geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r948077 - in /geronimo/server/trunk: ./ framework/configs/karaf-framework/ framework/configs/rmi-naming/ framework/configs/rmi-naming/src/main/history/ framework/configs/rmi-naming/src/main/resources/OSGI-INF/blueprint/ plugins/aries/ plugi...
Date Tue, 25 May 2010 15:36:12 GMT
Author: gawor
Date: Tue May 25 15:36:11 2010
New Revision: 948077

URL: http://svn.apache.org/viewvc?rev=948077&view=rev
Log:
use latest components from aries project

Modified:
    geronimo/server/trunk/framework/configs/karaf-framework/pom.xml
    geronimo/server/trunk/framework/configs/rmi-naming/pom.xml
    geronimo/server/trunk/framework/configs/rmi-naming/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/rmi-naming/src/main/resources/OSGI-INF/blueprint/naming-providers.xml
    geronimo/server/trunk/plugins/aries/pom.xml
    geronimo/server/trunk/plugins/client/client/pom.xml
    geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/client/client/src/main/resources/OSGI-INF/blueprint/naming-providers.xml
    geronimo/server/trunk/plugins/openjpa2/pom.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/framework/configs/karaf-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/pom.xml?rev=948077&r1=948076&r2=948077&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/pom.xml Tue May 25 15:36:11 2010
@@ -51,7 +51,7 @@
         <felix.plugin.version>2.1.0</felix.plugin.version>
         <felix.prefs.version>1.0.4</felix.prefs.version>
         <felix.metatype.version>1.0.2</felix.metatype.version>
-        <aries.blueprint.version>0.1-incubating</aries.blueprint.version>
+        <aries.blueprint.version>0.2-incubating-SNAPSHOT</aries.blueprint.version>
         <jansi.version>1.2</jansi.version>
         <junit.version>4.7_1</junit.version>
         <jline.version>0.9.95.20100209</jline.version>

Modified: geronimo/server/trunk/framework/configs/rmi-naming/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/rmi-naming/pom.xml?rev=948077&r1=948076&r2=948077&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/rmi-naming/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/rmi-naming/pom.xml Tue May 25 15:36:11 2010
@@ -110,13 +110,8 @@
         <!-- aries jndi integration -->
         <dependency>
             <groupId>org.apache.aries.jndi</groupId>
-            <artifactId>org.apache.aries.jndi.core</artifactId>
+            <artifactId>org.apache.aries.jndi</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.aries.jndi</groupId>
-            <artifactId>org.apache.aries.jndi.url</artifactId>
-        </dependency>
-        
 
     </dependencies>
 

Modified: geronimo/server/trunk/framework/configs/rmi-naming/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/rmi-naming/src/main/history/dependencies.xml?rev=948077&r1=948076&r2=948077&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/rmi-naming/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/rmi-naming/src/main/history/dependencies.xml Tue
May 25 15:36:11 2010
@@ -28,12 +28,7 @@
     </dependency>
     <dependency>
         <groupId>org.apache.aries.jndi</groupId>
-        <artifactId>org.apache.aries.jndi.core</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.aries.jndi</groupId>
-        <artifactId>org.apache.aries.jndi.url</artifactId>
+        <artifactId>org.apache.aries.jndi</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>

Modified: geronimo/server/trunk/framework/configs/rmi-naming/src/main/resources/OSGI-INF/blueprint/naming-providers.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/rmi-naming/src/main/resources/OSGI-INF/blueprint/naming-providers.xml?rev=948077&r1=948076&r2=948077&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/rmi-naming/src/main/resources/OSGI-INF/blueprint/naming-providers.xml
(original)
+++ geronimo/server/trunk/framework/configs/rmi-naming/src/main/resources/OSGI-INF/blueprint/naming-providers.xml
Tue May 25 15:36:11 2010
@@ -27,7 +27,7 @@ limitations under the License.
     <service id="javaContextProvider"
              interface="javax.naming.spi.ObjectFactory">
         <service-properties>
-            <entry key="osgi.jndi.urlScheme" value="java"/>
+            <entry key="osgi.jndi.url.scheme" value="java"/>
         </service-properties>
         <bean class="org.apache.geronimo.naming.java.javaURLContextFactory"/>
     </service>
@@ -35,7 +35,7 @@ limitations under the License.
     <service id="gerContextProvider"
              interface="javax.naming.spi.ObjectFactory">
         <service-properties>
