svn commit: r1736154 - in /ofbiz/branches/release13.07/framework: base/ofbiz-component.xml service/ofbiz-component.xml

[jl...@apache.org]

Author: jleroux
Date: Tue Mar 22 08:59:27 2016
New Revision: 1736154

URL: http://svn.apache.org/viewvc?rev=1736154&view=rev
Log:
Some errors slipped in while doing changes by hand for r1736092

Fixes "Comment out RMI related code because of the Java deserialization issue" - https://issues.apache.org/jira/browse/OFBIZ-6942

We decided to comment out as less as possible because once, in the start and both properties; the rmi part is off and the related test services are off there is no RMI related danger left (test services are not a danger but would fail during tests run). 
It's then easier for users who need RMI in their projects to have only to uncomment those and not digg everywhere.

Modified:
    ofbiz/branches/release13.07/framework/base/ofbiz-component.xml
    ofbiz/branches/release13.07/framework/service/ofbiz-component.xml

Modified: ofbiz/branches/release13.07/framework/base/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/framework/base/ofbiz-component.xml?rev=1736154&r1=1736153&r2=1736154&view=diff
==============================================================================
--- ofbiz/branches/release13.07/framework/base/ofbiz-component.xml (original)
+++ ofbiz/branches/release13.07/framework/base/ofbiz-component.xml Tue Mar 22 08:59:27 2016
@@ -29,8 +29,7 @@ under the License.
     <test-suite loader="main" location="testdef/basetests.xml"/>
 
     <!-- load the cached classloader container (always second) -->
-    <!-- <container name="classloader-container" loaders="main,rmi,pos,install,test" class="org.ofbiz.base.container.ClassLoaderContainer"/> -->
-    <container name="classloader-container" loaders="main,pos,install,test" class="org.ofbiz.base.container.ClassLoaderContainer"/>
+    <container name="classloader-container" loaders="main,rmi,pos,install,test" class="org.ofbiz.base.container.ClassLoaderContainer"/>
 
     <!-- load the naming (JNDI) server -->
     <container name="naming-container" loaders="rmi" class="org.ofbiz.base.container.NamingServiceContainer">

Modified: ofbiz/branches/release13.07/framework/service/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/framework/service/ofbiz-component.xml?rev=1736154&r1=1736153&r2=1736154&view=diff
==============================================================================
--- ofbiz/branches/release13.07/framework/service/ofbiz-component.xml (original)
+++ ofbiz/branches/release13.07/framework/service/ofbiz-component.xml Tue Mar 22 08:59:27 2016
@@ -44,7 +44,7 @@ under the License.
     <keystore name="rmitrust" type="jks" password="changeit" is-truststore="true"
               is-certstore="false" loader="main" location="config/rmitrust.jks"/>
 
-    <container name="service-container" loaders="main,rmi,pos,load-data,test" class="org.ofbiz.service.ServiceContainer">
+    <container name="service-container" loaders="main,rmi,pos,install,test" class="org.ofbiz.service.ServiceContainer">
         <property name="dispatcher-factory" value="org.ofbiz.service.GenericDispatcherFactory"/>
     </container>