midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-114 Server installer broken. Fixed webstore servlet not loading. Improve consistency across all the setup shell script file. 

(transplanted from 164ccb36b41f7f33f6d81b87f914c23cb10df409)
This commit is contained in:
Heng Sin Low 2012-02-02 11:49:17 +08:00
parent 7aceaecff6
commit c0bb5858c4
6 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
org.adempiere.server-feature/feature.xml
View File

@ -337,4 +337,11 @@
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin
id="org.eclipse.equinox.http.registry"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
</feature> </feature>

4
org.adempiere.server-feature/server.product
View File

@ -34,6 +34,9 @@
<configurations> <configurations>
<plugin id="org.adempiere.base" autoStart="true" startLevel="4" /> <plugin id="org.adempiere.base" autoStart="true" startLevel="4" />
<plugin id="org.adempiere.eclipse.equinox.http.servlet" autoStart="true" startLevel="0" />
<plugin id="org.adempiere.eclipse.equinox.http.servletbridge" autoStart="true" startLevel="0" />
<plugin id="org.adempiere.eclipse.equinox.servletbridge" autoStart="true" startLevel="0" />
<plugin id="org.adempiere.install" autoStart="true" startLevel="4" /> <plugin id="org.adempiere.install" autoStart="true" startLevel="4" />
<plugin id="org.adempiere.replication.server" autoStart="true" startLevel="4" /> <plugin id="org.adempiere.replication.server" autoStart="true" startLevel="4" />
<plugin id="org.adempiere.report.jasper.webapp" autoStart="true" startLevel="4" /> <plugin id="org.adempiere.report.jasper.webapp" autoStart="true" startLevel="4" />
@ -44,6 +47,7 @@
<plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" /> <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
<plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="3" /> <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="3" />
<plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="3" /> <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="3" />
<plugin id="org.eclipse.equinox.http.registry" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.gemini.web.core" autoStart="true" startLevel="4" /> <plugin id="org.eclipse.gemini.web.core" autoStart="true" startLevel="4" />
<plugin id="org.eclipse.gemini.web.extender" autoStart="true" startLevel="4" /> <plugin id="org.eclipse.gemini.web.extender" autoStart="true" startLevel="4" />
<plugin id="org.eclipse.gemini.web.tomcat" autoStart="true" startLevel="4" /> <plugin id="org.eclipse.gemini.web.tomcat" autoStart="true" startLevel="4" />

5
org.adempiere.server-feature/setup-alt.bat
View File

@ -1,4 +1,4 @@
@Title Setup Adempiere Server @Title ... Setup Adempiere Server
@Rem $Header: /cvsroot/adempiere/install/Adempiere/RUN_setup.bat,v 1.19 2005/09/08 21:54:12 jjanke Exp $ @Rem $Header: /cvsroot/adempiere/install/Adempiere/RUN_setup.bat,v 1.19 2005/09/08 21:54:12 jjanke Exp $
@Echo off @Echo off
@ -30,9 +30,10 @@ goto START
:NEXT :NEXT
@REM setup tomcat @REM setup tomcat
@Echo ... Setup Tomcat
@"%JAVA%" -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=setup -jar plugins/org.eclipse.osgi_3.6.2.R36x_v20110210.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.6.2.R36x_v20110210.jar -application org.eclipse.ant.core.antRunner -buildfile build.xml
@Echo . @Echo ...
@Echo For problems, check log file in base directory @Echo For problems, check log file in base directory
@Rem Wait 10 second @Rem Wait 10 second
@PING 1.1.1.1 -n 1 -w 10000 > NUL @PING 1.1.1.1 -n 1 -w 10000 > NUL

