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 2021/12/19 12:12:00 UTC
[ofbiz-tools] branch master updated: Fixed: few issues with patches in demo
This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ofbiz-tools.git
The following commit(s) were added to refs/heads/master by this push:
new 035bd69 Fixed: few issues with patches in demo
035bd69 is described below
commit 035bd692136704896c857286acfc7b07030e8fb6
Author: Jacques Le Roux <ja...@les7arts.com>
AuthorDate: Sun Dec 19 13:12:12 2021 +0100
Fixed: few issues with patches in demo
The process was based on SVN and has not been correctly upgraded since.
Git pull does not work with local changes, hence the checkout and patching after
Updates patch for R18 fop.xconf.patch
This has been also modified and tested on demo. I neglect old aka R17...
---
demo-backup/patch/stable/fop.xconf.patch | 17 ++++++++++-------
demo-backup/stable-manual.sh | 22 +++++++++++-----------
demo-backup/trunk.sh | 20 ++++++++++----------
3 files changed, 31 insertions(+), 28 deletions(-)
diff --git a/demo-backup/patch/stable/fop.xconf.patch b/demo-backup/patch/stable/fop.xconf.patch
index a279d7e..1eebe5b 100644
--- a/demo-backup/patch/stable/fop.xconf.patch
+++ b/demo-backup/patch/stable/fop.xconf.patch
@@ -1,13 +1,16 @@
-Index: framework/webapp/config/fop.xconf
-===================================================================
---- framework/webapp/config/fop.xconf (revision 1785051)
-+++ framework/webapp/config/fop.xconf (working copy)
-@@ -31,7 +31,7 @@
- <fop version="1.0">
+ framework/webapp/config/fop.xconf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git framework/webapp/config/fop.xconf framework/webapp/config/fop.xconf
+index 27576e37a5..36cdaa57c2 100644
+--- framework/webapp/config/fop.xconf
++++ framework/webapp/config/fop.xconf
+@@ -32,7 +32,7 @@ the location of this file.
+
<!-- Base URL for resolving relative URLs -->
+ <!-- We have to keep HTTP URL , FOP does not support HTTPS baseUrl for external graphics due to certificate issue (not remember exact reason) -->
- <base>http://localhost:8080</base>
+ <base>https://demo-stable.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/stable-manual.sh b/demo-backup/stable-manual.sh
index 70cf2cb..3a4d3e1 100755
--- a/demo-backup/stable-manual.sh
+++ b/demo-backup/stable-manual.sh
@@ -1,23 +1,22 @@
#!/bin/sh
echo This cant be used alone, see OFBIZ-10287. You need for now to use all-manual-nicely.sh
-cd /home/ofbizDemo/branch18.12
-git pull
-rm /home/ofbizDemo/branch18.12/framework/base/config/*.jks
-# 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.
+cd /home/ofbizDemo/branch18.12
-#patch -p0 < /home/ofbizDemo/branch18.12/url.properties.patch
-#patch -p0 < /home/ofbizDemo/branch18.12/fop.xconf.patch
+// 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
+patch -p0 < /home/ofbizDemo/branch18.12/url.properties.patch
+patch -p0 < /home/ofbizDemo/branch18.12/fop.xconf.patch
+// We don't want *.jks, we use "Let's encrypt"
+rm /home/ofbizDemo/branch18.12/framework/base/config/*.jks
-#the ones under plugins must be applied each time
-# because pullAllPluginsSource removes the plugins dir
./gradlew --no-daemon pullAllPluginsSource
+// Here no need to check out, it's not a repo. So patching is OK
cd /home/ofbizDemo/branch18.12/plugins
patch -p0 < /home/ofbizDemo/branch18.12/solr.config.patch
cd ..
@@ -27,3 +26,4 @@ cd ..
./gradlew --no-daemon loadAll
./gradlew --no-daemon gitInfoFooter
./gradlew --no-daemon "ofbizBackground --start --portoffset 10000"
+
diff --git a/demo-backup/trunk.sh b/demo-backup/trunk.sh
index b81de0f..36b5f66 100755
--- a/demo-backup/trunk.sh
+++ b/demo-backup/trunk.sh
@@ -1,21 +1,21 @@
#!/bin/sh
+echo This cant be used alone, see OFBIZ-10287. You need for now to use all-manual-nicely.sh
+
cd /home/ofbizDemo/trunk
+// 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/trunk/framework/base/config/*.jks
+patch -p0 < /home/ofbizDemo/trunk/url.properties.patch
+patch -p0 < /home/ofbizDemo/trunk/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.
-
-#patch -p0 < /home/ofbizDemo/trunk/url.properties.patch
-#patch -p0 < /home/ofbizDemo/trunk/fop.xconf.patch
+// We don't want *.jks, we use "Let's encrypt"
+rm /home/ofbizDemo/trunk/framework/base/config/*.jks
-#the ones under plugins must be applied each time
-# because pullAllPluginsSource removes the plugins dir
./gradlew --no-daemon pullAllPluginsSource
+// Here no need to check out, it's not a repo. So patching is OK
cd /home/ofbizDemo/trunk/plugins
patch -p0 < /home/ofbizDemo/trunk/solr.config.patch
cd ..