chiark / gitweb /
rename com.tedpearson.ypp.market.* to net.chiark.yarrg.*
authorIan Jackson <ian@liberator.relativity.greenend.org.uk>
Sun, 5 Sep 2010 19:37:54 +0000 (20:37 +0100)
committerIan Jackson <ian@liberator.relativity.greenend.org.uk>
Sun, 5 Sep 2010 19:37:54 +0000 (20:37 +0100)
.gitignore
LICENCE
accessibility.properties
build-sh
jarrg
src/Jarrg.xml
src/net/chiark/yarrg/ControlPanel.java [moved from src/com/tedpearson/ypp/market/ControlPanel.java with 91% similarity]
src/net/chiark/yarrg/MarketUploader.java [moved from src/com/tedpearson/ypp/market/MarketUploader.java with 99% similarity]
src/winsetup.nsi

index d3ef8c3..7d36bd5 100644 (file)
@@ -9,4 +9,4 @@ jarrg-setup.exe
 jarrg.tar.gz
 jarrg-debug-*
 src/build/
-src/com/tedpearson/ypp/market/Version.java
+src/net/chiark/yarrg/Version.java
diff --git a/LICENCE b/LICENCE
index ad4eaca..57e176e 100644 (file)
--- a/LICENCE
+++ b/LICENCE
@@ -3,9 +3,10 @@ Jarrg (and Yarrg) are Free Software.
 The Linux "jarrg" wrapper script is:
   Copyright (C) 2009-2010 Ian Jackson
 
-com.tedpearson.* Java source code is:
+net.chiark.yarrg.* Java code (except ClientHttpRequest) is:
   Copyright (C) 2009 Ted Pearson and Owen Dunn
   Copyright (C) 2010 Owen Dunn and Ian Jackson
+(much of this code was originally com.tedpearson.ypp.market.*)
 
 net.chiark.yarrg.ClientHttpRequest is copyright Vlad Petryshev,
 Ted Pearson, and Owen Dunn and licensed under the Apache license
index cc36ba7..eb99bda 100644 (file)
@@ -1 +1 @@
-assistive_technologies=com.tedpearson.ypp.market.MarketUploader
+assistive_technologies=net.chiark.yarrg.MarketUploader
index 3aae4b2..24b8a0a 100755 (executable)
--- a/build-sh
+++ b/build-sh
@@ -18,14 +18,14 @@ if [ x"`git diff 2>/dev/null || echo x`" != x ]; then
        revision="$revision-local"
 fi
 
-cat >src/com/tedpearson/ypp/market/Version.java <<END
-  package com.tedpearson.ypp.market;
+cat >src/net/chiark/yarrg/Version.java <<END
+  package net.chiark.yarrg;
   public class Version {
       public final static String version = "$revision";
   }
 END
-rm -f src/build/com/tedpearson/ypp/market/Version.class
-rm -f src/build/com/tedpearson/ypp/market/ControlPanel.class
+rm -f src/build/net/chiark/yarrg/Version.class
+rm -f src/build/net/chiark/yarrg/ControlPanel.class
 rm -f *.jar
 
 cd src
diff --git a/jarrg b/jarrg
index d5db77c..62d1465 100755 (executable)
--- a/jarrg
+++ b/jarrg
@@ -170,7 +170,7 @@ if $check_only; then echo "Check successful."; exit 0; fi
 
 set +e
 $setup_only_simulate "$realjava" \
- -Dcom.tedpearson.ypp.market.controlpanel.exitstatus=12 \
+ -Dnet.chiark.yarrg.controlpanel.exitstatus=12 \
  -jar "$srcjardir/Jarrg-ControlPanel.jar"
 rc=$?
 set -e
@@ -216,7 +216,7 @@ cat <<'END' >"$wrapper"
 #exec 4>&-
 
        yppclass=com.threerings.yohoho.client.YoApp
