You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by tj...@apache.org on 2014/07/09 23:24:28 UTC
svn commit: r1609307 [2/2] - in /aries/branches/subsystemsR6: ./
application/ application/application-api/ application/application-bundle/
application/application-converters/
application/application-default-local-platform/
application/application-deplo...
Modified: aries/branches/subsystemsR6/proxy/proxy-impl/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/proxy/proxy-impl/pom.xml?rev=1609307&r1=1609306&r2=1609307&view=diff
==============================================================================
--- aries/branches/subsystemsR6/proxy/proxy-impl/pom.xml (original)
+++ aries/branches/subsystemsR6/proxy/proxy-impl/pom.xml Wed Jul 9 21:24:25 2014
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
@@ -32,7 +32,7 @@
<artifactId>org.apache.aries.proxy.impl</artifactId>
<packaging>bundle</packaging>
<name>Apache Aries Proxy Service</name>
- <version>1.0.3-SNAPSHOT</version>
+ <version>1.0.4-SNAPSHOT</version>
<description>
This bundle contains the proxy service implementation for Apache Aries
</description>
@@ -68,6 +68,9 @@
<aries.osgi.private.pkg>
org.apache.aries.proxy.impl*
</aries.osgi.private.pkg>
+ <aries.osgi.export.service>
+ org.apache.aries.proxy.ProxyManager
+ </aries.osgi.export.service>
<lastReleaseVersion>1.0.2</lastReleaseVersion>
</properties>
@@ -115,7 +118,7 @@
<dependency>
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy.api</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.0</version>
</dependency>
</dependencies>
@@ -135,12 +138,11 @@
<configuration>
<tasks>
<!-- run the Synthesizer on the WovenProxy class -->
- <java classname="org.apache.aries.proxy.synthesizer.Synthesizer"
- classpathref="maven.runtime.classpath" fork="false">
- <arg value="${project.build.outputDirectory}/org/apache/aries/proxy/weaving/WovenProxy.class"/>
+ <java classname="org.apache.aries.proxy.synthesizer.Synthesizer" classpathref="maven.runtime.classpath" fork="false">
+ <arg value="${project.build.outputDirectory}/org/apache/aries/proxy/weaving/WovenProxy.class" />
</java>
- <delete dir="${project.build.outputDirectory}/org/apache/aries/proxy/synthesizer"/>
+ <delete dir="${project.build.outputDirectory}/org/apache/aries/proxy/synthesizer" />
</tasks>
</configuration>
@@ -177,8 +179,7 @@
</goals>
<configuration>
<rules>
- <checkSignatureRule
- implementation="org.codehaus.mojo.animal_sniffer.enforcer.CheckSignatureRule">
+ <checkSignatureRule implementation="org.codehaus.mojo.animal_sniffer.enforcer.CheckSignatureRule">
<ignoreDependencies>true</ignoreDependencies>
<ignores>
<ignore>sun.reflect.*</ignore>
Modified: aries/branches/subsystemsR6/proxy/proxy-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/proxy/proxy-itests/pom.xml?rev=1609307&r1=1609306&r2=1609307&view=diff
==============================================================================
--- aries/branches/subsystemsR6/proxy/proxy-itests/pom.xml (original)
+++ aries/branches/subsystemsR6/proxy/proxy-itests/pom.xml Wed Jul 9 21:24:25 2014
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
@@ -61,6 +61,12 @@
</dependency>
<dependency>
<groupId>org.apache.aries.proxy</groupId>
+ <artifactId>org.apache.aries.proxy</artifactId>
+ <scope>test</scope>
+ <version>1.0.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy.api</artifactId>
<scope>test</scope>
<version>1.0.1-SNAPSHOT</version>
Modified: aries/branches/subsystemsR6/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/AbstractProxyTest.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/AbstractProxyTest.java?rev=1609307&r1=1609306&r2=1609307&view=diff
==============================================================================
--- aries/branches/subsystemsR6/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/AbstractProxyTest.java (original)
+++ aries/branches/subsystemsR6/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/AbstractProxyTest.java Wed Jul 9 21:24:25 2014
@@ -319,7 +319,7 @@ public abstract class AbstractProxyTest
{
return options(
generalOptions(),
- mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy").version("1.0.2-SNAPSHOT")
+ mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy").versionAsInProject()
);
}
Modified: aries/branches/subsystemsR6/quiesce/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/quiesce/pom.xml?rev=1609307&r1=1609306&r2=1609307&view=diff
==============================================================================
--- aries/branches/subsystemsR6/quiesce/pom.xml (original)
+++ aries/branches/subsystemsR6/quiesce/pom.xml Wed Jul 9 21:24:25 2014
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: aries/branches/subsystemsR6/quiesce/quiesce-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/quiesce/quiesce-api/pom.xml?rev=1609307&r1=1609306&r2=1609307&view=diff
==============================================================================
--- aries/branches/subsystemsR6/quiesce/quiesce-api/pom.xml (original)
+++ aries/branches/subsystemsR6/quiesce/quiesce-api/pom.xml Wed Jul 9 21:24:25 2014
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: aries/branches/subsystemsR6/quiesce/quiesce-manager-itest/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/quiesce/quiesce-manager-itest/pom.xml?rev=1609307&r1=1609306&r2=1609307&view=diff
==============================================================================
--- aries/branches/subsystemsR6/quiesce/quiesce-manager-itest/pom.xml (original)
+++ aries/branches/subsystemsR6/quiesce/quiesce-manager-itest/pom.xml Wed Jul 9 21:24:25 2014
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: aries/branches/subsystemsR6/quiesce/quiesce-manager/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/quiesce/quiesce-manager/pom.xml?rev=1609307&r1=1609306&r2=1609307&view=diff
==============================================================================
--- aries/branches/subsystemsR6/quiesce/quiesce-manager/pom.xml (original)
+++ aries/branches/subsystemsR6/quiesce/quiesce-manager/pom.xml Wed Jul 9 21:24:25 2014
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: aries/branches/subsystemsR6/samples/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/samples/pom.xml?rev=1609307&r1=1609306&r2=1609307&view=diff
==============================================================================
--- aries/branches/subsystemsR6/samples/pom.xml (original)
+++ aries/branches/subsystemsR6/samples/pom.xml Wed Jul 9 21:24:25 2014
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: aries/branches/subsystemsR6/spi-fly/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/spi-fly/pom.xml?rev=1609307&r1=1609306&r2=1609307&view=diff
==============================================================================
--- aries/branches/subsystemsR6/spi-fly/pom.xml (original)
+++ aries/branches/subsystemsR6/spi-fly/pom.xml Wed Jul 9 21:24:25 2014
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: aries/branches/subsystemsR6/spi-fly/spi-fly-core/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/spi-fly/spi-fly-core/pom.xml?rev=1609307&r1=1609306&r2=1609307&view=diff
==============================================================================
--- aries/branches/subsystemsR6/spi-fly/spi-fly-core/pom.xml (original)
+++ aries/branches/subsystemsR6/spi-fly/spi-fly-core/pom.xml Wed Jul 9 21:24:25 2014
@@ -24,13 +24,13 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.spifly</groupId>
<artifactId>org.apache.aries.spifly.core-internal</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Apache Aries SPI Fly Core (internal module)</name>
<description>
Modified: aries/branches/subsystemsR6/spi-fly/spi-fly-dynamic-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/spi-fly/spi-fly-dynamic-bundle/pom.xml?rev=1609307&r1=1609306&r2=1609307&view=diff
==============================================================================
--- aries/branches/subsystemsR6/spi-fly/spi-fly-dynamic-bundle/pom.xml (original)
+++ aries/branches/subsystemsR6/spi-fly/spi-fly-dynamic-bundle/pom.xml Wed Jul 9 21:24:25 2014
@@ -24,13 +24,13 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.spifly</groupId>
<artifactId>org.apache.aries.spifly.dynamic.bundle</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Aries SPI Fly Dynamic Weaving Bundle</name>
<description>
@@ -58,7 +58,7 @@
<dependency>
<groupId>org.apache.aries.spifly</groupId>
<artifactId>org.apache.aries.spifly.core-internal</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.1</version>
<exclusions>
<exclusion>
<groupId>org.osgi</groupId>
@@ -75,7 +75,7 @@
<dependency>
<groupId>org.apache.aries.spifly</groupId>
<artifactId>org.apache.aries.spifly.weaver-internal</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.1</version>
</dependency>
<dependency>
Modified: aries/branches/subsystemsR6/spi-fly/spi-fly-examples/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/spi-fly/spi-fly-examples/pom.xml?rev=1609307&r1=1609306&r2=1609307&view=diff
==============================================================================
--- aries/branches/subsystemsR6/spi-fly/spi-fly-examples/pom.xml (original)
+++ aries/branches/subsystemsR6/spi-fly/spi-fly-examples/pom.xml Wed Jul 9 21:24:25 2014
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: aries/branches/subsystemsR6/spi-fly/spi-fly-static-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/spi-fly/spi-fly-static-bundle/pom.xml?rev=1609307&r1=1609306&r2=1609307&view=diff
==============================================================================
--- aries/branches/subsystemsR6/spi-fly/spi-fly-static-bundle/pom.xml (original)
+++ aries/branches/subsystemsR6/spi-fly/spi-fly-static-bundle/pom.xml Wed Jul 9 21:24:25 2014
@@ -24,13 +24,13 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.spifly</groupId>
<artifactId>org.apache.aries.spifly.static.bundle</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Aries SPI Fly Static Weaving Bundle</name>
<description>
@@ -52,7 +52,7 @@
<dependency>
<groupId>org.apache.aries.spifly</groupId>
<artifactId>org.apache.aries.spifly.core-internal</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.1</version>
</dependency>
<dependency>
Modified: aries/branches/subsystemsR6/spi-fly/spi-fly-static-tool/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/spi-fly/spi-fly-static-tool/pom.xml?rev=1609307&r1=1609306&r2=1609307&view=diff
==============================================================================
--- aries/branches/subsystemsR6/spi-fly/spi-fly-static-tool/pom.xml (original)
+++ aries/branches/subsystemsR6/spi-fly/spi-fly-static-tool/pom.xml Wed Jul 9 21:24:25 2014
@@ -24,13 +24,13 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.spifly</groupId>
<artifactId>org.apache.aries.spifly.static.tool</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Apache Aries SPI Fly Static Weaving Tool</name>
<description>
@@ -53,13 +53,13 @@
<dependency>
<groupId>org.apache.aries.spifly</groupId>
<artifactId>org.apache.aries.spifly.core-internal</artifactId>
- <version>${project.version}</version>
+ <version>1.0.1</version>
</dependency>
<dependency>
<groupId>org.apache.aries.spifly</groupId>
<artifactId>org.apache.aries.spifly.weaver-internal</artifactId>
- <version>${project.version}</version>
+ <version>1.0.1</version>
</dependency>
<dependency>
Modified: aries/branches/subsystemsR6/spi-fly/spi-fly-weaver/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/spi-fly/spi-fly-weaver/pom.xml?rev=1609307&r1=1609306&r2=1609307&view=diff
==============================================================================
--- aries/branches/subsystemsR6/spi-fly/spi-fly-weaver/pom.xml (original)
+++ aries/branches/subsystemsR6/spi-fly/spi-fly-weaver/pom.xml Wed Jul 9 21:24:25 2014
@@ -24,13 +24,13 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.spifly</groupId>
<artifactId>org.apache.aries.spifly.weaver-internal</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Apache Aries SPI Fly Weaver (internal module)</name>
@@ -51,7 +51,7 @@
<dependency>
<groupId>org.apache.aries.spifly</groupId>
<artifactId>org.apache.aries.spifly.core-internal</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.1</version>
</dependency>
<dependency>
Modified: aries/branches/subsystemsR6/subsystem/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/pom.xml?rev=1609307&r1=1609306&r2=1609307&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/pom.xml (original)
+++ aries/branches/subsystemsR6/subsystem/pom.xml Wed Jul 9 21:24:25 2014
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: aries/branches/subsystemsR6/subsystem/subsystem-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-api/pom.xml?rev=1609307&r1=1609306&r2=1609307&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-api/pom.xml (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-api/pom.xml Wed Jul 9 21:24:25 2014
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: aries/branches/subsystemsR6/subsystem/subsystem-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-bundle/pom.xml?rev=1609307&r1=1609306&r2=1609307&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-bundle/pom.xml (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-bundle/pom.xml Wed Jul 9 21:24:25 2014
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: aries/branches/subsystemsR6/subsystem/subsystem-core/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-core/pom.xml?rev=1609307&r1=1609306&r2=1609307&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-core/pom.xml (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-core/pom.xml Wed Jul 9 21:24:25 2014
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: aries/branches/subsystemsR6/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/DependencyCalculator.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/DependencyCalculator.java?rev=1609307&r1=1609306&r2=1609307&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/DependencyCalculator.java (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/DependencyCalculator.java Wed Jul 9 21:24:25 2014
@@ -23,7 +23,9 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.osgi.framework.Constants;
+import org.osgi.framework.namespace.ExecutionEnvironmentNamespace;
import org.osgi.framework.namespace.IdentityNamespace;
+import org.osgi.framework.namespace.NativeNamespace;
import org.osgi.resource.Capability;
import org.osgi.resource.Requirement;
import org.osgi.resource.Resource;
@@ -45,11 +47,15 @@ public class DependencyCalculator {
@Override
public List<Capability> findProviders(Requirement requirement) {
ArrayList<Capability> capabilities = new ArrayList<Capability>();
- for (Resource resource : resources)
- for (Capability capability : resource
- .getCapabilities(requirement.getNamespace()))
- if (ResourceHelper.matches(requirement, capability))
- capabilities.add(capability);
+ // never check local resources for osgi.ee or osgi.native capabilities
+ if (!(ExecutionEnvironmentNamespace.EXECUTION_ENVIRONMENT_NAMESPACE.equals(requirement.getNamespace())
+ || NativeNamespace.NATIVE_NAMESPACE.equals(requirement.getNamespace()))) {
+ for (Resource resource : resources)
+ for (Capability capability : resource
+ .getCapabilities(requirement.getNamespace()))
+ if (ResourceHelper.matches(requirement, capability))
+ capabilities.add(capability);
+ }
if (capabilities.isEmpty())
capabilities.add(new MissingCapability(requirement));
capabilities.trimToSize();
Modified: aries/branches/subsystemsR6/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/ResolveContext.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/ResolveContext.java?rev=1609307&r1=1609306&r2=1609307&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/ResolveContext.java (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/ResolveContext.java Wed Jul 9 21:24:25 2014
@@ -15,7 +15,9 @@ import org.apache.aries.subsystem.core.r
import org.eclipse.equinox.region.Region;
import org.osgi.framework.BundleException;
import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.framework.namespace.ExecutionEnvironmentNamespace;
import org.osgi.framework.namespace.IdentityNamespace;
+import org.osgi.framework.namespace.NativeNamespace;
import org.osgi.framework.wiring.BundleRevision;
import org.osgi.resource.Capability;
import org.osgi.resource.Namespace;
@@ -47,12 +49,18 @@ public class ResolveContext extends org.
public List<Capability> findProviders(Requirement requirement) {
ArrayList<Capability> result = new ArrayList<Capability>();
try {
- addDependenciesFromContentRepository(requirement, result);
- addDependenciesFromPreferredProviderRepository(requirement, result);
- addDependenciesFromSystemRepository(requirement, result);
- addDependenciesFromLocalRepository(requirement, result);
- if (result.isEmpty()) {
- addDependenciesFromRepositoryServiceRepositories(requirement, result);
+ // Only check the system repository for osgi.ee and osgi.native
+ if (ExecutionEnvironmentNamespace.EXECUTION_ENVIRONMENT_NAMESPACE.equals(requirement.getNamespace())
+ || NativeNamespace.NATIVE_NAMESPACE.equals(requirement.getNamespace())) {
+ addDependenciesFromSystemRepository(requirement, result);
+ } else {
+ addDependenciesFromContentRepository(requirement, result);
+ addDependenciesFromPreferredProviderRepository(requirement, result);
+ addDependenciesFromSystemRepository(requirement, result);
+ addDependenciesFromLocalRepository(requirement, result);
+ if (result.isEmpty()) {
+ addDependenciesFromRepositoryServiceRepositories(requirement, result);
+ }
}
if (result.isEmpty()) {
// Is the requirement optional?
Modified: aries/branches/subsystemsR6/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/SubsystemResource.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/SubsystemResource.java?rev=1609307&r1=1609306&r2=1609307&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/SubsystemResource.java (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/SubsystemResource.java Wed Jul 9 21:24:25 2014
@@ -52,7 +52,9 @@ import org.osgi.framework.BundleExceptio
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.hooks.weaving.WeavingHook;
+import org.osgi.framework.namespace.ExecutionEnvironmentNamespace;
import org.osgi.framework.namespace.IdentityNamespace;
+import org.osgi.framework.namespace.NativeNamespace;
import org.osgi.framework.wiring.BundleRevision;
import org.osgi.namespace.service.ServiceNamespace;
import org.osgi.resource.Capability;
@@ -615,6 +617,8 @@ public class SubsystemResource implement
}
}
}
+ // Always add access to osgi.ee and osgi.native namespaces
+ setImplicitAccessToNativeAndEECapabilities(builder);
// Now set the sharing policy, if the regions are different.
RegionFilter regionFilter = builder.build();
from.connectRegion(to, regionFilter);
@@ -644,6 +648,8 @@ public class SubsystemResource implement
setImportIsolationPolicy(builder, (SubsystemImportServiceHeader)header);
header = getSubsystemManifest().getRequireBundleHeader();
setImportIsolationPolicy(builder, (RequireBundleHeader)header);
+ // Always add access to osgi.ee and osgi.native namespaces
+ setImplicitAccessToNativeAndEECapabilities(builder);
}
RegionFilter regionFilter = builder.build();
from.connectRegion(to, regionFilter);
@@ -687,7 +693,12 @@ public class SubsystemResource implement
builder.allow(policy, filter);
}
}
-
+
+ private void setImplicitAccessToNativeAndEECapabilities(RegionFilterBuilder builder) {
+ builder.allowAll(ExecutionEnvironmentNamespace.EXECUTION_ENVIRONMENT_NAMESPACE);
+ builder.allowAll(NativeNamespace.NATIVE_NAMESPACE);
+ }
+
private void setImportIsolationPolicy(RegionFilterBuilder builder, SubsystemImportServiceHeader header) throws InvalidSyntaxException {
if (header == null)
return;
Modified: aries/branches/subsystemsR6/subsystem/subsystem-example/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-example/pom.xml?rev=1609307&r1=1609306&r2=1609307&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-example/pom.xml (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-example/pom.xml Wed Jul 9 21:24:25 2014
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: aries/branches/subsystemsR6/subsystem/subsystem-executor/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-executor/pom.xml?rev=1609307&r1=1609306&r2=1609307&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-executor/pom.xml (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-executor/pom.xml Wed Jul 9 21:24:25 2014
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: aries/branches/subsystemsR6/subsystem/subsystem-install/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-install/pom.xml?rev=1609307&r1=1609306&r2=1609307&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-install/pom.xml (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-install/pom.xml Wed Jul 9 21:24:25 2014
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: aries/branches/subsystemsR6/subsystem/subsystem-itests-api-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-itests-api-bundle/pom.xml?rev=1609307&r1=1609306&r2=1609307&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-itests-api-bundle/pom.xml (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-itests-api-bundle/pom.xml Wed Jul 9 21:24:25 2014
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: aries/branches/subsystemsR6/subsystem/subsystem-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-itests/pom.xml?rev=1609307&r1=1609306&r2=1609307&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-itests/pom.xml (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-itests/pom.xml Wed Jul 9 21:24:25 2014
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/ResolutionTest.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/ResolutionTest.java?rev=1609307&r1=1609306&r2=1609307&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/ResolutionTest.java (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/ResolutionTest.java Wed Jul 9 21:24:25 2014
@@ -23,6 +23,7 @@ import static org.junit.Assert.assertTru
import static org.junit.Assert.fail;
import java.io.IOException;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -57,6 +58,15 @@ public class ResolutionTest extends Subs
*/
private static final String APPLICATION_C = "application.c.esa";
/*
+ * Subsystem-SymbolicName: application.d.esa
+ * Subsystem-Content: bundle.f.jar
+ */
+ private static final String APPLICATION_D = "application.d.esa";
+ /* Subsystem-SymbolicName: application.e.esa
+ * Subsystem-Content: bundle.g.jar
+ */
+ private static final String APPLICATION_E = "application.e.esa";
+ /*
* Bundle-SymbolicName: bundle.a.jar
* Require-Capability: a
*/
@@ -82,6 +92,24 @@ public class ResolutionTest extends Subs
* Bundle-RequiredExecutionEnvironment: J2SE-1.4, J2SE-1.5, J2SE-1.6,JavaSE-1.7
*/
private static final String BUNDLE_E = "bundle.e.jar";
+
+ /*
+ * Bundle-SymbolicName: bundle.f.jar
+ * Bundle-NativeCode: \
+ * native.file; osname=Linux; processor=x86, \
+ * native.file; osname=Linux; processor=x86-64, \
+ * native.file; osname=Win32; processor=x86, \
+ * native.file; osname=Win32; processor=x86-64, \
+ * native.file; osname="mac os x"; processor=x86-64
+ */
+ private static final String BUNDLE_F = "bundle.f.jar";
+
+ /*
+ * Bundle-SymbolicName: bundle.f.jar
+ * Bundle-NativeCode: \
+ * native.file; osname=noMatch; processor=noMatch
+ */
+ private static final String BUNDLE_G = "bundle.g.jar";
@Before
public void createApplications() throws Exception {
@@ -93,9 +121,13 @@ public class ResolutionTest extends Subs
createBundleC();
createBundleD();
createBundleE();
+ createBundleF();
+ createBundleG();
createApplicationA();
createApplicationB();
createApplicationC();
+ createApplicationD();
+ createApplicationE();
createdApplications = true;
}
@@ -131,7 +163,29 @@ public class ResolutionTest extends Subs
attributes.put(SubsystemConstants.SUBSYSTEM_SYMBOLICNAME, APPLICATION_C);
createManifest(APPLICATION_C + ".mf", attributes);
}
-
+
+ private static void createApplicationD() throws IOException {
+ createApplicationDManifest();
+ createSubsystem(APPLICATION_D, BUNDLE_F);
+ }
+
+ private static void createApplicationDManifest() throws IOException {
+ Map<String, String> attributes = new HashMap<String, String>();
+ attributes.put(SubsystemConstants.SUBSYSTEM_SYMBOLICNAME, APPLICATION_D);
+ createManifest(APPLICATION_D + ".mf", attributes);
+ }
+
+ private static void createApplicationE() throws IOException {
+ createApplicationEManifest();
+ createSubsystem(APPLICATION_E, BUNDLE_G);
+ }
+
+ private static void createApplicationEManifest() throws IOException {
+ Map<String, String> attributes = new HashMap<String, String>();
+ attributes.put(SubsystemConstants.SUBSYSTEM_SYMBOLICNAME, APPLICATION_E);
+ createManifest(APPLICATION_E + ".mf", attributes);
+ }
+
private void createBundleA() throws IOException {
createBundle(name(BUNDLE_A), new Header(Constants.REQUIRE_CAPABILITY, "a"));
}
@@ -156,6 +210,19 @@ public class ResolutionTest extends Subs
createBundle(name(BUNDLE_E), new Header(Constants.BUNDLE_REQUIREDEXECUTIONENVIRONMENT, "J2SE-1.4, J2SE-1.5, J2SE-1.6,JavaSE-1.7"));
}
+ private void createBundleF() throws IOException {
+ createBundle(Collections.singletonList("native.file"), name(BUNDLE_F), new Header(Constants.BUNDLE_NATIVECODE,
+ "native.file; osname=Linux; processor=x86,"
+ + "native.file; osname=Linux; processor=x86-64,"
+ + "native.file; osname=Win32; processor=x86,"
+ + "native.file; osname=Win32; processor=x86-64,"
+ + "native.file; osname=\"MacOSX\"; processor=x86-64"));
+ }
+ private void createBundleG() throws IOException {
+ createBundle(Collections.singletonList("native.file"), name(BUNDLE_G), new Header(Constants.BUNDLE_NATIVECODE,
+ "native.file; osname=noMatch; processor=noMatch"));
+ }
+
/*
* Test that the right regions are used when validating capabilities.
*
@@ -250,4 +317,42 @@ public class ResolutionTest extends Subs
uninstallSubsystemSilently(applicationC);
}
}
+
+ @Test
+ public void testNativeCodeRequirement() throws Exception {
+ Subsystem applicationD = null;
+ try {
+ applicationD = installSubsystemFromFile(APPLICATION_D);
+ applicationD.start();
+ }
+ catch (Exception e) {
+ e.printStackTrace();
+ fail("Installation should succeed for Bundle-NativeCode");
+ }
+ finally {
+ uninstallSubsystemSilently(applicationD);
+ }
+ }
+
+ @Test
+ public void testMissingNativeCodeRequirement() throws Exception {
+ Subsystem applicationE = null;
+ try {
+ applicationE = installSubsystemFromFile(APPLICATION_E);
+ // TODO this should fail to intsall
+ } catch (SubsystemException e) {
+ e.printStackTrace();
+ fail("Installation should succeed for Bundle-NativeCode");
+ }
+ try {
+ applicationE.start();
+ fail("Expected to fail to install");
+ }
+ catch (Exception e) {
+ // expected
+ }
+ finally {
+ uninstallSubsystemSilently(applicationE);
+ }
+ }
}
Modified: aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SubsystemTest.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SubsystemTest.java?rev=1609307&r1=1609306&r2=1609307&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SubsystemTest.java (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SubsystemTest.java Wed Jul 9 21:24:25 2014
@@ -37,6 +37,7 @@ import java.lang.reflect.Field;
import java.net.URL;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.List;
@@ -629,16 +630,19 @@ public abstract class SubsystemTest exte
protected Header provideCapability(String capability) {
return new Header(Constants.PROVIDE_CAPABILITY, capability);
}
-
protected static void createBundle(Header... headers) throws IOException {
+ createBundle(Collections.<String> emptyList(), headers);
+ }
+
+ protected static void createBundle(List<String> emptyFiles, Header... headers) throws IOException {
HashMap<String, String> headerMap = new HashMap<String, String>();
for (Header header : headers) {
headerMap.put(header.key, header.value);
}
- createBundle(headerMap);
+ createBundle(emptyFiles, headerMap);
}
- private static void createBundle(Map<String, String> headers) throws IOException
+ private static void createBundle(List<String> emptyFiles, Map<String, String> headers) throws IOException
{
String symbolicName = headers.get(Constants.BUNDLE_SYMBOLICNAME);
JarFixture bundle = ArchiveFixture.newJar();
@@ -646,6 +650,9 @@ public abstract class SubsystemTest exte
for (Entry<String, String> header : headers.entrySet()) {
manifest.attribute(header.getKey(), header.getValue());
}
+ for (String path : emptyFiles) {
+ bundle.file(path).end();
+ }
write(symbolicName, bundle);
}
Modified: aries/branches/subsystemsR6/subsystem/subsystem-obr/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-obr/pom.xml?rev=1609307&r1=1609306&r2=1609307&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-obr/pom.xml (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-obr/pom.xml Wed Jul 9 21:24:25 2014
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: aries/branches/subsystemsR6/subsystem/subsystem-scope-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-scope-api/pom.xml?rev=1609307&r1=1609306&r2=1609307&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-scope-api/pom.xml (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-scope-api/pom.xml Wed Jul 9 21:24:25 2014
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: aries/branches/subsystemsR6/subsystem/subsystem-scope-impl/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-scope-impl/pom.xml?rev=1609307&r1=1609306&r2=1609307&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-scope-impl/pom.xml (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-scope-impl/pom.xml Wed Jul 9 21:24:25 2014
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: aries/branches/subsystemsR6/subsystem/subsystem-scope-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-scope-itests/pom.xml?rev=1609307&r1=1609306&r2=1609307&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-scope-itests/pom.xml (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-scope-itests/pom.xml Wed Jul 9 21:24:25 2014
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: aries/branches/subsystemsR6/testsupport/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/testsupport/pom.xml?rev=1609307&r1=1609306&r2=1609307&view=diff
==============================================================================
--- aries/branches/subsystemsR6/testsupport/pom.xml (original)
+++ aries/branches/subsystemsR6/testsupport/pom.xml Wed Jul 9 21:24:25 2014
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: aries/branches/subsystemsR6/testsupport/testsupport-unit/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/testsupport/testsupport-unit/pom.xml?rev=1609307&r1=1609306&r2=1609307&view=diff
==============================================================================
--- aries/branches/subsystemsR6/testsupport/testsupport-unit/pom.xml (original)
+++ aries/branches/subsystemsR6/testsupport/testsupport-unit/pom.xml Wed Jul 9 21:24:25 2014
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: aries/branches/subsystemsR6/transaction/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/transaction/pom.xml?rev=1609307&r1=1609306&r2=1609307&view=diff
==============================================================================
--- aries/branches/subsystemsR6/transaction/pom.xml (original)
+++ aries/branches/subsystemsR6/transaction/pom.xml Wed Jul 9 21:24:25 2014
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: aries/branches/subsystemsR6/transaction/transaction-blueprint/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/transaction/transaction-blueprint/pom.xml?rev=1609307&r1=1609306&r2=1609307&view=diff
==============================================================================
--- aries/branches/subsystemsR6/transaction/transaction-blueprint/pom.xml (original)
+++ aries/branches/subsystemsR6/transaction/transaction-blueprint/pom.xml Wed Jul 9 21:24:25 2014
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: aries/branches/subsystemsR6/transaction/transaction-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/transaction/transaction-itests/pom.xml?rev=1609307&r1=1609306&r2=1609307&view=diff
==============================================================================
--- aries/branches/subsystemsR6/transaction/transaction-itests/pom.xml (original)
+++ aries/branches/subsystemsR6/transaction/transaction-itests/pom.xml Wed Jul 9 21:24:25 2014
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: aries/branches/subsystemsR6/transaction/transaction-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/transaction/transaction-jdbc/pom.xml?rev=1609307&r1=1609306&r2=1609307&view=diff
==============================================================================
--- aries/branches/subsystemsR6/transaction/transaction-jdbc/pom.xml (original)
+++ aries/branches/subsystemsR6/transaction/transaction-jdbc/pom.xml Wed Jul 9 21:24:25 2014
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: aries/branches/subsystemsR6/transaction/transaction-jms/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/transaction/transaction-jms/pom.xml?rev=1609307&r1=1609306&r2=1609307&view=diff
==============================================================================
--- aries/branches/subsystemsR6/transaction/transaction-jms/pom.xml (original)
+++ aries/branches/subsystemsR6/transaction/transaction-jms/pom.xml Wed Jul 9 21:24:25 2014
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: aries/branches/subsystemsR6/transaction/transaction-manager/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/transaction/transaction-manager/pom.xml?rev=1609307&r1=1609306&r2=1609307&view=diff
==============================================================================
--- aries/branches/subsystemsR6/transaction/transaction-manager/pom.xml (original)
+++ aries/branches/subsystemsR6/transaction/transaction-manager/pom.xml Wed Jul 9 21:24:25 2014
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: aries/branches/subsystemsR6/transaction/transaction-testbundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/transaction/transaction-testbundle/pom.xml?rev=1609307&r1=1609306&r2=1609307&view=diff
==============================================================================
--- aries/branches/subsystemsR6/transaction/transaction-testbundle/pom.xml (original)
+++ aries/branches/subsystemsR6/transaction/transaction-testbundle/pom.xml Wed Jul 9 21:24:25 2014
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: aries/branches/subsystemsR6/transaction/transaction-testds/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/transaction/transaction-testds/pom.xml?rev=1609307&r1=1609306&r2=1609307&view=diff
==============================================================================
--- aries/branches/subsystemsR6/transaction/transaction-testds/pom.xml (original)
+++ aries/branches/subsystemsR6/transaction/transaction-testds/pom.xml Wed Jul 9 21:24:25 2014
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: aries/branches/subsystemsR6/util/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/util/pom.xml?rev=1609307&r1=1609306&r2=1609307&view=diff
==============================================================================
--- aries/branches/subsystemsR6/util/pom.xml (original)
+++ aries/branches/subsystemsR6/util/pom.xml Wed Jul 9 21:24:25 2014
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: aries/branches/subsystemsR6/util/util-r42/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/util/util-r42/pom.xml?rev=1609307&r1=1609306&r2=1609307&view=diff
==============================================================================
--- aries/branches/subsystemsR6/util/util-r42/pom.xml (original)
+++ aries/branches/subsystemsR6/util/util-r42/pom.xml Wed Jul 9 21:24:25 2014
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: aries/branches/subsystemsR6/util/util/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/util/util/pom.xml?rev=1609307&r1=1609306&r2=1609307&view=diff
==============================================================================
--- aries/branches/subsystemsR6/util/util/pom.xml (original)
+++ aries/branches/subsystemsR6/util/util/pom.xml Wed Jul 9 21:24:25 2014
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: aries/branches/subsystemsR6/web/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/web/pom.xml?rev=1609307&r1=1609306&r2=1609307&view=diff
==============================================================================
--- aries/branches/subsystemsR6/web/pom.xml (original)
+++ aries/branches/subsystemsR6/web/pom.xml Wed Jul 9 21:24:25 2014
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: aries/branches/subsystemsR6/web/web-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/web/web-itests/pom.xml?rev=1609307&r1=1609306&r2=1609307&view=diff
==============================================================================
--- aries/branches/subsystemsR6/web/web-itests/pom.xml (original)
+++ aries/branches/subsystemsR6/web/web-itests/pom.xml Wed Jul 9 21:24:25 2014
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: aries/branches/subsystemsR6/web/web-urlhandler/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/web/web-urlhandler/pom.xml?rev=1609307&r1=1609306&r2=1609307&view=diff
==============================================================================
--- aries/branches/subsystemsR6/web/web-urlhandler/pom.xml (original)
+++ aries/branches/subsystemsR6/web/web-urlhandler/pom.xml Wed Jul 9 21:24:25 2014
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>