Return-Path: 
 <scm-return-15638-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 20450 invoked from network); 30 Oct 2006 16:00:41 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 30 Oct 2006 16:00:41 -0000
Received: (qmail 37878 invoked by uid 500); 30 Oct 2006 16:00:47 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 37808 invoked by uid 500); 30 Oct 2006 16:00:47 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 37777 invoked by uid 99); 30 Oct 2006 16:00:47 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 30 Oct 2006 08:00:47 -0800
X-ASF-Spam-Status: No, hits=0.6 required=10.0
	tests=NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 30 Oct 2006 08:00:32 -0800
Received: by eris.apache.org (Postfix, from userid 65534)
	id 729E11A98A5; Mon, 30 Oct 2006 05:13:28 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r469142 - in /geronimo/server/trunk:
 configs/openejb/pom.xml
 pom.xml
Date: Mon, 30 Oct 2006 13:13:27 -0000
To: scm@geronimo.apache.org
From: rickmcguire@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20061030131328.729E11A98A5@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: rickmcguire
Date: Mon Oct 30 05:13:27 2006
New Revision: 469142

URL: http://svn.apache.org/viewvc?view=rev&rev=469142
Log:
OPENEJB-301 The geronimo-corba_2.3_spec jar should be replaced with the yoko spec jar


Modified:
    geronimo/server/trunk/configs/openejb/pom.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/configs/openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/openejb/pom.xml?view=diff&rev=469142&r1=469141&r2=469142
==============================================================================
--- geronimo/server/trunk/configs/openejb/pom.xml (original)
+++ geronimo/server/trunk/configs/openejb/pom.xml Mon Oct 30 05:13:27 2006
@@ -73,21 +73,16 @@
             <groupId>org.apache.openejb</groupId>
             <artifactId>openejb-core</artifactId>
         </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-corba_2.3_spec</artifactId>
-        </dependency>
-        
+
         <dependency>
             <groupId>org.apache.openejb</groupId>
             <artifactId>openejb-axis</artifactId>
         </dependency>
 
-        <!--<dependency>-->
-            <!--<groupId>org.apache.yoko</groupId>-->
-            <!--<artifactId>yoko-spec-corba</artifactId>-->
-        <!--</dependency>-->
+        <dependency>
+            <groupId>org.apache.yoko</groupId>
+            <artifactId>yoko-spec-corba</artifactId>
+        </dependency>
 
         <!--<dependency>-->
             <!--<groupId>concurrent</groupId>-->

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?view=diff&rev=469142&r1=469141&r2=469142
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Mon Oct 30 05:13:27 2006
@@ -48,13 +48,13 @@
         <!--
         NOTE: Project version, to be used instead of ${pom.version} since that
               value magically changes when using SNAPSHOT versions.
-              
+
               This value *must* be kept in sync with the value of the <version>
               element, and it will need to be changed manually before a release,
               as the maven-release-plugin will not update this value.
         -->
         <version>1.2-SNAPSHOT</version>
-        
+
         <geronimoSchemaVersion>1.2</geronimoSchemaVersion>
 
         <!--
@@ -100,13 +100,7 @@
                 <artifactId>geronimo-spec-corba</artifactId>
                 <version>1.0</version>
             </dependency>
-            
-            <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-corba_2.3_spec</artifactId>
-                <version>1.1</version>
-            </dependency>
-            
+
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-ejb_2.1_spec</artifactId>
@@ -196,15 +190,15 @@
                 <artifactId>geronimo-servlet_2.4_spec</artifactId>
                 <version>1.0.1</version>
             </dependency>
-            
+
             <!--
             NOTE: The full source for this artifact is private due to Sun licensing issues.
                   To view the generated XmlBeans source please see the -src artifact in the repository:
-                  
+
                   http://people.apache.org/repo/m2-snapshot-repository/org/apache/geronimo/schema/
-                  
+
                   The full source is here with restricted access:
-                  
+
                   https://svn.apache.org/repos/tck/geronimo-tck/schema/geronimo-schema-j2ee_1.4/trunk
             -->
             <dependency>
@@ -212,7 +206,7 @@
                 <artifactId>geronimo-schema-j2ee_1.4</artifactId>
                 <version>1.1-SNAPSHOT</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.apache.xbean</groupId>
                 <artifactId>xbean-naming</artifactId>
@@ -588,19 +582,19 @@
                 <artifactId>commons-fileupload</artifactId>
                 <version>1.1.1</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>commons-jexl</groupId>
                 <artifactId>commons-jexl</artifactId>
                 <version>1.1</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>ognl</groupId>
                 <artifactId>ognl</artifactId>
                 <version>2.6.9</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>xml-apis</groupId>
                 <artifactId>xml-apis</artifactId>
@@ -656,7 +650,7 @@
             </dependency>
 
             <dependency>
-                <groupId>org.apache.openejb</groupId> 
+                <groupId>org.apache.openejb</groupId>
                 <artifactId>openejb-corba-builder</artifactId>
                 <version>${openejbVersion}</version>
             </dependency>
@@ -1090,7 +1084,7 @@
                         </assemblies>
 
                         <defaultAssemblyId>jetty</defaultAssemblyId>
-                        
+
                         <optionSets>
                             <optionSet>
                                 <id>debug</id>
@@ -1112,7 +1106,7 @@
 
                 <!-- Tools includes custom packagings, install as extension to pick them up -->
                 <extensions>true</extensions>
-                
+
                 <executions>
                     <execution>
                         <id>validate-java-version</id>
@@ -1220,7 +1214,7 @@
                 <module>assemblies</module>
             </modules>
         </profile>
-        
+
         <!--
         NOTE: This profile is used to enable plugin prefixes for easy command-line usage, as in:
 
@@ -1317,7 +1311,7 @@
                 <module>maven-plugins</module>
                 <module>applications</module>
                 <module>configs</module>
-                
+
                 <!--
                 NOTE: Probably do not want to publish these to the repo...  Or do we?