henning 2004/05/17 05:31:21 Modified: . Tag: TORQUE_3_1_HENNING project.xml src/generator Tag: TORQUE_3_1_HENNING project.xml src/maven-plugin Tag: TORQUE_3_1_HENNING plugin.jelly project.xml Log: Rename all maven visible stuff from torque to torquex, so that the regular and the extended plugin can live side-by-side. Rename the jar names from torque and torque-gen to torquex and torquex-gen. Revision Changes Path No revision No revision 1.103.2.6.2.1 +2 -2 db-torque/project.xml Index: project.xml =================================================================== RCS file: /home/cvs/db-torque/project.xml,v retrieving revision 1.103.2.6 retrieving revision 1.103.2.6.2.1 diff -u -r1.103.2.6 -r1.103.2.6.2.1 --- project.xml 1 Apr 2004 02:06:14 -0000 1.103.2.6 +++ project.xml 17 May 2004 12:31:20 -0000 1.103.2.6.2.1 @@ -2,9 +2,9 @@ <project> <pomVersion>3</pomVersion> - <id>torque</id> + <id>torquex</id> <groupId>torque</groupId> - <name>Torque</name> + <name>Torque (Experimental Version)</name> <currentVersion>3.1.1-dev</currentVersion> <organization> <name>Apache Software Foundation</name> No revision No revision 1.13.2.1.2.1 +1 -1 db-torque/src/generator/project.xml Index: project.xml =================================================================== RCS file: /home/cvs/db-torque/src/generator/project.xml,v retrieving revision 1.13.2.1 retrieving revision 1.13.2.1.2.1 diff -u -r1.13.2.1 -r1.13.2.1.2.1 --- project.xml 25 Oct 2003 15:22:30 -0000 1.13.2.1 +++ project.xml 17 May 2004 12:31:21 -0000 1.13.2.1.2.1 @@ -3,7 +3,7 @@ <project> <extend>../../project.xml</extend> <pomVersion>3</pomVersion> - <id>torque-gen</id> + <id>torquex-gen</id> <name>Torque generator</name> <!-- Gump integration --> No revision No revision 1.8.2.1.2.1 +55 -55 db-torque/src/maven-plugin/plugin.jelly Index: plugin.jelly =================================================================== RCS file: /home/cvs/db-torque/src/maven-plugin/plugin.jelly,v retrieving revision 1.8.2.1 retrieving revision 1.8.2.1.2.1 diff -u -r1.8.2.1 -r1.8.2.1.2.1 --- plugin.jelly 23 Oct 2003 10:17:24 -0000 1.8.2.1 +++ plugin.jelly 17 May 2004 12:31:21 -0000 1.8.2.1.2.1 @@ -11,16 +11,16 @@ <!-- when you change your XML schema. --> <!-- ================================================================ --> <goal - name="torque" + name="torquex" description="Generates SQL files and Peer-based OM objects"> - <attainGoal name="torque:sql"/> - <attainGoal name="torque:om"/> + <attainGoal name="torquex:sql"/> + <attainGoal name="torquex:om"/> </goal> <goal - name="torque:init" + name="torquex:init" description="Build classpath and define tasks"> <!-- Setup the classpath for torque plugins --> @@ -32,7 +32,7 @@ <pathelement path="${plugin.getDependencyPath('village')}"/> <pathelement path="${plugin.getDependencyPath('xercesImpl')}"/> <pathelement path="${plugin.getDependencyPath('xml-apis')}"/> - <pathelement path="${plugin.getDependencyPath('torque:torque-gen')}"/> + <pathelement path="${plugin.getDependencyPath('torque:torquex-gen')}"/> <pathelement path="${pom.getDependencyClasspath()}"/> <path refid="maven.dependency.classpath"/> </path> @@ -42,7 +42,7 @@ Note: I have no idea why this file is not already processed by the plugin.. --> - <property file="${maven.plugin.dir}/maven-torque-plugin-3.1.1-dev/plugin.properties"/> + <property file="${maven.plugin.dir}/maven-torquex-plugin-3.1.1-dev/plugin.properties"/> <!-- Define all of the tasks --> <taskdef @@ -93,23 +93,23 @@ <!-- ================================================================ --> <goal - name="torque:sql" + name="torquex:sql" description="generates the SQL for your project" - prereqs="torque:init, torque:sql-check"> + prereqs="torquex:init, torquex:sql-check"> <j:choose> <j:when test="${torque.internal.sql.uptodate}"> <echo>Schema files have not changed since last generation.</echo> </j:when> <j:otherwise> - <attainGoal name="torque:sql-generate"/> + <attainGoal name="torquex:sql-generate"/> </j:otherwise> </j:choose> </goal> <goal - name="torque:sql-check" + name="torquex:sql-check" description="Determine if the SQL files need to be generated"> <j:choose> @@ -128,8 +128,8 @@ </goal> <goal - name="torque:sql-generate" - prereqs="torque:init"> + name="torquex:sql-generate" + prereqs="torquex:init"> <j:choose> <j:when test="${torque.useClasspath}"> @@ -178,24 +178,24 @@ <!-- ================================================================ --> <goal - name="torque:om" + name="torquex:om" description="Generate the Peer-based object model from *-schema.xml files" - prereqs="torque:init, torque:om-check"> + prereqs="torquex:init, torquex:om-check"> <j:choose> <j:when test="${torque.internal.om.uptodate}"> <echo>Schema files have not changed since last generation.</echo> </j:when> <j:otherwise> - <attainGoal name="torque:om-generate"/> + <attainGoal name="torquex:om-generate"/> </j:otherwise> </j:choose> </goal> <goal - name="torque:om-check" - prereqs="torque:init"> + name="torquex:om-check" + prereqs="torquex:init"> <j:choose> <j:when test="${torque.runOnlyOnSchemaChange}"> @@ -213,8 +213,8 @@ </goal> <goal - name="torque:om-generate" - prereqs="torque:init"> + name="torquex:om-generate" + prereqs="torquex:init"> <j:choose> <j:when test="${torque.useClasspath}"> @@ -258,9 +258,9 @@ <!-- ================================================================ --> <goal - name="torque:datadtd" + name="torquex:datadtd" description="Generates the DATA DTD for your project" - prereqs="torque:init"> + prereqs="torquex:init"> <torque-data-model contextProperties="${torque.contextProperties}" @@ -279,9 +279,9 @@ <!-- ================================================================ --> <goal - name="torque:datadump" + name="torquex:datadump" description="dump data from database into xml file" - prereqs="torque:init"> + prereqs="torquex:init"> <torque-data-dump contextProperties="${torque.contextProperties}" @@ -305,9 +305,9 @@ <!-- ================================================================ --> <goal - name="torque:datasql" + name="torquex:datasql" description="generates sql from data xml" - prereqs="torque:init"> + prereqs="torquex:init"> <torque-data-sql contextProperties="${torque.contextProperties}" @@ -333,9 +333,9 @@ <!-- ================================================================ --> <goal - name="torque:create-db" + name="torquex:create-db" description="generates the target database" - prereqs="torque:init"> + prereqs="torquex:init"> <j:choose> @@ -388,9 +388,9 @@ <!-- ================================================================ --> <goal - name="torque:doc" + name="torquex:doc" description="Generates documentation for your datamodel" - prereqs="torque:init"> + prereqs="torquex:init"> <torque-doc contextProperties="${torque.contextProperties}" @@ -414,9 +414,9 @@ <!-- ================================================================ --> <goal - name="torque:jdbc" + name="torquex:jdbc" description="jdbc to xml" - prereqs="torque:init"> + prereqs="torquex:init"> <torque-jdbc-transform dbDriver="${torque.database.driver}" @@ -434,9 +434,9 @@ <!-- ================================================================ --> <goal - name="torque:insert-sql" + name="torquex:insert-sql" description="inserts the generated sql" - prereqs="torque:init"> + prereqs="torquex:init"> <torque-sql-exec autocommit="true" @@ -457,9 +457,9 @@ <!-- ================================================================ --> <goal - name="torque:id-table-init-sql" + name="torquex:id-table-init-sql" description="generates initialization sql for ID Broker" - prereqs="torque:init"> + prereqs="torquex:init"> <torque-sql contextProperties="${torque.contextProperties}" @@ -485,8 +485,8 @@ <!-- Moves the files out of your source tree and into a zip file. --> <!-- ================================================================ --> - <goal name="torque:check-om-zip" - prereqs="torque:init"> + <goal name="torquex:check-om-zip" + prereqs="torquex:init"> <condition property="torque.internal.omzip.src.base"> <equals arg1="${torque.omzip.src.base}" arg2="true"/> @@ -507,8 +507,8 @@ </goal> <goal - name="torque:om-zip" - prereqs="torque:check-om-zip" + name="torquex:om-zip" + prereqs="torquex:check-om-zip" description="Moves source om files to separate jar and out of the source tree"> <!-- Perform the package to path converison. --> @@ -522,23 +522,23 @@ <j:set var="torque.internal.omzip.pattern" value="base"/> <j:set var="torque.internal.omzip.files" value="java"/> <j:set var="torque.internal.omzip.dir" value="${torque.java.dir}"/> - <attainGoal name="torque:om-zip-worker"/> + <attainGoal name="torquex:om-zip-worker"/> <j:set var="torque.internal.omzip.pattern" value="extension"/> - <attainGoal name="torque:om-zip-worker"/> + <attainGoal name="torquex:om-zip-worker"/> <!-- See if the class files need jar'ed. --> <j:set var="torque.internal.omzip.type" value="bin"/> <j:set var="torque.internal.omzip.pattern" value="base"/> <j:set var="torque.internal.omzip.files" value="class"/> <j:set var="torque.internal.omzip.dir" value="${torque.compile.build.dir}"/> - <attainGoal name="torque:om-zip-worker"/> + <attainGoal name="torquex:om-zip-worker"/> <j:set var="torque.internal.omzip.pattern" value="extension"/> - <attainGoal name="torque:om-zip-worker"/> + <attainGoal name="torquex:om-zip-worker"/> </goal> <goal - name="torque:om-zip-worker"> + name="torquex:om-zip-worker"> <j:if test="torque.internal.omzip.${torque.internal.omzip.type}.${torque.internal.omzip.pattern}"> @@ -561,14 +561,14 @@ </fileset> </jar> - <attainGoal name="torque:om-zip-worker-delete"/> + <attainGoal name="torquex:om-zip-worker-delete"/> </j:if> </goal> <goal - name="torque:om-zip-worker-delete"> + name="torquex:om-zip-worker-delete"> <j:if test="${torque.internal.omzip.deleteFiles}"> @@ -603,9 +603,9 @@ <!-- =================================================================== --> <goal - name="torque:sql2xml" + name="torquex:sql2xml" description="creates an xml schema from an sql schema" - prereqs="torque:init"> + prereqs="torquex:init"> <torque-sql-transform inputFile="${torque.schema.dir}/schema.sql" @@ -619,18 +619,18 @@ <!-- =================================================================== --> <goal - name="torque:ojb" + name="torquex:ojb" description="Generates the repository and om for ojb (experimental)"> - <attainGoal name="torque:ojb-repository"/> - <attainGoal name="torque:ojb-model"/> + <attainGoal name="torquex:ojb-repository"/> + <attainGoal name="torquex:ojb-model"/> </goal> <goal - name="torque:ojb-repository" + name="torquex:ojb-repository" description="Generates the repository for ojb (experimental)" - prereqs="torque:init"> + prereqs="torquex:init"> <torque-data-model contextProperties="${torque.contextProperties}" @@ -651,9 +651,9 @@ </goal> <target - name="torque:ojb-model" + name="torquex:ojb-model" description="Generates an object model for ojb (experimental)" - prereqs="torque:init"> + prereqs="torquex:init"> <torque-data-model contextProperties="${torque.contextProperties}" 1.12.2.2.2.1 +5 -5 db-torque/src/maven-plugin/project.xml Index: project.xml =================================================================== RCS file: /home/cvs/db-torque/src/maven-plugin/project.xml,v retrieving revision 1.12.2.2 retrieving revision 1.12.2.2.2.1 diff -u -r1.12.2.2 -r1.12.2.2.2.1 --- project.xml 22 Jan 2004 08:16:09 -0000 1.12.2.2 +++ project.xml 17 May 2004 12:31:21 -0000 1.12.2.2.2.1 @@ -3,11 +3,11 @@ <project> <extend>../../project.xml</extend> <pomVersion>3</pomVersion> - <id>maven-torque-plugin</id> - <name>Maven Torque Plug-in</name> + <id>maven-torquex-plugin</id> + <name>Maven Torque Plug-in (Experimental Version)</name> - <description>Maven Plugin for Torque</description> - <shortDescription>Maven Plugin for Torque</shortDescription> + <description>Maven Plugin for Torque (Experimental Version)</description> + <shortDescription>Maven Plugin for Torque (Experimental Version)</shortDescription> <url>http://db.apache.org/torque-31/maven-plugin/</url> <siteDirectory>/www/db.apache.org/torque-31/maven-plugin</siteDirectory> @@ -100,7 +100,7 @@ </dependency> <dependency> <groupId>torque</groupId> - <artifactId>torque-gen</artifactId> + <artifactId>torquex-gen</artifactId> <version>3.1.1-dev</version> <properties> <classloader>root</classloader>
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]