[Mulgara-svn] r1298 - in trunk/src/jar: server/java/org/mulgara/server util/java/org/mulgara/util

[pag at mulgara.org]

Author: pag
Date: 2008-10-08 15:40:03 -0700 (Wed, 08 Oct 2008)
New Revision: 1298

Modified:
   trunk/src/jar/server/java/org/mulgara/server/EmbeddedMulgaraOptionParser.java
   trunk/src/jar/server/java/org/mulgara/server/EmbeddedMulgaraServer.java
   trunk/src/jar/util/java/org/mulgara/util/Rmi.java
Log:
Changed the RMI peer port option name to 'objectPort' in both the system definition and the command line argument

Modified: trunk/src/jar/server/java/org/mulgara/server/EmbeddedMulgaraOptionParser.java
===================================================================
--- trunk/src/jar/server/java/org/mulgara/server/EmbeddedMulgaraOptionParser.java	2008-10-06 22:18:50 UTC (rev 1297)
+++ trunk/src/jar/server/java/org/mulgara/server/EmbeddedMulgaraOptionParser.java	2008-10-08 22:40:03 UTC (rev 1298)
@@ -73,7 +73,7 @@
   public final static Option RMI_PORT = new StringOption('r', "rmiport");
 
   /** option to change to the peer client port for RMI */
-  public final static Option RMI_CLIENT_PORT = new IntegerOption('t', "rmiclientport");
+  public final static Option RMI_OBJECT_PORT = new IntegerOption('t', "rmiobjectport");
 
   /** option to change the port the server is bound to */
   public final static Option PORT = new StringOption('p', "port");
@@ -120,7 +120,7 @@
     addOption(PORT);
     addOption(NO_RMI);
     addOption(RMI_PORT);
-    addOption(RMI_CLIENT_PORT);
+    addOption(RMI_OBJECT_PORT);
     addOption(SERVER_NAME);
     addOption(PERSISTENCE_PATH);
     addOption(SMTP_SERVER);

Modified: trunk/src/jar/server/java/org/mulgara/server/EmbeddedMulgaraServer.java
===================================================================
--- trunk/src/jar/server/java/org/mulgara/server/EmbeddedMulgaraServer.java	2008-10-06 22:18:50 UTC (rev 1297)
+++ trunk/src/jar/server/java/org/mulgara/server/EmbeddedMulgaraServer.java	2008-10-08 22:40:03 UTC (rev 1298)
@@ -542,8 +542,8 @@
         }
 
         // set up the client peer port in RMI
-        Integer rmiClientPort = (Integer)parser.getOptionValue(EmbeddedMulgaraOptionParser.RMI_CLIENT_PORT);
-        if (rmiClientPort != null) Rmi.setDefaultPort(rmiClientPort);
+        Integer rmiObjectPort = (Integer)parser.getOptionValue(EmbeddedMulgaraOptionParser.RMI_OBJECT_PORT);
+        if (rmiObjectPort != null) Rmi.setDefaultPort(rmiObjectPort);
 
         // set the port on which the RMI registry will be created
         String rmiPortStr = (String)parser.getOptionValue(EmbeddedMulgaraOptionParser.RMI_PORT);
@@ -774,7 +774,7 @@
     usage.append("-o, --httphost      the hostname for HTTP requests" + eol);
     usage.append("-p, --port          the port for HTTP requests" + eol);
     usage.append("-r, --rmiport       the RMI registry port" + eol);
-    usage.append("-t, --rmiclientport the RMI client peer port" + eol);
+    usage.append("-t, --rmiobjectport the RMI peer port for objects" + eol);
     usage.append("-s, --servername    the (RMI) name of the server" + eol);
     usage.append("-a, --path          the path server data will persist to, specifying " + eol +
         "                    '.' or 'temp' will use the current working directory " + eol +

Modified: trunk/src/jar/util/java/org/mulgara/util/Rmi.java
===================================================================
--- trunk/src/jar/util/java/org/mulgara/util/Rmi.java	2008-10-06 22:18:50 UTC (rev 1297)
+++ trunk/src/jar/util/java/org/mulgara/util/Rmi.java	2008-10-08 22:40:03 UTC (rev 1298)
@@ -38,14 +38,14 @@
   /** Generation UID */
   private static final long serialVersionUID = -8087526398171872888L;
 
-  public static final String CLIENT_PEER_PORT = "mulgara.rmi.peerPort";
+  public static final String CLIENT_OBJECT_PORT = "mulgara.rmi.objectPort";
 
   /** The default port used for exporting objects. */
   protected static int defaultPort = 0;
 
   // Check if a system property has been set for the default port
   static {
-    String val = System.getProperty(CLIENT_PEER_PORT);
+    String val = System.getProperty(CLIENT_OBJECT_PORT);
     if (val != null) {
       try {
         defaultPort = Integer.parseInt(val);