db-torque-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tfisc...@apache.org
Subject svn commit: r280104 - in /db/torque/test/trunk/test-project: maven.xml project.properties project.xml
Date Sun, 11 Sep 2005 11:19:44 GMT
Author: tfischer
Date: Sun Sep 11 04:19:39 2005
New Revision: 280104

URL: http://svn.apache.org/viewcvs?rev=280104&view=rev
Log:
- added the license where it was missing
- added comments
- added targets from the profile/base/maven.xml to the maven.xml from the test project,
  renaming "build" to "install"
- added the target torque-test:clean to the maven.xml from the test project

Modified:
    db/torque/test/trunk/test-project/maven.xml   (contents, props changed)
    db/torque/test/trunk/test-project/project.properties   (contents, props changed)
    db/torque/test/trunk/test-project/project.xml   (contents, props changed)

Modified: db/torque/test/trunk/test-project/maven.xml
URL: http://svn.apache.org/viewcvs/db/torque/test/trunk/test-project/maven.xml?rev=280104&r1=280103&r2=280104&view=diff
==============================================================================
--- db/torque/test/trunk/test-project/maven.xml (original)
+++ db/torque/test/trunk/test-project/maven.xml Sun Sep 11 04:19:39 2005
@@ -20,8 +20,9 @@
 <!-- ======================================================================== -->
 <!--                                                                          -->
 <!--  maven Buildfile for the test project                                    -->
+<!--  Defines the goals for running the tests                                 -->
 <!--                                                                          -->
-<!-- $Id: maven.xml 239655 2005-08-24 13:13:22Z henning $ -->
+<!-- $Id$ -->
 <!--                                                                          -->
 <!-- ======================================================================== -->
 
@@ -30,12 +31,15 @@
   xmlns:maven="jelly:maven"
   default="torque-test:run">
 
-  <goal name="torque-test:run">
+  <goal name="torque-test:run" description="builds and runs the test project">
     <attainGoal name="torque-test:test"/>
     <attainGoal name="torque-test:post-test"/>
   </goal>
 
-  <goal name="torque-test:prepare">
+
+  <goal name="torque-test:prepare"
+      description="copies resources and clears garbage from old tests">
+
     <property file="../profile/${torque.test.profile}/build.properties" />
     <property file="../profile/${torque.test.profile}/project.properties" />
     
@@ -53,16 +57,18 @@
       <fileset dir="src/sql" />
     </copy>
   </goal>
-  
+
+
   <goal name="torque-test:pre-test"
-      prereqs="torque-test:prepare">
+      prereqs="torque-test:prepare"
+      description="creates the docs, fills the database and creates om classes">
     <attainGoal name="torque:doc"/>
     <attainGoal name="torque:create-db"/>
     <attainGoal name="torque:sql"/>
     <attainGoal name="torque:id-table-init-sql"/>
     <attainGoal name="torque:insert-sql"/>
     <attainGoal name="torque:om"/>
-    
+
     <mkdir dir="${torque.test.compile.dir}" />
     <javac
       debug="${torque.compile.debug}"
@@ -72,7 +78,7 @@
       srcdir="${torque.java.dir}">
       <classpath refid="maven.dependency.classpath"/>
     </javac>
-    
+
     <javac
       debug="${torque.compile.debug}"
       deprecation="${torque.compile.deprecation}"
@@ -85,10 +91,11 @@
       </classpath>
     </javac>
   </goal>
-  
+
+
   <goal name="torque-test:test"
-     prereqs="torque-test:pre-test">
-         
+      prereqs="torque-test:pre-test"
+      description="run the tests for the om classes">
     <taskdef
       name="junit"
       classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask" />      
@@ -118,8 +125,8 @@
   </goal>
   
   
-  <goal name="torque-test:post-test">
-
+  <goal name="torque-test:post-test"
+      description="tests tasks needing a filled database">
     <attainGoal name="torque:datadtd"/>
     <attainGoal name="torque:datadump"/>
     
