You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by da...@apache.org on 2009/11/25 11:46:56 UTC
svn commit: r884025 - in /cxf/dosgi/trunk/distribution: ./ single-bundle/
single-bundle/src/main/resources/org/apache/cxf/dosgi/singlebundle/
single-bundle/src/test/java/org/apache/cxf/dosgi/singlebundle/
Author: davidb
Date: Wed Nov 25 10:46:39 2009
New Revision: 884025
URL: http://svn.apache.org/viewvc?rev=884025&view=rev
Log:
Merging the discovery single bundle distro into the pre-existing single bundle distro.
Modified:
cxf/dosgi/trunk/distribution/pom.xml
cxf/dosgi/trunk/distribution/single-bundle/pom.xml
cxf/dosgi/trunk/distribution/single-bundle/src/main/resources/org/apache/cxf/dosgi/singlebundle/activators.list
cxf/dosgi/trunk/distribution/single-bundle/src/test/java/org/apache/cxf/dosgi/singlebundle/AggregatedActivatorTest.java
Modified: cxf/dosgi/trunk/distribution/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/pom.xml?rev=884025&r1=884024&r2=884025&view=diff
==============================================================================
--- cxf/dosgi/trunk/distribution/pom.xml (original)
+++ cxf/dosgi/trunk/distribution/pom.xml Wed Nov 25 10:46:39 2009
@@ -40,7 +40,6 @@
<modules>
<module>multi-bundle</module>
<module>single-bundle</module>
- <module>discovery-single-bundle</module>
<module>discovery-multi-bundle</module>
<module>sources</module>
</modules>
Modified: cxf/dosgi/trunk/distribution/single-bundle/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/single-bundle/pom.xml?rev=884025&r1=884024&r2=884025&view=diff
==============================================================================
--- cxf/dosgi/trunk/distribution/single-bundle/pom.xml (original)
+++ cxf/dosgi/trunk/distribution/single-bundle/pom.xml Wed Nov 25 10:46:39 2009
@@ -183,6 +183,23 @@
</dependency>
<dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.configadmin</artifactId>
+ <version>1.0.10</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.fileinstall</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.log4j</groupId>
+ <artifactId>com.springsource.org.apache.log4j</artifactId>
+ <version>${log4j.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-bundle-minimal</artifactId>
<version>${cxf.version}</version>
@@ -197,6 +214,18 @@
<artifactId>cxf-dosgi-ri-dsw-cxf</artifactId>
<version>${project.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.cxf.dosgi</groupId>
+ <artifactId>cxf-dosgi-ri-discovery-distributed-zookeeper-wrapper</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf.dosgi</groupId>
+ <artifactId>cxf-dosgi-ri-discovery-distributed</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Modified: cxf/dosgi/trunk/distribution/single-bundle/src/main/resources/org/apache/cxf/dosgi/singlebundle/activators.list
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/single-bundle/src/main/resources/org/apache/cxf/dosgi/singlebundle/activators.list?rev=884025&r1=884024&r2=884025&view=diff
==============================================================================
--- cxf/dosgi/trunk/distribution/single-bundle/src/main/resources/org/apache/cxf/dosgi/singlebundle/activators.list (original)
+++ cxf/dosgi/trunk/distribution/single-bundle/src/main/resources/org/apache/cxf/dosgi/singlebundle/activators.list Wed Nov 25 10:46:39 2009
@@ -1,4 +1,7 @@
+org.apache.felix.cm.impl.ConfigurationManager
+org.apache.felix.fileinstall.FileInstall
org.ops4j.pax.web.service.internal.Activator
org.apache.cxf.dosgi.discovery.local.Activator
org.apache.cxf.dosgi.dsw.Activator
+org.apache.cxf.dosgi.discovery.zookeeper.Activator
org.springframework.osgi.extender.internal.activator.ContextLoaderListener
Modified: cxf/dosgi/trunk/distribution/single-bundle/src/test/java/org/apache/cxf/dosgi/singlebundle/AggregatedActivatorTest.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/single-bundle/src/test/java/org/apache/cxf/dosgi/singlebundle/AggregatedActivatorTest.java?rev=884025&r1=884024&r2=884025&view=diff
==============================================================================
--- cxf/dosgi/trunk/distribution/single-bundle/src/test/java/org/apache/cxf/dosgi/singlebundle/AggregatedActivatorTest.java (original)
+++ cxf/dosgi/trunk/distribution/single-bundle/src/test/java/org/apache/cxf/dosgi/singlebundle/AggregatedActivatorTest.java Wed Nov 25 10:46:39 2009
@@ -41,9 +41,12 @@
public void testReadResourcesFile() throws Exception {
String[] expected = {
+ "org.apache.felix.cm.impl.ConfigurationManager",
+ "org.apache.felix.fileinstall.FileInstall",
"org.ops4j.pax.web.service.internal.Activator",
"org.apache.cxf.dosgi.discovery.local.Activator",
"org.apache.cxf.dosgi.dsw.Activator",
+ "org.apache.cxf.dosgi.discovery.zookeeper.Activator",
"org.springframework.osgi.extender.internal.activator.ContextLoaderListener"};
AggregatedActivator aa = new AggregatedActivator();