Changeset 2178

Timestamp:

2001-03-14T15:15:38+13:00 (23 years ago)

Author:

say1

Message:

implemented multiway wrapper to allow a client to connect to multiple servers seamlessly

Location:

trunk/java-client/org/nzdl/gsdl

Files:

• SimpleClient.java (modified) (2 diffs)
• SimpleGraphicalClient/SimpleGraphicalClient.java (modified) (1 diff)
• service/Makefile (modified) (1 diff)
• service/NzdlCollectionInfo.java (modified) (2 diffs)
• service/NzdlWrapper.java (modified) (1 diff)
• util/NzdlCorbaFactory.java (modified) (1 diff)
• util/NzdlIORs.java (modified) (8 diffs)

trunk/java-client/org/nzdl/gsdl/SimpleClient.java

@@ -111 +111 @@
    */ 
   protected SimpleClient() {
-    nzdl = NzdlIORs.findIOR(null, URLFromCommandLine,
-                IORFileName, IORFromCommandLine);
+    nzdl = NzdlIORs.createNzdlService(null, 
+                      System.getProperties(), 
+                      URLFromCommandLine,
+                      IORFileName, 
+                      IORFromCommandLine);
     if (nzdl == null)
       throw new Error("URK! unable to find an IOR...");
@@ -123 +126 @@
   SimpleClient(String [] args) {
     parseArgs(args);
-    nzdl = NzdlIORs.findIOR(args, URLFromCommandLine, 
-                IORFileName, IORFromCommandLine);
+    nzdl = NzdlIORs.createNzdlService(args, 
+                      System.getProperties(), 
+                      URLFromCommandLine, 
+                      IORFileName, 
+                      IORFromCommandLine);
     if (nzdl == null)
       throw new Error("URK! unable to find an IOR...");

trunk/java-client/org/nzdl/gsdl/SimpleGraphicalClient/SimpleGraphicalClient.java

@@ -95 +95 @@
    */
     void init(String [] args)  {
-    nzdl = NzdlIORs.findIOR(null, null,
-                IORFileName, IORFromCommandLine);
+    nzdl = NzdlIORs.createNzdlService(args, 
+                      System.getProperties(), 
+                      null,
+                      IORFileName, 
+                      IORFromCommandLine);
     if (nzdl == null)
         throw new Error("URK! unable to find an IOR...");

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

@@ -25 +25 @@
           NzdlLogWrapper.class \
           NzdlDocSaveWrapper.class \
+          NzdlMultiWayWrapper.class \
           NzdlCacheWrapper.class
 

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

@@ -69 +69 @@
    */
   public String getHTTPPrefix() {
-    return NzdlCorbaFactory.toString( m_Info.httpprefix) ;
+    //return m_Info.httpprefix.text.toString();
+     return NzdlCorbaFactory.toString( m_Info.httpprefix ) ;
   }
 
@@ -76 +77 @@
    */
   public String getHTTPDomain() {
-    return NzdlCorbaFactory.toString( m_Info.httpdomain) ;
+    return NzdlCorbaFactory.toString( m_Info.httpdomain ) ;
+  }
+
+  /**
+   * Returns reseptionist
+   */
+  public String getReceptionist() {
+    return NzdlCorbaFactory.toString( m_Info.receptionist ) ;
   }
 

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

@@ -51 +51 @@
    */
   public NzdlWrapper(NzdlService service) {
-    if (service == null)
-      throw new Error("null service");
     this.service = service;
   }

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

@@ -59 +59 @@
     return text.toString();
   }
+
 
   public static corbaComErrorHolder createComErrorHolder() {

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

@@ -44 +44 @@
 import java.util.Set;
 import java.util.Vector;
+import java.util.Hashtable;
 
 // local libraries
@@ -56 +57 @@
 import org.nzdl.gsdl.service.NzdlLogWrapper;
 import org.nzdl.gsdl.service.NzdlDocSaveWrapper;
+import org.nzdl.gsdl.service.NzdlMultiWayWrapper;
 
 /**
@@ -108 +110 @@
   /** Are we saving documents ? */
   static public boolean saveDocs = true;
+  /** Are we trying for multiple servers ? */
+  static public boolean doMultiple = true;
 
   /**
@@ -194 +198 @@
    */
   public static NzdlService findIOR(String [] _args,
+                    Properties _props, 
                     String _URL,
                     String _filename,
@@ -235 +240 @@
     }
     return client;
+  }
+
+  /**
+   * Connect for as many servers as possible
+   * @param _args the command line arguments
+   * @param _URL a URL to look for an IOR in
+   * @param _filename a local filename to look for an IOR in
+   * @param _IOR a string to look for an IOR in
+   * @see org.omg.CORBA.ORB
+   */
+  public static Hashtable findIORs(String [] _args,
+                   Properties _props, 
+                   String _URL,
+                   String _filename,
+                   String _IOR)  {
+    // the object we're filling ...
+    Hashtable result = new Hashtable();
+
+    // read our prevously seed IORs ...
+    String IOR = null;
+    NzdlService client = null;
+      
+    // try a URL from the command line
+    if ( _URL != null) {
+      IOR = NzdlIORs.getIORfromURL(_URL);
+      client = attemptToInitialise(_args, null, IOR);
+      if (client != null)
+    result.put(IOR,client);
+    }
+    
+    // try an IOR from the command line
+    if (_IOR != null) {
+      IOR = NzdlIORs.registerIOR(_IOR);
+      client = attemptToInitialise(_args, null, IOR);
+      if (client != null)
+    result.put(IOR,client);
+    }
+    
+    // try an IOR from a file (the filename may have been 
+    // given from the commandline
+    
+    IOR = NzdlIORs.getIORfromFile(_filename);
+    client = attemptToInitialise(_args, null, IOR);
+    if (client != null)
+      result.put(IOR,client);
+
+    
+    // try the compiled-in URLs
+    for (int i=0;( i<urlsCompiledIn.length && client == null );i++) {
+      IOR = NzdlIORs.getIORfromURL(urlsCompiledIn[i]);
+      client = attemptToInitialise(_args, null,IOR);
+      if (client != null)
+    result.put(IOR,client);
+    }
+    
+    // the knownIORs is the last resort
+    IOR = NzdlIORs.getFirstValid();
+    client = attemptToInitialise(_args, null, IOR);
+    if (client != null)
+      result.put(IOR,client);
+    
+    return result;    
   }
 
@@ -328 +395 @@
     String ior = null;
     if (file == null || file.equals(""))
-      return "";
+      file = IORFileName;
     file = file.trim();
     try  {
@@ -395 +462 @@
       return null;
     }
+    return nzdl;
+  }
+  
+  static public NzdlService createNzdlService(String [] _args, 
+                          Properties _props, 
+                          String _URL,
+                          String _filename,
+                          String _IOR) {
+    if (_props == null)
+      _props = System.getProperties();
+
+    NzdlService nzdl = null;
+    
+    if (doMultiple)
+      nzdl = new NzdlMultiWayWrapper(_args,_props,_URL,_filename,_IOR);
+    else
+      nzdl = findIOR(_args,_props,_URL,_filename,_IOR);
+    
     if (saveDocs)
       nzdl = new NzdlDocSaveWrapper(nzdl);
-
+    
     if (logAfter)
       nzdl = new NzdlLogWrapper(nzdl, "log.file.after.cache", "AFTER: ");
-
+    
     if (caching)
       nzdl = new NzdlCacheWrapper(nzdl);
@@ -406 +491 @@
     if (logBefore)
       nzdl = new NzdlLogWrapper(nzdl, "log.file.before.cache", "BEFORE: ");
+    
     return nzdl;
   }
-  
+    
   /**
    * Write the System properties to a file called "System.properties" in