Author: sergeyb
Date: Wed Dec 14 18:09:48 2011
New Revision: 1214388
URL: http://svn.apache.org/viewvc?rev=1214388&view=rev
Log:
[DOSGI-100] Remove Zookeeper wrapper bundle
Removed:
cxf/dosgi/trunk/discovery/distributed/zookeeper-wrapper/
Modified:
cxf/dosgi/trunk/discovery/distributed/pom.xml
cxf/dosgi/trunk/discovery/distributed/zookeeper-server/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/server/ManagedServiceTest.java
cxf/dosgi/trunk/distribution/multi-bundle/pom.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/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/JaxRSUtils.java
cxf/dosgi/trunk/parent/pom.xml
Modified: cxf/dosgi/trunk/discovery/distributed/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/distributed/pom.xml?rev=1214388&r1=1214387&r2=1214388&view=diff
==============================================================================
--- cxf/dosgi/trunk/discovery/distributed/pom.xml (original)
+++ cxf/dosgi/trunk/discovery/distributed/pom.xml Wed Dec 14 18:09:48 2011
@@ -36,7 +36,6 @@
</parent>
<modules>
- <module>zookeeper-wrapper</module>
<module>zookeeper-server</module>
<module>zookeeper-server-config</module>
<module>cxf-discovery</module>
Modified:
cxf/dosgi/trunk/discovery/distributed/zookeeper-server/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/server/ManagedServiceTest.java
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/distributed/zookeeper-server/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/server/ManagedServiceTest.java?rev=1214388&r1=1214387&r2=1214388&view=diff
==============================================================================
---
cxf/dosgi/trunk/discovery/distributed/zookeeper-server/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/server/ManagedServiceTest.java
(original)
+++
cxf/dosgi/trunk/discovery/distributed/zookeeper-server/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/server/ManagedServiceTest.java
Wed Dec 14 18:09:48 2011
@@ -45,7 +45,7 @@ public class ManagedServiceTest extends
ServerConfig sc = (ServerConfig)
EasyMock.getCurrentArguments()[0];
assertEquals(new File(tempDir,
"zkdata").getCanonicalFile().toString(),
sc.getDataDir());
- assertEquals(1234, sc.getClientPort());
+ assertEquals(1234, sc.getClientPortAddress().getPort());
assertEquals(2000, sc.getTickTime());
return null;
}
Modified: cxf/dosgi/trunk/distribution/multi-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/multi-bundle/pom.xml?rev=1214388&r1=1214387&r2=1214388&view=diff
==============================================================================
--- cxf/dosgi/trunk/distribution/multi-bundle/pom.xml (original)
+++ cxf/dosgi/trunk/distribution/multi-bundle/pom.xml Wed Dec 14 18:09:48 2011
@@ -285,9 +285,23 @@
<version>${log4j.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.cxf.dosgi</groupId>
-
<artifactId>cxf-dosgi-ri-discovery-distributed-zookeeper-wrapper</artifactId>
- <version>${project.version}</version>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>zookeeper</artifactId>
+ <version>${zookeeper.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.sun.jdmk</groupId>
+ <artifactId>jmxtools</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jmx</groupId>
+ <artifactId>jmxri</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.cxf.dosgi</groupId>
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=1214388&r1=1214387&r2=1214388&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
Wed Dec 14 18:09:48 2011
@@ -4,6 +4,6 @@
<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/cxf-dosgi-ri-discovery-distributed-zookeeper-wrapper-${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=1214388&r1=1214387&r2=1214388&view=diff
==============================================================================
--- cxf/dosgi/trunk/distribution/single-bundle/pom.xml (original)
+++ cxf/dosgi/trunk/distribution/single-bundle/pom.xml Wed Dec 14 18:09:48 2011
@@ -269,9 +269,23 @@
</dependency>
<dependency>
- <groupId>org.apache.cxf.dosgi</groupId>
-
<artifactId>cxf-dosgi-ri-discovery-distributed-zookeeper-wrapper</artifactId>
- <version>${project.version}</version>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>zookeeper</artifactId>
+ <version>${zookeeper.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.sun.jdmk</groupId>
+ <artifactId>jmxtools</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jmx</groupId>
+ <artifactId>jmxri</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.cxf.dosgi</groupId>
Modified:
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/JaxRSUtils.java
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/JaxRSUtils.java?rev=1214388&r1=1214387&r2=1214388&view=diff
==============================================================================
---
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/JaxRSUtils.java
(original)
+++
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/JaxRSUtils.java
Wed Dec 14 18:09:48 2011
@@ -85,7 +85,7 @@ public class JaxRSUtils {
.getBooleanProperty(sd,
org.apache.cxf.dosgi.dsw.Constants.RS_PROVIDER_EXPECTED_PROP_KEY);
try {
- ServiceReference[] refs =
callingContext.getServiceReferences(null, PROVIDERS_FILTER);
+ ServiceReference[] refs =
callingContext.getServiceReferences((String)null, PROVIDERS_FILTER);
if (refs != null) {
for (ServiceReference ref : refs) {
if (!cxfProvidersOnly
Modified: cxf/dosgi/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/parent/pom.xml?rev=1214388&r1=1214387&r2=1214388&view=diff
==============================================================================
--- cxf/dosgi/trunk/parent/pom.xml (original)
+++ cxf/dosgi/trunk/parent/pom.xml Wed Dec 14 18:09:48 2011
@@ -28,11 +28,11 @@
<felix.version>3.0.8</felix.version>
<spring.version>3.0.6.RELEASE</spring.version>
<spring.osgi.version>1.2.1</spring.osgi.version>
- <zookeeper.version>3.2.1</zookeeper.version>
+ <zookeeper.version>3.3.1</zookeeper.version>
<remote.service.admin.interfaces.version>1.0.0</remote.service.admin.interfaces.version>
- <servicemix.specs.version>1.8.0</servicemix.specs.version>
+ <servicemix.specs.version>1.9.0</servicemix.specs.version>
<servlet.version>3.0</servlet.version>
<log4j.version>1.2.15</log4j.version>
