svn commit: r1736084 - in /ofbiz/branches/release15.12: ./ framework/base/ framework/base/config/ framework/service/ framework/start/src/org/ofbiz/base/start/ specialpurpose/pos/config/

Author: jleroux
Date: Mon Mar 21 20:20:31 2016
New Revision: 1736084

URL: http://svn.apache.org/viewvc?rev=1736084&view=rev
Log:
"Applied fix from trunk for revision: 1736083 "
------------------------------------------------------------------------
r1736083 | jleroux | 2016-03-21 21:17:59 +0100 (lun. 21 mars 2016) | 6 lignes

This partially reverts r1735569 to simplify and have less commented out parts.

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/release15.12/   (props changed)
    ofbiz/branches/release15.12/framework/base/config/ofbiz-containers.xml
    ofbiz/branches/release15.12/framework/base/ofbiz-component.xml
    ofbiz/branches/release15.12/framework/service/ofbiz-component.xml
    ofbiz/branches/release15.12/framework/start/src/org/ofbiz/base/start/start.properties
    ofbiz/branches/release15.12/specialpurpose/pos/config/xpos.properties

Propchange: ofbiz/branches/release15.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 21 20:20:31 2016
@@ -9,4 +9,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735244,1735385,1735398,1735569,1735731,1735734,1735750,1735753,1735756,1735759,1735773
+/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735244,1735385,1735398,1735569,1735731,1735734,1735750,1735753,1735756,1735759,1735773,1736083

Modified: ofbiz/branches/release15.12/framework/base/config/ofbiz-containers.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/framework/base/config/ofbiz-containers.xml?rev=1736084&r1=1736083&r2=1736084&view=diff
==============================================================================
--- ofbiz/branches/release15.12/framework/base/config/ofbiz-containers.xml (original)
+++ ofbiz/branches/release15.12/framework/base/config/ofbiz-containers.xml Mon Mar 21 20:20:31 2016
@@ -21,11 +21,8 @@ under the License.
 <ofbiz-containers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-containers.xsd">
 
-    <!-- Because of the danger of Java deserialization when using RMI, we (PMC) have decided to comment out main RMI related code entries.
-         If you need RMI you just need to uncomment those places - See OFBIZ-6942 for details -->
     <!-- load the ofbiz component container (always first) -->
-    <!-- <container name="component-container" loaders="main,rmi,pos,load-data" class="org.ofbiz.base.container.ComponentContainer"/> -->
-    <container name="component-container" loaders="main,pos,load-data" class="org.ofbiz.base.container.ComponentContainer"/>
+    <container name="component-container" loaders="main,rmi,pos,load-data" class="org.ofbiz.base.container.ComponentContainer"/>
 
     <container name="component-container-test" loaders="test" class="org.ofbiz.base.container.ComponentContainer">
         <property name="ofbiz.instrumenterClassName" value="org.ofbiz.base.config.CoberturaInstrumenter"/>

Modified: ofbiz/branches/release15.12/framework/base/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/framework/base/ofbiz-component.xml?rev=1736084&r1=1736083&r2=1736084&view=diff
==============================================================================
--- ofbiz/branches/release15.12/framework/base/ofbiz-component.xml (original)
+++ ofbiz/branches/release15.12/framework/base/ofbiz-component.xml Mon Mar 21 20:20:31 2016
@@ -33,13 +33,11 @@ under the License.
 
     <test-suite loader="main" location="testdef/basetests.xml"/>
 
-    <!-- Because of the danger of Java deserialization when using RMI, we (PMC) have decided to comment out main RMI related code entries.
-         If you need RMI you just need to uncomment those places - See OFBIZ-6942 for details -->
     <!-- load the naming (JNDI) server -->
-    <!-- <container name="naming-container" loaders="rmi" class="org.ofbiz.base.container.NamingServiceContainer">
+    <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> -->
+    </container>
 
     <!-- load BeanShell remote telnet server -->
     <!-- Commented out by default for security reasons -->

Modified: ofbiz/branches/release15.12/framework/service/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/framework/service/ofbiz-component.xml?rev=1736084&r1=1736083&r2=1736084&view=diff
==============================================================================
--- ofbiz/branches/release15.12/framework/service/ofbiz-component.xml (original)
+++ ofbiz/branches/release15.12/framework/service/ofbiz-component.xml Mon Mar 21 20:20:31 2016
@@ -44,17 +44,12 @@ under the License.
     <keystore name="rmitrust" type="jks" password="changeit" is-truststore="true"
               is-certstore="false" loader="main" location="config/rmitrust.jks"/>
 
