diff options
author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2008-07-29 02:01:42 +0000 |
---|---|---|
committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2008-07-29 02:01:42 +0000 |
commit | a31b51792e4eddf47312cd2362ccff568eab19e8 (patch) | |
tree | b8bf451ea98d19271f3975fa697b0f970cec4848 | |
parent | a344edd79341baf78c61e337ecc588c1f6c9c597 (diff) | |
download | instadisc-a31b51792e4eddf47312cd2362ccff568eab19e8.tar.gz instadisc-a31b51792e4eddf47312cd2362ccff568eab19e8.tar.bz2 instadisc-a31b51792e4eddf47312cd2362ccff568eab19e8.zip |
Client: Encapsulated classpath JARs
Moved required classpath JARs into a SVN controlled folder so that they are available to anyone who wishes to help develop InstaDisc. Note that the Appframework and Spring-worker JARs were not encapsulated. If you wish to help develop InstaDisc, you'd best be off using NetBeans.
-rw-r--r-- | client/trunk/lib/commons-logging-1.1.jar | bin | 0 -> 52915 bytes | |||
-rw-r--r-- | client/trunk/lib/je-3.3.62.jar | bin | 0 -> 1251989 bytes | |||
-rw-r--r-- | client/trunk/lib/ws-commons-util-1.0.2.jar | bin | 0 -> 34407 bytes | |||
-rw-r--r-- | client/trunk/lib/xmlrpc-client-3.1.jar | bin | 0 -> 45124 bytes | |||
-rw-r--r-- | client/trunk/lib/xmlrpc-common-3.1.jar | bin | 0 -> 104038 bytes | |||
-rw-r--r-- | client/trunk/lib/xmlrpc-server-3.1.jar | bin | 0 -> 75310 bytes | |||
-rw-r--r-- | client/trunk/nbproject/project.properties | 14 | ||||
-rw-r--r-- | client/trunk/src/com/fourisland/instadisc/FirstRun/Step2.java | 5 | ||||
-rw-r--r-- | client/trunk/src/com/fourisland/instadisc/resources/InstaDiscApp.properties | 4 |
9 files changed, 12 insertions, 11 deletions
diff --git a/client/trunk/lib/commons-logging-1.1.jar b/client/trunk/lib/commons-logging-1.1.jar new file mode 100644 index 0000000..2ff9bbd --- /dev/null +++ b/client/trunk/lib/commons-logging-1.1.jar | |||
Binary files differ | |||
diff --git a/client/trunk/lib/je-3.3.62.jar b/client/trunk/lib/je-3.3.62.jar new file mode 100644 index 0000000..1ec9577 --- /dev/null +++ b/client/trunk/lib/je-3.3.62.jar | |||
Binary files differ | |||
diff --git a/client/trunk/lib/ws-commons-util-1.0.2.jar b/client/trunk/lib/ws-commons-util-1.0.2.jar new file mode 100644 index 0000000..3fc364e --- /dev/null +++ b/client/trunk/lib/ws-commons-util-1.0.2.jar | |||
Binary files differ | |||
diff --git a/client/trunk/lib/xmlrpc-client-3.1.jar b/client/trunk/lib/xmlrpc-client-3.1.jar new file mode 100644 index 0000000..a76e6ec --- /dev/null +++ b/client/trunk/lib/xmlrpc-client-3.1.jar | |||
Binary files differ | |||
diff --git a/client/trunk/lib/xmlrpc-common-3.1.jar b/client/trunk/lib/xmlrpc-common-3.1.jar new file mode 100644 index 0000000..862098b --- /dev/null +++ b/client/trunk/lib/xmlrpc-common-3.1.jar | |||
Binary files differ | |||
diff --git a/client/trunk/lib/xmlrpc-server-3.1.jar b/client/trunk/lib/xmlrpc-server-3.1.jar new file mode 100644 index 0000000..bb64a50 --- /dev/null +++ b/client/trunk/lib/xmlrpc-server-3.1.jar | |||
Binary files differ | |||
diff --git a/client/trunk/nbproject/project.properties b/client/trunk/nbproject/project.properties index 078acf2..a239641 100644 --- a/client/trunk/nbproject/project.properties +++ b/client/trunk/nbproject/project.properties | |||
@@ -20,18 +20,16 @@ dist.dir=dist | |||
20 | dist.jar=${dist.dir}/InstaDisc.jar | 20 | dist.jar=${dist.dir}/InstaDisc.jar |
21 | dist.javadoc.dir=${dist.dir}/javadoc | 21 | dist.javadoc.dir=${dist.dir}/javadoc |
22 | excludes= | 22 | excludes= |
23 | file.reference.commons-logging-1.1.jar=../../Desktop/xmlrpc-3.1/lib/commons-logging-1.1.jar | 23 | file.reference.commons-logging-1.1.jar=lib/commons-logging-1.1.jar |
24 | file.reference.sqlite.jar=../../Desktop/javasqlite-20080420/sqlite.jar | 24 | file.reference.ws-commons-util-1.0.2.jar=lib/ws-commons-util-1.0.2.jar |
25 | file.reference.sqlitejdbc-v052.jar=../../Desktop/sqlitejdbc-v052.jar | ||
26 | file.reference.ws-commons-util-1.0.2.jar=../../Desktop/xmlrpc-3.1/lib/ws-commons-util-1.0.2.jar | ||
27 | includes=** | 25 | includes=** |
28 | jar.compress=false | 26 | jar.compress=false |
29 | javac.classpath=\ | 27 | javac.classpath=\ |
30 | ${libs.swing-app-framework.classpath}:\ | 28 | ${libs.swing-app-framework.classpath}:\ |
31 | ${libs.XML-RPC.classpath}:\ | 29 | ${libs.XML-RPC.classpath}:\ |
32 | ${file.reference.ws-commons-util-1.0.2.jar}:\ | 30 | ${libs.BDB.classpath}:\ |
33 | ${file.reference.commons-logging-1.1.jar}:\ | 31 | ${file.reference.commons-logging-1.1.jar}:\ |
34 | ${libs.BDB.classpath} | 32 | ${file.reference.ws-commons-util-1.0.2.jar} |
35 | # Space-separated list of extra javac options | 33 | # Space-separated list of extra javac options |
36 | javac.compilerargs= | 34 | javac.compilerargs= |
37 | javac.deprecation=false | 35 | javac.deprecation=false |
@@ -55,10 +53,10 @@ javadoc.version=false | |||
55 | javadoc.windowtitle= | 53 | javadoc.windowtitle= |
56 | # Property libs.BDB.classpath is set here just to make sharing of project simpler. | 54 | # Property libs.BDB.classpath is set here just to make sharing of project simpler. |
57 | # The library definition has always preference over this property. | 55 | # The library definition has always preference over this property. |
58 | libs.BDB.classpath=../../Desktop/je-3.3.62/lib/je-3.3.62.jar | 56 | libs.BDB.classpath=lib/je-3.3.62.jar |
59 | # Property libs.XML-RPC.classpath is set here just to make sharing of project simpler. | 57 | # Property libs.XML-RPC.classpath is set here just to make sharing of project simpler. |
60 | # The library definition has always preference over this property. | 58 | # The library definition has always preference over this property. |
61 | libs.XML-RPC.classpath=../../Desktop/xmlrpc-3.1/lib/xmlrpc-client-3.1.jar:../../Desktop/xmlrpc-3.1/lib/xmlrpc-common-3.1.jar:../../Desktop/xmlrpc-3.1/lib/xmlrpc-server-3.1.jar | 59 | libs.XML-RPC.classpath=lib/xmlrpc-client-3.1.jar:lib/xmlrpc-common-3.1.jar:lib/xmlrpc-server-3.1.jar |
62 | main.class=com.fourisland.instadisc.InstaDiscApp | 60 | main.class=com.fourisland.instadisc.InstaDiscApp |
63 | manifest.file=manifest.mf | 61 | manifest.file=manifest.mf |
64 | meta.inf.dir=${src.dir}/META-INF | 62 | meta.inf.dir=${src.dir}/META-INF |
diff --git a/client/trunk/src/com/fourisland/instadisc/FirstRun/Step2.java b/client/trunk/src/com/fourisland/instadisc/FirstRun/Step2.java index 5460bc4..e6e75ff 100644 --- a/client/trunk/src/com/fourisland/instadisc/FirstRun/Step2.java +++ b/client/trunk/src/com/fourisland/instadisc/FirstRun/Step2.java | |||
@@ -6,6 +6,7 @@ | |||
6 | package com.fourisland.instadisc.FirstRun; | 6 | package com.fourisland.instadisc.FirstRun; |
7 | 7 | ||
8 | import com.fourisland.instadisc.Database.Wrapper; | 8 | import com.fourisland.instadisc.Database.Wrapper; |
9 | import com.fourisland.instadisc.Item.MD5; | ||
9 | import com.fourisland.instadisc.XmlRpc; | 10 | import com.fourisland.instadisc.XmlRpc; |
10 | import java.net.MalformedURLException; | 11 | import java.net.MalformedURLException; |
11 | import java.net.URL; | 12 | import java.net.URL; |
@@ -168,8 +169,10 @@ public class Step2 extends javax.swing.JDialog { | |||
168 | { | 169 | { |
169 | jLabel5.setText("Error: No registration exists on the specified Central Server with the specified UN/PW combination"); | 170 | jLabel5.setText("Error: No registration exists on the specified Central Server with the specified UN/PW combination"); |
170 | } else { | 171 | } else { |
172 | MD5 md5 = new MD5(jTextField2.getText()); | ||
173 | |||
171 | Wrapper.setConfig("username", jTextField1.getText()); | 174 | Wrapper.setConfig("username", jTextField1.getText()); |
172 | Wrapper.setConfig("password", jTextField2.getText()); | 175 | Wrapper.setConfig("password", md5.hash()); |
173 | Wrapper.setConfig("centralServerURL", jTextField3.getText()); | 176 | Wrapper.setConfig("centralServerURL", jTextField3.getText()); |
174 | 177 | ||
175 | StepEndResults.ok = true; | 178 | StepEndResults.ok = true; |
diff --git a/client/trunk/src/com/fourisland/instadisc/resources/InstaDiscApp.properties b/client/trunk/src/com/fourisland/instadisc/resources/InstaDiscApp.properties index 8e3b5ef..9bb23b0 100644 --- a/client/trunk/src/com/fourisland/instadisc/resources/InstaDiscApp.properties +++ b/client/trunk/src/com/fourisland/instadisc/resources/InstaDiscApp.properties | |||
@@ -4,8 +4,8 @@ Application.name = InstaDisc | |||
4 | Application.title = Basic Application Example | 4 | Application.title = Basic Application Example |
5 | Application.version = 1.0 | 5 | Application.version = 1.0 |
6 | Application.vendor = Sun Microsystems Inc. | 6 | Application.vendor = Sun Microsystems Inc. |
7 | Application.homepage = http\://appframework.dev.java.net/ | 7 | Application.homepage = http://appframework.dev.java.net |
8 | Application.description = A simple Java desktop application based on Swing Application Framework. | 8 | Application.description = A simple java desktop application based on Swing Application Framework |
9 | Application.vendorId = Sun | 9 | Application.vendorId = Sun |
10 | Application.id = ${Application.name} | 10 | Application.id = ${Application.name} |
11 | Application.lookAndFeel = system | 11 | Application.lookAndFeel = system |