Author: sergeyb
Date: Fri Dec 16 23:46:50 2011
New Revision: 1215348
URL: http://svn.apache.org/viewvc?rev=1215348&view=rev
Log:
[DOSGI-104] Remove the local copy of osgi.enterprise interfaces
Removed:
cxf/dosgi/trunk/dsw/cxf-osgi-remote-service-admin-interfaces/
Modified:
cxf/dosgi/trunk/distribution/multi-bundle/pom.xml
cxf/dosgi/trunk/distribution/multi-bundle/src/main/resources/distro_bundles.xml
cxf/dosgi/trunk/distribution/multi-bundle/src/main/resources/distro_discovery_bundles.xml
cxf/dosgi/trunk/distribution/single-bundle/pom.xml
cxf/dosgi/trunk/dsw/pom.xml
Modified: cxf/dosgi/trunk/distribution/multi-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/multi-bundle/pom.xml?rev=1215348&r1=1215347&r2=1215348&view=diff
==============================================================================
--- cxf/dosgi/trunk/distribution/multi-bundle/pom.xml (original)
+++ cxf/dosgi/trunk/distribution/multi-bundle/pom.xml Fri Dec 16 23:46:50 2011
@@ -68,6 +68,11 @@
<artifactId>com.springsource.org.apache.commons.logging</artifactId>
<version>1.1.1</version>
</dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.enterprise</artifactId>
+ <version>${osgi.version}</version>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>com.springsource.slf4j.api</artifactId>
@@ -248,11 +253,6 @@
</dependency>
<dependency>
<groupId>org.apache.cxf.dosgi</groupId>
- <artifactId>cxf-dosgi-remote-service-admin-interfaces</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf.dosgi</groupId>
<artifactId>cxf-dosgi-ri-discovery-local</artifactId>
<version>${project.version}</version>
</dependency>
Modified:
cxf/dosgi/trunk/distribution/multi-bundle/src/main/resources/distro_bundles.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/multi-bundle/src/main/resources/distro_bundles.xml?rev=1215348&r1=1215347&r2=1215348&view=diff
==============================================================================
---
cxf/dosgi/trunk/distribution/multi-bundle/src/main/resources/distro_bundles.xml
(original)
+++
cxf/dosgi/trunk/distribution/multi-bundle/src/main/resources/distro_bundles.xml
Fri Dec 16 23:46:50 2011
@@ -42,8 +42,8 @@
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.bundles.opensaml-2.4.1_1.jar</bundle>
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/cxf-bundle-minimal-${cxf.version}.jar</bundle>
-
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/cxf-dosgi-remote-service-admin-interfaces-${project.version}.jar</bundle>
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/cxf-dosgi-ri-discovery-local-${project.version}.jar</bundle>
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/cxf-dosgi-ri-dsw-cxf-${project.version}.jar</bundle>
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/cxf-dosgi-ri-topology-manager-${project.version}.jar</bundle>
+
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.osgi.enterprise-${osgi.version}.jar</bundle>
</bundles>
Modified:
cxf/dosgi/trunk/distribution/multi-bundle/src/main/resources/distro_discovery_bundles.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/multi-bundle/src/main/resources/distro_discovery_bundles.xml?rev=1215348&r1=1215347&r2=1215348&view=diff
==============================================================================
---
cxf/dosgi/trunk/distribution/multi-bundle/src/main/resources/distro_discovery_bundles.xml
(original)
+++
cxf/dosgi/trunk/distribution/multi-bundle/src/main/resources/distro_discovery_bundles.xml
Fri Dec 16 23:46:50 2011
@@ -3,7 +3,6 @@
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.felix.configadmin-1.2.8.jar</bundle>
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.felix.fileinstall-3.1.10.jar</bundle>
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/com.springsource.org.apache.log4j-${log4j.version}.jar</bundle>
-
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/cxf-dosgi-remote-service-admin-interfaces-${project.version}.jar</bundle>
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/zookeeper-${zookeeper.version}.jar</bundle>
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/cxf-dosgi-ri-discovery-distributed-${project.version}.jar</bundle>
</bundles>
Modified: cxf/dosgi/trunk/distribution/single-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/single-bundle/pom.xml?rev=1215348&r1=1215347&r2=1215348&view=diff
==============================================================================
--- cxf/dosgi/trunk/distribution/single-bundle/pom.xml (original)
+++ cxf/dosgi/trunk/distribution/single-bundle/pom.xml Fri Dec 16 23:46:50 2011
@@ -254,11 +254,6 @@
<dependency>
<groupId>org.apache.cxf.dosgi</groupId>
- <artifactId>cxf-dosgi-remote-service-admin-interfaces</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf.dosgi</groupId>
<artifactId>cxf-dosgi-ri-discovery-local</artifactId>
<version>${project.version}</version>
</dependency>
@@ -292,7 +287,13 @@
<artifactId>cxf-dosgi-ri-discovery-distributed</artifactId>
<version>${project.version}</version>
</dependency>
-
+
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.enterprise</artifactId>
+ <version>${osgi.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.cxf.dosgi</groupId>
<artifactId>cxf-dosgi-ri-topology-manager</artifactId>
Modified: cxf/dosgi/trunk/dsw/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/pom.xml?rev=1215348&r1=1215347&r2=1215348&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/pom.xml (original)
+++ cxf/dosgi/trunk/dsw/pom.xml Fri Dec 16 23:46:50 2011
@@ -23,6 +23,5 @@
<modules>
<module>cxf-dsw</module>
<module>cxf-topology-manager</module>
- <module>cxf-osgi-remote-service-admin-interfaces</module>
</modules>
</project>
