Bug 469337: Cannot install DBWS Builder feature into Eclipse
Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
Reviewed-by: MartiNG, Bo
Conflicts:
antbuild.xml
utils/org.eclipse.persistence.dbws.builder/antbuild.xml
diff --git a/antbuild.xml b/antbuild.xml
index 517dd47..1a25c54 100644
--- a/antbuild.xml
+++ b/antbuild.xml
@@ -282,7 +282,6 @@
<ant antfile="antbuild.xml" dir="${eclipselink.modelgen}" target="clean"/>
<ant antfile="antbuild.xml" dir="${eclipselink.moxy.dynamicxjc}" target="clean"/>
<ant antfile="antbuild.xml" dir="${eclipselink.util.jaxb}" target="clean"/>
- <ant antfile="antbuild.xml" dir="${eclipselink.dbws.builder}" target="clean"/>
<!-- ant antfile="antbuild.xml" dir="${eclipselink.util.rename}" target="clean"/ -->
<ant antfile="antbuild.xml" dir="${eclipselink.util.sigcompare}" target="clean"/>
<ant antfile="build.xml" dir="${eclipselink.util.workbench}" target="clean"/>
@@ -396,16 +395,12 @@
</target>
<!-- Compiles all utils components. -->
- <target name="build-util" depends="build-dbws-utils">
+ <target name="build-util">
<ant antfile="antbuild.xml" dir="${eclipselink.util.sigcompare}" target="build"/>
<ant antfile="antbuild.xml" dir="${eclipselink.util.rename}" target="build"/>
<ant antfile="build.xml" dir="${eclipselink.util.workbench}" target="all"/>
</target>
- <target name="build-dbws-utils" unless="java_is_v5">
- <ant antfile="antbuild.xml" dir="${eclipselink.dbws.builder}" target="build"/>
- </target>
-
<!-- Oracle extensions Targets -->
<target name="clean-oracle-extension" depends="generate-oracle-p2, generate-local-compdeps" description="Clean the maven built oracle projects">
<!-- === Which extensions 'clean' is based on ${oracle.target} === -->
diff --git a/utils/org.eclipse.persistence.dbws.builder/antbuild.xml b/utils/org.eclipse.persistence.dbws.builder/antbuild.xml
index 59295d1..eead2ac 100644
--- a/utils/org.eclipse.persistence.dbws.builder/antbuild.xml
+++ b/utils/org.eclipse.persistence.dbws.builder/antbuild.xml
@@ -73,16 +73,8 @@
<property name="ddlparser.criteria" value="[1.0.0,2.0.0)"/>
<!-- Primary Targets: "jar" separate for dev use -->
- <target name="build" depends="clean, compile, jar" description="build ${ant.project.name} component"/>
- <target name="jar" depends="bnd-package, package" description="package ${ant.project.name} component"/>
-
- <!-- clean -->
- <target name="clean" description="Clean all generated content">
- <delete includeEmptyDirs="true" failonerror="false">
- <fileset dir="${classes.dir}"/>
- <fileset dir="${dbwsbldr.2.common.plugins.dir}" includes="${ant.project.name}_*.jar, ${ant.project.name}.source_*.jar"/>
- </delete>
- </target>
+ <target name="build" depends="jar" description="build ${ant.project.name} component"/>
+ <target name="jar" depends="package" description="package ${ant.project.name} component"/>
<!-- initialize varables and paths needed for compile -->
<!-- the number of properties needed now is too great for lazy loading without a target -->
@@ -206,25 +198,6 @@
<fail message="Missing BND library!"/>
</target>
- <target name="compile" depends="init, fail-on-no-bnd" description="Compile bundle code">
- <mkdir dir="${classes.dir}"/>
- <javac srcdir="${src.dir}"
- destdir="${classes.dir}"
- includes="**/*.java"
- debug="${javac.debug}"
- debuglevel="${javac.debuglevel}"
- encoding="UTF-8"
- optimize="${javac.optimize}"
- source="1.6"
- target="1.6"
- deprecation="${javac.deprecation}"
- failonerror="true"
- memoryMaximumSize="512m"
- fork="true"
- classpathref="dbwsbldr.compile.path"
- />
- </target>
-
<target name="package-src" depends="init" description="jar OSGI Source bundle">
<jar jarfile="${dbwsbldr.2.common.plugins.dir}/${ant.project.name}.source_${version.string}.jar">
<manifest>
