svn commit: r279164 - in /db/torque/test/trunk: maven-test-plugin/plugin.jelly profile/base/maven.xml

[tf...@apache.org]

Author: tfischer
Date: Tue Sep  6 15:31:01 2005
New Revision: 279164

URL: http://svn.apache.org/viewcvs?rev=279164&view=rev
Log:
- changed the namespace and removed the double :'s in the goals of the
test plugin
- added a complete build for the test project

Modified:
    db/torque/test/trunk/maven-test-plugin/plugin.jelly
    db/torque/test/trunk/profile/base/maven.xml

Modified: db/torque/test/trunk/maven-test-plugin/plugin.jelly
URL: http://svn.apache.org/viewcvs/db/torque/test/trunk/maven-test-plugin/plugin.jelly?rev=279164&r1=279163&r2=279164&view=diff
==============================================================================
--- db/torque/test/trunk/maven-test-plugin/plugin.jelly (original)
+++ db/torque/test/trunk/maven-test-plugin/plugin.jelly Tue Sep  6 15:31:01 2005
@@ -29,12 +29,12 @@
   xmlns:j="jelly:core"
   default="base:test">
 
-  <goal name="torque:run-test">
-    <attainGoal name="torque:test:test"/>
-    <attainGoal name="torque:test:post-test"/>
+  <goal name="torque-test-plugin:run">
+    <attainGoal name="torque-test-plugin:test"/>
+    <attainGoal name="torque-test-plugin:post-test"/>
   </goal>
 
-  <goal name="torque:test:prepare">
+  <goal name="torque-test-plugin:prepare">
   
     <copy todir="${torque.home}/src">
       <fileset dir="${plugin.resources}">
@@ -48,8 +48,8 @@
     </copy>
   </goal>
   
-  <goal name="torque:test:pre-test"
-      prereqs="torque:test:prepare">
+  <goal name="torque-test-plugin:pre-test"
+      prereqs="torque-test-plugin:prepare">
     <attainGoal name="torque:doc"/>
     <attainGoal name="torque:create-db"/>
     <attainGoal name="torque:sql"/>
@@ -72,8 +72,8 @@
     </javac>
   </goal>
   
-  <goal name="torque:test:test"
-     prereqs="torque:test:pre-test">
+  <goal name="torque-test-plugin:test"
+     prereqs="torque-test-plugin:pre-test">
     
     <copy 
       todir="${torque.home}" 
@@ -119,7 +119,7 @@
   </goal>
   
   
-  <goal name="torque:test:post-test">
+  <goal name="torque-test-plugin:post-test">
 
     <attainGoal name="torque:datadtd"/>
     <attainGoal name="torque:datadump"/>

Modified: db/torque/test/trunk/profile/base/maven.xml
URL: http://svn.apache.org/viewcvs/db/torque/test/trunk/profile/base/maven.xml?rev=279164&r1=279163&r2=279164&view=diff
==============================================================================
--- db/torque/test/trunk/profile/base/maven.xml (original)
+++ db/torque/test/trunk/profile/base/maven.xml Tue Sep  6 15:31:01 2005
@@ -29,30 +29,58 @@
   xmlns:maven="jelly:maven"
   default="build">
 
-  <goal 
-    name="torque:build-run-test" 
-    description="Build Torque and run the test">
+  <goal
+    name="torque-test:build" 
+    description="Build all Torque subprojects">
     <maven:reactor
       basedir="../../.."
       includes="templates/project.xml,generator/project.xml,runtime/project.xml"
       excludes=""
       goals="jar:install"
       ignoreFailures="false"
-    />  
+    />
     <maven:reactor
       basedir="../../.."
-      includes="maven-plugin/project.xml,test/maven-test-plugin/project.xml"
+      includes="maven-plugin/project.xml"
       excludes=""
       goals="plugin:install-now"
       ignoreFailures="false"
     />  
-    
-    <attainGoal name="torque:run-test" />
   </goal>
 
   <goal 
-    name="torque:clean-test" 
-    description="Build Torque and run the test">
+    name="torque-test:build-run-plugin" 
+    description="Build Torque and run the test plugin"
+    prereqs="torque-test:build">
+    <maven:reactor
+      basedir="../../.."
+      includes="test/maven-test-plugin/project.xml"
+      excludes=""
+      goals="plugin:install-now"
+      ignoreFailures="false"
+    />
+
+    <attainGoal name="torque-test-plugin:run" />
+
+    <maven:reactor
+      basedir="../../.."
+      includes="test/maven-test-plugin/project.xml"
+      excludes=""
+      goals="plugin:uninstall-now"
+      ignoreFailures="false"
+    />
+  </goal>
+
+  <goal 
+    name="torque-test:build-run-project" 
+    description="Build Torque and run the test project"
+    prereqs="torque-test:build">
+    <attainGoal name="torque-test:run" />
+  </goal>
+
+  <goal 
+    name="torque-test:clean" 
+    description="clean all subproject affected by the test">
     <maven:reactor
       basedir="../../.."
       includes="templates/project.xml,generator/project.xml,runtime/project.xml,maven-plugin/project.xml,test/maven-test-plugin/project.xml"



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