Merge remote-tracking branch 'origin/master'

igemsoftware · Oct 14, 2014 · 6d5516c · 6d5516c
2 parents 629ee4d + e262f0d
commit 6d5516c
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 7 deletions.
diff --git a/.classpath b/.classpath
@@ -7,5 +7,6 @@
 	<classpathentry kind="lib" path="lib/httpcore-4.3.2.jar"/>
 	<classpathentry kind="lib" path="lib/mysql-connector-java-5.1.18-bin.jar"/>
 	<classpathentry kind="lib" path="lib/jsoup-1.8.1.jar"/>
+	<classpathentry kind="lib" path="lib/commons-logging-1.1.3.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/Executeable/EasyBbk.jar b/Executeable/EasyBbk.jar
diff --git a/bin/data_center/Server$Blasting.class b/bin/data_center/Server$Blasting.class
diff --git a/bin/data_center/Server$Database.class b/bin/data_center/Server$Database.class
diff --git a/bin/data_center/Server.class b/bin/data_center/Server.class
diff --git a/lib/commons-logging-1.1.3.jar b/lib/commons-logging-1.1.3.jar
diff --git a/src/data_center/BlastingSearcher.java b/src/data_center/BlastingSearcher.java
@@ -21,11 +21,11 @@
 public class BlastingSearcher
 {
 	// about server
-	private static final String SERVER_ADDRESS = Server.Blasting.SERVER_ADDRESS;
+	private static final String SERVER_ADDRESS = Server.Blasting_old.SERVER_ADDRESS;
 	@SuppressWarnings("unused")
-	private static final int PORT = Server.Blasting.PORT;
-	private static final String USER_NAME = Server.Blasting.USER_NAME;
-	private static final String PASS_WORD = Server.Blasting.PASSWORD;
+	private static final int PORT = Server.Blasting_old.PORT;
+	private static final String USER_NAME = Server.Blasting_old.USER_NAME;
+	private static final String PASS_WORD = Server.Blasting_old.PASSWORD;
 
 	// about the cmd of blasting
 	private static final String PROGRAM_TASK_DATABASE

diff --git a/src/data_center/DatabaseConnector.java b/src/data_center/DatabaseConnector.java
@@ -10,9 +10,9 @@ public class DatabaseConnector
 {
 	@SuppressWarnings("unused")
 	private final static String DRIVER = "com.mysql.jdbc.Driver";
-	private final static String URL_SERVER = Server.Database.URL_SERVER;
-	private final static String USER_NAME = Server.Database.USER_NAME;
-	private final static String PASSWORD = Server.Database.PASSWORD;
+	private final static String URL_SERVER = Server.Database_old.URL_SERVER;
+	private final static String USER_NAME = Server.Database_old.USER_NAME;
+	private final static String PASSWORD = Server.Database_old.PASSWORD;
 
     private static Connection connection = null;