-       atclass=com.tedpearson.ypp.market.MarketUploader
+       atclass=net.chiark.yarrg.MarketUploader
 
        args=( "$@" )
        nargs=${#args[*]}
index b48e7a9..49b937f 100644 (file)
@@ -22,7 +22,7 @@
        <target name="jar" depends="compile">
                <jar jarfile="${src}/../Jarrg-ControlPanel.jar">
                        <manifest>
-                               <attribute name="Main-Class" value="com.tedpearson.ypp.market.ControlPanel"/>
+                               <attribute name="Main-Class" value="net.chiark.yarrg.ControlPanel"/>
                        </manifest>
                        <fileset dir="${build}" includes="**/ControlPanel*"/>
                        <fileset dir="${rootdir}" includes="LICENCE" defaultexcludes="yes"/>
@@ -30,7 +30,7 @@
                <jar jarfile="${src}/../Jarrg-Uploader.jar">
                        <fileset dir="${src}" includes="com/sun/**" />
                        <fileset dir="${build}" includes="**/Market*.class"/>
-                       <fileset dir="${build}" includes="net/chiark/**, com/tedpearson/util/update/*.class"/>
+                       <fileset dir="${build}" includes="net/chiark/**"/>
                        <fileset dir="${rootdir}" includes="LICENCE*" defaultexcludes="yes"/>
                </jar>
        </target>
similarity index 91%
rename from src/com/tedpearson/ypp/market/ControlPanel.java
rename to src/net/chiark/yarrg/ControlPanel.java
index bbd75f6..b4dc305 100644 (file)
@@ -1,4 +1,4 @@
-package com.tedpearson.ypp.market;
+package net.chiark.yarrg;
 
 import javax.swing.*;
 import java.awt.*;
@@ -32,7 +32,7 @@ public class ControlPanel extends JFrame {
                liveortest.add(testing);
 
                String version_label = " version: " +
-                   com.tedpearson.ypp.market.Version.version;
+                   net.chiark.yarrg.Version.version;
                JLabel version = new JLabel(version_label);
 
                final JCheckBox enableDebug = new JCheckBox("Write debug files?", prefs.getBoolean("writeDebugFiles", false));
@@ -46,7 +46,7 @@ public class ControlPanel extends JFrame {
                add(version);
                add(enableDebug);
 
-               final int exitstatus = Integer.parseInt(System.getProperty("com.tedpearson.ypp.market.controlpanel.exitstatus", "0"));
+               final int exitstatus = Integer.parseInt(System.getProperty("net.chiark.yarrg.controlpanel.exitstatus", "0"));
 
                JButton but = new JButton("Save options");
                add(but);
similarity index 99%
rename from src/com/tedpearson/ypp/market/MarketUploader.java
rename to src/net/chiark/yarrg/MarketUploader.java
index 90a920a..234da5f 100644 (file)
@@ -1,4 +1,4 @@
-package com.tedpearson.ypp.market;
+package net.chiark.yarrg;
 
 import java.awt.*;
 import java.awt.event.*;
@@ -50,7 +50,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
        // Yarrg protocol parameters
        private final static String YARRG_CLIENTNAME = "jpctb greenend";
        private final static String YARRG_CLIENTVERSION =
-           com.tedpearson.ypp.market.Version.version;
+           net.chiark.yarrg.Version.version;
        private final static String YARRG_CLIENTFIXES = "bug-094";
        private final static String YARRG_LIVE_URL = "http://upload.yarrg.chiark.net/commod-update-receiver";
        private final static String YARRG_TEST_URL = "http://upload.yarrg.chiark.net/test/commod-update-receiver";
index 32348d6..829606d 100644 (file)
@@ -82,5 +82,5 @@ CreateShortCut "$DESKTOP\JARRG.lnk" "$INSTDIR\jre\bin\javaw.exe" \
 CreateShortCut "$SMPROGRAMS\JARRG.lnk" "$INSTDIR\jre\bin\javaw.exe" \
 "-jar getdown-dop.jar ." "$YPPDIR\app_icon.ico" 0 SW_SHOWNORMAL
 CreateShortCut "$SMPROGRAMS\JARRG Control Panel.lnk" \
-"$INSTDIR\jre\bin\javaw.exe" "com.tedpearson.ypp.market.ControlPanel"
+"$INSTDIR\jre\bin\javaw.exe" "net.chiark.yarrg.ControlPanel"
 FunctionEnd