Author: kstam
Date: Mon May 13 14:39:55 2013
New Revision: 1481882
URL: http://svn.apache.org/r1481882
Log:
JUDDI-612 adding the delete/copy to the maven clean phase. This should address
the issues mentioned.
Modified:
juddi/trunk/juddi-core-openjpa/build.xml
juddi/trunk/juddi-core-openjpa/pom.xml
Modified: juddi/trunk/juddi-core-openjpa/build.xml
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-core-openjpa/build.xml?rev=1481882&r1=1481881&r2=1481882&view=diff
==============================================================================
--- juddi/trunk/juddi-core-openjpa/build.xml (original)
+++ juddi/trunk/juddi-core-openjpa/build.xml Mon May 13 14:39:55 2013
@@ -1,26 +1,18 @@
-<project name="juddi-core-jpa" default="package-jar" basedir=".">
-
- <target name="unzip-jar">
- <mkdir dir="${basedir}/target/classes"/>
- <echo>unzip: ${dependency.juddi.core}</echo>
- <unzip dest="${basedir}/target/classes">
- <fileset file="${dependency.juddi.core}"/>
- </unzip>
- </target>
+<project name="juddi-core-jpa" default="copy-from-core" basedir=".">
- <target name="copy-src">
- <echo>delete: ${basedir}/src/main/java</echo>
- <delete dir="${basedir}/src/main/java" />
- <mkdir dir="${basedir}/src/main/java"/>
- <echo>copy: ${juddi.core.dir}/src/test/java</echo>
- <copy todir="${basedir}/src/main/java">
- <fileset dir="${juddi.core.dir}/src/main/java">
- <include name="**/*.java"/>
+ <target name="copy-main">
+ <echo>delete: ${basedir}/src/main/</echo>
+ <delete dir="${basedir}/src/main/" />
+ <mkdir dir="${basedir}/src/main/"/>
+ <echo>copy: ${juddi.core.dir}/src/main</echo>
+ <copy todir="${basedir}/src/main">
+ <fileset dir="${juddi.core.dir}/src/main">
+ <include name="**/*"/>
</fileset>
</copy>
</target>
- <target name="copy-tests">
+ <target name="copy-test-java">
<echo>delete: ${basedir}/src/test/java</echo>
<delete dir="${basedir}/src/test/java" />
<mkdir dir="${basedir}/src/test/java"/>
@@ -32,6 +24,6 @@
</copy>
</target>
- <target name="package-jar" depends="copy-src,copy-tests,unzip-jar"/>
+ <target name="copy-from-core" depends="copy-main,copy-test-java"/>
</project>
Modified: juddi/trunk/juddi-core-openjpa/pom.xml
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-core-openjpa/pom.xml?rev=1481882&r1=1481881&r2=1481882&view=diff
==============================================================================
--- juddi/trunk/juddi-core-openjpa/pom.xml (original)
+++ juddi/trunk/juddi-core-openjpa/pom.xml Mon May 13 14:39:55 2013
@@ -37,7 +37,6 @@
<instructions>
<Export-Package>org.apache.juddi,
org.apache.juddi.api, org.apache.juddi.api.impl, org.apache.juddi.api.util,
org.apache.juddi.config, org.apache.juddi.config, org.apache.juddi.cryptor,
org.apache.juddi.keygen, org.apache.juddi.mapping, org.apache.juddi.model,
org.apache.juddi.query, org.apache.juddi.query.util, org.apache.juddi.rmi,
org.apache.juddi.subscription, org.apache.juddi.subscription.notify,
org.apache.juddi.validation, org.apache.juddi.v3.auth,
org.apache.juddi.v3.error</Export-Package>
<Include-Resource>juddi_install_data=target/classes/juddi_install_data,
target/classes/messages.properties</Include-Resource>
-
</instructions>
</configuration>
</plugin>
@@ -47,15 +46,15 @@
<version>1.3</version>
<executions>
<execution>
- <id>unzip</id>
- <phase>compile</phase>
+ <id>copy</id>
+ <phase>clean</phase>
<configuration>
<tasks>
<property
name="dependency.juddi.core"
value="${maven.dependency.org.apache.juddi.juddi-core.jar.path}" />
<property
name="juddi.core.dir" value="${basedir}/../juddi-core" />
<echo>Enhancing
juddi-core=${dependency.juddi.core}</echo>
<ant
antfile="${basedir}/build.xml">
- <target
name="package-jar" />
+ <target
name="copy-from-core" />
</ant>
</tasks>
</configuration>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
