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

[jacopoc]

Author: jacopoc
Date: Mon Jul  2 07:28:55 2012
New Revision: 1356087

URL: http://svn.apache.org/viewvc?rev=1356087&view=rev
Log:
Moved "naming-container" to the base component configuration file.

Modified:
    ofbiz/trunk/framework/base/config/both-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/base/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=1356087&r1=1356086&r2=1356087&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/config/both-containers.xml (original)
+++ ofbiz/trunk/framework/base/config/both-containers.xml Mon Jul  2 07:28:55 2012
@@ -29,9 +29,4 @@ under the License.
     <!-- load the cached classloader container (always second) -->
     <container name="classloader-container" class="org.ofbiz.base.container.ClassLoaderContainer"/>
 
-    <!-- load the naming (JNDI) server -->
-    <container name="naming-container" class="org.ofbiz.base.container.NamingServiceContainer">
-        <property name="host" value="0.0.0.0"/>
-        <property name="port" value="1099"/>
-    </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=1356087&r1=1356086&r2=1356087&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/config/ofbiz-containers.xml (original)
+++ ofbiz/trunk/framework/base/config/ofbiz-containers.xml Mon Jul  2 07:28:55 2012
@@ -34,12 +34,6 @@ under the License.
     </container>
     -->
 
-    <!-- load the naming (JNDI) server -->
-    <container name="naming-container" class="org.ofbiz.base.container.NamingServiceContainer">
-        <property name="host" value="0.0.0.0"/>
-        <property name="port" value="1099"/>
-    </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=1356087&r1=1356086&r2=1356087&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/config/rmi-containers.xml (original)
+++ ofbiz/trunk/framework/base/config/rmi-containers.xml Mon Jul  2 07:28:55 2012
@@ -27,8 +27,4 @@ under the License.
     <!-- load the cached classloader container (always second) -->
     <container name="classloader-container" class="org.ofbiz.base.container.ClassLoaderContainer"/>
 
-    <!-- load the naming (JNDI) server -->
-    <container name="naming-container" class="org.ofbiz.base.container.NamingServiceContainer">
-        <property name="port" value="1099"/>
-    </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=1356087&r1=1356086&r2=1356087&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/config/test-containers.xml (original)
+++ ofbiz/trunk/framework/base/config/test-containers.xml Mon Jul  2 07:28:55 2012
@@ -31,9 +31,4 @@ under the License.
     <!-- load the cached classloader container (always second) -->
     <container name="classloader-container" class="org.ofbiz.base.container.ClassLoaderContainer"/>
 
-    <!-- load the naming (JNDI) server -->
-    <container name="naming-container" class="org.ofbiz.base.container.NamingServiceContainer">
-        <property name="host" value="0.0.0.0"/>
-        <property name="port" value="1099"/>
-    </container>
 </ofbiz-containers>

Modified: ofbiz/trunk/framework/base/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/ofbiz-component.xml?rev=1356087&r1=1356086&r2=1356087&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/ofbiz-component.xml (original)
+++ ofbiz/trunk/framework/base/ofbiz-component.xml Mon Jul  2 07:28:55 2012
@@ -27,4 +27,11 @@ under the License.
     <classpath type="jar" location="lib/*"/>
 
     <test-suite loader="main" location="testdef/basetests.xml"/>
+
+    <!-- load the naming (JNDI) server -->
+    <container name="naming-container" loaders="rmi" class="org.ofbiz.base.container.NamingServiceContainer">
+        <property name="host" value="0.0.0.0"/>
+        <property name="port" value="1099"/>
+    </container>
+
 </ofbiz-component>