ajack       2004/07/01 08:49:48

  Modified:    project  Tag: CleanUp ws-wsrp4j.xml jakarta-slide.xml
                        incubator-altrmi.xml jakarta-jmeter.xml
                        jakarta-jmeter-20.xml jakarta-commons.xml
                        jakarta-turbine-jcs.xml dom4j.xml msv.xml
                        jakarta-commons-sandbox.xml xml-xindice.xml
               profile  Tag: CleanUp gump.xml
  Added:       project  Tag: CleanUp jgroups.xml hibernate.xml
  Log:
  Merged metadata w/ CVS HEAD.
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.19.2.2  +6 -6      gump/project/ws-wsrp4j.xml
  
  Index: ws-wsrp4j.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/ws-wsrp4j.xml,v
  retrieving revision 1.19.2.1
  retrieving revision 1.19.2.2
  diff -u -r1.19.2.1 -r1.19.2.2
  --- ws-wsrp4j.xml     16 Jun 2004 23:05:36 -0000      1.19.2.1
  +++ ws-wsrp4j.xml     1 Jul 2004 15:49:48 -0000       1.19.2.2
  @@ -43,12 +43,12 @@
       <depend project="my-axis"/>
       <depend project="commons-discovery"/>
       <depend project="commons-logging"/>
  -    <depend project="my-tt-bytecode"/>
  +    <depend project="tt-bytecode"/>
       <depend project="wsdl4j"/>
       <depend project="xml-apis"/>
       <depend project="xml-xerces"/>
       <depend project="my-jaxrpc"/>
  -    <depend project="my-saaj"/>
  +    <depend project="saaj"/>
   
       <work nested="build/ant/lib/ForeachTask.jar"/>
       <work nested="bin/classes"/>
  @@ -68,17 +68,17 @@
       </nag>
     </project>
     
  -  <project name="my-tt-bytecode">
  +  <project name="tt-bytecode">
        <jar name="lib/tt-bytecode.jar"/>
     </project>
     <project name="my-axis">
       <jar name="lib/axis.jar"/>
     </project>
  +  <project name="saaj">
  +    <jar name="lib/saaj.jar"/>
  +  </project>
     <project name="my-jaxrpc">
       <jar name="lib/jaxrpc.jar"/>
  -  </project>
  -  <project name="my-saaj">
  -    <jar name="lib/saaj.jar"/>
     </project>
     
   </module>
  
  
  
  1.58.4.1  +15 -0     gump/project/jakarta-slide.xml
  
  Index: jakarta-slide.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/jakarta-slide.xml,v
  retrieving revision 1.58
  retrieving revision 1.58.4.1
  diff -u -r1.58 -r1.58.4.1
  --- jakarta-slide.xml 7 May 2004 06:35:33 -0000       1.58
  +++ jakarta-slide.xml 1 Jul 2004 15:49:48 -0000       1.58.4.1
  @@ -72,6 +72,9 @@
       <depend project="xmlunit"/>
       <option project="jakarta-taglibs-standard" ids="jstl standard"/>
   
  +    <depend project="textmining-word-extractor"/>
  +    <depend project="pdfbox"/>
  +
       <work nested="build/classes"/>
       <work nested="build/client/classes"/>
       <work nested="webdavclient/build/clientlib/classes"/>
  @@ -106,6 +109,18 @@
   
       <nag to="[EMAIL PROTECTED]"
            from="Stefan Bodewig &lt;[EMAIL PROTECTED]&gt;"/>
  +  </project>
  +
  +  <project name="textmining-word-extractor">
  +    <url href="http://www.textmining.org/"/>
  +    <description>TextMining.org Word 6.0/97/2000/XP/2003 Text 
