geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dblev...@apache.org
Subject cvs commit: incubator-geronimo/modules/axis project.xml
Date Thu, 29 Jul 2004 02:58:37 GMT
dblevins    2004/07/28 19:58:37

  Modified:    .        project.properties
               etc      project.xml
               modules/assembly maven.xml
               modules/assembly/src/plan j2ee-deployer-plan.xml
                        j2ee-secure-plan.xml j2ee-server-plan.xml
               modules/axis project.xml
  Log:
  The plan files now use parsed xml entities for geronimo version numbers
  making it much easier to change versions.
  
  The assembly module no longer uses the deploy plugin
  
  Upped the version number to 1.0-M2.  CVS will be tagged, then the version
  number will be restored to 1.0-SNAPSHOT
  
  The build works completely, don't hose it up.
  
  Revision  Changes    Path
  1.14      +3 -2      incubator-geronimo/project.properties
  
  Index: project.properties
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/project.properties,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- project.properties	28 Jul 2004 19:16:08 -0000	1.13
  +++ project.properties	29 Jul 2004 02:58:36 -0000	1.14
  @@ -6,4 +6,5 @@
   
   geronimo.cvs.docdir = ../incubator-site/build/site/projects/geronimo
   maven.repo.remote=http://dist.codehaus.org, http://www.ibiblio.org/maven
  -#module.excludes=axis
  +module.excludes=axis
  +#maven.test.failure.ignore=true
  
  
  
  1.31      +2 -2      incubator-geronimo/etc/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/etc/project.xml,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- project.xml	30 May 2004 14:12:09 -0000	1.30
  +++ project.xml	29 Jul 2004 02:58:36 -0000	1.31
  @@ -77,7 +77,7 @@
       <!-- Versions -->
       <!-- ======== -->
   
  -    <currentVersion>1.0-SNAPSHOT</currentVersion>
  +    <currentVersion>1.0-M2</currentVersion>
   
       <versions>
           <version>
  
  
  
  1.23      +3 -13     incubator-geronimo/modules/assembly/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/assembly/maven.xml,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- maven.xml	28 Jul 2004 19:16:08 -0000	1.22
  +++ maven.xml	29 Jul 2004 02:58:36 -0000	1.23
  @@ -22,7 +22,6 @@
       xmlns:j="jelly:core"
       xmlns:ant="jelly:ant"
       xmlns:define="jelly:define"
  -    xmlns:deploy="geronimo:deploy"
       xmlns:bootstrap="geronimo:bootstrap">
   
       <!-- ================= -->
  @@ -246,15 +245,9 @@
               manifest="${cliDeployer}/MANIFEST.MF"/>
   
       </goal>
  -
  +<!--
       <goal name="startdb">
   
  -        <!--deploy:startServer
  -            geronimoHome="${distDir}"
  -            kernelName="geronimo.deployer"
  -            domainName="geronimo"
  -            configs="org/apache/geronimo/Server"
  -            /-->
           <deploy:distribute
               uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
               username="system"
  @@ -281,9 +274,6 @@
               username="system"
               password="manager"
               id="org/apache/geronimo/DefaultDatabase"/>
  -        <!--deploy:stopServer
  -            kernelName="geronimo.deployer"
  -            /-->
  -    </goal>
  +    </goal-->
   
   </project>
  
  
  
  1.23      +13 -8     incubator-geronimo/modules/assembly/src/plan/j2ee-deployer-plan.xml
  
  Index: j2ee-deployer-plan.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/assembly/src/plan/j2ee-deployer-plan.xml,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- j2ee-deployer-plan.xml	18 Jul 2004 22:18:59 -0000	1.22
  +++ j2ee-deployer-plan.xml	29 Jul 2004 02:58:36 -0000	1.23
  @@ -1,4 +1,7 @@
   <?xml version="1.0" encoding="UTF-8"?>
  +<!DOCTYPE configuration [
  +<!ENTITY version  "1.0-M2">
  +]>
   <!--
   
       Copyright 2004 The Apache Software Foundation
  @@ -27,36 +30,38 @@
       parentId="org/apache/geronimo/DeployerSystem"
       >
   
  +    
  +    <!-- TODO Use parsed entities for version numbers -->
       <dependency>
           <uri>openejb/jars/openejb-core-2.0-SNAPSHOT.jar</uri>
       </dependency>
       <dependency>
  -        <uri>geronimo/jars/geronimo-connector-1.0-SNAPSHOT.jar</uri>
  +        <uri>geronimo/jars/geronimo-connector-&version;.jar</uri>
       </dependency>
       <dependency>
  -        <uri>geronimo/jars/geronimo-core-1.0-SNAPSHOT.jar</uri>
  +        <uri>geronimo/jars/geronimo-core-&version;.jar</uri>
       </dependency>
       <!-- needed to load some connector and core classes-->
       <dependency>
           <uri>concurrent/jars/concurrent-1.3.4.jar</uri>
       </dependency>
       <dependency>
  -        <uri>geronimo/jars/geronimo-j2ee-1.0-SNAPSHOT.jar</uri>
  +        <uri>geronimo/jars/geronimo-j2ee-&version;.jar</uri>
       </dependency>
       <dependency>
  -        <uri>geronimo/jars/geronimo-security-1.0-SNAPSHOT.jar</uri>
  +        <uri>geronimo/jars/geronimo-security-&version;.jar</uri>
       </dependency>
       <dependency>
  -        <uri>geronimo/jars/geronimo-jetty-1.0-SNAPSHOT.jar</uri>
  +        <uri>geronimo/jars/geronimo-jetty-&version;.jar</uri>
       </dependency>
       <dependency>
  -        <uri>geronimo/jars/geronimo-naming-1.0-SNAPSHOT.jar</uri>
  +        <uri>geronimo/jars/geronimo-naming-&version;.jar</uri>
       </dependency>
       <dependency>
  -        <uri>geronimo/jars/geronimo-transaction-1.0-SNAPSHOT.jar</uri>
  +        <uri>geronimo/jars/geronimo-transaction-&version;.jar</uri>
       </dependency>
       <dependency>
  -        <uri>geronimo-spec/jars/geronimo-spec-j2eeschema-1.0-SNAPSHOT.jar</uri>
  +        <uri>geronimo-spec/jars/geronimo-spec-j2eeschema-&version;.jar</uri>
       </dependency>
       <!-- seems to be required to load jetty deployer - but I think this should not be
