You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ad...@apache.org on 2006/02/22 16:37:12 UTC
svn commit: r379797 - in /geronimo/trunk: ./ assemblies/j2ee-installer/
assemblies/j2ee-jetty-server/ assemblies/j2ee-tomcat-server/
configs/axis-deployer/ configs/client-deployer/ configs/openejb-deployer/
etc/ modules/interop/
Author: adc
Date: Wed Feb 22 07:37:09 2006
New Revision: 379797
URL: http://svn.apache.org/viewcvs?rev=379797&view=rev
Log:
GERONIMO-1639
Setup old version of CORBA specs for temporary use until the new CORBA specs can pass the TCK.
Modified:
geronimo/trunk/assemblies/j2ee-installer/project.xml
geronimo/trunk/assemblies/j2ee-jetty-server/project.xml
geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml
geronimo/trunk/configs/axis-deployer/project.xml
geronimo/trunk/configs/client-deployer/project.xml
geronimo/trunk/configs/openejb-deployer/project.xml
geronimo/trunk/etc/project.properties
geronimo/trunk/modules/interop/project.xml
geronimo/trunk/pom.xml
Modified: geronimo/trunk/assemblies/j2ee-installer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-installer/project.xml?rev=379797&r1=379796&r2=379797&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-installer/project.xml (original)
+++ geronimo/trunk/assemblies/j2ee-installer/project.xml Wed Feb 22 07:37:09 2006
@@ -755,8 +755,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</artifactId>
<version>${geronimo_spec_corba_version}</version>
<properties>
<geronimo.assemble>repository</geronimo.assemble>
@@ -1306,39 +1306,6 @@
<artifactId>geronimo-console-core</artifactId>
<version>${geronimo_version}</version>
</dependency>
-
- <!-- Specification dependencies to preload into the repository -->
- <!-- duplicate dependency - commented out to avoid eclipse project errors
- #<dependency>
- # <groupId>org.apache.geronimo.specs</groupId>
- # <artifactId>geronimo-j2ee_1.4_spec</artifactId>
- # <version>${geronimo_spec_j2ee_version}</version>
- #</dependency>
- -->
-
- <!-- duplicate dependency - commented out to avoid eclipse project errors
- #<dependency>
- # <groupId>org.apache.geronimo.specs</groupId>
- # <artifactId>geronimo-activation_1.0.2_spec</artifactId>
- # <version>${geronimo_spec_activation_version}</version>
- #</dependency>
- -->
-
- <!-- duplicate dependency - commented out to avoid eclipse project errors
- #<dependency>
- # <groupId>org.apache.geronimo.specs</groupId>
- # <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
- # <version>${geronimo_spec_javamail_version}</version>
- #</dependency>
- -->
-
- <!-- duplicate dependency - commented out to avoid eclipse project errors
- #<dependency>
- # <groupId>org.apache.geronimo.specs</groupId>
- # <artifactId>geronimo-corba_2.3_spec</artifactId>
- # <version>${geronimo_spec_corba_version}</version>
- #</dependency>
- -->
<!-- Geronimo modules to preload into the repository -->
<dependency>
Modified: geronimo/trunk/assemblies/j2ee-jetty-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-jetty-server/project.xml?rev=379797&r1=379796&r2=379797&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-jetty-server/project.xml (original)
+++ geronimo/trunk/assemblies/j2ee-jetty-server/project.xml Wed Feb 22 07:37:09 2006
@@ -646,8 +646,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</artifactId>
<version>${geronimo_spec_corba_version}</version>
<properties>
<geronimo.assemble>repository</geronimo.assemble>
@@ -1196,48 +1196,6 @@
<artifactId>geronimo-console-core</artifactId>
<version>${geronimo_version}</version>
</dependency>
-
- <!-- Specification dependencies to preload into the repository -->
-
- <!-- duplicate dependency - commented out to avoid eclipse project errors
- #<dependency>
- # <groupId>org.apache.geronimo.specs</groupId>
- # <artifactId>geronimo-j2ee_1.4_spec</artifactId>
- # <version>${geronimo_spec_j2ee_version}</version>
- #</dependency>
- -->
-
- <!-- duplicate dependency - commented out to avoid eclipse project errors
- #<dependency>
- # <groupId>org.apache.geronimo.specs</groupId>
- # <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
- # <version>${geronimo_spec_j2ee_jacc_version}</version>
- #</dependency>
- -->
-
- <!-- duplicate dependency - commented out to avoid eclipse project errors
- #<dependency>
- # <groupId>org.apache.geronimo.specs</groupId>
- # <artifactId>geronimo-activation_1.0.2_spec</artifactId>
- # <version>${geronimo_spec_activation_version}</version>
- #</dependency>
- -->
-
- <!-- duplicate dependency - commented out to avoid eclipse project errors
- #<dependency>
- # <groupId>org.apache.geronimo.specs</groupId>
- # <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
- # <version>${geronimo_spec_javamail_version}</version>
- #</dependency>
- -->
-
- <!-- duplicate dependency - commented out to avoid eclipse project errors
- #<dependency>
- # <groupId>org.apache.geronimo.specs</groupId>
- # <artifactId>geronimo-corba_2.3_spec</artifactId>
- # <version>${geronimo_spec_corba_version}</version>
- #</dependency>
- -->
<!-- Geronimo modules to preload into the repository -->
<dependency>
Modified: geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml?rev=379797&r1=379796&r2=379797&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml (original)
+++ geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml Wed Feb 22 07:37:09 2006
@@ -645,8 +645,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</artifactId>
<version>${geronimo_spec_corba_version}</version>
<properties>
<geronimo.assemble>repository</geronimo.assemble>
@@ -1204,48 +1204,6 @@
<artifactId>geronimo-console-core</artifactId>
<version>${geronimo_version}</version>
</dependency>
-
- <!-- Specification dependencies to preload into the repository -->
-
- <!-- duplicate dependency - commented out to avoid eclipse project errors
- #<dependency>
- # <groupId>org.apache.geronimo.specs</groupId>
- # <artifactId>geronimo-j2ee_1.4_spec</artifactId>
- # <version>${geronimo_spec_j2ee_version}</version>
- #</dependency>
- -->
-
- <!-- duplicate dependency - commented out to avoid eclipse project errors
- #<dependency>
- # <groupId>org.apache.geronimo.specs</groupId>
- # <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
- # <version>${geronimo_spec_j2ee_jacc_version}</version>
- #</dependency>
- -->
-
- <!-- duplicate dependency - commented out to avoid eclipse project errors
- #<dependency>
- # <groupId>org.apache.geronimo.specs</groupId>
- # <artifactId>geronimo-activation_1.0.2_spec</artifactId>
- # <version>${geronimo_spec_activation_version}</version>
- #</dependency>
- -->
-
- <!-- duplicate dependency - commented out to avoid eclipse project errors
- #<dependency>
- # <groupId>org.apache.geronimo.specs</groupId>
- # <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
- # <version>${geronimo_spec_javamail_version}</version>
- #</dependency>
- -->
-
- <!-- duplicate dependency - commented out to avoid eclipse project errors
- #<dependency>
- # <groupId>org.apache.geronimo.specs</groupId>
- # <artifactId>geronimo-corba_2.3_spec</artifactId>
- # <version>${geronimo_spec_corba_version}</version>
- #</dependency>
- -->
<!-- Geronimo modules to preload into the repository -->
<dependency>
Modified: geronimo/trunk/configs/axis-deployer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/axis-deployer/project.xml?rev=379797&r1=379796&r2=379797&view=diff
==============================================================================
--- geronimo/trunk/configs/axis-deployer/project.xml (original)
+++ geronimo/trunk/configs/axis-deployer/project.xml Wed Feb 22 07:37:09 2006
@@ -126,8 +126,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</artifactId>
<version>${geronimo_spec_corba_version}</version>
<properties>
<geronimo.dependency>true</geronimo.dependency>
Modified: geronimo/trunk/configs/client-deployer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/client-deployer/project.xml?rev=379797&r1=379796&r2=379797&view=diff
==============================================================================
--- geronimo/trunk/configs/client-deployer/project.xml (original)
+++ geronimo/trunk/configs/client-deployer/project.xml Wed Feb 22 07:37:09 2006
@@ -118,8 +118,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</artifactId>
<version>${geronimo_spec_corba_version}</version>
<properties>
<geronimo.dependency>true</geronimo.dependency>
Modified: geronimo/trunk/configs/openejb-deployer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/openejb-deployer/project.xml?rev=379797&r1=379796&r2=379797&view=diff
==============================================================================
--- geronimo/trunk/configs/openejb-deployer/project.xml (original)
+++ geronimo/trunk/configs/openejb-deployer/project.xml Wed Feb 22 07:37:09 2006
@@ -118,8 +118,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</artifactId>
<version>${geronimo_spec_corba_version}</version>
<properties>
<geronimo.dependency>true</geronimo.dependency>
Modified: geronimo/trunk/etc/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/etc/project.properties?rev=379797&r1=379796&r2=379797&view=diff
==============================================================================
--- geronimo/trunk/etc/project.properties (original)
+++ geronimo/trunk/etc/project.properties Wed Feb 22 07:37:09 2006
@@ -90,7 +90,7 @@
geronimo_dependency_plugin_version=1.1.1
geronimo_spec_activation_version=1.0
-geronimo_spec_corba_version=1.1-SNAPSHOT
+geronimo_spec_corba_version=1.0-SNAPSHOT
geronimo_spec_ejb_version=1.0
geronimo_spec_j2ee_version=1.1-SNAPSHOT
geronimo_spec_j2ee_connector_version=1.0
Modified: geronimo/trunk/modules/interop/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/project.xml?rev=379797&r1=379796&r2=379797&view=diff
==============================================================================
--- geronimo/trunk/modules/interop/project.xml (original)
+++ geronimo/trunk/modules/interop/project.xml Wed Feb 22 07:37:09 2006
@@ -55,8 +55,8 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-corba_2.3_spec</artifactId>
+ <groupId>geronimo-spec</groupId>
+ <artifactId>geronimo-spec-corba</artifactId>
<version>${geronimo_spec_corba_version}</version>
</dependency>
Modified: geronimo/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/pom.xml?rev=379797&r1=379796&r2=379797&view=diff
==============================================================================
--- geronimo/trunk/pom.xml (original)
+++ geronimo/trunk/pom.xml Wed Feb 22 07:37:09 2006
@@ -111,22 +111,14 @@
|
-->
<geronimoSpecActivationVersion>1.0</geronimoSpecActivationVersion>
- <geronimoSpecCorbaVersion>1.1-SNAPSHOT</geronimoSpecCorbaVersion>
+ <geronimoSpecCorbaVersion>1.0-SNAPSHOT</geronimoSpecCorbaVersion>
<geronimoSpecEjbVersion>1.0</geronimoSpecEjbVersion>
<geronimoSpecJ2eeVersion>1.1-SNAPSHOT</geronimoSpecJ2eeVersion>
- <geronimoSpecJ2eeConnectorVersion>
- 1.0
- </geronimoSpecJ2eeConnectorVersion>
- <geronimoSpecJ2eeDeploymentVersion>
- 1.0
- </geronimoSpecJ2eeDeploymentVersion>
+ <geronimoSpecJ2eeConnectorVersion>1.0</geronimoSpecJ2eeConnectorVersion>
+ <geronimoSpecJ2eeDeploymentVersion>1.0</geronimoSpecJ2eeDeploymentVersion>
<geronimoSpecJ2eeJaccVersion>1.0</geronimoSpecJ2eeJaccVersion>
- <geronimoSpecJ2eeManagementVersion>
- 1.0
- </geronimoSpecJ2eeManagementVersion>
- <geronimoSpecJavamailVersion>
- 1.1-SNAPSHOT
- </geronimoSpecJavamailVersion>
+ <geronimoSpecJ2eeManagementVersion>1.0</geronimoSpecJ2eeManagementVersion>
+ <geronimoSpecJavamailVersion>1.1-SNAPSHOT</geronimoSpecJavamailVersion>
<geronimoSpecJaxrVersion>1.0</geronimoSpecJaxrVersion>
<geronimoSpecJaxrpcVersion>1.0</geronimoSpecJaxrpcVersion>
<geronimoSpecJmsVersion>1.0</geronimoSpecJmsVersion>
@@ -234,8 +226,8 @@
<version>${geronimoSpecActivationVersion}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-corba_2.3_spec</artifactId>
+ <groupId>geronimo-spec</groupId>
+ <artifactId>geronimo-spec-corba</artifactId>
<version>${geronimoSpecCorbaVersion}</version>
</dependency>
<dependency>