svn commit: r1356074 - in /ofbiz/trunk/framework: base/config/both-containers.xml base/config/limited-containers.xml base/config/ofbiz-containers.xml base/config/rmi-containers.xml base/config/test-containers.xml service/ofbiz-component.xml

[jacopoc]

Author: jacopoc
Date: Mon Jul  2 05:55:25 2012
New Revision: 1356074

URL: http://svn.apache.org/viewvc?rev=1356074&view=rev
Log:
Moved rmi-dispatcher container definition to the service component.


Modified:
    ofbiz/trunk/framework/base/config/both-containers.xml
    ofbiz/trunk/framework/base/config/limited-containers.xml
    ofbiz/trunk/framework/base/config/ofbiz-containers.xml
    ofbiz/trunk/framework/base/config/rmi-containers.xml
    ofbiz/trunk/framework/base/config/test-containers.xml
    ofbiz/trunk/framework/service/ofbiz-component.xml

Modified: ofbiz/trunk/framework/base/config/both-containers.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/config/both-containers.xml?rev=1356074&r1=1356073&r2=1356074&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/config/both-containers.xml (original)
+++ ofbiz/trunk/framework/base/config/both-containers.xml Mon Jul  2 05:55:25 2012
@@ -22,6 +22,7 @@ under the License.
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-containers.xsd">
     <loader name="main"/>
     <loader name="pos"/>
+    <loader name="rmi"/>
     <!-- load the ofbiz component container (always first) -->
     <container name="component-container" class="org.ofbiz.base.container.ComponentContainer"/>
 
@@ -33,19 +34,4 @@ under the License.
         <property name="host" value="0.0.0.0"/>
         <property name="port" value="1099"/>
     </container>
-
-    <!-- RMI Service Dispatcher -->
-    <container name="rmi-dispatcher" class="org.ofbiz.service.rmi.RmiServiceContainer">
-        <property name="bound-name" value="RMIDispatcher"/>
-        <property name="bound-host" value="127.0.0.1"/>
-        <property name="bound-port" value="1099"/>
-        <property name="delegator-name" value="default"/>
-        <property name="client-factory" value="org.ofbiz.service.rmi.socket.ssl.SSLClientSocketFactory"/>
-        <property name="server-factory" value="org.ofbiz.service.rmi.socket.ssl.SSLServerSocketFactory"/>
-        <property name="ssl-keystore" value="framework/base/config/ofbizrmi.jks"/>
-        <property name="ssl-keystore-type" value="JKS"/>
-        <property name="ssl-keystore-pass" value="changeit"/>
-        <property name="ssl-keystore-alias" value="rmissl"/>
-        <property name="ssl-client-auth" value="false"/>
-    </container>
 </ofbiz-containers>

Modified: ofbiz/trunk/framework/base/config/limited-containers.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/config/limited-containers.xml?rev=1356074&r1=1356073&r2=1356074&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/config/limited-containers.xml (original)
+++ ofbiz/trunk/framework/base/config/limited-containers.xml Mon Jul  2 05:55:25 2012
@@ -20,6 +20,7 @@ under the License.
 
 <ofbiz-containers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-containers.xsd">
+    <loader name="rmi"/>
     <!-- load the ofbiz component container (always first) -->
     <container name="component-container" class="org.ofbiz.base.container.ComponentContainer">
         <property name="update-classpath" value="false"/>
@@ -28,17 +29,4 @@ under the License.
     <!-- load the cached classloader container (always second) -->
     <container name="classloader-container" class="org.ofbiz.base.container.ClassLoaderContainer"/>
 
