Author: gmazza
Date: Sun Jul 28 02:33:19 2013
New Revision: 1507753

URL: http://svn.apache.org/r1507753
Log:
Changes to Ant tasks so -Dmaven.test.skip option will work again.

Modified:
    roller/trunk/app/pom.xml
    roller/trunk/app/src/test/resources/roller-custom.properties

Modified: roller/trunk/app/pom.xml
URL: 
http://svn.apache.org/viewvc/roller/trunk/app/pom.xml?rev=1507753&r1=1507752&r2=1507753&view=diff
==============================================================================
--- roller/trunk/app/pom.xml (original)
+++ roller/trunk/app/pom.xml Sun Jul 28 02:33:19 2013
@@ -655,6 +655,7 @@
                         </configuration>
                     </execution>
 
+                    <!-- Derby only for unit testing and jetty:run dev 
testing: skipped when maven.test.skip is set -->
                     <execution>
                         <id>startdb</id>
                         <phase>test-compile</phase>
@@ -662,20 +663,19 @@
                             <goal>run</goal>
                         </goals>
                         <configuration>
-                            <target>
-                                <!-- Derby only for unit testing and jetty:run 
dev testing: skipped when maven.text.skip is set -->
+                            <target unless="${maven.test.skip}">
                                 <delete dir="${basedir}/target/derby-system" 
verbose="true" failonerror="false" />
                                 <taskdef name="startdb" 
classname="org.apache.roller.derby.ant.StartDerbyTask"
                                          classpathref="maven.test.classpath"/>
                                 <startdb 
databaseDir="${basedir}/target/derby-system"
                                          port="3223"
-                                         
databaseScriptsDir="${basedir}/target/dbscripts"
-                                         skip="${maven.test.skip}" >
+                                         
databaseScriptsDir="${basedir}/target/dbscripts" >
                                 </startdb>
                             </target>
                         </configuration>
                     </execution>
 
+                    <!-- Derby only for unit testing: skipped when 
maven.test.skip is set -->
                     <execution>
                         <id>stopdb</id>
                         <phase>package</phase>
@@ -683,14 +683,12 @@
                             <goal>run</goal>
                         </goals>
                         <configuration>
-                            <target>
-                                <!-- Derby only for unit testing: skip when 
maven.test.skip is set -->
+                            <target unless="${maven.test.skip}">
                                 <taskdef name="stopdb" 
classname="org.apache.roller.derby.ant.StopDerbyTask"
                                          classpathref="maven.test.classpath"/>
                                 <stopdb 
databaseDir="${basedir}/target/derby-system"
                                         port="3223"
-                                        
databaseScriptsDir="${basedir}/target/dbscripts"
-                                        skip="${maven.test.skip}" >
+                                        
databaseScriptsDir="${basedir}/target/dbscripts" >
                                 </stopdb>
                                 <delete dir="${basedir}/target/derby-system" 
verbose="true" failonerror="false" />
                             </target>

Modified: roller/trunk/app/src/test/resources/roller-custom.properties
URL: 
http://svn.apache.org/viewvc/roller/trunk/app/src/test/resources/roller-custom.properties?rev=1507753&r1=1507752&r2=1507753&view=diff
==============================================================================
--- roller/trunk/app/src/test/resources/roller-custom.properties (original)
+++ roller/trunk/app/src/test/resources/roller-custom.properties Sun Jul 28 
02:33:19 2013
@@ -4,11 +4,6 @@ database.jdbc.connectionURL=jdbc:derby:/
 database.jdbc.username=APP
 database.jdbc.password=APP
 
-openjpa.IgnoreChanges=true
-openjpa.FlushBeforeQueries=true
-openjpa.ConnectionRetainMode=always
-openjpa.Log=commons
-
 #see http://wiki.eclipse.org/EclipseLink/Examples/JPA/Logging
 #eclipselink.logging.file=target/eclipselink.log
 # OFF, SEVERE, WARNING, INFO, CONFIG, FINE, FINER, ALL


Reply via email to