JBossWS SVN: r9247 - common/tags.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-02-06 04:34:02 -0500 (Fri, 06 Feb 2009)
New Revision: 9247
Added:
common/tags/jbossws-common-1.0.9.CR2/
Log:
Tagging jbossws-common-1.0.9.CR2
Copied: common/tags/jbossws-common-1.0.9.CR2 (from rev 9246, common/trunk)
15 years, 2 months
JBossWS SVN: r9246 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-02-06 03:49:01 -0500 (Fri, 06 Feb 2009)
New Revision: 9246
Modified:
stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss424.txt
Log:
Restoring excludes
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt 2009-02-05 23:42:11 UTC (rev 9245)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt 2009-02-06 08:49:01 UTC (rev 9246)
@@ -90,3 +90,6 @@
# [JBWS-2480] Soap attachments are dropped on server response
org/jboss/test/ws/jaxws/jbws1283/**
+
+# [JBWS-2491] Enable JAXWS 2.1 WebServiceContext methods
+org/jboss/test/ws/jaxws/jbws2257/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2009-02-05 23:42:11 UTC (rev 9245)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2009-02-06 08:49:01 UTC (rev 9246)
@@ -90,3 +90,6 @@
# [JBWS-2480] Soap attachments are dropped on server response
org/jboss/test/ws/jaxws/jbws1283/**
+
+# [JBWS-2491] Enable JAXWS 2.1 WebServiceContext methods
+org/jboss/test/ws/jaxws/jbws2257/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss424.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss424.txt 2009-02-05 23:42:11 UTC (rev 9245)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss424.txt 2009-02-06 08:49:01 UTC (rev 9246)
@@ -90,3 +90,6 @@
# [JBWS-2480] Soap attachments are dropped on server response
org/jboss/test/ws/jaxws/jbws1283/**
+
+# [JBWS-2491] Enable JAXWS 2.1 WebServiceContext methods
+org/jboss/test/ws/jaxws/jbws2257/**
15 years, 2 months
JBossWS SVN: r9245 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-02-05 18:42:11 -0500 (Thu, 05 Feb 2009)
New Revision: 9245
Modified:
stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss424.txt
Log:
updating excludes files for AS42x
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt 2009-02-05 22:48:11 UTC (rev 9244)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt 2009-02-05 23:42:11 UTC (rev 9245)
@@ -13,9 +13,6 @@
org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.*
org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.*
-# [CXF-1261] Handler does not see XOP message properly
-org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*
-
# [CXF-1510] Cannot handle anonymous bare requests
org/jboss/test/ws/jaxws/anonymous/**
@@ -57,9 +54,6 @@
# [JBWS-1655] Add support for endpoint address rewriting
org/jboss/test/ws/jaxws/jbws2150/**
-# [JBWS-2112] Cannot use CXF with endpoint API
-org/jboss/test/ws/jaxws/endpoint/**
-
# [JBWS-2115] EJB client vehicle not sufficiently isolated
org/jboss/test/ws/jaxws/jbws1581/**
@@ -96,6 +90,3 @@
# [JBWS-2480] Soap attachments are dropped on server response
org/jboss/test/ws/jaxws/jbws1283/**
-
-# [JBWS-2491] Enable JAXWS 2.1 WebServiceContext methods
-org/jboss/test/ws/jaxws/jbws2257/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2009-02-05 22:48:11 UTC (rev 9244)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2009-02-05 23:42:11 UTC (rev 9245)
@@ -13,9 +13,6 @@
org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.*
org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.*
-# [CXF-1261] Handler does not see XOP message properly
-org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*
-
# [CXF-1510] Cannot handle anonymous bare requests
org/jboss/test/ws/jaxws/anonymous/**
@@ -57,9 +54,6 @@
# [JBWS-1655] Add support for endpoint address rewriting
org/jboss/test/ws/jaxws/jbws2150/**
-# [JBWS-2112] Cannot use CXF with endpoint API
-org/jboss/test/ws/jaxws/endpoint/**
-
# [JBWS-2115] EJB client vehicle not sufficiently isolated
org/jboss/test/ws/jaxws/jbws1581/**
@@ -96,6 +90,3 @@
# [JBWS-2480] Soap attachments are dropped on server response
org/jboss/test/ws/jaxws/jbws1283/**
-
-# [JBWS-2491] Enable JAXWS 2.1 WebServiceContext methods
-org/jboss/test/ws/jaxws/jbws2257/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss424.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss424.txt 2009-02-05 22:48:11 UTC (rev 9244)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss424.txt 2009-02-05 23:42:11 UTC (rev 9245)
@@ -13,9 +13,6 @@
org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.*
org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.*
-# [CXF-1261] Handler does not see XOP message properly
-org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*
-
# [CXF-1510] Cannot handle anonymous bare requests
org/jboss/test/ws/jaxws/anonymous/**
@@ -57,9 +54,6 @@
# [JBWS-1655] Add support for endpoint address rewriting
org/jboss/test/ws/jaxws/jbws2150/**
-# [JBWS-2112] Cannot use CXF with endpoint API
-org/jboss/test/ws/jaxws/endpoint/**
-
# [JBWS-2115] EJB client vehicle not sufficiently isolated
org/jboss/test/ws/jaxws/jbws1581/**
@@ -96,6 +90,3 @@
# [JBWS-2480] Soap attachments are dropped on server response
org/jboss/test/ws/jaxws/jbws1283/**
-
-# [JBWS-2491] Enable JAXWS 2.1 WebServiceContext methods
-org/jboss/test/ws/jaxws/jbws2257/**
15 years, 2 months
JBossWS SVN: r9244 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-02-05 17:48:11 -0500 (Thu, 05 Feb 2009)
New Revision: 9244
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
Log:
enabling passing tests
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2009-02-05 18:16:55 UTC (rev 9243)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2009-02-05 22:48:11 UTC (rev 9244)
@@ -17,7 +17,7 @@
<!-- Properties -->
<properties>
<surefire.security.args>-Djava.security.manager -Djava.security.policy=src/test/etc/tst.policy</surefire.security.args>
- <surefire.memory.args>-Xmx512m -XX:MaxPermSize=192m</surefire.memory.args>
+ <surefire.memory.args>-Xmx512m -XX:MaxPermSize=256m</surefire.memory.args>
<surefire.jdwp.args>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005</surefire.jdwp.args>
<test.archive.directory>${project.build.directory}/test-libs</test.archive.directory>
<test.classes.directory>${project.build.directory}/test-classes</test.classes.directory>
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-02-05 18:16:55 UTC (rev 9243)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-02-05 22:48:11 UTC (rev 9244)
@@ -1,6 +1,3 @@
-# Won't Fix: [CXF-1261] Handler does not see XOP message properly
-org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*
-
# Exclude endpoints with AS42 @SecurityDomain
org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointImpl.*
@@ -56,26 +53,13 @@
# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
-org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefServletTestCase.*
# [JBWS-1655] Add support for endpoint address rewriting
org/jboss/test/ws/jaxws/jbws2150/**
-# [JBWS-1178] Multiple virtual host and soap:address problem
-org/jboss/test/ws/jaxws/jbws1178/**
-
-# [JBWS-2112] Cannot use CXF with endpoint API
-org/jboss/test/ws/jaxws/endpoint/**
-
# [JBWS-2115] EJB client vehicle not sufficiently isolated
org/jboss/test/ws/jaxws/jbws1581/**
-# [JBWS-2118] context-root in jboss.xml is ignored
-org/jboss/test/ws/jaxws/jbws1813/**
-
-# [JBWS-2119] WebServiceRef injection from DD doesn't work
-org/jboss/test/ws/jaxws/jbws1841/**
-
# [JBWS-2165] Fix xop tests with maven build
org/jboss/test/ws/jaxws/samples/xop/**
@@ -89,9 +73,6 @@
# [JBWS-2227] Investigate why multiple virtual hosts test fails on CXF
org/jboss/test/ws/jaxws/jbws1178/**
-# [JBWS-2384] NameAlreadyBoundException when more than one virtual host are specified in @WebContext(virtualHosts) annotation variable
-org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
-
# [JBWS-2478] Investigate why WS-Security CXF tests are failing
org/jboss/test/ws/jaxws/samples/wsse/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-02-05 18:16:55 UTC (rev 9243)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-02-05 22:48:11 UTC (rev 9244)
@@ -1,6 +1,3 @@
-# Won't Fix: [CXF-1261] Handler does not see XOP message properly
-org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*
-
# Exclude endpoints with AS42 @SecurityDomain
org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointImpl.*
@@ -56,26 +53,13 @@
# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
-org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefServletTestCase.*
# [JBWS-1655] Add support for endpoint address rewriting
org/jboss/test/ws/jaxws/jbws2150/**
-# [JBWS-1178] Multiple virtual host and soap:address problem
-org/jboss/test/ws/jaxws/jbws1178/**
-
-# [JBWS-2112] Cannot use CXF with endpoint API
-org/jboss/test/ws/jaxws/endpoint/**
-
# [JBWS-2115] EJB client vehicle not sufficiently isolated
org/jboss/test/ws/jaxws/jbws1581/**
-# [JBWS-2118] context-root in jboss.xml is ignored
-org/jboss/test/ws/jaxws/jbws1813/**
-
-# [JBWS-2119] WebServiceRef injection from DD doesn't work
-org/jboss/test/ws/jaxws/jbws1841/**
-
# [JBWS-2165] Fix xop tests with maven build
org/jboss/test/ws/jaxws/samples/xop/**
@@ -89,9 +73,6 @@
# [JBWS-2227] Investigate why multiple virtual hosts test fails on CXF
org/jboss/test/ws/jaxws/jbws1178/**
-# [JBWS-2384] NameAlreadyBoundException when more than one virtual host are specified in @WebContext(virtualHosts) annotation variable
-org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
-
# [JBWS-2478] Investigate why WS-Security CXF tests are failing
org/jboss/test/ws/jaxws/samples/wsse/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-02-05 18:16:55 UTC (rev 9243)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-02-05 22:48:11 UTC (rev 9244)
@@ -1,6 +1,3 @@
-# Won't Fix: [CXF-1261] Handler does not see XOP message properly
-org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*
-
# Exclude endpoints with AS42 @SecurityDomain
org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointImpl.*
@@ -56,26 +53,13 @@
# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
-org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefServletTestCase.*
# [JBWS-1655] Add support for endpoint address rewriting
org/jboss/test/ws/jaxws/jbws2150/**
-# [JBWS-1178] Multiple virtual host and soap:address problem
-org/jboss/test/ws/jaxws/jbws1178/**
-
-# [JBWS-2112] Cannot use CXF with endpoint API
-org/jboss/test/ws/jaxws/endpoint/**
-
# [JBWS-2115] EJB client vehicle not sufficiently isolated
org/jboss/test/ws/jaxws/jbws1581/**
-# [JBWS-2118] context-root in jboss.xml is ignored
-org/jboss/test/ws/jaxws/jbws1813/**
-
-# [JBWS-2119] WebServiceRef injection from DD doesn't work
-org/jboss/test/ws/jaxws/jbws1841/**
-
# [JBWS-2165] Fix xop tests with maven build
org/jboss/test/ws/jaxws/samples/xop/**
@@ -89,9 +73,6 @@
# [JBWS-2227] Investigate why multiple virtual hosts test fails on CXF
org/jboss/test/ws/jaxws/jbws1178/**
-# [JBWS-2384] NameAlreadyBoundException when more than one virtual host are specified in @WebContext(virtualHosts) annotation variable
-org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
-
# [JBWS-2478] Investigate why WS-Security CXF tests are failing
org/jboss/test/ws/jaxws/samples/wsse/**
15 years, 2 months
JBossWS SVN: r9243 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-02-05 13:16:55 -0500 (Thu, 05 Feb 2009)
New Revision: 9243
Modified:
stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss424.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
Log:
[CXF-1518] Enable passing tests
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt 2009-02-05 18:05:03 UTC (rev 9242)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt 2009-02-05 18:16:55 UTC (rev 9243)
@@ -36,9 +36,6 @@
# [CXF-1517] HTTP bindings for Provider
org/jboss/test/ws/jaxws/jbws1807/**
-# [CXF-1518] Missing fault detail in messages from SLSB Provider
-org/jboss/test/ws/jaxws/jbws1815/**
-
# [CXF-1519] Explicitly set the namespace of a WebFault
org/jboss/test/ws/jaxws/jbws1904/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2009-02-05 18:05:03 UTC (rev 9242)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2009-02-05 18:16:55 UTC (rev 9243)
@@ -36,9 +36,6 @@
# [CXF-1517] HTTP bindings for Provider
org/jboss/test/ws/jaxws/jbws1807/**
-# [CXF-1518] Missing fault detail in messages from SLSB Provider
-org/jboss/test/ws/jaxws/jbws1815/**
-
# [CXF-1519] Explicitly set the namespace of a WebFault
org/jboss/test/ws/jaxws/jbws1904/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss424.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss424.txt 2009-02-05 18:05:03 UTC (rev 9242)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss424.txt 2009-02-05 18:16:55 UTC (rev 9243)
@@ -36,9 +36,6 @@
# [CXF-1517] HTTP bindings for Provider
org/jboss/test/ws/jaxws/jbws1807/**
-# [CXF-1518] Missing fault detail in messages from SLSB Provider
-org/jboss/test/ws/jaxws/jbws1815/**
-
# [CXF-1519] Explicitly set the namespace of a WebFault
org/jboss/test/ws/jaxws/jbws1904/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-02-05 18:05:03 UTC (rev 9242)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-02-05 18:16:55 UTC (rev 9243)
@@ -36,9 +36,6 @@
# [CXF-1517] HTTP bindings for Provider
org/jboss/test/ws/jaxws/jbws1807/**
-# [CXF-1518] Missing fault detail in messages from SLSB Provider
-org/jboss/test/ws/jaxws/jbws1815/**
-
# [CXF-1519] Explicitly set the namespace of a WebFault
org/jboss/test/ws/jaxws/jbws1904/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-02-05 18:05:03 UTC (rev 9242)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-02-05 18:16:55 UTC (rev 9243)
@@ -36,9 +36,6 @@
# [CXF-1517] HTTP bindings for Provider
org/jboss/test/ws/jaxws/jbws1807/**
-# [CXF-1518] Missing fault detail in messages from SLSB Provider
-org/jboss/test/ws/jaxws/jbws1815/**
-
# [CXF-1519] Explicitly set the namespace of a WebFault
org/jboss/test/ws/jaxws/jbws1904/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-02-05 18:05:03 UTC (rev 9242)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-02-05 18:16:55 UTC (rev 9243)
@@ -36,9 +36,6 @@
# [CXF-1517] HTTP bindings for Provider
org/jboss/test/ws/jaxws/jbws1807/**
-# [CXF-1518] Missing fault detail in messages from SLSB Provider
-org/jboss/test/ws/jaxws/jbws1815/**
-
# [CXF-1519] Explicitly set the namespace of a WebFault
org/jboss/test/ws/jaxws/jbws1904/**
15 years, 3 months
JBossWS SVN: r9242 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-02-05 13:05:03 -0500 (Thu, 05 Feb 2009)
New Revision: 9242
Modified:
stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss424.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
Log:
Enable passing test
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt 2009-02-05 17:55:54 UTC (rev 9241)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt 2009-02-05 18:05:03 UTC (rev 9242)
@@ -32,7 +32,6 @@
# [CXF-1516] Type inheritance with document/literal/wrapped
org/jboss/test/ws/jaxws/jbws1702/**
-org/jboss/test/ws/jaxws/jbws1733/**
# [CXF-1517] HTTP bindings for Provider
org/jboss/test/ws/jaxws/jbws1807/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2009-02-05 17:55:54 UTC (rev 9241)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2009-02-05 18:05:03 UTC (rev 9242)
@@ -32,7 +32,6 @@
# [CXF-1516] Type inheritance with document/literal/wrapped
org/jboss/test/ws/jaxws/jbws1702/**
-org/jboss/test/ws/jaxws/jbws1733/**
# [CXF-1517] HTTP bindings for Provider
org/jboss/test/ws/jaxws/jbws1807/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss424.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss424.txt 2009-02-05 17:55:54 UTC (rev 9241)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss424.txt 2009-02-05 18:05:03 UTC (rev 9242)
@@ -32,7 +32,6 @@
# [CXF-1516] Type inheritance with document/literal/wrapped
org/jboss/test/ws/jaxws/jbws1702/**
-org/jboss/test/ws/jaxws/jbws1733/**
# [CXF-1517] HTTP bindings for Provider
org/jboss/test/ws/jaxws/jbws1807/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-02-05 17:55:54 UTC (rev 9241)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-02-05 18:05:03 UTC (rev 9242)
@@ -32,7 +32,6 @@
# [CXF-1516] Type inheritance with document/literal/wrapped
org/jboss/test/ws/jaxws/jbws1702/**
-org/jboss/test/ws/jaxws/jbws1733/**
# [CXF-1517] HTTP bindings for Provider
org/jboss/test/ws/jaxws/jbws1807/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-02-05 17:55:54 UTC (rev 9241)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-02-05 18:05:03 UTC (rev 9242)
@@ -32,7 +32,6 @@
# [CXF-1516] Type inheritance with document/literal/wrapped
org/jboss/test/ws/jaxws/jbws1702/**
-org/jboss/test/ws/jaxws/jbws1733/**
# [CXF-1517] HTTP bindings for Provider
org/jboss/test/ws/jaxws/jbws1807/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-02-05 17:55:54 UTC (rev 9241)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-02-05 18:05:03 UTC (rev 9242)
@@ -32,7 +32,6 @@
# [CXF-1516] Type inheritance with document/literal/wrapped
org/jboss/test/ws/jaxws/jbws1702/**
-org/jboss/test/ws/jaxws/jbws1733/**
# [CXF-1517] HTTP bindings for Provider
org/jboss/test/ws/jaxws/jbws1807/**
15 years, 3 months
JBossWS SVN: r9241 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-02-05 12:55:54 -0500 (Thu, 05 Feb 2009)
New Revision: 9241
Modified:
stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss424.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
Log:
[CXF-1515] Enable passing tests
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt 2009-02-05 15:55:26 UTC (rev 9240)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt 2009-02-05 17:55:54 UTC (rev 9241)
@@ -30,9 +30,6 @@
# [JBWS-2247][CXF-1514] Generated WSDL does not take 'transport-guarantee' in web.xml into account
org/jboss/test/ws/jaxws/jbws1190/**
-# [CXF-1515] Bad Enumeration value 'extension restriction'
-org/jboss/test/ws/jaxws/jbws1505/**
-
# [CXF-1516] Type inheritance with document/literal/wrapped
org/jboss/test/ws/jaxws/jbws1702/**
org/jboss/test/ws/jaxws/jbws1733/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2009-02-05 15:55:26 UTC (rev 9240)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2009-02-05 17:55:54 UTC (rev 9241)
@@ -30,9 +30,6 @@
# [JBWS-2247][CXF-1514] Generated WSDL does not take 'transport-guarantee' in web.xml into account
org/jboss/test/ws/jaxws/jbws1190/**
-# [CXF-1515] Bad Enumeration value 'extension restriction'
-org/jboss/test/ws/jaxws/jbws1505/**
-
# [CXF-1516] Type inheritance with document/literal/wrapped
org/jboss/test/ws/jaxws/jbws1702/**
org/jboss/test/ws/jaxws/jbws1733/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss424.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss424.txt 2009-02-05 15:55:26 UTC (rev 9240)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss424.txt 2009-02-05 17:55:54 UTC (rev 9241)
@@ -30,9 +30,6 @@
# [JBWS-2247][CXF-1514] Generated WSDL does not take 'transport-guarantee' in web.xml into account
org/jboss/test/ws/jaxws/jbws1190/**
-# [CXF-1515] Bad Enumeration value 'extension restriction'
-org/jboss/test/ws/jaxws/jbws1505/**
-
# [CXF-1516] Type inheritance with document/literal/wrapped
org/jboss/test/ws/jaxws/jbws1702/**
org/jboss/test/ws/jaxws/jbws1733/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-02-05 15:55:26 UTC (rev 9240)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-02-05 17:55:54 UTC (rev 9241)
@@ -30,9 +30,6 @@
# [JBWS-2247][CXF-1514] Generated WSDL does not take 'transport-guarantee' in web.xml into account
org/jboss/test/ws/jaxws/jbws1190/**
-# [CXF-1515] Bad Enumeration value 'extension restriction'
-org/jboss/test/ws/jaxws/jbws1505/**
-
# [CXF-1516] Type inheritance with document/literal/wrapped
org/jboss/test/ws/jaxws/jbws1702/**
org/jboss/test/ws/jaxws/jbws1733/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-02-05 15:55:26 UTC (rev 9240)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-02-05 17:55:54 UTC (rev 9241)
@@ -30,9 +30,6 @@
# [JBWS-2247][CXF-1514] Generated WSDL does not take 'transport-guarantee' in web.xml into account
org/jboss/test/ws/jaxws/jbws1190/**
-# [CXF-1515] Bad Enumeration value 'extension restriction'
-org/jboss/test/ws/jaxws/jbws1505/**
-
# [CXF-1516] Type inheritance with document/literal/wrapped
org/jboss/test/ws/jaxws/jbws1702/**
org/jboss/test/ws/jaxws/jbws1733/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-02-05 15:55:26 UTC (rev 9240)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-02-05 17:55:54 UTC (rev 9241)
@@ -30,9 +30,6 @@
# [JBWS-2247][CXF-1514] Generated WSDL does not take 'transport-guarantee' in web.xml into account
org/jboss/test/ws/jaxws/jbws1190/**
-# [CXF-1515] Bad Enumeration value 'extension restriction'
-org/jboss/test/ws/jaxws/jbws1505/**
-
# [CXF-1516] Type inheritance with document/literal/wrapped
org/jboss/test/ws/jaxws/jbws1702/**
org/jboss/test/ws/jaxws/jbws1733/**
15 years, 3 months
JBossWS SVN: r9240 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-02-05 10:55:26 -0500 (Thu, 05 Feb 2009)
New Revision: 9240
Modified:
stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss424.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
Log:
[CXF-1244] Enabling passing tests
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt 2009-02-05 15:23:11 UTC (rev 9239)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt 2009-02-05 15:55:26 UTC (rev 9240)
@@ -4,9 +4,6 @@
# Exclude endpoints with AS5 @SecurityDomain
org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointAS5Impl.*
-# [CXF-1244] Application Exception not initialized properly
-org/jboss/test/ws/jaxws/samples/exception/**
-
# [CXF-1252] Provider PAYLOAD endpoint expects SOAP Envelope
org/jboss/test/ws/jaxws/samples/httpbinding/**
org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.*
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2009-02-05 15:23:11 UTC (rev 9239)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2009-02-05 15:55:26 UTC (rev 9240)
@@ -4,9 +4,6 @@
# Exclude endpoints with AS5 @SecurityDomain
org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointAS5Impl.*
-# [CXF-1244] Application Exception not initialized properly
-org/jboss/test/ws/jaxws/samples/exception/**
-
# [CXF-1252] Provider PAYLOAD endpoint expects SOAP Envelope
org/jboss/test/ws/jaxws/samples/httpbinding/**
org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.*
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss424.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss424.txt 2009-02-05 15:23:11 UTC (rev 9239)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss424.txt 2009-02-05 15:55:26 UTC (rev 9240)
@@ -4,9 +4,6 @@
# Exclude endpoints with AS5 @SecurityDomain
org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointAS5Impl.*
-# [CXF-1244] Application Exception not initialized properly
-org/jboss/test/ws/jaxws/samples/exception/**
-
# [CXF-1252] Provider PAYLOAD endpoint expects SOAP Envelope
org/jboss/test/ws/jaxws/samples/httpbinding/**
org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.*
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-02-05 15:23:11 UTC (rev 9239)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-02-05 15:55:26 UTC (rev 9240)
@@ -7,9 +7,6 @@
# TODO: Fix classpath to ClientLauncher
org/jboss/test/ws/jaxws/samples/webserviceref/**
-# [CXF-1244] Application Exception not initialized properly
-org/jboss/test/ws/jaxws/samples/exception/**
-
# [CXF-1252] Provider PAYLOAD endpoint expects SOAP Envelope
org/jboss/test/ws/jaxws/samples/httpbinding/**
org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.*
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-02-05 15:23:11 UTC (rev 9239)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-02-05 15:55:26 UTC (rev 9240)
@@ -7,9 +7,6 @@
# TODO: Fix classpath to ClientLauncher
org/jboss/test/ws/jaxws/samples/webserviceref/**
-# [CXF-1244] Application Exception not initialized properly
-org/jboss/test/ws/jaxws/samples/exception/**
-
# [CXF-1252] Provider PAYLOAD endpoint expects SOAP Envelope
org/jboss/test/ws/jaxws/samples/httpbinding/**
org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.*
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-02-05 15:23:11 UTC (rev 9239)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-02-05 15:55:26 UTC (rev 9240)
@@ -7,9 +7,6 @@
# TODO: Fix classpath to ClientLauncher
org/jboss/test/ws/jaxws/samples/webserviceref/**
-# [CXF-1244] Application Exception not initialized properly
-org/jboss/test/ws/jaxws/samples/exception/**
-
# [CXF-1252] Provider PAYLOAD endpoint expects SOAP Envelope
org/jboss/test/ws/jaxws/samples/httpbinding/**
org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.*
15 years, 3 months
JBossWS SVN: r9239 - stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-02-05 10:23:11 -0500 (Thu, 05 Feb 2009)
New Revision: 9239
Added:
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/HandlerResolverImpl.java
Modified:
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceObjectFactory.java
Log:
[JBWS-2517] provide handler resolver for service ref
Added: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/HandlerResolverImpl.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/HandlerResolverImpl.java (rev 0)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/HandlerResolverImpl.java 2009-02-05 15:23:11 UTC (rev 9239)
@@ -0,0 +1,378 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.stack.cxf.client;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Pattern;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+import javax.xml.namespace.QName;
+import javax.xml.ws.WebServiceException;
+import javax.xml.ws.handler.Handler;
+import javax.xml.ws.handler.HandlerResolver;
+import javax.xml.ws.handler.LogicalHandler;
+import javax.xml.ws.handler.PortInfo;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.common.injection.ResourceInjector;
+import org.apache.cxf.helpers.XMLUtils;
+import org.apache.cxf.jaxws.handler.HandlerChainBuilder;
+import org.apache.cxf.jaxws.javaee.PortComponentHandlerType;
+import org.apache.cxf.resource.DefaultResourceManager;
+import org.apache.cxf.resource.ResourceManager;
+import org.apache.cxf.resource.ResourceResolver;
+import org.jboss.logging.Logger;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+
+/**
+ * Handler resolver for CXF integration
+ * @author richard.opalka(a)jboss.com
+ */
+public final class HandlerResolverImpl extends HandlerChainBuilder implements HandlerResolver
+{
+
+ private static final Logger log = Logger.getLogger(HandlerResolverImpl.class);
+ private final Map<PortInfo, List<Handler>> handlerMap = new HashMap<PortInfo, List<Handler>>();
+ private final String handlerFile;
+ private static JAXBContext context;
+ private final Class<?> clazz;
+ private final ClassLoader classLoader;
+ private final Bus bus;
+
+ public HandlerResolverImpl(Bus bus, String handlerFile, Class<?> clazz)
+ {
+ super();
+ this.handlerFile = handlerFile;
+ this.clazz = clazz;
+ this.classLoader = clazz.getClassLoader();
+ this.bus = bus;
+ }
+
+ public List<Handler> getHandlerChain(PortInfo portInfo)
+ {
+ List<Handler> handlerChain = handlerMap.get(portInfo);
+ if (handlerChain == null) {
+ QName portQName = portInfo.getPortName();
+ QName serviceQName = portInfo.getServiceName();
+ String bindingId = portInfo.getBindingID();
+ handlerChain = createHandlerChain(portInfo, portQName, serviceQName, bindingId);
+ handlerMap.put(portInfo, handlerChain);
+ }
+
+ for (Handler h : handlerChain) {
+ configHandler(h);
+ }
+
+ return handlerChain;
+ }
+
+ /**
+ * JAX-WS section 9.3.1: The runtime MUST then carry out any injections
+ * requested by the handler, typically via the javax .annotation.Resource
+ * annotation. After all the injections have been carried out, including in
+ * the case where no injections were requested, the runtime MUST invoke the
+ * method carrying a javax.annotation .PostConstruct annotation, if present.
+ */
+ private void configHandler(Handler handler) {
+ if (handler != null) {
+ ResourceManager resourceManager = bus.getExtension(ResourceManager.class);
+ List<ResourceResolver> resolvers = resourceManager.getResourceResolvers();
+ resourceManager = new DefaultResourceManager(resolvers);
+// resourceManager.addResourceResolver(new WebContextEntriesResourceResolver());
+ ResourceInjector injector = new ResourceInjector(resourceManager);
+ injector.inject(handler);
+ injector.construct(handler);
+ }
+ }
+
+ private InputStream getInputStream()
+ {
+ return this.getInputStream(this.handlerFile, this.clazz);
+ }
+
+ public List<Handler> createHandlerChain(PortInfo portInfo, QName portQName, QName serviceQName, String bindingID) {
+ List<Handler> chain = new ArrayList<Handler>();
+ InputStream is = getInputStream();
+ try {
+
+ if (is == null) {
+ throw new WebServiceException("Handler config file not found: " + handlerFile);
+ }
+
+ Document doc = XMLUtils.parse(is);
+ Element el = doc.getDocumentElement();
+ if (!"http://java.sun.com/xml/ns/javaee".equals(el.getNamespaceURI())
+ || !"handler-chains".equals(el.getLocalName())) {
+
+ String xml = XMLUtils.toString(el);
+ throw new WebServiceException("{http://java.sun.com/xml/ns/javaee}handler-chains element expected");
+ }
+ chain = new ArrayList<Handler>();
+ Node node = el.getFirstChild();
+ while (node != null) {
+ if (node instanceof Element) {
+ el = (Element)node;
+ if (!el.getNamespaceURI().equals("http://java.sun.com/xml/ns/javaee")
+ || !el.getLocalName().equals("handler-chain")) {
+
+ String xml = XMLUtils.toString(el);
+ throw new WebServiceException("{http://java.sun.com/xml/ns/javaee}handler-chain element expected");
+ }
+ processHandlerChainElement(el, chain, portQName, serviceQName, bindingID);
+ }
+ node = node.getNextSibling();
+ }
+ } catch (WebServiceException e) {
+ throw e;
+ } catch (Exception e) {
+ throw new WebServiceException("No handler chain found", e);
+ }
+ finally
+ {
+ if (is != null)
+ {
+ try { is.close(); } catch (IOException ioe) {};
+ }
+ }
+ assert chain != null;
+ return sortHandlers(chain);
+ }
+
+ private void processHandlerChainElement(Element el, List<Handler> chain,
+ QName portQName, QName serviceQName, String bindingID) {
+ Node node = el.getFirstChild();
+ while (node != null) {
+ Node cur = node;
+ node = node.getNextSibling();
+ if (cur instanceof Element) {
+ el = (Element)cur;
+ if (!el.getNamespaceURI().equals("http://java.sun.com/xml/ns/javaee")) {
+ String xml = XMLUtils.toString(el);
+ throw new WebServiceException("Invalid element in handler: " + xml);
+ }
+ String name = el.getLocalName();
+ if ("port-name-pattern".equals(name)) {
+ if (!patternMatches(el, portQName)) {
+ return;
+ }
+ } else if ("service-name-pattern".equals(name)) {
+ if (!patternMatches(el, serviceQName)) {
+ return;
+ }
+ } else if ("protocol-bindings".equals(name)) {
+ if (!protocolMatches(el, bindingID)) {
+ return;
+ }
+ } else if ("handler".equals(name)) {
+ processHandlerElement(el, chain);
+ }
+ }
+ }
+ }
+ private boolean protocolMatches(Element el, String id) {
+ if (id == null) {
+ return true;
+ }
+ String name = el.getTextContent().trim();
+ if ("##SOAP11_HTTP".equals(name)) {
+ return "http://schemas.xmlsoap.org/wsdl/soap/http".contains(id)
+ || "http://schemas.xmlsoap.org/soap/".contains(id);
+ } else if ("##SOAP11_HTTP_MTOM".equals(name)) {
+ return "http://schemas.xmlsoap.org/wsdl/soap/http?mtom=true".contains(id)
+ || "http://schemas.xmlsoap.org/soap/?mtom=true".contains(id);
+ } else if ("##SOAP12_HTTP".equals(name)) {
+ return "http://www.w3.org/2003/05/soap/bindings/HTTP/".contains(id)
+ || "http://schemas.xmlsoap.org/wsdl/soap12/".contains(id);
+ } else if ("##SOAP12_HTTP_MTOM".equals(name)) {
+ return "http://www.w3.org/2003/05/soap/bindings/HTTP/?mtom=true".contains(id)
+ || "http://schemas.xmlsoap.org/wsdl/soap12/?mtom=true".contains(id);
+ } else if ("##XML_HTTP".equals(name)) {
+ name = "http://www.w3.org/2004/08/wsdl/http";
+ }
+ return name.contains(id);
+ }
+ private boolean patternMatches(Element el, QName comp) {
+ if (comp == null) {
+ return true;
+ }
+ String namePattern = el.getTextContent().trim();
+ if ("*".equals(namePattern)) {
+ return true;
+ }
+ if (!namePattern.contains(":")) {
+ throw new WebServiceException("Not a qname pattern: " + namePattern);
+ }
+ String localPart = namePattern.substring(namePattern.indexOf(':') + 1,
+ namePattern.length());
+ String pfx = namePattern.substring(0, namePattern.indexOf(':'));
+ String ns = el.lookupNamespaceURI(pfx);
+ if (ns == null) {
+ ns = pfx;
+ }
+ if (!ns.equals(comp.getNamespaceURI())) {
+ return false;
+ }
+ if (localPart.contains("*")) {
+ //wildcard pattern matching
+ return Pattern.matches(localPart, comp.getLocalPart());
+ } else if (!localPart.equals(comp.getLocalPart())) {
+ return false;
+ }
+ return true;
+ }
+
+ public List<Handler> sortHandlers(List<Handler> handlers) {
+
+ List<LogicalHandler> logicalHandlers = new ArrayList<LogicalHandler>();
+ List<Handler> protocolHandlers = new ArrayList<Handler>();
+
+ for (Handler handler : handlers) {
+ if (handler instanceof LogicalHandler) {
+ logicalHandlers.add((LogicalHandler)handler);
+ } else {
+ protocolHandlers.add(handler);
+ }
+ }
+
+ List<Handler> sortedHandlers = new ArrayList<Handler>();
+ sortedHandlers.addAll(logicalHandlers);
+ sortedHandlers.addAll(protocolHandlers);
+ return sortedHandlers;
+ }
+
+ private InputStream getInputStream(String filename, Class<?> wsClass)
+ {
+ URL fileURL = null;
+ log.debug("processHandlerChain [" + filename + "] on: " + wsClass.getName());
+
+ // Try the filename as URL
+ try
+ {
+ fileURL = new URL(filename);
+ }
+ catch (MalformedURLException ex)
+ {
+ // ignore
+ }
+
+ // Try the filename as File
+ if (fileURL == null)
+ {
+ try
+ {
+ File file = new File(filename);
+ if (file.exists())
+ fileURL = file.toURL();
+ }
+ catch (MalformedURLException e)
+ {
+ // ignore
+ }
+ }
+
+ // Try the filename as Resource
+ if (fileURL == null)
+ {
+ log.debug(wsClass.getProtectionDomain().getCodeSource());
+ log.debug(wsClass.getClassLoader());
+ fileURL = wsClass.getClassLoader().getResource(filename);
+ }
+
+ // Try the filename relative to class
+ if (fileURL == null)
+ {
+ String filepath = filename;
+ String packagePath = wsClass.getPackage().getName().replace('.', '/');
+ String resourcePath = packagePath + "/" + filepath;
+ while (filepath.startsWith("../"))
+ {
+ packagePath = packagePath.substring(0, packagePath.lastIndexOf("/"));
+ filepath = filepath.substring(3);
+ resourcePath = packagePath + "/" + filepath;
+ }
+ fileURL = wsClass.getClassLoader().getResource(resourcePath);
+ }
+
+ if (fileURL == null)
+ throw new WebServiceException("Cannot resolve handler file '" + filename + "' on " + wsClass.getName());
+
+ try
+ {
+ return fileURL.openStream();
+ }
+ catch (IOException ioe)
+ {
+ throw new WebServiceException(ioe);
+ }
+ }
+
+ private void processHandlerElement(Element el, List<Handler> chain) {
+ try {
+ JAXBContext ctx = getContextForPortComponentHandlerType();
+ PortComponentHandlerType pt = ctx.createUnmarshaller()
+ .unmarshal(el, PortComponentHandlerType.class).getValue();
+ chain.addAll(buildHandlerChain(pt, classLoader));
+ } catch (JAXBException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+
+ private static synchronized JAXBContext getContextForPortComponentHandlerType()
+ throws JAXBException {
+ if (context == null) {
+ context = JAXBContext.newInstance(PortComponentHandlerType.class);
+ }
+ return context;
+ }
+
+}
Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceObjectFactory.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceObjectFactory.java 2009-02-05 14:39:00 UTC (rev 9238)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceObjectFactory.java 2009-02-05 15:23:11 UTC (rev 9239)
@@ -21,6 +21,8 @@
*/
package org.jboss.wsf.stack.cxf.client;
+import org.apache.cxf.Bus;
+import org.apache.cxf.jaxws.ServiceImpl;
import org.jboss.wsf.spi.WSFException;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData;
@@ -28,14 +30,23 @@
import javax.naming.spi.ObjectFactory;
import javax.xml.namespace.QName;
import javax.xml.ws.Service;
+import javax.xml.ws.spi.ServiceDelegate;
+
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.net.URL;
+import java.security.AccessController;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
import java.util.Hashtable;
+import java.util.LinkedList;
+import java.util.List;
+
import org.jboss.logging.Logger;
/**
@@ -171,6 +182,12 @@
}
}
+ if ((serviceRef.getHandlerChain() != null) && (target instanceof Service))
+ {
+ Bus bus = getBus((Service)target);
+ ((Service)target).setHandlerResolver(new HandlerResolverImpl(bus, serviceRef.getHandlerChain(), target.getClass()));
+ }
+
return target;
}
catch (Throwable ex)
@@ -179,6 +196,49 @@
return null;
}
}
+
+ private Bus getBus(final Service service) throws Throwable
+ {
+ SecurityManager sm = System.getSecurityManager();
+ if (sm != null)
+ {
+ try
+ {
+ return AccessController.doPrivileged(new PrivilegedExceptionAction<Bus>()
+ {
+ public Bus run() throws Exception
+ {
+ Field delegateField = findServiceDelegateField(service.getClass());
+ delegateField.setAccessible(true);
+ ServiceImpl serviceImpl = (ServiceImpl)delegateField.get(service);
+ return serviceImpl.getBus();
+ }
+ });
+ }
+ catch (PrivilegedActionException e)
+ {
+ throw e.getCause();
+ }
+ }
+ Field delegateField = findServiceDelegateField(service.getClass());
+ delegateField.setAccessible(true);
+ ServiceImpl serviceImpl = (ServiceImpl)delegateField.get(service);
+ return serviceImpl.getBus();
+ }
+
+ private static Field findServiceDelegateField(Class<?> clazz)
+ {
+ while (clazz != null)
+ {
+ for (Field f : clazz.getDeclaredFields())
+ {
+ if (f.getType().equals(ServiceDelegate.class))
+ return f;
+ }
+ clazz = clazz.getSuperclass();
+ }
+ return null;
+ }
private void configureService(Service service, UnifiedServiceRefMetaData serviceRef)
15 years, 3 months