[jboss-cvs] JBossAS SVN: r91001 - in projects/jboss-jca/trunk: sjc/src/main/java/org/jboss/jca/sjc and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jul 9 09:34:58 EDT 2009
Author: jesper.pedersen
Date: 2009-07-09 09:34:57 -0400 (Thu, 09 Jul 2009)
New Revision: 91001
Added:
projects/jboss-jca/trunk/standalone/src/main/resources/run.bat
Modified:
projects/jboss-jca/trunk/doc/userguide/en/modules/running.xml
projects/jboss-jca/trunk/sjc/src/main/java/org/jboss/jca/sjc/Main.java
projects/jboss-jca/trunk/sjc/src/main/resources/boot.xml
projects/jboss-jca/trunk/sjc/src/main/resources/run.bat
projects/jboss-jca/trunk/sjc/src/main/resources/run.sh
projects/jboss-jca/trunk/standalone/build.xml
projects/jboss-jca/trunk/standalone/src/main/java/org/jboss/jca/standalone/Main.java
projects/jboss-jca/trunk/standalone/src/main/resources/bootstrap/naming.xml
projects/jboss-jca/trunk/standalone/src/main/resources/run.sh
Log:
[JBJCA-110] Use remotable POJO naming server
Modified: projects/jboss-jca/trunk/doc/userguide/en/modules/running.xml
===================================================================
--- projects/jboss-jca/trunk/doc/userguide/en/modules/running.xml 2009-07-09 13:19:56 UTC (rev 91000)
+++ projects/jboss-jca/trunk/doc/userguide/en/modules/running.xml 2009-07-09 13:34:57 UTC (rev 91001)
@@ -25,6 +25,12 @@
<para>on Windows.</para>
+ <para>The command takes an optional -b argument to define the binding address of the naming server</para>
+
+ <programlisting>
+./run.sh -b 192.168.0.199
+ </programlisting>
+
<para>Once the container has started you should see a log entry like</para>
<programlisting>
Modified: projects/jboss-jca/trunk/sjc/src/main/java/org/jboss/jca/sjc/Main.java
===================================================================
--- projects/jboss-jca/trunk/sjc/src/main/java/org/jboss/jca/sjc/Main.java 2009-07-09 13:19:56 UTC (rev 91000)
+++ projects/jboss-jca/trunk/sjc/src/main/java/org/jboss/jca/sjc/Main.java 2009-07-09 13:34:57 UTC (rev 91001)
@@ -99,6 +99,17 @@
SecurityActions.setSystemProperty("jboss.jca.home", root.getAbsolutePath());
}
+ if (args != null && args.length > 0)
+ {
+ for (int i = 0; i < args.length; i++)
+ {
+ if ("-b".equals(args[i]))
+ {
+ SecurityActions.setSystemProperty("jboss.jca.bindaddress", args[++i]);
+ }
+ }
+ }
+
File libDirectory = new File(root, "/lib/");
File configDirectory = new File(root, "/config/");
File deployDirectory = new File(root, "/deploy/");
Modified: projects/jboss-jca/trunk/sjc/src/main/resources/boot.xml
===================================================================
--- projects/jboss-jca/trunk/sjc/src/main/resources/boot.xml 2009-07-09 13:19:56 UTC (rev 91000)
+++ projects/jboss-jca/trunk/sjc/src/main/resources/boot.xml 2009-07-09 13:34:57 UTC (rev 91001)
@@ -4,7 +4,50 @@
<bean name="LogBridgeHandler" class="org.jboss.logbridge.LogBridgeHandler"/>
<!-- Naming -->
- <bean name="NamingServer" class="org.jnp.server.SingletonNamingServer"/>
+ <bean name="LookupPool">
+ <constructor factoryMethod="newFixedThreadPool"
+ factoryClass="java.util.concurrent.Executors">
+ <parameter>2</parameter>
+ </constructor>
+ </bean>
+
+ <bean name="NamingBeanImpl" class="org.jnp.server.NamingBeanImpl">
+ <!-- Install this bean as the global JVM NamingServer -->
+ <property name="installGlobalService">true</property>
+
+ <property name="useGlobalService">false</property>
+ </bean>
+
+ <bean name="NamingServer" class="org.jnp.server.Main">
+ <property name="namingInfo"><inject bean="NamingBeanImpl"/></property>
+
+ <!-- The call by value mode. true if all lookups are unmarshalled using
+ the caller's TCL, false if in VM lookups return the value by reference.
+ -->
+ <property name="callByValue">false</property>
+
+ <!-- The listening port for the bootstrap JNP service. Set this to -1
+ to run the NamingService without the JNP invoker listening port.
+ -->
+ <property name="port">1099</property>
+
+ <!-- The bootstrap JNP server bind address. This also sets the default
+ RMI service bind address. Empty == all addresses
+ -->
+ <property name="bindAddress">${jboss.jca.bindaddress:localhost}</property>
+
+ <!-- The port of the RMI naming service, 0 == anonymous -->
+ <property name="rmiPort">0</property>
+
+ <!-- The RMI service bind address. Empty == all addresses -->
+ <property name="rmiBindAddress">${jboss.jca.bindaddress:localhost}</property>
+
+ <!-- Set the java.rmi.server.hostname system property to rmiBindAddress -->
+ <property name="enableRmiServerHostname">true</property>
+
+ <!-- The thread pool service used to control the bootstrap lookups -->
+ <property name="lookupExector"><inject bean="LookupPool"/></property>
+ </bean>
<!-- JMX -->
<bean name="JMX" class="org.jboss.jca.sjc.hack.JMX"/>
Modified: projects/jboss-jca/trunk/sjc/src/main/resources/run.bat
===================================================================
--- projects/jboss-jca/trunk/sjc/src/main/resources/run.bat 2009-07-09 13:19:56 UTC (rev 91000)
+++ projects/jboss-jca/trunk/sjc/src/main/resources/run.bat 2009-07-09 13:34:57 UTC (rev 91001)
@@ -63,7 +63,7 @@
:RESTART
"%JAVA%" %JAVA_OPTS% ^
-Djava.endorsed.dirs="%JBOSS_JCA_ENDORSED_DIRS%" ^
- -jar jboss-jca-sjc.jar
+ -jar jboss-jca-sjc.jar %*
if ERRORLEVEL 10 goto RESTART
Modified: projects/jboss-jca/trunk/sjc/src/main/resources/run.sh
===================================================================
--- projects/jboss-jca/trunk/sjc/src/main/resources/run.sh 2009-07-09 13:19:56 UTC (rev 91000)
+++ projects/jboss-jca/trunk/sjc/src/main/resources/run.sh 2009-07-09 13:34:57 UTC (rev 91001)
@@ -48,4 +48,4 @@
# Start JBoss JCA
"$JAVA" $JAVA_OPTS \
-Djava.endorsed.dirs="$JBOSS_JCA_ENDORSED_DIRS" \
- -jar jboss-jca-sjc.jar
+ -jar jboss-jca-sjc.jar "$@"
Modified: projects/jboss-jca/trunk/standalone/build.xml
===================================================================
--- projects/jboss-jca/trunk/standalone/build.xml 2009-07-09 13:19:56 UTC (rev 91000)
+++ projects/jboss-jca/trunk/standalone/build.xml 2009-07-09 13:34:57 UTC (rev 91001)
@@ -91,6 +91,7 @@
<copy todir="${target.dir}/standalone/bin">
<fileset dir="src/main/resources/">
<include name="**/*.sh"/>
+ <include name="**/*.bat"/>
</fileset>
</copy>
Modified: projects/jboss-jca/trunk/standalone/src/main/java/org/jboss/jca/standalone/Main.java
===================================================================
--- projects/jboss-jca/trunk/standalone/src/main/java/org/jboss/jca/standalone/Main.java 2009-07-09 13:19:56 UTC (rev 91000)
+++ projects/jboss-jca/trunk/standalone/src/main/java/org/jboss/jca/standalone/Main.java 2009-07-09 13:34:57 UTC (rev 91001)
@@ -73,6 +73,17 @@
root = new File(new URI(home.substring(0, home.lastIndexOf("bin"))));
}
+ if (args != null && args.length > 0)
+ {
+ for (int i = 0; i < args.length; i++)
+ {
+ if ("-b".equals(args[i]))
+ {
+ SecurityActions.setSystemProperty("jboss.jca.bindaddress", args[++i]);
+ }
+ }
+ }
+
File libDirectory = new File(root, "/lib/");
File configDirectory = new File(root, "/server/jca/conf/");
URL deployDirectory = new File(root, "/server/jca/deploy/").toURI().toURL();
Modified: projects/jboss-jca/trunk/standalone/src/main/resources/bootstrap/naming.xml
===================================================================
--- projects/jboss-jca/trunk/standalone/src/main/resources/bootstrap/naming.xml 2009-07-09 13:19:56 UTC (rev 91000)
+++ projects/jboss-jca/trunk/standalone/src/main/resources/bootstrap/naming.xml 2009-07-09 13:34:57 UTC (rev 91001)
@@ -12,6 +12,49 @@
</classloader>
<!-- Naming -->
- <bean name="NamingServer" class="org.jnp.server.SingletonNamingServer"/>
+ <bean name="LookupPool">
+ <constructor factoryMethod="newFixedThreadPool"
+ factoryClass="java.util.concurrent.Executors">
+ <parameter>2</parameter>
+ </constructor>
+ </bean>
+ <bean name="NamingBeanImpl" class="org.jnp.server.NamingBeanImpl">
+ <!-- Install this bean as the global JVM NamingServer -->
+ <property name="installGlobalService">true</property>
+
+ <property name="useGlobalService">false</property>
+ </bean>
+
+ <bean name="NamingServer" class="org.jnp.server.Main">
+ <property name="namingInfo"><inject bean="NamingBeanImpl"/></property>
+
+ <!-- The call by value mode. true if all lookups are unmarshalled using
+ the caller's TCL, false if in VM lookups return the value by reference.
+ -->
+ <property name="callByValue">false</property>
+
+ <!-- The listening port for the bootstrap JNP service. Set this to -1
+ to run the NamingService without the JNP invoker listening port.
+ -->
+ <property name="port">1099</property>
+
+ <!-- The bootstrap JNP server bind address. This also sets the default
+ RMI service bind address. Empty == all addresses
+ -->
+ <property name="bindAddress">${jboss.jca.bindaddress:localhost}</property>
+
+ <!-- The port of the RMI naming service, 0 == anonymous -->
+ <property name="rmiPort">0</property>
+
+ <!-- The RMI service bind address. Empty == all addresses -->
+ <property name="rmiBindAddress">${jboss.jca.bindaddress:localhost}</property>
+
+ <!-- Set the java.rmi.server.hostname system property to rmiBindAddress -->
+ <property name="enableRmiServerHostname">true</property>
+
+ <!-- The thread pool service used to control the bootstrap lookups -->
+ <property name="lookupExector"><inject bean="LookupPool"/></property>
+ </bean>
+
</deployment>
Added: projects/jboss-jca/trunk/standalone/src/main/resources/run.bat
===================================================================
--- projects/jboss-jca/trunk/standalone/src/main/resources/run.bat (rev 0)
+++ projects/jboss-jca/trunk/standalone/src/main/resources/run.bat 2009-07-09 13:34:57 UTC (rev 91001)
@@ -0,0 +1,73 @@
+ at echo off
+rem -------------------------------------------------------------------------
+rem JBoss JCA Script for Windows
+rem -------------------------------------------------------------------------
+
+rem $Id: $
+
+ at if not "%ECHO%" == "" echo %ECHO%
+ at if "%OS%" == "Windows_NT" setlocal
+
+if "%OS%" == "Windows_NT" (
+ set "DIRNAME=%~dp0%"
+) else (
+ set DIRNAME=.\
+)
+
+pushd %DIRNAME%..
+if "x%JBOSS_JCA_HOME%" == "x" (
+ set "JBOSS_JCA_HOME=%CD%"
+)
+popd
+
+set DIRNAME=
+
+if "%OS%" == "Windows_NT" (
+ set "PROGNAME=%~nx0%"
+) else (
+ set "PROGNAME=run.bat"
+)
+
+if "x%JAVA_HOME%" == "x" (
+ set JAVA=java
+ echo JAVA_HOME is not set. Unexpected results may occur.
+ echo Set JAVA_HOME to the directory of your local JDK to avoid this message.
+) else (
+ set "JAVA=%JAVA_HOME%\bin\java"
+)
+
+rem Setup JBoss specific properties
+
+rem Setup the java endorsed dirs
+set JBOSS_JCA_ENDORSED_DIRS=%JBOSS_JCA_HOME%\lib\endorsed
+
+if "x%JAVA_OPTS%" == "x" (
+ set "JAVA_OPTS=-Xmx512m"
+) else (
+ set "JAVA_OPTS=-Xmx512m %JAVA_OPTS%"
+)
+
+echo ===============================================================================
+echo.
+echo JBoss JCA
+echo.
+echo JBOSS_JCA_HOME: %JBOSS_HOME%
+echo.
+echo JAVA: %JAVA%
+echo.
+echo JAVA_OPTS: %JAVA_OPTS%
+echo.
+echo ===============================================================================
+echo.
+
+:RESTART
+"%JAVA%" %JAVA_OPTS% ^
+ -Djava.endorsed.dirs="%JBOSS_JCA_ENDORSED_DIRS%" ^
+ -jar jboss-jca-standalone.jar %*
+
+if ERRORLEVEL 10 goto RESTART
+
+:END
+if "x%NOPAUSE%" == "x" pause
+
+:END_NO_PAUSE
Modified: projects/jboss-jca/trunk/standalone/src/main/resources/run.sh
===================================================================
--- projects/jboss-jca/trunk/standalone/src/main/resources/run.sh 2009-07-09 13:19:56 UTC (rev 91000)
+++ projects/jboss-jca/trunk/standalone/src/main/resources/run.sh 2009-07-09 13:34:57 UTC (rev 91001)
@@ -48,4 +48,4 @@
# Start JBoss JCA
"$JAVA" $JAVA_OPTS \
-Djava.endorsed.dirs="$JBOSS_JCA_ENDORSED_DIRS" \
- -jar jboss-jca-standalone.jar
+ -jar jboss-jca-standalone.jar "$@"
More information about the jboss-cvs-commits
mailing list