You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by hu...@apache.org on 2012/01/06 19:03:27 UTC
svn commit: r1228313 - in /aries/trunk/jndi: ./ jndi-bundle/ jndi-core/
jndi-core/src/main/java/org/apache/aries/jndi/
jndi-core/src/test/java/org/apache/aries/jndi/ jndi-legacy-support/
jndi-rmi/ jndi-url-itest-biz/ jndi-url-itest-web/ jndi-url-itest/...
Author: hughesj
Date: Fri Jan 6 18:03:26 2012
New Revision: 1228313
URL: http://svn.apache.org/viewvc?rev=1228313&view=rev
Log:
ARIES-807 reintegrate the dec-2011 jndi release branch updating the snapshot dependency versions on the way
Modified:
aries/trunk/jndi/ (props changed)
aries/trunk/jndi/jndi-bundle/pom.xml
aries/trunk/jndi/jndi-core/pom.xml
aries/trunk/jndi/jndi-core/src/main/java/org/apache/aries/jndi/ (props changed)
aries/trunk/jndi/jndi-core/src/test/java/org/apache/aries/jndi/ObjectFactoryTest.java (props changed)
aries/trunk/jndi/jndi-legacy-support/pom.xml
aries/trunk/jndi/jndi-rmi/pom.xml
aries/trunk/jndi/jndi-url-itest-biz/pom.xml
aries/trunk/jndi/jndi-url-itest-web/pom.xml
aries/trunk/jndi/jndi-url-itest/pom.xml
aries/trunk/jndi/jndi-url/pom.xml
aries/trunk/jndi/jndi-url/src/main/java/org/apache/aries/jndi/ (props changed)
aries/trunk/jndi/jndi-url/src/test/java/org/apache/aries/jndi/ (props changed)
Propchange: aries/trunk/jndi/
------------------------------------------------------------------------------
svn:mergeinfo = /aries/branches/dec-2011-jndi-release/jndi:1209408-1228277
Modified: aries/trunk/jndi/jndi-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-bundle/pom.xml?rev=1228313&r1=1228312&r2=1228313&view=diff
==============================================================================
--- aries/trunk/jndi/jndi-bundle/pom.xml (original)
+++ aries/trunk/jndi/jndi-bundle/pom.xml Fri Jan 6 18:03:26 2012
@@ -27,7 +27,7 @@
<artifactId>org.apache.aries.jndi</artifactId>
<packaging>bundle</packaging>
<name>Apache Aries JNDI Bundle</name>
- <version>0.3.1-SNAPSHOT</version>
+ <version>0.3.2-SNAPSHOT</version>
<description>
This bundle contains the core JNDI along with the OSGi url handler.
It's composed of the jndi-api, jndi-core and jndi-url modules.
@@ -62,13 +62,13 @@
<dependency>
<groupId>org.apache.aries.jndi</groupId>
<artifactId>org.apache.aries.jndi.core</artifactId>
- <version>0.3.1-SNAPSHOT</version>
+ <version>0.3.2-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.jndi</groupId>
<artifactId>org.apache.aries.jndi.url</artifactId>
- <version>0.3.1-SNAPSHOT</version>
+ <version>0.3.2-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -80,7 +80,7 @@
<dependency>
<groupId>org.apache.aries.jndi</groupId>
<artifactId>org.apache.aries.jndi.rmi</artifactId>
- <version>0.3.1-SNAPSHOT</version>
+ <version>0.3.2-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: aries/trunk/jndi/jndi-core/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-core/pom.xml?rev=1228313&r1=1228312&r2=1228313&view=diff
==============================================================================
--- aries/trunk/jndi/jndi-core/pom.xml (original)
+++ aries/trunk/jndi/jndi-core/pom.xml Fri Jan 6 18:03:26 2012
@@ -29,7 +29,7 @@
<artifactId>org.apache.aries.jndi.core</artifactId>
<packaging>bundle</packaging>
<name>Apache Aries JNDI Core</name>
- <version>0.3.1-SNAPSHOT</version>
+ <version>0.3.2-SNAPSHOT</version>
<description>
This bundle contains the core of JNDI support for OSGi.
</description>
Propchange: aries/trunk/jndi/jndi-core/src/main/java/org/apache/aries/jndi/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 6 18:03:26 2012
@@ -0,0 +1 @@
+/aries/branches/dec-2011-jndi-release/jndi/jndi-core/src/main/java/org/apache/aries/jndi:1209408-1228277
Propchange: aries/trunk/jndi/jndi-core/src/test/java/org/apache/aries/jndi/ObjectFactoryTest.java
('svn:mergeinfo' removed)
Modified: aries/trunk/jndi/jndi-legacy-support/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-legacy-support/pom.xml?rev=1228313&r1=1228312&r2=1228313&view=diff
==============================================================================
--- aries/trunk/jndi/jndi-legacy-support/pom.xml (original)
+++ aries/trunk/jndi/jndi-legacy-support/pom.xml Fri Jan 6 18:03:26 2012
@@ -1,63 +1,63 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.aries</groupId>
- <artifactId>java5-parent</artifactId>
- <version>0.5</version>
- <relativePath />
- </parent>
-
- <groupId>org.apache.aries.jndi</groupId>
- <artifactId>org.apache.aries.jndi.legacy.support</artifactId>
- <packaging>bundle</packaging>
- <version>0.3.1-SNAPSHOT</version>
- <name>Apache Aries JNDI Support for Legacy Runtimes</name>
- <description>
- This bundle contains support for legacy runtimes which rely on the thread context classloader to load JNDI implementations. It is intended for use with OSGi Web Container implementations which do not correctly work with the OSGi JNDI Service specification.
- </description>
-
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-legacy-support</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-legacy-support</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-legacy-support</url>
- </scm>
-
- <properties>
- <aries.osgi.export.pkg/>
- <aries.osgi.private.pkg>
- org.apache.aries.jndi.legacy.support
- </aries.osgi.private.pkg>
- <aries.osgi.activator>
- org.apache.aries.jndi.legacy.support.Activator
- </aries.osgi.activator>
- <aries.osgi.import.pkg> *
- </aries.osgi.import.pkg>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
-</project>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>java5-parent</artifactId>
+ <version>0.5</version>
+ <relativePath />
+ </parent>
+
+ <groupId>org.apache.aries.jndi</groupId>
+ <artifactId>org.apache.aries.jndi.legacy.support</artifactId>
+ <packaging>bundle</packaging>
+ <version>0.3.2-SNAPSHOT</version>
+ <name>Apache Aries JNDI Support for Legacy Runtimes</name>
+ <description>
+ This bundle contains support for legacy runtimes which rely on the thread context classloader to load JNDI implementations. It is intended for use with OSGi Web Container implementations which do not correctly work with the OSGi JNDI Service specification.
+ </description>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-legacy-support</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-legacy-support</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-legacy-support</url>
+ </scm>
+
+ <properties>
+ <aries.osgi.export.pkg />
+ <aries.osgi.private.pkg>
+ org.apache.aries.jndi.legacy.support
+ </aries.osgi.private.pkg>
+ <aries.osgi.activator>
+ org.apache.aries.jndi.legacy.support.Activator
+ </aries.osgi.activator>
+ <aries.osgi.import.pkg> *
+ </aries.osgi.import.pkg>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+</project>
Modified: aries/trunk/jndi/jndi-rmi/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-rmi/pom.xml?rev=1228313&r1=1228312&r2=1228313&view=diff
==============================================================================
--- aries/trunk/jndi/jndi-rmi/pom.xml (original)
+++ aries/trunk/jndi/jndi-rmi/pom.xml Fri Jan 6 18:03:26 2012
@@ -1,86 +1,86 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.aries</groupId>
- <artifactId>java5-parent</artifactId>
- <version>0.5</version>
- <relativePath />
- </parent>
-
- <groupId>org.apache.aries.jndi</groupId>
- <artifactId>org.apache.aries.jndi.rmi</artifactId>
- <packaging>bundle</packaging>
- <name>Apache Aries JNDI RMI Handler</name>
- <version>0.3.1-SNAPSHOT</version>
- <description>
- This bundle contains the JNDI RMI handler
- </description>
-
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-rmi</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-rmi</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-rmi</url>
- </scm>
-
- <properties>
- <aries.osgi.activator>
- org.apache.aries.jndi.rmi.Activator
- </aries.osgi.activator>
- <aries.osgi.private.pkg>
- ${project.artifactId}*
- </aries.osgi.private.pkg>
- <aries.osgi.export.pkg/>
- <!--
- We use the range macro to get a 0.x to 0.x+1 version range while Aries is still
- stabilizing API. This should be removed once the dependency is available at a
- version greater than or equal to 1.0.0
- -->
- <aries.osgi.import.pkg>
- org.apache.aries.*;version="$<range;[==,=+)>",
- *
- </aries.osgi.import.pkg>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.aries.jndi</groupId>
- <artifactId>org.apache.aries.jndi.api</artifactId>
- <scope>provided</scope>
- <version>0.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries</groupId>
- <artifactId>org.apache.aries.util</artifactId>
- <version>0.4</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
-</project>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>java5-parent</artifactId>
+ <version>0.5</version>
+ <relativePath />
+ </parent>
+
+ <groupId>org.apache.aries.jndi</groupId>
+ <artifactId>org.apache.aries.jndi.rmi</artifactId>
+ <packaging>bundle</packaging>
+ <name>Apache Aries JNDI RMI Handler</name>
+ <version>0.3.2-SNAPSHOT</version>
+ <description>
+ This bundle contains the JNDI RMI handler
+ </description>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-rmi</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-rmi</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-rmi</url>
+ </scm>
+
+ <properties>
+ <aries.osgi.activator>
+ org.apache.aries.jndi.rmi.Activator
+ </aries.osgi.activator>
+ <aries.osgi.private.pkg>
+ ${project.artifactId}*
+ </aries.osgi.private.pkg>
+ <aries.osgi.export.pkg />
+ <!--
+ We use the range macro to get a 0.x to 0.x+1 version range while Aries is still
+ stabilizing API. This should be removed once the dependency is available at a
+ version greater than or equal to 1.0.0
+ -->
+ <aries.osgi.import.pkg>
+ org.apache.aries.*;version="$<range;[==,=+)>",
+ *
+ </aries.osgi.import.pkg>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.aries.jndi</groupId>
+ <artifactId>org.apache.aries.jndi.api</artifactId>
+ <scope>provided</scope>
+ <version>0.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>org.apache.aries.util</artifactId>
+ <version>0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+</project>
Modified: aries/trunk/jndi/jndi-url-itest-biz/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-url-itest-biz/pom.xml?rev=1228313&r1=1228312&r2=1228313&view=diff
==============================================================================
--- aries/trunk/jndi/jndi-url-itest-biz/pom.xml (original)
+++ aries/trunk/jndi/jndi-url-itest-biz/pom.xml Fri Jan 6 18:03:26 2012
@@ -31,7 +31,7 @@
<groupId>org.apache.aries.jndi</groupId>
<artifactId>org.apache.aries.jndi.url.itest.biz</artifactId>
<name>Apache Aries JNDI "business logic" test bundle for Aries jndi-url iTests</name>
- <version>0.3.1-SNAPSHOT</version>
+ <version>0.3.2-SNAPSHOT</version>
<packaging>bundle</packaging>
<scm>
Modified: aries/trunk/jndi/jndi-url-itest-web/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-url-itest-web/pom.xml?rev=1228313&r1=1228312&r2=1228313&view=diff
==============================================================================
--- aries/trunk/jndi/jndi-url-itest-web/pom.xml (original)
+++ aries/trunk/jndi/jndi-url-itest-web/pom.xml Fri Jan 6 18:03:26 2012
@@ -31,7 +31,7 @@
<groupId>org.apache.aries.jndi</groupId>
<artifactId>org.apache.aries.jndi.url.itest.web</artifactId>
<name>Apache Aries JNDI Test Bundle for Aries jndi-url iTests</name>
- <version>0.3.1-SNAPSHOT</version>
+ <version>0.3.2-SNAPSHOT</version>
<packaging>bundle</packaging>
<scm>
Modified: aries/trunk/jndi/jndi-url-itest/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-url-itest/pom.xml?rev=1228313&r1=1228312&r2=1228313&view=diff
==============================================================================
--- aries/trunk/jndi/jndi-url-itest/pom.xml (original)
+++ aries/trunk/jndi/jndi-url-itest/pom.xml Fri Jan 6 18:03:26 2012
@@ -28,7 +28,7 @@
<groupId>org.apache.aries.jndi</groupId>
<artifactId>org.apache.aries.jndi.url.itest</artifactId>
<name>Apache Aries JNDI iTests for jndi-url</name>
- <version>0.3.1-SNAPSHOT</version>
+ <version>0.3.2-SNAPSHOT</version>
<description>
Integration test for JNDI
</description>
@@ -89,14 +89,14 @@
<groupId>org.apache.aries.jndi</groupId>
<artifactId>org.apache.aries.jndi.url.itest.web</artifactId>
<scope>test</scope>
- <version>0.3.1-SNAPSHOT</version>
+ <version>0.3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.jndi</groupId>
<artifactId>org.apache.aries.jndi.url.itest.biz</artifactId>
<scope>test</scope>
- <version>0.3.1-SNAPSHOT</version>
+ <version>0.3.2-SNAPSHOT</version>
</dependency>
<dependency>
@@ -214,14 +214,14 @@
<groupId>org.apache.aries.jndi</groupId>
<artifactId>org.apache.aries.jndi</artifactId>
<scope>test</scope>
- <version>0.3.1-SNAPSHOT</version>
+ <version>0.3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.jndi</groupId>
<artifactId>org.apache.aries.jndi.url</artifactId>
<scope>test</scope>
- <version>0.3.1-SNAPSHOT</version>
+ <version>0.3.2-SNAPSHOT</version>
</dependency>
<dependency>
Modified: aries/trunk/jndi/jndi-url/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-url/pom.xml?rev=1228313&r1=1228312&r2=1228313&view=diff
==============================================================================
--- aries/trunk/jndi/jndi-url/pom.xml (original)
+++ aries/trunk/jndi/jndi-url/pom.xml Fri Jan 6 18:03:26 2012
@@ -29,7 +29,7 @@
<artifactId>org.apache.aries.jndi.url</artifactId>
<packaging>bundle</packaging>
<name>Apache Aries JNDI URL Handler</name>
- <version>0.3.1-SNAPSHOT</version>
+ <version>0.3.2-SNAPSHOT</version>
<description>
This bundle contains the JNDI URL handler for OSGi
</description>
@@ -94,7 +94,7 @@
<groupId>org.apache.aries.jndi</groupId>
<artifactId>org.apache.aries.jndi.core</artifactId>
<scope>test</scope>
- <version>0.3.1-SNAPSHOT</version>
+ <version>0.3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.testsupport</groupId>
Propchange: aries/trunk/jndi/jndi-url/src/main/java/org/apache/aries/jndi/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 6 18:03:26 2012
@@ -0,0 +1 @@
+/aries/branches/dec-2011-jndi-release/jndi/jndi-url/src/main/java/org/apache/aries/jndi:1209408-1228277
Propchange: aries/trunk/jndi/jndi-url/src/test/java/org/apache/aries/jndi/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 6 18:03:26 2012
@@ -0,0 +1 @@
+/aries/branches/dec-2011-jndi-release/jndi/jndi-url/src/test/java/org/apache/aries/jndi:1209408-1228277