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/02 09:45:03 UTC
svn commit: r1607265 - in /ofbiz/trunk/tools/demo-backup: ./ README
RUN-DEMOS-AS-ofbizDemo-USER-ONLY-NOT-ROOT all-manual.sh
branch12.4-demo.patch check-svn-update.sh old-manual.sh stable-manual.sh
trunk-manual.sh
Author: jleroux
Date: Wed Jul 2 07:45:02 2014
New Revision: 1607265
URL: http://svn.apache.org/r1607265
Log:
Adds demo-backup here since the VM is not backuped and we already lost those.
These are not the definitive versions but almost
Added:
ofbiz/trunk/tools/demo-backup/
ofbiz/trunk/tools/demo-backup/README (with props)
ofbiz/trunk/tools/demo-backup/RUN-DEMOS-AS-ofbizDemo-USER-ONLY-NOT-ROOT
ofbiz/trunk/tools/demo-backup/all-manual.sh (with props)
ofbiz/trunk/tools/demo-backup/branch12.4-demo.patch
ofbiz/trunk/tools/demo-backup/check-svn-update.sh (with props)
ofbiz/trunk/tools/demo-backup/old-manual.sh (with props)
ofbiz/trunk/tools/demo-backup/stable-manual.sh (with props)
ofbiz/trunk/tools/demo-backup/trunk-manual.sh (with props)
Added: ofbiz/trunk/tools/demo-backup/README
URL: http://svn.apache.org/viewvc/ofbiz/trunk/tools/demo-backup/README?rev=1607265&view=auto
==============================================================================
--- ofbiz/trunk/tools/demo-backup/README (added)
+++ ofbiz/trunk/tools/demo-backup/README Wed Jul 2 07:45:02 2014
@@ -0,0 +1,38 @@
+3 instances of OFBiz on this VM:
+
+trunk: the trunk version
+stable: the last stable version (currently 13.07)
+old: the previous stable version (currently 12.04)
+
+{checking}
+ Note: Only run the ofbiz demos using the 'ofbizDemo' user, never run as root.
+
+ To do this sudo to the ofbizDemo user:
+
+ sudo -s -u ofbizDemo -H
+
+ then you can start/stop as required.
+
+ To check if the demos are being run as the ofbizDemo user:
+
+ ps aux | grep ofbizDemo
+
+ The first column on the left tell you the username the demo is
+ being run as - it should say ofbizDemo !
+{checking}
+
+Also note that the demos are usually updated and started/stopped
+automatically using the check-svn-update.sh script in this
+directory, it is run by an ofbiz cron job every 24 hours at 3 AM.
+You should therefore only need to start/stop manually if there is
+a problem.
+
+If you want to tackle only a single instance you can respectively use
+
+trunk-manual.sh
+stable-manual.sh
+old-manual.sh
+
+{checking}
+ Type 'exit' to exit the ofbizDemo user and return to your normal user.
+{checking}
Propchange: ofbiz/trunk/tools/demo-backup/README
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/tools/demo-backup/README
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/tools/demo-backup/RUN-DEMOS-AS-ofbizDemo-USER-ONLY-NOT-ROOT
URL: http://svn.apache.org/viewvc/ofbiz/trunk/tools/demo-backup/RUN-DEMOS-AS-ofbizDemo-USER-ONLY-NOT-ROOT?rev=1607265&view=auto
==============================================================================
(empty)
Added: ofbiz/trunk/tools/demo-backup/all-manual.sh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/tools/demo-backup/all-manual.sh?rev=1607265&view=auto
==============================================================================
--- ofbiz/trunk/tools/demo-backup/all-manual.sh (added)
+++ ofbiz/trunk/tools/demo-backup/all-manual.sh Wed Jul 2 07:45:02 2014
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+cd /home/ofbizDemo/trunk
+export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64/
+
+ svn up
+ ./ant stop
+ ./ant clean-all
+ ./ant load-demo
+ ./ant svninfo
+ ./ant start-batch
+
+cd /home/ofbizDemo/branch13.7
+export JAVA_HOME=/usr/lib/jvm/java-6-openjdk-amd64/
+
+ svn up
+ ./ant stop -Dportoffset=10000
+ ./ant clean-all
+ ./ant load-demo
+ ./ant svninfo
+ ./ant start-batch -Dportoffset=10000
+
+
+cd /home/ofbizDemo/branch12.4
+
+ svn up
+ tools/stopofbiz.sh
+ sleep 10
+ tools/stopofbiz.sh
+ sleep 10
+ tools/stopofbiz.sh
+ sleep 10
+ ./ant clean-all
+ ./ant load-demo
+ ./ant svninfo
+ sleep 10
+ nohup tools/startofbiz.sh &
+
+cd /home/ofbiz
\ No newline at end of file
Propchange: ofbiz/trunk/tools/demo-backup/all-manual.sh
------------------------------------------------------------------------------
svn:eol-style = LF
Propchange: ofbiz/trunk/tools/demo-backup/all-manual.sh
------------------------------------------------------------------------------
svn:executable = *
Propchange: ofbiz/trunk/tools/demo-backup/all-manual.sh
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Added: ofbiz/trunk/tools/demo-backup/branch12.4-demo.patch
URL: http://svn.apache.org/viewvc/ofbiz/trunk/tools/demo-backup/branch12.4-demo.patch?rev=1607265&view=auto
==============================================================================
--- ofbiz/trunk/tools/demo-backup/branch12.4-demo.patch (added)
+++ ofbiz/trunk/tools/demo-backup/branch12.4-demo.patch Wed Jul 2 07:45:02 2014
@@ -0,0 +1,72 @@
+Index: framework/start/src/org/ofbiz/base/start/start.properties
+===================================================================
+--- framework/start/src/org/ofbiz/base/start/start.properties (revision 1604588)
++++ framework/start/src/org/ofbiz/base/start/start.properties (working copy)
+@@ -29,7 +29,7 @@
+
+ # --- Set these for shutting down when running as background process
+ ofbiz.admin.host=127.0.0.1
+-ofbiz.admin.port=10523
++ofbiz.admin.port=30523
+ ofbiz.admin.key=so3du5kasd5dn
+
+ # --- External Base configuration files (relative to ofbiz.home)
+Index: framework/base/config/ofbiz-containers.xml
+===================================================================
+--- framework/base/config/ofbiz-containers.xml (revision 1604588)
++++ framework/base/config/ofbiz-containers.xml (working copy)
+@@ -35,14 +35,14 @@
+ <!-- load the naming (JNDI) server -->
+ <container name="naming-container" class="org.ofbiz.base.container.NamingServiceContainer">
+ <property name="host" value="0.0.0.0"/>
+- <property name="port" value="1099"/>
++ <property name="port" value="21099"/>
+ </container>
+
+ <!-- RMI Service Dispatcher -->
+ <container name="rmi-dispatcher" 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"/>
++ <property name="bound-port" value="21099"/>
+ <property name="delegator-name" value="default"/>
+ <property name="client-factory" value="org.ofbiz.service.rmi.socket.ssl.SSLClientSocketFactory"/>
+ <property name="server-factory" value="org.ofbiz.service.rmi.socket.ssl.SSLServerSocketFactory"/>
+@@ -187,7 +187,7 @@
+ <property name="maxSpareThreads" value="50"/>
+ <property name="maxThreads" value="100"/>
+ <property name="minSpareThreads" value="4"/>
+- <property name="port" value="8080"/>
++ <property name="port" value="28080"/>
+ <property name="restrictedUserAgents" value=""/>
+ <property name="server" value=""/>
+ <property name="socketBuffer" value="9000"/>
+@@ -225,7 +225,7 @@
+ <property name="maxSpareThreads" value="50"/>
+ <property name="maxThreads" value="100"/>
+ <property name="minSpareThreads" value="4"/>
+- <property name="port" value="8443"/>
++ <property name="port" value="28443"/>
+ <property name="restrictedUserAgents" value=""/>
+ <property name="server" value=""/>
+ <property name="socketBuffer" value="9000"/>
+Index: framework/webapp/config/url.properties
+===================================================================
+--- framework/webapp/config/url.properties (revision 1604588)
++++ framework/webapp/config/url.properties (working copy)
+@@ -21,12 +21,12 @@
+ ####
+
+ # HTTPS Port (Secure port)
+-port.https.enabled=Y
+-port.https=8443
++port.https.enabled=N
++port.https=28443
+ force.https.host=
+
+ # HTTP Port (Not Secure port)
+-port.http=8080
++port.http=28080
+ force.http.host=
+
+ # Static Content URLs to make it easy to move the serving load for static content to other machines
Added: 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=1607265&view=auto
==============================================================================
--- ofbiz/trunk/tools/demo-backup/check-svn-update.sh (added)
+++ ofbiz/trunk/tools/demo-backup/check-svn-update.sh Wed Jul 2 07:45:02 2014
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+# check trunk for updates
+
+cd /home/ofbizDemo/trunk
+export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64/
+
+svn st -u | grep '*'
+
+if [ $? = 0 ]; then
+ svn up
+ ./ant stop
+ ./ant clean-all
+ ./ant load-demo
+ ./ant svninfo
+ #./ant start > console.log
+ ./ant start-batch
+fi
+
+# check branch for updates
+
+cd /home/ofbizDemo/branch13.7
+export JAVA_HOME=/usr/lib/jvm/java-6-openjdk-amd64/
+
+svn st -u | grep '*'
+
+if [ $? = 0 ]; then
+ svn up
+ ./ant stop -Dportoffset=10000
+ ./ant clean-all
+ ./ant load-demo
+ ./ant svninfo
+ #./ant start -Dportoffset=10000 > console.log
+ ./ant start-batch -Dportoffset=10000
+fi
+
+cd /home/ofbizDemo/branch12.4
+
+svn st -u | grep '*'
+
+if [ $? = 0 ]; then
+ svn up
+ tools/stopofbiz.sh
+ sleep 10
+ tools/stopofbiz.sh
+ sleep 10
+ tools/stopofbiz.sh
+ sleep 10
+ ./ant clean-all
+ ./ant load-demo
+ ./ant svninfo
+ sleep 10
+ tools/startofbiz.sh
+fi
Propchange: ofbiz/trunk/tools/demo-backup/check-svn-update.sh
------------------------------------------------------------------------------
svn:eol-style = LF
Propchange: ofbiz/trunk/tools/demo-backup/check-svn-update.sh
------------------------------------------------------------------------------
svn:executable = *
Propchange: ofbiz/trunk/tools/demo-backup/check-svn-update.sh
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Added: ofbiz/trunk/tools/demo-backup/old-manual.sh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/tools/demo-backup/old-manual.sh?rev=1607265&view=auto
==============================================================================
--- ofbiz/trunk/tools/demo-backup/old-manual.sh (added)
+++ ofbiz/trunk/tools/demo-backup/old-manual.sh Wed Jul 2 07:45:02 2014
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+cd /home/ofbizDemo/branch12.4
+svn up
+tools/stopofbiz.sh
+sleep 10
+tools/stopofbiz.sh
+sleep 10
+tools/stopofbiz.sh
+sleep 10
+./ant clean-all
+./ant load-demo
+./ant svninfo
+sleep 10
+nohup tools/startofbiz.sh &
Propchange: ofbiz/trunk/tools/demo-backup/old-manual.sh
------------------------------------------------------------------------------
svn:eol-style = LF
Propchange: ofbiz/trunk/tools/demo-backup/old-manual.sh
------------------------------------------------------------------------------
svn:executable = *
Propchange: ofbiz/trunk/tools/demo-backup/old-manual.sh
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Added: ofbiz/trunk/tools/demo-backup/stable-manual.sh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/tools/demo-backup/stable-manual.sh?rev=1607265&view=auto
==============================================================================
--- ofbiz/trunk/tools/demo-backup/stable-manual.sh (added)
+++ ofbiz/trunk/tools/demo-backup/stable-manual.sh Wed Jul 2 07:45:02 2014
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+cd /home/ofbizDemo/branch13.7
+svn up
+./ant stop -Dportoffset=10000
+./ant clean-all
+./ant load-demo
+./ant svninfo
+./ant start-batch -Dportoffset=10000
Propchange: ofbiz/trunk/tools/demo-backup/stable-manual.sh
------------------------------------------------------------------------------
svn:eol-style = LF
Propchange: ofbiz/trunk/tools/demo-backup/stable-manual.sh
------------------------------------------------------------------------------
svn:executable = *
Propchange: ofbiz/trunk/tools/demo-backup/stable-manual.sh
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Added: ofbiz/trunk/tools/demo-backup/trunk-manual.sh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/tools/demo-backup/trunk-manual.sh?rev=1607265&view=auto
==============================================================================
--- ofbiz/trunk/tools/demo-backup/trunk-manual.sh (added)
+++ ofbiz/trunk/tools/demo-backup/trunk-manual.sh Wed Jul 2 07:45:02 2014
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+cd /home/ofbizDemo/trunk
+svn up
+export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64/
+./ant stop
+./ant clean-all
+./ant load-demo
+./ant svninfo
+./ant start-batch
+
Propchange: ofbiz/trunk/tools/demo-backup/trunk-manual.sh
------------------------------------------------------------------------------
svn:eol-style = LF
Propchange: ofbiz/trunk/tools/demo-backup/trunk-manual.sh
------------------------------------------------------------------------------
svn:executable = *
Propchange: ofbiz/trunk/tools/demo-backup/trunk-manual.sh
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id