9
org.adempiere.server-feature/setup-alt.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# #
echo Setup Adempiere Server echo ... Setup Adempiere Server
# $Header: /cvsroot/adempiere/install/Adempiere/RUN_setup.sh,v 1.19 2005/09/08 21:54:12 jjanke Exp $ # $Header: /cvsroot/adempiere/install/Adempiere/RUN_setup.sh,v 1.19 2005/09/08 21:54:12 jjanke Exp $
if [ $JAVA_HOME ]; then if [ $JAVA_HOME ]; then
@ -17,14 +17,13 @@ fi
#setup Adempiere.properties and AdempiereEnv.propertiess #setup Adempiere.properties and AdempiereEnv.propertiess
$JAVA -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=setup -jar plugins/org.eclipse.osgi_3.6.2.R36x_v20110210.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.6.2.R36x_v20110210.jar -application org.adempiere.install.application -consoleLog
echo ... Setup Tomcat
#setup tomcat #setup tomcat
$JAVA -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=setup -jar plugins/org.eclipse.osgi_3.6.2.R36x_v20110210.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.6.2.R36x_v20110210.jar -application org.eclipse.ant.core.antRunner -buildfile build.xml
echo =================================== echo ... Make .sh executable
echo Make .sh executable & set Env
echo ===================================
chmod -R a+x *.sh chmod -R a+x *.sh
find . -name '*.sh' -exec chmod a+x '{}' \; find . -name '*.sh' -exec chmod a+x '{}' \;
echo . echo ...
echo For problems, check log file in base directory echo For problems, check log file in base directory

7
org.adempiere.server-feature/setup.bat
View File

@ -1,8 +1,8 @@
@Title Install Adempiere Server @Title ... Setup Adempiere Server
@Echo off @Echo off
@REM Setup Adempiere.properties and AdempiereEnv.properties @REM Setup Adempiere.properties and AdempiereEnv.properties
adempiere -noExit --launcher.ini setup.ini -application org.adempiere.install.application -consoleLog adempiere --launcher.ini setup.ini -application org.adempiere.install.application -consoleLog
@Echo ErrorLevel = %ERRORLEVEL% @Echo ErrorLevel = %ERRORLEVEL%
@IF NOT ERRORLEVEL = 1 GOTO NEXT @IF NOT ERRORLEVEL = 1 GOTO NEXT
@ -14,9 +14,10 @@ adempiere -noExit --launcher.ini setup.ini -application org.adempiere.install.ap
:NEXT :NEXT
@REM Setup Tomcat @REM Setup Tomcat
@Echo ... Setup Tomcat
adempiere --launcher.ini setup.ini -application org.eclipse.ant.core.antRunner -buildfile build.xml adempiere --launcher.ini setup.ini -application org.eclipse.ant.core.antRunner -buildfile build.xml
@Echo . @Echo ...
@Echo For problems, check log file in base directory @Echo For problems, check log file in base directory
@Rem Wait 10 second @Rem Wait 10 second
@PING 1.1.1.1 -n 1 -w 10000 > NUL @PING 1.1.1.1 -n 1 -w 10000 > NUL

11
org.adempiere.server-feature/setup.sh
View File

@ -1,12 +1,17 @@
#!/bin/sh #!/bin/sh
# #
echo Setup Adempiere Server echo ... Setup Adempiere Server
# Setup Adempiere.properties and AdempiereEnv.properties # Setup Adempiere.properties and AdempiereEnv.properties
./adempiere -noExit --launcher.ini setup.ini -application org.adempiere.install.application ./adempiere --launcher.ini setup.ini -application org.adempiere.install.application
echo ... Setup Tomcat
# Setup Tomcat # Setup Tomcat
./adempiere --launcher.ini setup.ini -application org.eclipse.ant.core.antRunner -buildfile build.xml ./adempiere --launcher.ini setup.ini -application org.eclipse.ant.core.antRunner -buildfile build.xml
echo . echo ... Make .sh executable
chmod -R a+x *.sh
find . -name '*.sh' -exec chmod a+x '{}' \;
echo ...
echo For problems, check log file in base directory echo For problems, check log file in base directory