You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jaxme-dev@ws.apache.org by jo...@apache.org on 2005/12/12 11:14:08 UTC

svn commit: r356237 - in /webservices/jaxme/branches/MAVEN: ./ projects/pm/maven.xml projects/pm/src/test/resources/dropdb.sql

Author: jochen
Date: Mon Dec 12 02:13:58 2005
New Revision: 356237

URL: http://svn.apache.org/viewcvs?rev=356237&view=rev
Log:
Fixed, that the pm tests failed when rerunning the test suite in order to build the test reports.

Added:
    webservices/jaxme/branches/MAVEN/projects/pm/src/test/resources/dropdb.sql
Modified:
    webservices/jaxme/branches/MAVEN/   (props changed)
    webservices/jaxme/branches/MAVEN/projects/pm/maven.xml

Propchange: webservices/jaxme/branches/MAVEN/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Dec 12 02:13:58 2005
@@ -7,3 +7,4 @@
 xjc
 test
 target
+velocity.log.1

Modified: webservices/jaxme/branches/MAVEN/projects/pm/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/jaxme/branches/MAVEN/projects/pm/maven.xml?rev=356237&r1=356236&r2=356237&view=diff
==============================================================================
--- webservices/jaxme/branches/MAVEN/projects/pm/maven.xml (original)
+++ webservices/jaxme/branches/MAVEN/projects/pm/maven.xml Mon Dec 12 02:13:58 2005
@@ -34,9 +34,22 @@
     <ant:delete dir="${build.pm.db}"/>
     <ant:mkdir dir="${build.pm.db}"/>
 
+	<!-- Clearly, we'd prefer to combine dropdb.sql and initdb.sql
+	     into a single file. However, Derby doesn't support the
+	     "DROP IF EXISTS" statement, so this would fail when the
+	     statements are issued the first time. On the other hand,
+	     the DROP statement is required, because we want this to
+	     run twice: Once for the acceptance tests, and once for
+	     running the tests in order to generate the reports.
+	-->
     <ant:sql classpathref="pm.class.path" driver="${jdbc.pm.driver}"
+    		onerror="continue"
+	        password="${jdbc.pm.password}" src="${maven.test.dest}/dropdb.sql"
+	        url="${jdbc.pm.url};create=true" userid="${jdbc.pm.user}"/>	
+    <ant:sql classpathref="pm.class.path" driver="${jdbc.pm.driver}"
+    		onerror="continue"
 	        password="${jdbc.pm.password}" src="${maven.test.dest}/initdb.sql"
-	       url="${jdbc.pm.url};create=true" userid="${jdbc.pm.user}"/>	
+	        url="${jdbc.pm.url};create=true" userid="${jdbc.pm.user}"/>	
 	<ant:taskdef name="xjc" classname="org.apache.ws.jaxme.generator.XJCTask" classpathref="pm.class.path"/>
 	<ant:xjc target="${maven.test.dest}">
             <ant:schema dir="${maven.test.dest}" includes="*.xsd"/>

Added: webservices/jaxme/branches/MAVEN/projects/pm/src/test/resources/dropdb.sql
URL: http://svn.apache.org/viewcvs/webservices/jaxme/branches/MAVEN/projects/pm/src/test/resources/dropdb.sql?rev=356237&view=auto
==============================================================================
--- webservices/jaxme/branches/MAVEN/projects/pm/src/test/resources/dropdb.sql (added)
+++ webservices/jaxme/branches/MAVEN/projects/pm/src/test/resources/dropdb.sql Mon Dec 12 02:13:58 2005
@@ -0,0 +1 @@
+DROP TABLE httpSession;



---------------------------------------------------------------------
To unsubscribe, e-mail: jaxme-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: jaxme-dev-help@ws.apache.org