geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke...@apache.org
Subject svn commit: r396030 - in /geronimo/branches/1.1: assemblies/j2ee-installer/ assemblies/j2ee-jetty-server/ assemblies/j2ee-tomcat-server/ configs/client/ configs/j2ee-deployer/ configs/openejb/ configs/rmi-naming/ etc/
Date Fri, 21 Apr 2006 23:02:21 GMT
Author: kevan
Date: Fri Apr 21 16:02:20 2006
New Revision: 396030

URL: http://svn.apache.org/viewcvs?rev=396030&view=rev
Log:
Use RC4 version of corba spec. The idl produced for newer versions doesn't work, currently,
with Sun's 1.4 implementation...

Modified:
    geronimo/branches/1.1/assemblies/j2ee-installer/project.xml
    geronimo/branches/1.1/assemblies/j2ee-jetty-server/project.xml
    geronimo/branches/1.1/assemblies/j2ee-tomcat-server/project.xml
    geronimo/branches/1.1/configs/client/project.xml
    geronimo/branches/1.1/configs/j2ee-deployer/project.xml
    geronimo/branches/1.1/configs/openejb/project.xml
    geronimo/branches/1.1/configs/rmi-naming/project.xml
    geronimo/branches/1.1/etc/explicit_versions.properties
    geronimo/branches/1.1/etc/project.properties

Modified: geronimo/branches/1.1/assemblies/j2ee-installer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/assemblies/j2ee-installer/project.xml?rev=396030&r1=396029&r2=396030&view=diff
==============================================================================
--- geronimo/branches/1.1/assemblies/j2ee-installer/project.xml (original)
+++ geronimo/branches/1.1/assemblies/j2ee-installer/project.xml Fri Apr 21 16:02:20 2006
@@ -765,8 +765,8 @@
             </properties>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-corba_2.3_spec</artifactId>
+            <groupId>geronimo-spec</groupId>
+            <artifactId>geronimo-spec-corba-2.3</artifactId>
             <version>${geronimo_spec_corba_version}</version>
             <properties>
                 <geronimo.assemble>repository</geronimo.assemble>

Modified: geronimo/branches/1.1/assemblies/j2ee-jetty-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/assemblies/j2ee-jetty-server/project.xml?rev=396030&r1=396029&r2=396030&view=diff
==============================================================================
--- geronimo/branches/1.1/assemblies/j2ee-jetty-server/project.xml (original)
+++ geronimo/branches/1.1/assemblies/j2ee-jetty-server/project.xml Fri Apr 21 16:02:20 2006
@@ -599,8 +599,8 @@
             </properties>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-corba_2.3_spec</artifactId>
+            <groupId>geronimo-spec</groupId>
+            <artifactId>geronimo-spec-corba-2.3</artifactId>
             <version>${geronimo_spec_corba_version}</version>
             <properties>
                 <geronimo.assemble>repository</geronimo.assemble>

Modified: geronimo/branches/1.1/assemblies/j2ee-tomcat-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/assemblies/j2ee-tomcat-server/project.xml?rev=396030&r1=396029&r2=396030&view=diff
==============================================================================
--- geronimo/branches/1.1/assemblies/j2ee-tomcat-server/project.xml (original)
+++ geronimo/branches/1.1/assemblies/j2ee-tomcat-server/project.xml Fri Apr 21 16:02:20 2006
@@ -599,8 +599,8 @@
             </properties>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-corba_2.3_spec</artifactId>
+            <groupId>geronimo-spec</groupId>
+            <artifactId>geronimo-spec-corba-2.3</artifactId>
             <version>${geronimo_spec_corba_version}</version>
             <properties>
                 <geronimo.assemble>repository</geronimo.assemble>

Modified: geronimo/branches/1.1/configs/client/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/client/project.xml?rev=396030&r1=396029&r2=396030&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/client/project.xml (original)
+++ geronimo/branches/1.1/configs/client/project.xml Fri Apr 21 16:02:20 2006
@@ -57,6 +57,16 @@
             <version>${geronimo_version}</version>
         </dependency>
 
+     <!-- corba spec is needed before spec-j2ee to pick up corba api that works with geronimo
-->
+        <dependency>
+            <groupId>geronimo-spec</groupId>
+            <artifactId>geronimo-spec-corba-2.3</artifactId>
+            <version>${geronimo_spec_corba_version}</version>
+            <properties>
+                <geronimo.dependency>true</geronimo.dependency>
+            </properties>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-j2ee_1.4_spec</artifactId>

