[jboss-cvs] JBoss Messaging SVN: r2773 - in trunk: docs/examples/http and 8 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jun 12 09:31:30 EDT 2007
Author: sergeypk
Date: 2007-06-12 09:31:30 -0400 (Tue, 12 Jun 2007)
New Revision: 2773
Added:
trunk/src/etc/remoting/
trunk/src/etc/remoting/remoting-bisocket-service.xml
trunk/src/etc/remoting/remoting-http-service.xml
trunk/src/etc/remoting/remoting-sslbisocket-service.xml
Removed:
trunk/src/etc/server/default/deploy/remoting-service.xml
Modified:
trunk/build-messaging.xml
trunk/docs/examples/http/build.xml
trunk/docs/examples/http/etc/messaging-http-service.xml
trunk/docs/examples/secure-socket/build.xml
trunk/docs/examples/secure-socket/etc/messaging-secure-socket-service.xml
trunk/docs/userguide/en/modules/configuration.xml
trunk/docs/userguide/en/modules/installation.xml
trunk/pom.xml
trunk/tests/src/org/jboss/test/messaging/tools/jmx/ServiceContainer.java
Log:
http://jira.jboss.com/jira/browse/JBMESSAGING-861
Gathered various remoting configurations into src/etc/remoting. The default configuration is now stored in remoting-bisocket-service.xml instead of remoting-service.xml.
Modified: trunk/build-messaging.xml
===================================================================
--- trunk/build-messaging.xml 2007-06-12 10:18:00 UTC (rev 2772)
+++ trunk/build-messaging.xml 2007-06-12 13:31:30 UTC (rev 2773)
@@ -399,7 +399,7 @@
<copy todir="${build.jar}" file="${source.etc}/server/default/deploy/connection-factories-service.xml"/>
<copy todir="${build.jar}" file="${source.etc}/server/default/deploy/destinations-service.xml"/>
<copy todir="${build.jar}" file="${source.etc}/server/default/deploy/hsqldb-persistence-service.xml"/>
- <copy todir="${build.jar}" file="${source.etc}/server/default/deploy/remoting-service.xml"/>
+ <copy todir="${build.jar}" file="${source.etc}/remoting/remoting-bisocket-service.xml"/>
<copy file="${build.etc}/VERSION" toFile="${build.jar}/VERSION"/>
<copy todir="${build.jar}/xmdesc">
<fileset dir="${source.etc}/xmdesc" includes="*.xml"/>
Modified: trunk/docs/examples/http/build.xml
===================================================================
--- trunk/docs/examples/http/build.xml 2007-06-12 10:18:00 UTC (rev 2772)
+++ trunk/docs/examples/http/build.xml 2007-06-12 13:31:30 UTC (rev 2773)
@@ -73,6 +73,8 @@
</target>
<target name="deploy">
+ <copy file="../../../src/etc/remoting/remoting-http-service.xml"
+ todir="${jboss.home}/server/${jboss.configuration}/deploy"/>
<copy file="./etc/messaging-http-service.xml"
todir="${jboss.home}/server/${jboss.configuration}/deploy"/>
<antcall target="sleep"><param name="sleep.interval" value="10"/></antcall>
@@ -94,6 +96,7 @@
<target name="undeploy">
<delete file="${jboss.home}/server/${jboss.configuration}/deploy/messaging-http-service.xml" quiet="true"/>
+ <delete file="${jboss.home}/server/${jboss.configuration}/deploy/remoting-http-service.xml" quiet="true"/>
</target>
<target name="clean" depends="undeploy">
Modified: trunk/docs/examples/http/etc/messaging-http-service.xml
===================================================================
--- trunk/docs/examples/http/etc/messaging-http-service.xml 2007-06-12 10:18:00 UTC (rev 2772)
+++ trunk/docs/examples/http/etc/messaging-http-service.xml 2007-06-12 13:31:30 UTC (rev 2773)
@@ -8,28 +8,6 @@
<server>
- <mbean code="org.jboss.remoting.transport.Connector"
- name="jboss.messaging:service=Connector,transport=http"
- display-name="HTTP transport Connector">
- <attribute name="Configuration">
- <config>
- <invoker transport="http">
- <attribute name="marshaller" isParam="true">org.jboss.jms.wireformat.JMSWireFormat</attribute>
- <attribute name="unmarshaller" isParam="true">org.jboss.jms.wireformat.JMSWireFormat</attribute>
- <attribute name="dataType" isParam="true">jms</attribute>
- <attribute name="serverBindAddress">${jboss.bind.address}</attribute>
- <attribute name="serverBindPort">4458</attribute>
- <attribute name="leasePeriod">10000</attribute>
- <attribute name="callbackStore">org.jboss.remoting.callback.CallbackStore</attribute>
- <attribute name="callbackPollPeriod" isParam="true">100</attribute>
- </invoker>
- <handlers>
- <handler subsystem="JMS">org.jboss.jms.server.remoting.JMSServerInvocationHandler</handler>
- </handlers>
- </config>
- </attribute>
- </mbean>
-
<mbean code="org.jboss.jms.server.connectionfactory.ConnectionFactory"
name="jboss.messaging.destination:service=HttpConnectionFactory"
xmbean-dd="xmdesc/ConnectionFactory-xmbean.xml">
Modified: trunk/docs/examples/secure-socket/build.xml
===================================================================
--- trunk/docs/examples/secure-socket/build.xml 2007-06-12 10:18:00 UTC (rev 2772)
+++ trunk/docs/examples/secure-socket/build.xml 2007-06-12 13:31:30 UTC (rev 2773)
@@ -78,6 +78,8 @@
<target name="deploy">
<copy file="./etc/messaging.keystore"
todir="${jboss.home}/server/${jboss.configuration}/deploy/jboss-messaging.sar"/>
+ <copy file="../../../src/etc/remoting/remoting-sslbisocket-service.xml"
+ todir="${jboss.home}/server/${jboss.configuration}/deploy"/>
<copy file="./etc/messaging-secure-socket-service.xml"
todir="${jboss.home}/server/${jboss.configuration}/deploy"/>
<antcall target="sleep"><param name="sleep.interval" value="5"/></antcall>
@@ -100,6 +102,7 @@
</target>
<target name="undeploy">
+ <delete file="${jboss.home}/server/${jboss.configuration}/deploy/remoting-sslbisocket-service.xml" quiet="true"/>
<delete file="${jboss.home}/server/${jboss.configuration}/deploy/messaging-secure-socket-service.xml" quiet="true"/>
<delete file="${jboss.home}/server/${jboss.configuration}/deploy/jboss-messaging.sar/messaging.keystore" quiet="true"/>
</target>
Modified: trunk/docs/examples/secure-socket/etc/messaging-secure-socket-service.xml
===================================================================
--- trunk/docs/examples/secure-socket/etc/messaging-secure-socket-service.xml 2007-06-12 10:18:00 UTC (rev 2772)
+++ trunk/docs/examples/secure-socket/etc/messaging-secure-socket-service.xml 2007-06-12 13:31:30 UTC (rev 2773)
@@ -9,40 +9,11 @@
<server>
- <mbean code="org.jboss.remoting.transport.Connector"
- name="jboss.messaging:service=Connector,transport=SSLSocket"
- display-name="SSL Socket Transport Connector">
- <attribute name="Configuration">
- <config>
- <invoker transport="sslbisocket">
- <attribute name="marshaller" isParam="true">org.jboss.jms.wireformat.JMSWireFormat</attribute>
- <attribute name="unmarshaller" isParam="true">org.jboss.jms.wireformat.JMSWireFormat</attribute>
- <attribute name="dataType" isParam="true">jms</attribute>
- <attribute name="socket.check_connection" isParam="true">false</attribute>
- <attribute name="timeout" isParam="true">0</attribute>
- <attribute name="serverBindAddress">${jboss.bind.address}</attribute>
- <attribute name="serverBindPort">5457</attribute>
- <attribute name="leasePeriod">10000</attribute>
- <attribute name="clientSocketClass" isParam="true">org.jboss.jms.client.remoting.ClientSocketWrapper</attribute>
- <attribute name="serverSocketClass">org.jboss.jms.server.remoting.ServerSocketWrapper</attribute>
- <attribute name="numberOfRetries" isParam="true">1</attribute>
- <attribute name="numberOfCallRetries" isParam="true">1</attribute>
- <attribute name="clientMaxPoolSize" isParam="true">50</attribute>
- <attribute name="serverSocketFactory">jboss.messaging:service=ServerSocketFactory,type=SSL</attribute>
- </invoker>
- <handlers>
- <handler subsystem="JMS">org.jboss.jms.server.remoting.JMSServerInvocationHandler</handler>
- </handlers>
- </config>
- </attribute>
- <depends>jboss.messaging:service=ServerSocketFactory,type=SSL</depends>
- </mbean>
-
<mbean code="org.jboss.jms.server.connectionfactory.ConnectionFactory"
name="jboss.messaging.destination:service=SecureConnectionFactory"
xmbean-dd="xmdesc/ConnectionFactory-xmbean.xml">
<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends optional-attribute-name="Connector">jboss.messaging:service=Connector,transport=SSLSocket</depends>
+ <depends optional-attribute-name="Connector">jboss.messaging:service=Connector,transport=sslbisocket</depends>
<attribute name="JNDIBindings">
<bindings>
<binding>/SecureConnectionFactory</binding>
@@ -50,60 +21,4 @@
</attribute>
</mbean>
- <!-- This section is for custom (SSL) server socket factory -->
-
- <!--
- The server socket factory mbean to be used as attribute to socket invoker (see
- serverSocketFactory attribute above for where it is used). This service provides the exact
- same API as the ServerSocketFactory, so can be set as an attribute of that type on any
- MBean requiring an ServerSocketFactory.
- -->
- <mbean code="org.jboss.remoting.security.SSLServerSocketFactoryService"
- name="jboss.messaging:service=ServerSocketFactory,type=SSL"
- display-name="SSL Server Socket Factory">
- <depends optional-attribute-name="SSLSocketBuilder"
- proxy-type="attribute">jboss.messaging:service=SocketBuilder,type=SSL</depends>
- </mbean>
-
- <!--
- This service is used to build the SSL Server socket factory. This will be where all the
- store/trust information will be set. If do not need to make any custom configurations,
- no extra attributes need to be set for the SSLSocketBuilder and just need to set the
- javax.net.ssl.keyStore and javax.net.ssl.keyStorePassword system properties.
-
- This can be done by just adding something like the following to the run script for JBoss
- (this one is for run.bat):
- set JAVA_OPTS=-Djavax.net.ssl.keyStore=.keystore -Djavax.net.ssl.keyStorePassword=opensource %JAVA_OPTS%
-
- Otherwise, if want to customize the attributes for SSLSocketBuilder, will need to uncomment
- them below.
- -->
- <mbean code="org.jboss.remoting.security.SSLSocketBuilder"
- name="jboss.messaging:service=SocketBuilder,type=SSL"
- display-name="SSL Server Socket Factory Builder">
- <!--
- IMPORTANT - If making ANY customizations, this MUST be set to false.
- Otherwise, will used default settings and the following attributes will be ignored.
- -->
- <attribute name="UseSSLServerSocketFactory">false</attribute>
- <!-- This is the url string to the key store to use -->
- <attribute name="KeyStoreURL">messaging.keystore</attribute>
- <!-- The password for the key store -->
- <attribute name="KeyStorePassword">secureexample</attribute>
- <!-- The password for the keys (will use KeystorePassword if this is not set explicitly. -->
- <attribute name="KeyPassword">secureexample</attribute>
- <!-- The protocol for the SSLContext. Default is TLS. -->
- <attribute name="SecureSocketProtocol">TLS</attribute>
- <!-- The algorithm for the key manager factory. Default is SunX509. -->
- <attribute name="KeyStoreAlgorithm">SunX509</attribute>
- <!--
- The type to be used for the key store.
- Defaults to JKS. Some acceptable values are JKS (Java Keystore - Sun's keystore format),
- JCEKS (Java Cryptography Extension keystore - More secure version of JKS), and
- PKCS12 (Public-Key Cryptography Standards #12 keystore - RSA's Personal Information
- Exchange Syntax Standard). These are not case sensitive.
- -->
- <attribute name="KeyStoreType">JKS</attribute>
- </mbean>
-
</server>
Modified: trunk/docs/userguide/en/modules/configuration.xml
===================================================================
--- trunk/docs/userguide/en/modules/configuration.xml 2007-06-12 10:18:00 UTC (rev 2772)
+++ trunk/docs/userguide/en/modules/configuration.xml 2007-06-12 13:31:30 UTC (rev 2773)
@@ -21,7 +21,7 @@
Depending on the functionality provided by the services it configures, the configuration
data is distributed between
<filename>messaging-service.xml</filename>,
- <filename>remoting-service.xml</filename>,
+ <filename>remoting-bisocket-service.xml</filename>,
<filename>xxx-persistence-service.xml</filename>
(or <filename>clustered-xxx-persistence-service.xml</filename> for a clustered configuration,
more about clusterered configuration in <xref linkend="c_configuration"/>) (where xxx is the name
@@ -2230,7 +2230,7 @@
</para>
<para>
- <JBoss>/server/<YourMessagingServer>/deploy/jboss-messaging.sar/remoting-service.xml
+ <JBoss>/server/<YourMessagingServer>/deploy/jboss-messaging.sar/remoting-bisocket-service.xml
</para>
<para>
@@ -2239,7 +2239,7 @@
</para>
<para>
- You can change remoting-service.xml if you want for example use a
+ You can change remoting-bisocket-service.xml if you want for example use a
different communication port.
</para>
@@ -2251,7 +2251,7 @@
<title>ServiceBindingManager</title>
<para>If you are using the JBoss AS ServiceBindingManager to provide different servers with different port ranges, then you must make sure that the JBoss Messaging
- remoting configuration specified in the JBoss Messaging section of the ServiceBindingManager xml file exactly matches that in remoting-service.xml
+ remoting configuration specified in the JBoss Messaging section of the ServiceBindingManager xml file exactly matches that in remoting-bisocket-service.xml
</para>
<para>See the chapter on installation for a description of how to set-up the service binding manager for
Modified: trunk/docs/userguide/en/modules/installation.xml
===================================================================
--- trunk/docs/userguide/en/modules/installation.xml 2007-06-12 10:18:00 UTC (rev 2772)
+++ trunk/docs/userguide/en/modules/installation.xml 2007-06-12 13:31:30 UTC (rev 2773)
@@ -426,10 +426,10 @@
</programlisting>
- <warning>You must ensure that the config (like above) is identical to that in <literal>remoting-service.xml</literal>
+ <warning>You must ensure that the config (like above) is identical to that in <literal>remoting-bisocket-service.xml</literal>
With the exception of the actual serverBindPort which clearly must be different for each ports range.
Please note that the default JBoss Messaging service binding manager bindings in <literal>sample-bindings.xml</literal>
- shipped with JBAS 4.2.0 is out of date and you will need to copy the config from <literal>remoting-service.xml</literal>
+ shipped with JBAS 4.2.0 is out of date and you will need to copy the config from <literal>remoting-bisocket-service.xml</literal>
</warning>
<para>You should ensure that each node is configured to use a different ports range.</para>
@@ -643,10 +643,10 @@
</programlisting>
- <warning>You must ensure that the config (like above) is identical to that in <literal>remoting-service.xml</literal>
+ <warning>You must ensure that the config (like above) is identical to that in <literal>remoting-bisocket-service.xml</literal>
With the exception of the actual serverBindPort which clearly must be different for each ports range.
Please note that the default JBoss Messaging service binding manager bindings in <literal>sample-bindings.xml</literal>
- shipped with JBAS 4.2.0 is out of date and you will need to copy the config from <literal>remoting-service.xml</literal>
+ shipped with JBAS 4.2.0 is out of date and you will need to copy the config from <literal>remoting-bisocket-service.xml</literal>
</warning>
<para>You should ensure that each node is configured to use a different ports range.</para>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2007-06-12 10:18:00 UTC (rev 2772)
+++ trunk/pom.xml 2007-06-12 13:31:30 UTC (rev 2773)
@@ -65,6 +65,12 @@
<include>aop-messaging-server.xml</include>
<include>aop-messaging-client.xml</include>
</includes>
+ </resource>
+ <resource>
+ <directory>src/etc/remoting</directory>
+ <includes>
+ <include>remoting-bisocket-service.xml</include>
+ </includes>
</resource>
<resource>
<directory>src/etc/server/default/deploy</directory>
@@ -73,7 +79,6 @@
<include>connection-factories-service.xml</include>
<include>destinations-service.xml</include>
<include>hsqldb-persistence-service.xml</include>
- <include>remoting-service.xml</include>
<include>jms-ds.xml</include>
</includes>
</resource>
Added: trunk/src/etc/remoting/remoting-bisocket-service.xml
===================================================================
--- trunk/src/etc/remoting/remoting-bisocket-service.xml (rev 0)
+++ trunk/src/etc/remoting/remoting-bisocket-service.xml 2007-06-12 13:31:30 UTC (rev 2773)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Standard bisocket-based Remoting service deployment descriptor.
+
+ $Id$
+ -->
+
+<server>
+
+ <!-- Standard bisocket connector - the bisocket transport only opens connection from client->server
+ so can be used with firewalls where only outgoing connections are allowed.
+ For examples of HTTP and SSL transports see docs/examples -->
+ <mbean code="org.jboss.remoting.transport.Connector"
+ name="jboss.messaging:service=Connector,transport=bisocket"
+ display-name="Bisocket Transport Connector">
+ <attribute name="Configuration">
+ <config>
+ <invoker transport="bisocket">
+ <attribute name="marshaller" isParam="true">org.jboss.jms.wireformat.JMSWireFormat</attribute>
+ <attribute name="unmarshaller" isParam="true">org.jboss.jms.wireformat.JMSWireFormat</attribute>
+ <attribute name="dataType" isParam="true">jms</attribute>
+ <attribute name="socket.check_connection" isParam="true">false</attribute>
+ <attribute name="timeout" isParam="true">0</attribute>
+ <attribute name="serverBindAddress">${jboss.bind.address}</attribute>
+ <attribute name="serverBindPort">4457</attribute>
+ <attribute name="leasePeriod">10000</attribute>
+ <attribute name="clientSocketClass" isParam="true">org.jboss.jms.client.remoting.ClientSocketWrapper</attribute>
+ <attribute name="serverSocketClass" isParam="true">org.jboss.jms.server.remoting.ServerSocketWrapper</attribute>
+ <attribute name="numberOfRetries" isParam="true">1</attribute>
+ <attribute name="numberOfCallRetries" isParam="true">1</attribute>
+ <attribute name="clientMaxPoolSize" isParam="true">50</attribute>
+ </invoker>
+ <handlers>
+ <handler subsystem="JMS">org.jboss.jms.server.remoting.JMSServerInvocationHandler</handler>
+ </handlers>
+ </config>
+ </attribute>
+ </mbean>
+
+</server>
Property changes on: trunk/src/etc/remoting/remoting-bisocket-service.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Added: trunk/src/etc/remoting/remoting-http-service.xml
===================================================================
--- trunk/src/etc/remoting/remoting-http-service.xml (rev 0)
+++ trunk/src/etc/remoting/remoting-http-service.xml 2007-06-12 13:31:30 UTC (rev 2773)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ HTTP-based Remoting service deployment descriptor.
+
+ $Id$
+ -->
+
+<server>
+
+ <mbean code="org.jboss.remoting.transport.Connector"
+ name="jboss.messaging:service=Connector,transport=http"
+ display-name="HTTP Transport Connector">
+ <attribute name="Configuration">
+ <config>
+ <invoker transport="http">
+ <attribute name="marshaller" isParam="true">org.jboss.jms.wireformat.JMSWireFormat</attribute>
+ <attribute name="unmarshaller" isParam="true">org.jboss.jms.wireformat.JMSWireFormat</attribute>
+ <attribute name="dataType" isParam="true">jms</attribute>
+ <attribute name="serverBindAddress">${jboss.bind.address}</attribute>
+ <attribute name="serverBindPort">4458</attribute>
+ <attribute name="leasePeriod">10000</attribute>
+ <attribute name="socket.check_connection" isParam="true">false</attribute>
+ <attribute name="callbackStore">org.jboss.remoting.callback.BlockingCallbackStore</attribute>
+ <attribute name="callbackPollPeriod" isParam="true">102</attribute>
+ <attribute name="clientLeasePeriod" isParam="true">20000</attribute>
+ </invoker>
+ <handlers>
+ <handler subsystem="JMS">org.jboss.jms.server.remoting.JMSServerInvocationHandler</handler>
+ </handlers>
+ </config>
+ </attribute>
+ </mbean>
+
+</server>
Property changes on: trunk/src/etc/remoting/remoting-http-service.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Added: trunk/src/etc/remoting/remoting-sslbisocket-service.xml
===================================================================
--- trunk/src/etc/remoting/remoting-sslbisocket-service.xml (rev 0)
+++ trunk/src/etc/remoting/remoting-sslbisocket-service.xml 2007-06-12 13:31:30 UTC (rev 2773)
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ The deployment descriptor for the secure socket factory
+ service and secure connector.
+
+ $Id$
+ -->
+
+<server>
+
+ <mbean code="org.jboss.remoting.transport.Connector"
+ name="jboss.messaging:service=Connector,transport=sslbisocket"
+ display-name="SSL Bisocket Transport Connector">
+ <attribute name="Configuration">
+ <config>
+ <invoker transport="sslbisocket">
+ <attribute name="marshaller" isParam="true">org.jboss.jms.wireformat.JMSWireFormat</attribute>
+ <attribute name="unmarshaller" isParam="true">org.jboss.jms.wireformat.JMSWireFormat</attribute>
+ <attribute name="dataType" isParam="true">jms</attribute>
+ <attribute name="socket.check_connection" isParam="true">false</attribute>
+ <attribute name="timeout" isParam="true">0</attribute>
+ <attribute name="serverBindAddress">${jboss.bind.address}</attribute>
+ <attribute name="serverBindPort">5457</attribute>
+ <attribute name="leasePeriod">10000</attribute>
+ <attribute name="clientSocketClass" isParam="true">org.jboss.jms.client.remoting.ClientSocketWrapper</attribute>
+ <attribute name="serverSocketClass">org.jboss.jms.server.remoting.ServerSocketWrapper</attribute>
+ <attribute name="numberOfRetries" isParam="true">1</attribute>
+ <attribute name="numberOfCallRetries" isParam="true">1</attribute>
+ <attribute name="clientMaxPoolSize" isParam="true">50</attribute>
+ <attribute name="serverSocketFactory">jboss.messaging:service=ServerSocketFactory,type=SSL</attribute>
+ </invoker>
+ <handlers>
+ <handler subsystem="JMS">org.jboss.jms.server.remoting.JMSServerInvocationHandler</handler>
+ </handlers>
+ </config>
+ </attribute>
+ <depends>jboss.messaging:service=ServerSocketFactory,type=SSL</depends>
+ </mbean>
+
+ <!-- This section is for custom (SSL) server socket factory -->
+
+ <!--
+ The server socket factory mbean to be used as attribute to socket invoker (see
+ serverSocketFactory attribute above for where it is used). This service provides the exact
+ same API as the ServerSocketFactory, so can be set as an attribute of that type on any
+ MBean requiring an ServerSocketFactory.
+ -->
+ <mbean code="org.jboss.remoting.security.SSLServerSocketFactoryService"
+ name="jboss.messaging:service=ServerSocketFactory,type=SSL"
+ display-name="SSL Server Socket Factory">
+ <depends optional-attribute-name="SSLSocketBuilder"
+ proxy-type="attribute">jboss.messaging:service=SocketBuilder,type=SSL</depends>
+ </mbean>
+
+ <!--
+ This service is used to build the SSL Server socket factory. This will be where all the
+ store/trust information will be set. If do not need to make any custom configurations,
+ no extra attributes need to be set for the SSLSocketBuilder and just need to set the
+ javax.net.ssl.keyStore and javax.net.ssl.keyStorePassword system properties.
+
+ This can be done by just adding something like the following to the run script for JBoss
+ (this one is for run.bat):
+ set JAVA_OPTS=-Djavax.net.ssl.keyStore=.keystore -Djavax.net.ssl.keyStorePassword=opensource %JAVA_OPTS%
+
+ Otherwise, if want to customize the attributes for SSLSocketBuilder, will need to uncomment
+ them below.
+ -->
+ <mbean code="org.jboss.remoting.security.SSLSocketBuilder"
+ name="jboss.messaging:service=SocketBuilder,type=SSL"
+ display-name="SSL Server Socket Factory Builder">
+ <!--
+ IMPORTANT - If making ANY customizations, this MUST be set to false.
+ Otherwise, will used default settings and the following attributes will be ignored.
+ -->
+ <attribute name="UseSSLServerSocketFactory">false</attribute>
+ <!-- This is the url string to the key store to use -->
+ <attribute name="KeyStoreURL">messaging.keystore</attribute>
+ <!-- The password for the key store -->
+ <attribute name="KeyStorePassword">secureexample</attribute>
+ <!-- The password for the keys (will use KeystorePassword if this is not set explicitly. -->
+ <attribute name="KeyPassword">secureexample</attribute>
+ <!-- The protocol for the SSLContext. Default is TLS. -->
+ <attribute name="SecureSocketProtocol">TLS</attribute>
+ <!-- The algorithm for the key manager factory. Default is SunX509. -->
+ <attribute name="KeyStoreAlgorithm">SunX509</attribute>
+ <!--
+ The type to be used for the key store.
+ Defaults to JKS. Some acceptable values are JKS (Java Keystore - Sun's keystore format),
+ JCEKS (Java Cryptography Extension keystore - More secure version of JKS), and
+ PKCS12 (Public-Key Cryptography Standards #12 keystore - RSA's Personal Information
+ Exchange Syntax Standard). These are not case sensitive.
+ -->
+ <attribute name="KeyStoreType">JKS</attribute>
+ </mbean>
+
+</server>
Property changes on: trunk/src/etc/remoting/remoting-sslbisocket-service.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Deleted: trunk/src/etc/server/default/deploy/remoting-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/remoting-service.xml 2007-06-12 10:18:00 UTC (rev 2772)
+++ trunk/src/etc/server/default/deploy/remoting-service.xml 2007-06-12 13:31:30 UTC (rev 2773)
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Messaging Remoting service deployment descriptor.
-
- $Id$
- -->
-
-<server>
-
- <!-- Standard bisocket connector - the bisocket transport only opens connection from client->server
- so can be used with firewalls where only outgoing connections are allowed.
- For examples of HTTP and SSL transports see docs/examples -->
- <mbean code="org.jboss.remoting.transport.Connector"
- name="jboss.messaging:service=Connector,transport=bisocket"
- display-name="Bisocket transport Connector">
- <attribute name="Configuration">
- <config>
- <invoker transport="bisocket">
- <attribute name="marshaller" isParam="true">org.jboss.jms.wireformat.JMSWireFormat</attribute>
- <attribute name="unmarshaller" isParam="true">org.jboss.jms.wireformat.JMSWireFormat</attribute>
- <attribute name="dataType" isParam="true">jms</attribute>
- <attribute name="socket.check_connection" isParam="true">false</attribute>
- <attribute name="timeout" isParam="true">0</attribute>
- <attribute name="serverBindAddress">${jboss.bind.address}</attribute>
- <attribute name="serverBindPort">4457</attribute>
- <attribute name="leasePeriod">10000</attribute>
- <attribute name="clientSocketClass" isParam="true">org.jboss.jms.client.remoting.ClientSocketWrapper</attribute>
- <attribute name="serverSocketClass" isParam="true">org.jboss.jms.server.remoting.ServerSocketWrapper</attribute>
- <attribute name="numberOfRetries" isParam="true">1</attribute>
- <attribute name="numberOfCallRetries" isParam="true">1</attribute>
- <attribute name="clientMaxPoolSize" isParam="true">50</attribute>
- </invoker>
- <handlers>
- <handler subsystem="JMS">org.jboss.jms.server.remoting.JMSServerInvocationHandler</handler>
- </handlers>
- </config>
- </attribute>
- </mbean>
-
-</server>
Modified: trunk/tests/src/org/jboss/test/messaging/tools/jmx/ServiceContainer.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/jmx/ServiceContainer.java 2007-06-12 10:18:00 UTC (rev 2772)
+++ trunk/tests/src/org/jboss/test/messaging/tools/jmx/ServiceContainer.java 2007-06-12 13:31:30 UTC (rev 2773)
@@ -143,6 +143,7 @@
public static String USER_TRANSACTION_JNDI_NAME = "UserTransaction";
public static String JCA_JMS_CONNECTION_FACTORY_JNDI_NAME = "java:/JCAConnectionFactory";
+ // Must match the value in remoting-http-service.xml
public static long HTTP_CONNECTOR_CALLBACK_POLL_PERIOD = 102;
// List<ObjectName>
@@ -1326,81 +1327,53 @@
// Note that we DO NOT want the direct thread pool on the server side - since that can lead
// to deadlocks
- String params;
+ String configFileName = "remoting/remoting-" + transport + "-service.xml";
- // specific parameters per transport
- if ("http".equals(transport))
- {
- // TODO - use remoting-service.xml parameters, not these ...
-
- long clientLeasePeriod = 20000;
+ MBeanConfigurationElement connectorServiceConfig =
+ ServiceConfigHelper.loadServiceConfiguration(configFileName, "Connector");
+
+ String invokerConfig = connectorServiceConfig.getAttributeValue("Configuration");
+
+ Element invokerElement = (Element) XMLUtil
+ .stringToElement(invokerConfig)
+ .getElementsByTagName("invoker").item(0);
+
+ NodeList invokerAttributes = invokerElement.getElementsByTagName("attribute");
+
+ StringBuffer paramsBuffer = new StringBuffer();
- String marshallers = overrideMarshallers ? "" :
- "marshaller=org.jboss.jms.wireformat.JMSWireFormat&" +
- "unmarshaller=org.jboss.jms.wireformat.JMSWireFormat&";
-
- params =
- "/?" +
- marshallers +
- "socket.check_connection=false&" +
- "clientLeasePeriod=" + clientLeasePeriod +
- "&dataType=jms";
-
- params += "&callbackPollPeriod=" + HTTP_CONNECTOR_CALLBACK_POLL_PERIOD +
- "&callbackStore=org.jboss.remoting.callback.BlockingCallbackStore";
- }
- else
+ for (int i = 0; i < invokerAttributes.getLength(); i++)
{
- //socket transports
- MBeanConfigurationElement connectorServiceConfig =
- ServiceConfigHelper.loadServiceConfiguration("server/default/deploy/remoting-service.xml", "Connector");
+ Element attr = (Element) invokerAttributes.item(i);
+ if (attr.getAttribute("isParam").equals(""))
+ {
+ continue;
+ }
- String invokerConfig = connectorServiceConfig.getAttributeValue("Configuration");
-
- Element invokerConfigRoot = XMLUtil.stringToElement(invokerConfig);
- Element invokerElement = (Element) invokerConfigRoot.getElementsByTagName("invoker").item(0);
-
- NodeList invokerAttributes = invokerElement.getElementsByTagName("attribute");
-
- StringBuffer paramsBuffer = new StringBuffer();
+ String key = attr.getAttribute("name");
+ String value = attr.getTextContent().trim();
- for (int i = 0; i < invokerAttributes.getLength(); i++)
+ if (overrideMarshallers &&
+ (key.equals("marshaller") || key.equals("unmarshaller")))
{
- Element attr = (Element) invokerAttributes.item(i);
- if (attr.getAttribute("isParam").equals(""))
- {
- continue;
- }
-
- String key = attr.getAttribute("name");
- String value = attr.getTextContent().trim();
+ continue;
+ }
- if (overrideMarshallers &&
- (key.equals("marshaller") || key.equals("unmarshaller")))
- {
- continue;
- }
-
- if (paramsBuffer.length() > 0)
- {
- paramsBuffer.append('&');
- }
-
- paramsBuffer.append(key).append('=').append(value);
+ if (paramsBuffer.length() > 0)
+ {
+ paramsBuffer.append('&');
}
- params = paramsBuffer.insert(0, "/?").toString();
+ paramsBuffer.append(key).append('=').append(value);
}
-
- if ("sslbisocket".equals(transport) || "sslsocket".equals(transport))
- {
- System.setProperty("javax.net.ssl.keyStorePassword", "secureexample");
- String keyStoreFilePath = this.getClass().getResource("../../../../../../../etc/messaging.keystore").getFile();
- System.setProperty("javax.net.ssl.keyStore", keyStoreFilePath);
- }
-
+
int freePort = PortUtil.findFreePort(ipAddressOrHostName);
- return transport + "://" + ipAddressOrHostName + ":" + freePort + params;
+
+ return new StringBuffer()
+ .append(transport).append("://")
+ .append(ipAddressOrHostName).append(':').append(freePort)
+ .append("/?").append(paramsBuffer)
+ .toString();
}
private void startRemoting(ServiceAttributeOverrides attrOverrides,
More information about the jboss-cvs-commits
mailing list