Extractor</description>
  +    <jar name="lib/tm-extractors-0.4.jar"/>
  +  </project>
  +
  +  <project name="pdfbox">
  +    <url href="http://www.pdfbox.org/"/>
  +    <description>PDFBox is a Java PDF Library.</description>
  +    <jar name="lib/PDFBox-0.6.5.jar"/>
     </project>
   
   </module>
  
  
  
  1.25.4.1  +1 -6      gump/project/incubator-altrmi.xml
  
  Index: incubator-altrmi.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/incubator-altrmi.xml,v
  retrieving revision 1.25
  retrieving revision 1.25.4.1
  diff -u -r1.25 -r1.25.4.1
  --- incubator-altrmi.xml      10 May 2004 08:19:14 -0000      1.25
  +++ incubator-altrmi.xml      1 Jul 2004 15:49:48 -0000       1.25.4.1
  @@ -26,12 +26,7 @@
       <project name="incubator-altrmi">
           <package>org.apache.altrmi</package>
   
  -        <ant target="jars">
  -            <property name="version" value="@@DATE@@"/>
  -            <property name="junit.failonerror" value="true"/>
  -            <property name="do.checkstyle" value="true"/>
  -            <property name="skip.dependencies" value="true"/>
  -        </ant>
  +        <maven goal="jar"/>
   
           <depend project="excalibur-pool"/>
           <depend project="ant" inherit="runtime"/>
  
  
  
  1.97.2.2  +32 -16    gump/project/jakarta-jmeter.xml
  
  Index: jakarta-jmeter.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/jakarta-jmeter.xml,v
  retrieving revision 1.97.2.1
  retrieving revision 1.97.2.2
  diff -u -r1.97.2.1 -r1.97.2.2
  --- jakarta-jmeter.xml        21 Jun 2004 04:06:09 -0000      1.97.2.1
  +++ jakarta-jmeter.xml        1 Jul 2004 15:49:48 -0000       1.97.2.2
  @@ -97,11 +97,10 @@
       <work nested="build/htmlparser"/>
       <work nested="build/jorphan"/>
       
  -    <!-- Not available as Gump projects -->
  -    <work nested="lib/xpp3-1.1.3.4.D.jar"/>
  -    <work nested="lib/xstream-1.0.1.jar"/>
  -
  -    <!-- Allow http to build: -->
  +    <depend project="xpp3"/>
  +    <depend project="xstream"/>
  +    
  +        <!-- Allow http to build: -->
       <work nested="build/components"/>
   
       <!-- Allow Monitor to build -->
  @@ -113,8 +112,25 @@
           <regexp pattern="/BUILD FAILED/" subject="JMeter Build Failure"/>
       </nag>
     </project>
  -
  -  <project name="jakarta-jmeter-cvs">
  +  
  +  <project name="xpp3">
  +     <url href="http://www.extreme.indiana.edu/xgws/xsoap/xpp/"/>
  +     <description>
  +             Xml Pull Parser (in short XPP) is a streaming pull XML parser
  +             and should be used when there is a need to process quickly and 
efficiently 
  +             all input elements.
  +     </description>
  +     <jar name="lib/xpp3-1.1.3.4.D.jar" id="xpp3"/>
  +  </project>
  +  
  +  <project name="xstream">
  +     <url href="http://xstream.codehaus.org/"/>
  +     <description>XStream is a simple library to serialize objects to XML and back 
