db-torque-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mpoes...@apache.org
Subject cvs commit: db-torque project-base.xml project.xml
Date Tue, 28 Oct 2003 19:04:10 GMT
mpoeschl    2003/10/28 11:04:10

  Modified:    src/maven-plugin project.xml
               src/generator project.xml
               .        project.xml
  Added:       .        project-base.xml
  Log:
  restructure project.xml files (add project-base.xml containing all shared info)
  this is needed as all dependencies from the parent file are included too (generator doesn't
need most of the runtime dependencies)
  
  Revision  Changes    Path
  1.15      +3 -47     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.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- project.xml	28 Oct 2003 15:21:03 -0000	1.14
  +++ project.xml	28 Oct 2003 19:04:10 -0000	1.15
  @@ -1,7 +1,7 @@
   <?xml version="1.0" encoding="UTF-8"?>
   
   <project>
  -  <extend>../../project.xml</extend>
  +  <extend>../../project-base.xml</extend>
     <pomVersion>3</pomVersion>
     <id>maven-torque-plugin</id>
     <name>Maven Torque Plug-in</name>
  @@ -11,43 +11,6 @@
     <url>http://db.apache.org/torque/maven-plugin/</url>
     <siteDirectory>/www/db.apache.org/torque/maven-plugin</siteDirectory>
   
  -  <developers>
  -    <developer>
  -      <name>Martin Poeschl</name>
  -      <id>mpoeschl</id>
  -      <email>mpoeschl@marmot.at</email>
  -      <organization>Tucana.at</organization>
  -      <roles>
  -        <role>Java Developer</role>
  -      </roles>
  -    </developer>
  -    <developer>
  -      <name>Stephen Haberman</name>
  -      <id>stephenh</id>
  -      <email>stephenh@chase3000.com</email>
  -      <organization/>
  -      <roles>
  -        <role>Java Developer</role>
  -      </roles>
  -    </developer>
  -    <developer>
  -      <name>Quinton McCombs</name>
  -      <id>quintonm</id>
  -      <email>quintonm@bellsouth.net</email>
  -      <organization>NequalsOne</organization>
  -      <roles>
  -        <role>Java Developer</role>
  -      </roles>
  -    </developer>
  -  </developers>
  -
  -  <contributors>
  -    <contributor>
  -      <name>Markus M. May</name>
  -      <email>mmay@javafreedom.org</email>
  -    </contributor>
  -  </contributors>
  -
     <dependencies>
       <dependency>
         <id>commons-collections</id>
  @@ -65,14 +28,14 @@
       </dependency>
       <dependency>
         <id>commons-dbcp</id>
  -      <version>20030825.184428</version>
  +      <version>1.1</version>
         <properties>
           <classloader>root</classloader>
         </properties>
       </dependency>
       <dependency>
         <id>commons-lang</id>
  -      <version>1.0.1</version>
  +      <version>2.0</version>
         <properties>
           <classloader>root</classloader>
         </properties>
  @@ -87,13 +50,6 @@
       <dependency>
         <id>log4j</id>
         <version>1.2.8</version>
  -      <properties>
  -        <classloader>root</classloader>
  -      </properties>
  -    </dependency>
  -    <dependency>
  -      <id>stratum</id>
  -      <version>1.0-b3</version>
         <properties>
           <classloader>root</classloader>
         </properties>
  
  
  
  1.14      +16 -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
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- project.xml	26 Jun 2003 08:37:04 -0000	1.13
  +++ project.xml	28 Oct 2003 19:04:10 -0000	1.14
  @@ -1,7 +1,7 @@
   <?xml version="1.0" encoding="UTF-8"?>
   
   <project>
  -  <extend>../../project.xml</extend>
  +  <extend>../../project-base.xml</extend>
     <pomVersion>3</pomVersion>
     <id>torque-gen</id>
     <name>Torque generator</name>
  @@ -19,6 +19,21 @@
         <id>ant</id>
         <version>1.5.1</version>
         <url>http://ant.apache.org/</url>
  +    </dependency>
  +    <dependency>
  +      <id>commons-collections</id>
  +      <version>2.1</version>
  +      <url>http://jakarta.apache.org/commons/collections.html</url>
  +    </dependency>
  +    <dependency>
  +      <id>commons-lang</id>
  +      <version>2.0</version>
  +      <url>http://jakarta.apache.org/commons/</url>
  +    </dependency>
  +    <dependency>
  +      <id>commons-logging</id>
  +      <version>1.0.3</version>
  +      <url>http://jakarta.apache.org/commons/</url>
       </dependency>
       <dependency>
         <id>velocity</id>
  
  
  
  1.109     +2 -189    db-torque/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/db-torque/project.xml,v
  retrieving revision 1.108
  retrieving revision 1.109
  diff -u -r1.108 -r1.109
  --- project.xml	28 Oct 2003 08:58:34 -0000	1.108
  +++ project.xml	28 Oct 2003 19:04:10 -0000	1.109
  @@ -1,30 +1,15 @@
   <?xml version="1.0" encoding="UTF-8"?>
   
   <project>
  +  <extend>project-base.xml</extend>
     <pomVersion>3</pomVersion>
     <id>torque</id>
  -  <groupId>torque</groupId>
     <name>Torque</name>
  -  <currentVersion>3.2-dev</currentVersion>
  -  <organization>
  -    <name>Apache Software Foundation</name>
  -    <url>http://db.apache.org/</url>
  -    <logo>/images/db-logo-blue.png</logo>
  -  </organization>
  -  <inceptionYear>2000</inceptionYear>
  -  <package>org.apache.torque</package>
  -  <logo>/images/blue-logo.gif</logo>
  -
  -  <!-- Gump integration -->
  -  <gumpRepositoryId>jakarta</gumpRepositoryId>
   
     <description>Torque is a persistence layer.</description>
     <shortDescription>Persistence Layer</shortDescription>
     <url>http://db.apache.org/torque/</url>
  -  <issueTrackingUrl>http://scarab.werken.com/scarab/issues</issueTrackingUrl>
  -  <siteAddress>db.apache.org</siteAddress>
     <siteDirectory>/www/db.apache.org/torque/</siteDirectory>
  -  <distributionDirectory>/www/db.apache.org/builds/db-torque/</distributionDirectory>
   
     <repository>
       <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:db-torque</connection>
  @@ -32,163 +17,6 @@
       <url>http://cvs.apache.org/viewcvs/db-torque/</url>
     </repository>
   
  -  <mailingLists>
  -    <mailingList>
  -      <name>Torque User List</name>
  -      <subscribe>torque-user-subscribe@db.apache.org</subscribe>
  -      <unsubscribe>torque-user-unsubscribe@db.apache.org</unsubscribe>
  -      <archive>http://archives.apache.org/eyebrowse/SummarizeList?listName=torque-user@db.apache.org</archive>
  -    </mailingList>
  -    <mailingList>
  -      <name>Torque Developer List</name>
  -      <subscribe>torque-dev-subscribe@db.apache.org</subscribe>
  -      <unsubscribe>torque-dev-unsubscribe@db.apache.org</unsubscribe>
  -      <archive>http://archives.apache.org/eyebrowse/SummarizeList?listName=torque-dev@db.apache.org</archive>
  -    </mailingList>
  -  </mailingLists>
  -
  -  <developers>
  -    <developer>
  -      <name>Jeffrey D. Brekke</name>
  -      <id>brekke</id>
  -      <email>brekke@apache.org</email>
  -      <organization/>
  -      <roles>
  -        <role>Java Developer</role>
  -      </roles>
  -    </developer>
  -    <developer>
  -      <name>Eric Dobbs</name>
  -      <id>dobbs</id>
  -      <email>dobbs@apache.org</email>
  -      <organization/>
  -      <roles>
  -        <role>Java Developer</role>
  -      </roles>
  -    </developer>
  -    <developer>
  -      <name>Scott Eade</name>
  -      <id>seade</id>
  -      <email>seade@backstagetech.com.au</email>
  -      <organization>Backstage Technologies Pty. Ltd.</organization>
  -      <roles>
  -        <role>Java Developer</role>
  -      </roles>
  -    </developer>
  -    <developer>
  -      <name>Stephen Haberman</name>
  -      <id>stephenh</id>
  -      <email>stephenh@chase3000.com</email>
  -      <organization/>
  -      <roles>
  -        <role>Java Developer</role>
  -      </roles>
  -    </developer>
  -    <developer>
  -      <name>Humberto Hernandez</name>
  -      <id>hhernandez</id>
  -      <email>hhernandez@itweb.com.mx</email>
  -      <organization>Integrated Technology S.C.</organization>
  -      <roles>
  -        <role>Java Developer</role>
  -      </roles>
  -    </developer>
  -    <developer>
  -      <name>Fedor Karpelevitch</name>
  -      <id>fedor</id>
  -      <email>fedor@karpelevitch.net</email>
  -      <organization/>
  -      <roles>
  -        <role>Java Developer</role>
  -      </roles>
  -    </developer>
  -    <developer>
  -      <name>Quinton McCombs</name>
  -      <id>quintonm</id>
  -      <email>quintonm@bellsouth.net</email>
  -      <organization>NEqualsOne</organization>
  -      <roles>
  -        <role>Java Developer</role>
  -      </roles>
  -    </developer>
  -    <developer>
  -      <name>John McNally</name>
  -      <id>jmcnally</id>
  -      <email>jmcnally@collab.net</email>
  -      <organization>CollabNet</organization>
  -      <roles>
  -        <role>Java Developer</role>
  -      </roles>
  -    </developer>
  -    <developer>
  -      <name>Martin Poeschl</name>
  -      <id>mpoeschl</id>
  -      <email>mpoeschl@marmot.at</email>
  -      <organization>Tucana.at</organization>
  -      <roles>
  -        <role>Java Developer</role>
  -      </roles>
  -      <timezone>+18</timezone>
  -    </developer>
  -    <developer>
  -      <name>Daniel Rall</name>
  -      <id>dlr</id>
  -      <email>dlr@finemaltcoding.com</email>
  -      <organization>CollabNet, Inc.</organization>
  -      <roles>
  -        <role>Java Developer</role>
  -      </roles>
  -    </developer>
  -    <developer>
  -      <name>Henning P. Schmiedehausen</name>
  -      <id>henning</id>
  -      <email>hps@intermeta.de</email>
  -      <organization>INTERMETA - Gesellschaft fuer Mehrwertdienste mbH</organization>
  -      <roles>
  -        <role>Java Developer</role>
  -      </roles>
  -      <timezone>+18</timezone>
  -    </developer>
  -    <developer>
  -      <name>Kurt Schrader</name>
  -      <id>kschrader</id>
  -      <email>kschrader@karmalab.org</email>
  -      <organization/>
  -      <roles>
  -        <role>Java Developer</role>
  -      </roles>
  -    </developer>
  -    <developer>
  -      <name>Jon Scott Stevens</name>
  -      <id>jon</id>
  -      <email>jon@latchkey.com</email>
  -      <organization>CollabNet, Inc.</organization>
  -      <roles>
  -        <role>Java Developer</role>
  -      </roles>
  -    </developer>
  -    <developer>
  -      <name>James Taylor</name>
  -      <id>jtaylor</id>
  -      <email>james@jamestaylor.org</email>
  -      <organization/>
  -      <roles>
  -        <role>Java Developer</role>
  -      </roles>
  -    </developer>
  -  </developers>
  -
  -  <contributors>
  -    <contributor>
  -      <name>James Hillyerd</name>
  -      <email>james@hillyerd.com</email>
  -    </contributor>
  -    <contributor>
  -      <name>J. Russell Smyth</name>
  -      <email>drfish@cox.net</email>
  -    </contributor>
  -  </contributors>
  -
     <dependencies>
       <dependency>
         <id>avalon-framework</id>
  @@ -296,24 +124,9 @@
           <exclude>**/BaseTestCase.java</exclude>
         </excludes>
       </unitTest>
  -
  +    
       <resources></resources>
       <jars></jars>
     </build>
  -  <reports>
  -    <report>maven-jdepend-plugin</report>
  -    <report>maven-checkstyle-plugin</report>
  -    <report>maven-changes-plugin</report>
  -    <report>maven-changelog-plugin</report>
  -    <report>maven-file-activity-plugin</report>
  -    <report>maven-developer-activity-plugin</report>
  -    <report>maven-javadoc-plugin</report>
  -    <report>maven-jxr-plugin</report>
  -    <report>maven-junit-report-plugin</report>
  -    <report>maven-tasklist-plugin</report>
  -    <report>maven-pmd-plugin</report>
  -    <report>maven-simian-plugin</report>
  -    <report>maven-jcoverage-plugin</report>
  -  </reports>
     
   </project>
  
  
  
  1.1                  db-torque/project-base.xml
  
  Index: project-base.xml
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  
  <project>
    <pomVersion>3</pomVersion>
    <groupId>torque</groupId>
    <name>Torque</name>
    <currentVersion>3.2-dev</currentVersion>
    <organization>
      <name>Apache Software Foundation</name>
      <url>http://db.apache.org/</url>
      <logo>/images/db-logo-blue.png</logo>
    </organization>
    <inceptionYear>2000</inceptionYear>
    <package>org.apache.torque</package>
    <logo>/images/blue-logo.gif</logo>
  
    <!-- Gump integration -->
    <gumpRepositoryId>jakarta</gumpRepositoryId>
  
    <description>Torque is a persistence layer.</description>
    <shortDescription>Persistence Layer</shortDescription>
    <url>http://db.apache.org/torque/</url>
    <issueTrackingUrl>http://scarab.werken.com/scarab/issues</issueTrackingUrl>
    <siteAddress>db.apache.org</siteAddress>
    <siteDirectory>/www/db.apache.org/torque/</siteDirectory>
    <distributionDirectory>/www/db.apache.org/builds/db-torque/</distributionDirectory>
  
    <repository>
      <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:db-torque</connection>
      <developerConnection>scm:cvs:ext:${maven.username}@cvs.apache.org:/home/cvs:db-torque</developerConnection>
      <url>http://cvs.apache.org/viewcvs/db-torque/</url>
    </repository>
  
    <mailingLists>
      <mailingList>
        <name>Torque User List</name>
        <subscribe>torque-user-subscribe@db.apache.org</subscribe>
        <unsubscribe>torque-user-unsubscribe@db.apache.org</unsubscribe>
        <archive>http://archives.apache.org/eyebrowse/SummarizeList?listName=torque-user@db.apache.org</archive>
      </mailingList>
      <mailingList>
        <name>Torque Developer List</name>
        <subscribe>torque-dev-subscribe@db.apache.org</subscribe>
        <unsubscribe>torque-dev-unsubscribe@db.apache.org</unsubscribe>
        <archive>http://archives.apache.org/eyebrowse/SummarizeList?listName=torque-dev@db.apache.org</archive>
      </mailingList>
    </mailingLists>
  
    <developers>
      <developer>
        <name>Jeffrey D. Brekke</name>
        <id>brekke</id>
        <email>brekke@apache.org</email>
        <organization/>
        <roles>
          <role>Java Developer</role>
        </roles>
      </developer>
      <developer>
        <name>Eric Dobbs</name>
        <id>dobbs</id>
        <email>dobbs@apache.org</email>
        <organization/>
        <roles>
          <role>Java Developer</role>
        </roles>
      </developer>
      <developer>
        <name>Scott Eade</name>
        <id>seade</id>
        <email>seade@backstagetech.com.au</email>
        <organization>Backstage Technologies Pty. Ltd.</organization>
        <roles>
          <role>Java Developer</role>
        </roles>
      </developer>
      <developer>
        <name>Stephen Haberman</name>
        <id>stephenh</id>
        <email>stephenh@chase3000.com</email>
        <organization/>
        <roles>
          <role>Java Developer</role>
        </roles>
      </developer>
      <developer>
        <name>Humberto Hernandez</name>
        <id>hhernandez</id>
        <email>hhernandez@itweb.com.mx</email>
        <organization>Integrated Technology S.C.</organization>
        <roles>
          <role>Java Developer</role>
        </roles>
      </developer>
      <developer>
        <name>Fedor Karpelevitch</name>
        <id>fedor</id>
        <email>fedor@karpelevitch.net</email>
        <organization/>
        <roles>
          <role>Java Developer</role>
        </roles>
      </developer>
      <developer>
        <name>Quinton McCombs</name>
        <id>quintonm</id>
        <email>quintonm@bellsouth.net</email>
        <organization>NEqualsOne</organization>
        <roles>
          <role>Java Developer</role>
        </roles>
      </developer>
      <developer>
        <name>John McNally</name>
        <id>jmcnally</id>
        <email>jmcnally@collab.net</email>
        <organization>CollabNet</organization>
        <roles>
          <role>Java Developer</role>
        </roles>
      </developer>
      <developer>
        <name>Martin Poeschl</name>
        <id>mpoeschl</id>
        <email>mpoeschl@marmot.at</email>
        <organization>Tucana.at</organization>
        <roles>
          <role>Java Developer</role>
        </roles>
        <timezone>+18</timezone>
      </developer>
      <developer>
        <name>Daniel Rall</name>
        <id>dlr</id>
        <email>dlr@finemaltcoding.com</email>
        <organization>CollabNet, Inc.</organization>
        <roles>
          <role>Java Developer</role>
        </roles>
      </developer>
      <developer>
        <name>Henning P. Schmiedehausen</name>
        <id>henning</id>
        <email>hps@intermeta.de</email>
        <organization>INTERMETA - Gesellschaft fuer Mehrwertdienste mbH</organization>
        <roles>
          <role>Java Developer</role>
        </roles>
        <timezone>+18</timezone>
      </developer>
      <developer>
        <name>Kurt Schrader</name>
        <id>kschrader</id>
        <email>kschrader@karmalab.org</email>
        <organization/>
        <roles>
          <role>Java Developer</role>
        </roles>
      </developer>
      <developer>
        <name>Jon Scott Stevens</name>
        <id>jon</id>
        <email>jon@latchkey.com</email>
        <organization>CollabNet, Inc.</organization>
        <roles>
          <role>Java Developer</role>
        </roles>
      </developer>
      <developer>
        <name>James Taylor</name>
        <id>jtaylor</id>
        <email>james@jamestaylor.org</email>
        <organization/>
        <roles>
          <role>Java Developer</role>
        </roles>
      </developer>
    </developers>
  
    <contributors>
      <contributor>
        <name>James Hillyerd</name>
        <email>james@hillyerd.com</email>
      </contributor>
      <contributor>
        <name>Markus M. May</name>
        <email>mmay@javafreedom.org</email>
      </contributor>
      <contributor>
        <name>J. Russell Smyth</name>
        <email>drfish@cox.net</email>
      </contributor>
    </contributors>
  
    <build>
      <nagEmailAddress>torque-dev@db.apache.org</nagEmailAddress>
      <sourceDirectory>src/java</sourceDirectory>
      <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
      <aspectSourceDirectory></aspectSourceDirectory>
  
      <unitTest>
        <includes>
          <include>**/*Test*.java</include>
        </includes>
        <excludes>
          <exclude>**/BaseTestCase.java</exclude>
        </excludes>
      </unitTest>
  
      <resources></resources>
      <jars></jars>
    </build>
    <reports>
      <report>maven-jdepend-plugin</report>
      <report>maven-checkstyle-plugin</report>
      <report>maven-changes-plugin</report>
      <report>maven-changelog-plugin</report>
      <report>maven-file-activity-plugin</report>
      <report>maven-developer-activity-plugin</report>
      <report>maven-javadoc-plugin</report>
      <report>maven-jxr-plugin</report>
      <report>maven-junit-report-plugin</report>
      <report>maven-tasklist-plugin</report>
      <report>maven-pmd-plugin</report>
      <report>maven-simian-plugin</report>
      <report>maven-jcoverage-plugin</report>
    </reports>
    
  </project>
  
  
  

---------------------------------------------------------------------
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