From be71b2f55ee649abad88262c5d9693ed2129ced2 Mon Sep 17 00:00:00 2001
From: David BRASSELY <brasseld@gmail.com>
Date: Tue, 22 Oct 2013 13:44:26 +0200
Subject: [PATCH] Moving to net.open-esb Set RMI Port to connector port
 paramter value Add flag to enable getter invoke

---
 openesb-standalone-framework/pom.xml          |  2 +-
 .../standalone/framework/JSEJBIFramework.java | 10 +++----
 .../framework/JSEPlatformContext.java         |  8 +++---
 .../src/main/resources/bin/openesb.sh         |  1 +
 pom.xml                                       | 26 +------------------
 5 files changed, 13 insertions(+), 34 deletions(-)

diff --git a/openesb-standalone-framework/pom.xml b/openesb-standalone-framework/pom.xml
index 6cc2416..ea5d179 100644
--- a/openesb-standalone-framework/pom.xml
+++ b/openesb-standalone-framework/pom.xml
@@ -15,7 +15,7 @@
     
     <dependencies>
         <dependency>
-            <groupId>open-esb</groupId>
+            <groupId>net.open-esb</groupId>
             <artifactId>framework-core</artifactId>
         </dependency>
         <dependency>
diff --git a/openesb-standalone-framework/src/main/java/net/openesb/standalone/framework/JSEJBIFramework.java b/openesb-standalone-framework/src/main/java/net/openesb/standalone/framework/JSEJBIFramework.java
index 1725397..ccea677 100644
--- a/openesb-standalone-framework/src/main/java/net/openesb/standalone/framework/JSEJBIFramework.java
+++ b/openesb-standalone-framework/src/main/java/net/openesb/standalone/framework/JSEJBIFramework.java
@@ -64,10 +64,9 @@ public class JSEJBIFramework
     public static final String CONNECTOR_PORT = "connector.port";
     
     /** Configuration defaults. */
-    private static final String DEFAULT_INSTALL_ROOT =
-            System.getProperty("user.dir");
-    private static final String DEFAULT_INSTANCE_NAME = 
-            "server";
+    private static final String DEFAULT_INSTALL_ROOT = System.getProperty("user.dir");
+    private static final String DEFAULT_INSTANCE_NAME = "server";
+    private static final String DEFAULT_CONNECTOR_PORT = "8699";
     
     private JSEPlatformContext  mPlatformContext;
     private boolean             mLoaded;
@@ -86,7 +85,8 @@ public class JSEJBIFramework
         mEnvironment = environment;
         mPlatformContext = new JSEPlatformContext(
                 mEnvironment.getProperty(INSTANCE_NAME, DEFAULT_INSTANCE_NAME),
-                mEnvironment.getProperty(INSTALL_ROOT, DEFAULT_INSTALL_ROOT));
+                mEnvironment.getProperty(INSTALL_ROOT, DEFAULT_INSTALL_ROOT),
+                mEnvironment.getProperty(CONNECTOR_PORT, DEFAULT_CONNECTOR_PORT));
     }
     
     /** Load the JBI framework with the specified environment.  When this method
diff --git a/openesb-standalone-framework/src/main/java/net/openesb/standalone/framework/JSEPlatformContext.java b/openesb-standalone-framework/src/main/java/net/openesb/standalone/framework/JSEPlatformContext.java
index bf04c58..d123b25 100644
--- a/openesb-standalone-framework/src/main/java/net/openesb/standalone/framework/JSEPlatformContext.java
+++ b/openesb-standalone-framework/src/main/java/net/openesb/standalone/framework/JSEPlatformContext.java
@@ -51,14 +51,16 @@ public class JSEPlatformContext implements com.sun.jbi.platform.PlatformContext
     private String          mInstanceName;
     private String          mInstanceRoot;
     private String          mInstallRoot;
+    private String          mConnectorPort;
     private InitialContext  mNamingContext;
     private Logger          mLog = Logger.getLogger(getClass().getPackage().getName());
     
-    public JSEPlatformContext(String instanceName, String installRoot)
+    public JSEPlatformContext(String instanceName, String installRoot, String connectorPort)
     {
         mInstanceName = instanceName;
         mInstallRoot  = installRoot;
         mInstanceRoot = installRoot + File.separator + instanceName;
+        mConnectorPort = connectorPort;
         
         try
         {
@@ -111,7 +113,7 @@ public class JSEPlatformContext implements com.sun.jbi.platform.PlatformContext
      */
     public boolean isAdminServer()
     {
-        return false;
+        return true;
     }
     
     /**
@@ -261,7 +263,7 @@ public class JSEPlatformContext implements com.sun.jbi.platform.PlatformContext
      */
     public String getJmxRmiPort()
     {
-        return null;
+        return mConnectorPort;
     }
     
     /**
diff --git a/openesb-standalone-packaging/src/main/resources/bin/openesb.sh b/openesb-standalone-packaging/src/main/resources/bin/openesb.sh
index ed1c497..9789302 100644
--- a/openesb-standalone-packaging/src/main/resources/bin/openesb.sh
+++ b/openesb-standalone-packaging/src/main/resources/bin/openesb.sh
@@ -77,6 +77,7 @@ echo ""
 # Execute the JVM in the foreground
 "$JAVA" $JAVA_OPTS \
         -Djava.util.logging.config.file=$OPENESB_HOME/config/logger.properties \
+        -Djmx.invoke.getters=true \
         -Dinstall.root=$OPENESB_HOME \
         -jar "$OPENESB_BOOT_CLASSPATH" \
         "$@"
diff --git a/pom.xml b/pom.xml
index 7eaaaf8..6a2d9f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,7 +46,7 @@
         <dependencies>
             <!-- OpenESB Core -->
             <dependency>
-                <groupId>open-esb</groupId>
+                <groupId>net.open-esb</groupId>
                 <artifactId>framework-core</artifactId>
                 <version>${openesb.version}</version>
                 <exclusions>
@@ -58,28 +58,4 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
-
-    <!-- This part should be in the parent POM -->
-    <repositories>
-        <repository>
-            <id>openesb-snapshot</id>
-            <url>http://openesb-dev.org:8081/nexus/content/repositories/openesb-snapshot/</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>openesb-release</id>
-            <url>http://openesb-dev.org:8081/nexus/content/repositories/openesb-release/</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
 </project>