svn commit: r1736273 - in /ofbiz/branches/release15.12: ./ framework/start/src/org/ofbiz/base/start/start.properties

[Deepak Dixit-5]

Author: deepak
Date: Wed Mar 23 05:46:28 2016
New Revision: 1736273

URL: http://svn.apache.org/viewvc?rev=1736273&view=rev
Log:
Applied fix from trunk for revision: 1736272
===

Removed extra unused sign from start.properties file, I think its mistakenly committed at r#1736083.

Modified:
    ofbiz/branches/release15.12/   (props changed)
    ofbiz/branches/release15.12/framework/start/src/org/ofbiz/base/start/start.properties

Propchange: ofbiz/branches/release15.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 23 05:46:28 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,1736083,1736087
+/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,1736087,1736272

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=1736273&r1=1736272&r2=1736273&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 Wed Mar 23 05:46:28 2016
@@ -40,10 +40,10 @@ ofbiz.admin.key=so3du5kasd5dn
 
 # --- StartupLoader implementations to load (in order)
 ofbiz.start.loader1=org.ofbiz.base.container.ContainerLoader
-+# 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
+# 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