Moving to net.open-esb
Set RMI Port to connector port paramter value Add flag to enable getter invokemaster
parent
563424ac16
commit
be71b2f55e
|
@ -15,7 +15,7 @@
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>open-esb</groupId>
|
<groupId>net.open-esb</groupId>
|
||||||
<artifactId>framework-core</artifactId>
|
<artifactId>framework-core</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|
|
@ -64,10 +64,9 @@ public class JSEJBIFramework
|
||||||
public static final String CONNECTOR_PORT = "connector.port";
|
public static final String CONNECTOR_PORT = "connector.port";
|
||||||
|
|
||||||
/** Configuration defaults. */
|
/** Configuration defaults. */
|
||||||
private static final String DEFAULT_INSTALL_ROOT =
|
private static final String DEFAULT_INSTALL_ROOT = System.getProperty("user.dir");
|
||||||
System.getProperty("user.dir");
|
private static final String DEFAULT_INSTANCE_NAME = "server";
|
||||||
private static final String DEFAULT_INSTANCE_NAME =
|
private static final String DEFAULT_CONNECTOR_PORT = "8699";
|
||||||
"server";
|
|
||||||
|
|
||||||
private JSEPlatformContext mPlatformContext;
|
private JSEPlatformContext mPlatformContext;
|
||||||
private boolean mLoaded;
|
private boolean mLoaded;
|
||||||
|
@ -86,7 +85,8 @@ public class JSEJBIFramework
|
||||||
mEnvironment = environment;
|
mEnvironment = environment;
|
||||||
mPlatformContext = new JSEPlatformContext(
|
mPlatformContext = new JSEPlatformContext(
|
||||||
mEnvironment.getProperty(INSTANCE_NAME, DEFAULT_INSTANCE_NAME),
|
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
|
/** Load the JBI framework with the specified environment. When this method
|
||||||
|
|
|
@ -51,14 +51,16 @@ public class JSEPlatformContext implements com.sun.jbi.platform.PlatformContext
|
||||||
private String mInstanceName;
|
private String mInstanceName;
|
||||||
private String mInstanceRoot;
|
private String mInstanceRoot;
|
||||||
private String mInstallRoot;
|
private String mInstallRoot;
|
||||||
|
private String mConnectorPort;
|
||||||
private InitialContext mNamingContext;
|
private InitialContext mNamingContext;
|
||||||
private Logger mLog = Logger.getLogger(getClass().getPackage().getName());
|
private Logger mLog = Logger.getLogger(getClass().getPackage().getName());
|
||||||
|
|
||||||
public JSEPlatformContext(String instanceName, String installRoot)
|
public JSEPlatformContext(String instanceName, String installRoot, String connectorPort)
|
||||||
{
|
{
|
||||||
mInstanceName = instanceName;
|
mInstanceName = instanceName;
|
||||||
mInstallRoot = installRoot;
|
mInstallRoot = installRoot;
|
||||||
mInstanceRoot = installRoot + File.separator + instanceName;
|
mInstanceRoot = installRoot + File.separator + instanceName;
|
||||||
|
mConnectorPort = connectorPort;
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
@ -111,7 +113,7 @@ public class JSEPlatformContext implements com.sun.jbi.platform.PlatformContext
|
||||||
*/
|
*/
|
||||||
public boolean isAdminServer()
|
public boolean isAdminServer()
|
||||||
{
|
{
|
||||||
return false;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -261,7 +263,7 @@ public class JSEPlatformContext implements com.sun.jbi.platform.PlatformContext
|
||||||
*/
|
*/
|
||||||
public String getJmxRmiPort()
|
public String getJmxRmiPort()
|
||||||
{
|
{
|
||||||
return null;
|
return mConnectorPort;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -77,6 +77,7 @@ echo ""
|
||||||
# Execute the JVM in the foreground
|
# Execute the JVM in the foreground
|
||||||
"$JAVA" $JAVA_OPTS \
|
"$JAVA" $JAVA_OPTS \
|
||||||
-Djava.util.logging.config.file=$OPENESB_HOME/config/logger.properties \
|
-Djava.util.logging.config.file=$OPENESB_HOME/config/logger.properties \
|
||||||
|
-Djmx.invoke.getters=true \
|
||||||
-Dinstall.root=$OPENESB_HOME \
|
-Dinstall.root=$OPENESB_HOME \
|
||||||
-jar "$OPENESB_BOOT_CLASSPATH" \
|
-jar "$OPENESB_BOOT_CLASSPATH" \
|
||||||
"$@"
|
"$@"
|
||||||
|
|
26
pom.xml
26
pom.xml
|
@ -46,7 +46,7 @@
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<!-- OpenESB Core -->
|
<!-- OpenESB Core -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>open-esb</groupId>
|
<groupId>net.open-esb</groupId>
|
||||||
<artifactId>framework-core</artifactId>
|
<artifactId>framework-core</artifactId>
|
||||||
<version>${openesb.version}</version>
|
<version>${openesb.version}</version>
|
||||||
<exclusions>
|
<exclusions>
|
||||||
|
@ -58,28 +58,4 @@
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
</dependencyManagement>
|
</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>
|
</project>
|
||||||
|
|
Loading…
Reference in New Issue