@@ -132,5 +139,44 @@
       
     <attainGoal name="torque:datasql"/>
     <attainGoal name="torque:jdbc"/>
-  </goal>  
+  </goal>
+  
+  <goal
+    name="torque-test:install" 
+    description="Builds and installs all Torque subprojects to the local repository">
+    <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"
+      excludes=""
+      goals="plugin:install-now"
+      ignoreFailures="false"
+    />  
+  </goal>
+
+  <goal name="torque-test:install-run" 
+      description="Builds and installs all Torque components and run the test project"
+      prereqs="torque-test:install">
+    <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"
+      excludes=""
+      goals="clean"
+      ignoreFailures="false"
+    />  
+    <attainGoal name="clean" />
+  </goal>
+
 </project>

Propchange: db/torque/test/trunk/test-project/maven.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: db/torque/test/trunk/test-project/project.properties
URL: http://svn.apache.org/viewcvs/db/torque/test/trunk/test-project/project.properties?rev=280104&r1=280103&r2=280104&view=diff
==============================================================================
--- db/torque/test/trunk/test-project/project.properties (original)
+++ db/torque/test/trunk/test-project/project.properties Sun Sep 11 04:19:39 2005
@@ -1,16 +1,62 @@
-# we copy the complete source for the project to
-# ${basedir}/target/tests/base in order to be able
-# to do the filtering. This must be made known
-# to the maven-plugin
-#settings for the generator
+# Copyright 2005 The Apache Software Foundation.
+#
+# Licensed under the Apache License, Version 2.0 (the "License")
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+###############################################################################
+#
+# Settings for the test project.
+# If you need to customize the test project, please consider using a 
+# build.properties file instead of editing this file. 
+#
+# $Id$
+#
+##############################################################################
+
+##############################################################################
+# generator settings which are the same for every profile
+##############################################################################
+
 torque.project = bookstore
 torque.targetPackage = org.apache.torque.test
 
-torque.java.dir=target/java 
+##############################################################################
+# non-standard directories.
+##############################################################################
+
+# The java classes are generated in the target to remove them vith a simple 
+# "maven clean"
+torque.java.dir=target/java
+
+# The generator should read the schema files from the target directory
+# where some tokens have been replaced by the torque-test:prepare task 
 torque.schema.dir=target/schema 
 
+##############################################################################
+# internal settings for the test
+##############################################################################
+
+# Working directory for the SQLToAppDataRuntimeTest
 torque.test.sql2xml.dir=target/sql2xml
+
+# the classes directory to compile the junit test classes and the generated 
+# om classes to  
 torque.test.compile.dir=target/classes
+
+# log directory where test classes can put their log files 
 torque.test.log.dir=target/logs
+
+# base directory for the java sources for the junit tests 
 torque.test.junit.src.dir=src/java
-torque.test.junit.report.dir=target/reports
+
+# directory where the junit test put their results
+torque.test.junit.report.dir=target/reports
\ No newline at end of file

Propchange: db/torque/test/trunk/test-project/project.properties
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: db/torque/test/trunk/test-project/project.xml
URL: http://svn.apache.org/viewcvs/db/torque/test/trunk/test-project/project.xml?rev=280104&r1=280103&r2=280104&view=diff
==============================================================================
--- db/torque/test/trunk/test-project/project.xml (original)
+++ db/torque/test/trunk/test-project/project.xml Sun Sep 11 04:19:39 2005
@@ -1,4 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+ ==============================================================================
+
+ project descriptor for the project for testing Torque
+ $Id$
+ 
+ -->
+
 <project>
   <extend>../profile/${torque.test.profile}/project.xml</extend>
   <dependencies>
@@ -11,5 +35,4 @@
       </properties>
     </dependency>
   </dependencies>
-</project>
-
+</project>
\ No newline at end of file

Propchange: db/torque/test/trunk/test-project/project.xml
------------------------------------------------------------------------------
    svn:keywords = Id



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


Mime
View raw message