You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by ep...@apache.org on 2004/02/18 11:42:35 UTC

cvs commit: jakarta-commons-sandbox/xo/src/test/org/apache/commons/xo/classname Container.java

epugh       2004/02/18 02:42:35

  Modified:    xo/src/test/org/apache/commons/xo/datamodel Database.java
                        ForeignKey.java Table.java Column.java
               xo/src/test/org/apache/commons/xo/liveobject Turbine.java
               xo       project.xml
               xo/src/test/org/apache/commons/xo/classname Container.java
  Log:
  Update code to work with Maven RC1.  Cleanup imports
  
  Revision  Changes    Path
  1.2       +0 -1      jakarta-commons-sandbox/xo/src/test/org/apache/commons/xo/datamodel/Database.java
  
  Index: Database.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/xo/src/test/org/apache/commons/xo/datamodel/Database.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Database.java	16 Apr 2002 19:07:56 -0000	1.1
  +++ Database.java	18 Feb 2004 10:42:35 -0000	1.2
  @@ -1,6 +1,5 @@
   package org.apache.commons.xo.datamodel;
   
  -import java.util.Iterator;
   import java.util.ArrayList;
   import java.util.List;
   
  
  
  
  1.2       +0 -1      jakarta-commons-sandbox/xo/src/test/org/apache/commons/xo/datamodel/ForeignKey.java
  
  Index: ForeignKey.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/xo/src/test/org/apache/commons/xo/datamodel/ForeignKey.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ForeignKey.java	16 Apr 2002 19:07:56 -0000	1.1
  +++ ForeignKey.java	18 Feb 2004 10:42:35 -0000	1.2
  @@ -1,6 +1,5 @@
   package org.apache.commons.xo.datamodel;
   
  -import java.util.Iterator;
   import java.util.ArrayList;
   import java.util.List;
   
  
  
  
  1.2       +0 -1      jakarta-commons-sandbox/xo/src/test/org/apache/commons/xo/datamodel/Table.java
  
  Index: Table.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/xo/src/test/org/apache/commons/xo/datamodel/Table.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Table.java	16 Apr 2002 19:07:56 -0000	1.1
  +++ Table.java	18 Feb 2004 10:42:35 -0000	1.2
  @@ -1,6 +1,5 @@
   package org.apache.commons.xo.datamodel;
   
  -import java.util.Iterator;
   import java.util.ArrayList;
   import java.util.List;
   
  
  
  
  1.2       +0 -3      jakarta-commons-sandbox/xo/src/test/org/apache/commons/xo/datamodel/Column.java
  
  Index: Column.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/xo/src/test/org/apache/commons/xo/datamodel/Column.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Column.java	16 Apr 2002 19:07:56 -0000	1.1
  +++ Column.java	18 Feb 2004 10:42:35 -0000	1.2
  @@ -1,8 +1,5 @@
   package org.apache.commons.xo.datamodel;
   
  -import java.util.Iterator;
  -import java.util.ArrayList;
  -import java.util.List;
   
   public class Column 
   {
  
  
  
  1.2       +0 -1      jakarta-commons-sandbox/xo/src/test/org/apache/commons/xo/liveobject/Turbine.java
  
  Index: Turbine.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/xo/src/test/org/apache/commons/xo/liveobject/Turbine.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Turbine.java	16 Apr 2002 19:07:56 -0000	1.1
  +++ Turbine.java	18 Feb 2004 10:42:35 -0000	1.2
  @@ -2,7 +2,6 @@
   
   import java.util.ArrayList;
   import java.util.List;
  -import org.apache.commons.xo.Mapper;
   
   public class Turbine
   {
  
  
  
  1.10      +43 -50    jakarta-commons-sandbox/xo/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/xo/project.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- project.xml	25 Jun 2002 01:45:31 -0000	1.9
  +++ project.xml	18 Feb 2004 10:42:35 -0000	1.10
  @@ -6,8 +6,8 @@
     <id>commons-xo</id>
     <currentVersion>0.8</currentVersion>
     <organization>
  -	  <name>Apache Software Foundation</name>
  -	  <url>http://www.apache.org</url>
  +    <name>Apache Software Foundation</name>
  +    <url>http://www.apache.org</url>
     </organization>
     <inceptionYear>2002</inceptionYear>
     <package>org.apache.commons.xo</package>
  @@ -40,79 +40,72 @@
         <email>dion@multitask.com.au</email>
         <organization>Multitask Consulting</organization>
       </developer>
  +    <developer>
  +      <name>Eric Pugh</name>
  +      <id>epugh</id>
  +      <email>epugh@opensourceconnections.com</email>
  +      <organization>Eric Pugh</organization>
  +    </developer>    
     </developers>
     
     <dependencies>
       
       <dependency>
  -      <name>commons-beanutils</name>
  -      <type>required</type>
  -      <version>dev</version>
  -      <jar>commons-beanutils-dev.jar</jar>
  +      <id>commons-beanutils</id>      
  +      <version>1.7-dev</version>
       </dependency>
       
       <dependency>
  -      <name>commons-betwixt</name>
  -      <type>required</type>
  -      <version>1.0</version>
  -      <jar>commons-betwixt-1.0-dev.jar</jar>
  +      <id>commons-betwixt</id>      
  +      <version>1.0-beta-1</version>
       </dependency>
  -    
       <dependency>
  -      <name>commons-digester</name>
  -      <type>required</type>
  -      <version>1.2</version>
  -      <jar>commons-digester-1.2.jar</jar>
  +      <id>commons-digester</id>
  +      <version>1.5</version>
  +      <url>http://jakarta.apache.org/commons/digester/index.html</url>
       </dependency>
       
       <dependency>
  -      <name>commons-collections</name>
  -      <type>required</type>
  +      <id>commons-collections</id>
         <version>1.0</version>
  -      <jar>commons-collections-1.0.jar</jar>
  -    </dependency>
  -    
  -    <dependency>
  -      <name>commons-io</name>
  -      <type>required</type>
  -      <version>0.1</version>
  -      <jar>commons-io-0.1.jar</jar>
  +      <url>http://jakarta.apache.org/commons/collections/index.html</url>
       </dependency>
  -    
  + 
       <dependency>
  -      <name>commons-lang</name>
  -      <type>required</type>
  +      <id>commons-io</id>
         <version>0.1</version>
  -      <jar>commons-lang-0.1-dev.jar</jar>
  +      <url>http://jakarta.apache.org/commons/io/index.html</url>
       </dependency>
       
       <dependency>
  -      <name>commons-logging</name>
  -      <type>required</type>
  -      <version>1.0</version>
  -      <jar>commons-logging-1.0.jar</jar>
  +      <id>commons-lang</id>
  +      <version>2.0</version>
  +      <url>http://jakarta.apache.org/commons/lang/index.html</url>
       </dependency>
       
       <dependency>
  -      <name>dom4j</name>
  -      <type>required</type>
  -      <version>1.3</version>
  -      <jar>dom4j-1.3.jar</jar>
  +      <id>commons-logging</id>
  +      <version>1.0.3</version>
  +      <url>http://jakarta.apache.org/commons/logging/index.html</url>
       </dependency>
  +     <dependency>
  +      <id>dom4j</id>
  +      <version>1.4</version>
  +    </dependency>   
     </dependencies>
  -  
  +
     <build>
  -<!--    <sourceDirectory>src/java</sourceDirectory>  -->
  -    <sourceDirectories>
  -      <sourceDirectory>src/java</sourceDirectory> 
  -    </sourceDirectories>
  +    <sourceDirectory>src/java</sourceDirectory>
       <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
  -    <aspectSourceDirectories></aspectSourceDirectories>
  -    <unitTestPatterns>
  -      <unitTestPattern>include = **/*Test*.java</unitTestPattern>
  -    </unitTestPatterns>
  -    <jarResources></jarResources>
  -    <jars></jars>
  -    <nagEmailAddress>commons-dev@jakarta.apache.org</nagEmailAddress>
  -  </build>
  +    <unitTest>
  +      <includes>
  +        <include>**/Test*.java</include>
  +      </includes>
  +      <excludes>
  +      </excludes>
  +    </unitTest>
  +    <integrationUnitTestSourceDirectory/>
  +    <integrationUnitTest/>
  +    <aspectSourceDirectory/>
  +  </build>  
   </project>
  
  
  
  1.2       +0 -1      jakarta-commons-sandbox/xo/src/test/org/apache/commons/xo/classname/Container.java
  
  Index: Container.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/xo/src/test/org/apache/commons/xo/classname/Container.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Container.java	16 Apr 2002 19:07:56 -0000	1.1
  +++ Container.java	18 Feb 2004 10:42:35 -0000	1.2
  @@ -1,6 +1,5 @@
   package org.apache.commons.xo.classname;
   
  -import java.util.List;
   import java.util.ArrayList;
   
   public class Container
  
  
  

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