JBossWS SVN: r9608 - common/trunk/src/main/java/org/jboss/ws/core/utils.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-03-17 04:04:51 -0400 (Tue, 17 Mar 2009)
New Revision: 9608
Modified:
common/trunk/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java
Log:
[JBWS-2579] removing hardcoded string literals
Modified: common/trunk/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java 2009-03-17 08:04:11 UTC (rev 9607)
+++ common/trunk/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java 2009-03-17 08:04:51 UTC (rev 9608)
@@ -25,6 +25,8 @@
import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URL;
+import java.util.Enumeration;
+import java.util.Properties;
import org.jboss.logging.Logger;
import org.jboss.util.xml.JBossEntityResolver;
@@ -44,19 +46,46 @@
public JBossWSEntityResolver()
{
- registerEntity("urn:jboss:jaxrpc-config:2.0", "schema/jaxrpc-config_2_0.xsd");
- registerEntity("urn:jboss:jaxws-config:2.0", "schema/jaxws-config_2_0.xsd");
- registerEntity("http://java.sun.com/xml/ns/javaee", "schema/javaee_web_services_1_2.xsd");
- registerEntity("http://www.w3.org/2005/08/addressing", "schema/ws-addr.xsd");
- registerEntity("http://schemas.xmlsoap.org/ws/2004/08/eventing", "eventing.xsd");
- registerEntity("http://www.w3.org/2002/06/soap-encoding", "soap-encoding_200206.xsd");
- registerEntity("http://schemas.xmlsoap.org/soap/encoding/", "soap-encoding_1_1.xsd");
- registerEntity("http://www.ibm.com/webservices/xsd/j2ee_web_services_client_1_1.xsd", "j2ee_web_services_client_1_1.xsd");
- registerEntity("http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd", "j2ee_web_services_1_1.xsd");
- registerEntity("http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd", "j2ee_jaxrpc_mapping_1_1.xsd");
- registerEntity("http://ws-i.org/profiles/basic/1.1/swaref.xsd", "schema/swaref.xsd");
+ this("META-INF/jbossws-entities.properties");
}
+
+ public JBossWSEntityResolver(final String entitiesResource)
+ {
+ super();
+ // get stream
+ InputStream is = this.getClass().getClassLoader().getResourceAsStream(entitiesResource);
+ if (is == null)
+ throw new IllegalArgumentException("Resource " + entitiesResource + " not found");
+ // load props
+ Properties props = new Properties();
+ try
+ {
+ props.load(is);
+ }
+ catch (IOException ioe)
+ {
+ log.error("Cannot read resource: " + entitiesResource, ioe);
+ }
+ finally
+ {
+ try { is.close(); } catch (IOException ioe) {} // ignore
+ }
+
+ if (props.size() == 0)
+ throw new IllegalArgumentException("Resource " + entitiesResource + " have no mappings defined");
+
+ // register entities
+ String key = null, val = null;
+ for (Enumeration<Object> keys = props.keys(); keys.hasMoreElements();)
+ {
+ key = (String)keys.nextElement();
+ val = props.getProperty(key);
+ registerEntity(key, val);
+ }
+ }
+
+
public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException
{
if(log.isDebugEnabled()) log.debug("resolveEntity: [pub=" + publicId + ",sysid=" + systemId + "]");
17 years, 1 month
JBossWS SVN: r9607 - stack/native/trunk/modules/core/src/main/resources/META-INF.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-03-17 04:04:11 -0400 (Tue, 17 Mar 2009)
New Revision: 9607
Added:
stack/native/trunk/modules/core/src/main/resources/META-INF/jbossws-entities.properties
Log:
[JBWS-2579] providing property file
Added: stack/native/trunk/modules/core/src/main/resources/META-INF/jbossws-entities.properties
===================================================================
--- stack/native/trunk/modules/core/src/main/resources/META-INF/jbossws-entities.properties (rev 0)
+++ stack/native/trunk/modules/core/src/main/resources/META-INF/jbossws-entities.properties 2009-03-17 08:04:11 UTC (rev 9607)
@@ -0,0 +1,12 @@
+urn\:jboss\:jaxrpc-config\:2.0=schema/jaxrpc-config_2_0.xsd
+urn\:jboss\:jaxws-config\:2.0=schema/jaxws-config_2_0.xsd
+http\://java.sun.com/xml/ns/javaee=schema/javaee_web_services_1_2.xsd
+http\://www.w3.org/2005/08/addressing=schema/ws-addr.xsd
+http\://schemas.xmlsoap.org/ws/2004/08/eventing=eventing.xsd
+http\://www.w3.org/2002/06/soap-encoding=soap-encoding_200206.xsd
+http\://schemas.xmlsoap.org/soap/encoding/=soap-encoding_1_1.xsd
+http\://www.ibm.com/webservices/xsd/j2ee_web_services_client_1_1.xsd=j2ee_web_services_client_1_1.xsd
+http\://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd=j2ee_web_services_1_1.xsd
+http\://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd=j2ee_jaxrpc_mapping_1_1.xsd
+http\://ws-i.org/profiles/basic/1.1/swaref.xsd=schema/swaref.xsd
+
17 years, 1 month
JBossWS SVN: r9606 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-03-16 12:29:14 -0400 (Mon, 16 Mar 2009)
New Revision: 9606
Modified:
stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
Log:
[CXF-1516] Updating description
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2009-03-16 15:57:06 UTC (rev 9605)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2009-03-16 16:29:14 UTC (rev 9606)
@@ -23,7 +23,7 @@
# [CXF-1514][JBWS-2247] Generated WSDL does not take 'transport-guarantee' in web.xml into account
org/jboss/test/ws/jaxws/jbws1190/**
-# [CXF-1516] Type inheritance with document/literal/wrapped
+# [CXF-1516] Type inheritance with document/literal/bare
org/jboss/test/ws/jaxws/jbws1702/**
# [CXF-1517] HTTP bindings for Provider
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-03-16 15:57:06 UTC (rev 9605)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-03-16 16:29:14 UTC (rev 9606)
@@ -20,7 +20,7 @@
# [CXF-1514][JBWS-2247] Generated WSDL does not take 'transport-guarantee' in web.xml into account
org/jboss/test/ws/jaxws/jbws1190/**
-# [CXF-1516] Type inheritance with document/literal/wrapped
+# [CXF-1516] Type inheritance with document/literal/bare
org/jboss/test/ws/jaxws/jbws1702/**
# [CXF-1517] HTTP bindings for Provider
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-03-16 15:57:06 UTC (rev 9605)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-03-16 16:29:14 UTC (rev 9606)
@@ -20,7 +20,7 @@
# [CXF-1514][JBWS-2247] Generated WSDL does not take 'transport-guarantee' in web.xml into account
org/jboss/test/ws/jaxws/jbws1190/**
-# [CXF-1516] Type inheritance with document/literal/wrapped
+# [CXF-1516] Type inheritance with document/literal/bare
org/jboss/test/ws/jaxws/jbws1702/**
# [CXF-1517] HTTP bindings for Provider
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-03-16 15:57:06 UTC (rev 9605)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-03-16 16:29:14 UTC (rev 9606)
@@ -20,7 +20,7 @@
# [CXF-1514][JBWS-2247] Generated WSDL does not take 'transport-guarantee' in web.xml into account
org/jboss/test/ws/jaxws/jbws1190/**
-# [CXF-1516] Type inheritance with document/literal/wrapped
+# [CXF-1516] Type inheritance with document/literal/bare
org/jboss/test/ws/jaxws/jbws1702/**
# [CXF-1517] HTTP bindings for Provider
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-03-16 15:57:06 UTC (rev 9605)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-03-16 16:29:14 UTC (rev 9606)
@@ -20,7 +20,7 @@
# [CXF-1514][JBWS-2247] Generated WSDL does not take 'transport-guarantee' in web.xml into account
org/jboss/test/ws/jaxws/jbws1190/**
-# [CXF-1516] Type inheritance with document/literal/wrapped
+# [CXF-1516] Type inheritance with document/literal/bare
org/jboss/test/ws/jaxws/jbws1702/**
# [CXF-1517] HTTP bindings for Provider
17 years, 1 month
JBossWS SVN: r9605 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-03-16 11:57:06 -0400 (Mon, 16 Mar 2009)
New Revision: 9605
Modified:
stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
Log:
Updating excludes (handlerscope testcase)
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2009-03-16 15:54:47 UTC (rev 9604)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2009-03-16 15:57:06 UTC (rev 9605)
@@ -12,6 +12,7 @@
org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.*
org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.*
org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.*
+org/jboss/test/ws/jaxws/handlerscope/**
# [CXF-1510] Cannot handle anonymous bare requests
org/jboss/test/ws/jaxws/anonymous/**
@@ -19,9 +20,6 @@
# [CXF-1511] WrappedMessageContext does not implement SOAPMessageContext
org/jboss/test/ws/jaxws/binding/**
-# [CXF-1513] NPE in JaxWsServiceConfiguration
-org/jboss/test/ws/jaxws/handlerscope/**
-
# [CXF-1514][JBWS-2247] Generated WSDL does not take 'transport-guarantee' in web.xml into account
org/jboss/test/ws/jaxws/jbws1190/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-03-16 15:54:47 UTC (rev 9604)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-03-16 15:57:06 UTC (rev 9605)
@@ -9,6 +9,7 @@
org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.*
org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.*
org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.*
+org/jboss/test/ws/jaxws/handlerscope/**
# [CXF-1510] Cannot handle anonymous bare requests
org/jboss/test/ws/jaxws/anonymous/**
@@ -16,9 +17,6 @@
# [CXF-1511] WrappedMessageContext does not implement SOAPMessageContext
org/jboss/test/ws/jaxws/binding/**
-# [CXF-1513] NPE in JaxWsServiceConfiguration
-org/jboss/test/ws/jaxws/handlerscope/**
-
# [CXF-1514][JBWS-2247] Generated WSDL does not take 'transport-guarantee' in web.xml into account
org/jboss/test/ws/jaxws/jbws1190/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-03-16 15:54:47 UTC (rev 9604)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-03-16 15:57:06 UTC (rev 9605)
@@ -9,6 +9,7 @@
org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.*
org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.*
org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.*
+org/jboss/test/ws/jaxws/handlerscope/**
# [CXF-1510] Cannot handle anonymous bare requests
org/jboss/test/ws/jaxws/anonymous/**
@@ -16,9 +17,6 @@
# [CXF-1511] WrappedMessageContext does not implement SOAPMessageContext
org/jboss/test/ws/jaxws/binding/**
-# [CXF-1513] NPE in JaxWsServiceConfiguration
-org/jboss/test/ws/jaxws/handlerscope/**
-
# [CXF-1514][JBWS-2247] Generated WSDL does not take 'transport-guarantee' in web.xml into account
org/jboss/test/ws/jaxws/jbws1190/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-03-16 15:54:47 UTC (rev 9604)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-03-16 15:57:06 UTC (rev 9605)
@@ -9,6 +9,7 @@
org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.*
org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.*
org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.*
+org/jboss/test/ws/jaxws/handlerscope/**
# [CXF-1510] Cannot handle anonymous bare requests
org/jboss/test/ws/jaxws/anonymous/**
@@ -16,9 +17,6 @@
# [CXF-1511] WrappedMessageContext does not implement SOAPMessageContext
org/jboss/test/ws/jaxws/binding/**
-# [CXF-1513] NPE in JaxWsServiceConfiguration
-org/jboss/test/ws/jaxws/handlerscope/**
-
# [CXF-1514][JBWS-2247] Generated WSDL does not take 'transport-guarantee' in web.xml into account
org/jboss/test/ws/jaxws/jbws1190/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-03-16 15:54:47 UTC (rev 9604)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-03-16 15:57:06 UTC (rev 9605)
@@ -9,6 +9,7 @@
org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.*
org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.*
org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.*
+org/jboss/test/ws/jaxws/handlerscope/**
# [CXF-1510] Cannot handle anonymous bare requests
org/jboss/test/ws/jaxws/anonymous/**
@@ -16,9 +17,6 @@
# [CXF-1511] WrappedMessageContext does not implement SOAPMessageContext
org/jboss/test/ws/jaxws/binding/**
-# [CXF-1513] NPE in JaxWsServiceConfiguration
-org/jboss/test/ws/jaxws/handlerscope/**
-
# [CXF-1514][JBWS-2247] Generated WSDL does not take 'transport-guarantee' in web.xml into account
org/jboss/test/ws/jaxws/jbws1190/**
17 years, 1 month
JBossWS SVN: r9604 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-03-16 11:54:47 -0400 (Mon, 16 Mar 2009)
New Revision: 9604
Modified:
stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
Log:
[JBWS-2397] Adding exclude
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2009-03-16 15:48:59 UTC (rev 9603)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2009-03-16 15:54:47 UTC (rev 9604)
@@ -21,7 +21,6 @@
# [CXF-1513] NPE in JaxWsServiceConfiguration
org/jboss/test/ws/jaxws/handlerscope/**
-org/jboss/test/ws/jaxws/jbws1797/**
# [CXF-1514][JBWS-2247] Generated WSDL does not take 'transport-guarantee' in web.xml into account
org/jboss/test/ws/jaxws/jbws1190/**
@@ -91,3 +90,6 @@
# [JBWS-2533] Fix MTOM/XOP Content Type Testcase failure
org/jboss/test/ws/jaxws/jbws2419/**
+
+# [JBWS-2397] Fix jbws1797 testcase
+org/jboss/test/ws/jaxws/jbws1797/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-03-16 15:48:59 UTC (rev 9603)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-03-16 15:54:47 UTC (rev 9604)
@@ -18,7 +18,6 @@
# [CXF-1513] NPE in JaxWsServiceConfiguration
org/jboss/test/ws/jaxws/handlerscope/**
-org/jboss/test/ws/jaxws/jbws1797/**
# [CXF-1514][JBWS-2247] Generated WSDL does not take 'transport-guarantee' in web.xml into account
org/jboss/test/ws/jaxws/jbws1190/**
@@ -67,3 +66,6 @@
# [JBWS-2533] Fix MTOM/XOP Content Type Testcase failure
org/jboss/test/ws/jaxws/jbws2419/**
+
+# [JBWS-2397] Fix jbws1797 testcase
+org/jboss/test/ws/jaxws/jbws1797/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-03-16 15:48:59 UTC (rev 9603)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-03-16 15:54:47 UTC (rev 9604)
@@ -18,7 +18,6 @@
# [CXF-1513] NPE in JaxWsServiceConfiguration
org/jboss/test/ws/jaxws/handlerscope/**
-org/jboss/test/ws/jaxws/jbws1797/**
# [CXF-1514][JBWS-2247] Generated WSDL does not take 'transport-guarantee' in web.xml into account
org/jboss/test/ws/jaxws/jbws1190/**
@@ -67,3 +66,6 @@
# [JBWS-2533] Fix MTOM/XOP Content Type Testcase failure
org/jboss/test/ws/jaxws/jbws2419/**
+
+# [JBWS-2397] Fix jbws1797 testcase
+org/jboss/test/ws/jaxws/jbws1797/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-03-16 15:48:59 UTC (rev 9603)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-03-16 15:54:47 UTC (rev 9604)
@@ -18,7 +18,6 @@
# [CXF-1513] NPE in JaxWsServiceConfiguration
org/jboss/test/ws/jaxws/handlerscope/**
-org/jboss/test/ws/jaxws/jbws1797/**
# [CXF-1514][JBWS-2247] Generated WSDL does not take 'transport-guarantee' in web.xml into account
org/jboss/test/ws/jaxws/jbws1190/**
@@ -67,3 +66,6 @@
# [JBWS-2533] Fix MTOM/XOP Content Type Testcase failure
org/jboss/test/ws/jaxws/jbws2419/**
+
+# [JBWS-2397] Fix jbws1797 testcase
+org/jboss/test/ws/jaxws/jbws1797/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-03-16 15:48:59 UTC (rev 9603)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-03-16 15:54:47 UTC (rev 9604)
@@ -18,7 +18,6 @@
# [CXF-1513] NPE in JaxWsServiceConfiguration
org/jboss/test/ws/jaxws/handlerscope/**
-org/jboss/test/ws/jaxws/jbws1797/**
# [CXF-1514][JBWS-2247] Generated WSDL does not take 'transport-guarantee' in web.xml into account
org/jboss/test/ws/jaxws/jbws1190/**
@@ -67,3 +66,6 @@
# [JBWS-2533] Fix MTOM/XOP Content Type Testcase failure
org/jboss/test/ws/jaxws/jbws2419/**
+
+# [JBWS-2397] Fix jbws1797 testcase
+org/jboss/test/ws/jaxws/jbws1797/**
17 years, 1 month
JBossWS SVN: r9603 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-03-16 11:48:59 -0400 (Mon, 16 Mar 2009)
New Revision: 9603
Modified:
stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
Log:
Fixing exclude for jbws1694 testcase
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2009-03-16 15:47:03 UTC (rev 9602)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2009-03-16 15:48:59 UTC (rev 9603)
@@ -21,7 +21,6 @@
# [CXF-1513] NPE in JaxWsServiceConfiguration
org/jboss/test/ws/jaxws/handlerscope/**
-org/jboss/test/ws/jaxws/jbws1694/**
org/jboss/test/ws/jaxws/jbws1797/**
# [CXF-1514][JBWS-2247] Generated WSDL does not take 'transport-guarantee' in web.xml into account
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-03-16 15:47:03 UTC (rev 9602)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-03-16 15:48:59 UTC (rev 9603)
@@ -18,7 +18,6 @@
# [CXF-1513] NPE in JaxWsServiceConfiguration
org/jboss/test/ws/jaxws/handlerscope/**
-org/jboss/test/ws/jaxws/jbws1694/**
org/jboss/test/ws/jaxws/jbws1797/**
# [CXF-1514][JBWS-2247] Generated WSDL does not take 'transport-guarantee' in web.xml into account
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-03-16 15:47:03 UTC (rev 9602)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-03-16 15:48:59 UTC (rev 9603)
@@ -18,7 +18,6 @@
# [CXF-1513] NPE in JaxWsServiceConfiguration
org/jboss/test/ws/jaxws/handlerscope/**
-org/jboss/test/ws/jaxws/jbws1694/**
org/jboss/test/ws/jaxws/jbws1797/**
# [CXF-1514][JBWS-2247] Generated WSDL does not take 'transport-guarantee' in web.xml into account
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-03-16 15:47:03 UTC (rev 9602)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-03-16 15:48:59 UTC (rev 9603)
@@ -18,7 +18,6 @@
# [CXF-1513] NPE in JaxWsServiceConfiguration
org/jboss/test/ws/jaxws/handlerscope/**
-org/jboss/test/ws/jaxws/jbws1694/**
org/jboss/test/ws/jaxws/jbws1797/**
# [CXF-1514][JBWS-2247] Generated WSDL does not take 'transport-guarantee' in web.xml into account
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-03-16 15:47:03 UTC (rev 9602)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-03-16 15:48:59 UTC (rev 9603)
@@ -18,7 +18,6 @@
# [CXF-1513] NPE in JaxWsServiceConfiguration
org/jboss/test/ws/jaxws/handlerscope/**
-org/jboss/test/ws/jaxws/jbws1694/**
org/jboss/test/ws/jaxws/jbws1797/**
# [CXF-1514][JBWS-2247] Generated WSDL does not take 'transport-guarantee' in web.xml into account
17 years, 1 month
JBossWS SVN: r9602 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1694.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-03-16 11:47:03 -0400 (Mon, 16 Mar 2009)
New Revision: 9602
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1694/JBWS1694EndpointSEI.java
Log:
ParameterStyle.WRAPPED should not be allowed with multiple part in wsdl:message
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1694/JBWS1694EndpointSEI.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1694/JBWS1694EndpointSEI.java 2009-03-16 11:20:57 UTC (rev 9601)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1694/JBWS1694EndpointSEI.java 2009-03-16 15:47:03 UTC (rev 9602)
@@ -21,18 +21,22 @@
*/
package org.jboss.test.ws.jaxws.jbws1694;
+import javax.ejb.Remote;
import javax.jws.WebMethod;
+import javax.jws.WebParam;
import javax.jws.WebResult;
-import javax.jws.WebParam;
import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+import javax.jws.soap.SOAPBinding.ParameterStyle;
import javax.xml.ws.Holder;
-import javax.ejb.Remote;
/**
* @author Heiko.Braun(a)jboss.com
*/
@WebService
@Remote
+//BARE required as the header param forces wsdl:message to have more than one wsdl:part thus WRAPPED (which is default) should not be allowed
+(a)SOAPBinding(parameterStyle=ParameterStyle.BARE)
public interface JBWS1694EndpointSEI
{
@WebMethod(operationName = "SubmitBasket")
17 years, 1 month
JBossWS SVN: r9601 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2529.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-03-16 07:20:57 -0400 (Mon, 16 Mar 2009)
New Revision: 9601
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2529/JBWS2529TestCase.java
Log:
[JBWS-2529] fixing testcase for native
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2529/JBWS2529TestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2529/JBWS2529TestCase.java 2009-03-16 10:15:57 UTC (rev 9600)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2529/JBWS2529TestCase.java 2009-03-16 11:20:57 UTC (rev 9601)
@@ -86,7 +86,7 @@
String command = JBOSS_HOME + FS + "bin" + FS + "wsprovide" + EXT + " -k -w -o " + absOutput + " --classpath " + CLASSES_DIR + " " + ENDPOINT_CLASS;
executeCommand(command, "wsprovide");
- File wsdl = new File(destDir, isIntegrationCXF() ? "JBWS2529EndpointService.wsdl" : "JBWS2529EndpointService_schema1.xsd");
+ File wsdl = new File(destDir, isIntegrationMetro() ? "JBWS2529EndpointService_schema1.xsd" : "JBWS2529EndpointService.wsdl");
Element root = DOMUtils.parse(new FileInputStream(wsdl));
QName schemaQName = new QName(XML_SCHEMA_NS,"schema");
Element schema = null;
17 years, 1 month
JBossWS SVN: r9600 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-03-16 06:15:57 -0400 (Mon, 16 Mar 2009)
New Revision: 9600
Modified:
stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
Log:
Updating exclusion causes
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2009-03-13 15:15:28 UTC (rev 9599)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2009-03-16 10:15:57 UTC (rev 9600)
@@ -11,6 +11,7 @@
# [CXF-1253] CXF does not respect @HandlerChain on client SEI
org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.*
org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.*
+org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.*
# [CXF-1510] Cannot handle anonymous bare requests
org/jboss/test/ws/jaxws/anonymous/**
@@ -38,9 +39,6 @@
# [CXF-1521] Exception handling with @WebFault annotation
org/jboss/test/ws/jaxws/webfault/**
-# [CXF-1624] XmlSchemaException: Schema name conflict in collection
-org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.*
-
# [CXF-2006] RespectBinding feature and not understood required extensibility elements
org/jboss/test/ws/jaxws/jbws2449/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-03-13 15:15:28 UTC (rev 9599)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-03-16 10:15:57 UTC (rev 9600)
@@ -8,6 +8,7 @@
# [CXF-1253] CXF does not respect @HandlerChain on client SEI
org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.*
org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.*
+org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.*
# [CXF-1510] Cannot handle anonymous bare requests
org/jboss/test/ws/jaxws/anonymous/**
@@ -35,9 +36,6 @@
# [CXF-1521] Exception handling with @WebFault annotation
org/jboss/test/ws/jaxws/webfault/**
-# [CXF-1624] XmlSchemaException: Schema name conflict in collection
-org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.*
-
# [CXF-2006] RespectBinding feature and not understood required extensibility elements
org/jboss/test/ws/jaxws/jbws2449/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-03-13 15:15:28 UTC (rev 9599)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-03-16 10:15:57 UTC (rev 9600)
@@ -8,6 +8,7 @@
# [CXF-1253] CXF does not respect @HandlerChain on client SEI
org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.*
org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.*
+org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.*
# [CXF-1510] Cannot handle anonymous bare requests
org/jboss/test/ws/jaxws/anonymous/**
@@ -35,9 +36,6 @@
# [CXF-1521] Exception handling with @WebFault annotation
org/jboss/test/ws/jaxws/webfault/**
-# [CXF-1624] XmlSchemaException: Schema name conflict in collection
-org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.*
-
# [CXF-2006] RespectBinding feature and not understood required extensibility elements
org/jboss/test/ws/jaxws/jbws2449/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-03-13 15:15:28 UTC (rev 9599)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-03-16 10:15:57 UTC (rev 9600)
@@ -8,6 +8,7 @@
# [CXF-1253] CXF does not respect @HandlerChain on client SEI
org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.*
org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.*
+org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.*
# [CXF-1510] Cannot handle anonymous bare requests
org/jboss/test/ws/jaxws/anonymous/**
@@ -35,9 +36,6 @@
# [CXF-1521] Exception handling with @WebFault annotation
org/jboss/test/ws/jaxws/webfault/**
-# [CXF-1624] XmlSchemaException: Schema name conflict in collection
-org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.*
-
# [CXF-2006] RespectBinding feature and not understood required extensibility elements
org/jboss/test/ws/jaxws/jbws2449/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-03-13 15:15:28 UTC (rev 9599)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-03-16 10:15:57 UTC (rev 9600)
@@ -8,6 +8,7 @@
# [CXF-1253] CXF does not respect @HandlerChain on client SEI
org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.*
org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.*
+org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.*
# [CXF-1510] Cannot handle anonymous bare requests
org/jboss/test/ws/jaxws/anonymous/**
@@ -35,9 +36,6 @@
# [CXF-1521] Exception handling with @WebFault annotation
org/jboss/test/ws/jaxws/webfault/**
-# [CXF-1624] XmlSchemaException: Schema name conflict in collection
-org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.*
-
# [CXF-2006] RespectBinding feature and not understood required extensibility elements
org/jboss/test/ws/jaxws/jbws2449/**
17 years, 1 month