svn commit: r1614245 [2/2] - in /ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23: ./ applications/accounting/src/org/ofbiz/accounting/tax/ applications/accounting/widget/ applications/accounting/widget/ap/forms/ applications/accounting/widget/...

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/tools/demo-backup/branch13.7-demo.patch
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/tools/demo-backup/branch13.7-demo.patch?rev=1614245&r1=1614244&r2=1614245&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/tools/demo-backup/branch13.7-demo.patch (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/tools/demo-backup/branch13.7-demo.patch Tue Jul 29 03:18:19 2014
@@ -1,104 +1,104 @@
-
-Property changes on: .
-___________________________________________________________________
-Added: svn:externals
-   + specialpurpose/appserver/ https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/appserver
-specialpurpose/assetmaint/ https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/assetmaint
-specialpurpose/birt/ https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/birt
-specialpurpose/cmssite/ https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/cmssite
-specialpurpose/ebay/ https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/ebay
-specialpurpose/ebaystore/ https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/ebaystore
-specialpurpose/example/ https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/example
-specialpurpose/exampleext/ https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/exampleext
-specialpurpose/googlebase/ https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/googlebase
-specialpurpose/googlecheckout/ https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/googlecheckout
-specialpurpose/hhfacility/ https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/hhfacility
-specialpurpose/jetty/ https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/jetty
-specialpurpose/ldap/ https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/ldap
-specialpurpose/lucene/ https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/lucene
-specialpurpose/myportal/ https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/myportal
-specialpurpose/pos/ https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/pos
-specialpurpose/projectmgr/ https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/projectmgr
-specialpurpose/oagis/ https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/oagis
-specialpurpose/scrum/ https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/scrum
-specialpurpose/webpos/ https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/webpos
-
-
-
-Index: framework/webapp/config/url.properties
-===================================================================
---- framework/webapp/config/url.properties (revision 1608427)
-+++ framework/webapp/config/url.properties (working copy)
-@@ -21,7 +21,7 @@
- ####
-
- # HTTPS Port (Secure port)
--port.https.enabled=Y
-+port.https.enabled=N
- port.https=8443
- force.https.host=
-
-Index: specialpurpose/build.xml
-===================================================================
---- specialpurpose/build.xml (revision 1608427)
-+++ specialpurpose/build.xml (working copy)
-@@ -19,7 +19,26 @@
- -->
-
- <project name="OFBiz Special Purpose Applications Build" default="build" basedir=".">
--    <import file="../macros.xml"/>
-     <filelist id="specialpurpose-builds" dir="specialpurpose"
--        files="ecommerce/build.xml"/>
-+        files="
-+        appserver/build.xml,
-+        assetmaint/build.xml,
-+        birt/build.xml,
-+        ebay/build.xml,
-+        ebaystore/build.xml,
-+        ecommerce/build.xml,
-+        example/build.xml,
-+        googlebase/build.xml,
-+        googlecheckout/build.xml,
-+        hhfacility/build.xml,
-+        jetty/build.xml,
-+        ldap/build.xml,
-+        lucene/build.xml,
-+        oagis/build.xml,
-+        pos/build.xml,
-+        projectmgr/build.xml,
-+        scrum/build.xml,
-+        webpos/build.xml
-+    "/>
- </project>
-+
-Index: specialpurpose/component-load.xml
-===================================================================
---- specialpurpose/component-load.xml (revision 1608427)
-+++ specialpurpose/component-load.xml (working copy)
-@@ -20,5 +20,26 @@
-
- <component-loader xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/component-loader.xsd">
-+    <load-component component-location="appserver"/>
-+    <load-component component-location="lucene"/>
-     <load-component component-location="ecommerce"/>
-+    <load-component component-location="pos"/>
-+    <load-component component-location="hhfacility"/>
-+    <load-component component-location="assetmaint"/>
-+    <load-component component-location="cmssite"/>
-+    <load-component component-location="projectmgr"/>
-+    <load-component component-location="scrum"/>
-+    <load-component component-location="oagis"/>
-+    <load-component component-location="googlebase"/>
-+    <load-component component-location="googlecheckout"/>
-+    <load-component component-location="ebay"/>
-+    <load-component component-location="ebaystore"/>
-+    <load-component component-location="myportal"/>
-+    <load-component component-location="ldap"/>
-+    <load-component component-location="webpos"/>
-+    <load-component component-location="birt"/>
-+    <load-component component-location="example"/>
-+    <load-component component-location="exampleext"/>
-+    <!-- <load-component component-location="jetty"/> -->
- </component-loader>
-+
+
+Property changes on: .
+___________________________________________________________________
+Added: svn:externals
+   + specialpurpose/appserver/ https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/appserver
+specialpurpose/assetmaint/ https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/assetmaint
+specialpurpose/birt/ https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/birt
+specialpurpose/cmssite/ https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/cmssite
+specialpurpose/ebay/ https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/ebay
+specialpurpose/ebaystore/ https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/ebaystore
+specialpurpose/example/ https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/example
+specialpurpose/exampleext/ https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/exampleext
+specialpurpose/googlebase/ https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/googlebase
+specialpurpose/googlecheckout/ https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/googlecheckout
+specialpurpose/hhfacility/ https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/hhfacility
+specialpurpose/jetty/ https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/jetty
+specialpurpose/ldap/ https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/ldap
+specialpurpose/lucene/ https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/lucene
+specialpurpose/myportal/ https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/myportal
+specialpurpose/pos/ https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/pos
+specialpurpose/projectmgr/ https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/projectmgr
+specialpurpose/oagis/ https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/oagis
+specialpurpose/scrum/ https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/scrum
+specialpurpose/webpos/ https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/webpos
+
+
+
+Index: framework/webapp/config/url.properties
+===================================================================
+--- framework/webapp/config/url.properties (revision 1608427)
++++ framework/webapp/config/url.properties (working copy)
+@@ -21,7 +21,7 @@
+ ####
+
+ # HTTPS Port (Secure port)
+-port.https.enabled=Y
++port.https.enabled=N
+ port.https=8443
+ force.https.host=
+
+Index: specialpurpose/build.xml
+===================================================================
+--- specialpurpose/build.xml (revision 1608427)
++++ specialpurpose/build.xml (working copy)
+@@ -19,7 +19,26 @@
+ -->
+
+ <project name="OFBiz Special Purpose Applications Build" default="build" basedir=".">
+-    <import file="../macros.xml"/>
+     <filelist id="specialpurpose-builds" dir="specialpurpose"
+-        files="ecommerce/build.xml"/>
++        files="
++        appserver/build.xml,
++        assetmaint/build.xml,
++        birt/build.xml,
++        ebay/build.xml,
++        ebaystore/build.xml,
++        ecommerce/build.xml,
++        example/build.xml,
++        googlebase/build.xml,
++        googlecheckout/build.xml,
++        hhfacility/build.xml,
++        jetty/build.xml,
++        ldap/build.xml,
++        lucene/build.xml,
++        oagis/build.xml,
++        pos/build.xml,
++        projectmgr/build.xml,
++        scrum/build.xml,
++        webpos/build.xml
++    "/>
+ </project>
++
+Index: specialpurpose/component-load.xml
+===================================================================
+--- specialpurpose/component-load.xml (revision 1608427)
++++ specialpurpose/component-load.xml (working copy)
+@@ -20,5 +20,26 @@
+
+ <component-loader xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/component-loader.xsd">
++    <load-component component-location="appserver"/>
++    <load-component component-location="lucene"/>
+     <load-component component-location="ecommerce"/>
++    <load-component component-location="pos"/>
++    <load-component component-location="hhfacility"/>
++    <load-component component-location="assetmaint"/>
++    <load-component component-location="cmssite"/>
++    <load-component component-location="projectmgr"/>
++    <load-component component-location="scrum"/>
++    <load-component component-location="oagis"/>
++    <load-component component-location="googlebase"/>
++    <load-component component-location="googlecheckout"/>
++    <load-component component-location="ebay"/>
++    <load-component component-location="ebaystore"/>
++    <load-component component-location="myportal"/>
++    <load-component component-location="ldap"/>
++    <load-component component-location="webpos"/>
++    <load-component component-location="birt"/>
++    <load-component component-location="example"/>
++    <load-component component-location="exampleext"/>
++    <!-- <load-component component-location="jetty"/> -->
+ </component-loader>
++

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/tools/demo-backup/check-svn-update.sh
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/tools/demo-backup/check-svn-update.sh?rev=1614245&r1=1614244&r2=1614245&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/tools/demo-backup/check-svn-update.sh (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/tools/demo-backup/check-svn-update.sh Tue Jul 29 03:18:19 2014
@@ -22,7 +22,7 @@ svn st -u | grep '*'
 
 if [ $? = 0 ]; then
     svn up
-    ./ant stop -Dportoffset=10000
+    ./ant stop -Dportoffset=10000
     ./ant clean-all
     ./ant load-demo
     ./ant svninfo
@@ -45,5 +45,5 @@ if [ $? = 0 ]; then
     ./ant load-demo
     ./ant svninfo
     sleep 10
-    tools/startofbiz.sh
+    nohup tools/startofbiz.sh &
 fi

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/tools/demo-backup/ofbizDemo.crontab
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/tools/demo-backup/ofbizDemo.crontab?rev=1614245&r1=1614244&r2=1614245&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/tools/demo-backup/ofbizDemo.crontab (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/tools/demo-backup/ofbizDemo.crontab Tue Jul 29 03:18:19 2014
@@ -1 +1 @@
-0 3 * * * /home/ofbizDemo/check-svn-update.sh >> /home/ofbizDemo/cronlog-svn-update.log 2>&1
\ No newline at end of file
+0 3 * * * /home/ofbizDemo/check-svn-update.sh > /home/ofbizDemo/cronlog-svn-update.log 2>&1
\ No newline at end of file