You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2014/07/23 19:20:49 UTC
svn commit: r1612878 [2/3] - in /tomee/tomee/trunk: ./
arquillian/arquillian-tomee-tests/
arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/httpheaders/
container/openejb-core/ contai...
Modified: tomee/tomee/trunk/examples/server-events/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/server-events/pom.xml?rev=1612878&r1=1612877&r2=1612878&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/server-events/pom.xml (original)
+++ tomee/tomee/trunk/examples/server-events/pom.xml Wed Jul 23 17:20:44 2014
@@ -59,7 +59,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0-6</version>
+ <version>7.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<!--
Modified: tomee/tomee/trunk/examples/simple-cdi-interceptor/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-cdi-interceptor/pom.xml?rev=1612878&r1=1612877&r2=1612878&view=diff
==============================================================================
Binary files - no diff available.
Modified: tomee/tomee/trunk/examples/simple-cmp2/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-cmp2/pom.xml?rev=1612878&r1=1612877&r2=1612878&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-cmp2/pom.xml (original)
+++ tomee/tomee/trunk/examples/simple-cmp2/pom.xml Wed Jul 23 17:20:44 2014
@@ -91,7 +91,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0-6</version>
+ <version>7.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
Modified: tomee/tomee/trunk/examples/simple-mdb-and-cdi/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-mdb-and-cdi/pom.xml?rev=1612878&r1=1612877&r2=1612878&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-mdb-and-cdi/pom.xml (original)
+++ tomee/tomee/trunk/examples/simple-mdb-and-cdi/pom.xml Wed Jul 23 17:20:44 2014
@@ -54,7 +54,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0-6</version>
+ <version>7.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: tomee/tomee/trunk/examples/simple-mdb-with-descriptor/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-mdb-with-descriptor/pom.xml?rev=1612878&r1=1612877&r2=1612878&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-mdb-with-descriptor/pom.xml (original)
+++ tomee/tomee/trunk/examples/simple-mdb-with-descriptor/pom.xml Wed Jul 23 17:20:44 2014
@@ -54,7 +54,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0-6</version>
+ <version>7.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: tomee/tomee/trunk/examples/simple-mdb/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-mdb/pom.xml?rev=1612878&r1=1612877&r2=1612878&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-mdb/pom.xml (original)
+++ tomee/tomee/trunk/examples/simple-mdb/pom.xml Wed Jul 23 17:20:44 2014
@@ -54,7 +54,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0-6</version>
+ <version>7.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: tomee/tomee/trunk/examples/simple-osgi/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-osgi/pom.xml?rev=1612878&r1=1612877&r2=1612878&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-osgi/pom.xml (original)
+++ tomee/tomee/trunk/examples/simple-osgi/pom.xml Wed Jul 23 17:20:44 2014
@@ -87,7 +87,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0-6</version>
+ <version>7.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: tomee/tomee/trunk/examples/simple-rest/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-rest/pom.xml?rev=1612878&r1=1612877&r2=1612878&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-rest/pom.xml (original)
+++ tomee/tomee/trunk/examples/simple-rest/pom.xml Wed Jul 23 17:20:44 2014
@@ -56,7 +56,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0-6</version>
+ <version>7.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
Modified: tomee/tomee/trunk/examples/simple-singleton/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-singleton/pom.xml?rev=1612878&r1=1612877&r2=1612878&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-singleton/pom.xml (original)
+++ tomee/tomee/trunk/examples/simple-singleton/pom.xml Wed Jul 23 17:20:44 2014
@@ -57,7 +57,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0-6</version>
+ <version>7.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: tomee/tomee/trunk/examples/simple-stateful-callbacks/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-stateful-callbacks/pom.xml?rev=1612878&r1=1612877&r2=1612878&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-stateful-callbacks/pom.xml (original)
+++ tomee/tomee/trunk/examples/simple-stateful-callbacks/pom.xml Wed Jul 23 17:20:44 2014
@@ -54,7 +54,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0-6</version>
+ <version>7.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: tomee/tomee/trunk/examples/simple-stateful/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-stateful/pom.xml?rev=1612878&r1=1612877&r2=1612878&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-stateful/pom.xml (original)
+++ tomee/tomee/trunk/examples/simple-stateful/pom.xml Wed Jul 23 17:20:44 2014
@@ -54,7 +54,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0-6</version>
+ <version>7.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: tomee/tomee/trunk/examples/simple-stateless-callbacks/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-stateless-callbacks/pom.xml?rev=1612878&r1=1612877&r2=1612878&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-stateless-callbacks/pom.xml (original)
+++ tomee/tomee/trunk/examples/simple-stateless-callbacks/pom.xml Wed Jul 23 17:20:44 2014
@@ -54,7 +54,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0-6</version>
+ <version>7.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: tomee/tomee/trunk/examples/simple-stateless-with-descriptor/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-stateless-with-descriptor/pom.xml?rev=1612878&r1=1612877&r2=1612878&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-stateless-with-descriptor/pom.xml (original)
+++ tomee/tomee/trunk/examples/simple-stateless-with-descriptor/pom.xml Wed Jul 23 17:20:44 2014
@@ -54,7 +54,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0-6</version>
+ <version>7.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: tomee/tomee/trunk/examples/simple-stateless/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-stateless/pom.xml?rev=1612878&r1=1612877&r2=1612878&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-stateless/pom.xml (original)
+++ tomee/tomee/trunk/examples/simple-stateless/pom.xml Wed Jul 23 17:20:44 2014
@@ -54,7 +54,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0-6</version>
+ <version>7.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: tomee/tomee/trunk/examples/simple-webservice-without-interface/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-webservice-without-interface/pom.xml?rev=1612878&r1=1612877&r2=1612878&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-webservice-without-interface/pom.xml (original)
+++ tomee/tomee/trunk/examples/simple-webservice-without-interface/pom.xml Wed Jul 23 17:20:44 2014
@@ -54,7 +54,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0-6</version>
+ <version>7.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: tomee/tomee/trunk/examples/simple-webservice/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-webservice/pom.xml?rev=1612878&r1=1612877&r2=1612878&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-webservice/pom.xml (original)
+++ tomee/tomee/trunk/examples/simple-webservice/pom.xml Wed Jul 23 17:20:44 2014
@@ -54,7 +54,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0-6</version>
+ <version>7.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: tomee/tomee/trunk/examples/spring-data-proxy-meta/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/spring-data-proxy-meta/pom.xml?rev=1612878&r1=1612877&r2=1612878&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/spring-data-proxy-meta/pom.xml (original)
+++ tomee/tomee/trunk/examples/spring-data-proxy-meta/pom.xml Wed Jul 23 17:20:44 2014
@@ -51,7 +51,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0-6</version>
+ <version>7.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: tomee/tomee/trunk/examples/spring-data-proxy/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/spring-data-proxy/pom.xml?rev=1612878&r1=1612877&r2=1612878&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/spring-data-proxy/pom.xml (original)
+++ tomee/tomee/trunk/examples/spring-data-proxy/pom.xml Wed Jul 23 17:20:44 2014
@@ -51,7 +51,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0-6</version>
+ <version>7.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: tomee/tomee/trunk/examples/struts/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/struts/pom.xml?rev=1612878&r1=1612877&r2=1612878&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/struts/pom.xml (original)
+++ tomee/tomee/trunk/examples/struts/pom.xml Wed Jul 23 17:20:44 2014
@@ -85,7 +85,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0-6</version>
+ <version>7.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: tomee/tomee/trunk/examples/telephone-stateful/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/telephone-stateful/pom.xml?rev=1612878&r1=1612877&r2=1612878&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/telephone-stateful/pom.xml (original)
+++ tomee/tomee/trunk/examples/telephone-stateful/pom.xml Wed Jul 23 17:20:44 2014
@@ -54,7 +54,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0-6</version>
+ <version>7.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: tomee/tomee/trunk/examples/testcase-injection/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/testcase-injection/pom.xml?rev=1612878&r1=1612877&r2=1612878&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/testcase-injection/pom.xml (original)
+++ tomee/tomee/trunk/examples/testcase-injection/pom.xml Wed Jul 23 17:20:44 2014
@@ -54,7 +54,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0-6</version>
+ <version>7.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: tomee/tomee/trunk/examples/testing-security-2/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/testing-security-2/pom.xml?rev=1612878&r1=1612877&r2=1612878&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/testing-security-2/pom.xml (original)
+++ tomee/tomee/trunk/examples/testing-security-2/pom.xml Wed Jul 23 17:20:44 2014
@@ -59,7 +59,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0-6</version>
+ <version>7.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: tomee/tomee/trunk/examples/testing-security-3/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/testing-security-3/pom.xml?rev=1612878&r1=1612877&r2=1612878&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/testing-security-3/pom.xml (original)
+++ tomee/tomee/trunk/examples/testing-security-3/pom.xml Wed Jul 23 17:20:44 2014
@@ -59,7 +59,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0-6</version>
+ <version>7.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: tomee/tomee/trunk/examples/testing-security-4/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/testing-security-4/pom.xml?rev=1612878&r1=1612877&r2=1612878&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/testing-security-4/pom.xml (original)
+++ tomee/tomee/trunk/examples/testing-security-4/pom.xml Wed Jul 23 17:20:44 2014
@@ -59,7 +59,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0-6</version>
+ <version>7.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: tomee/tomee/trunk/examples/testing-security-meta/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/testing-security-meta/pom.xml?rev=1612878&r1=1612877&r2=1612878&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/testing-security-meta/pom.xml (original)
+++ tomee/tomee/trunk/examples/testing-security-meta/pom.xml Wed Jul 23 17:20:44 2014
@@ -59,7 +59,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0-6</version>
+ <version>7.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: tomee/tomee/trunk/examples/testing-security/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/testing-security/pom.xml?rev=1612878&r1=1612877&r2=1612878&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/testing-security/pom.xml (original)
+++ tomee/tomee/trunk/examples/testing-security/pom.xml Wed Jul 23 17:20:44 2014
@@ -59,7 +59,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0-6</version>
+ <version>7.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: tomee/tomee/trunk/examples/testing-transactions-bmt/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/testing-transactions-bmt/pom.xml?rev=1612878&r1=1612877&r2=1612878&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/testing-transactions-bmt/pom.xml (original)
+++ tomee/tomee/trunk/examples/testing-transactions-bmt/pom.xml Wed Jul 23 17:20:44 2014
@@ -54,7 +54,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0-6</version>
+ <version>7.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: tomee/tomee/trunk/examples/testing-transactions/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/testing-transactions/pom.xml?rev=1612878&r1=1612877&r2=1612878&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/testing-transactions/pom.xml (original)
+++ tomee/tomee/trunk/examples/testing-transactions/pom.xml Wed Jul 23 17:20:44 2014
@@ -54,7 +54,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0-6</version>
+ <version>7.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: tomee/tomee/trunk/examples/tomee-jersey-eclipselink/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/tomee-jersey-eclipselink/pom.xml?rev=1612878&r1=1612877&r2=1612878&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/tomee-jersey-eclipselink/pom.xml (original)
+++ tomee/tomee/trunk/examples/tomee-jersey-eclipselink/pom.xml Wed Jul 23 17:20:44 2014
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0-6</version>
+ <version>7.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: tomee/tomee/trunk/examples/transaction-rollback/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/transaction-rollback/pom.xml?rev=1612878&r1=1612877&r2=1612878&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/transaction-rollback/pom.xml (original)
+++ tomee/tomee/trunk/examples/transaction-rollback/pom.xml Wed Jul 23 17:20:44 2014
@@ -54,7 +54,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0-6</version>
+ <version>7.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: tomee/tomee/trunk/examples/troubleshooting/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/troubleshooting/pom.xml?rev=1612878&r1=1612877&r2=1612878&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/troubleshooting/pom.xml (original)
+++ tomee/tomee/trunk/examples/troubleshooting/pom.xml Wed Jul 23 17:20:44 2014
@@ -54,7 +54,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0-6</version>
+ <version>7.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: tomee/tomee/trunk/examples/webservice-attachments/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/webservice-attachments/pom.xml?rev=1612878&r1=1612877&r2=1612878&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/webservice-attachments/pom.xml (original)
+++ tomee/tomee/trunk/examples/webservice-attachments/pom.xml Wed Jul 23 17:20:44 2014
@@ -54,7 +54,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0-6</version>
+ <version>7.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: tomee/tomee/trunk/examples/webservice-handlerchain/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/webservice-handlerchain/pom.xml?rev=1612878&r1=1612877&r2=1612878&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/webservice-handlerchain/pom.xml (original)
+++ tomee/tomee/trunk/examples/webservice-handlerchain/pom.xml Wed Jul 23 17:20:44 2014
@@ -54,7 +54,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0-6</version>
+ <version>7.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: tomee/tomee/trunk/examples/webservice-holder/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/webservice-holder/pom.xml?rev=1612878&r1=1612877&r2=1612878&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/webservice-holder/pom.xml (original)
+++ tomee/tomee/trunk/examples/webservice-holder/pom.xml Wed Jul 23 17:20:44 2014
@@ -54,7 +54,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0-6</version>
+ <version>7.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: tomee/tomee/trunk/examples/webservice-inheritance/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/webservice-inheritance/pom.xml?rev=1612878&r1=1612877&r2=1612878&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/webservice-inheritance/pom.xml (original)
+++ tomee/tomee/trunk/examples/webservice-inheritance/pom.xml Wed Jul 23 17:20:44 2014
@@ -54,7 +54,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0-6</version>
+ <version>7.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: tomee/tomee/trunk/examples/webservice-security/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/webservice-security/pom.xml?rev=1612878&r1=1612877&r2=1612878&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/webservice-security/pom.xml (original)
+++ tomee/tomee/trunk/examples/webservice-security/pom.xml Wed Jul 23 17:20:44 2014
@@ -54,7 +54,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0-6</version>
+ <version>7.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: tomee/tomee/trunk/examples/webservice-ws-security/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/webservice-ws-security/pom.xml?rev=1612878&r1=1612877&r2=1612878&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/webservice-ws-security/pom.xml (original)
+++ tomee/tomee/trunk/examples/webservice-ws-security/pom.xml Wed Jul 23 17:20:44 2014
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0-6</version>
+ <version>7.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: tomee/tomee/trunk/examples/webservice-ws-security/src/test/java/org/superbiz/calculator/CalculatorTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/webservice-ws-security/src/test/java/org/superbiz/calculator/CalculatorTest.java?rev=1612878&r1=1612877&r2=1612878&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/webservice-ws-security/src/test/java/org/superbiz/calculator/CalculatorTest.java (original)
+++ tomee/tomee/trunk/examples/webservice-ws-security/src/test/java/org/superbiz/calculator/CalculatorTest.java Wed Jul 23 17:20:44 2014
@@ -24,9 +24,9 @@ import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.frontend.ClientProxy;
import org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor;
import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor;
-import org.apache.ws.security.WSConstants;
-import org.apache.ws.security.WSPasswordCallback;
-import org.apache.ws.security.handler.WSHandlerConstants;
+import org.apache.wss4j.common.ext.WSPasswordCallback;
+import org.apache.wss4j.dom.WSConstants;
+import org.apache.wss4j.dom.handler.WSHandlerConstants;
import javax.naming.Context;
import javax.naming.InitialContext;
@@ -74,7 +74,7 @@ public class CalculatorTest extends Test
final Endpoint endpoint = client.getEndpoint();
endpoint.getOutInterceptors().add(new SAAJOutInterceptor());
- final Map<String, Object> outProps = new HashMap<String, Object>();
+ final Map<String, Object> outProps = new HashMap<>();
outProps.put(WSHandlerConstants.ACTION, WSHandlerConstants.USERNAME_TOKEN);
outProps.put(WSHandlerConstants.USER, "jane");
outProps.put(WSHandlerConstants.PASSWORD_TYPE, WSConstants.PW_TEXT);
Modified: tomee/tomee/trunk/examples/webservice-ws-security/src/test/java/org/superbiz/calculator/CustomPasswordHandler.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/webservice-ws-security/src/test/java/org/superbiz/calculator/CustomPasswordHandler.java?rev=1612878&r1=1612877&r2=1612878&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/webservice-ws-security/src/test/java/org/superbiz/calculator/CustomPasswordHandler.java (original)
+++ tomee/tomee/trunk/examples/webservice-ws-security/src/test/java/org/superbiz/calculator/CustomPasswordHandler.java Wed Jul 23 17:20:44 2014
@@ -16,7 +16,7 @@
*/
package org.superbiz.calculator;
-import org.apache.ws.security.WSPasswordCallback;
+import org.apache.wss4j.common.ext.WSPasswordCallback;
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
Modified: tomee/tomee/trunk/examples/webservice-ws-with-resources-config/src/main/java/org/superbiz/ws/security/PasswordCallbackHandler.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/webservice-ws-with-resources-config/src/main/java/org/superbiz/ws/security/PasswordCallbackHandler.java?rev=1612878&r1=1612877&r2=1612878&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/webservice-ws-with-resources-config/src/main/java/org/superbiz/ws/security/PasswordCallbackHandler.java (original)
+++ tomee/tomee/trunk/examples/webservice-ws-with-resources-config/src/main/java/org/superbiz/ws/security/PasswordCallbackHandler.java Wed Jul 23 17:20:44 2014
@@ -16,7 +16,7 @@
*/
package org.superbiz.ws.security;
-import org.apache.ws.security.WSPasswordCallback;
+import org.apache.wss4j.common.ext.WSPasswordCallback;
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
Modified: tomee/tomee/trunk/examples/webservice-ws-with-resources-config/src/test/java/org/superbiz/ws/security/CalculatorTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/webservice-ws-with-resources-config/src/test/java/org/superbiz/ws/security/CalculatorTest.java?rev=1612878&r1=1612877&r2=1612878&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/webservice-ws-with-resources-config/src/test/java/org/superbiz/ws/security/CalculatorTest.java (original)
+++ tomee/tomee/trunk/examples/webservice-ws-with-resources-config/src/test/java/org/superbiz/ws/security/CalculatorTest.java Wed Jul 23 17:20:44 2014
@@ -19,7 +19,7 @@ package org.superbiz.ws.security;
import org.apache.cxf.frontend.ClientProxy;
import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor;
import org.apache.openejb.OpenEjbContainer;
-import org.apache.ws.security.WSPasswordCallback;
+import org.apache.wss4j.common.ext.WSPasswordCallback;
import org.junit.Test;
import javax.ejb.embeddable.EJBContainer;
Modified: tomee/tomee/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/pom.xml?rev=1612878&r1=1612877&r2=1612878&view=diff
==============================================================================
--- tomee/tomee/trunk/pom.xml (original)
+++ tomee/tomee/trunk/pom.xml Wed Jul 23 17:20:44 2014
@@ -123,15 +123,13 @@
<openejb.osgi.symbolic.name>${project.groupId}.${project.artifactId}</openejb.osgi.symbolic.name>
<!-- to change easily the javaee api version -->
- <javaee-api.version>6.0-6</javaee-api.version>
-
- <jaxb.version>2.2.7</jaxb.version>
+ <javaee-api.version>7.0-SNAPSHOT</javaee-api.version>
<tomcat.version>7.0.54</tomcat.version>
- <cxf.version>2.6.14</cxf.version>
+ <cxf.version>3.0.2-SNAPSHOT</cxf.version>
<!--2.6.4 requires wss4j 1.6.8-->
- <ehcache.version>2.6.7</ehcache.version>
+ <ehcache.version>2.8.3</ehcache.version>
<!-- used by cxf for security (replay attack) -->
<jetty.version>7.5.3.v20111011</jetty.version>
<pax-url.version>1.3.5</pax-url.version>
@@ -1513,34 +1511,6 @@
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>${jaxb.version}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.xml</groupId>
- <artifactId>jsr173</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jsr173_api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-xjc</artifactId>
- <version>${jaxb.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-finder-shaded</artifactId>
<version>${xbeanVersion}</version>
@@ -1608,17 +1578,6 @@
<version>${commons-pool.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.ws.security</groupId>
- <artifactId>wss4j</artifactId>
- <version>1.6.15</version>
- <exclusions>
- <exclusion>
- <artifactId>commons-logging</artifactId>
- <groupId>commons-logging</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<artifactId>xmlsec</artifactId>
<groupId>org.apache.santuario</groupId>
<version>1.5.6</version>
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/pom.xml?rev=1612878&r1=1612877&r2=1612878&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/pom.xml (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/pom.xml Wed Jul 23 17:20:44 2014
@@ -28,15 +28,6 @@
<name>OpenEJB :: Server :: CXF RS</name>
<dependencies>
- <!-- TODO: remove when using javaee-api 7 -->
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-json_1.0_spec</artifactId>
- <version>1.0-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
-
-
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -58,6 +49,11 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-service-description</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
<version>${cxf.version}</version>
<exclusions>
@@ -81,6 +77,10 @@
<groupId>xalan</groupId>
<artifactId>serializer</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -115,5 +115,4 @@
<version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
-
</project>
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/Contexts.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/Contexts.java?rev=1612878&r1=1612877&r2=1612878&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/Contexts.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/Contexts.java Wed Jul 23 17:20:44 2014
@@ -17,10 +17,10 @@
package org.apache.openejb.server.cxf.rs;
import org.apache.cxf.jaxrs.ext.ContextProvider;
+import org.apache.cxf.jaxrs.ext.MessageContext;
import org.apache.cxf.jaxrs.model.ClassResourceInfo;
import org.apache.cxf.jaxrs.model.OperationResourceInfo;
import org.apache.cxf.jaxrs.provider.ProviderFactory;
-import org.apache.cxf.jaxrs.utils.AnnotationUtils;
import org.apache.cxf.jaxrs.utils.JAXRSUtils;
import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.Message;
@@ -29,18 +29,30 @@ import org.apache.openejb.rest.ThreadLoc
import javax.annotation.Resource;
import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
import javax.servlet.ServletRequest;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.core.*;
+import javax.ws.rs.core.Application;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.Request;
+import javax.ws.rs.core.SecurityContext;
+import javax.ws.rs.core.UriInfo;
import javax.ws.rs.ext.ContextResolver;
import javax.ws.rs.ext.Providers;
import java.lang.annotation.Annotation;
import java.lang.reflect.Field;
-import java.util.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
public final class Contexts {
- private static final ThreadLocal<Exchange> EXCHANGE = new ThreadLocal<Exchange>();
+ private static final ThreadLocal<Exchange> EXCHANGE = new ThreadLocal<>();
+ private static final Set<Class<?>> CONTEXT_CLASSES = contextClasses();
private Contexts() {
// no-op
@@ -53,7 +65,7 @@ public final class Contexts {
for (final Field f : cls.getDeclaredFields()) {
for (final Annotation a : f.getAnnotations()) {
if (a.annotationType() == Context.class || a.annotationType() == Resource.class
- && AnnotationUtils.isContextClass(f.getType())) {
+ && isContextClass(f.getType())) {
types.add(f.getType());
}
}
@@ -62,6 +74,30 @@ public final class Contexts {
return types;
}
+ private static boolean isContextClass(final Class<?> type) {
+ return CONTEXT_CLASSES.contains(type);
+ }
+
+ private static Set<Class<?>> contextClasses() {
+ final Set<Class<?>> classes = new HashSet<>(); classes.add(UriInfo.class);
+ classes.add(SecurityContext.class);
+ classes.add(HttpHeaders.class);
+ classes.add(ContextResolver.class);
+ classes.add(Providers.class);
+ classes.add(Request.class);
+ /* TODO: when we have jaxrs 2
+ classes.add(ResourceInfo.class);
+ classes.add(ResourceContext.class);
+ */
+ classes.add(Application.class);
+ classes.add(HttpServletRequest.class);
+ classes.add(HttpServletResponse.class);
+ classes.add(ServletConfig.class);
+ classes.add(ServletContext.class);
+ classes.add(MessageContext.class);
+ return classes;
+ }
+
@SuppressWarnings("UnusedDeclaration")
public static void bind(final Exchange exchange) {
if (exchange == null) {
@@ -71,7 +107,7 @@ public final class Contexts {
final ClassResourceInfo cri = exchange.get(OperationResourceInfo.class).getClassResourceInfo();
// binding context fields
- final Set<Class<?>> types = new HashSet<Class<?>>();
+ final Set<Class<?>> types = new HashSet<>();
for (final Field field : cri.getContextFields()) {
types.add(field.getType());
}
@@ -133,7 +169,7 @@ public final class Contexts {
final Object value = provider.createContext(message);
Map<String, Object> map = ThreadLocalContextManager.OTHERS.get();
if (map == null) {
- map = new HashMap<String, Object>();
+ map = new HashMap<>();
ThreadLocalContextManager.OTHERS.set(map);
}
map.put(type.getName(), value);
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRSService.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRSService.java?rev=1612878&r1=1612877&r2=1612878&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRSService.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRSService.java Wed Jul 23 17:20:44 2014
@@ -19,9 +19,8 @@ package org.apache.openejb.server.cxf.rs
import org.apache.cxf.Bus;
import org.apache.cxf.binding.BindingFactoryManager;
import org.apache.cxf.jaxrs.JAXRSBindingFactory;
-import org.apache.openejb.assembler.classic.AppInfo;
-import org.apache.openejb.assembler.classic.WebAppInfo;
-import org.apache.openejb.assembler.classic.event.AssemblerAfterApplicationCreated;
+import org.apache.cxf.transport.DestinationFactory;
+import org.apache.cxf.transport.http.HTTPTransportFactory;
import org.apache.openejb.cdi.WebBeansContextCreated;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.observer.Observes;
@@ -29,11 +28,9 @@ import org.apache.openejb.rest.AbstractR
import org.apache.openejb.rest.RESTResourceFinder;
import org.apache.openejb.rest.ThreadLocalContextManager;
import org.apache.openejb.server.ServiceException;
-import org.apache.openejb.server.cxf.transport.HttpTransportFactory;
import org.apache.openejb.server.cxf.transport.util.CxfUtil;
import org.apache.openejb.server.rest.RESTService;
import org.apache.openejb.server.rest.RsHttpListener;
-import org.apache.openejb.spi.ContainerSystem;
import org.apache.webbeans.annotation.AnyLiteral;
import org.apache.webbeans.annotation.EmptyAnnotationLiteral;
import org.apache.webbeans.config.WebBeansContext;
@@ -77,7 +74,7 @@ import static java.util.Arrays.asList;
public class CxfRSService extends RESTService {
private static final String NAME = "cxf-rs";
- private HttpTransportFactory httpTransportFactory;
+ private DestinationFactory destinationFactory;
@Override
public void service(final InputStream in, final OutputStream out) throws ServiceException, IOException {
@@ -146,7 +143,7 @@ public class CxfRSService extends RESTSe
@Override
protected void beforeStart() {
super.beforeStart();
- httpTransportFactory = new HttpTransportFactory(CxfUtil.getBus());
+ destinationFactory = new HTTPTransportFactory();
}
@Override
@@ -164,7 +161,7 @@ public class CxfRSService extends RESTSe
@Override
protected RsHttpListener createHttpListener() {
- return new CxfRsHttpListener(httpTransportFactory, getWildcard());
+ return new CxfRsHttpListener(destinationFactory, getWildcard());
}
private static class ContextLiteral extends EmptyAnnotationLiteral<Context> implements Context {
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java?rev=1612878&r1=1612877&r2=1612878&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java Wed Jul 23 17:20:44 2014
@@ -22,20 +22,16 @@ import org.apache.cxf.endpoint.ServerImp
import org.apache.cxf.helpers.IOUtils;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.JAXRSServiceImpl;
-import org.apache.cxf.jaxrs.ext.RequestHandler;
import org.apache.cxf.jaxrs.ext.ResourceComparator;
import org.apache.cxf.jaxrs.lifecycle.ResourceProvider;
import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
import org.apache.cxf.jaxrs.model.ClassResourceInfo;
import org.apache.cxf.jaxrs.model.MethodDispatcher;
import org.apache.cxf.jaxrs.model.OperationResourceInfo;
-import org.apache.cxf.jaxrs.model.ProviderInfo;
-import org.apache.cxf.jaxrs.model.wadl.WadlGenerator;
import org.apache.cxf.jaxrs.provider.JAXBElementProvider;
-import org.apache.cxf.jaxrs.provider.json.JSONProvider;
import org.apache.cxf.service.invoker.Invoker;
+import org.apache.cxf.transport.DestinationFactory;
import org.apache.cxf.transport.http.AbstractHTTPDestination;
-import org.apache.cxf.transport.http.HTTPTransportFactory;
import org.apache.cxf.transport.servlet.BaseUrlHelper;
import org.apache.fleece.jaxrs.FleeceProvider;
import org.apache.fleece.jaxrs.JsrProvider;
@@ -66,7 +62,6 @@ import org.apache.openejb.util.LogCatego
import org.apache.openejb.util.Logger;
import org.apache.openejb.util.proxy.ProxyEJB;
import org.apache.webbeans.config.WebBeansContext;
-import org.w3c.dom.Document;
import javax.management.ObjectName;
import javax.management.openmbean.TabularData;
@@ -75,21 +70,12 @@ import javax.servlet.ServletException;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.Produces;
import javax.ws.rs.core.Application;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.ext.MessageBodyReader;
-import javax.ws.rs.ext.MessageBodyWriter;
-import javax.ws.rs.ext.Provider;
import javax.xml.bind.Marshaller;
import java.io.IOException;
import java.io.InputStream;
-import java.io.OutputStream;
import java.lang.annotation.Annotation;
import java.lang.reflect.Constructor;
-import java.lang.reflect.Type;
import java.net.HttpURLConnection;
import java.net.URL;
import java.util.ArrayList;
@@ -121,17 +107,17 @@ public class CxfRsHttpListener implement
private static final Map<String, String> STATIC_CONTENT_TYPES;
- private final HTTPTransportFactory transportFactory;
+ private final DestinationFactory transportFactory;
private final String wildcard;
private AbstractHTTPDestination destination;
private Server server;
private String context = "";
private String servlet = "";
- private final Collection<Pattern> staticResourcesList = new CopyOnWriteArrayList<Pattern>();
- private final List<ObjectName> jmxNames = new ArrayList<ObjectName>();
+ private final Collection<Pattern> staticResourcesList = new CopyOnWriteArrayList<>();
+ private final List<ObjectName> jmxNames = new ArrayList<>();
static {
- STATIC_CONTENT_TYPES = new HashMap<String, String>();
+ STATIC_CONTENT_TYPES = new HashMap<>();
STATIC_CONTENT_TYPES.put("html", "text/html");
STATIC_CONTENT_TYPES.put("xhtml", "text/html");
STATIC_CONTENT_TYPES.put("txt", "text/plain");
@@ -141,27 +127,10 @@ public class CxfRsHttpListener implement
STATIC_CONTENT_TYPES.put("ico", "image/ico");
STATIC_CONTENT_TYPES.put("pdf", "application/pdf");
STATIC_CONTENT_TYPES.put("xsd", "application/xml");
-
- for (final ProviderInfo<RequestHandler> rh : org.apache.cxf.jaxrs.provider.ProviderFactory.getSharedInstance().getRequestHandlers()) {
- final RequestHandler provider = rh.getProvider();
- if (WadlGenerator.class.isInstance(provider)) {
- final WadlGenerator wadlGenerator = WadlGenerator.class.cast(provider);
- final String ignoreRequests = SystemInstance.get().getProperty("openejb.cxf-rs.wadl-generator.ignoreRequests");
- final String ignoreMessageWriters = SystemInstance.get().getProperty("openejb.cxf-rs.wadl-generator.ignoreMessageWriters", "false");
-
- if (ignoreRequests != null) {
- wadlGenerator.setIgnoreRequests(Boolean.parseBoolean(ignoreRequests));
- }
- // CXF-5319: bug in CXF? it prevents to get the wadl as json otherwise
- if (ignoreMessageWriters != null) {
- wadlGenerator.setIgnoreMessageWriters(Boolean.parseBoolean(ignoreMessageWriters));
- }
- }
- }
}
- public CxfRsHttpListener(final HTTPTransportFactory httpTransportFactory, final String star) {
- transportFactory = httpTransportFactory;
+ public CxfRsHttpListener(final DestinationFactory destinationFactory, final String star) {
+ transportFactory = destinationFactory;
wildcard = star;
}
@@ -314,7 +283,7 @@ public class CxfRsHttpListener implement
}
private Collection<Object> providers(final Collection<ServiceInfo> services, final Collection<Object> additionalProviders) {
- final Collection<Object> instances = new ArrayList<Object>();
+ final Collection<Object> instances = new ArrayList<>();
for (final Object o : additionalProviders) {
if (o instanceof Class<?>) {
final Class<?> clazz = (Class<?>) o;
@@ -382,7 +351,7 @@ public class CxfRsHttpListener implement
configureFactory(additionalProviders, serviceConfiguration, factory);
factory.setApplication(application);
- final List<Class<?>> classes = new ArrayList<Class<?>>();
+ final List<Class<?>> classes = new ArrayList<>();
for (final Class<?> clazz : application.getClasses()) {
if (!additionalProviders.contains(clazz) && !clazz.isInterface()) {
@@ -468,7 +437,7 @@ public class CxfRsHttpListener implement
private void logEndpoints(final Application application, final String prefix,
final Map<String, EJBRestServiceInfo> restEjbs,
final JAXRSServerFactoryBean factory, final String base) {
- final List<Logs.LogResourceEndpointInfo> resourcesToLog = new ArrayList<Logs.LogResourceEndpointInfo>();
+ final List<Logs.LogResourceEndpointInfo> resourcesToLog = new ArrayList<>();
int classSize = 0;
int addressSize = 0;
@@ -495,7 +464,7 @@ public class CxfRsHttpListener implement
int methodSize = 7;
int methodStrSize = 0;
- final List<Logs.LogOperationEndpointInfo> toLog = new ArrayList<Logs.LogOperationEndpointInfo>();
+ final List<Logs.LogOperationEndpointInfo> toLog = new ArrayList<>();
final MethodDispatcher md = info.getMethodDispatcher();
for (final OperationResourceInfo ori : md.getOperationResourceInfos()) {
@@ -559,7 +528,7 @@ public class CxfRsHttpListener implement
private JAXRSServerFactoryBean newFactory(final String prefix) {
final JAXRSServerFactoryBean factory = new JAXRSServerFactoryBean();
factory.setDestinationFactory(transportFactory);
- factory.setBus(transportFactory.getBus());
+ factory.setBus(CxfUtil.getBus());
factory.setAddress(prefix);
return factory;
}
@@ -607,7 +576,7 @@ public class CxfRsHttpListener implement
{
final String provider = serviceConfiguration.getProperties().getProperty(PROVIDERS_KEY);
if (provider != null) {
- providersConfig = new HashSet<String>();
+ providersConfig = new HashSet<>();
for (final String p : Arrays.asList(provider.split(","))) {
providersConfig.add(p.trim());
}
@@ -616,7 +585,7 @@ public class CxfRsHttpListener implement
{
if (GLOBAL_PROVIDERS != null) {
if (providersConfig == null) {
- providersConfig = new HashSet<String>();
+ providersConfig = new HashSet<>();
}
providersConfig.addAll(Arrays.asList(GLOBAL_PROVIDERS.split(",")));
}
@@ -635,7 +604,7 @@ public class CxfRsHttpListener implement
}
}
if (providers == null) {
- providers = new ArrayList<Object>(4);
+ providers = new ArrayList<>(4);
if (additionalProviders != null && !additionalProviders.isEmpty()) {
providers.addAll(providers(services, additionalProviders));
} else {
@@ -656,7 +625,7 @@ public class CxfRsHttpListener implement
private static List<Object> defaultProviders() {
final JAXBElementProvider jaxb = new JAXBElementProvider();
- final Map<String, Object> jaxbProperties = new HashMap<String, Object>();
+ final Map<String, Object> jaxbProperties = new HashMap<>();
jaxbProperties.put(Marshaller.JAXB_FRAGMENT, true);
jaxb.setMarshallerProperties(jaxbProperties);
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/OpenEJBPerRequestPojoResourceProvider.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/OpenEJBPerRequestPojoResourceProvider.java?rev=1612878&r1=1612877&r2=1612878&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/OpenEJBPerRequestPojoResourceProvider.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/OpenEJBPerRequestPojoResourceProvider.java Wed Jul 23 17:20:44 2014
@@ -19,7 +19,6 @@ package org.apache.openejb.server.cxf.rs
import org.apache.cxf.jaxrs.lifecycle.ResourceProvider;
import org.apache.cxf.jaxrs.utils.InjectionUtils;
import org.apache.cxf.jaxrs.utils.ResourceUtils;
-import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.Message;
import org.apache.openejb.Injection;
import org.apache.openejb.InjectionProcessor;
@@ -47,11 +46,9 @@ import java.lang.reflect.InvocationTarge
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
-import java.util.logging.Level;
public class OpenEJBPerRequestPojoResourceProvider implements ResourceProvider {
protected final Collection<Injection> injections;
@@ -63,7 +60,7 @@ public class OpenEJBPerRequestPojoResour
protected final Method preDestroyMethod;
protected final ClassLoader classLoader;
- private final Collection<Class<?>> contextTypes = new HashSet<Class<?>>();
+ private final Collection<Class<?>> contextTypes = new HashSet<>();
private final BeanManagerImpl bm;
private final Bean<?> bean;
private final BeanCreator normalScopeCreator;
@@ -294,11 +291,11 @@ public class OpenEJBPerRequestPojoResour
@Override
public Object create() {
- final Object[] values = ResourceUtils.createConstructorArguments(constructor, m);
+ final Object[] values = ResourceUtils.createConstructorArguments(constructor, m, true);
try {
instance = constructor.newInstance(values);
- injector = new InjectionProcessor<Object>(instance, new ArrayList<Injection>(injections), InjectionProcessor.unwrap(context));
+ injector = new InjectionProcessor<>(instance, new ArrayList<>(injections), InjectionProcessor.unwrap(context));
instance = injector.createInstance();
final BeanManager bm = webbeansContext.getBeanManagerImpl();
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/DynamicSubclassEjbDeploymentTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/DynamicSubclassEjbDeploymentTest.java?rev=1612878&r1=1612877&r2=1612878&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/DynamicSubclassEjbDeploymentTest.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/DynamicSubclassEjbDeploymentTest.java Wed Jul 23 17:20:44 2014
@@ -73,7 +73,8 @@ public class DynamicSubclassEjbDeploymen
@Test
public void rest() {
- final String response = WebClient.create("http://localhost:" + port + "/openejb-cxf-rs").path("/ejb/rest").get(String.class);
+ final String response = WebClient.create("http://localhost:" + port + "/openejb-cxf-rs")
+ .path("/ejb/rest").get(String.class);
assertEquals("ok", response);
}
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RsJMXTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RsJMXTest.java?rev=1612878&r1=1612877&r2=1612878&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RsJMXTest.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RsJMXTest.java Wed Jul 23 17:20:44 2014
@@ -75,7 +75,7 @@ public class RsJMXTest {
assertTrue(LocalMBeanServer.get().isRegistered(name));
final String wadlXml = String.class.cast(LocalMBeanServer.get().invoke(name, "getWadl", new Object[]{null}, new String[0]));
- assertThat(wadlXml, wadlXml, CoreMatchers.containsString("<resources base=\"http://127.0.0.1:" + port + "/app/"));
+ assertThat(wadlXml, wadlXml, CoreMatchers.containsString("<resources base=\"http://localhost:" + port + "/app/"));
/* need a fix from cxf which will be shipped soon so deactivating it ATM
final String wadlJson = String.class.cast(LocalMBeanServer.get().invoke(name, "getWadl", new Object[]{"json"}, new String[0]));
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationTest.java?rev=1612878&r1=1612877&r2=1612878&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationTest.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationTest.java Wed Jul 23 17:20:44 2014
@@ -16,7 +16,6 @@
*/
package org.apache.openejb.server.cxf.rs;
-import org.apache.cxf.jaxrs.client.ServerWebApplicationException;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.openejb.OpenEjbContainer;
import org.apache.openejb.jee.WebApp;
@@ -39,6 +38,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import javax.servlet.http.HttpServletResponse;
+import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Application;
import javax.ws.rs.core.Response;
import java.io.BufferedReader;
@@ -164,7 +164,7 @@ public class SimpleApplicationTest {
assertEquals("hi Pink Floyd", writer.toString());
}
- @Test(expected = ServerWebApplicationException.class)
+ @Test(expected = WebApplicationException.class)
public void nonListed() {
WebClient.create(BASE_URL).path("/non-listed/yata/foo").get(String.class);
}
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationWithLongMappingTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationWithLongMappingTest.java?rev=1612878&r1=1612877&r2=1612878&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationWithLongMappingTest.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationWithLongMappingTest.java Wed Jul 23 17:20:44 2014
@@ -16,7 +16,6 @@
*/
package org.apache.openejb.server.cxf.rs;
-import org.apache.cxf.jaxrs.client.ServerWebApplicationException;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.openejb.OpenEjbContainer;
import org.apache.openejb.jee.WebApp;
@@ -38,6 +37,7 @@ import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
+import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Application;
import java.util.Properties;
@@ -86,7 +86,7 @@ public class SimpleApplicationWithLongMa
assertEquals("hi 2nd", hi);
}
- @Test(expected = ServerWebApplicationException.class)
+ @Test(expected = WebApplicationException.class)
public void nonListed() {
WebClient.create(BASE_URL).path("/non-listed/yata/foo").get(String.class);
}
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationWithLongMappingWithNoAppPathTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationWithLongMappingWithNoAppPathTest.java?rev=1612878&r1=1612877&r2=1612878&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationWithLongMappingWithNoAppPathTest.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationWithLongMappingWithNoAppPathTest.java Wed Jul 23 17:20:44 2014
@@ -16,7 +16,6 @@
*/
package org.apache.openejb.server.cxf.rs;
-import org.apache.cxf.jaxrs.client.ServerWebApplicationException;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.openejb.OpenEjbContainer;
import org.apache.openejb.jee.WebApp;
@@ -38,6 +37,7 @@ import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
+import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Application;
import java.util.Properties;
@@ -89,7 +89,7 @@ public class SimpleApplicationWithLongMa
assertEquals("hi 2nd", hi);
}
- @Test(expected = ServerWebApplicationException.class)
+ @Test(expected = WebApplicationException.class)
public void nonListed() {
WebClient.create(BASE_URL).path("/non-listed/yata/foo").get(String.class);
}
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationWithMappingTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationWithMappingTest.java?rev=1612878&r1=1612877&r2=1612878&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationWithMappingTest.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationWithMappingTest.java Wed Jul 23 17:20:44 2014
@@ -16,7 +16,6 @@
*/
package org.apache.openejb.server.cxf.rs;
-import org.apache.cxf.jaxrs.client.ServerWebApplicationException;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.openejb.OpenEjbContainer;
import org.apache.openejb.jee.WebApp;
@@ -38,6 +37,7 @@ import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
+import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Application;
import java.util.Properties;
@@ -86,7 +86,7 @@ public class SimpleApplicationWithMappin
assertEquals("hi 2nd", hi);
}
- @Test(expected = ServerWebApplicationException.class)
+ @Test(expected = WebApplicationException.class)
public void nonListed() {
WebClient.create(BASE_URL).path("/non-listed/yata/foo").get(String.class);
}
Copied: tomee/tomee/trunk/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/OpenEJBHttpDestinationFactory.java (from r1612877, tomee/tomee/trunk/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/HttpTransportFactory.java)
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/OpenEJBHttpDestinationFactory.java?p2=tomee/tomee/trunk/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/OpenEJBHttpDestinationFactory.java&p1=tomee/tomee/trunk/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/HttpTransportFactory.java&r1=1612877&r2=1612878&rev=1612878&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/HttpTransportFactory.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/OpenEJBHttpDestinationFactory.java Wed Jul 23 17:20:44 2014
@@ -19,23 +19,16 @@ package org.apache.openejb.server.cxf.tr
import org.apache.cxf.Bus;
import org.apache.cxf.service.model.EndpointInfo;
-import org.apache.cxf.transport.Destination;
-import org.apache.cxf.transport.http.HTTPTransportFactory;
+import org.apache.cxf.transport.http.AbstractHTTPDestination;
+import org.apache.cxf.transport.http.DestinationRegistry;
+import org.apache.cxf.transport.http.HttpDestinationFactory;
import java.io.IOException;
-public class HttpTransportFactory extends HTTPTransportFactory {
- public HttpTransportFactory() {
- // no-op
- }
-
- public HttpTransportFactory(Bus bus) {
- setBus(bus);
-
- }
-
+public class OpenEJBHttpDestinationFactory implements HttpDestinationFactory {
@Override
- public Destination getDestination(EndpointInfo endpointInfo) throws IOException {
- return new HttpDestination(getBus(), getRegistry(), endpointInfo, endpointInfo.getAddress());
+ public AbstractHTTPDestination createDestination(final EndpointInfo endpointInfo, final Bus bus,
+ final DestinationRegistry registry) throws IOException {
+ return new HttpDestination(bus, registry, endpointInfo, endpointInfo.getAddress());
}
}
Modified: tomee/tomee/trunk/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/util/CxfUtil.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/util/CxfUtil.java?rev=1612878&r1=1612877&r2=1612878&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/util/CxfUtil.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/util/CxfUtil.java Wed Jul 23 17:20:44 2014
@@ -21,18 +21,17 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.binding.BindingFactory;
import org.apache.cxf.binding.BindingFactoryManager;
import org.apache.cxf.bus.CXFBusFactory;
-import org.apache.cxf.bus.CXFBusImpl;
-import org.apache.cxf.bus.managers.BindingFactoryManagerImpl;
import org.apache.cxf.common.logging.LogUtils;
-import org.apache.cxf.configuration.spring.MapProvider;
import org.apache.cxf.databinding.DataBinding;
import org.apache.cxf.endpoint.AbstractEndpointFactory;
import org.apache.cxf.feature.AbstractFeature;
-import org.apache.cxf.interceptor.AbstractBasicInterceptorProvider;
+import org.apache.cxf.feature.Feature;
import org.apache.cxf.interceptor.Interceptor;
+import org.apache.cxf.interceptor.InterceptorProvider;
import org.apache.cxf.management.InstrumentationManager;
import org.apache.cxf.management.jmx.InstrumentationManagerImpl;
import org.apache.cxf.message.Message;
+import org.apache.cxf.transport.http.HttpDestinationFactory;
import org.apache.openejb.OpenEJBRuntimeException;
import org.apache.openejb.assembler.classic.OpenEjbConfiguration;
import org.apache.openejb.assembler.classic.ServiceInfo;
@@ -40,7 +39,9 @@ import org.apache.openejb.assembler.clas
import org.apache.openejb.assembler.classic.util.ServiceInfos;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.monitoring.LocalMBeanServer;
+import org.apache.openejb.server.cxf.transport.OpenEJBHttpDestinationFactory;
import org.apache.openejb.util.PropertiesHelper;
+import org.apache.openejb.util.reflection.Reflections;
import javax.management.MBeanServer;
import java.lang.reflect.InvocationHandler;
@@ -50,7 +51,6 @@ import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Properties;
-import java.util.concurrent.ConcurrentHashMap;
import java.util.logging.Level;
public final class CxfUtil {
@@ -65,16 +65,15 @@ public final class CxfUtil {
public static final String DEBUG = "debug";
public static final String BUS_PREFIX = "org.apache.openejb.cxf.bus.";
public static final String BUS_CONFIGURED_FLAG = "openejb.cxf.bus.configured";
- private static final Map<String, BindingFactory> bindingFactoryMap = new ConcurrentHashMap<String, BindingFactory>(8, 0.75f, 4);
private static final Bus DEFAULT_BUS = initDefaultBus(); // has to be initializd after bindingFactoryMap
- private static volatile boolean usingBindingFactoryMap = false;
+ private static Map<String, BindingFactory> bindingFactoryMap;
private CxfUtil() {
// no-op
}
public static boolean hasService(final String name) {
- return usingBindingFactoryMap && bindingFactoryMap.containsKey(name);
+ return bindingFactoryMap != null && bindingFactoryMap.containsKey(name);
}
private static Bus initDefaultBus() {
@@ -83,16 +82,9 @@ public final class CxfUtil {
try { // create the bus reusing cxf logic but skipping factory lookup
final Bus bus = BusFactory.newInstance(CXFBusFactory.class.getName()).createBus();
final BindingFactoryManager bfm = bus.getExtension(BindingFactoryManager.class);
+ bindingFactoryMap = (Map<String, BindingFactory>) Reflections.get(bfm, "bindingFactories");
- if (BindingFactoryManagerImpl.class.isInstance(bfm) && !usingBindingFactoryMap) {
- BindingFactoryManagerImpl.class.cast(bfm).setMapProvider(new MapProvider<String, BindingFactory>() {
- @Override
- public Map<String, BindingFactory> createMap() {
- usingBindingFactoryMap = true;
- return bindingFactoryMap;
- }
- });
- }
+ bus.setExtension(new OpenEJBHttpDestinationFactory(), HttpDestinationFactory.class);
// ensure client proxies can use app classes
CXFBusFactory.setDefaultBus(Bus.class.cast(Proxy.newProxyInstance(CxfUtil.class.getClassLoader(), new Class<?>[]{Bus.class}, new ClientAwareBusHandler())));
@@ -107,11 +99,6 @@ public final class CxfUtil {
return DEFAULT_BUS;
}
- @Deprecated // no more useful since we create it once
- public static Bus getDefaultBus() {
- return getBus();
- }
-
public static ClassLoader initBusLoader() {
final ClassLoader loader = CxfUtil.getBus().getExtension(ClassLoader.class);
if (loader != null) {
@@ -154,8 +141,8 @@ public final class CxfUtil {
// endpoint features
final String featuresIds = beanConfig.getProperty(prefix + FEATURES);
if (featuresIds != null) {
- final List<?> features = createFeatures(availableServices, featuresIds);
- svrFactory.setFeatures((List<AbstractFeature>) features);
+ final List<? extends Feature> features = createFeatures(availableServices, featuresIds);
+ svrFactory.setFeatures(features);
}
configureInterceptors(svrFactory, prefix, availableServices, beanConfig);
@@ -186,7 +173,7 @@ public final class CxfUtil {
}
}
- public static void configureInterceptors(final AbstractBasicInterceptorProvider abip, final String prefix, final Collection<ServiceInfo> availableServices, final Properties beanConfig) {
+ public static void configureInterceptors(final InterceptorProvider abip, final String prefix, final Collection<ServiceInfo> availableServices, final Properties beanConfig) {
// interceptors
final String inInterceptorsIds = beanConfig.getProperty(prefix + IN_INTERCEPTORS);
if (inInterceptorsIds != null && !inInterceptorsIds.trim().isEmpty()) {
@@ -209,14 +196,14 @@ public final class CxfUtil {
}
}
- public static List<AbstractFeature> createFeatures(final Collection<ServiceInfo> availableServices, final String featuresIds) {
+ public static List<Feature> createFeatures(final Collection<ServiceInfo> availableServices, final String featuresIds) {
final List<?> features = ServiceInfos.resolve(availableServices, featuresIds.split(","));
- for (Object instance : features) {
+ for (final Object instance : features) {
if (!AbstractFeature.class.isInstance(instance)) {
throw new OpenEJBRuntimeException("feature should inherit from " + AbstractFeature.class.getName());
}
}
- return (List<AbstractFeature>) features;
+ return (List<Feature>) features;
}
public static List<Interceptor<? extends Message>> createInterceptors(final Collection<ServiceInfo> availableServices, final String ids) {
@@ -258,37 +245,34 @@ public final class CxfUtil {
}
}
- if (bus instanceof CXFBusImpl) {
- final ServiceConfiguration configuration = new ServiceConfiguration(SystemInstance.get().getProperties(),
- SystemInstance.get().getComponent(OpenEjbConfiguration.class).facilities.services);
-
- final CXFBusImpl busImpl = (CXFBusImpl) bus;
- final Collection<ServiceInfo> serviceInfos = configuration.getAvailableServices();
- final Properties properties = configuration.getProperties();
- if (properties == null || properties.isEmpty()) {
- return;
- }
+ final ServiceConfiguration configuration = new ServiceConfiguration(SystemInstance.get().getProperties(),
+ SystemInstance.get().getComponent(OpenEjbConfiguration.class).facilities.services);
- final String featuresIds = properties.getProperty(BUS_PREFIX + FEATURES);
- if (featuresIds != null) {
- final List<AbstractFeature> features = createFeatures(serviceInfos, featuresIds);
- if (features != null) {
- features.addAll(busImpl.getFeatures());
- busImpl.setFeatures(features);
- }
- }
+ final Collection<ServiceInfo> serviceInfos = configuration.getAvailableServices();
+ final Properties properties = configuration.getProperties();
+ if (properties == null || properties.isEmpty()) {
+ return;
+ }
- final Properties busProperties = ServiceInfos.serviceProperties(serviceInfos, properties.getProperty(BUS_PREFIX + ENDPOINT_PROPERTIES));
- if (busProperties != null) {
- busImpl.getProperties().putAll(PropertiesHelper.map(busProperties));
+ final String featuresIds = properties.getProperty(BUS_PREFIX + FEATURES);
+ if (featuresIds != null) {
+ final List<Feature> features = createFeatures(serviceInfos, featuresIds);
+ if (features != null) {
+ features.addAll(bus.getFeatures());
+ bus.setFeatures(features);
}
+ }
- configureInterceptors(busImpl, BUS_PREFIX, serviceInfos, configuration.getProperties());
+ final Properties busProperties = ServiceInfos.serviceProperties(serviceInfos, properties.getProperty(BUS_PREFIX + ENDPOINT_PROPERTIES));
+ if (busProperties != null) {
+ bus.getProperties().putAll(PropertiesHelper.map(busProperties));
+ }
- SystemInstance.get().getProperties().setProperty(BUS_CONFIGURED_FLAG, "true");
+ configureInterceptors(bus, BUS_PREFIX, serviceInfos, configuration.getProperties());
- busImpl.setId(SystemInstance.get().getProperty("openejb.cxf.bus.id", "openejb.cxf.bus"));
- }
+ SystemInstance.get().getProperties().setProperty(BUS_CONFIGURED_FLAG, "true");
+
+ bus.setId(SystemInstance.get().getProperty("openejb.cxf.bus.id", "openejb.cxf.bus"));
}
private static class ClientAwareBusHandler implements InvocationHandler {
Modified: tomee/tomee/trunk/server/openejb-cxf/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf/pom.xml?rev=1612878&r1=1612877&r2=1612878&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf/pom.xml (original)
+++ tomee/tomee/trunk/server/openejb-cxf/pom.xml Wed Jul 23 17:20:44 2014
@@ -26,16 +26,20 @@
<groupId>org.apache.openejb</groupId>
<version>5.0.0-SNAPSHOT</version>
</parent>
+
<modelVersion>4.0.0</modelVersion>
<artifactId>openejb-cxf</artifactId>
<packaging>jar</packaging>
<name>OpenEJB :: Server :: CXF</name>
+
<properties>
+ <wss4j.version>2.0.1</wss4j.version>
<openejb.osgi.import.pkg>
org.apache.xml.resolver*;resolution:=optional,
*
</openejb.osgi.import.pkg>
</properties>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -57,8 +61,30 @@
<artifactId>wsdl4j</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.ws.security</groupId>
- <artifactId>wss4j</artifactId>
+ <groupId>org.apache.wss4j</groupId>
+ <artifactId>wss4j-ws-security-dom</artifactId>
+ <version>${wss4j.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wss4j</groupId>
+ <artifactId>wss4j-policy</artifactId>
+ <version>${wss4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wss4j</groupId>
+ <artifactId>wss4j-ws-security-stax</artifactId>
+ <version>${wss4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wss4j</groupId>
+ <artifactId>wss4j-ws-security-policy-stax</artifactId>
+ <version>${wss4j.version}</version>
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
@@ -89,6 +115,18 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-javamail_1.4_spec</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
Modified: tomee/tomee/trunk/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/CxfEndpoint.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/CxfEndpoint.java?rev=1612878&r1=1612877&r2=1612878&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/CxfEndpoint.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/CxfEndpoint.java Wed Jul 23 17:20:44 2014
@@ -28,8 +28,8 @@ import org.apache.cxf.jaxws.support.JaxW
import org.apache.cxf.jaxws.support.JaxWsImplementorInfo;
import org.apache.cxf.jaxws.support.JaxWsServiceFactoryBean;
import org.apache.cxf.service.Service;
-import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
-import org.apache.cxf.transport.http.HTTPTransportFactory;
+import org.apache.cxf.transport.DestinationFactory;
+import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean;
import org.apache.openejb.OpenEJBRuntimeException;
import org.apache.openejb.assembler.classic.ServiceInfo;
import org.apache.openejb.assembler.classic.util.ServiceConfiguration;
@@ -78,18 +78,18 @@ public abstract class CxfEndpoint {
protected HandlerResolverImpl handlerResolver;
- protected HTTPTransportFactory httpTransportFactory;
+ protected DestinationFactory destinationFactory;
protected ServiceConfiguration serviceConfiguration;
public CxfEndpoint(Bus bus, PortData port, Context context,
- Object implementor, HTTPTransportFactory httpTransportFactory,
+ Object implementor, DestinationFactory destinationFactory,
ServiceConfiguration configuration) {
this.bus = bus;
this.port = port;
this.context = context;
this.implementor = implementor;
- this.httpTransportFactory = httpTransportFactory;
+ this.destinationFactory = destinationFactory;
this.serviceConfiguration = configuration;
this.bus.setExtension(this, CxfEndpoint.class);
}
@@ -181,7 +181,7 @@ public abstract class CxfEndpoint {
svrFactory.setServiceFactory(serviceFactory);
svrFactory.setStart(false);
svrFactory.setServiceBean(implementor);
- svrFactory.setDestinationFactory(httpTransportFactory);
+ svrFactory.setDestinationFactory(destinationFactory);
svrFactory.setServiceClass(serviceFactory.getServiceClass());
final Properties beanConfig = serviceConfiguration.getProperties();
Modified: tomee/tomee/trunk/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/CxfService.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/CxfService.java?rev=1612878&r1=1612877&r2=1612878&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/CxfService.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/CxfService.java Wed Jul 23 17:20:44 2014
@@ -18,21 +18,20 @@
package org.apache.openejb.server.cxf;
import org.apache.cxf.Bus;
+import org.apache.cxf.binding.soap.SoapTransportFactory;
+import org.apache.cxf.transport.DestinationFactory;
import org.apache.openejb.BeanContext;
import org.apache.openejb.assembler.classic.util.ServiceConfiguration;
import org.apache.openejb.core.webservices.PortData;
import org.apache.openejb.server.cxf.client.SaajInterceptor;
import org.apache.openejb.server.cxf.ejb.EjbWsContainer;
import org.apache.openejb.server.cxf.pojo.PojoWsContainer;
-import org.apache.openejb.server.cxf.transport.HttpTransportFactory;
import org.apache.openejb.server.cxf.transport.util.CxfUtil;
import org.apache.openejb.server.httpd.HttpListener;
import org.apache.openejb.server.webservices.WsService;
import javax.naming.Context;
import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.TreeMap;
@@ -42,7 +41,7 @@ public class CxfService extends WsServic
private final Map<String, CxfWsContainer> wsContainers = new TreeMap<String, CxfWsContainer>();
- private HttpTransportFactory httpTransportFactory;
+ private SoapTransportFactory transportFactory;
public String getName() {
return "cxf";
@@ -53,15 +52,7 @@ public class CxfService extends WsServic
CxfUtil.configureBus();
SaajInterceptor.registerInterceptors();
- initBusTransport(CxfUtil.getBus());
- }
-
- private void initBusTransport(final Bus bus) {
- httpTransportFactory = new HttpTransportFactory(bus);
- final List<String> ids = new ArrayList<String>(httpTransportFactory.getTransportIds().size() + 1);
- ids.addAll(httpTransportFactory.getTransportIds());
- ids.add("http://schemas.xmlsoap.org/wsdl/soap/");
- httpTransportFactory.setTransportIds(ids);
+ transportFactory = new SoapTransportFactory();
}
@Override
@@ -79,7 +70,7 @@ public class CxfService extends WsServic
try {
CxfCatalogUtils.loadOASISCatalog(bus, moduleBaseUrl, "META-INF/jax-ws-catalog.xml");
- final EjbWsContainer container = new EjbWsContainer(bus, httpTransportFactory, port, beanContext, config);
+ final EjbWsContainer container = new EjbWsContainer(bus, transportFactory, port, beanContext, config);
container.start();
wsContainers.put(beanContext.getDeploymentID().toString(), container);
return container;
@@ -98,7 +89,7 @@ public class CxfService extends WsServic
try {
CxfCatalogUtils.loadOASISCatalog(bus, moduleBaseUrl, "META-INF/jax-ws-catalog.xml");
- PojoWsContainer container = new PojoWsContainer(loader, httpTransportFactory, bus, port, context, target, bdgs, services);
+ PojoWsContainer container = new PojoWsContainer(loader, transportFactory, bus, port, context, target, bdgs, services);
container.start();
wsContainers.put(serviceId, container);
return container;
Modified: tomee/tomee/trunk/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/CxfServiceConfiguration.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/CxfServiceConfiguration.java?rev=1612878&r1=1612877&r2=1612878&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/CxfServiceConfiguration.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/CxfServiceConfiguration.java Wed Jul 23 17:20:44 2014
@@ -17,7 +17,7 @@
*/
package org.apache.openejb.server.cxf;
-import org.apache.cxf.service.factory.AbstractServiceConfiguration;
+import org.apache.cxf.wsdl.service.factory.AbstractServiceConfiguration;
import org.apache.openejb.core.webservices.PortData;
import javax.xml.namespace.QName;
Modified: tomee/tomee/trunk/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/CxfWsContainer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/CxfWsContainer.java?rev=1612878&r1=1612877&r2=1612878&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/CxfWsContainer.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/CxfWsContainer.java Wed Jul 23 17:20:44 2014
@@ -18,8 +18,8 @@
package org.apache.openejb.server.cxf;
import org.apache.cxf.Bus;
+import org.apache.cxf.transport.DestinationFactory;
import org.apache.cxf.transport.http.AbstractHTTPDestination;
-import org.apache.cxf.transport.http.HTTPTransportFactory;
import org.apache.openejb.assembler.classic.util.ServiceConfiguration;
import org.apache.openejb.core.webservices.PortData;
import org.apache.openejb.monitoring.LocalMBeanServer;
@@ -35,20 +35,20 @@ public abstract class CxfWsContainer imp
protected final PortData port;
protected AbstractHTTPDestination destination;
protected CxfEndpoint endpoint;
- protected HTTPTransportFactory httpTransportFactory;
+ protected DestinationFactory transportFactory;
protected final ServiceConfiguration serviceConfiguration;
private ObjectName jmxName;
- public CxfWsContainer(final Bus bus, final HTTPTransportFactory httpTransportFactory, final PortData port, final ServiceConfiguration config) {
+ public CxfWsContainer(final Bus bus, final DestinationFactory transportFactory, final PortData port, final ServiceConfiguration config) {
this.bus = bus;
this.port = port;
this.serviceConfiguration = config;
- this.httpTransportFactory = httpTransportFactory;
+ this.transportFactory = transportFactory;
}
public void start() {
endpoint = createEndpoint();
- endpoint.publish("http://" + getFakeUrl() + ":80"); // needs to be unique and with a port
+ endpoint.publish("http://" + getFakeUrl().replace('$', '_') + ":80"); // needs to be unique and with a port
destination = (AbstractHTTPDestination) endpoint.getServer().getDestination();
// register an MBean for this endpoint