Fixed classpath to depends only on plugin dependency. Modify build file for osgi deployment
This commit is contained in:
Heng Sin Low
parent
78adb47b4b
commit
7c42c67b5e
|
|
@ -4,11 +4,6 @@
|
|||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
|
||||
<classpathentry kind="src" path="/base"/>
|
||||
<classpathentry kind="src" path="/tools"/>
|
||||
<classpathentry kind="lib" path="/tools/lib/swingx-1.6.jar"/>
|
||||
<classpathentry kind="lib" path="/tools/lib/groovy-all-1.5.1.jar"/>
|
||||
<classpathentry kind="lib" path="/tools/lib/jcommon-1.0.16.jar"/>
|
||||
<classpathentry kind="lib" path="/tools/lib/jfreechart-1.0.13.jar"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
|
||||
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
|
||||
<classpathentry kind="output" path="build"/>
|
||||
</classpath>
|
||||
|
|
|
|||
|
|
@ -3,88 +3,10 @@ Bundle-ManifestVersion: 2
|
|||
Bundle-Name: org.adempiere.client
|
||||
Bundle-SymbolicName: org.adempiere.client;singleton:=true
|
||||
Bundle-Version: 0.0.0.2
|
||||
Bundle-ClassPath: client.jar,
|
||||
lib/swingx-0.9.0.jar,
|
||||
lib/groovy-all-1.5.1.jar,
|
||||
lib/jcommon-1.0.14.jar,
|
||||
lib/jfreechart-1.0.11.jar
|
||||
Export-Package: com.keypoint,
|
||||
de.schaeffer.compiere.tools,
|
||||
groovy.inspect,
|
||||
groovy.inspect.swingui,
|
||||
groovy.io,
|
||||
groovy.lang,
|
||||
groovy.mock,
|
||||
groovy.mock.interceptor,
|
||||
groovy.model,
|
||||
groovy.security,
|
||||
groovy.servlet,
|
||||
groovy.sql,
|
||||
groovy.swing,
|
||||
groovy.swing.binding,
|
||||
groovy.swing.factory,
|
||||
groovy.swing.impl,
|
||||
groovy.text,
|
||||
groovy.time,
|
||||
groovy.ui,
|
||||
groovy.ui.icons,
|
||||
groovy.ui.text,
|
||||
groovy.ui.view,
|
||||
groovy.util,
|
||||
groovy.util.slurpersupport,
|
||||
groovy.xml,
|
||||
groovy.xml.dom,
|
||||
groovy.xml.streamingmarkupsupport,
|
||||
groovyjarjarantlr,
|
||||
groovyjarjarantlr.ASdebug,
|
||||
groovyjarjarantlr.actions.cpp,
|
||||
groovyjarjarantlr.actions.csharp,
|
||||
groovyjarjarantlr.actions.java,
|
||||
groovyjarjarantlr.actions.python,
|
||||
groovyjarjarantlr.build,
|
||||
groovyjarjarantlr.collections,
|
||||
groovyjarjarantlr.collections.impl,
|
||||
groovyjarjarantlr.debug,
|
||||
groovyjarjarantlr.debug.misc,
|
||||
groovyjarjarantlr.preprocessor,
|
||||
groovyjarjarasm.asm,
|
||||
groovyjarjarasm.asm.signature,
|
||||
groovyjarjarasm.asm.tree,
|
||||
groovyjarjarcommonscli,
|
||||
Bundle-ClassPath: client.jar
|
||||
Export-Package: de.schaeffer.compiere.tools,
|
||||
org.adempiere.apps.graph,
|
||||
org.adempiere.osgi,
|
||||
org.codehaus.groovy,
|
||||
org.codehaus.groovy.ant,
|
||||
org.codehaus.groovy.antlr,
|
||||
org.codehaus.groovy.antlr.java,
|
||||
org.codehaus.groovy.antlr.parser,
|
||||
org.codehaus.groovy.antlr.treewalker,
|
||||
org.codehaus.groovy.ast,
|
||||
org.codehaus.groovy.ast.expr,
|
||||
org.codehaus.groovy.ast.stmt,
|
||||
org.codehaus.groovy.binding,
|
||||
org.codehaus.groovy.bsf,
|
||||
org.codehaus.groovy.classgen,
|
||||
org.codehaus.groovy.control,
|
||||
org.codehaus.groovy.control.io,
|
||||
org.codehaus.groovy.control.messages,
|
||||
org.codehaus.groovy.groovydoc,
|
||||
org.codehaus.groovy.reflection,
|
||||
org.codehaus.groovy.runtime,
|
||||
org.codehaus.groovy.runtime.metaclass,
|
||||
org.codehaus.groovy.runtime.typehandling,
|
||||
org.codehaus.groovy.runtime.wrappers,
|
||||
org.codehaus.groovy.syntax,
|
||||
org.codehaus.groovy.tools,
|
||||
org.codehaus.groovy.tools.groovydoc,
|
||||
org.codehaus.groovy.tools.javac,
|
||||
org.codehaus.groovy.tools.shell,
|
||||
org.codehaus.groovy.tools.shell.commands,
|
||||
org.codehaus.groovy.tools.shell.util,
|
||||
org.codehaus.groovy.tools.xml,
|
||||
org.codehaus.groovy.vmplugin,
|
||||
org.codehaus.groovy.vmplugin.v4,
|
||||
org.codehaus.groovy.vmplugin.v5,
|
||||
org.compiere,
|
||||
org.compiere.acct,
|
||||
org.compiere.apps,
|
||||
|
|
@ -99,99 +21,10 @@ Export-Package: com.keypoint,
|
|||
org.compiere.minigrid,
|
||||
org.compiere.pos,
|
||||
org.compiere.print,
|
||||
org.eevolution.form,
|
||||
org.jdesktop.beans,
|
||||
org.jdesktop.swingx,
|
||||
org.jdesktop.swingx.action,
|
||||
org.jdesktop.swingx.auth,
|
||||
org.jdesktop.swingx.autocomplete,
|
||||
org.jdesktop.swingx.autocomplete.workarounds,
|
||||
org.jdesktop.swingx.border,
|
||||
org.jdesktop.swingx.calendar,
|
||||
org.jdesktop.swingx.color,
|
||||
org.jdesktop.swingx.combobox,
|
||||
org.jdesktop.swingx.decorator,
|
||||
org.jdesktop.swingx.error,
|
||||
org.jdesktop.swingx.event,
|
||||
org.jdesktop.swingx.geom,
|
||||
org.jdesktop.swingx.graphics,
|
||||
org.jdesktop.swingx.icon,
|
||||
org.jdesktop.swingx.image,
|
||||
org.jdesktop.swingx.multislider,
|
||||
org.jdesktop.swingx.multisplitpane,
|
||||
org.jdesktop.swingx.painter,
|
||||
org.jdesktop.swingx.painter.effects,
|
||||
org.jdesktop.swingx.plaf,
|
||||
org.jdesktop.swingx.plaf.basic,
|
||||
org.jdesktop.swingx.plaf.basic.resources,
|
||||
org.jdesktop.swingx.plaf.linux,
|
||||
org.jdesktop.swingx.plaf.macosx,
|
||||
org.jdesktop.swingx.plaf.metal,
|
||||
org.jdesktop.swingx.plaf.misc,
|
||||
org.jdesktop.swingx.plaf.motif,
|
||||
org.jdesktop.swingx.plaf.nimbus,
|
||||
org.jdesktop.swingx.plaf.windows,
|
||||
org.jdesktop.swingx.plaf.windows.resources,
|
||||
org.jdesktop.swingx.renderer,
|
||||
org.jdesktop.swingx.table,
|
||||
org.jdesktop.swingx.tips,
|
||||
org.jdesktop.swingx.tree,
|
||||
org.jdesktop.swingx.treetable,
|
||||
org.jdesktop.swingx.util,
|
||||
org.jfree,
|
||||
org.jfree.base,
|
||||
org.jfree.base.config,
|
||||
org.jfree.base.log,
|
||||
org.jfree.base.modules,
|
||||
org.jfree.chart,
|
||||
org.jfree.chart.annotations,
|
||||
org.jfree.chart.axis,
|
||||
org.jfree.chart.block,
|
||||
org.jfree.chart.demo,
|
||||
org.jfree.chart.editor,
|
||||
org.jfree.chart.encoders,
|
||||
org.jfree.chart.entity,
|
||||
org.jfree.chart.event,
|
||||
org.jfree.chart.imagemap,
|
||||
org.jfree.chart.labels,
|
||||
org.jfree.chart.needle,
|
||||
org.jfree.chart.plot,
|
||||
org.jfree.chart.plot.dial,
|
||||
org.jfree.chart.renderer,
|
||||
org.jfree.chart.renderer.category,
|
||||
org.jfree.chart.renderer.xy,
|
||||
org.jfree.chart.resources,
|
||||
org.jfree.chart.servlet,
|
||||
org.jfree.chart.title,
|
||||
org.jfree.chart.urls,
|
||||
org.jfree.chart.util,
|
||||
org.jfree.data,
|
||||
org.jfree.data.category,
|
||||
org.jfree.data.contour,
|
||||
org.jfree.data.function,
|
||||
org.jfree.data.gantt,
|
||||
org.jfree.data.general,
|
||||
org.jfree.data.io,
|
||||
org.jfree.data.jdbc,
|
||||
org.jfree.data.resources,
|
||||
org.jfree.data.statistics,
|
||||
org.jfree.data.time,
|
||||
org.jfree.data.time.ohlc,
|
||||
org.jfree.data.xml,
|
||||
org.jfree.data.xy,
|
||||
org.jfree.date,
|
||||
org.jfree.io,
|
||||
org.jfree.layout,
|
||||
org.jfree.resources,
|
||||
org.jfree.text,
|
||||
org.jfree.threads,
|
||||
org.jfree.ui,
|
||||
org.jfree.ui.about,
|
||||
org.jfree.ui.about.resources,
|
||||
org.jfree.ui.action,
|
||||
org.jfree.ui.tabbedui,
|
||||
org.jfree.util
|
||||
org.eevolution.form
|
||||
Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
|
||||
org.eclipse.core.runtime;bundle-version="3.5.0",
|
||||
org.adempiere.tools;bundle-version="0.0.0"
|
||||
Bundle-Activator: org.adempiere.client.Activator
|
||||
Eclipse-ExtensibleAPI: true
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
source.client.jar = src/
|
||||
output.client.jar = build
|
||||
bin.includes = META-INF/,\
|
||||
client.jar,\
|
||||
plugin.xml
|
||||
|
|
|
|||
128
client/build.xml
128
client/build.xml
|
|
@ -5,137 +5,33 @@
|
|||
<!-- ============================================= -->
|
||||
<!-- $Header: /cvs/adempiere/client/build.xml,v 1.2 2006/06/10 21:57:27 jjanke Exp $ -->
|
||||
|
||||
<project name="client" default="clientDistribute" basedir=".">
|
||||
<project name="client" default="plugin" basedir=".">
|
||||
|
||||
<description>
|
||||
This buildfile is used to build the client subproject within
|
||||
This buildfile is used to build the client subproject within
|
||||
the Adempiere project.
|
||||
</description>
|
||||
|
||||
<!-- set global properties for this build -->
|
||||
<property name="src" value="src"/>
|
||||
<property name="build.dir" value="build"/>
|
||||
<property name="dist.dir" value="../lib"/>
|
||||
<property name="jar.path" value="../lib"/>
|
||||
<property name="jar.name" value="client.jar"/>
|
||||
<!--<property environment="env"/>-->
|
||||
<import file="../utils_dev/properties.xml"/>
|
||||
<property name="equinox.target" value="../equinox-target"/>
|
||||
<property name="bundle.name" value="org.adempiere.client"/>
|
||||
<property name="bundle.version" value="0.0.0.2"/>
|
||||
|
||||
<path id="osgi.libs">
|
||||
<fileset dir="${equinox.target}/plugins">
|
||||
<include name="*.jar"/>
|
||||
</fileset>
|
||||
</path>
|
||||
|
||||
<!-- set path to include the necessary jar files for javac -->
|
||||
<path id="project.class.path">
|
||||
<pathelement path="${classpath}"/>
|
||||
<pathelement path="${jar.path}/CCTools.jar"/>
|
||||
<path refid="osgi.libs"/>
|
||||
<pathelement path="../base/Base.jar"/>
|
||||
<pathelement path="../lib/customization.jar"/>
|
||||
<pathelement path="../lib/patches.jar"/>
|
||||
<pathelement path="../lib/jcommon-1.0.16.jar"/>
|
||||
<pathelement path="../lib/jfreechart-1.0.13.jar"/>
|
||||
<pathelement path="../extend/Extend.jar"/>
|
||||
<pathelement path="../tools/lib/j2ee.jar"/>
|
||||
<pathelement path="../tools/lib/swinglabs-0.8.0.jar"/>
|
||||
</path>
|
||||
|
||||
|
||||
<target name="clientInit" description="initialization target">
|
||||
<target name="init" description="initialization target">
|
||||
<echo message="=========== Build Client"/>
|
||||
<!-- create the time stamp -->
|
||||
<tstamp/>
|
||||
<!-- create the build directory structure used by compile -->
|
||||
<mkdir dir="${build.dir}"/>
|
||||
<!-- check for the distribution directory -->
|
||||
<available file="${dist.dir}" type="dir" property="dist.dir.exists"/>
|
||||
|
||||
<uptodate property="jar.uptodate"
|
||||
targetfile="${dist.dir}/${jar.name}.jar">
|
||||
<srcfiles dir="${src}" includes="**/*.java"/>
|
||||
<srcfiles dir="..\base" includes="Base.jar"/>
|
||||
<srcfiles dir="..\extend" includes="Extend.jar"/>
|
||||
</uptodate>
|
||||
</target>
|
||||
|
||||
<target name="clientMakedir" depends="clientInit" unless="dist.dir.exists">
|
||||
<!-- create the distribution directory if not available -->
|
||||
<mkdir dir="${dist.dir}"/>
|
||||
</target>
|
||||
|
||||
|
||||
<!-- =========================================== -->
|
||||
<!-- Compile -->
|
||||
<!-- =========================================== -->
|
||||
<target name="clientCompile" depends="clientMakedir">
|
||||
<!-- compile the java code from ${src} into ${build.dir} -->
|
||||
<javac target="1.6" srcdir="${src}" destdir="${build.dir}" deprecation="on" debug="on">
|
||||
<classpath refid="project.class.path"/>
|
||||
</javac>
|
||||
<!-- copy all image & sound files from src to the build directory -->
|
||||
<copy todir="${build.dir}">
|
||||
<fileset dir="${src}">
|
||||
<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>
|
||||
|
||||
|
||||
<!-- =========================================== -->
|
||||
<!-- Distribution -->
|
||||
<!-- =========================================== -->
|
||||
<target name="clientDistribute" depends="clientCompile" unless="jar.uptodate">
|
||||
|
||||
<!-- Compile JasperReports classes because it is required when packaging client jar! -->
|
||||
<ant inheritall="false" antfile="../JasperReports/build.xml" dir="../JasperReports"/>
|
||||
|
||||
<!-- put everything from ${build.dir} into Adempiere.jar file -->
|
||||
<jar
|
||||
jarfile="${dist.dir}/Adempiere.jar"
|
||||
basedir="${build.dir}"
|
||||
duplicate="preserve"
|
||||
index="yes">
|
||||
<fileset dir="../base/build" />
|
||||
<fileset dir="../extend/build" />
|
||||
<zipgroupfileset file="../JasperReports/CompiereJasper.jar"/>
|
||||
<manifest>
|
||||
<attribute name="Specification-Title" value="Adempiere"/>
|
||||
<attribute name="Specification-Version" value="${env.ADEMPIERE_VERSION}"/>
|
||||
<attribute name="Specification-Vendor" value="ADempiere"/>
|
||||
<attribute name="Implementation-Title" value="Adempiere ${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="Main-Class" value="org.compiere.Adempiere"/>
|
||||
<attribute name="Class-Path" value="AdempiereSLib.jar"/>
|
||||
</manifest>
|
||||
</jar>
|
||||
</target>
|
||||
|
||||
<target name="plugin">
|
||||
<buildPlugin workspaceDirectory=".."
|
||||
<target name="plugin" depends="init">
|
||||
<buildPlugin workspaceDirectory="${workspace}"
|
||||
projectName="client"
|
||||
targetPlatformId="target.platform"
|
||||
destination="${dist.dir}"
|
||||
destination="../lib"
|
||||
buildSourceJar="false" />
|
||||
</target>
|
||||
</target>
|
||||
|
||||
<target name="clean">
|
||||
<!-- Delete the ${build.dir} directory trees -->
|
||||
<delete dir="${build.dir}"/>
|
||||
<delete file="${dist.dir}/Adempiere.jar" failonerror="false"/>
|
||||
<delete>
|
||||
<fileset dir="../lib/plugins">
|
||||
<include name="org.adempiere.client*.jar"/>
|
||||
</fileset>
|
||||
</delete>
|
||||
</target>
|
||||
|
||||
</project>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
package org.adempiere.client;
|
||||
|
||||
import java.rmi.RMISecurityManager;
|
||||
|
||||
import org.compiere.util.CLogger;
|
||||
import org.eclipse.core.runtime.Plugin;
|
||||
import org.osgi.framework.Bundle;
|
||||
|
|
|
|||
Loading…
Reference in New Issue