From a31b51792e4eddf47312cd2362ccff568eab19e8 Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Tue, 29 Jul 2008 02:01:42 +0000 Subject: 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. --- client/trunk/lib/commons-logging-1.1.jar | Bin 0 -> 52915 bytes client/trunk/lib/je-3.3.62.jar | Bin 0 -> 1251989 bytes client/trunk/lib/ws-commons-util-1.0.2.jar | Bin 0 -> 34407 bytes client/trunk/lib/xmlrpc-client-3.1.jar | Bin 0 -> 45124 bytes client/trunk/lib/xmlrpc-common-3.1.jar | Bin 0 -> 104038 bytes client/trunk/lib/xmlrpc-server-3.1.jar | Bin 0 -> 75310 bytes client/trunk/nbproject/project.properties | 14 ++++++-------- .../src/com/fourisland/instadisc/FirstRun/Step2.java | 5 ++++- .../instadisc/resources/InstaDiscApp.properties | 4 ++-- 9 files changed, 12 insertions(+), 11 deletions(-) create mode 100644 client/trunk/lib/commons-logging-1.1.jar create mode 100644 client/trunk/lib/je-3.3.62.jar create mode 100644 client/trunk/lib/ws-commons-util-1.0.2.jar create mode 100644 client/trunk/lib/xmlrpc-client-3.1.jar create mode 100644 client/trunk/lib/xmlrpc-common-3.1.jar create mode 100644 client/trunk/lib/xmlrpc-server-3.1.jar 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 Binary files /dev/null and b/client/trunk/lib/commons-logging-1.1.jar 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 Binary files /dev/null and b/client/trunk/lib/je-3.3.62.jar 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 Binary files /dev/null and b/client/trunk/lib/ws-commons-util-1.0.2.jar 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 Binary files /dev/null and b/client/trunk/lib/xmlrpc-client-3.1.jar 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 Binary files /dev/null and b/client/trunk/lib/xmlrpc-common-3.1.jar 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 Binary files /dev/null and b/client/trunk/lib/xmlrpc-server-3.1.jar 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 dist.jar=${dist.dir}/InstaDisc.jar dist.javadoc.dir=${dist.dir}/javadoc excludes= -file.reference.commons-logging-1.1.jar=../../Desktop/xmlrpc-3.1/lib/commons-logging-1.1.jar -file.reference.sqlite.jar=../../Desktop/javasqlite-20080420/sqlite.jar -file.reference.sqlitejdbc-v052.jar=../../Desktop/sqlitejdbc-v052.jar -file.reference.ws-commons-util-1.0.2.jar=../../Desktop/xmlrpc-3.1/lib/ws-commons-util-1.0.2.jar +file.reference.commons-logging-1.1.jar=lib/commons-logging-1.1.jar +file.reference.ws-commons-util-1.0.2.jar=lib/ws-commons-util-1.0.2.jar includes=** jar.compress=false javac.classpath=\ ${libs.swing-app-framework.classpath}:\ ${libs.XML-RPC.classpath}:\ - ${file.reference.ws-commons-util-1.0.2.jar}:\ + ${libs.BDB.classpath}:\ ${file.reference.commons-logging-1.1.jar}:\ - ${libs.BDB.classpath} + ${file.reference.ws-commons-util-1.0.2.jar} # Space-separated list of extra javac options javac.compilerargs= javac.deprecation=false @@ -55,10 +53,10 @@ javadoc.version=false javadoc.windowtitle= # Property libs.BDB.classpath is set here just to make sharing of project simpler. # The library definition has always preference over this property. -libs.BDB.classpath=../../Desktop/je-3.3.62/lib/je-3.3.62.jar +libs.BDB.classpath=lib/je-3.3.62.jar # Property libs.XML-RPC.classpath is set here just to make sharing of project simpler. # The library definition has always preference over this property. -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 +libs.XML-RPC.classpath=lib/xmlrpc-client-3.1.jar:lib/xmlrpc-common-3.1.jar:lib/xmlrpc-server-3.1.jar main.class=com.fourisland.instadisc.InstaDiscApp manifest.file=manifest.mf 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 @@ package com.fourisland.instadisc.FirstRun; import com.fourisland.instadisc.Database.Wrapper; +import com.fourisland.instadisc.Item.MD5; import com.fourisland.instadisc.XmlRpc; import java.net.MalformedURLException; import java.net.URL; @@ -168,8 +169,10 @@ public class Step2 extends javax.swing.JDialog { { jLabel5.setText("Error: No registration exists on the specified Central Server with the specified UN/PW combination"); } else { + MD5 md5 = new MD5(jTextField2.getText()); + Wrapper.setConfig("username", jTextField1.getText()); - Wrapper.setConfig("password", jTextField2.getText()); + Wrapper.setConfig("password", md5.hash()); Wrapper.setConfig("centralServerURL", jTextField3.getText()); 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 Application.title = Basic Application Example Application.version = 1.0 Application.vendor = Sun Microsystems Inc. -Application.homepage = http\://appframework.dev.java.net/ -Application.description = A simple Java desktop application based on Swing Application Framework. +Application.homepage = http://appframework.dev.java.net +Application.description = A simple java desktop application based on Swing Application Framework Application.vendorId = Sun Application.id = ${Application.name} Application.lookAndFeel = system -- cgit 1.4.1