again
  +     </description>
  +    <jar name="lib/xstream-1.0.1.jar" id="xstream"/>
  +  </project>
  +  
  +     <project name="jakarta-jmeter-cvs">
           <!-- Build JMeter from CVS versions of dependencies -->
       <package>org.apache.jmeter</package>
   
  
  
  
  1.6.2.2   +0 -0      gump/project/jakarta-jmeter-20.xml
  
  Index: jakarta-jmeter-20.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/jakarta-jmeter-20.xml,v
  retrieving revision 1.6.2.1
  retrieving revision 1.6.2.2
  diff -u -r1.6.2.1 -r1.6.2.2
  
  
  
  1.133.2.1 +2 -0      gump/project/jakarta-commons.xml
  
  Index: jakarta-commons.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/jakarta-commons.xml,v
  retrieving revision 1.133
  retrieving revision 1.133.2.1
  diff -u -r1.133 -r1.133.2.1
  --- jakarta-commons.xml       25 May 2004 21:19:33 -0000      1.133
  +++ jakarta-commons.xml       1 Jul 2004 15:49:48 -0000       1.133.2.1
  @@ -411,6 +411,8 @@
       <depend project="ant" inherit="runtime"/>
       <depend project="jakarta-site2" inherit="all"/>
       <depend project="commons-beanutils-core" runtime="true"/>
  +    <work nested="jxpath/target/classes"/>
  +    <work nested="jxpath/target/test-classes"/>
       <home nested="jxpath/dist"/>
       <jar name="commons-jxpath.jar"/>
       <javadoc nested="jxpath/dist/docs/api"/>
  
  
  
  1.8.4.1   +3 -1      gump/project/jakarta-turbine-jcs.xml
  
  Index: jakarta-turbine-jcs.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/jakarta-turbine-jcs.xml,v
  retrieving revision 1.8
  retrieving revision 1.8.4.1
  diff -u -r1.8 -r1.8.4.1
  --- jakarta-turbine-jcs.xml   27 Feb 2004 13:33:56 -0000      1.8
  +++ jakarta-turbine-jcs.xml   1 Jul 2004 15:49:48 -0000       1.8.4.1
  @@ -42,6 +42,7 @@
       <depend project="ant"/>
       <depend project="xml-xerces"/>
   
  +    <depend project="commons-collections"/>
       <depend project="commons-configuration"/>
       <depend project="commons-logging"/>
       <depend project="commons-lang"/>
  @@ -49,7 +50,8 @@
       <depend project="hsqldb"/>
       <depend project="logging-log4j"/>
       <depend project="jakarta-servletapi"/>
  -    <depend project="javagroups"/>
  +    <depend project="jakarta-struts"/>
  +    <depend project="jgroups"/>
       <depend project="jisp"/>
       <depend project="jakarta-tomcat-util"/>
       <depend project="jakarta-tomcat"/>
  
  
  
  1.35.4.3  +8 -4      gump/project/dom4j.xml
  
  Index: dom4j.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/dom4j.xml,v
  retrieving revision 1.35.4.2
  retrieving revision 1.35.4.3
  diff -u -r1.35.4.2 -r1.35.4.3
  --- dom4j.xml 23 Jun 2004 21:38:42 -0000      1.35.4.2
  +++ dom4j.xml 1 Jul 2004 15:49:48 -0000       1.35.4.3
  @@ -35,17 +35,21 @@
       <depend project="ant" inherit="runtime"/>
       <depend project="xml-xerces"/>
       <depend project="junit"/>
  +    <depend project="xml-apis"/>
       <depend project="xml-xalan2"/>
  -    <depend project="tranquilo"/>
       <depend project="xpp"/>
       <depend project="jaxen-from-packaged-dom4j"/>
  -    <depend project="xmldb"/>
  -    <depend project="msv"/>
  +    <depend project="xsdlib"/>
       <depend project="relaxng"/>
       <depend project="stax" ids="api"/>
  -    <depend project="xml-fop" inherit="runtime"/>
       <depend project="jtidy"/>
       <depend project="junitperf"/>
  +
  +    <!-- needed for tests -->
  +    <work nested="build/classes"/>
  +    <!-- holds resources for tests -->
  +    <work nested="."/>
  +
       <junitreport nested="build/test-results/xml"/>
       <jar name="build/dom4j.jar" id="dom4j"/>
       <license name="LICENSE.txt"/>
  
  
  
  1.2.4.1   +32 -3     gump/project/msv.xml
  
  Index: msv.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/msv.xml,v
  retrieving revision 1.2
  retrieving revision 1.2.4.1
  diff -u -r1.2 -r1.2.4.1
  --- msv.xml   27 Feb 2004 09:22:56 -0000      1.2
  +++ msv.xml   1 Jul 2004 15:49:48 -0000       1.2.4.1
  @@ -16,16 +16,45 @@
   -->
   <module name="msv">
   
  -  <url href="http://wwws.sun.com/software/xml/developers/multischema/"/>
  +  <url href="https://msv.dev.java.net/"/>
     <description>
       Sun Multi-Schema XML Validator 
     </description>
   
  +  <cvs repository="java.net"/>
  +
  +  <project name="xsdlib">
  +    <package>com.sun.msv</package>
  +
  +    <ant basedir="xsdlib" target="release"/>
  +
  +    <depend project="ant"/>
  +    <depend project="relaxng"/>
  +    <depend project="xml-xerces"/>
  +
  +    <jar name="xsdlib/dist/xsdlib.jar" id="xsdlib"/>
  +  </project>
  +
     <project name="msv">
       <package>com.sun.msv</package>
   
  -    <jar name="msv.jar" id="msv"/>
  -    <jar name="xsdlib.jar" id="xsdlib"/>
  +    <ant basedir="msv" target="dist"/>
  +
  +    <depend project="ant"/>
  +    <depend project="iso-relax"/>
  +    <depend project="jakarta-servletapi-5-servlet"/>
  +    <depend project="relaxng"/>
  +    <depend project="xml-commons-resolver"/>
  +    <depend project="xml-xerces"/>
  +    <depend project="xsdlib" inherit="jars"/>
  +
  +    <!-- I'm afraid this is going to cause problems in non-clean
  +         builds, in particular on Windows.  Let's try anyway since the
  +         build process deletes the compiled classes and I can't seem
  +         to find a workaround. -->
  +    <work nested="msv/dist/msv.jar"/>
  +
  +    <jar name="msv/dist/msv.jar" id="msv"/>
     </project>
   
   </module>
  
  
  
  1.161.2.3 +7 -0      gump/project/jakarta-commons-sandbox.xml
  
  Index: jakarta-commons-sandbox.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/jakarta-commons-sandbox.xml,v
  retrieving revision 1.161.2.2
  retrieving revision 1.161.2.3
  diff -u -r1.161.2.2 -r1.161.2.3
  --- jakarta-commons-sandbox.xml       23 Jun 2004 21:38:42 -0000      1.161.2.2
  +++ jakarta-commons-sandbox.xml       1 Jul 2004 15:49:48 -0000       1.161.2.3
  @@ -267,6 +267,13 @@
       <depend project="jakarta-servletapi-4"/>
       <depend project="xml-xalan2"/>
       <depend project="junit"/>
  +    <depend project="hibernate"/>
  +
  +    <!-- needed by hibernate test -->
  +    <depend project="dom4j"/>
  +    <depend project="cglib"/>
  +    <depend project="hsqldb"/>
  +    <depend project="jta"/>
   
       <work nested="resources/target/classes"/>
       <work nested="resources/target/test-classes"/>
  
  
  
  1.31.4.1  +1 -0      gump/project/xml-xindice.xml
  
  Index: xml-xindice.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/xml-xindice.xml,v
  retrieving revision 1.31
  retrieving revision 1.31.4.1
  diff -u -r1.31 -r1.31.4.1
  --- xml-xindice.xml   18 Mar 2004 23:31:36 -0000      1.31
  +++ xml-xindice.xml   1 Jul 2004 15:49:48 -0000       1.31.4.1
  @@ -41,6 +41,7 @@
       <depend project="jakarta-servletapi"/>
       <depend project="junit"/>
       <depend project="junit-addons"/>
  +    <depend project="xmlunit"/>
       <work nested="build/classes"/>
   
       <home nested="dist"/>
  
  
  
  No                   revision
  
  Index: xml-xindice.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/xml-xindice.xml,v
  retrieving revision 1.31
  retrieving revision 1.31.4.1
  diff -u -r1.31 -r1.31.4.1
  --- xml-xindice.xml   18 Mar 2004 23:31:36 -0000      1.31
  +++ xml-xindice.xml   1 Jul 2004 15:49:48 -0000       1.31.4.1
  @@ -41,6 +41,7 @@
       <depend project="jakarta-servletapi"/>
       <depend project="junit"/>
       <depend project="junit-addons"/>
  +    <depend project="xmlunit"/>
       <work nested="build/classes"/>
   
       <home nested="dist"/>
  
  
  
  No                   revision
  
  Index: xml-xindice.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/xml-xindice.xml,v
  retrieving revision 1.31
  retrieving revision 1.31.4.1
  diff -u -r1.31 -r1.31.4.1
  --- xml-xindice.xml   18 Mar 2004 23:31:36 -0000      1.31
  +++ xml-xindice.xml   1 Jul 2004 15:49:48 -0000       1.31.4.1
  @@ -41,6 +41,7 @@
       <depend project="jakarta-servletapi"/>
       <depend project="junit"/>
       <depend project="junit-addons"/>
  +    <depend project="xmlunit"/>
       <work nested="build/classes"/>
   
       <home nested="dist"/>
  
  
  
  1.1.2.1   +0 -0      gump/project/jgroups.xml
  
  Index: jgroups.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/jgroups.xml,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  
  
  
  1.1.2.1   +0 -0      gump/project/hibernate.xml
  
  Index: hibernate.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/hibernate.xml,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  
  
  
  No                   revision
  No                   revision
  1.351.2.2 +5 -1      gump/profile/gump.xml
  
  Index: gump.xml
  ===================================================================
  RCS file: /home/cvs/gump/profile/gump.xml,v
  retrieving revision 1.351.2.1
  retrieving revision 1.351.2.2
  diff -u -r1.351.2.1 -r1.351.2.2
  --- gump.xml  21 Jun 2004 04:06:10 -0000      1.351.2.1
  +++ gump.xml  1 Jul 2004 15:49:48 -0000       1.351.2.2
  @@ -161,6 +161,7 @@
     <module href="project/freemarker.xml"/>
     <module href="project/hsqldb.xml"/>
     <module href="project/httpunit.xml"/>
  +  <module href="project/hibernate.xml"/>
     <module href="project/iso-relax.xml"/>
     <module href="project/invicta.xml"/>
     <module href="project/javagroups.xml"/>
  @@ -170,6 +171,7 @@
     <module href="project/jetty.xml"/>
     <module href="project/jfor.xml"/>
     <module href="project/jgen.xml"/>
  +  <module href="project/jgroups.xml"/>
     <module href="project/jrefactory.xml"/>
     <module href="project/jtidy.xml"/>
     <module href="project/junit.xml"/>
  @@ -278,6 +280,8 @@
     <project name="commons-codec-11" package="commons-codec-1.1"/>
     <project name="ejb"              package="ejb-2_0-fr"/>
     <!--project name="fesi"             package="fesi"/-->
  +  <project name="hibernate"        package="hibernate-2.1"/>
  +  <project name="cglib"            package="hibernate-2.1"/>
     <project name="iso-relax"        package="isorelax.20020707"/>
     <project name="j2ee-connector"   package="j2ee_connector-1_0-fr"/>
     <project name="jaas"             package="jaas1_0"/>
  @@ -308,7 +312,7 @@
     <project name="mockobjects"      package="mockobjects-0.09"/>
     <!--project name="mockobjects-j2ee-13" package="mockobjects-0.09"/>
     <project name="mockobjects-j2ee-14" package="mockobjects-0.09"/-->
  -  <project name="msv"              package="msv-20030225"/>
  +  <!--project name="msv"              package="msv-20030225"/-->
     <project name="multipartrequest" package="MultipartRequest-1.30rc1"/>
     <project name="relaxng"          package="relaxngDatatype-1.0"/>
     <project name="eclipse"          package="eclipse-2.1"/>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to