-    <!-- RMI Service Dispatcher -->
-    <container name="rmi-dispatcher" class="org.ofbiz.service.rmi.RmiServiceContainer">
-        <property name="use-initial-context" value="true"/>
-        <property name="bound-name" value="RMIDispatcher"/>
-        <property name="delegator-name" value="default"/>
-        <property name="client-factory" value="org.ofbiz.service.rmi.socket.ssl.SSLClientSocketFactory"/>
-        <property name="server-factory" value="org.ofbiz.service.rmi.socket.ssl.SSLServerSocketFactory"/>
-        <property name="ssl-keystore" value="framework/base/config/ofbizrmi.jks"/>
-        <property name="ssl-keystore-type" value="JKS"/>
-        <property name="ssl-keystore-pass" value="changeit"/>
-        <property name="ssl-keystore-alias" value="rmissl"/>
-        <property name="ssl-client-auth" value="true"/>
-    </container>
 </ofbiz-containers>

Modified: ofbiz/trunk/framework/base/config/ofbiz-containers.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/config/ofbiz-containers.xml?rev=1356074&r1=1356073&r2=1356074&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/config/ofbiz-containers.xml (original)
+++ ofbiz/trunk/framework/base/config/ofbiz-containers.xml Mon Jul  2 05:55:25 2012
@@ -21,6 +21,7 @@ under the License.
 <ofbiz-containers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-containers.xsd">
     <loader name="main"/>
+    <loader name="rmi"/>
     <!-- load the ofbiz component container (always first) -->
     <container name="component-container" class="org.ofbiz.base.container.ComponentContainer"/>
 
@@ -39,21 +40,6 @@ under the License.
         <property name="port" value="1099"/>
     </container>
 
-    <!-- RMI Service Dispatcher -->
-    <container name="rmi-dispatcher" class="org.ofbiz.service.rmi.RmiServiceContainer">
-        <property name="bound-name" value="RMIDispatcher"/>
-        <property name="bound-host" value="127.0.0.1"/>
-        <property name="bound-port" value="1099"/>
-        <property name="delegator-name" value="default"/>
-        <property name="client-factory" value="org.ofbiz.service.rmi.socket.ssl.SSLClientSocketFactory"/>
-        <property name="server-factory" value="org.ofbiz.service.rmi.socket.ssl.SSLServerSocketFactory"/>
-        <property name="ssl-keystore" value="framework/base/config/ofbizrmi.jks"/>
-        <property name="ssl-keystore-type" value="JKS"/>
-        <property name="ssl-keystore-pass" value="changeit"/>
-        <property name="ssl-keystore-alias" value="rmissl"/>
-        <property name="ssl-client-auth" value="false"/>
-    </container>
-
     <!-- JavaMail Listener Container - Triggers MCA Rules -->
     <!-- if delete-mail is set to true, will delete messages after fetching them. otherwise, will try to mark them as seen
         mail.store.protocol supports both imap and pop3, but pop3 will not be able to mark messages as seen, so you would need to delete them-->

Modified: ofbiz/trunk/framework/base/config/rmi-containers.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/config/rmi-containers.xml?rev=1356074&r1=1356073&r2=1356074&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/config/rmi-containers.xml (original)
+++ ofbiz/trunk/framework/base/config/rmi-containers.xml Mon Jul  2 05:55:25 2012
@@ -20,6 +20,7 @@ under the License.
 
 <ofbiz-containers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-containers.xsd">
+    <loader name="rmi"/>
     <!-- load the ofbiz component container (always first) -->
     <container name="component-container" class="org.ofbiz.base.container.ComponentContainer"/>
 
@@ -30,20 +31,4 @@ under the License.
     <container name="naming-container" class="org.ofbiz.base.container.NamingServiceContainer">
         <property name="port" value="1099"/>
     </container>
-
-    <!-- RMI Service Dispatcher -->
-    <container name="rmi-dispatcher" class="org.ofbiz.service.rmi.RmiServiceContainer">
-        <property name="bound-name" value="RMIDispatcher"/>
-        <property name="bound-host" value="127.0.0.1"/>
-        <property name="bound-port" value="1099"/>
-        <property name="delegator-name" value="default"/>
-        <property name="client-factory" value="org.ofbiz.service.rmi.socket.ssl.SSLClientSocketFactory"/>
-        <property name="server-factory" value="org.ofbiz.service.rmi.socket.ssl.SSLServerSocketFactory"/>
-        <property name="ssl-keystore" value="framework/base/config/ofbizrmi.jks"/>
-        <property name="ssl-keystore-type" value="JKS"/>
-        <property name="ssl-keystore-pass" value="changeit"/>
-        <property name="ssl-keystore-alias" value="rmissl"/>
-        <property name="ssl-client-auth" value="true"/>
-    </container>
-
 </ofbiz-containers>

