You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gump.apache.org by bo...@apache.org on 2004/11/12 10:12:48 UTC

cvs commit: gump/project jakarta-cactus.xml jakarta-ecs.xml jakarta-turbine-2.xml jdbc.xml mockobjects.xml xdoclet.xml xml-xerces2.xml

bodewig     2004/11/12 01:12:48

  Modified:    project  jakarta-cactus.xml jakarta-ecs.xml
                        jakarta-turbine-2.xml jdbc.xml mockobjects.xml
                        xdoclet.xml xml-xerces2.xml
  Log:
  Try to match some Maven ids
  
  Revision  Changes    Path
  1.53      +4 -4      gump/project/jakarta-cactus.xml
  
  Index: jakarta-cactus.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/jakarta-cactus.xml,v
  retrieving revision 1.52
  retrieving revision 1.53
  diff -u -r1.52 -r1.53
  --- jakarta-cactus.xml	26 Oct 2004 14:52:29 -0000	1.52
  +++ jakarta-cactus.xml	12 Nov 2004 09:12:47 -0000	1.53
  @@ -50,7 +50,7 @@
         <depend property="httpunit.jar" project="httpunit"/>
         <depend property="aspectjrt.jar" project="aspectj" id="aspectjrt"/>
         <depend property="junit.jar" project="junit"/>
  -      <depend property="mockobjects.jar" project="mockobjects" id="core"/>
  +      <depend property="mockobjects.jar" project="mockobjects" id="mockobjects-core"/>
         <!-- Note: the Jetty jar should only be needed for framework-13 but our
              framework build.xml does not make the distinction between 12 or 13 
              for dependencies -->
  @@ -105,7 +105,7 @@
         <depend property="httpunit.jar" project="httpunit"/>
         <depend property="aspectjrt.jar" project="aspectj" id="aspectjrt"/>
         <depend property="junit.jar" project="junit"/>
  -      <depend property="mockobjects.jar" project="mockobjects" id="core"/>
  +      <depend property="mockobjects.jar" project="mockobjects" id="mockobjects-core"/>
         <depend property="jetty.jar" project="jetty" id="jetty"/>
   
       </ant>
  @@ -155,7 +155,7 @@
         <depend property="junit.jar" project="junit"/>
         <depend property="xerces.jar" project="xml-xerces" id="xml-parser"/>
         <depend property="xmlapis.jar" project="xml-xerces" id="xml-apis"/>
  -      <depend property="mockobjects.jar" project="mockobjects" id="core"/>
  +      <depend property="mockobjects.jar" project="mockobjects" id="mockobjects-core"/>
   
       </ant>
     
  @@ -205,7 +205,7 @@
         <depend property="junit.jar" project="junit"/>
         <depend property="xerces.jar" project="xml-xerces" id="xml-parser"/>
         <depend property="xmlapis.jar" project="xml-xerces" id="xml-apis"/>
  -      <depend property="mockobjects.jar" project="mockobjects" id="core"/>
  +      <depend property="mockobjects.jar" project="mockobjects" id="mockobjects-core"/>
   
       </ant>
     
  
  
  
  1.13      +1 -1      gump/project/jakarta-ecs.xml
  
  Index: jakarta-ecs.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/jakarta-ecs.xml,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- jakarta-ecs.xml	27 Feb 2004 09:22:56 -0000	1.12
  +++ jakarta-ecs.xml	12 Nov 2004 09:12:47 -0000	1.13
  @@ -34,7 +34,7 @@
       <depend project="xml-xerces"/>
       <depend project="jakarta-regexp"/>
       <home nested="ecs-@@DATE@@"/>
  -    <jar name="ecs-@@DATE@@.jar"/>
  +    <jar name="ecs-@@DATE@@.jar" id="ecs"/>
       <javadoc nested="ecs-@@DATE@@/docs/apidocs"/>
       <nag from="Jon Stevens &lt;jon@latchkey.com&gt;"
            to="ecs-dev@jakarta.apache.org"/>
  
  
  
  1.40      +1 -1      gump/project/jakarta-turbine-2.xml
  
  Index: jakarta-turbine-2.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/jakarta-turbine-2.xml,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- jakarta-turbine-2.xml	4 Nov 2004 05:23:35 -0000	1.39
  +++ jakarta-turbine-2.xml	12 Nov 2004 09:12:47 -0000	1.40
  @@ -108,7 +108,7 @@
       <depend project="xmlrpc"/>
       <depend project="xalan"/>
       <depend project="xml-apis"/>
  -    <depend project="xml-xerces"/>
  +    <depend project="xml-xercesImpl"/>
       <depend project="xstream"/>
   
       <work nested="target/classes"/>
  
  
  
  1.7       +1 -1      gump/project/jdbc.xml
  
  Index: jdbc.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/jdbc.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- jdbc.xml	27 Feb 2004 09:22:56 -0000	1.6
  +++ jdbc.xml	12 Nov 2004 09:12:47 -0000	1.7
  @@ -24,7 +24,7 @@
     <project name="jdbc">
       <package>javax.sql</package>
     
  -    <jar name="jdbc2_0-stdext.jar" id="stdext"/>
  +    <jar name="jdbc2_0-stdext.jar" id="jdbc"/>
     </project>
   
   </module>
  
  
  
  1.20      +5 -5      gump/project/mockobjects.xml
  
  Index: mockobjects.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/mockobjects.xml,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- mockobjects.xml	4 Nov 2004 05:23:35 -0000	1.19
  +++ mockobjects.xml	12 Nov 2004 09:12:47 -0000	1.20
  @@ -106,14 +106,14 @@
   -->
   
     <project name="mockobjects">
  -    <jar name="mockobjects-core-0.09.jar" id="core"/>
  -    <jar name="mockobjects-jdk1.4-0.09.jar" id="jdk"/>
  -    <jar name="mockobjects-alt-jdk1.4-0.09.jar" id="alt-jdk"/>
  +    <jar name="mockobjects-core-0.09.jar" id="mockobjects-core"/>
  +    <jar name="mockobjects-jdk1.4-0.09.jar" id="mockobjects-jdk1.4"/>
  +    <jar name="mockobjects-alt-jdk1.4-0.09.jar" id="mockobjects-alt-jdk1.4"/>
     </project>
   
     <project name="mockobjects-j2ee-13">
  -    <jar name="mockobjects-jdk1.4-j2ee1.3-0.09.jar" id="j2ee"/>
  -    <jar name="mockobjects-alt-jdk1.4-j2ee1.3-0.09.jar" id="alt-j2ee"/>
  +    <jar name="mockobjects-jdk1.4-j2ee1.3-0.09.jar" id="mockobjects-jdk1.4-j2ee"/>
  +    <jar name="mockobjects-alt-jdk1.4-j2ee1.3-0.09.jar" id="mockobjects-jdk1.4-alt-j2ee"/>
     </project>
   
     <!--project name="mockobjects-j2ee-14">
  
  
  
  1.85      +1 -1      gump/project/xdoclet.xml
  
  Index: xdoclet.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/xdoclet.xml,v
  retrieving revision 1.84
  retrieving revision 1.85
  diff -u -r1.84 -r1.85
  --- xdoclet.xml	2 Nov 2004 12:27:51 -0000	1.84
  +++ xdoclet.xml	12 Nov 2004 09:12:47 -0000	1.85
  @@ -295,7 +295,7 @@
       <depend project="jakarta-servletapi-4"/>
       <depend project="bcel" runtime="true"/>
       <depend project="mockobjects" inherit="runtime"
  -            ids="core jdk"/>
  +            ids="mockobjects-core mockobjects-jdk1.4"/>
   
       <work nested="core/build/classes" />
       <work nested="modules/build/apache/classes"/>
  
  
  
  1.38      +8 -0      gump/project/xml-xerces2.xml
  
  Index: xml-xerces2.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/xml-xerces2.xml,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- xml-xerces2.xml	28 Oct 2004 06:49:50 -0000	1.37
  +++ xml-xerces2.xml	12 Nov 2004 09:12:48 -0000	1.38
  @@ -41,6 +41,14 @@
            to="xerces-j-dev@xml.apache.org"/>
     </project>
   
  +  <project name="xml-xercesImpl">
  +    <package>org.apache.xerces</package>
  +    <depend project="xml-xerces"/>
  +    <home nested="java/build"/>
  +    <jar name="xercesImpl.jar" id="xercesImpl"/>
  +    <license name="java/LICENSE"/>
  +  </project>
  +
     <!-- package up the distribution -->
   
     <project name="dist-xerces">