From 7184f1c80ebe27d7df615a22fe377ee76adee777 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Wed, 29 Nov 2017 10:43:04 +0100 Subject: [PATCH] IDEMPIERE-3560 - restore back previous of update.sh version before changes from IDEMPIERE-3353 - add org.idempiere.fitnesse.feature.group to the updated plugins on core --- .../update-prd.bat | 10 ++-------- .../update-prd.sh | 13 +++---------- .../update.bat | 4 +--- org.idempiere.equinox.p2.director-feature/update.sh | 5 +---- 4 files changed, 7 insertions(+), 25 deletions(-) diff --git a/org.idempiere.equinox.p2.director-feature/update-prd.bat b/org.idempiere.equinox.p2.director-feature/update-prd.bat index 1f0b2f7cf0..a4fbd288ae 100644 --- a/org.idempiere.equinox.p2.director-feature/update-prd.bat +++ b/org.idempiere.equinox.p2.director-feature/update-prd.bat @@ -6,12 +6,6 @@ set DESTINATION=%cd% @echo %DESTINATION% @echo %1% -set INSTALL_UI=%2% -set UNINSTALL_UI=%2% -if [%3]==[] goto nothird -set UNINSTALL_UI=%3% -:nothird - FOR %%c in (plugins\org.eclipse.equinox.launcher_1.*.jar) DO set JARFILE=%%c -java -Dorg.eclipse.ecf.provider.filetransfer.excludeContributors=org.eclipse.ecf.provider.filetransfer.httpclient4 -Djava.net.preferIPv4Stack=true -jar %JARFILE% -install director -configuration director/configuration -application org.eclipse.equinox.p2.director -consoleLog -profileProperties org.eclipse.update.install.features=true -destination %DESTINATION% -repository %1 -u %UNINSTALL_UI% -java -Dorg.eclipse.ecf.provider.filetransfer.excludeContributors=org.eclipse.ecf.provider.filetransfer.httpclient4 -Djava.net.preferIPv4Stack=true -jar %JARFILE% -install director -configuration director/configuration -application org.eclipse.equinox.p2.director -consoleLog -profileProperties org.eclipse.update.install.features=true -destination %DESTINATION% -repository %1 -i %INSTALL_UI% +java -Dorg.eclipse.ecf.provider.filetransfer.excludeContributors=org.eclipse.ecf.provider.filetransfer.httpclient4 -Djava.net.preferIPv4Stack=true -jar %JARFILE% -install director -configuration director/configuration -application org.eclipse.equinox.p2.director -consoleLog -profileProperties org.eclipse.update.install.features=true -destination %DESTINATION% -repository %1% -u %2% +java -Dorg.eclipse.ecf.provider.filetransfer.excludeContributors=org.eclipse.ecf.provider.filetransfer.httpclient4 -Djava.net.preferIPv4Stack=true -jar %JARFILE% -install director -configuration director/configuration -application org.eclipse.equinox.p2.director -consoleLog -profileProperties org.eclipse.update.install.features=true -destination %DESTINATION% -repository %1% -i %2% diff --git a/org.idempiere.equinox.p2.director-feature/update-prd.sh b/org.idempiere.equinox.p2.director-feature/update-prd.sh index 05f7af4bfc..a8aa4e76b5 100644 --- a/org.idempiere.equinox.p2.director-feature/update-prd.sh +++ b/org.idempiere.equinox.p2.director-feature/update-prd.sh @@ -4,13 +4,6 @@ cd $(dirname "${0}") DESTINATION=$(pwd) -VMOPTS="-Declipse.log.level=ALL -Dorg.eclipse.ecf.provider.filetransfer.excludeContributors=org.eclipse.ecf.provider.filetransfer.httpclient4 -Djava.net.preferIPv4Stack=true" - -INSTALL_UI="$2" -UNINSTALL_UI="$2" -if [ -n "$3" ]; then - # case update org.adempiere.server.product, install and un-install is difference - UNINSTALL_UI="$3" -fi -java $VMOPTS -jar plugins/org.eclipse.equinox.launcher_1.*.jar -install director -configuration director/configuration -application org.eclipse.equinox.p2.director -consoleLog -profileProperties org.eclipse.update.install.features=true -destination $DESTINATION -repository $1 -u "$UNINSTALL_UI" -java $VMOPTS -jar plugins/org.eclipse.equinox.launcher_1.*.jar -install director -configuration director/configuration -application org.eclipse.equinox.p2.director -consoleLog -profileProperties org.eclipse.update.install.features=true -destination $DESTINATION -repository $1 -i "$INSTALL_UI" \ No newline at end of file +VMOPTS="-Dorg.eclipse.ecf.provider.filetransfer.excludeContributors=org.eclipse.ecf.provider.filetransfer.httpclient4 -Djava.net.preferIPv4Stack=true" +java $VMOPTS -jar plugins/org.eclipse.equinox.launcher_1.*.jar -install director -configuration director/configuration -application org.eclipse.equinox.p2.director -consoleLog -profileProperties org.eclipse.update.install.features=true -destination $DESTINATION -repository $1 -u $2 +java $VMOPTS -jar plugins/org.eclipse.equinox.launcher_1.*.jar -install director -configuration director/configuration -application org.eclipse.equinox.p2.director -consoleLog -profileProperties org.eclipse.update.install.features=true -destination $DESTINATION -repository $1 -i $2 \ No newline at end of file diff --git a/org.idempiere.equinox.p2.director-feature/update.bat b/org.idempiere.equinox.p2.director-feature/update.bat index a98806a7ae..3afaae9b0d 100644 --- a/org.idempiere.equinox.p2.director-feature/update.bat +++ b/org.idempiere.equinox.p2.director-feature/update.bat @@ -23,9 +23,7 @@ if exist jettyhome\etc\jetty-selector.xml ( copy jettyhome\etc\jetty-selector.xml jetty-selector.xml.sav ) -set UNINSTALL_UI="org.adempiere.server.product, org.idempiere.fitnesse.feature.group" -set INSTALL_UI="org.adempiere.server.product, org.eclipse.equinox.p2.director, org.idempiere.fitnesse.feature.group, org.idempiere.equinox.p2.director.feature.group" -@call %DESTINATION%\update-prd %1 %INSTALL_UI% %UNINSTALL_UI% +@call %DESTINATION%\update-prd %1% org.adempiere.server.product,org.idempiere.fitnesse.feature.group copy idempiere.ini.sav idempiere.ini diff --git a/org.idempiere.equinox.p2.director-feature/update.sh b/org.idempiere.equinox.p2.director-feature/update.sh index ed89fddb6a..3447fa255d 100644 --- a/org.idempiere.equinox.p2.director-feature/update.sh +++ b/org.idempiere.equinox.p2.director-feature/update.sh @@ -33,10 +33,7 @@ then cp jettyhome/etc/jetty-selector.xml jetty-selector.xml.sav fi -UNINSTALL_UI="org.adempiere.server.product, org.idempiere.fitnesse.feature.group" -INSTALL_UI="org.adempiere.server.product, org.eclipse.equinox.p2.director, org.idempiere.fitnesse.feature.group, org.idempiere.equinox.p2.director.feature.group" - -$DESTINATION/update-prd.sh $1 "$INSTALL_UI" "$UNINSTALL_UI" +$DESTINATION/update-prd.sh $1 org.adempiere.server.product,org.idempiere.fitnesse.feature.group cp idempiere.ini.sav idempiere.ini