Implemented: 1st step to move from old to next demo
Seems that it's impossible (difficult?) to modify and then rename a file. I then
get a Git index issue. I'll rename old-manual.sh after pushing...
diff --git a/demo-backup/README.md b/demo-backup/README.md
index de986f3..b16a359 100644
--- a/demo-backup/README.md
+++ b/demo-backup/README.md
@@ -3,7 +3,7 @@
* trunk: the trunk version
* stable: the last stable version (currently 18.12)
-* old: the previous stable version (currently 17.12)
+* next: the next stable version (currently 22.01)
This is the 3rd instance of VM we use hence the 3 in its domain name.
The root of https://ofbiz-vm3.apache.org is the so called bigfiles directory which is actually at /var/www/ofbiz/big-files.
@@ -12,7 +12,7 @@
* https://demo-trunk.ofbiz.apache.org
* https://demo-stable.ofbiz.apache.org
-* https://demo-old.ofbiz.apache.org
+* https://demo-next.ofbiz.apache.org
The Puppet configuration is at
https://github.com/apache/infrastructure-p6/blob/production/data/nodes/ofbiz-vm3.apache.org.yaml
@@ -45,16 +45,16 @@
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 ofbizDemo cron job every 24 hours at 3 AM. You should therefore only need to start/stop manually if there is a problem.
-## Upgrade stable and old demos
+## Upgrade stable and next demos
-You need first to create a branchAA.mm directory under the ofbizDemo directory and to clone the related releaseAA.mm in this new directory. Then to copy and apply the patches contained in the old-manual.sh and stable-manual.sh files, read the comments in these files for details.
+You need first to create a branchAA.mm directory under the ofbizDemo directory and to clone the related releaseAA.mm in this new directory. Then to copy and apply the patches contained in the next-manual.sh and stable-manual.sh files, read the comments in these files for details.
-Looking at the Puppet configuration (see above) you will see that you only need to change the old-manual.sh and stable-manual.sh files to upgrade stable and old demos. Because they are defined in the Puppet configuration by respectively
+Looking at the Puppet configuration (see above) you will see that you only need to change the next-manual.sh and stable-manual.sh files to upgrade stable and next demos. Because they are defined in the Puppet configuration by respectively
stable: ProxyPass / ajp://localhost:18009/
- old : ProxyPass / ajp://localhost:28009/
+ next : ProxyPass / ajp://localhost:28009/
-Finally you need to kill the current stable and old processes before running again the demos using
+Finally you need to kill the current stable and next processes before running again the demos using
./all-manual-nicely.sh
@@ -81,7 +81,7 @@
~~If you want to restart only a single instance you can respectively use
trunk-manual-nicely.sh
stable-manual-nicely.sh
-old-manual-nicely.sh~~
+next-manual-nicely.sh~~
This does not work.See why at https://issues.apache.org/jira/browse/OFBIZ-10287
So you need to use ./all-manual-nicely.sh from ofbizDemo
From time to time (every months?) better to delete nohup.out.
diff --git a/demo-backup/old-manual-nicely.sh b/demo-backup/next-manual-nicely.sh
similarity index 65%
rename from demo-backup/old-manual-nicely.sh
rename to demo-backup/next-manual-nicely.sh
index 53f09b5..481c7e7 100755
--- a/demo-backup/old-manual-nicely.sh
+++ b/demo-backup/next-manual-nicely.sh
@@ -2,4 +2,4 @@
echo This does not work, see OFBIZ-10287. You need for now to use all-manual-nicely.sh
-# nohup nice -n 19 ionice -c2 -n7 ./old-manual.sh &
\ No newline at end of file
+# nohup nice -n 19 ionice -c2 -n7 ./next-manual.sh &
\ No newline at end of file
diff --git a/demo-backup/old-manual.sh b/demo-backup/old-manual.sh
index 1a81bdc..116246d 100755
--- a/demo-backup/old-manual.sh
+++ b/demo-backup/old-manual.sh
@@ -1,25 +1,24 @@
#!/bin/sh
echo This cant be used alone, see OFBIZ-10287. You need for now to use all-manual-nicely.sh
-cd /home/ofbizDemo/branch17.12
+
+cd /home/ofbizDemo/branch22.01
+
+# checkout patched files before patching them, else git pull would not work
+git checkout framework/webapp/config/url.properties
+git checkout framework/webapp/config/fop.xconf
git pull
-rm /home/ofbizDemo/branch17.12/framework/base/config/*.jks
+patch -p0 < /home/ofbizDemo/branch22.01/url.properties.patch
+patch -p0 < /home/ofbizDemo/branch22.01/fop.xconf.patch
-# I have decided to apply patches once for all. The reason is else they are
-# applied once and not later. So it's easier like that.
-# If we need to change the patches they will be reverted and applied again.
-# Hopefully only when changing stable and old.
+# We don't want *.jks, we use "Let's encrypt"
+rm /home/ofbizDemo/branch22.01/framework/base/config/*.jks
-#patch -p0 < /home/ofbizDemo/branch17.12/url.properties.patch
-#patch -p0 < /home/ofbizDemo/branch17.12/fop.xconf.patch
-
-
-#the ones under plugins must be applied each time
-# because pullAllPluginsSource removes the plugins dir
./gradlew --no-daemon pullAllPluginsSource
-cd /home/ofbizDemo/branch17.12/plugins
-patch -p0 < /home/ofbizDemo/branch17.12/solr.config.patch
+# Here no need to check out, it's not a repo. So patching is OK
+cd /home/ofbizDemo/branch22.01/plugins
+patch -p0 < /home/ofbizDemo/branch22.01/solr.config.patch
cd ..
./gradlew --no-daemon "ofbiz --shutdown --portoffset 20000"
diff --git a/demo-backup/patch/old/fop.xconf.patch b/demo-backup/patch/next/fop.xconf.patch
similarity index 91%
rename from demo-backup/patch/old/fop.xconf.patch
rename to demo-backup/patch/next/fop.xconf.patch
index 22a036e..ab41ec2 100644
--- a/demo-backup/patch/old/fop.xconf.patch
+++ b/demo-backup/patch/next/fop.xconf.patch
@@ -7,7 +7,7 @@
<!-- Base URL for resolving relative URLs -->
- <base>http://localhost:8080</base>
-+ <base>https://demo-old.ofbiz.apache.org</base>
++ <base>https://demo-next.ofbiz.apache.org</base>
<!-- Source resolution in dpi (dots/pixels per inch) for determining the size of pixels in SVG and bitmap images, default: 72dpi -->
<source-resolution>72</source-resolution>
diff --git a/demo-backup/patch/old/solr.config.patch b/demo-backup/patch/next/solr.config.patch
similarity index 96%
rename from demo-backup/patch/old/solr.config.patch
rename to demo-backup/patch/next/solr.config.patch
index 69d1f4e..d5bbdbe 100644
--- a/demo-backup/patch/old/solr.config.patch
+++ b/demo-backup/patch/next/solr.config.patch
@@ -8,7 +8,7 @@
+# complete url with protocol, domainName,port(if require), and webapp path
+# complete url will be given preference if set
-+solr.complete.url=https://demo-old.ofbiz.apache.org/solr
++solr.complete.url=https://demo-next.ofbiz.apache.org/solr
+
# Global solr ECA service toggling
# Set to true to enable solr indexing using ECAs/SECAs.
diff --git a/demo-backup/patch/old/url.properties.patch b/demo-backup/patch/next/url.properties.patch
similarity index 82%
rename from demo-backup/patch/old/url.properties.patch
rename to demo-backup/patch/next/url.properties.patch
index 74f5bdd..05004fb 100644
--- a/demo-backup/patch/old/url.properties.patch
+++ b/demo-backup/patch/next/url.properties.patch
@@ -8,8 +8,8 @@
# -- these are for general content such as images, js & css files, or non-dynamic HTML files
-content.url.prefix.secure=
-content.url.prefix.standard=
-+content.url.prefix.secure=https://demo-old.ofbiz.apache.org
-+content.url.prefix.standard=https://demo-old.ofbiz.apache.org
++content.url.prefix.secure=https://demo-next.ofbiz.apache.org
++content.url.prefix.standard=https://demo-next.ofbiz.apache.org
# Here you can set the domain string to use for new cookies
cookie.domain=