-            <entry key="osgi.jndi.urlScheme" value="ger"/>
+            <entry key="osgi.jndi.url.scheme" value="ger"/>
         </service-properties>
         <bean class="org.apache.geronimo.naming.WritableURLContextFactory">
             <argument>
@@ -47,7 +47,7 @@ limitations under the License.
     <service id="jcaContextProvider"
              interface="javax.naming.spi.ObjectFactory">
         <service-properties>
-            <entry key="osgi.jndi.urlScheme" value="jca"/>
+            <entry key="osgi.jndi.url.scheme" value="jca"/>
         </service-properties>
         <bean class="org.apache.geronimo.naming.WritableURLContextFactory">
             <argument>
@@ -56,6 +56,7 @@ limitations under the License.
         </bean>
     </service>
 
+<!--
     <service id="XBeanInitialContextFactory">
         <interfaces>
             <value>javax.naming.spi.InitialContextFactory</value>
@@ -63,14 +64,15 @@ limitations under the License.
         </interfaces>
         <bean class="org.apache.xbean.naming.global.GlobalContextManager"/>
     </service>
+-->
 
     <service id="rmiContextProvider"
              interface="javax.naming.spi.ObjectFactory">
         <service-properties>
-            <entry key="osgi.jndi.urlScheme" value="rmi"/>
+            <entry key="osgi.jndi.url.scheme" value="rmi"/>
         </service-properties>
         <bean class="com.sun.jndi.url.rmi.rmiURLContextFactory"/>
     </service>
 
 
-</blueprint>
\ No newline at end of file
+</blueprint>

Modified: geronimo/server/trunk/plugins/aries/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/pom.xml?rev=948077&r1=948076&r2=948077&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/aries/pom.xml (original)
+++ geronimo/server/trunk/plugins/aries/pom.xml Tue May 25 15:36:11 2010
@@ -50,17 +50,17 @@
             <dependency>
                 <groupId>org.apache.aries.application</groupId>
                 <artifactId>org.apache.aries.application.utils</artifactId>
-                <version>0.1-incubating</version>
+                <version>0.2-incubating-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.aries.application</groupId>
                 <artifactId>org.apache.aries.application.api</artifactId>
-                <version>0.1-incubating</version>
+                <version>0.2-incubating-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.aries.application</groupId>
                 <artifactId>org.apache.aries.application.management</artifactId>
-                <version>0.1-incubating</version>
+                <version>0.2-incubating-SNAPSHOT</version>
             </dependency>
         </dependencies>
     </dependencyManagement>

Modified: geronimo/server/trunk/plugins/client/client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/client/pom.xml?rev=948077&r1=948076&r2=948077&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/client/pom.xml (original)
+++ geronimo/server/trunk/plugins/client/client/pom.xml Tue May 25 15:36:11 2010
@@ -118,15 +118,13 @@
             <groupId>org.apache.xbean</groupId>
             <artifactId>xbean-naming</artifactId>
         </dependency>
+
         <!-- aries jndi integration -->
         <dependency>
             <groupId>org.apache.aries.jndi</groupId>
-            <artifactId>org.apache.aries.jndi.core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.aries.jndi</groupId>
-            <artifactId>org.apache.aries.jndi.url</artifactId>
+            <artifactId>org.apache.aries.jndi</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-bval</artifactId>

Modified: geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml?rev=948077&r1=948076&r2=948077&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml Tue May
25 15:36:11 2010
@@ -13,12 +13,7 @@
     </dependency>
     <dependency>
         <groupId>org.apache.aries.jndi</groupId>
-        <artifactId>org.apache.aries.jndi.core</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.aries.jndi</groupId>
-        <artifactId>org.apache.aries.jndi.url</artifactId>
+        <artifactId>org.apache.aries.jndi</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>

Modified: geronimo/server/trunk/plugins/client/client/src/main/resources/OSGI-INF/blueprint/naming-providers.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/client/src/main/resources/OSGI-INF/blueprint/naming-providers.xml?rev=948077&r1=948076&r2=948077&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/client/src/main/resources/OSGI-INF/blueprint/naming-providers.xml
(original)
+++ geronimo/server/trunk/plugins/client/client/src/main/resources/OSGI-INF/blueprint/naming-providers.xml
Tue May 25 15:36:11 2010
@@ -55,7 +55,7 @@ limitations under the License.
             </argument>
         </bean>
     </service>
