Author: mikedd
Date: Tue Feb 19 09:49:21 2008
New Revision: 629173
URL: http://svn.apache.org/viewvc?rev=629173&view=rev
Log:
OPENJPA-374
Modified:
openjpa/branches/1.0.x/openjpa-persistence-jdbc/pom.xml
openjpa/branches/1.0.x/openjpa-persistence-jdbc/src/main/ant/enhancer.xml
Modified: openjpa/branches/1.0.x/openjpa-persistence-jdbc/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.0.x/openjpa-persistence-jdbc/pom.xml?rev=629173&r1=629172&r2=629173&view=diff
==============================================================================
--- openjpa/branches/1.0.x/openjpa-persistence-jdbc/pom.xml (original)
+++ openjpa/branches/1.0.x/openjpa-persistence-jdbc/pom.xml Tue Feb 19 09:49:21
2008
@@ -388,14 +388,16 @@
<configuration>
<tasks>
<ant antfile="src/main/ant/enhancer.xml"
- target="enhance.all.entities"
+ target="enhance"
inheritRefs="true">
<!--
- InheritAll doesn't seem to work. Pass in
- properties manually.
- -->
- <property name="maven.test.skip"
- value="${maven.test.skip}"/>
+ InheritAll doesn't seem to work. Pass
in
+ properties manually.
+ -->
+ <property name="maven.test.skip"
+ value="${maven.test.skip}" />
+ <property name="test"
+ value="${test}" />
<property name="outdir"
value="${project.build.outputDirectory}" />
<property
@@ -403,7 +405,7 @@
value="${project.build.testOutputDirectory}" />
<property name="openjpa.loglevel"
value="${openjpa.loglevel}" />
- </ant>
+ </ant>
</tasks>
</configuration>
<goals>
Modified:
openjpa/branches/1.0.x/openjpa-persistence-jdbc/src/main/ant/enhancer.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.0.x/openjpa-persistence-jdbc/src/main/ant/enhancer.xml?rev=629173&r1=629172&r2=629173&view=diff
==============================================================================
--- openjpa/branches/1.0.x/openjpa-persistence-jdbc/src/main/ant/enhancer.xml
(original)
+++ openjpa/branches/1.0.x/openjpa-persistence-jdbc/src/main/ant/enhancer.xml
Tue Feb 19 09:49:21 2008
@@ -31,18 +31,32 @@
<istrue value="${maven.test.skip}" />
</condition>
+ <condition property="test.isfalse">
+ <equals arg1="${test}" arg2="false" />
+ </condition>
+
+ <!-- =================================
+ target: enhance
+ ================================= -->
+ <target name="enhance"
+ description="--> run the enhancer unless test=false"
+ unless="test.isfalse">
+ <antcall target="enhance.all.entities"
+ inheritall="true"
+ inheritrefs="true" />
+ </target>
+
<!-- =================================
target: enhance.all.entities
================================= -->
<target name="enhance.all.entities"
- depends=""
description="--> enhance the test entities"
unless="maven.test.skip.istrue">
-
+ <echo> running enhancer</echo>
<!--
Inherited references won't be present until the task is called.
Therefore the path definition needs to stay inside the task.
- -->
+ -->
<path id="cp">
<path refid="maven.test.classpath" />
<path refid="maven.compile.classpath" />
