Fixed classpath to depends only on plugin dependency. Modify build file for osgi deployment
This commit is contained in:
Heng Sin Low
parent
e2d9a9a498
commit
efc28ca782
|
|
@ -2,13 +2,9 @@
|
|||
<classpath>
|
||||
<classpathentry kind="src" path="src/main/servlet"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
|
||||
<classpathentry kind="src" path="/base"/>
|
||||
<classpathentry kind="src" path="/tools"/>
|
||||
<classpathentry combineaccessrules="false" kind="src" path="/client"/>
|
||||
<classpathentry exported="true" kind="lib" path="src/web/WEB-INF/lib/commons-beanutils-bean-collections.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="src/web/WEB-INF/lib/commons-beanutils-core.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="src/web/WEB-INF/lib/commons-beanutils.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="src/web/WEB-INF/lib/commons-codec-1.3.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="src/web/WEB-INF/lib/commons-collections-3.1.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="src/web/WEB-INF/lib/commons-digester-1.7.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="src/web/WEB-INF/lib/commons-fileupload.jar"/>
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@ Bundle-ClassPath: serverApps.jar,
|
|||
src/web/WEB-INF/lib/commons-beanutils-bean-collections.jar,
|
||||
src/web/WEB-INF/lib/commons-beanutils-core.jar,
|
||||
src/web/WEB-INF/lib/commons-beanutils.jar,
|
||||
src/web/WEB-INF/lib/commons-codec-1.3.jar,
|
||||
src/web/WEB-INF/lib/commons-collections-3.1.jar,
|
||||
src/web/WEB-INF/lib/commons-digester-1.7.jar,
|
||||
src/web/WEB-INF/lib/commons-fileupload.jar,
|
||||
|
|
@ -28,11 +27,6 @@ Export-Package: org.apache.commons.beanutils,
|
|||
org.apache.commons.beanutils.converters,
|
||||
org.apache.commons.beanutils.locale,
|
||||
org.apache.commons.beanutils.locale.converters,
|
||||
org.apache.commons.codec,
|
||||
org.apache.commons.codec.binary,
|
||||
org.apache.commons.codec.digest,
|
||||
org.apache.commons.codec.language,
|
||||
org.apache.commons.codec.net,
|
||||
org.apache.commons.collections,
|
||||
org.apache.commons.collections.bag,
|
||||
org.apache.commons.collections.bidimap,
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@ bin.includes = META-INF/,\
|
|||
src/web/WEB-INF/lib/commons-beanutils-bean-collections.jar,\
|
||||
src/web/WEB-INF/lib/commons-beanutils-core.jar,\
|
||||
src/web/WEB-INF/lib/commons-beanutils.jar,\
|
||||
src/web/WEB-INF/lib/commons-codec-1.3.jar,\
|
||||
src/web/WEB-INF/lib/commons-collections-3.1.jar,\
|
||||
src/web/WEB-INF/lib/commons-digester-1.7.jar,\
|
||||
src/web/WEB-INF/lib/commons-fileupload.jar,\
|
||||
|
|
|
|||
|
|
@ -4,115 +4,29 @@
|
|||
<!-- ============================================= -->
|
||||
<!-- $Header: /cvs/adempiere/serverApps/build.xml,v 1.14 2006/08/07 18:23:48 possibilityforge Exp $-->
|
||||
|
||||
<project name="adempiereApps" default="serverAppsDeployServer" basedir=".">
|
||||
<project name="adempiereApps" default="plugin" basedir=".">
|
||||
|
||||
<!--<property environment="env"/>-->
|
||||
<import file="../utils_dev/properties.xml"/>
|
||||
|
||||
<property name="src.dir" value="${basedir}/src"/>
|
||||
<property name="src.main.dir" value="${src.dir}/main"/>
|
||||
<property name="src.client.dir" value="${src.main.dir}/client"/>
|
||||
<property name="src.servlet.dir" value="${src.main.dir}/servlet"/>
|
||||
<property name="src.resources.dir" value="${src.dir}/resources"/>
|
||||
<property name="src.web.dir" value="${src.dir}/web"/>
|
||||
|
||||
<property name="build.dir" value="${basedir}/build"/>
|
||||
<property name="build.classes.dir" value="${build.dir}/classes"/>
|
||||
<property name="build.tmp.dir" value="${build.dir}/tmp"/>
|
||||
<property name="build.deploy.dir" value="${build.dir}/deploy"/>
|
||||
<property name="build.jar.dir" value="${build.dir}/jar"/>
|
||||
|
||||
<target name="serverAppsInit">
|
||||
<target name="init">
|
||||
<echo message="=========== Build Server Application"/>
|
||||
<tstamp/>
|
||||
</target>
|
||||
|
||||
|
||||
<path id="base.path">
|
||||
<pathelement location="../lib/Adempiere.jar" />
|
||||
<pathelement location="../lib/CSTools.jar" />
|
||||
<pathelement location="../tools/lib/servlet-api.jar" />
|
||||
<pathelement location="../tools/lib/jsp-api.jar" />
|
||||
</path>
|
||||
|
||||
<!-- =========================================== -->
|
||||
<!-- Compiles the source code -->
|
||||
<!-- =========================================== -->
|
||||
<target name="serverAppsCompile" depends="serverAppsInit">
|
||||
|
||||
<mkdir dir="${build.dir}"/>
|
||||
<!-- Compile Web -->
|
||||
<javac
|
||||
target="1.5"
|
||||
destdir="${build.classes.dir}"
|
||||
debug="on"
|
||||
deprecation="off"
|
||||
optimize="on"
|
||||
classpathref="base.path">
|
||||
<src path="${src.servlet.dir}"/>
|
||||
</javac>
|
||||
|
||||
<copy todir="${build.classes.dir}">
|
||||
<fileset dir="${src.servlet.dir}">
|
||||
<include name="**/images/*"/>
|
||||
<include name="**/*.gif"/>
|
||||
<include name="**/*.jpg"/>
|
||||
<include name="**/*.wav"/>
|
||||
<include name="**/*.htm"/>
|
||||
<include name="**/*.html"/>
|
||||
<include name="**/*.properties"/>
|
||||
<exclude name="**/package.html"/>
|
||||
</fileset>
|
||||
</copy>
|
||||
|
||||
<target name="plugin" depends="init">
|
||||
<buildPlugin workspaceDirectory="${workspace}"
|
||||
projectName="serverApps"
|
||||
targetPlatformId="target.platform"
|
||||
destination="../lib"
|
||||
buildSourceJar="false" />
|
||||
</target>
|
||||
|
||||
<!-- =========================================== -->
|
||||
<!-- Creates the jar archives -->
|
||||
<!-- =========================================== -->
|
||||
<target name="serverAppsJar" depends="serverAppsCompile">
|
||||
<mkdir dir="${build.jar.dir}"/>
|
||||
|
||||
<!-- Jar Apps Code -->
|
||||
<jar
|
||||
jarfile="${build.jar.dir}/adempiereApps.jar">
|
||||
<fileset
|
||||
dir="${build.classes.dir}"
|
||||
includes="**/*.*">
|
||||
</fileset>
|
||||
<manifest>
|
||||
<attribute name="Specification-Title" value="AdempiereApps"/>
|
||||
<attribute name="Specification-Version" value="${env.ADEMPIERE_VERSION}"/>
|
||||
<attribute name="Specification-Vendor" value="Adempiere"/>
|
||||
<attribute name="Implementation-Title" value="AdempiereApps ${env.ADEMPIERE_VERSION}"/>
|
||||
<attribute name="Implementation-Version" value="${env.ADEMPIERE_VERSION} ${DSTAMP}-${TSTAMP}"/>
|
||||
<attribute name="Implementation-Vendor" value="${env.ADEMPIERE_VENDOR}"/>
|
||||
<attribute name="Implementation-URL" value="http://www.adempiere.com"/>
|
||||
<attribute name="Class-Path" value="Adempiere.jar AdempiereSLib.jar"/>
|
||||
</manifest>
|
||||
</jar>
|
||||
|
||||
</target>
|
||||
|
||||
<!-- =========================================== -->
|
||||
<!-- Creates the server binary -->
|
||||
<!-- =========================================== -->
|
||||
<target name="serverAppsDeployServer" depends="serverAppsJar">
|
||||
<copy todir="../lib">
|
||||
<fileset dir="${build.deploy.dir}"
|
||||
includes="*.jar"/>
|
||||
<fileset dir="${build.jar.dir}"
|
||||
includes="*.jar"/>
|
||||
</copy>
|
||||
</target>
|
||||
|
||||
|
||||
<!-- =========================================== -->
|
||||
<!-- Cleans up the current build -->
|
||||
<!-- =========================================== -->
|
||||
<target name="clean">
|
||||
<delete dir="${build.dir}"/>
|
||||
<delete file="../lib/adempiereApps.jar" failonerror="false"/>
|
||||
<delete>
|
||||
<fileset dir="../lib">
|
||||
<include name="org.adempiere.serverApp*.jar"/>
|
||||
</fileset>
|
||||
</delete>
|
||||
</target>
|
||||
|
||||
</project>
|
||||
|
|
|
|||
Loading…
Reference in New Issue