OFBiz › OFBiz - Dev

Re: svn commit: r1736083 - in /ofbiz/trunk: framework/base/config/ofbiz-containers.xml framework/base/ofbiz-component.xml framework/service/ofbiz-component.xml framework/start/src/org/ofbiz/base/start/start.properties specialpurpose/pos/config/xpos.properties

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

Jacques Le Roux

Re: svn commit: r1736083 - in /ofbiz/trunk: framework/base/config/ofbiz-containers.xml framework/base/ofbiz-component.xml framework/service/ofbiz-component.xml framework/start/src/org/ofbiz/base/start/start.properties specialpurpose/pos/config/xpos.properties

Administrator

Damned, xpos.properties should not have been part of this, only both.properties (already in). I will remove it

Jacques

Le 21/03/2016 21:17, [hidden email] a écrit :

> 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">
>
> - 
> 
> - 
> - <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"/>
>
> - 
> 
> - 
> + </container>
>
> 
> 
>
> 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"/>
>
> - 
> - 
> - <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>
>
> - 
> 
> - 
> + </container>
>
> 
> 
> ++#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
>
>
>