Changeset 2157

Timestamp:

2001-03-11T23:58:37+13:00 (23 years ago)

Author:

say1

Message:

fixed Makefiles to stop deleting html files. Added the notion of a Wrapper. Converted NzdlCachingServiceClient to NzdlCacheWrapper. Added NzdlDocSaveWrapper. Added NzdlLogWrapper. Added functionality to NzdlIORs to use these.

Location:

trunk/java-client

Files:

• Makefile (modified) (1 diff)
• README (modified) (1 diff)
• org/nzdl/gsdl/Makefile (modified) (1 diff)
• org/nzdl/gsdl/ptp/Makefile (modified) (1 diff)
• org/nzdl/gsdl/service/Makefile (modified) (2 diffs)
• org/nzdl/gsdl/service/NzdlCacheWrapper.java (added)
• org/nzdl/gsdl/service/NzdlDocSaveWrapper.java (added)
• org/nzdl/gsdl/service/NzdlLogWrapper.java (added)
• org/nzdl/gsdl/service/NzdlServiceCachingClient.java (deleted)
• org/nzdl/gsdl/service/NzdlServiceClient.java (modified) (1 diff)
• org/nzdl/gsdl/service/NzdlWrapper.java (added)
• org/nzdl/gsdl/util/Makefile (modified) (1 diff)
• org/nzdl/gsdl/util/NzdlIORs.java (modified) (5 diffs)

trunk/java-client/Makefile

@@ -40 +40 @@
 
 clean :
+    rm -f log.file.*
+    rm -f knownIORs.properties
     (cd gnu/getopt && $(MAKE) clean)
     (cd org/nzdl/gsdl && $(MAKE) clean)

trunk/java-client/README

@@ -9 +9 @@
    David Bainbridge <[email protected]>
    Dave Nichols <[email protected]>,
-   Brett Sheeran <[email protected]>
+   Brett Sheeran <[email protected]> (bas6 in the cvs log)
    Stuart Yeates <[email protected]>
 

trunk/java-client/org/nzdl/gsdl/Makefile

@@ -6 +6 @@
 
 subdirs :
+    (cd service && $(MAKE) all)
+    (cd util && $(MAKE) all)
+    (cd ptp && $(MAKE) all)
     (cd SimpleGraphicalClient && $(MAKE) all)
-    (cd util && $(MAKE) all)
-    (cd service && $(MAKE) all)
-    (cd ptp && $(MAKE) all)
 
 clean:

trunk/java-client/org/nzdl/gsdl/ptp/Makefile

@@ -25 +25 @@
 clean:
     rm -f *.class
-    rm -f *.html
 
 

trunk/java-client/org/nzdl/gsdl/service/Makefile

@@ -22 +22 @@
           NzdlServiceClient.class \
           NzdlServiceServer.class \
-          NzdlServiceCachingClient.class
+          NzdlWrapper.class \
+          NzdlLogWrapper.class \
+          NzdlDocSaveWrapper.class \
+          NzdlCacheWrapper.class
 
 
@@ -29 +32 @@
 clean:
     rm -f *.class
-    rm -f *.html
 
 

trunk/java-client/org/nzdl/gsdl/service/NzdlServiceClient.java

@@ -21 +21 @@
 package org.nzdl.gsdl.service;
 
-import java.io.*;
-import java.util.*;
+//import java.io.*;
+//import java.util.*;
+import java.util.Map;
+import java.util.Set;
+import java.util.List;
+import java.util.HashSet;
+import java.util.Properties;
+
 /* jdk 1.3 orb */
-import org.omg.CORBA.*;
+import org.omg.CORBA.ORB;
 /* gsdl corba stuff */
 import org.nzdl.gsdl.corba.gsdlInterface.*;

trunk/java-client/org/nzdl/gsdl/util/Makefile

@@ -22 +22 @@
 clean:
     rm -f *.class
-    rm -f *.html
 
 

trunk/java-client/org/nzdl/gsdl/util/NzdlIORs.java

@@ -57 +57 @@
 import org.nzdl.gsdl.service.NzdlService;
 import org.nzdl.gsdl.service.NzdlServiceClient;
-import org.nzdl.gsdl.service.NzdlServiceCachingClient;
+import org.nzdl.gsdl.service.NzdlCacheWrapper;
+import org.nzdl.gsdl.service.NzdlLogWrapper;
+import org.nzdl.gsdl.service.NzdlDocSaveWrapper;
 
 /**
@@ -100 +102 @@
 
   /** Are we using a caching NzdlService ? */
-  static public boolean nzdlServiceCachingClass = true;
+  static public boolean caching = true;
+  /** Are we logging before the cache ? */
+  static public boolean logBefore = true;
+  /** Are we logging after the cache ? */
+  static public boolean logAfter = true;
+  /** Are we saving documents ? */
+  static public boolean saveDocs = true;
 
   /**
@@ -186 +194 @@
    * @see org.omg.CORBA.ORB
    */
-  public static NzdlServiceClient findIOR(String [] _args,
-                      String _URL,
-                      String _filename,
-                      String _IOR)  {
+  public static NzdlService findIOR(String [] _args,
+                    String _URL,
+                    String _filename,
+                    String _IOR)  {
     
     // read our prevously seed IORs ...
     String IOR = null;
-    NzdlServiceClient client = null;
+    NzdlService client = null;
       
     // try a URL from the command line
@@ -376 +384 @@
    * @return the newly created NzdlServiceClient
    */
-  static public NzdlServiceClient attemptToInitialise(String [] _args, 
+  static public NzdlService attemptToInitialise(String [] _args, 
                       Properties _props, 
                       String _IOR) {
     checkLoaded();
-    NzdlServiceClient nzdl = null;
+    NzdlService nzdl = null;
     try {
-      if (nzdlServiceCachingClass) 
-    nzdl = new NzdlServiceCachingClient( _args, _props, _IOR);
-      else
-    nzdl = new NzdlServiceClient( _args, _props, _IOR);
+      nzdl = new NzdlServiceClient( _args, _props, _IOR);
     } catch (Throwable t) {
       System.err.println ("failed to initialise using:");
@@ -391 +396 @@
       return null;
     }
+    if (saveDocs)
+      nzdl = new NzdlDocSaveWrapper(nzdl);
+
+    if (logAfter)
+      nzdl = new NzdlLogWrapper(nzdl, "log.file.after.cache", "AFTER: ");
+
+    if (caching)
+      nzdl = new NzdlCacheWrapper(nzdl);
+
+    if (logBefore)
+      nzdl = new NzdlLogWrapper(nzdl, "log.file.before.cache", "BEFORE: ");
     return nzdl;
   }