You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2014/07/24 11:32:00 UTC
svn commit: r1613049 - in /ofbiz/trunk/tools/demo-backup: all-manual.sh
branch13.7-demo.patch check-svn-update.sh ofbizDemo.crontab
Author: jleroux
Date: Thu Jul 24 09:31:59 2014
New Revision: 1613049
URL: http://svn.apache.org/r1613049
Log:
Small update, no functional changes
Modified:
ofbiz/trunk/tools/demo-backup/all-manual.sh
ofbiz/trunk/tools/demo-backup/branch13.7-demo.patch
ofbiz/trunk/tools/demo-backup/check-svn-update.sh
ofbiz/trunk/tools/demo-backup/ofbizDemo.crontab
Modified: ofbiz/trunk/tools/demo-backup/all-manual.sh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/tools/demo-backup/all-manual.sh?rev=1613049&r1=1613048&r2=1613049&view=diff
==============================================================================
--- ofbiz/trunk/tools/demo-backup/all-manual.sh (original)
+++ ofbiz/trunk/tools/demo-backup/all-manual.sh Thu Jul 24 09:31:59 2014
@@ -31,4 +31,4 @@ cd /home/ofbizDemo/branch12.4
sleep 10
nohup tools/startofbiz.sh &
-cd /home/ofbiz
\ No newline at end of file
+cd /home/ofbizDemo
\ No newline at end of file
Modified: ofbiz/trunk/tools/demo-backup/branch13.7-demo.patch
URL: http://svn.apache.org/viewvc/ofbiz/trunk/tools/demo-backup/branch13.7-demo.patch?rev=1613049&r1=1613048&r2=1613049&view=diff
==============================================================================
--- ofbiz/trunk/tools/demo-backup/branch13.7-demo.patch (original)
+++ ofbiz/trunk/tools/demo-backup/branch13.7-demo.patch Thu Jul 24 09:31:59 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/trunk/tools/demo-backup/check-svn-update.sh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/tools/demo-backup/check-svn-update.sh?rev=1613049&r1=1613048&r2=1613049&view=diff
==============================================================================
--- ofbiz/trunk/tools/demo-backup/check-svn-update.sh (original)
+++ ofbiz/trunk/tools/demo-backup/check-svn-update.sh Thu Jul 24 09:31:59 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/trunk/tools/demo-backup/ofbizDemo.crontab
URL: http://svn.apache.org/viewvc/ofbiz/trunk/tools/demo-backup/ofbizDemo.crontab?rev=1613049&r1=1613048&r2=1613049&view=diff
==============================================================================
--- ofbiz/trunk/tools/demo-backup/ofbizDemo.crontab (original)
+++ ofbiz/trunk/tools/demo-backup/ofbizDemo.crontab Thu Jul 24 09:31:59 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