Modified: geronimo/branches/1.1/configs/j2ee-deployer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/j2ee-deployer/project.xml?rev=396030&r1=396029&r2=396030&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/j2ee-deployer/project.xml (original)
+++ geronimo/branches/1.1/configs/j2ee-deployer/project.xml Fri Apr 21 16:02:20 2006
@@ -128,17 +128,17 @@
 
         <!-- common libraries used by all builders -->
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-j2ee_1.4_spec</artifactId>
-            <version>${geronimo_spec_j2ee_version}</version>
+            <groupId>geronimo-spec</groupId>
+            <artifactId>geronimo-spec-corba-2.3</artifactId>
+            <version>${geronimo_spec_corba_version}</version>
             <properties>
                 <geronimo.dependency>true</geronimo.dependency>
             </properties>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-corba_2.3_spec</artifactId>
-            <version>${geronimo_spec_corba_version}</version>
+            <artifactId>geronimo-j2ee_1.4_spec</artifactId>
+            <version>${geronimo_spec_j2ee_version}</version>
             <properties>
                 <geronimo.dependency>true</geronimo.dependency>
             </properties>

Modified: geronimo/branches/1.1/configs/openejb/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/openejb/project.xml?rev=396030&r1=396029&r2=396030&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/openejb/project.xml (original)
+++ geronimo/branches/1.1/configs/openejb/project.xml Fri Apr 21 16:02:20 2006
@@ -91,15 +91,15 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-j2ee_1.4_spec</artifactId>
-            <version>${geronimo_spec_j2ee_version}</version>
+            <groupId>geronimo-spec</groupId>
+            <artifactId>geronimo-spec-corba-2.3</artifactId>
+            <version>${geronimo_spec_corba_version}</version>
         </dependency>
 
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-corba-2.3</artifactId>
-            <version>${geronimo_spec_correct_corba_version}</version>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee_1.4_spec</artifactId>
+            <version>${geronimo_spec_j2ee_version}</version>
         </dependency>
 
         <dependency>

Modified: geronimo/branches/1.1/configs/rmi-naming/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/rmi-naming/project.xml?rev=396030&r1=396029&r2=396030&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/rmi-naming/project.xml (original)
+++ geronimo/branches/1.1/configs/rmi-naming/project.xml Fri Apr 21 16:02:20 2006
@@ -68,6 +68,15 @@
                  <geronimo.dependency>true</geronimo.dependency>
              </properties>
         </dependency>
+     <!-- corba spec is needed before spec-j2ee to pick up corba api that works with geronimo
-->
+        <dependency>
+            <groupId>geronimo-spec</groupId>
+            <artifactId>geronimo-spec-corba-2.3</artifactId>
+            <version>${geronimo_spec_corba_version}</version>
+            <properties>
+                <geronimo.dependency>true</geronimo.dependency>
+            </properties>
+        </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-j2ee_1.4_spec</artifactId>

Modified: geronimo/branches/1.1/etc/explicit_versions.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/etc/explicit_versions.properties?rev=396030&r1=396029&r2=396030&view=diff
==============================================================================
--- geronimo/branches/1.1/etc/explicit_versions.properties (original)
+++ geronimo/branches/1.1/etc/explicit_versions.properties Fri Apr 21 16:02:20 2006
@@ -8,7 +8,7 @@
 
 org.apache.geronimo.spec///=1.0
 #org.apache.geronimo.spec/geronimo-activation_1.0.2_spec//=1.1-SNAPSHOT
-org.apache.geronimo.spec/geronimo-corba_2.3_spec//=1.1-SNAPSHOT
+geronimo-spec/geronimo-spec-corba_2.3//=rc4
 org.apache.geronimo.spec/geronimo-javamail_1.3.1_spec//=1.1-SNAPSHOT
 #org.apache.geronimo.spec///=1.1-SNAPSHOT
 

Modified: geronimo/branches/1.1/etc/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/etc/project.properties?rev=396030&r1=396029&r2=396030&view=diff
==============================================================================
--- geronimo/branches/1.1/etc/project.properties (original)
+++ geronimo/branches/1.1/etc/project.properties Fri Apr 21 16:02:20 2006
@@ -101,7 +101,10 @@
 geronimo_dependency_plugin_version=1.1.0-2
 
 geronimo_spec_activation_version=1.0
-geronimo_spec_corba_version=1.1-SNAPSHOT
+
+# use old version of corba specs. the idl compiler for new specs is
+# currently incompatible with sun's orb...
+geronimo_spec_corba_version=rc4
 geronimo_spec_ejb_version=1.0
 geronimo_spec_j2ee_version=1.1-SNAPSHOT
 geronimo_spec_j2ee_connector_version=1.0
@@ -118,8 +121,6 @@
 geronimo_spec_qname_version=1.0
 geronimo_spec_saaj_version=1.0
 geronimo_spec_servlet_version=1.0
-
-geronimo_spec_correct_corba_version=rc4
 
 ant_version=1.6.5
 antlr_version=2.7.2



Mime
View raw message