You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by da...@apache.org on 2004/04/26 22:18:58 UTC

cvs commit: incubator-geronimo/specs/j2ee-jacc project.xml

dain        2004/04/26 13:18:58

  Modified:    etc      global.properties project.xml
               modules/assembly project.xml
               modules/assembly/src/plan j2ee-deployer-plan.xml
                        j2ee-server-plan.xml
               modules/maven-plugin project.xml
               modules/maven-xmlbeans-plugin project.xml
               modules/remoting maven.xml
               specs/j2ee project.xml
               specs/j2ee-jacc project.xml
  Log:
  Changed geronimo to version 1.0M1
  Changed activemq to version 1.0-M1
  
  Revision  Changes    Path
  1.13      +2 -2      incubator-geronimo/etc/global.properties
  
  Index: global.properties
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/etc/global.properties,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- global.properties	25 Apr 2004 23:21:50 -0000	1.12
  +++ global.properties	26 Apr 2004 20:18:58 -0000	1.13
  @@ -23,7 +23,7 @@
   # Build and Deployment
   #####################################################
   
  -#maven.repo.remote=http://www.apache.org/~dain/maven,http://tranql.codehaus.org/maven,http://www.openejb.org/maven,http://www.ibiblio.org/maven
  +#maven.repo.remote=http://tranql.codehaus.org/maven,http://www.openejb.org/maven,http://www.ibiblio.org/maven
   
   maven.compile.source=1.4
   maven.compile.target=1.4
  
  
  
  1.24      +2 -2      incubator-geronimo/etc/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/etc/project.xml,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- project.xml	10 Mar 2004 10:00:52 -0000	1.23
  +++ project.xml	26 Apr 2004 20:18:58 -0000	1.24
  @@ -77,7 +77,7 @@
       <!-- Versions -->
       <!-- ======== -->
   
  -    <currentVersion>DEV</currentVersion>
  +    <currentVersion>1.0M1</currentVersion>
   
       <versions>
           <version>
  
  
  
  1.15      +2 -2      incubator-geronimo/modules/assembly/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/assembly/project.xml,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- project.xml	26 Apr 2004 15:21:40 -0000	1.14
  +++ project.xml	26 Apr 2004 20:18:58 -0000	1.15
  @@ -448,7 +448,7 @@
         <dependency>
             <groupId>activemq</groupId>
             <artifactId>activemq</artifactId>
  -          <version>SNAPSHOT</version>
  +          <version>1.0-M1</version>
             <properties>
                 <repository>true</repository>
             </properties>
  
  
  
  1.9       +8 -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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- j2ee-deployer-plan.xml	26 Apr 2004 14:44:47 -0000	1.8
  +++ j2ee-deployer-plan.xml	26 Apr 2004 20:18:58 -0000	1.9
  @@ -31,29 +31,29 @@
           <uri>openejb/jars/openejb-core-2.0M1.jar</uri>
       </dependency>
       <dependency>
  -        <uri>geronimo/jars/geronimo-connector-DEV.jar</uri>
  +        <uri>geronimo/jars/geronimo-connector-1.0M1.jar</uri>
       </dependency>
       <dependency>
  -        <uri>geronimo/jars/geronimo-core-DEV.jar</uri>
  +        <uri>geronimo/jars/geronimo-core-1.0M1.jar</uri>
       </dependency>
       <dependency>
  -        <uri>geronimo/jars/geronimo-security-DEV.jar</uri>
  +        <uri>geronimo/jars/geronimo-security-1.0M1.jar</uri>
       </dependency>
       <dependency>
  -        <uri>geronimo/jars/geronimo-jetty-DEV.jar</uri>
  +        <uri>geronimo/jars/geronimo-jetty-1.0M1.jar</uri>
       </dependency>
       <dependency>
  -        <uri>geronimo/jars/geronimo-naming-DEV.jar</uri>
  +        <uri>geronimo/jars/geronimo-naming-1.0M1.jar</uri>
       </dependency>
       <dependency>
  -        <uri>geronimo/jars/geronimo-transaction-DEV.jar</uri>
  +        <uri>geronimo/jars/geronimo-transaction-1.0M1.jar</uri>
       </dependency>
       <dependency>
  -        <uri>geronimo-spec/jars/geronimo-spec-j2eeschema-DEV.jar</uri>
  +        <uri>geronimo-spec/jars/geronimo-spec-j2eeschema-1.0M1.jar</uri>
       </dependency>
       <!-- seems to be required to load jetty deployer - but I think this should not be here-->
       <dependency>
  -        <uri>geronimo-spec/jars/geronimo-spec-j2ee-DEV.jar</uri>
  +        <uri>geronimo-spec/jars/geronimo-spec-j2ee-1.0M1.jar</uri>
       </dependency>
       <!-- required for rar 1.5 to load realms -->
       <dependency>
  
  
  
  1.9       +9 -9      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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- j2ee-server-plan.xml	26 Apr 2004 15:21:40 -0000	1.8
  +++ j2ee-server-plan.xml	26 Apr 2004 20:18:58 -0000	1.9
  @@ -30,28 +30,28 @@
       >
   
       <dependency>
  -        <uri>geronimo-spec/jars/geronimo-spec-j2ee-DEV.jar</uri>
  +        <uri>geronimo-spec/jars/geronimo-spec-j2ee-1.0M1.jar</uri>
       </dependency>
       <dependency>
  -        <uri>geronimo/jars/geronimo-j2ee-DEV.jar</uri>
  +        <uri>geronimo/jars/geronimo-j2ee-1.0M1.jar</uri>
       </dependency>
       <dependency>
  -        <uri>geronimo/jars/geronimo-core-DEV.jar</uri>
  +        <uri>geronimo/jars/geronimo-core-1.0M1.jar</uri>
       </dependency>
       <dependency>
  -        <uri>geronimo/jars/geronimo-connector-DEV.jar</uri>
  +        <uri>geronimo/jars/geronimo-connector-1.0M1.jar</uri>
       </dependency>
       <dependency>
           <uri>concurrent/jars/concurrent-1.3.2.jar</uri>
       </dependency>
       <dependency>
  -        <uri>geronimo/jars/geronimo-transaction-DEV.jar</uri>
  +        <uri>geronimo/jars/geronimo-transaction-1.0M1.jar</uri>
       </dependency>
       <dependency>
  -        <uri>geronimo/jars/geronimo-naming-DEV.jar</uri>
  +        <uri>geronimo/jars/geronimo-naming-1.0M1.jar</uri>
       </dependency>
       <dependency>
  -        <uri>geronimo/jars/geronimo-security-DEV.jar</uri>
  +        <uri>geronimo/jars/geronimo-security-1.0M1.jar</uri>
       </dependency>
       <dependency>
           <uri>tranql/jars/tranql-SNAPSHOT.jar</uri>
  @@ -60,10 +60,10 @@
           <uri>openejb/jars/openejb-core-2.0M1.jar</uri>
       </dependency>
       <dependency>
  -        <uri>geronimo/jars/geronimo-jetty-DEV.jar</uri>
  +        <uri>geronimo/jars/geronimo-jetty-1.0M1.jar</uri>
       </dependency>
       <dependency>
  -      <uri>activemq/jars/activemq-SNAPSHOT.jar</uri>
  +      <uri>activemq/jars/activemq-1.0-M1.jar</uri>
       </dependency>
   
       <gbean name="geronimo.server:type=ConnectionTracker" class="org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinator">
  
  
  
  1.12      +1 -1      incubator-geronimo/modules/maven-plugin/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/maven-plugin/project.xml,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- project.xml	25 Apr 2004 23:21:50 -0000	1.11
  +++ project.xml	26 Apr 2004 20:18:58 -0000	1.12
  @@ -21,7 +21,7 @@
       <groupId>geronimo</groupId>
       <id>geronimo-deployment-plugin</id>
       <name>Geronimo maven deployment plugin</name>
  -    <currentVersion>DEV</currentVersion>
  +    <currentVersion>1.0M1</currentVersion>
       <organization>
           <name>Apache Software Foundation</name>
           <url>http://www.apache.org/</url>
  
  
  
  1.7       +1 -1      incubator-geronimo/modules/maven-xmlbeans-plugin/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/maven-xmlbeans-plugin/project.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- project.xml	25 Apr 2004 23:21:50 -0000	1.6
  +++ project.xml	26 Apr 2004 20:18:58 -0000	1.7
  @@ -21,7 +21,7 @@
       <groupId>geronimo</groupId>
       <id>geronimo-xmlbeans-plugin</id>
       <name>Geronimo maven xmlbeans plugin</name>
  -    <currentVersion>DEV</currentVersion>
  +    <currentVersion>1.0M1</currentVersion>
       <organization>
           <name>Apache Software Foundation</name>
           <url>http://www.apache.org/</url>
  
  
  
  1.4       +1 -2      incubator-geronimo/modules/remoting/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/remoting/maven.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- maven.xml	10 Mar 2004 09:59:19 -0000	1.3
  +++ maven.xml	26 Apr 2004 20:18:58 -0000	1.4
  @@ -23,7 +23,6 @@
     xmlns:j="jelly:core"
     xmlns:ant="jelly:ant"
     xmlns:maven="jelly:maven"
  -  xmlns:xdoclet="common:xdoclet"
     >
   
     <!-- Set up the test files -->
  
  
  
  1.8       +2 -3      incubator-geronimo/specs/j2ee/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/specs/j2ee/project.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- project.xml	10 Mar 2004 09:59:42 -0000	1.7
  +++ project.xml	26 Apr 2004 20:18:58 -0000	1.8
  @@ -21,12 +21,11 @@
   
   <project>
       <pomVersion>3</pomVersion>
  +    <extend>${basedir}/../../etc/project.xml</extend>
   
       <name>Geronimo :: J2EE Specification</name>
       <groupId>geronimo-spec</groupId>
       <id>geronimo-spec-j2ee</id>
  -
  -    <currentVersion>DEV</currentVersion>
   
       <!-- ============ -->
       <!-- Dependencies -->
  
  
  
  1.7       +34 -34    incubator-geronimo/specs/j2ee-jacc/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/specs/j2ee-jacc/project.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- project.xml	10 Mar 2004 09:59:53 -0000	1.6
  +++ project.xml	26 Apr 2004 20:18:58 -0000	1.7
  @@ -1,4 +1,4 @@
  -<?xml version="1.0" encoding="UTF-8"?>
  +<?xml version="1.0" encoding="UTF-8"?>
   <!--
   
       Copyright 2003-2004 The Apache Software Foundation
  @@ -16,36 +16,36 @@
       limitations under the License.
   -->
     
  -
  -<!-- $Id$ -->
  -
  -<project>
  -    <pomVersion>3</pomVersion>
  -    <extend>${basedir}/../../etc/project.xml</extend>
  -
  -    <name>Geronimo :: Java Authorization Contract for Containers Specification</name>
  -    <groupId>geronimo-spec</groupId>
  -    <id>geronimo-spec-j2ee-jacc</id>
  -    <shortDescription>Java Authorization Contract for Containers</shortDescription>
  -    <description>
  -        See http://www.jcp.org/en/jsr/detail?id=115
  -    </description>
  -    <siteDirectory></siteDirectory>
  -    <distributionDirectory></distributionDirectory>
  -
  -    <package>javax.security.jacc</package>
  -
  -    <!-- ============ -->
  -    <!-- Dependencies -->
  -    <!-- ============ -->
  -
  -    <dependencies>
  -
  -        <dependency>
  -            <groupId>geronimo-spec</groupId>
  -            <artifactId>geronimo-spec-servlet</artifactId>
  -            <version>${pom.currentVersion}</version>
  -        </dependency>
  -
  -    </dependencies>
  -</project>
  +
  +<!-- $Id$ -->
  +
  +<project>
  +    <pomVersion>3</pomVersion>
  +    <extend>${basedir}/../../etc/project.xml</extend>
  +
  +    <name>Geronimo :: Java Authorization Contract for Containers Specification</name>
  +    <groupId>geronimo-spec</groupId>
  +    <id>geronimo-spec-j2ee-jacc</id>
  +    <shortDescription>Java Authorization Contract for Containers</shortDescription>
  +    <description>
  +        See http://www.jcp.org/en/jsr/detail?id=115
  +    </description>
  +    <siteDirectory></siteDirectory>
  +    <distributionDirectory></distributionDirectory>
  +
  +    <package>javax.security.jacc</package>
  +
  +    <!-- ============ -->
  +    <!-- Dependencies -->
  +    <!-- ============ -->
  +
  +    <dependencies>
  +
  +        <dependency>
  +            <groupId>geronimo-spec</groupId>
  +            <artifactId>geronimo-spec-servlet</artifactId>
  +            <version>${pom.currentVersion}</version>
  +        </dependency>
  +
  +    </dependencies>
  +</project>