From 4bb88c5fd06e28012da47c74b6292c15ae909651 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Tue, 1 May 2012 12:26:04 -0500 Subject: [PATCH] IDEMPIERE-225 Update setup config.ini to use 3.7.2 osgi library Thanks to longnan for seed of the patch - including other 4 files affected --- org.adempiere.server-feature/console-setup-alt.bat | 4 ++-- org.adempiere.server-feature/console-setup-alt.sh | 4 ++-- org.adempiere.server-feature/setup-alt.bat | 4 ++-- org.adempiere.server-feature/setup-alt.sh | 4 ++-- org.adempiere.server-feature/setup/configuration/config.ini | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/org.adempiere.server-feature/console-setup-alt.bat b/org.adempiere.server-feature/console-setup-alt.bat index 418ec6aec8..84b457cc2e 100644 --- a/org.adempiere.server-feature/console-setup-alt.bat +++ b/org.adempiere.server-feature/console-setup-alt.bat @@ -18,7 +18,7 @@ goto START :START @REM Setup Adempiere.properties and AdempiereEnv.properties -@"%JAVA%" -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=setup -jar plugins/org.eclipse.osgi_3.7.1.R37x_v20110808-1106.jar -clean -noRegistryCache -application org.adempiere.install.console-application +@"%JAVA%" -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=setup -jar plugins/org.eclipse.osgi_3.7.2.v20120110-1415.jar -clean -noRegistryCache -application org.adempiere.install.console-application @Echo ErrorLevel = %ERRORLEVEL% @IF NOT ERRORLEVEL = 1 GOTO NEXT @@ -30,7 +30,7 @@ goto START :NEXT @REM setup tomcat -@"%JAVA%" -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=setup -jar plugins/org.eclipse.osgi_3.7.1.R37x_v20110808-1106.jar -clean -noRegistryCache -application org.eclipse.ant.core.antRunner -buildfile build.xml +@"%JAVA%" -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=setup -jar plugins/org.eclipse.osgi_3.7.2.v20120110-1415.jar -clean -noRegistryCache -application org.eclipse.ant.core.antRunner -buildfile build.xml @Echo . @Echo For problems, check log file in base directory diff --git a/org.adempiere.server-feature/console-setup-alt.sh b/org.adempiere.server-feature/console-setup-alt.sh index 05eb6685c2..549adeb280 100644 --- a/org.adempiere.server-feature/console-setup-alt.sh +++ b/org.adempiere.server-feature/console-setup-alt.sh @@ -16,10 +16,10 @@ fi # Setup Adempiere.properties and AdempiereEnv.properties -$JAVA -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=setup -jar plugins/org.eclipse.osgi_3.7.1.R37x_v20110808-1106.jar -application org.adempiere.install.console-application +$JAVA -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=setup -jar plugins/org.eclipse.osgi_3.7.2.v20120110-1415.jar -application org.adempiere.install.console-application # Setup Tomcat -$JAVA -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=setup -jar plugins/org.eclipse.osgi_3.7.1.R37x_v20110808-1106.jar -application org.eclipse.ant.core.antRunner -buildfile build.xml +$JAVA -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=setup -jar plugins/org.eclipse.osgi_3.7.2.v20120110-1415.jar -application org.eclipse.ant.core.antRunner -buildfile build.xml echo =================================== echo Make .sh executable & set Env diff --git a/org.adempiere.server-feature/setup-alt.bat b/org.adempiere.server-feature/setup-alt.bat index a096bf3635..d603d1c2b7 100644 --- a/org.adempiere.server-feature/setup-alt.bat +++ b/org.adempiere.server-feature/setup-alt.bat @@ -18,7 +18,7 @@ goto START :START @REM Setup Adempiere.properties and AdempiereEnv.properties -@"%JAVA%" -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=setup -jar plugins/org.eclipse.osgi_3.7.1.R37x_v20110808-1106.jar -application org.adempiere.install.application -consoleLog +@"%JAVA%" -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=setup -jar plugins/org.eclipse.osgi_3.7.2.v20120110-1415.jar -application org.adempiere.install.application -consoleLog @Echo ErrorLevel = %ERRORLEVEL% @IF NOT ERRORLEVEL = 1 GOTO NEXT @@ -31,7 +31,7 @@ goto START :NEXT @REM setup tomcat @Echo ... Setup Tomcat -@"%JAVA%" -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=setup -jar plugins/org.eclipse.osgi_3.7.1.R37x_v20110808-1106.jar -application org.eclipse.ant.core.antRunner -buildfile build.xml +@"%JAVA%" -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=setup -jar plugins/org.eclipse.osgi_3.7.2.v20120110-1415.jar -application org.eclipse.ant.core.antRunner -buildfile build.xml @Echo ... @Echo For problems, check log file in base directory diff --git a/org.adempiere.server-feature/setup-alt.sh b/org.adempiere.server-feature/setup-alt.sh index b06eea1a27..7de0fd2b33 100644 --- a/org.adempiere.server-feature/setup-alt.sh +++ b/org.adempiere.server-feature/setup-alt.sh @@ -15,11 +15,11 @@ else fi #setup Adempiere.properties and AdempiereEnv.propertiess -$JAVA -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=setup -jar plugins/org.eclipse.osgi_3.7.1.R37x_v20110808-1106.jar -application org.adempiere.install.application -consoleLog +$JAVA -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=setup -jar plugins/org.eclipse.osgi_3.7.2.v20120110-1415.jar -application org.adempiere.install.application -consoleLog echo ... Setup Tomcat #setup tomcat -$JAVA -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=setup -jar plugins/org.eclipse.osgi_3.7.1.R37x_v20110808-1106.jar -application org.eclipse.ant.core.antRunner -buildfile build.xml +$JAVA -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=setup -jar plugins/org.eclipse.osgi_3.7.2.v20120110-1415.jar -application org.eclipse.ant.core.antRunner -buildfile build.xml echo ... Make .sh executable chmod -R a+x *.sh diff --git a/org.adempiere.server-feature/setup/configuration/config.ini b/org.adempiere.server-feature/setup/configuration/config.ini index 50fc6e5e16..15d1654c40 100644 --- a/org.adempiere.server-feature/setup/configuration/config.ini +++ b/org.adempiere.server-feature/setup/configuration/config.ini @@ -1,4 +1,4 @@ -osgi.framework=file\:../plugins/org.eclipse.osgi_3.7.1.R37x_v20110808-1106.jar +osgi.framework=file\:../plugins/org.eclipse.osgi_3.7.2.v20120110-1415.jar equinox.use.ds=true osgi.bundles=org.eclipse.core.variables,org.eclipse.ant.core,org.eclipse.core.runtime@start,org.adempiere.base@start,org.compiere.db.oracle.provider,org.compiere.db.postgresql.provider,org.hamcrest.core,org.junit,org.adempiere.install,org.restlet,com.springsource.net.sf.cglib,com.springsource.javax.mail,com.springsource.org.apache.activemq,com.springsource.org.apache.kahadb,org.apache.commons.collections,org.apache.ant,javax.servlet,com.springsource.javax.jms,org.apache.ecs,org.apache.commons.net,org.eclipse.equinox.app,org.eclipse.equinox.registry,org.eclipse.equinox.common@2:start,org.eclipse.core.contenttype,org.apache.poi,org.eclipse.core.jobs,org.eclipse.equinox.preferences,org.apache.commons.logging,com.springsource.org.apache.commons.logging,com.springsource.javax.management.j2ee,org.eclipse.osgi.services,com.springsource.javax.ejb,com.springsource.javax.xml.rpc,com.springsource.javax.xml.soap,com.springsource.javax.activation,javax.xml osgi.framework.extensions=