Changeset 10296 for trunk/gsdl3/src

Timestamp:

2005-07-25T16:20:43+12:00 (19 years ago)

Author:

kjdon

Message:

changed the args a bit, gsdl3_home now comes from GlobalProperties (in MessageRouter)

Location:

trunk/gsdl3/src/java/org/greenstone/gsdl3

Files:

• Library1.java (modified) (1 diff)
• Library2.java (modified) (3 diffs)

trunk/gsdl3/src/java/org/greenstone/gsdl3/Library1.java

@@ -35 +35 @@
 
     if (args.length != 1) {
-        System.out.println("Usage: Library1 <sitehome>");
+        System.out.println("Usage: Library1 <sitename>");
         System.exit(1);
     }
-    String site_home = args[0];
+    String site_name = args[0];
 
     MessageRouter mr = new MessageRouter();
-    mr.setSiteHome(site_home);
+    mr.setSiteName(site_name);
     mr.configure();
     

trunk/gsdl3/src/java/org/greenstone/gsdl3/Library2.java

@@ -56 +56 @@
     }
     
-    public void configure(String gsdl_home, String site_name, String interface_name) {
+    public void configure(String site_name, String interface_name) {
 
     HashMap config_params = new HashMap();
-    config_params.put(GSConstants.GSDL3_HOME, gsdl_home);
+    //config_params.put(GSConstants.GSDL3_HOME, gsdl_home);
     config_params.put(GSConstants.SITE_NAME, site_name);
     config_params.put(GSConstants.INTERFACE_NAME, interface_name);
@@ -66 +66 @@
     MessageRouter message_router = new MessageRouter();
     
-    message_router.setSiteHome(GSFile.siteHome(gsdl_home, site_name));
+    message_router.setSiteName(site_name);
     message_router.configure();
     // new receptionist
@@ -76 +76 @@
     public static void main(String args[]) {
 
-    if (args.length != 3) {
-        System.out.println("Usage: Library2 <gsdl3 home> <site name> <interface name>");
+    if (args.length != 2) {
+        System.out.println("Usage: Library2 <site name> <interface name>");
         System.exit(1);
     }
     
     Library2 library = new Library2();
-    library.configure(args[0], args[1], args[2]);
+    library.configure(args[0], args[1]);