rename com.tedpearson.ypp.market.* to net.chiark.yarrg.*

diff --git a/.gitignore b/.gitignore
index d3ef8c3e35f9905ef3959d59026b36ae314609b8..7d36bd500c4832f1ceb659c8e8c9fcbb41f4365e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -9,4 +9,4 @@ jarrg-setup.exe
 jarrg.tar.gz
 jarrg-debug-*
 src/build/
 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 ad4eaca27b9e35daa1ba17207265dd8d591ee466..57e176ef8d0b053e8655684b00f1ceaf7fcd6e2f 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
 
 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
   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
 
 net.chiark.yarrg.ClientHttpRequest is copyright Vlad Petryshev,
 Ted Pearson, and Owen Dunn and licensed under the Apache license

diff --git a/accessibility.properties b/accessibility.properties
index cc36ba730543df63577d8ef3dbc4ef222ab45639..eb99bda8021119a16e9dacd96597100d991fe259 100644 (file)
--- a/accessibility.properties
+++ b/accessibility.properties
@@ -1 +1 @@
-assistive_technologies=com.tedpearson.ypp.market.MarketUploader
+assistive_technologies=net.chiark.yarrg.MarketUploader

diff --git a/build-sh b/build-sh
index 3aae4b23d512d61beadcc65df5586bede739081c..24b8a0a54372cef7c9273437ed190c53b4b370d4 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
 
        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
   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
 rm -f *.jar
 
 cd src

diff --git a/jarrg b/jarrg
index d5db77c544ddd5e00c54868521aa15f698eadfbc..62d1465d0e9d754533728e8c2b09a086f8d40f71 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" \
 
 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
  -jar "$srcjardir/Jarrg-ControlPanel.jar"
 rc=$?
 set -e


@@ -216,7 +216,7 @@ cat <<'END' >"$wrapper"
 #exec 4>&-
 
        yppclass=com.threerings.yohoho.client.YoApp
 #exec 4>&-
 
        yppclass=com.threerings.yohoho.client.YoApp

-       atclass=com.tedpearson.ypp.market.MarketUploader
+       atclass=net.chiark.yarrg.MarketUploader

 
        args=( "$@" )
        nargs=${#args[*]}
 
        args=( "$@" )
        nargs=${#args[*]}

diff --git a/src/Jarrg.xml b/src/Jarrg.xml
index b48e7a92269c322bec27b745bb144669819518db..49b937f263c3a9ae47e558f65be06687f828c9b1 100644 (file)
--- a/src/Jarrg.xml
+++ b/src/Jarrg.xml
@@ -22,7 +22,7 @@
        <target name="jar" depends="compile">
                <jar jarfile="${src}/../Jarrg-ControlPanel.jar">
                        <manifest>
        <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"/>
                        </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"/>
                <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>
                        <fileset dir="${rootdir}" includes="LICENCE*" defaultexcludes="yes"/>
                </jar>
        </target>

diff --git a/src/com/tedpearson/ypp/market/ControlPanel.java b/src/net/chiark/yarrg/ControlPanel.java
similarity index 91%
rename from src/com/tedpearson/ypp/market/ControlPanel.java
rename to src/net/chiark/yarrg/ControlPanel.java
index bbd75f6c71bcd33b19605e363dcb232600a57380..b4dc3055450ee92f32e07a5236e34bee344dafa7 100644 (file)
--- a/src/com/tedpearson/ypp/market/ControlPanel.java
+++ b/src/net/chiark/yarrg/ControlPanel.java
@@ -1,4 +1,4 @@
-package com.tedpearson.ypp.market;
+package net.chiark.yarrg;

 
 import javax.swing.*;
 import java.awt.*;
 
 import javax.swing.*;
 import java.awt.*;


@@ -32,7 +32,7 @@ public class ControlPanel extends JFrame {
                liveortest.add(testing);
 
                String version_label = " version: " +
                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));
                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);
 
                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);
 
                JButton but = new JButton("Save options");
                add(but);

diff --git a/src/com/tedpearson/ypp/market/MarketUploader.java b/src/net/chiark/yarrg/MarketUploader.java
similarity index 99%
rename from src/com/tedpearson/ypp/market/MarketUploader.java
rename to src/net/chiark/yarrg/MarketUploader.java
index 90a920a44442f321f0bcec4ec63a61e2d3eae2d7..234da5f221d068ee3bf3f436f92c8bafa00b43b4 100644 (file)
--- a/src/com/tedpearson/ypp/market/MarketUploader.java
+++ b/src/net/chiark/yarrg/MarketUploader.java
@@ -1,4 +1,4 @@
-package com.tedpearson.ypp.market;
+package net.chiark.yarrg;

 
 import java.awt.*;
 import java.awt.event.*;
 
 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 =
        // 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";
        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";

diff --git a/src/winsetup.nsi b/src/winsetup.nsi
index 32348d621a846491b422f2d74dd0747a54312228..829606d6f717dea5da87f7f961132c9360b2025c 100644 (file)
--- a/src/winsetup.nsi
+++ b/src/winsetup.nsi
@@ -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" \
 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
 FunctionEnd