-    <!-- Because of the danger of Java deserialization when using RMI, we (PMC) have decided to comment out main RMI related code entries.
-         If you need RMI you just need to uncomment those places - See OFBIZ-6942 for details -->
-    <!-- <container name="service-container" loaders="main,rmi,pos,load-data,test" class="org.ofbiz.service.ServiceContainer"> -->
-    <container name="service-container" loaders="main,pos,load-data,test" class="org.ofbiz.service.ServiceContainer">
+    <container name="service-container" loaders="main,rmi,pos,load-data,test" class="org.ofbiz.service.ServiceContainer">
         <property name="dispatcher-factory" value="org.ofbiz.service.GenericDispatcherFactory"/>
     </container>
 
-    <!-- Because of the danger of Java deserialization when using RMI, we (PMC) have decided to comment out main RMI related code entries.
-         If you need RMI you just need to uncomment those places - See OFBIZ-6942 for details -->
     <!-- RMI Service Dispatcher -->
-    <!-- <container name="rmi-dispatcher" loaders="rmi" class="org.ofbiz.service.rmi.RmiServiceContainer">
+    <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"/>
@@ -66,7 +61,7 @@ under the License.
         <property name="ssl-keystore-pass" value="changeit"/>
         <property name="ssl-keystore-alias" value="rmissl"/>
         <property name="ssl-client-auth" value="false"/>
-    </container> -->
+    </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

Modified: ofbiz/branches/release15.12/framework/start/src/org/ofbiz/base/start/start.properties
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/framework/start/src/org/ofbiz/base/start/start.properties?rev=1736084&r1=1736083&r2=1736084&view=diff
==============================================================================
--- ofbiz/branches/release15.12/framework/start/src/org/ofbiz/base/start/start.properties (original)
+++ ofbiz/branches/release15.12/framework/start/src/org/ofbiz/base/start/start.properties Mon Mar 21 20:20:31 2016
@@ -40,8 +40,11 @@ ofbiz.admin.key=so3du5kasd5dn
 
 # --- StartupLoader implementations to load (in order)
 ofbiz.start.loader1=org.ofbiz.base.container.ContainerLoader
-ofbiz.start.loader1.loaders=main,rmi
-
++# Because of the danger of Java deserialization when using RMI, we (PMC) have decided to comment out main RMI related code entries.
++# If you need RMI you just need to uncomment those places - See OFBIZ-6942 for details -->
++#ofbiz.start.loader1.loaders=main,rmi
++ofbiz.start.loader1.loaders=main
+
 # -- Enable the shutdown hook
 #ofbiz.enable.hook=true
 

Modified: ofbiz/branches/release15.12/specialpurpose/pos/config/xpos.properties
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/pos/config/xpos.properties?rev=1736084&r1=1736083&r2=1736084&view=diff
==============================================================================
--- ofbiz/branches/release15.12/specialpurpose/pos/config/xpos.properties (original)
+++ ofbiz/branches/release15.12/specialpurpose/pos/config/xpos.properties Mon Mar 21 20:20:31 2016
@@ -1,35 +1,34 @@
 ###############################################################################
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
+# Licensed to the Apache Software Foundation (ASF) under one                  
+# or more contributor license agreements.  See the NOTICE file                
+# distributed with this work for additional information                        
+# regarding copyright ownership.  The ASF licenses this file                  
+# to you under the Apache License, Version 2.0 (the                            
+# "License"); you may not use this file except in compliance                
+# with the License.  You may obtain a copy of the License at                  
+#                                                                              
+# http://www.apache.org/licenses/LICENSE-2.0                                   
+#                                                                              
+# Unless required by applicable law or agreed to in writing,                  
+# software distributed under the License is distributed on an                  
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY                    
+# KIND, either express or implied.  See the License for the                    
+# specific language governing permissions and limitations                      
+# under the License.                                                          
 ###############################################################################
 #                                                                              
-# By default the screen is 1024x768 wide. If you want to use another screen size,
-# you must create a new directory under specialpurpose/pos/screens, like the 800x600.
-# You must also set the 3 related parameters (StartClass, ClientWidth, ClientHeight) accordingly.
+# Dynamically modified by OFBiz Framework (org.ofbiz.base.util : UtilProperties.setPropertyValue)
+# The comments have been removed, you may still find them on the OFBiz repository...
 #
-
-StartPackage=org.ofbiz.pos
-StartClass=default/pospanel
-LogLevel=0
-StyleFile=posstyles.xml
+#Mon Mar 21 21:15:53 CET 2016
 CenterWin=true
 ClientHeight=768
+Language=XuiLabels_fr
 ClientWidth=1024
-Language=XuiLabels
+StartClass=default/pospanel
 Title=OFBiz POS
+StyleFile=posstyles.xml
 UseWindow=false
 UseFrames=false
+LogLevel=0
+StartPackage=org.ofbiz.pos