Modified: ofbiz/trunk/framework/base/config/test-containers.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/config/test-containers.xml?rev=1356074&r1=1356073&r2=1356074&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/config/test-containers.xml (original)
+++ ofbiz/trunk/framework/base/config/test-containers.xml Mon Jul  2 05:55:25 2012
@@ -21,6 +21,7 @@ under the License.
 <ofbiz-containers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-containers.xsd">
     <loader name="test"/>
+    <loader name="rmi"/>
     <!-- load the ofbiz component container (always first) -->
     <container name="component-container" class="org.ofbiz.base.container.ComponentContainer">
         <property name="ofbiz.instrumenterClassName" value="org.ofbiz.base.config.CoberturaInstrumenter"/>
@@ -35,19 +36,4 @@ under the License.
         <property name="host" value="0.0.0.0"/>
         <property name="port" value="1099"/>
     </container>
-
-    <!-- RMI Service Dispatcher -->
-    <container name="rmi-dispatcher" class="org.ofbiz.service.rmi.RmiServiceContainer">
-        <property name="bound-name" value="RMIDispatcher"/>
-        <property name="bound-host" value="127.0.0.1"/>
-        <property name="bound-port" value="1099"/>
-        <property name="delegator-name" value="test"/>
-        <property name="client-factory" value="org.ofbiz.service.rmi.socket.ssl.SSLClientSocketFactory"/>
-        <property name="server-factory" value="org.ofbiz.service.rmi.socket.ssl.SSLServerSocketFactory"/>
-        <property name="ssl-keystore" value="framework/base/config/ofbizrmi.jks"/>
-        <property name="ssl-keystore-type" value="JKS"/>
-        <property name="ssl-keystore-pass" value="changeit"/>
-        <property name="ssl-keystore-alias" value="rmissl"/>
-        <property name="ssl-client-auth" value="true"/>
-    </container>
 </ofbiz-containers>

Modified: ofbiz/trunk/framework/service/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/ofbiz-component.xml?rev=1356074&r1=1356073&r2=1356074&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/ofbiz-component.xml (original)
+++ ofbiz/trunk/framework/service/ofbiz-component.xml Mon Jul  2 05:55:25 2012
@@ -43,4 +43,19 @@ under the License.
 
     <keystore name="rmitrust" type="jks" password="changeit" is-truststore="true"
               is-certstore="false" loader="main" location="config/rmitrust.jks"/>
+
+    <!-- RMI Service Dispatcher -->
+    <container name="rmi-dispatcher" loaders="rmi" class="org.ofbiz.service.rmi.RmiServiceContainer">
+        <property name="bound-name" value="RMIDispatcher"/>
+        <property name="bound-host" value="127.0.0.1"/>
+        <property name="bound-port" value="1099"/>
+        <property name="delegator-name" value="default"/>
+        <property name="client-factory" value="org.ofbiz.service.rmi.socket.ssl.SSLClientSocketFactory"/>
+        <property name="server-factory" value="org.ofbiz.service.rmi.socket.ssl.SSLServerSocketFactory"/>
+        <property name="ssl-keystore" value="framework/base/config/ofbizrmi.jks"/>
+        <property name="ssl-keystore-type" value="JKS"/>
+        <property name="ssl-keystore-pass" value="changeit"/>
+        <property name="ssl-keystore-alias" value="rmissl"/>
+        <property name="ssl-client-auth" value="false"/>
+    </container>
 </ofbiz-component>