Author: sergeyb
Date: Wed Jan 25 12:16:54 2012
New Revision: 1235722
URL: http://svn.apache.org/viewvc?rev=1235722&view=rev
Log:
Removing all the refs to the osgi compendium module
Modified:
cxf/dosgi/trunk/discovery/distributed/cxf-discovery/pom.xml
cxf/dosgi/trunk/discovery/distributed/zookeeper-server-config/pom.xml
cxf/dosgi/trunk/discovery/distributed/zookeeper-server/pom.xml
cxf/dosgi/trunk/distribution/multi-bundle/pom.xml
cxf/dosgi/trunk/distribution/single-bundle/pom.xml
cxf/dosgi/trunk/dsw/cxf-dsw/pom.xml
cxf/dosgi/trunk/systests2/common/pom.xml
cxf/dosgi/trunk/systests2/multi-bundle/pom.xml
cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestDiscoveryRountrip.java
cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestExportService.java
cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestImportService.java
cxf/dosgi/trunk/systests2/single-bundle/pom.xml
cxf/dosgi/trunk/systests2/single-bundle/src/test/java/org/apache/cxf/dosgi/systests2/single/TestDiscoveryRountrip.java
cxf/dosgi/trunk/systests2/single-bundle/src/test/java/org/apache/cxf/dosgi/systests2/single/TestExportService.java
cxf/dosgi/trunk/systests2/single-bundle/src/test/java/org/apache/cxf/dosgi/systests2/single/TestImportService.java
Modified: cxf/dosgi/trunk/discovery/distributed/cxf-discovery/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/distributed/cxf-discovery/pom.xml?rev=1235722&r1=1235721&r2=1235722&view=diff
==============================================================================
--- cxf/dosgi/trunk/discovery/distributed/cxf-discovery/pom.xml (original)
+++ cxf/dosgi/trunk/discovery/distributed/cxf-discovery/pom.xml Wed Jan 25
12:16:54 2012
@@ -39,13 +39,6 @@
<dependencies>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>${osgi.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
<version>${felix.version}</version>
Modified: cxf/dosgi/trunk/discovery/distributed/zookeeper-server-config/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/distributed/zookeeper-server-config/pom.xml?rev=1235722&r1=1235721&r2=1235722&view=diff
==============================================================================
--- cxf/dosgi/trunk/discovery/distributed/zookeeper-server-config/pom.xml
(original)
+++ cxf/dosgi/trunk/discovery/distributed/zookeeper-server-config/pom.xml Wed
Jan 25 12:16:54 2012
@@ -41,9 +41,8 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>org.osgi.enterprise</artifactId>
<version>${osgi.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
Modified: cxf/dosgi/trunk/discovery/distributed/zookeeper-server/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/distributed/zookeeper-server/pom.xml?rev=1235722&r1=1235721&r2=1235722&view=diff
==============================================================================
--- cxf/dosgi/trunk/discovery/distributed/zookeeper-server/pom.xml (original)
+++ cxf/dosgi/trunk/discovery/distributed/zookeeper-server/pom.xml Wed Jan 25
12:16:54 2012
@@ -38,11 +38,11 @@
</properties>
<dependencies>
+
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>org.osgi.enterprise</artifactId>
<version>${osgi.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
Modified: cxf/dosgi/trunk/distribution/multi-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/multi-bundle/pom.xml?rev=1235722&r1=1235721&r2=1235722&view=diff
==============================================================================
--- cxf/dosgi/trunk/distribution/multi-bundle/pom.xml (original)
+++ cxf/dosgi/trunk/distribution/multi-bundle/pom.xml Wed Jan 25 12:16:54 2012
@@ -335,24 +335,6 @@
<outputDirectory>${project.build.directory}/distribution_bundles</outputDirectory>
</configuration>
</execution>
- <execution>
- <id>copy</id>
- <phase>package</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>1.2.0</version>
- <type>jar</type>
- <outputDirectory>target/deps</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
</executions>
</plugin>
Modified: cxf/dosgi/trunk/distribution/single-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/single-bundle/pom.xml?rev=1235722&r1=1235721&r2=1235722&view=diff
==============================================================================
--- cxf/dosgi/trunk/distribution/single-bundle/pom.xml (original)
+++ cxf/dosgi/trunk/distribution/single-bundle/pom.xml Wed Jan 25 12:16:54 2012
@@ -364,31 +364,7 @@
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy</id>
- <phase>package</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>${osgi.version}</version>
- <type>jar</type>
- <outputDirectory>target/deps</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
+
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
@@ -404,18 +380,13 @@
</fileset>
<pathconvert pathsep="" property="bundle"
refid="single.bundle" />
- <fileset dir="target/deps" id="felix.dep.bundles">
- <include name="*.jar" />
- </fileset>
- <pathconvert pathsep=" file:/" property="felix.deps"
refid="felix.dep.bundles" />
-
<!-- config.properties file for Felix -->
<echo file="target/felix.config.properties.append">
org.ops4j.pax.web.session.timeout=30
org.osgi.framework.startlevel=2
felix.auto.start.2=
</echo>
- <echo message="file:/${felix.deps} file:/${bundle}"
file="target/felix.config.properties.append" append="true" />
+ <echo message="file:/${bundle}"
file="target/felix.config.properties.append" append="true" />
<replace file="target/felix.config.properties.append"
token="\" value="/" />
<!-- config.ini file for Equinox -->
Modified: cxf/dosgi/trunk/dsw/cxf-dsw/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/pom.xml?rev=1235722&r1=1235721&r2=1235722&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/pom.xml (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/pom.xml Wed Jan 25 12:16:54 2012
@@ -70,11 +70,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>${osgi.version}</version>
- </dependency>
- <dependency>
<groupId>org.jdom</groupId>
<artifactId>com.springsource.org.jdom</artifactId>
<version>1.1.0</version>
Modified: cxf/dosgi/trunk/systests2/common/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/common/pom.xml?rev=1235722&r1=1235721&r2=1235722&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests2/common/pom.xml (original)
+++ cxf/dosgi/trunk/systests2/common/pom.xml Wed Jan 25 12:16:54 2012
@@ -38,9 +38,8 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>org.osgi.enterprise</artifactId>
<version>${osgi.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.swissbox</groupId>
Modified: cxf/dosgi/trunk/systests2/multi-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/multi-bundle/pom.xml?rev=1235722&r1=1235721&r2=1235722&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests2/multi-bundle/pom.xml (original)
+++ cxf/dosgi/trunk/systests2/multi-bundle/pom.xml Wed Jan 25 12:16:54 2012
@@ -54,7 +54,7 @@
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>org.osgi.enterprise</artifactId>
<version>${osgi.version}</version>
<scope>test</scope>
</dependency>
Modified:
cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestDiscoveryRountrip.java
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestDiscoveryRountrip.java?rev=1235722&r1=1235721&r2=1235722&view=diff
==============================================================================
---
cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestDiscoveryRountrip.java
(original)
+++
cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestDiscoveryRountrip.java
Wed Jan 25 12:16:54 2012
@@ -54,7 +54,6 @@ public class TestDiscoveryRountrip exten
// This property sets the start level for equinox
opts.add(CoreOptions.systemProperty("osgi.startLevel").value("" +
startLevel));
-
opts.add(CoreOptions.mavenBundle().groupId("org.osgi").artifactId("org.osgi.compendium").versionAsInProject());
for(Map.Entry<Integer, String> entry : bundles.entrySet()) {
opts.add(CoreOptions.bundle(entry.getValue()).startLevel(entry.getKey()));
}
Modified:
cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestExportService.java
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestExportService.java?rev=1235722&r1=1235721&r2=1235722&view=diff
==============================================================================
---
cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestExportService.java
(original)
+++
cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestExportService.java
Wed Jan 25 12:16:54 2012
@@ -48,7 +48,6 @@ public class TestExportService extends A
// Run this test under Felix.
opts.add(CoreOptions.frameworks(CoreOptions.felix()));
-
opts.add(CoreOptions.mavenBundle().groupId("org.osgi").artifactId("org.osgi.compendium").versionAsInProject());
for(Map.Entry<Integer, String> entry : bundles.entrySet()) {
opts.add(CoreOptions.bundle(entry.getValue()).startLevel(entry.getKey()));
}
Modified:
cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestImportService.java
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestImportService.java?rev=1235722&r1=1235721&r2=1235722&view=diff
==============================================================================
---
cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestImportService.java
(original)
+++
cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestImportService.java
Wed Jan 25 12:16:54 2012
@@ -49,7 +49,6 @@ public class TestImportService extends A
// Run this test under Felix.
opts.add(CoreOptions.frameworks(CoreOptions.felix()));
-
opts.add(CoreOptions.mavenBundle().groupId("org.osgi").artifactId("org.osgi.compendium").versionAsInProject());
for(Map.Entry<Integer, String> entry : bundles.entrySet()) {
opts.add(CoreOptions.bundle(entry.getValue()).startLevel(entry.getKey()));
}
Modified: cxf/dosgi/trunk/systests2/single-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/single-bundle/pom.xml?rev=1235722&r1=1235721&r2=1235722&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests2/single-bundle/pom.xml (original)
+++ cxf/dosgi/trunk/systests2/single-bundle/pom.xml Wed Jan 25 12:16:54 2012
@@ -47,7 +47,7 @@
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>org.osgi.enterprise</artifactId>
<version>${osgi.version}</version>
<scope>test</scope>
</dependency>
Modified:
cxf/dosgi/trunk/systests2/single-bundle/src/test/java/org/apache/cxf/dosgi/systests2/single/TestDiscoveryRountrip.java
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/single-bundle/src/test/java/org/apache/cxf/dosgi/systests2/single/TestDiscoveryRountrip.java?rev=1235722&r1=1235721&r2=1235722&view=diff
==============================================================================
---
cxf/dosgi/trunk/systests2/single-bundle/src/test/java/org/apache/cxf/dosgi/systests2/single/TestDiscoveryRountrip.java
(original)
+++
cxf/dosgi/trunk/systests2/single-bundle/src/test/java/org/apache/cxf/dosgi/systests2/single/TestDiscoveryRountrip.java
Wed Jan 25 12:16:54 2012
@@ -45,7 +45,6 @@ public class TestDiscoveryRountrip exten
// Run this one in Felix
CoreOptions.frameworks(CoreOptions.felix()),
-
CoreOptions.mavenBundle().groupId("org.osgi").artifactId("org.osgi.compendium").versionAsInProject(),
CoreOptions.mavenBundle().groupId("org.apache.cxf.dosgi").artifactId("cxf-dosgi-ri-singlebundle-distribution").versionAsInProject(),
CoreOptions.mavenBundle().groupId("org.apache.log4j").artifactId("com.springsource.org.apache.log4j").versionAsInProject(),
Modified:
cxf/dosgi/trunk/systests2/single-bundle/src/test/java/org/apache/cxf/dosgi/systests2/single/TestExportService.java
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/single-bundle/src/test/java/org/apache/cxf/dosgi/systests2/single/TestExportService.java?rev=1235722&r1=1235721&r2=1235722&view=diff
==============================================================================
---
cxf/dosgi/trunk/systests2/single-bundle/src/test/java/org/apache/cxf/dosgi/systests2/single/TestExportService.java
(original)
+++
cxf/dosgi/trunk/systests2/single-bundle/src/test/java/org/apache/cxf/dosgi/systests2/single/TestExportService.java
Wed Jan 25 12:16:54 2012
@@ -40,7 +40,6 @@ public class TestExportService extends A
// Run this one in Felix
CoreOptions.frameworks(CoreOptions.felix()),
-
CoreOptions.mavenBundle().groupId("org.osgi").artifactId("org.osgi.compendium").versionAsInProject(),
CoreOptions.mavenBundle().groupId("org.apache.cxf.dosgi").artifactId("cxf-dosgi-ri-singlebundle-distribution").versionAsInProject(),
// The following two bundles start the greeter demo which
registers a remote service
Modified:
cxf/dosgi/trunk/systests2/single-bundle/src/test/java/org/apache/cxf/dosgi/systests2/single/TestImportService.java
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/single-bundle/src/test/java/org/apache/cxf/dosgi/systests2/single/TestImportService.java?rev=1235722&r1=1235721&r2=1235722&view=diff
==============================================================================
---
cxf/dosgi/trunk/systests2/single-bundle/src/test/java/org/apache/cxf/dosgi/systests2/single/TestImportService.java
(original)
+++
cxf/dosgi/trunk/systests2/single-bundle/src/test/java/org/apache/cxf/dosgi/systests2/single/TestImportService.java
Wed Jan 25 12:16:54 2012
@@ -39,7 +39,6 @@ public class TestImportService extends A
// Run this one in Equinox
CoreOptions.frameworks(CoreOptions.equinox()),
-
CoreOptions.mavenBundle().groupId("org.osgi").artifactId("org.osgi.compendium").versionAsInProject(),
CoreOptions.mavenBundle().groupId("org.apache.cxf.dosgi").artifactId("cxf-dosgi-ri-singlebundle-distribution").versionAsInProject(),
CoreOptions.mavenBundle().groupId("org.apache.cxf.dosgi.samples").artifactId("cxf-dosgi-ri-samples-greeter-interface").versionAsInProject(),
