You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by cs...@apache.org on 2012/11/14 22:53:29 UTC
svn commit: r1409451 [1/2] - in /cxf/dosgi/trunk: distribution/multi-bundle/
distribution/multi-bundle/src/main/resources/ distribution/single-bundle/
dsw/cxf-dsw/ dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/
dsw/cxf-dsw/src/main/java/o...
Author: cschneider
Date: Wed Nov 14 21:53:25 2012
New Revision: 1409451
URL: http://svn.apache.org/viewvc?rev=1409451&view=rev
Log:
DOSGI-142 Upgrade to CXF 2.7.0, fix for problems when service could not be generated
Added:
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/qos/DefaultIntentMapFactory.java (with props)
cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/qos/
cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/qos/IntentUtilsTest.java (with props)
cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test1/GreeterDataImpl.java (with props)
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/single-bundle/ (props changed)
cxf/dosgi/trunk/distribution/single-bundle/pom.xml
cxf/dosgi/trunk/dsw/cxf-dsw/pom.xml
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/AbstractPojoConfigurationTypeHandler.java
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/ExportResult.java
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/HttpServiceConfigurationTypeHandler.java
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/JaxRSHttpServiceConfigurationTypeHandler.java
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/JaxRSPojoConfigurationTypeHandler.java
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/JaxRSUtils.java
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/PojoConfigurationTypeHandler.java
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/WsdlConfigurationTypeHandler.java
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/qos/IntentUtils.java
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/RemoteServiceAdminCore.java
cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/ActivatorTest.java
cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/handlers/HttpServiceConfigurationTypeHandlerTest.java
cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/handlers/JaxRSUtilsTest.java
cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/handlers/PojoConfigurationTypeHandlerTest.java
cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/util/OsgiUtilsTest.java
cxf/dosgi/trunk/parent/pom.xml
cxf/dosgi/trunk/samples/security_filter/ (props changed)
cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/AbstractTestImportService.java
cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test1/MyServiceTracker.java
cxf/dosgi/trunk/systests2/multi-bundle/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=1409451&r1=1409450&r2=1409451&view=diff
==============================================================================
--- cxf/dosgi/trunk/distribution/multi-bundle/pom.xml (original)
+++ cxf/dosgi/trunk/distribution/multi-bundle/pom.xml Wed Nov 14 21:53:25 2012
@@ -51,7 +51,12 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-javamail_1.4_spec</artifactId>
- <version>1.2</version>
+ <version>1.7.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jpa_2.0_spec</artifactId>
+ <version>1.1</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -73,11 +78,6 @@
<artifactId>commons-lang</artifactId>
<version>2.6</version>
</dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.enterprise</artifactId>
- <version>${osgi.version}</version>
- </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
@@ -86,7 +86,6 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jcl</artifactId>
</dependency>
-
<dependency>
<groupId>org.jdom</groupId>
<artifactId>com.springsource.org.jdom</artifactId>
@@ -143,11 +142,6 @@
<version>${spring.osgi.version}</version>
</dependency>
<dependency>
- <groupId>org.eclipse.jetty.aggregate</groupId>
- <artifactId>jetty-all-server</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
<groupId>org.ops4j.pax.web</groupId>
<artifactId>pax-web-spi</artifactId>
<version>${pax.web.version}</version>
@@ -158,6 +152,11 @@
<version>${pax.web.version}</version>
</dependency>
<dependency>
+ <groupId>org.eclipse.jetty.aggregate</groupId>
+ <artifactId>jetty-all-server</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.ops4j.pax.web</groupId>
<artifactId>pax-web-jetty</artifactId>
<version>${pax.web.version}</version>
@@ -174,17 +173,17 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.jaxb-api-2.1</artifactId>
+ <artifactId>org.apache.servicemix.specs.jaxb-api-2.2</artifactId>
<version>${servicemix.specs.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.jaxws-api-2.1</artifactId>
+ <artifactId>org.apache.servicemix.specs.jaxws-api-2.2</artifactId>
<version>${servicemix.specs.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.jsr311-api-1.1.1</artifactId>
+ <artifactId>org.apache.servicemix.specs.jsr339-api-m10</artifactId>
<version>${servicemix.specs.version}</version>
</dependency>
<dependency>
@@ -223,6 +222,11 @@
<artifactId>org.apache.servicemix.bundles.asm</artifactId>
<version>${asm.bundle.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.commons-pool</artifactId>
+ <version>${commons.pool.bundle.version}</version>
+ </dependency>
<dependency>
<groupId>org.codehaus.woodstox</groupId>
@@ -234,11 +238,7 @@
<artifactId>woodstox-core-asl</artifactId>
<version>${woodstox.bundle.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.commons-pool</artifactId>
- <version>${commons.pool.bundle.version}</version>
- </dependency>
+
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.joda-time</artifactId>
@@ -249,11 +249,94 @@
<artifactId>org.apache.servicemix.bundles.opensaml</artifactId>
<version>2.4.1_1</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>org.apache.aries.util</artifactId>
+ <version>0.3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.proxy</groupId>
+ <artifactId>org.apache.aries.proxy</artifactId>
+ <version>0.3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.blueprint</groupId>
+ <artifactId>org.apache.aries.blueprint</artifactId>
+ <version>0.3.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-api</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-core</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-simple</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxws</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-bindings-xml</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-bindings-soap</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-databinding-jaxb</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-databinding-aegis</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-ws-policy</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-http</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-http-jetty</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-extension-providers</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-bundle-minimal</artifactId>
+ <artifactId>cxf-bundle-compatible</artifactId>
<version>${cxf.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.cxf.dosgi</groupId>
<artifactId>cxf-dosgi-ri-discovery-local</artifactId>
@@ -312,6 +395,11 @@
<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-discovery-distributed-zookeeper-server</artifactId>
<version>${project.version}</version>
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=1409451&r1=1409450&r2=1409451&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 Wed Nov 14 21:53:25 2012
@@ -2,7 +2,8 @@
<bundles>
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/geronimo-annotation_1.0_spec-1.1.1.jar</bundle>
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/geronimo-activation_1.1_spec-1.1.jar</bundle>
- <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/geronimo-javamail_1.4_spec-1.2.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/geronimo-jpa_2.0_spec-1.1.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/geronimo-javamail_1.4_spec-1.7.1.jar</bundle>
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/geronimo-servlet_3.0_spec-1.0.jar</bundle>
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/geronimo-ws-metadata_2.0_spec-1.1.3.jar</bundle>
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/com.springsource.org.apache.commons.logging-1.1.1.jar</bundle>
@@ -36,12 +37,31 @@
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.bundles.commons-pool-${commons.pool.bundle.version}.jar</bundle>
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.specs.saaj-api-1.3-${servicemix.specs.version}.jar</bundle>
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.specs.stax-api-1.0-${servicemix.specs.version}.jar</bundle>
- <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.specs.jaxb-api-2.1-${servicemix.specs.version}.jar</bundle>
- <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.specs.jaxws-api-2.1-${servicemix.specs.version}.jar</bundle>
- <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.specs.jsr311-api-1.1.1-${servicemix.specs.version}.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.specs.jaxb-api-2.2-${servicemix.specs.version}.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.specs.jaxws-api-2.2-${servicemix.specs.version}.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.specs.jsr339-api-m10-${servicemix.specs.version}.jar</bundle>
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.bundles.joda-time-1.5.2_4.jar</bundle>
<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/org.apache.aries.util-0.3.1.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.aries.proxy-0.3.1.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.aries.blueprint-0.3.2.jar</bundle>
+
+ <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/cxf-api-${cxf.version}.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/cxf-rt-core-${cxf.version}.jar</bundle>
+
+ <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/cxf-rt-frontend-simple-${cxf.version}.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/cxf-rt-frontend-jaxws-${cxf.version}.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/cxf-rt-frontend-jaxrs-${cxf.version}.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/cxf-rt-databinding-jaxb-${cxf.version}.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/cxf-rt-databinding-aegis-${cxf.version}.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/cxf-rt-bindings-xml-${cxf.version}.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/cxf-rt-bindings-soap-${cxf.version}.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/cxf-rt-transports-http-${cxf.version}.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/cxf-rt-transports-http-jetty-${cxf.version}.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/cxf-rt-ws-policy-${cxf.version}.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/cxf-rt-rs-extension-providers-${cxf.version}.jar</bundle>
+
+ <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/cxf-bundle-compatible-${cxf.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/org.osgi.enterprise-${osgi.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>
Propchange: cxf/dosgi/trunk/distribution/single-bundle/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Nov 14 21:53:25 2012
@@ -6,3 +6,5 @@ target
.project
+
+.classpath
Modified: cxf/dosgi/trunk/distribution/single-bundle/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/single-bundle/pom.xml?rev=1409451&r1=1409450&r2=1409451&view=diff
==============================================================================
--- cxf/dosgi/trunk/distribution/single-bundle/pom.xml (original)
+++ cxf/dosgi/trunk/distribution/single-bundle/pom.xml Wed Nov 14 21:53:25 2012
@@ -37,8 +37,8 @@
<properties>
<topDirectoryLocation>../..</topDirectoryLocation>
</properties>
-
- <dependencies>
+
+ <dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.0_spec</artifactId>
@@ -208,7 +208,6 @@
<artifactId>org.apache.servicemix.bundles.asm</artifactId>
<version>${asm.bundle.version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.commons-pool</artifactId>
@@ -220,7 +219,6 @@
<artifactId>stax2-api</artifactId>
<version>3.1.1</version>
</dependency>
-
<dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>woodstox-core-asl</artifactId>
@@ -264,7 +262,11 @@
<artifactId>cxf-dosgi-ri-dsw-cxf</artifactId>
<version>${project.version}</version>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.cxf.dosgi</groupId>
+ <artifactId>cxf-dosgi-ri-topology-manager</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
@@ -289,18 +291,11 @@
<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>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>junit</groupId>
Modified: cxf/dosgi/trunk/dsw/cxf-dsw/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/pom.xml?rev=1409451&r1=1409450&r2=1409451&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/pom.xml (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/pom.xml Wed Nov 14 21:53:25 2012
@@ -43,40 +43,63 @@
org.apache.cxf.dosgi.*;version="${project.version}"
</bundle.export.package>
</properties>
-
+
<dependencies>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.enterprise</artifactId>
- <version>${osgi.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-bundle-minimal</artifactId>
+ <artifactId>cxf-rt-core</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxws</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-databinding-aegis</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-extension-providers</artifactId>
<version>${cxf.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.framework</artifactId>
- <version>${felix.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.foundation</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jdom</groupId>
- <artifactId>com.springsource.org.jdom</artifactId>
- <version>1.1.0</version>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_${servlet.version}_spec</artifactId>
+ <version>1.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jdom</groupId>
+ <artifactId>com.springsource.org.jdom</artifactId>
+ <version>1.1.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymockclassextension</artifactId>
@@ -86,13 +109,29 @@
<groupId>org.springframework.osgi</groupId>
<artifactId>spring-osgi-core</artifactId>
<version>${spring.osgi.version}</version>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>${spring.version}</version>
- </dependency>
- </dependencies>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+
+ </dependencies>
<build>
<plugins>
@@ -102,8 +141,11 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Bundle-Name>CXF dOSGi Remote Service Admin Implementation</Bundle-Name>
- <Bundle-Description>This bundle contains the implementation required by the CXF Distributed Software Bundle</Bundle-Description>
+ <Bundle-Name>CXF dOSGi Remote Service Admin
+ Implementation</Bundle-Name>
+ <Bundle-Description>This bundle contains the
+ implementation required by the CXF
+ Distributed Software Bundle</Bundle-Description>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
<Import-Package>${bundle.import.package}</Import-Package>
@@ -112,7 +154,7 @@
<Spring-Context>META-INF/spring/*.xml;create-asynchrously:=false</Spring-Context>
</instructions>
</configuration>
- </plugin>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -124,5 +166,5 @@
</configuration>
</plugin>
</plugins>
- </build>
+ </build>
</project>
Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/AbstractPojoConfigurationTypeHandler.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/AbstractPojoConfigurationTypeHandler.java?rev=1409451&r1=1409450&r2=1409451&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/AbstractPojoConfigurationTypeHandler.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/AbstractPojoConfigurationTypeHandler.java Wed Nov 14 21:53:25 2012
@@ -40,6 +40,7 @@ import org.apache.cxf.dosgi.dsw.util.Cla
import org.apache.cxf.dosgi.dsw.util.OsgiUtils;
import org.apache.cxf.endpoint.AbstractEndpointFactory;
import org.apache.cxf.feature.AbstractFeature;
+import org.apache.cxf.feature.Feature;
import org.apache.cxf.frontend.ClientFactoryBean;
import org.apache.cxf.frontend.ClientProxyFactoryBean;
import org.apache.cxf.frontend.ServerFactoryBean;
@@ -84,7 +85,7 @@ public abstract class AbstractPojoConfig
String [] applyIntents(BundleContext dswContext,
BundleContext callingContext,
- List<AbstractFeature> features,
+ List<Feature> features,
AbstractEndpointFactory factory,
Map sd) throws IntentUnsatifiedException {
String[] requestedIntents = getRequestedIntents(sd);
@@ -242,7 +243,7 @@ public abstract class AbstractPojoConfig
}
private boolean processIntent(Set<String> appliedIntents,
- List<AbstractFeature> features,
+ List<Feature> features,
AbstractEndpointFactory factory, String intentName,
IntentMap intentMap) throws IntentUnsatifiedException {
boolean rc = processIntent(features, factory, intentName, intentMap);
@@ -250,7 +251,7 @@ public abstract class AbstractPojoConfig
return rc;
}
- private boolean processIntent(List<AbstractFeature> features,
+ private boolean processIntent(List<Feature> features,
AbstractEndpointFactory factory, String intentName,
IntentMap intentMap) throws IntentUnsatifiedException {
Object intent = intentMap.get(intentName);
@@ -258,8 +259,8 @@ public abstract class AbstractPojoConfig
if (PROVIDED_INTENT_VALUE.equalsIgnoreCase((String) intent)) {
return false;
}
- } else if (intent instanceof AbstractFeature) {
- AbstractFeature feature = (AbstractFeature)intent;
+ } else if (intent instanceof Feature) {
+ Feature feature = (Feature)intent;
LOG.info("Applying intent: " + intentName
+ " via feature: " + feature);
features.add(feature);
Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/ExportResult.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/ExportResult.java?rev=1409451&r1=1409450&r2=1409451&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/ExportResult.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/ExportResult.java Wed Nov 14 21:53:25 2012
@@ -25,11 +25,20 @@ import org.apache.cxf.endpoint.Server;
public class ExportResult {
private final Map<String, Object> endpointProps;
private final Server server;
+ private final Exception exception;
public ExportResult(Map<String, Object> endpointProps, Server server) {
super();
this.endpointProps = endpointProps;
this.server = server;
+ this.exception = null;
+ }
+
+ public ExportResult(Map<String, Object> endpointProps, Exception ex) {
+ super();
+ this.endpointProps = endpointProps;
+ this.server = null;
+ this.exception = ex;
}
public Map<String, Object> getEndpointProps() {
@@ -39,5 +48,10 @@ public class ExportResult {
public Server getServer() {
return server;
}
+
+ public Exception getException() {
+ return exception;
+ }
+
}
Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/HttpServiceConfigurationTypeHandler.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/HttpServiceConfigurationTypeHandler.java?rev=1409451&r1=1409450&r2=1409451&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/HttpServiceConfigurationTypeHandler.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/HttpServiceConfigurationTypeHandler.java Wed Nov 14 21:53:25 2012
@@ -27,7 +27,6 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.CopyOnWriteArraySet;
-import org.apache.commons.lang.StringUtils;
import org.apache.cxf.Bus;
import org.apache.cxf.aegis.databinding.AegisDatabinding;
import org.apache.cxf.databinding.DataBinding;
@@ -161,18 +160,19 @@ public class HttpServiceConfigurationTyp
constructAddress(dswContext, contextRoot, relativeEndpointAddress);
ClassLoader oldClassLoader = Thread.currentThread().getContextClassLoader();
- try {
- String[] intents = applyIntents(dswContext, callingContext, factory.getFeatures(), factory, sd);
+ String[] intents = applyIntents(dswContext, callingContext, factory.getFeatures(), factory, sd);
- // The properties for the EndpointDescription
- Map<String, Object> endpointProps = createEndpointProps(sd, iClass, new String[] {
- Constants.WS_CONFIG_TYPE
- }, completeEndpointAddress, intents);
+ // The properties for the EndpointDescription
+ Map<String, Object> endpointProps = createEndpointProps(sd, iClass, new String[] {
+ Constants.WS_CONFIG_TYPE
+ }, completeEndpointAddress, intents);
+ try {
Thread.currentThread().setContextClassLoader(ServerFactoryBean.class.getClassLoader());
Server server = factory.create();
-
return new ExportResult(endpointProps, server);
+ } catch (Exception ex) {
+ return new ExportResult(endpointProps, ex);
} finally {
Thread.currentThread().setContextClassLoader(oldClassLoader);
}
@@ -216,13 +216,17 @@ public class HttpServiceConfigurationTyp
}
String address = getAddress(https ? "https" : "http", hostName, port, contextRoot);
- if (!StringUtils.isEmpty(relativeEndpointAddress)
+ if (!isEmpty(relativeEndpointAddress)
&& !relativeEndpointAddress.equals("/")) {
address += relativeEndpointAddress;
}
return address;
}
+ private boolean isEmpty(String relativeEndpointAddress) {
+ return relativeEndpointAddress == null || "".equals(relativeEndpointAddress);
+ }
+
protected HttpService getHttpService() {
for (ServiceReference sr : httpServiceReferences) {
Object svc = bundleContext.getService(sr);
Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/JaxRSHttpServiceConfigurationTypeHandler.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/JaxRSHttpServiceConfigurationTypeHandler.java?rev=1409451&r1=1409450&r2=1409451&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/JaxRSHttpServiceConfigurationTypeHandler.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/JaxRSHttpServiceConfigurationTypeHandler.java Wed Nov 14 21:53:25 2012
@@ -84,19 +84,19 @@ public class JaxRSHttpServiceConfigurati
String completeEndpointAddress =
constructAddress(dswContext, contextRoot, relativeEndpointAddress);
- ClassLoader oldClassLoader = Thread.currentThread().getContextClassLoader();
+ String[] intents = new String[] { "HTTP" };
+
+ // The properties for the EndpointDescription
+ Map<String, Object> endpointProps = createEndpointProps(sd, iClass, new String[] { Constants.RS_CONFIG_TYPE },
+ completeEndpointAddress, intents);
+
+ ClassLoader oldClassLoader = Thread.currentThread().getContextClassLoader();
try {
- String[] intents = new String[] {
- "HTTP"
- };
-
- // The properties for the EndpointDescription
- Map<String, Object> endpointProps = createEndpointProps(sd, iClass, new String[] {
- Constants.RS_CONFIG_TYPE
- }, completeEndpointAddress, intents);
Thread.currentThread().setContextClassLoader(JAXRSServerFactoryBean.class.getClassLoader());
Server server = factory.create();
return new ExportResult(endpointProps, server);
+ } catch (Exception e) {
+ return new ExportResult(endpointProps, e);
} finally {
Thread.currentThread().setContextClassLoader(oldClassLoader);
}
Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/JaxRSPojoConfigurationTypeHandler.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/JaxRSPojoConfigurationTypeHandler.java?rev=1409451&r1=1409450&r2=1409451&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/JaxRSPojoConfigurationTypeHandler.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/JaxRSPojoConfigurationTypeHandler.java Wed Nov 14 21:53:25 2012
@@ -151,27 +151,22 @@ public class JaxRSPojoConfigurationTypeH
}
ClassLoader oldClassLoader = Thread.currentThread().getContextClassLoader();
- try {
- String[] intents = new String[] {
- "HTTP"
- };
-
- // The properties for the EndpointDescription
- Map<String, Object> endpointProps = createEndpointProps(sd, iClass, new String[] {
- Constants.RS_CONFIG_TYPE
- }, address,intents);
- EndpointDescription endpdDesc = null;
+ String[] intents = new String[] { "HTTP" };
+
+ // The properties for the EndpointDescription
+ Map<String, Object> endpointProps = createEndpointProps(sd, iClass, new String[] { Constants.RS_CONFIG_TYPE },
+ address, intents);
+ try {
Thread.currentThread().setContextClassLoader(JAXRSServerFactoryBean.class.getClassLoader());
Server server = factory.create();
-
- // add the information on the new Endpoint to the export registration
return new ExportResult(endpointProps, server);
+ } catch (Exception e) {
+ return new ExportResult(endpointProps, e);
} finally {
Thread.currentThread().setContextClassLoader(oldClassLoader);
}
-
}
protected String getPojoAddress(EndpointDescription sd, Class<?> iClass) {
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=1409451&r1=1409450&r2=1409451&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 Nov 14 21:53:25 2012
@@ -28,7 +28,7 @@ import java.util.Map;
import org.apache.cxf.dosgi.dsw.util.ClassUtils;
import org.apache.cxf.dosgi.dsw.util.OsgiUtils;
import org.apache.cxf.jaxrs.model.UserResource;
-import org.apache.cxf.jaxrs.provider.AegisElementProvider;
+import org.apache.cxf.jaxrs.provider.aegis.AegisElementProvider;
import org.apache.cxf.jaxrs.utils.ResourceUtils;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/PojoConfigurationTypeHandler.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/PojoConfigurationTypeHandler.java?rev=1409451&r1=1409450&r2=1409451&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/PojoConfigurationTypeHandler.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/PojoConfigurationTypeHandler.java Wed Nov 14 21:53:25 2012
@@ -115,16 +115,17 @@ public class PojoConfigurationTypeHandle
addWsInterceptorsFeaturesProps(factory, callingContext, sd);
setWsdlProperties(factory, callingContext, sd, false);
ClassLoader oldClassLoader = Thread.currentThread().getContextClassLoader();
- try {
- String[] intents = applyIntents(dswContext, callingContext, factory.getFeatures(), factory, sd);
+ String[] intents = applyIntents(dswContext, callingContext, factory.getFeatures(), factory, sd);
- // The properties for the EndpointDescription
- Map<String, Object> endpointProps = createEndpointProps(sd, iClass, new String[]{Constants.WS_CONFIG_TYPE}, address,intents);
-
+ // The properties for the EndpointDescription
+ Map<String, Object> endpointProps = createEndpointProps(sd, iClass, new String[]{Constants.WS_CONFIG_TYPE}, address,intents);
+
+ try {
Thread.currentThread().setContextClassLoader(ServerFactoryBean.class.getClassLoader());
Server server = factory.create();
-
- return new ExportResult(endpointProps, server);
+ return new ExportResult(endpointProps, server);
+ } catch (Exception e) {
+ return new ExportResult(endpointProps, e);
} finally {
Thread.currentThread().setContextClassLoader(oldClassLoader);
}
Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/WsdlConfigurationTypeHandler.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/WsdlConfigurationTypeHandler.java?rev=1409451&r1=1409450&r2=1409451&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/WsdlConfigurationTypeHandler.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/WsdlConfigurationTypeHandler.java Wed Nov 14 21:53:25 2012
@@ -151,17 +151,18 @@ public class WsdlConfigurationTypeHandle
factory.setBus(bus);
}
+ String[] intents = applyIntents(dswContext, callingContext, factory.getFeatures(), factory, sd);
+
+ // The properties for the EndpointDescription
+ Map<String, Object> endpointProps = createEndpointProps(sd, iClass, new String[]{Constants.WS_CONFIG_TYPE}, address,intents);
+
ClassLoader oldClassLoader = Thread.currentThread().getContextClassLoader();
try {
- String[] intents = applyIntents(dswContext, callingContext, factory.getFeatures(), factory, sd);
-
- // The properties for the EndpointDescription
- Map<String, Object> endpointProps = createEndpointProps(sd, iClass, new String[]{Constants.WS_CONFIG_TYPE}, address,intents);
-
Thread.currentThread().setContextClassLoader(ServerFactoryBean.class.getClassLoader());
Server server = factory.create();
-
return new ExportResult(endpointProps, server);
+ } catch (Exception e) {
+ return new ExportResult(endpointProps, e);
} finally {
Thread.currentThread().setContextClassLoader(oldClassLoader);
}
Added: cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/qos/DefaultIntentMapFactory.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/qos/DefaultIntentMapFactory.java?rev=1409451&view=auto
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/qos/DefaultIntentMapFactory.java (added)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/qos/DefaultIntentMapFactory.java Wed Nov 14 21:53:25 2012
@@ -0,0 +1,46 @@
+package org.apache.cxf.dosgi.dsw.qos;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.cxf.binding.soap.Soap11;
+import org.apache.cxf.binding.soap.Soap12;
+import org.apache.cxf.binding.soap.SoapBindingConfiguration;
+import org.apache.cxf.binding.soap.SoapVersion;
+import org.apache.cxf.feature.LoggingFeature;
+import org.apache.cxf.ws.policy.WSPolicyFeature;
+import org.apache.neethi.Policy;
+
+public class DefaultIntentMapFactory {
+ public IntentMap create() {
+ Map<String, Object> intentMap = new HashMap<String, Object>();
+ intentMap.put("addressing", getNonDecoupledAddressing());
+ intentMap.put("logging", getLoggingFeature());
+ Object soap11 = getSoapBinding(Soap11.getInstance());
+ intentMap.put("SOAP", soap11);
+ intentMap.put("SOAP.1_1", soap11);
+ intentMap.put("SOAP.1_2", getSoapBinding(Soap12.getInstance()));
+ intentMap.put("HTTP", "PROVIDED");
+
+ IntentMap intentMap2 = new IntentMap();
+ intentMap2.setIntents(intentMap );
+ return intentMap2;
+ }
+
+ private Object getNonDecoupledAddressing() {
+ Policy wsAddressing = new Policy();
+ WSPolicyFeature wsPolicy = new WSPolicyFeature(wsAddressing );
+ return wsPolicy;
+ }
+
+ private Object getLoggingFeature() {
+ return new LoggingFeature();
+ }
+
+ private Object getSoapBinding(SoapVersion soapVersion) {
+ SoapBindingConfiguration soapBindingConfig = new SoapBindingConfiguration();
+ soapBindingConfig.setVersion(soapVersion);
+ return soapBindingConfig;
+ }
+
+}
Propchange: cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/qos/DefaultIntentMapFactory.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/qos/IntentUtils.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/qos/IntentUtils.java?rev=1409451&r1=1409450&r2=1409451&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/qos/IntentUtils.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/qos/IntentUtils.java Wed Nov 14 21:53:25 2012
@@ -22,117 +22,117 @@ public class IntentUtils {
"/OSGI-INF/cxf/intents/intent-map.xml"
};
- public static String formatIntents(String[] intents) {
- StringBuilder sb = new StringBuilder();
- boolean first = true;
- for (String intent : intents) {
- if (first) {
- first = false;
- } else {
- sb.append(' ');
- }
- sb.append(intent);
- }
- return sb.toString();
- }
-
- public static String[] parseIntents(String intentsSequence) {
- return intentsSequence == null ? new String[] {} : intentsSequence.split(" ");
- }
-
- public static IntentMap getIntentMap(BundleContext bundleContext) {
- IntentMap im = IntentUtils.readIntentMap(bundleContext);
- if (im == null) {
- // Couldn't read an intent map
- LOG.debug("Using default intent map");
- im = new IntentMap();
- im.setIntents(new HashMap<String, Object>());
- }
- return im;
- }
-
- public static IntentMap readIntentMap(BundleContext bundleContext) {
- List<String> springIntentLocations = new ArrayList<String>();
- for (String mapFile : INTENT_MAP) {
- if (bundleContext.getBundle().getResource(mapFile) == null) {
- OsgiUtils.LOG.info("Could not find intent map file " + mapFile);
- return null;
- }
- springIntentLocations.add("classpath:" + mapFile);
- }
-
- try {
-
- // switch to cxf bundle classloader for spring
- ClassLoader oldClassLoader = Thread.currentThread().getContextClassLoader();
- Thread.currentThread().setContextClassLoader(PolicyNamespaceHandler.class.getClassLoader());
-
- LOG.debug("Loading Intent map from {}", springIntentLocations);
- OsgiBundleXmlApplicationContext ctx = new OsgiBundleXmlApplicationContext (springIntentLocations.toArray(new String[] {})) {
- @Override
- protected void initBeanDefinitionReader(XmlBeanDefinitionReader pBeanDefinitionReader) {
- super.initBeanDefinitionReader(pBeanDefinitionReader);
- pBeanDefinitionReader.setValidating(false);
- }
- };
- ctx.setPublishContextAsService(false);
- ctx.setBundleContext(bundleContext);
- ctx.refresh();
- LOG.debug("application context: {}", ctx);
- IntentMap im = (IntentMap)ctx.getBean("intentMap");
- LOG.debug("retrieved intent map: {}", im);
-
- Thread.currentThread().setContextClassLoader(oldClassLoader);
-
- return im;
- } catch (Throwable t) {
- LOG.warn("Intent map load failed: ", t);
- return null;
- }
- }
+ public static String formatIntents(String[] intents) {
+ StringBuilder sb = new StringBuilder();
+ boolean first = true;
+ for (String intent : intents) {
+ if (first) {
+ first = false;
+ } else {
+ sb.append(' ');
+ }
+ sb.append(intent);
+ }
+ return sb.toString();
+ }
+
+ public static String[] parseIntents(String intentsSequence) {
+ return intentsSequence == null ? new String[] {} : intentsSequence.split(" ");
+ }
+
+ public static IntentMap getIntentMap(BundleContext bundleContext) {
+ IntentMap im = null;
+ try {
+ im = IntentUtils.readIntentMap(bundleContext);
+ } catch (Throwable t) {
+ LOG.warn("Intent map load failed: ", t);
+ }
+ if (im == null) {
+ // Couldn't read an intent map
+ LOG.debug("Using default intent map");
+ im = new IntentMap();
+ im.setIntents(new HashMap<String, Object>());
+ }
+ return im;
+ }
+
+ public static IntentMap readIntentMap(BundleContext bundleContext) {
+ List<String> springIntentLocations = new ArrayList<String>();
+ for (String mapFile : INTENT_MAP) {
+ if (bundleContext.getBundle().getResource(mapFile) == null) {
+ OsgiUtils.LOG.info("Could not find intent map file " + mapFile);
+ return null;
+ }
+ springIntentLocations.add("classpath:" + mapFile);
+ }
+
+ // switch to cxf bundle classloader for spring
+ ClassLoader oldClassLoader = Thread.currentThread().getContextClassLoader();
+ Thread.currentThread().setContextClassLoader(PolicyNamespaceHandler.class.getClassLoader());
+
+ LOG.debug("Loading Intent map from {}", springIntentLocations);
+ OsgiBundleXmlApplicationContext ctx = new OsgiBundleXmlApplicationContext(springIntentLocations.toArray(new String[] {})) {
+ @Override
+ protected void initBeanDefinitionReader(XmlBeanDefinitionReader pBeanDefinitionReader) {
+ super.initBeanDefinitionReader(pBeanDefinitionReader);
+ pBeanDefinitionReader.setValidating(false);
+ }
+ };
+ ctx.setPublishContextAsService(false);
+ ctx.setBundleContext(bundleContext);
+ ctx.refresh();
+ LOG.debug("application context: {}", ctx);
+ IntentMap im = (IntentMap) ctx.getBean("intentMap");
+ LOG.debug("retrieved intent map: {}", im);
+
+ Thread.currentThread().setContextClassLoader(oldClassLoader);
+
+ return im;
+
+ }
@SuppressWarnings("rawtypes")
- public static String[] getAllRequiredIntents(Map serviceProperties){
+ public static String[] getAllRequiredIntents(Map serviceProperties) {
// Get the intents that need to be supported by the RSA
String[] requiredIntents = Utils.normalizeStringPlus(serviceProperties.get(RemoteConstants.SERVICE_EXPORTED_INTENTS));
- if(requiredIntents==null){
+ if (requiredIntents == null) {
requiredIntents = new String[0];
}
-
+
{ // merge with extra intents;
String[] requiredExtraIntents = Utils.normalizeStringPlus(serviceProperties.get(RemoteConstants.SERVICE_EXPORTED_INTENTS_EXTRA));
- if(requiredExtraIntents!= null && requiredExtraIntents.length>0){
-
+ if (requiredExtraIntents != null && requiredExtraIntents.length > 0) {
+
requiredIntents = IntentUtils.mergeArrays(requiredIntents, requiredExtraIntents);
}
}
-
+
return requiredIntents;
}
@SuppressWarnings("rawtypes")
- public static String[] getInetntsImplementedByTheService(Map serviceProperties){
- // Get the Intents that are implemented by the service
+ public static String[] getInetntsImplementedByTheService(Map serviceProperties) {
+ // Get the Intents that are implemented by the service
String[] serviceIntents = Utils.normalizeStringPlus(serviceProperties.get(RemoteConstants.SERVICE_INTENTS));
-
+
return serviceIntents;
}
- public static String[] mergeArrays(String[] a1,String[] a2){
+ public static String[] mergeArrays(String[] a1, String[] a2) {
if(a1==null) return a2;
if(a2==null) return a1;
-
- List<String> list = new ArrayList<String>(a1.length+a2.length);
-
+
+ List<String> list = new ArrayList<String>(a1.length + a2.length);
+
for (String s : a1) {
- list.add(s);
+ list.add(s);
}
-
+
for (String s : a2) {
- if(!list.contains(s))
- list.add(s);
+ if (!list.contains(s))
+ list.add(s);
}
-
+
return list.toArray(new String[list.size()]);
}
Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/RemoteServiceAdminCore.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/RemoteServiceAdminCore.java?rev=1409451&r1=1409450&r2=1409451&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/RemoteServiceAdminCore.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/RemoteServiceAdminCore.java Wed Nov 14 21:53:25 2012
@@ -245,22 +245,15 @@ public class RemoteServiceAdminCore impl
Class<?> interfaceClass = ClassUtils.getInterfaceClass(serviceObject, interfaceName);
if (interfaceClass != null) {
- try {
- ExportResult exportResult = handler.createServer(serviceReference, bctx, callingContext, serviceProperties,
- interfaceClass, serviceObject);
- LOG.info("created server for interface " + iface);
-
- EndpointDescription epd = new EndpointDescription(exportResult.getEndpointProps());
- ExportRegistrationImpl exportRegistration = new ExportRegistrationImpl(serviceReference, epd, this);
+ ExportResult exportResult = handler.createServer(serviceReference, bctx, callingContext,
+ serviceProperties, interfaceClass, serviceObject);
+ LOG.info("created server for interface " + iface);
+ EndpointDescription epd = new EndpointDescription(exportResult.getEndpointProps());
+ ExportRegistrationImpl exportRegistration = new ExportRegistrationImpl(serviceReference, epd, this);
+ if (exportRegistration.getException() == null) {
exportRegistration.startServiceTracker(bctx);
- exportRegs.put(iface, exportRegistration);
- } catch (Exception e) {
- LOG.warn("server creation for interface {} failed!", iface);
- EndpointDescription epd = new EndpointDescription(new HashMap<String, Object>());
- ExportRegistrationImpl exportRegistration = new ExportRegistrationImpl(serviceReference, epd, this);
- exportRegistration.setException(e);
- exportRegs.put(iface, exportRegistration);
}
+ exportRegs.put(iface, exportRegistration);
}
}
Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/ActivatorTest.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/ActivatorTest.java?rev=1409451&r1=1409450&r2=1409451&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/ActivatorTest.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/ActivatorTest.java Wed Nov 14 21:53:25 2012
@@ -32,7 +32,6 @@ import org.osgi.service.remoteserviceadm
public class ActivatorTest extends TestCase{
private BundleContext getMockBundleContext(IMocksControl control) {
-
Bundle b = control.createMock(Bundle.class);
Hashtable<String, String> ht = new Hashtable<String, String>();
EasyMock.expect(b.getHeaders()).andReturn(ht).anyTimes();
@@ -40,222 +39,20 @@ public class ActivatorTest extends TestC
EasyMock.expect(b.getBundleContext()).andReturn(bc).anyTimes();
EasyMock.expect(bc.getBundle()).andReturn(b).anyTimes();
- // EasyMock.expect(bc.registerService(
- // (String) EasyMock.anyObject(), EasyMock.anyObject(),
- // (Dictionary) EasyMock.anyObject())).andAnswer(new IAnswer<ServiceRegistration>() {
- // public ServiceRegistration answer() throws Throwable {
- // ServiceRegistration sr = EasyMock.createNiceMock(ServiceRegistration.class);
- // EasyMock.replay(sr);
- // return sr;
- // }
- // }).anyTimes();
return bc;
}
-
-
-
public void testCreateAndShutdownRemoteServiceAdminService() throws Exception {
-
- //IntentMap im = new IntentMap();
- //im.setIntents(new HashMap<String, Object>());
-
- // IntentMapLoader.initializeWithExistingMap(im);
-
IMocksControl control = EasyMock.createNiceControl();
BundleContext bc = getMockBundleContext(control);
-
ServiceRegistration sr = control.createMock(ServiceRegistration.class);
EasyMock.expect(bc.registerService(EasyMock.eq(RemoteServiceAdmin.class.getName()),EasyMock.anyObject(), (Dictionary)EasyMock.anyObject())).andReturn(sr).atLeastOnce();
-
control.replay();
-
-
Activator a = new Activator();
a.setBundleContext(bc);
a.start();
-
control.verify();
-
}
-// @SuppressWarnings("unchecked")
-// public void testCreateDistributionProviderService() throws Exception {
-// IMocksControl control = EasyMock.createNiceControl();
-//
-// Bundle b = control.createMock(Bundle.class);
-// Hashtable<String, String> ht = new Hashtable<String, String>();
-// EasyMock.expect(b.getHeaders()).andReturn(ht).anyTimes();
-//
-// final Map<Object, Dictionary> services = new HashMap<Object, Dictionary>();
-// BundleContext bc = control.createMock(BundleContext.class);
-// EasyMock.expect(bc.registerService(
-// (String) EasyMock.anyObject(),
-// EasyMock.anyObject(),
-// (Dictionary) EasyMock.anyObject())).andAnswer(new IAnswer<ServiceRegistration>() {
-// public ServiceRegistration answer() throws Throwable {
-// services.put(EasyMock.getCurrentArguments()[1],
-// (Dictionary) EasyMock.getCurrentArguments()[2]);
-// return null;
-// }
-// }).anyTimes();
-// EasyMock.expect(bc.registerService(
-// (String []) EasyMock.anyObject(),
-// EasyMock.anyObject(),
-// (Dictionary) EasyMock.anyObject())).andAnswer(new IAnswer<ServiceRegistration>() {
-// public ServiceRegistration answer() throws Throwable {
-// services.put(EasyMock.getCurrentArguments()[1],
-// (Dictionary) EasyMock.getCurrentArguments()[2]);
-// return null;
-// }
-// }).anyTimes();
-//
-// EasyMock.expect(b.getBundleContext()).andReturn(bc).anyTimes();
-// EasyMock.expect(bc.getBundle()).andReturn(b).anyTimes();
-// control.replay();
-//
-// Activator a = new Activator() {
-// @Override
-// IntentMap getIntentMap() {
-// Map<String, Object> intents = new HashMap<String, Object>();
-// intents.put("A", new AbstractFeature() {});
-// intents.put("B", "PROVIDED");
-//
-// IntentMap im = new IntentMap();
-// im.setIntents(intents);
-// return im;
-// }
-// };
-//
-// assertEquals("Precondition failed", 0, services.size());
-// a.start(bc);
-//
-// CxfDistributionProvider dp = null;
-// for (Object o : services.keySet()) {
-// if (o instanceof CxfDistributionProvider) {
-// dp = ((CxfDistributionProvider) o);
-// }
-// }
-//
-// Dictionary serviceProps = services.get(dp);
-// Set<String> expected = new HashSet<String>(Arrays.asList("A", "B"));
-// assertEquals(expected, new HashSet<String>(Arrays.asList(
-// OsgiUtils.parseIntents((String) serviceProps.get(DistributionProvider.SUPPORTED_INTENTS)))));
-// assertNotNull(serviceProps.get(DistributionProvider.PRODUCT_NAME));
-// assertNotNull(serviceProps.get(DistributionProvider.PRODUCT_VERSION));
-// assertNotNull(serviceProps.get(DistributionProvider.VENDOR_NAME));
-// }
-
- // TODO: move to controller
-
-// public void testPublishPreexistingServices() throws Exception {
-// TestService serviceObject = new TestServiceImpl();
-//
-// IMocksControl control = EasyMock.createNiceControl();
-//
-// Bundle b = control.createMock(Bundle.class);
-// Hashtable<String, String> ht = new Hashtable<String, String>();
-// EasyMock.expect(b.getHeaders()).andReturn(ht).anyTimes();
-//
-// BundleContext bc = control.createMock(BundleContext.class);
-//
-// ServiceReference sref = control.createMock(ServiceReference.class);
-// EasyMock.expect(sref.getBundle()).andReturn(b).anyTimes();
-// EasyMock.expect(sref.getProperty(org.osgi.framework.Constants.OBJECTCLASS)).
-// andReturn(new String [] {TestService.class.getName()}).anyTimes();
-// EasyMock.expect(sref.getPropertyKeys()).
-// andReturn(new String [] {"service.exported.interfaces"}).anyTimes();
-// EasyMock.expect(sref.getProperty("service.exported.interfaces")).
-// andReturn("*").anyTimes();
-//
-// EasyMock.expect(bc.getServiceReferences(null,
-// "(|(service.exported.interfaces=*)(osgi.remote.interfaces=*))")).
-// andReturn(new ServiceReference[] {sref}).anyTimes();
-// EasyMock.expect(bc.getService(sref)).andReturn(serviceObject).anyTimes();
-//
-// EasyMock.expect(b.getBundleContext()).andReturn(bc).anyTimes();
-// EasyMock.expect(bc.getBundle()).andReturn(b).anyTimes();
-// control.replay();
-//
-// Activator a = new Activator() {
-// @Override
-// IntentMap getIntentMap() {
-// IntentMap intentMap = new IntentMap();
-// intentMap.setIntents(new HashMap<String, Object>());
-// return intentMap;
-// }
-// };
-//
-// a.start(bc);
-// assertEquals(1, a.pHook.getEndpoints().size());
-// ServiceReference key = a.pHook.getEndpoints().keySet().iterator().next();
-// assertSame(sref, key);
-//
-// }
-
-// public void testListenerHookRegistered() throws Exception {
-// testServiceRegistered(ListenerHook.class);
-// }
-//
-// public void testFindHookRegistered() throws Exception {
-// testServiceRegistered(FindHook.class);
-// }
-
-// public void testDiscoveredServiceTrackerRegistered() throws Exception {
-// testServiceRegistered(DiscoveredServiceTracker.class);
-// }
-//
-//
-// public void testRemoteServiceAdminRegistered() throws Exception {
-// testServiceRegistered(RemoteServiceAdmin.class);
-// }
-//
-//
-// private void testServiceRegistered(Class serviceClass) throws Exception {
-// IMocksControl control = EasyMock.createNiceControl();
-//
-// Bundle b = control.createMock(Bundle.class);
-// Hashtable<String, String> ht = new Hashtable<String, String>();
-// EasyMock.expect(b.getHeaders()).andReturn(ht).anyTimes();
-//
-// final Map<Object, Dictionary> services = new HashMap<Object, Dictionary>();
-// BundleContext bc = control.createMock(BundleContext.class);
-// EasyMock.expect(bc.registerService(
-// (String) EasyMock.anyObject(),
-// EasyMock.anyObject(),
-// (Dictionary) EasyMock.anyObject())).andAnswer(new IAnswer<ServiceRegistration>() {
-// public ServiceRegistration answer() throws Throwable {
-// services.put(EasyMock.getCurrentArguments()[1],
-// (Dictionary) EasyMock.getCurrentArguments()[2]);
-// return null;
-// }
-// }).anyTimes();
-// EasyMock.expect(bc.registerService(
-// (String []) EasyMock.anyObject(),
-// EasyMock.anyObject(),
-// (Dictionary) EasyMock.anyObject())).andAnswer(new IAnswer<ServiceRegistration>() {
-// public ServiceRegistration answer() throws Throwable {
-// services.put(EasyMock.getCurrentArguments()[1],
-// (Dictionary) EasyMock.getCurrentArguments()[2]);
-// return null;
-// }
-// }).anyTimes();
-//
-// EasyMock.expect(b.getBundleContext()).andReturn(bc).anyTimes();
-// EasyMock.expect(bc.getBundle()).andReturn(b).anyTimes();
-// control.replay();
-//
-// Activator a = new Activator();
-// a.start(bc);
-//
-// for (Object svc : services.keySet()) {
-// if (serviceClass.isAssignableFrom(svc.getClass())) {
-// return;
-// }
-// }
-// fail("Should have a service registered of type: " + serviceClass);
-// }
-//
-// private static class TestServiceImpl implements TestService {}
}
Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/handlers/HttpServiceConfigurationTypeHandlerTest.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/handlers/HttpServiceConfigurationTypeHandlerTest.java?rev=1409451&r1=1409450&r2=1409451&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/handlers/HttpServiceConfigurationTypeHandlerTest.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/handlers/HttpServiceConfigurationTypeHandlerTest.java Wed Nov 14 21:53:25 2012
@@ -30,6 +30,7 @@ import org.apache.cxf.dosgi.dsw.service.
import org.apache.cxf.endpoint.AbstractEndpointFactory;
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.feature.AbstractFeature;
+import org.apache.cxf.feature.Feature;
import org.apache.cxf.frontend.ClientProxyFactoryBean;
import org.apache.cxf.frontend.ServerFactoryBean;
import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
@@ -73,7 +74,7 @@ public class HttpServiceConfigurationTyp
@Override
String[] applyIntents(BundleContext dswContext, BundleContext callingContext,
- List<AbstractFeature> features, AbstractEndpointFactory factory,
+ List<Feature> features, AbstractEndpointFactory factory,
Map sd) {
return new String [] {"a.b.c"};
}
@@ -152,7 +153,7 @@ public class HttpServiceConfigurationTyp
@Override
String[] applyIntents(BundleContext dswContext, BundleContext callingContext,
- List<AbstractFeature> features, AbstractEndpointFactory factory,
+ List<Feature> features, AbstractEndpointFactory factory,
Map sd) {
return new String [] {};
}
@@ -224,7 +225,7 @@ public class HttpServiceConfigurationTyp
@Override
String[] applyIntents(BundleContext dswContext, BundleContext callingContext,
- List<AbstractFeature> features, AbstractEndpointFactory factory,
+ List<Feature> features, AbstractEndpointFactory factory,
Map sd) {
return new String [] {};
}
@@ -356,7 +357,7 @@ public class HttpServiceConfigurationTyp
@Override
String[] applyIntents(BundleContext dswContext, BundleContext callingContext,
- List<AbstractFeature> features, AbstractEndpointFactory factory, Map sd) {
+ List<Feature> features, AbstractEndpointFactory factory, Map sd) {
return new String[] { "a.b.c" };
}
};
Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/handlers/JaxRSUtilsTest.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/handlers/JaxRSUtilsTest.java?rev=1409451&r1=1409450&r2=1409451&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/handlers/JaxRSUtilsTest.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/handlers/JaxRSUtilsTest.java Wed Nov 14 21:53:25 2012
@@ -25,8 +25,8 @@ import java.util.Map;
import junit.framework.TestCase;
import org.apache.cxf.dosgi.dsw.Constants;
-import org.apache.cxf.jaxrs.provider.AegisElementProvider;
import org.apache.cxf.jaxrs.provider.JAXBElementProvider;
+import org.apache.cxf.jaxrs.provider.aegis.AegisElementProvider;
import org.easymock.EasyMock;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
@@ -80,8 +80,8 @@ public class JaxRSUtilsTest extends Test
public void testServiceProviderProperty() throws Exception {
- BundleContext bc = EasyMock.createNiceMock(BundleContext.class);
- Bundle bundle = EasyMock.createNiceMock(Bundle.class);
+ BundleContext bc = EasyMock.createMock(BundleContext.class);
+ Bundle bundle = EasyMock.createMock(Bundle.class);
bc.getBundle();
EasyMock.expectLastCall().andReturn(bundle).times(2);
bundle.loadClass(AegisElementProvider.class.getName());
@@ -92,8 +92,8 @@ public class JaxRSUtilsTest extends Test
Map<String, Object> props = new HashMap<String, Object>();
props.put(Constants.RS_PROVIDER_PROP_KEY,
- "\r\n org.apache.cxf.jaxrs.provider.AegisElementProvider , \r\n"
- + "org.apache.cxf.jaxrs.provider.JAXBElementProvider\r\n");
+ "\r\n " + AegisElementProvider.class.getName() + " , \r\n"
+ + JAXBElementProvider.class.getName() + "\r\n");
props.put(Constants.RS_PROVIDER_GLOBAL_PROP_KEY, "false");
addRequiredProps(props);
@@ -106,8 +106,8 @@ public class JaxRSUtilsTest extends Test
public void testServiceProviderStrings() throws Exception {
- BundleContext bc = EasyMock.createNiceMock(BundleContext.class);
- Bundle bundle = EasyMock.createNiceMock(Bundle.class);
+ BundleContext bc = EasyMock.createMock(BundleContext.class);
+ Bundle bundle = EasyMock.createMock(Bundle.class);
bc.getBundle();
EasyMock.expectLastCall().andReturn(bundle).times(2);
bundle.loadClass(AegisElementProvider.class.getName());
@@ -118,8 +118,8 @@ public class JaxRSUtilsTest extends Test
Map<String, Object> props = new HashMap<String, Object>();
props.put(Constants.RS_PROVIDER_PROP_KEY, new String[] {
- "\r\n org.apache.cxf.jaxrs.provider.AegisElementProvider",
- "org.apache.cxf.jaxrs.provider.JAXBElementProvider\r\n"
+ "\r\n " + AegisElementProvider.class.getName(),
+ JAXBElementProvider.class.getName() + "\r\n"
});
props.put(Constants.RS_PROVIDER_GLOBAL_PROP_KEY, "false");
Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/handlers/PojoConfigurationTypeHandlerTest.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/handlers/PojoConfigurationTypeHandlerTest.java?rev=1409451&r1=1409450&r2=1409451&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/handlers/PojoConfigurationTypeHandlerTest.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/handlers/PojoConfigurationTypeHandlerTest.java Wed Nov 14 21:53:25 2012
@@ -35,6 +35,7 @@ import org.apache.cxf.dosgi.dsw.service.
import org.apache.cxf.endpoint.AbstractEndpointFactory;
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.feature.AbstractFeature;
+import org.apache.cxf.feature.Feature;
import org.apache.cxf.frontend.ClientProxyFactoryBean;
import org.apache.cxf.frontend.ServerFactoryBean;
import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
@@ -137,7 +138,7 @@ public class PojoConfigurationTypeHandle
@Override
String[] applyIntents(BundleContext dswContext, BundleContext callingContext,
- List<AbstractFeature> features, AbstractEndpointFactory factory, Map sd) {
+ List<Feature> features, AbstractEndpointFactory factory, Map sd) {
return new String[0];
}
};
@@ -273,7 +274,7 @@ public class PojoConfigurationTypeHandle
@Override
String[] applyIntents(BundleContext dswContext, BundleContext callingContext,
- List<AbstractFeature> features, AbstractEndpointFactory factory, Map sd) {
+ List<Feature> features, AbstractEndpointFactory factory, Map sd) {
return new String []{};
}
};
@@ -359,7 +360,7 @@ public class PojoConfigurationTypeHandle
IMocksControl control = EasyMock.createNiceControl();
BundleContext dswContext = control.createMock(BundleContext.class);
BundleContext callingContext = control.createMock(BundleContext.class);
- List<AbstractFeature> features = new ArrayList<AbstractFeature>();
+ List<Feature> features = new ArrayList<Feature>();
AbstractEndpointFactory factory = control.createMock(AbstractEndpointFactory.class);
control.replay();
@@ -395,7 +396,7 @@ public class PojoConfigurationTypeHandle
IMocksControl control = EasyMock.createNiceControl();
BundleContext dswContext = control.createMock(BundleContext.class);
BundleContext callingContext = control.createMock(BundleContext.class);
- List<AbstractFeature> features = new ArrayList<AbstractFeature>();
+ List<Feature> features = new ArrayList<Feature>();
AbstractEndpointFactory factory = control.createMock(AbstractEndpointFactory.class);
control.replay();
@@ -431,7 +432,7 @@ public class PojoConfigurationTypeHandle
IMocksControl control = EasyMock.createNiceControl();
BundleContext dswContext = control.createMock(BundleContext.class);
BundleContext callingContext = control.createMock(BundleContext.class);
- List<AbstractFeature> features = new ArrayList<AbstractFeature>();
+ List<Feature> features = new ArrayList<Feature>();
AbstractEndpointFactory factory = control.createMock(AbstractEndpointFactory.class);
control.replay();
@@ -469,7 +470,7 @@ public class PojoConfigurationTypeHandle
IMocksControl control = EasyMock.createNiceControl();
BundleContext dswContext = control.createMock(BundleContext.class);
BundleContext callingContext = control.createMock(BundleContext.class);
- List<AbstractFeature> features = new ArrayList<AbstractFeature>();
+ List<Feature> features = new ArrayList<Feature>();
AbstractEndpointFactory factory = control.createMock(AbstractEndpointFactory.class);
control.replay();
@@ -513,7 +514,7 @@ public class PojoConfigurationTypeHandle
BundleContext dswContext = control.createMock(BundleContext.class);
BundleContext callingContext = control.createMock(BundleContext.class);
- List<AbstractFeature> features = new ArrayList<AbstractFeature>();
+ List<Feature> features = new ArrayList<Feature>();
AbstractEndpointFactory factory = control.createMock(AbstractEndpointFactory.class);
control.replay();
@@ -552,7 +553,7 @@ public class PojoConfigurationTypeHandle
BundleContext dswContext = control.createMock(BundleContext.class);
BundleContext callingContext = control.createMock(BundleContext.class);
- List<AbstractFeature> features = new ArrayList<AbstractFeature>();
+ List<Feature> features = new ArrayList<Feature>();
AbstractEndpointFactory factory = control.createMock(AbstractEndpointFactory.class);
control.replay();
@@ -626,7 +627,7 @@ public class PojoConfigurationTypeHandle
IMocksControl control = EasyMock.createNiceControl();
final BundleContext dswContext = control.createMock(BundleContext.class);
final BundleContext callingContext = control.createMock(BundleContext.class);
- List<AbstractFeature> features = new ArrayList<AbstractFeature>();
+ List<Feature> features = new ArrayList<Feature>();
AbstractEndpointFactory factory = control.createMock(AbstractEndpointFactory.class);
control.replay();
@@ -657,7 +658,7 @@ public class PojoConfigurationTypeHandle
p.applyIntents(dswContext, callingContext, features, factory, props);
List<String> featureNames = new ArrayList<String>();
- for (AbstractFeature f : features) {
+ for (Feature f : features) {
featureNames.add(f.toString());
}
return featureNames;
@@ -675,7 +676,7 @@ public class PojoConfigurationTypeHandle
IMocksControl control = EasyMock.createNiceControl();
final BundleContext dswContext = control.createMock(BundleContext.class);
final BundleContext callingContext = control.createMock(BundleContext.class);
- List<AbstractFeature> features = new ArrayList<AbstractFeature>();
+ List<Feature> features = new ArrayList<Feature>();
AbstractEndpointFactory factory = control.createMock(AbstractEndpointFactory.class);
control.replay();
Added: cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/qos/IntentUtilsTest.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/qos/IntentUtilsTest.java?rev=1409451&view=auto
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/qos/IntentUtilsTest.java (added)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/qos/IntentUtilsTest.java Wed Nov 14 21:53:25 2012
@@ -0,0 +1,49 @@
+package org.apache.cxf.dosgi.dsw.qos;
+
+import java.io.IOException;
+import java.util.Arrays;
+
+import junit.framework.Assert;
+
+import org.easymock.EasyMock;
+import org.junit.Test;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.InvalidSyntaxException;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+public class IntentUtilsTest {
+ private static final String INTENT_MAP_URL = "/OSGI-INF/cxf/intents/intent-map.xml";
+
+ public void testNoIntentMap() {
+ Bundle b = EasyMock.createNiceMock(Bundle.class);
+ EasyMock.replay(b);
+ BundleContext bc = EasyMock.createNiceMock(BundleContext.class);
+ EasyMock.expect(bc.getBundle()).andReturn(b).anyTimes();
+ EasyMock.replay(bc);
+
+ Assert.assertNull(IntentUtils.readIntentMap(bc));
+ Assert.assertNotNull(IntentUtils.getIntentMap(bc));
+ }
+
+ public void testIntentsParsingAndFormatting() {
+ String initial = "A SOAP_1.1 integrity";
+
+ String[] expected = {"A", "SOAP_1.1", "integrity"};
+ String[] actual = IntentUtils.parseIntents(initial);
+ Assert.assertTrue(Arrays.equals(expected, actual));
+
+ Assert.assertEquals(initial, IntentUtils.formatIntents(actual));
+ }
+
+ @Test
+ public void testgetIntentMap() throws IOException, ClassNotFoundException, InvalidSyntaxException {
+ ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext(INTENT_MAP_URL);
+ IntentMap intentMap = (IntentMap) ctx.getBean("intentMap", IntentMap.class);
+ Assert.assertEquals(6, intentMap.getIntents().size());
+
+ IntentMap intentMap2 = new DefaultIntentMapFactory().create();
+ Object soap11_1 = intentMap.getIntents().get("addressing");
+ Object soap11_2 = intentMap2.getIntents().get("addressing");
+ }
+}
Propchange: cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/qos/IntentUtilsTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/util/OsgiUtilsTest.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/util/OsgiUtilsTest.java?rev=1409451&r1=1409450&r2=1409451&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/util/OsgiUtilsTest.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/util/OsgiUtilsTest.java Wed Nov 14 21:53:25 2012
@@ -27,7 +27,6 @@ import java.util.Map;
import junit.framework.TestCase;
-import org.apache.cxf.dosgi.dsw.qos.IntentUtils;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.osgi.framework.Bundle;
@@ -41,27 +40,6 @@ import org.osgi.service.remoteserviceadm
public class OsgiUtilsTest extends TestCase {
- public void testNoIntentMap() {
- Bundle b = EasyMock.createNiceMock(Bundle.class);
- EasyMock.replay(b);
- BundleContext bc = EasyMock.createNiceMock(BundleContext.class);
- EasyMock.expect(bc.getBundle()).andReturn(b).anyTimes();
- EasyMock.replay(bc);
-
- assertNull(IntentUtils.readIntentMap(bc));
- assertNotNull(IntentUtils.getIntentMap(bc));
- }
-
- public void testIntentsParsingAndFormatting() {
- String initial = "A SOAP_1.1 integrity";
-
- String[] expected = {"A", "SOAP_1.1", "integrity"};
- String[] actual = IntentUtils.parseIntents(initial);
- assertTrue(Arrays.equals(expected, actual));
-
- assertEquals(initial, IntentUtils.formatIntents(actual));
- }
-
public void testMultiValuePropertyAsString() {
assertEquals(Collections.singleton("hi"),
OsgiUtils.getMultiValueProperty("hi"));
Modified: cxf/dosgi/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/parent/pom.xml?rev=1409451&r1=1409450&r2=1409451&view=diff
==============================================================================
--- cxf/dosgi/trunk/parent/pom.xml (original)
+++ cxf/dosgi/trunk/parent/pom.xml Wed Nov 14 21:53:25 2012
@@ -23,8 +23,8 @@
<osgi.version>4.2.0</osgi.version>
- <cxf.version>2.5.4</cxf.version>
- <cxf.build-utils.version>2.4.0</cxf.build-utils.version>
+ <cxf.version>2.7.0</cxf.version>
+ <cxf.build-utils.version>2.4.1</cxf.build-utils.version>
<felix.version>3.0.8</felix.version>
<spring.version>3.0.6.RELEASE</spring.version>
<spring.osgi.version>1.2.1</spring.osgi.version>
@@ -32,7 +32,7 @@
<remote.service.admin.interfaces.version>1.0.0</remote.service.admin.interfaces.version>
- <servicemix.specs.version>1.9.0</servicemix.specs.version>
+ <servicemix.specs.version>2.1.0</servicemix.specs.version>
<pax.web.version>1.0.3</pax.web.version>
<servlet.version>3.0</servlet.version>
<log4j.version>1.2.15</log4j.version>
@@ -54,6 +54,16 @@
<dependencyManagement>
<dependencies>
<dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>${osgi.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.enterprise</artifactId>
+ <version>${osgi.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
@@ -81,7 +91,7 @@
<version>2.5.2</version>
<scope>test</scope>
</dependency>
- </dependencies>
+ </dependencies>
</dependencyManagement>
<build>
Propchange: cxf/dosgi/trunk/samples/security_filter/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Nov 14 21:53:25 2012
@@ -5,3 +5,7 @@ target
.project
+
+.classpath
+
+.settings