Author: not
Date: Mon Nov 30 11:42:48 2009
New Revision: 885382
URL: http://svn.apache.org/viewvc?rev=885382&view=rev
Log:
ARIES-57 remove osgi interfaces from blueprint jar
Modified:
incubator/aries/trunk/blueprint/blueprint-bundle/pom.xml
incubator/aries/trunk/blueprint/blueprint-itests/pom.xml
incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerTest.java
incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestConfigAdmin.java
incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestReferences.java
Modified: incubator/aries/trunk/blueprint/blueprint-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-bundle/pom.xml?rev=885382&r1=885381&r2=885382&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-bundle/pom.xml (original)
+++ incubator/aries/trunk/blueprint/blueprint-bundle/pom.xml Mon Nov 30
11:42:48 2009
@@ -27,7 +27,7 @@
<name>Apache Aries Blueprint Bundle</name>
<description>
This bundle contains the standalone implementation along with the API.
- It's composed of the blueprint-api, blueprint-core and blueprint-cm
modules.
+ It's composed of the blueprint-core and blueprint-cm modules.
</description>
<dependencies>
@@ -75,9 +75,6 @@
*
</Import-Package>
<Export-Package>
-
=org.osgi.service.blueprint;uses:="org.osgi.service.blueprint.container,org.osgi.service.blueprint.reflect,org.apache.aries.blueprint,org.apache.aries.blueprint.ext,org.apache.aries.blueprint.mutable";version="1.0",
- org.osgi.service.blueprint.container;version="1.0",
- org.osgi.service.blueprint.reflect;version="1.0",
org.apache.aries.blueprint;version="${pom.version}",
org.apache.aries.blueprint.ext;version="${pom.version}",
org.apache.aries.blueprint.mutable;version="${pom.version}"
@@ -116,19 +113,12 @@
<configuration>
<artifactSet>
<includes>
-
<include>org.apache.aries.blueprint:aries-blueprint-api</include>
<include>org.apache.aries.blueprint:aries-blueprint-core</include>
<include>org.apache.aries.blueprint:aries-blueprint-cm</include>
</includes>
</artifactSet>
<filters>
<filter>
-
<artifact>org.apache.aries.blueprint:aries-blueprint-api</artifact>
- <excludes>
- <exclude>org/**</exclude>
- </excludes>
- </filter>
- <filter>
<artifact>org.apache.aries.blueprint:aries-blueprint-core</artifact>
<excludes>
<exclude>org/**</exclude>
@@ -173,11 +163,6 @@
<artifactItems>
<artifactItem>
<groupId>org.apache.aries.blueprint</groupId>
-
<artifactId>aries-blueprint-api</artifactId>
- <classifier>sources</classifier>
- </artifactItem>
- <artifactItem>
-
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>aries-blueprint-core</artifactId>
<classifier>sources</classifier>
</artifactItem>
Modified: incubator/aries/trunk/blueprint/blueprint-itests/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-itests/pom.xml?rev=885382&r1=885381&r2=885382&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-itests/pom.xml (original)
+++ incubator/aries/trunk/blueprint/blueprint-itests/pom.xml Mon Nov 30
11:42:48 2009
@@ -101,6 +101,11 @@
<artifactId>osgi</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
Modified:
incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerTest.java
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerTest.java?rev=885382&r1=885381&r2=885382&view=diff
==============================================================================
---
incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerTest.java
(original)
+++
incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerTest.java
Mon Nov 30 11:42:48 2009
@@ -127,7 +127,7 @@
// Bundles
mavenBundle("org.apache.aries.blueprint", "aries-blueprint"),
mavenBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.sample").noStart(),
-
+ mavenBundle("org.osgi", "org.osgi.compendium"),
//
org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption("-Xdebug
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"),
equinox().version("3.5.0")
Modified:
incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestConfigAdmin.java
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestConfigAdmin.java?rev=885382&r1=885381&r2=885382&view=diff
==============================================================================
---
incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestConfigAdmin.java
(original)
+++
incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestConfigAdmin.java
Mon Nov 30 11:42:48 2009
@@ -184,7 +184,7 @@
// Bundles
mavenBundle("org.apache.aries.blueprint", "aries-blueprint"),
mavenBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.sample").noStart(),
-
+ mavenBundle("org.osgi","org.osgi.compendium"),
//
org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption("-Xdebug
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"),
equinox().version("3.5.0")
@@ -193,4 +193,4 @@
return options;
}
-}
\ No newline at end of file
+}
Modified:
incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestReferences.java
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestReferences.java?rev=885382&r1=885381&r2=885382&view=diff
==============================================================================
---
incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestReferences.java
(original)
+++
incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestReferences.java
Mon Nov 30 11:42:48 2009
@@ -146,6 +146,7 @@
// Bundles
mavenBundle("org.apache.aries.blueprint", "aries-blueprint"),
mavenBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.sample"),
+ mavenBundle("org.osgi", "org.osgi.compendium"),
//
org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption("-Xdebug
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"),
@@ -155,4 +156,4 @@
return options;
}
-}
\ No newline at end of file
+}
