[Mulgara-svn] r1271 - trunk/src/jar/server/java/org/mulgara/server

[pag at mulgara.org]

Author: pag
Date: 2008-09-25 12:14:28 -0700 (Thu, 25 Sep 2008)
New Revision: 1271

Modified:
   trunk/src/jar/server/java/org/mulgara/server/EmbeddedMulgaraOptionParser.java
   trunk/src/jar/server/java/org/mulgara/server/EmbeddedMulgaraServer.java
Log:
Added command line arguments for setting the RMI peer port

Modified: trunk/src/jar/server/java/org/mulgara/server/EmbeddedMulgaraOptionParser.java
===================================================================
--- trunk/src/jar/server/java/org/mulgara/server/EmbeddedMulgaraOptionParser.java	2008-09-25 19:14:02 UTC (rev 1270)
+++ trunk/src/jar/server/java/org/mulgara/server/EmbeddedMulgaraOptionParser.java	2008-09-25 19:14:28 UTC (rev 1271)
@@ -72,6 +72,9 @@
   /** option to change to the port the RMI registry listens on */
   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");
+
   /** option to change the port the server is bound to */
   public final static Option PORT = new StringOption('p', "port");
 
@@ -117,6 +120,7 @@
     addOption(PORT);
     addOption(NO_RMI);
     addOption(RMI_PORT);
+    addOption(RMI_CLIENT_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-09-25 19:14:02 UTC (rev 1270)
+++ trunk/src/jar/server/java/org/mulgara/server/EmbeddedMulgaraServer.java	2008-09-25 19:14:28 UTC (rev 1271)
@@ -50,6 +50,7 @@
 import org.mulgara.server.SessionFactory;
 import org.mulgara.store.StoreException;
 import org.mulgara.store.xa.SimpleXAResourceException;
+import org.mulgara.util.Rmi;
 import org.mulgara.util.TempDir;
 
 import static org.mulgara.server.ServerMBean.ServerState;
@@ -540,6 +541,10 @@
           ServerInfo.setBoundHostname(configHost);
         }
 
+        // set up the client peer port in RMI
+        Integer rmiClientPort = (Integer)parser.getOptionValue(EmbeddedMulgaraOptionParser.RMI_CLIENT_PORT);
+        if (rmiClientPort != null) Rmi.setDefaultPort(rmiClientPort);
+
         // set the port on which the RMI registry will be created
         String rmiPortStr = (String)parser.getOptionValue(EmbeddedMulgaraOptionParser.RMI_PORT);
         int rmiPort = (rmiPortStr != null) ? Integer.parseInt(rmiPortStr) : mulgaraConfig.getRMIPort();
@@ -724,7 +729,7 @@
 
     // only set the security policy if a RMI registry has started
     if (startedLocalRMIRegistry) {
-      if (System.getProperty("java.security.policy") == null) {
+      if (System.getProperty(SECURITY_POLICY_PROP) == null) {
         if (log.isDebugEnabled()) log.debug("Started local RMI registry -> setting security policy");
 
         URL mulgaraSecurityPolicyURL = ClassLoader.getSystemResource(RMI_SECURITY_POLICY_PATH);
@@ -769,6 +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("-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 +