From f40c9a52ecbb5260ac9418d37bb863cb502bed3c Mon Sep 17 00:00:00 2001 From: Heng Sin Low Date: Sat, 10 Jul 2010 18:09:49 +0800 Subject: [PATCH] converted to osgi war bundle --- serverRoot/.classpath | 10 +++----- serverRoot/.packaging | 2 -- serverRoot/.project | 11 +++++++++ serverRoot/{src/web => }/AdemPiere150x50.gif | Bin serverRoot/{src/web => }/Adempiere120x60.gif | Bin serverRoot/{src/web => }/Background.gif | Bin serverRoot/{src/web => }/C32.gif | Bin serverRoot/{src/web => }/Logo.gif | Bin serverRoot/META-INF/MANIFEST.MF | 19 +++++++++++++++ serverRoot/RUN_build.bat | 20 ---------------- serverRoot/RUN_build.sh | 18 -------------- ...Remote Debug Adempiere - serverRoot.launch | 22 ------------------ serverRoot/{src/web => }/WEB-INF/web.xml | 0 serverRoot/{src/web => }/adempiere.html | 0 serverRoot/{src/web => }/adempiere.jnlp | 0 serverRoot/{src/web => }/adempiere_logo.gif | Bin serverRoot/{src/web => }/adempiere_logo.png | Bin serverRoot/{src/web => }/adempiere_logo2.gif | Bin serverRoot/{src/web => }/adempiere_logo3.png | Bin serverRoot/{src/web => }/applet.html | 0 serverRoot/build.properties | 12 ++++++++++ serverRoot/documentation.bat | 5 ---- serverRoot/{src/web => }/error.html | 0 serverRoot/{src/web => }/favicon.ico | Bin serverRoot/{src/web => }/footer_bar.gif | Bin serverRoot/{src/web => }/header_banner.jpg | Bin serverRoot/{src/web => }/header_banner.png | Bin serverRoot/{src/web => }/header_bar.jpg | Bin serverRoot/{src/web => }/index.html | 0 serverRoot/packages.txt | 4 ---- serverRoot/{src/web => }/robots.txt | 0 serverRoot/{src/web => }/standard.css | 0 serverRoot/{src/web => }/webstart.jpg | Bin serverRoot/{src/web => }/webstart_s.jpg | Bin serverRoot/{src/web => }/zip.gif | Bin 35 files changed, 45 insertions(+), 78 deletions(-) delete mode 100644 serverRoot/.packaging rename serverRoot/{src/web => }/AdemPiere150x50.gif (100%) rename serverRoot/{src/web => }/Adempiere120x60.gif (100%) rename serverRoot/{src/web => }/Background.gif (100%) rename serverRoot/{src/web => }/C32.gif (100%) rename serverRoot/{src/web => }/Logo.gif (100%) create mode 100644 serverRoot/META-INF/MANIFEST.MF delete mode 100644 serverRoot/RUN_build.bat delete mode 100644 serverRoot/RUN_build.sh delete mode 100644 serverRoot/Remote Debug Adempiere - serverRoot.launch rename serverRoot/{src/web => }/WEB-INF/web.xml (100%) rename serverRoot/{src/web => }/adempiere.html (100%) rename serverRoot/{src/web => }/adempiere.jnlp (100%) rename serverRoot/{src/web => }/adempiere_logo.gif (100%) rename serverRoot/{src/web => }/adempiere_logo.png (100%) rename serverRoot/{src/web => }/adempiere_logo2.gif (100%) rename serverRoot/{src/web => }/adempiere_logo3.png (100%) rename serverRoot/{src/web => }/applet.html (100%) create mode 100644 serverRoot/build.properties delete mode 100644 serverRoot/documentation.bat rename serverRoot/{src/web => }/error.html (100%) rename serverRoot/{src/web => }/favicon.ico (100%) rename serverRoot/{src/web => }/footer_bar.gif (100%) rename serverRoot/{src/web => }/header_banner.jpg (100%) rename serverRoot/{src/web => }/header_banner.png (100%) rename serverRoot/{src/web => }/header_bar.jpg (100%) rename serverRoot/{src/web => }/index.html (100%) delete mode 100644 serverRoot/packages.txt rename serverRoot/{src/web => }/robots.txt (100%) rename serverRoot/{src/web => }/standard.css (100%) rename serverRoot/{src/web => }/webstart.jpg (100%) rename serverRoot/{src/web => }/webstart_s.jpg (100%) rename serverRoot/{src/web => }/zip.gif (100%) diff --git a/serverRoot/.classpath b/serverRoot/.classpath index 334f94edc9..aae0f4ae6a 100644 --- a/serverRoot/.classpath +++ b/serverRoot/.classpath @@ -2,13 +2,9 @@ + + - - - - - - - + diff --git a/serverRoot/.packaging b/serverRoot/.packaging deleted file mode 100644 index a336b0bb42..0000000000 --- a/serverRoot/.packaging +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/serverRoot/.project b/serverRoot/.project index 292a281227..18191035d0 100644 --- a/serverRoot/.project +++ b/serverRoot/.project @@ -15,8 +15,19 @@ + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + org.eclipse.jdt.core.javanature + org.eclipse.pde.PluginNature diff --git a/serverRoot/src/web/AdemPiere150x50.gif b/serverRoot/AdemPiere150x50.gif similarity index 100% rename from serverRoot/src/web/AdemPiere150x50.gif rename to serverRoot/AdemPiere150x50.gif diff --git a/serverRoot/src/web/Adempiere120x60.gif b/serverRoot/Adempiere120x60.gif similarity index 100% rename from serverRoot/src/web/Adempiere120x60.gif rename to serverRoot/Adempiere120x60.gif diff --git a/serverRoot/src/web/Background.gif b/serverRoot/Background.gif similarity index 100% rename from serverRoot/src/web/Background.gif rename to serverRoot/Background.gif diff --git a/serverRoot/src/web/C32.gif b/serverRoot/C32.gif similarity index 100% rename from serverRoot/src/web/C32.gif rename to serverRoot/C32.gif diff --git a/serverRoot/src/web/Logo.gif b/serverRoot/Logo.gif similarity index 100% rename from serverRoot/src/web/Logo.gif rename to serverRoot/Logo.gif diff --git a/serverRoot/META-INF/MANIFEST.MF b/serverRoot/META-INF/MANIFEST.MF new file mode 100644 index 0000000000..819d9605e0 --- /dev/null +++ b/serverRoot/META-INF/MANIFEST.MF @@ -0,0 +1,19 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: org.adempiere.serverRoot +Bundle-SymbolicName: org.adempiere.serverRoot;singleton:=true +Bundle-Version: 0.0.0.1 +Require-Bundle: org.eclipse.osgi.services;bundle-version="3.1.100", + org.eclipse.core.runtime;bundle-version="3.5.0", + com.springsource.javax.servlet;bundle-version="2.5.0", + com.springsource.javax.servlet.jsp;bundle-version="2.1.0", + org.adempiere.base;bundle-version="0.0.0", + org.adempiere.tools;bundle-version="0.0.0", + org.adempiere.serverApps;bundle-version="0.0.0", + com.springsource.javax.jms;bundle-version="1.1.0" +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Web-ContextPath: admin +Eclipse-RegisterBuddy: org.adempiere.tools +Bundle-ClassPath: WEB-INF/lib/jardiff.jar, + WEB-INF/lib/jnlp-servlet.jar, + . diff --git a/serverRoot/RUN_build.bat b/serverRoot/RUN_build.bat deleted file mode 100644 index 159a54700e..0000000000 --- a/serverRoot/RUN_build.bat +++ /dev/null @@ -1,20 +0,0 @@ -@Title Build Adempiere Root -@Rem $Header: /cvsroot/adempiere/serverRoot/RUN_build.bat,v 1.11 2005/09/16 00:50:14 jjanke Exp $ - -@CALL ..\utils_dev\myDevEnv.bat -@IF NOT %ADEMPIERE_ENV%==Y GOTO NOBUILD - -@echo Cleanup ... -@"%JAVA_HOME%\bin\java" -Dant.home="." %ANT_PROPERTIES% org.apache.tools.ant.Main clean - -@echo Building ... -@"%JAVA_HOME%\bin\java" -Dant.home="." %ANT_PROPERTIES% org.apache.tools.ant.Main main - -@Echo Done ... -@Rem Wait 60 second -@PING 1.1.1.1 -n 1 -w 60000 > NUL -@Exit - -:NOBUILD -@Echo Check myDevEnv.bat (copy from myDevEnvTemplate.bat) -@Pause diff --git a/serverRoot/RUN_build.sh b/serverRoot/RUN_build.sh deleted file mode 100644 index 5f80633c60..0000000000 --- a/serverRoot/RUN_build.sh +++ /dev/null @@ -1,18 +0,0 @@ -# Module compiling script -# Ported from Windows script Marek Mosiewicz - - -SAVED_DIR=`pwd` #save current dir -cd `dirname $0`/../utils_dev #change dir to place where script resides - doesn not work with sym links -UTILS_DEV=`pwd` #this is adempiere source -cd $SAVED_DIR #back to the saved directory - -. $UTILS_DEV/myDevEnv.sh #call environment -echo done -if [ ! $ADEMPIERE_ENV==Y ] ; then - echo "Can't set developemeent environemnt - check myDevEnv.sh" - exit 1 -fi - -echo running Ant -$JAVA_HOME/bin/java -Dant.home="." $ANT_PROPERTIES org.apache.tools.ant.Main diff --git a/serverRoot/Remote Debug Adempiere - serverRoot.launch b/serverRoot/Remote Debug Adempiere - serverRoot.launch deleted file mode 100644 index 45a2d19cc1..0000000000 --- a/serverRoot/Remote Debug Adempiere - serverRoot.launch +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/serverRoot/src/web/WEB-INF/web.xml b/serverRoot/WEB-INF/web.xml similarity index 100% rename from serverRoot/src/web/WEB-INF/web.xml rename to serverRoot/WEB-INF/web.xml diff --git a/serverRoot/src/web/adempiere.html b/serverRoot/adempiere.html similarity index 100% rename from serverRoot/src/web/adempiere.html rename to serverRoot/adempiere.html diff --git a/serverRoot/src/web/adempiere.jnlp b/serverRoot/adempiere.jnlp similarity index 100% rename from serverRoot/src/web/adempiere.jnlp rename to serverRoot/adempiere.jnlp diff --git a/serverRoot/src/web/adempiere_logo.gif b/serverRoot/adempiere_logo.gif similarity index 100% rename from serverRoot/src/web/adempiere_logo.gif rename to serverRoot/adempiere_logo.gif diff --git a/serverRoot/src/web/adempiere_logo.png b/serverRoot/adempiere_logo.png similarity index 100% rename from serverRoot/src/web/adempiere_logo.png rename to serverRoot/adempiere_logo.png diff --git a/serverRoot/src/web/adempiere_logo2.gif b/serverRoot/adempiere_logo2.gif similarity index 100% rename from serverRoot/src/web/adempiere_logo2.gif rename to serverRoot/adempiere_logo2.gif diff --git a/serverRoot/src/web/adempiere_logo3.png b/serverRoot/adempiere_logo3.png similarity index 100% rename from serverRoot/src/web/adempiere_logo3.png rename to serverRoot/adempiere_logo3.png diff --git a/serverRoot/src/web/applet.html b/serverRoot/applet.html similarity index 100% rename from serverRoot/src/web/applet.html rename to serverRoot/applet.html diff --git a/serverRoot/build.properties b/serverRoot/build.properties new file mode 100644 index 0000000000..94b89c0bb9 --- /dev/null +++ b/serverRoot/build.properties @@ -0,0 +1,12 @@ +bin.includes = META-INF/,\ + WEB-INF/lib/jardiff.jar,\ + WEB-INF/lib/jnlp-servlet.jar,\ + . +bin.excludes = src/**,\ + .settings/**,\ + .classpath,\ + .project,\ + build.properties,\ + build.xml +source.. = src/main/server/,\ + src/main/servlet/ diff --git a/serverRoot/documentation.bat b/serverRoot/documentation.bat deleted file mode 100644 index 182c3fd299..0000000000 --- a/serverRoot/documentation.bat +++ /dev/null @@ -1,5 +0,0 @@ -@Rem API Documentation for Server - -call ..\doc\documentation.bat "src\main\client;src\main\ejb;src\main\server;src\main\servlet" doc -private - -@pause diff --git a/serverRoot/src/web/error.html b/serverRoot/error.html similarity index 100% rename from serverRoot/src/web/error.html rename to serverRoot/error.html diff --git a/serverRoot/src/web/favicon.ico b/serverRoot/favicon.ico similarity index 100% rename from serverRoot/src/web/favicon.ico rename to serverRoot/favicon.ico diff --git a/serverRoot/src/web/footer_bar.gif b/serverRoot/footer_bar.gif similarity index 100% rename from serverRoot/src/web/footer_bar.gif rename to serverRoot/footer_bar.gif diff --git a/serverRoot/src/web/header_banner.jpg b/serverRoot/header_banner.jpg similarity index 100% rename from serverRoot/src/web/header_banner.jpg rename to serverRoot/header_banner.jpg diff --git a/serverRoot/src/web/header_banner.png b/serverRoot/header_banner.png similarity index 100% rename from serverRoot/src/web/header_banner.png rename to serverRoot/header_banner.png diff --git a/serverRoot/src/web/header_bar.jpg b/serverRoot/header_bar.jpg similarity index 100% rename from serverRoot/src/web/header_bar.jpg rename to serverRoot/header_bar.jpg diff --git a/serverRoot/src/web/index.html b/serverRoot/index.html similarity index 100% rename from serverRoot/src/web/index.html rename to serverRoot/index.html diff --git a/serverRoot/packages.txt b/serverRoot/packages.txt deleted file mode 100644 index 88cb732d7d..0000000000 --- a/serverRoot/packages.txt +++ /dev/null @@ -1,4 +0,0 @@ -org.compiere.client -org.compiere.session -org.compiere.server -org.compiere.web diff --git a/serverRoot/src/web/robots.txt b/serverRoot/robots.txt similarity index 100% rename from serverRoot/src/web/robots.txt rename to serverRoot/robots.txt diff --git a/serverRoot/src/web/standard.css b/serverRoot/standard.css similarity index 100% rename from serverRoot/src/web/standard.css rename to serverRoot/standard.css diff --git a/serverRoot/src/web/webstart.jpg b/serverRoot/webstart.jpg similarity index 100% rename from serverRoot/src/web/webstart.jpg rename to serverRoot/webstart.jpg diff --git a/serverRoot/src/web/webstart_s.jpg b/serverRoot/webstart_s.jpg similarity index 100% rename from serverRoot/src/web/webstart_s.jpg rename to serverRoot/webstart_s.jpg diff --git a/serverRoot/src/web/zip.gif b/serverRoot/zip.gif similarity index 100% rename from serverRoot/src/web/zip.gif rename to serverRoot/zip.gif