-
+<!--
     <service id="XBeanInitialContextFactory">
         <interfaces>
             <value>javax.naming.spi.InitialContextFactory</value>
@@ -63,7 +63,7 @@ limitations under the License.
         </interfaces>
         <bean class="org.apache.xbean.naming.global.GlobalContextManager"/>
     </service>
-
+-->
     <service id="rmiContextProvider"
              interface="javax.naming.spi.ObjectFactory">
         <service-properties>
@@ -77,4 +77,4 @@ limitations under the License.
         <bean class="org.apache.openejb.client.RemoteInitialContextFactory"/>
     </service>
 
-</blueprint>
\ No newline at end of file
+</blueprint>

Modified: geronimo/server/trunk/plugins/openjpa2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa2/pom.xml?rev=948077&r1=948076&r2=948077&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa2/pom.xml (original)
+++ geronimo/server/trunk/plugins/openjpa2/pom.xml Tue May 25 15:36:11 2010
@@ -137,25 +137,25 @@
             <dependency>
                 <groupId>org.apache.aries.jpa</groupId>
                 <artifactId>org.apache.aries.jpa.api</artifactId>
-                <version>0.1-incubating</version>
+                <version>0.2-incubating-SNAPSHOT</version>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.aries.jpa</groupId>
                 <artifactId>org.apache.aries.jpa.blueprint.aries</artifactId>
-                <version>0.1-incubating</version>
+                <version>0.2-incubating-SNAPSHOT</version>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.aries.jpa</groupId>
                 <artifactId>org.apache.aries.jpa.container</artifactId>
-                <version>0.1-incubating</version>
+                <version>0.2-incubating-SNAPSHOT</version>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.aries.jpa</groupId>
                 <artifactId>org.apache.aries.jpa.container.context</artifactId>
-                <version>0.1-incubating</version>
+                <version>0.2-incubating-SNAPSHOT</version>
             </dependency>
         </dependencies>
     </dependencyManagement>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=948077&r1=948076&r2=948077&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Tue May 25 15:36:11 2010
@@ -1903,31 +1903,25 @@ only found in cxf
             <dependency>
                 <groupId>org.apache.aries</groupId>
                 <artifactId>org.apache.aries.util</artifactId>
-                <version>0.1-incubating</version>
+                <version>0.2-incubating-SNAPSHOT</version>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.aries.jndi</groupId>
-                <artifactId>org.apache.aries.jndi.core</artifactId>
-                <version>0.1-incubating</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.aries.jndi</groupId>
-                <artifactId>org.apache.aries.jndi.url</artifactId>
-                <version>0.1-incubating</version>
+                <artifactId>org.apache.aries.jndi</artifactId>
+                <version>0.2-incubating-SNAPSHOT</version>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.aries.jmx</groupId>
                 <artifactId>org.apache.aries.jmx</artifactId>
-                <version>0.1-incubating</version>
+                <version>0.2-incubating-SNAPSHOT</version>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.aries.jmx</groupId>
                 <artifactId>org.apache.aries.jmx.blueprint</artifactId>
-                <version>0.1-incubating</version>
+                <version>0.2-incubating-SNAPSHOT</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.slf4j</groupId>
@@ -1939,43 +1933,7 @@ only found in cxf
             <dependency>
                 <groupId>org.apache.aries.blueprint</groupId>
                 <artifactId>org.apache.aries.blueprint</artifactId>
-                <version>0.1-incubating</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.slf4j</groupId>
-                        <artifactId>slf4j-api</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.aries.blueprint</groupId>
-                <artifactId>org.apache.aries.blueprint.api</artifactId>
-                <version>0.1-incubating</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.slf4j</groupId>
-                        <artifactId>slf4j-api</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.aries.blueprint</groupId>
-                <artifactId>org.apache.aries.blueprint.core</artifactId>
-                <version>0.1-incubating</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.slf4j</groupId>
-                        <artifactId>slf4j-api</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.aries.blueprint</groupId>
-                <artifactId>org.apache.aries.blueprint.cm</artifactId>
-                <version>0.1-incubating</version>
+                <version>0.2-incubating-SNAPSHOT</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.slf4j</groupId>



Mime
View raw message