Author: jleroux
Date: Mon Mar 21 20:17:59 2016
New Revision: 1736083
URL: http://svn.apache.org/viewvc?rev=1736083&view=rev
Log:
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/trunk/framework/base/config/ofbiz-containers.xml
ofbiz/trunk/framework/base/ofbiz-component.xml
ofbiz/trunk/framework/service/ofbiz-component.xml
ofbiz/trunk/framework/start/src/org/ofbiz/base/start/start.properties
ofbiz/trunk/specialpurpose/pos/config/xpos.properties
Modified: ofbiz/trunk/framework/base/config/ofbiz-containers.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/config/ofbiz-containers.xml?rev=1736083&r1=1736082&r2=1736083&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/config/ofbiz-containers.xml (original)
+++ ofbiz/trunk/framework/base/config/ofbiz-containers.xml Mon Mar 21 20:17:59
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/trunk/framework/base/ofbiz-component.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/ofbiz-component.xml?rev=1736083&r1=1736082&r2=1736083&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/ofbiz-component.xml (original)
+++ ofbiz/trunk/framework/base/ofbiz-component.xml Mon Mar 21 20:17:59 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/trunk/framework/service/ofbiz-component.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/ofbiz-component.xml?rev=1736083&r1=1736082&r2=1736083&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/ofbiz-component.xml (original)
+++ ofbiz/trunk/framework/service/ofbiz-component.xml Mon Mar 21 20:17:59 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/trunk/framework/start/src/org/ofbiz/base/start/start.properties
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/start/src/org/ofbiz/base/start/start.properties?rev=1736083&r1=1736082&r2=1736083&view=diff
==============================================================================
--- ofbiz/trunk/framework/start/src/org/ofbiz/base/start/start.properties
(original)
+++ ofbiz/trunk/framework/start/src/org/ofbiz/base/start/start.properties Mon
Mar 21 20:17:59 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/trunk/specialpurpose/pos/config/xpos.properties
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/config/xpos.properties?rev=1736083&r1=1736082&r2=1736083&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/config/xpos.properties (original)
+++ ofbiz/trunk/specialpurpose/pos/config/xpos.properties Mon Mar 21 20:17:59
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