here-->
       <dependency>
  
  
  
  1.4       +4 -1      incubator-geronimo/modules/assembly/src/plan/j2ee-secure-plan.xml
  
  Index: j2ee-secure-plan.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/assembly/src/plan/j2ee-secure-plan.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- j2ee-secure-plan.xml	12 Jul 2004 06:07:50 -0000	1.3
  +++ j2ee-secure-plan.xml	29 Jul 2004 02:58:36 -0000	1.4
  @@ -1,4 +1,7 @@
   <?xml version="1.0" encoding="UTF-8"?>
  +<!DOCTYPE configuration [
  +<!ENTITY version  "1.0-M2">
  +]>
   <!--
   
       Copyright 2004 The Apache Software Foundation
  @@ -30,7 +33,7 @@
       >
   
       <dependency>
  -        <uri>geronimo/jars/geronimo-jetty-1.0-SNAPSHOT.jar</uri>
  +        <uri>geronimo/jars/geronimo-jetty-&version;.jar</uri>
       </dependency>
   
       <!-- Security GBeans -->
  
  
  
  1.40      +15 -12    incubator-geronimo/modules/assembly/src/plan/j2ee-server-plan.xml
  
  Index: j2ee-server-plan.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/assembly/src/plan/j2ee-server-plan.xml,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- j2ee-server-plan.xml	23 Jul 2004 06:12:22 -0000	1.39
  +++ j2ee-server-plan.xml	29 Jul 2004 02:58:36 -0000	1.40
  @@ -1,4 +1,7 @@
   <?xml version="1.0" encoding="UTF-8"?>
  +<!DOCTYPE configuration [
  +<!ENTITY version  "1.0-M2">
  +]>
   <!--
   
       Copyright 2004 The Apache Software Foundation
  @@ -33,28 +36,28 @@
           <uri>geronimo-spec/jars/geronimo-spec-j2ee-1.4-rc2.jar</uri>
       </dependency>
       <dependency>
  -        <uri>geronimo/jars/geronimo-j2ee-1.0-SNAPSHOT.jar</uri>
  +        <uri>geronimo/jars/geronimo-j2ee-&version;.jar</uri>
       </dependency>
       <dependency>
  -        <uri>geronimo/jars/geronimo-core-1.0-SNAPSHOT.jar</uri>
  +        <uri>geronimo/jars/geronimo-core-&version;.jar</uri>
       </dependency>
       <dependency>
  -        <uri>geronimo/jars/geronimo-connector-1.0-SNAPSHOT.jar</uri>
  +        <uri>geronimo/jars/geronimo-connector-&version;.jar</uri>
       </dependency>
       <dependency>
           <uri>concurrent/jars/concurrent-1.3.4.jar</uri>
       </dependency>
       <dependency>
  -        <uri>geronimo/jars/geronimo-timer-1.0-SNAPSHOT.jar</uri>
  +        <uri>geronimo/jars/geronimo-timer-&version;.jar</uri>
       </dependency>
       <dependency>
  -        <uri>geronimo/jars/geronimo-transaction-1.0-SNAPSHOT.jar</uri>
  +        <uri>geronimo/jars/geronimo-transaction-&version;.jar</uri>
       </dependency>
       <dependency>
  -        <uri>geronimo/jars/geronimo-naming-1.0-SNAPSHOT.jar</uri>
  +        <uri>geronimo/jars/geronimo-naming-&version;.jar</uri>
       </dependency>
       <dependency>
  -        <uri>geronimo/jars/geronimo-security-1.0-SNAPSHOT.jar</uri>
  +        <uri>geronimo/jars/geronimo-security-&version;.jar</uri>
       </dependency>
       <dependency>
           <uri>tranql/jars/tranql-1.0-SNAPSHOT.jar</uri>
  @@ -63,10 +66,10 @@
           <uri>openejb/jars/openejb-core-2.0-SNAPSHOT.jar</uri>
       </dependency>
       <dependency>
  -        <uri>geronimo/jars/geronimo-jetty-1.0-SNAPSHOT.jar</uri>
  +        <uri>geronimo/jars/geronimo-jetty-&version;.jar</uri>
       </dependency>
       <dependency>
  -        <uri>geronimo/jars/geronimo-jmxremoting-1.0-SNAPSHOT.jar</uri>
  +        <uri>geronimo/jars/geronimo-jmxremoting-&version;.jar</uri>
       </dependency>
       <dependency>
           <uri>howl/jars/howl-logger-0.1.3.jar</uri>
  @@ -79,13 +82,13 @@
   
       <!-- needed for online deployment -->
       <dependency>
  -        <uri>geronimo-spec/jars/geronimo-spec-j2eeschema-1.0-SNAPSHOT.jar</uri>
  +        <uri>geronimo-spec/jars/geronimo-spec-j2eeschema-&version;.jar</uri>
       </dependency>
       <dependency>
  -        <uri>geronimo/jars/geronimo-deployment-1.0-SNAPSHOT.jar</uri>
  +        <uri>geronimo/jars/geronimo-deployment-&version;.jar</uri>
       </dependency>
       <dependency>
  -        <uri>geronimo/jars/geronimo-common-1.0-SNAPSHOT.jar</uri>
  +        <uri>geronimo/jars/geronimo-common-&version;.jar</uri>
       </dependency>
       <dependency>
           <uri>xmlbeans/jars/xbean-apache-1.0-DEV.jar</uri>
  
  
  
  1.5       +2 -2      incubator-geronimo/modules/axis/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/axis/project.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- project.xml	28 Jul 2004 14:24:47 -0000	1.4
  +++ project.xml	29 Jul 2004 02:58:36 -0000	1.5
  @@ -132,7 +132,7 @@
           <dependency>
               <groupId>geronimo</groupId>
               <artifactId>geronimo-timer</artifactId>
  -            <version>1.0-SNAPSHOT</version>
  +            <version>${pom.currentVersion}</version>
               <properties>
                   <runtime>true</runtime>
               </properties>
  
  
  

Mime
View raw message