JBossWS SVN: r14913 - in stack/native/branches/jbossws-native-3.1.2: modules/core and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: mmusaji
Date: 2011-08-31 11:37:16 -0400 (Wed, 31 Aug 2011)
New Revision: 14913
Modified:
stack/native/branches/jbossws-native-3.1.2/
stack/native/branches/jbossws-native-3.1.2/modules/core/
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/CommonSOAPFaultException.java
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/
Log:
JBPAPP-6860 - Added System Property org.jboss.ws.IgnoreParseError to allow parsing errors to be sent back to the client if set to true
Property changes on: stack/native/branches/jbossws-native-3.1.2
___________________________________________________________________
Modified: svn:mergeinfo
- /stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365:14192
/stack/native/branches/jbossws-native-3.4.0.SP1:13928,13933,13936,13946
/stack/native/trunk:12502,13992,14157,14160,14181,14183,14842
+ /stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864:14776-14778,14786,14894,14905,14907-14908
/stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365:14192
/stack/native/branches/jbossws-native-3.4.0.SP1:13928,13933,13936,13946
/stack/native/trunk:12502,13992,14157,14160,14181,14183,14842
Property changes on: stack/native/branches/jbossws-native-3.1.2/modules/core
___________________________________________________________________
Modified: svn:mergeinfo
- /stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/core:14192
/stack/native/branches/jbossws-native-3.4.0.SP1/modules/core:13928,13933,13936,13946
/stack/native/trunk/modules/core:12502,13992,14011,14157,14160,14181,14183,14842
+ /stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core:14776-14778,14786,14894,14905,14907-14908
/stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/core:14192
/stack/native/branches/jbossws-native-3.4.0.SP1/modules/core:13928,13933,13936,13946
/stack/native/trunk/modules/core:12502,13992,14011,14157,14160,14181,14183,14842
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/CommonSOAPFaultException.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/CommonSOAPFaultException.java 2011-08-31 15:04:42 UTC (rev 14912)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/CommonSOAPFaultException.java 2011-08-31 15:37:16 UTC (rev 14913)
@@ -32,6 +32,7 @@
{
private QName faultCode;
private String faultString;
+ private Throwable throwable;
public CommonSOAPFaultException(QName faultCode, String faultString)
{
@@ -40,6 +41,15 @@
this.faultCode = faultCode;
this.faultString = faultString;
}
+
+ public CommonSOAPFaultException(QName faultCode, Throwable throwable) {
+
+ super(throwable.getMessage(), throwable);
+
+ this.faultCode = faultCode;
+ this.throwable = throwable;
+
+ }
public QName getFaultCode()
{
@@ -50,4 +60,9 @@
{
return faultString;
}
+
+ public Throwable getThrowable()
+ {
+ return throwable;
+ }
}
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java 2011-08-31 15:04:42 UTC (rev 14912)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java 2011-08-31 15:37:16 UTC (rev 14913)
@@ -263,8 +263,15 @@
{
throw new WSTimeoutException("Timeout after: " + timeout + "ms", new Long(timeout.toString()));
}
+
+ IOException io = null;
- IOException io = new IOException("Could not transmit message");
+ if(th.getCause().getMessage() != null) {
+ io = new IOException(th.getCause().getMessage());
+ }else {
+ io = new IOException("Could not transmit message");
+ }
+
io.initCause(th);
throw io;
}
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2011-08-31 15:04:42 UTC (rev 14912)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2011-08-31 15:37:16 UTC (rev 14913)
@@ -60,6 +60,8 @@
{
// provide logging
private static Logger log = Logger.getLogger(EnvelopeBuilderDOM.class);
+
+ private static final String IGNORE_PARSE_ERROR_PROPERTY = System.getProperty("org.jboss.ws.IgnoreParseError", "true");
private SOAPFactoryImpl soapFactory = new SOAPFactoryImpl();
private Style style;
@@ -86,12 +88,16 @@
}
catch (IOException ex)
{
- if (ignoreParseError)
- {
+ if(IGNORE_PARSE_ERROR_PROPERTY.equalsIgnoreCase("false")) {
+ QName faultCode = Constants.SOAP11_FAULT_CODE_CLIENT;
+ throw new CommonSOAPFaultException(faultCode, ex);
+ }else if (ignoreParseError) { //kept for backward compatibility
return null;
}
+
QName faultCode = Constants.SOAP11_FAULT_CODE_CLIENT;
throw new CommonSOAPFaultException(faultCode, ex.getMessage());
+
}
return build(soapMessage, domEnv);
@@ -109,10 +115,13 @@
}
catch (IOException ex)
{
- if (ignoreParseError)
- {
+ if(IGNORE_PARSE_ERROR_PROPERTY.equalsIgnoreCase("false")) {
+ QName faultCode = Constants.SOAP11_FAULT_CODE_CLIENT;
+ throw new CommonSOAPFaultException(faultCode, ex);
+ }else if (ignoreParseError) { //kept for backward compatibility
return null;
}
+
QName faultCode = Constants.SOAP11_FAULT_CODE_CLIENT;
throw new CommonSOAPFaultException(faultCode, ex.getMessage());
}
Property changes on: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests
___________________________________________________________________
Modified: svn:mergeinfo
- /stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests:14192
/stack/native/branches/jbossws-native-3.4.0.SP1/modules/testsuite/native-tests:13928,13933,13936,13946
/stack/native/trunk/modules/testsuite/native-tests:12502,13992,14013,14157,14160,14181,14183,14842
+ /stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/testsuite/native-tests:14776-14778,14786,14894,14905,14907-14908
/stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests:14192
/stack/native/branches/jbossws-native-3.4.0.SP1/modules/testsuite/native-tests:13928,13933,13936,13946
/stack/native/trunk/modules/testsuite/native-tests:12502,13992,14013,14157,14160,14181,14183,14842
13 years, 3 months
JBossWS SVN: r14912 - in common/tags/jbossws-common-1.1.0.SP7-patch-01: src/main/java/org/jboss/wsf/common and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-08-31 11:04:42 -0400 (Wed, 31 Aug 2011)
New Revision: 14912
Modified:
common/tags/jbossws-common-1.1.0.SP7-patch-01/pom.xml
common/tags/jbossws-common-1.1.0.SP7-patch-01/src/main/java/org/jboss/wsf/common/DOMUtils.java
Log:
JBPAPP-6879
Modified: common/tags/jbossws-common-1.1.0.SP7-patch-01/pom.xml
===================================================================
--- common/tags/jbossws-common-1.1.0.SP7-patch-01/pom.xml 2011-08-31 14:58:54 UTC (rev 14911)
+++ common/tags/jbossws-common-1.1.0.SP7-patch-01/pom.xml 2011-08-31 15:04:42 UTC (rev 14912)
@@ -8,7 +8,7 @@
<artifactId>jbossws-common</artifactId>
<packaging>jar</packaging>
- <version>1.1.0.SP7</version>
+ <version>1.1.0.SP7-patch-01</version>
<!-- Parent -->
<parent>
Modified: common/tags/jbossws-common-1.1.0.SP7-patch-01/src/main/java/org/jboss/wsf/common/DOMUtils.java
===================================================================
--- common/tags/jbossws-common-1.1.0.SP7-patch-01/src/main/java/org/jboss/wsf/common/DOMUtils.java 2011-08-31 14:58:54 UTC (rev 14911)
+++ common/tags/jbossws-common-1.1.0.SP7-patch-01/src/main/java/org/jboss/wsf/common/DOMUtils.java 2011-08-31 15:04:42 UTC (rev 14912)
@@ -73,11 +73,14 @@
private static final String DISABLE_DEFERRED_NODE_EXPANSION = "org.jboss.ws.disable_deferred_node_expansion";
private static final String DEFER_NODE_EXPANSION_FEATURE = "http://apache.org/xml/features/dom/defer-node-expansion";
+ private static final String ENABLE_DOCTYPE_DECL = "org.jboss.ws.enable_doctype_decl";
+ private static final String DISALLOW_DOCTYPE_DECL_FEATURE = "http://apache.org/xml/features/disallow-doctype-decl";
private static String documentBuilderFactoryName;
private static final boolean alwaysResolveFactoryName = Boolean.getBoolean(Constants.ALWAYS_RESOLVE_DOCUMENT_BUILDER_FACTORY);
private static final boolean disableDeferedNodeExpansion = Boolean.getBoolean(DISABLE_DEFERRED_NODE_EXPANSION);
+ private static final boolean enableDoctypeDeclaration = Boolean.getBoolean(ENABLE_DOCTYPE_DECL);
// All elements created by the same thread are created by the same builder and belong to the same doc
private static ThreadLocal<Document> documentThreadLocal = new ThreadLocal<Document>();
@@ -116,6 +119,10 @@
{
factory.setFeature(DEFER_NODE_EXPANSION_FEATURE, false);
}
+ if (!enableDoctypeDeclaration)
+ {
+ factory.setFeature(DISALLOW_DOCTYPE_DECL_FEATURE, true);
+ }
}
catch (ParserConfigurationException pce)
{
13 years, 3 months
JBossWS SVN: r14911 - common/tags.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-08-31 10:58:54 -0400 (Wed, 31 Aug 2011)
New Revision: 14911
Added:
common/tags/jbossws-common-1.1.0.SP7-patch-01/
Log:
13 years, 3 months
JBossWS SVN: r14910 - stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-client/main.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-08-29 11:22:45 -0400 (Mon, 29 Aug 2011)
New Revision: 14910
Modified:
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml
Log:
[JBWS-3341] Adding javax.wsdl4j.api module dep to org.jboss.ws.cxf.jbossws-cxf-client
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml 2011-08-29 09:47:53 UTC (rev 14909)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml 2011-08-29 15:22:45 UTC (rev 14910)
@@ -33,6 +33,8 @@
<module name="javax.xml.bind.api" export="true"/>
<module name="com.sun.xml.bind" export="true" services="export"/>
<module name="javax.xml.ws.api" />
+ <!-- WSDL4J API -->
+ <module name="javax.wsdl4j.api" export="true"/>
<!-- JBossWS API -->
<module name="org.jboss.ws.api" export="true" />
<!-- JBossWS JAXWS client -->
13 years, 3 months
JBossWS SVN: r14909 - in stack/cxf/trunk/modules/testsuite: cxf-spring-tests/scripts and 11 other directories.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2011-08-29 05:47:53 -0400 (Mon, 29 Aug 2011)
New Revision: 14909
Added:
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/EndpointOne.java
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/EndpointOneEJB3Impl.java
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/EndpointOneImpl.java
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/MixedTypeTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/mixtype/
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/mixtype/WEB-INF/
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/mixtype/WEB-INF/jboss-web.xml
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/mixtype/WEB-INF/jbossws-cxf.xml
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/mixtype/WEB-INF/web.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/EndpointOne.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/EndpointOneEJB3Impl.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/EndpointOneImpl.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/MixedTypeTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/mixtype/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/mixtype/WEB-INF/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/mixtype/WEB-INF/jboss-web.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/mixtype/WEB-INF/web.xml
Modified:
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
Add test case to expose the mixedtype deployment issue
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml 2011-08-26 16:08:42 UTC (rev 14908)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml 2011-08-29 09:47:53 UTC (rev 14909)
@@ -93,6 +93,19 @@
</metainf>
</jar>
+ <!-- jaxws-cxf-mixtype -->
+ <!-- jaxws-cxf-mixtype-->
+ <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-mixtype.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/mixtype/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/cxf/mixtype/Endpoint*.class"/>
+ </classes>
+
+ <webinf dir="${tests.output.dir}/test-resources//jaxws/cxf/mixtype/WEB-INF">
+ <include name="jboss-web.xml"/>
+ <include name="jbossws-cxf.xml"/>
+ </webinf>
+ </war>
+
<!-- jaxws-cxf-jms-api -->
<war warfile="${tests.output.dir}/test-libs/jaxws-cxf-jms-api-as6.war"
needxmlfile='false'>
Added: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/EndpointOne.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/EndpointOne.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/EndpointOne.java 2011-08-29 09:47:53 UTC (rev 14909)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, 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.test.ws.jaxws.cxf.mixtype;
+
+import javax.jws.Oneway;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+@WebService(name = "EndpointOne", targetNamespace = "http://org.jboss.ws.jaxws.cxf/mixtype", serviceName = "ServiceOne")
+@SOAPBinding(style = SOAPBinding.Style.RPC)
+public interface EndpointOne
+{
+ String echo(String input);
+
+ @Oneway
+ void echoOneWay(String input);
+
+ int getCount();
+}
+
Added: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/EndpointOneEJB3Impl.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/EndpointOneEJB3Impl.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/EndpointOneEJB3Impl.java 2011-08-29 09:47:53 UTC (rev 14909)
@@ -0,0 +1,61 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, 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.test.ws.jaxws.cxf.mixtype;
+
+import javax.ejb.Stateless;
+import javax.jws.Oneway;
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+import org.jboss.logging.Logger;
+
+@WebService(name = "EJBEndpointOne", targetNamespace = "http://org.jboss.ws.jaxws.cxf/mixtype", serviceName = "EJBServiceOne")
+@SOAPBinding(style = SOAPBinding.Style.RPC)
+@Stateless
+public class EndpointOneEJB3Impl
+{
+ private volatile static int count = 0;
+
+ @WebMethod
+ public String echo(String input)
+ {
+ Logger.getLogger(this.getClass()).info("echo: " + input);
+ count++;
+ return input;
+ }
+
+ @WebMethod
+ @Oneway
+ public void echoOneWay(String input)
+ {
+ Logger.getLogger(this.getClass()).info("echoOneWay: " + input);
+ count++;
+ }
+
+ @WebMethod
+ public int getCount()
+ {
+ return count;
+ }
+}
+
Added: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/EndpointOneImpl.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/EndpointOneImpl.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/EndpointOneImpl.java 2011-08-29 09:47:53 UTC (rev 14909)
@@ -0,0 +1,60 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, 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.test.ws.jaxws.cxf.mixtype;
+
+
+import javax.jws.Oneway;
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+import org.jboss.logging.Logger;
+
+@WebService(name = "EndpointOne", targetNamespace = "http://org.jboss.ws.jaxws.cxf/mixtype", serviceName = "ServiceOne")
+@SOAPBinding(style = SOAPBinding.Style.RPC)
+public class EndpointOneImpl
+{
+ private volatile static int count = 0;
+
+ @WebMethod
+ public String echo(String input)
+ {
+ Logger.getLogger(this.getClass()).info("echo: " + input);
+ count++;
+ return input;
+ }
+
+ @WebMethod
+ @Oneway
+ public void echoOneWay(String input)
+ {
+ Logger.getLogger(this.getClass()).info("echoOneWay: " + input);
+ count++;
+ }
+
+ @WebMethod
+ public int getCount()
+ {
+ return count;
+ }
+}
+
Added: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/MixedTypeTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/MixedTypeTestCase.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/MixedTypeTestCase.java 2011-08-29 09:47:53 UTC (rev 14909)
@@ -0,0 +1,68 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, 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.test.ws.jaxws.cxf.mixtype;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSCXFTestSetup;
+import org.jboss.wsf.test.JBossWSTest;
+
+public class MixedTypeTestCase extends JBossWSTest
+{
+ private final String endpointURL = "http://" + getServerHost() + ":8080/jaxws-cxf-mixtype";
+ private final String ejbEndpointURL = "http://" + getServerHost() + ":8080/mixtype/EJBServiceOne/EJBEndpointOne";
+
+ private String targetNS = "http://org.jboss.ws.jaxws.cxf/mixtype";
+
+ public static Test suite()
+ {
+ return new JBossWSCXFTestSetup(MixedTypeTestCase.class, "jaxws-cxf-mixtype.war");
+ }
+
+ public void testEndpoint() throws Exception
+ {
+
+ URL wsdlOneURL = new URL(endpointURL + "?wsdl");
+ QName serviceOneName = new QName(targetNS, "ServiceOne");
+ Service serviceOne = Service.create(wsdlOneURL, serviceOneName);
+ EndpointOne endpoint = (EndpointOne)serviceOne.getPort(EndpointOne.class);
+ assertEquals("mixedType", endpoint.echo("mixedType"));
+
+
+ }
+
+ public void testEJBEndpoint() throws Exception
+ {
+ URL wsdlOneURL = new URL(ejbEndpointURL + "?wsdl");
+ QName serviceOneName = new QName(targetNS, "EJBServiceOne");
+ Service serviceOne = Service.create(wsdlOneURL, serviceOneName);
+ EndpointOne endpoint = (EndpointOne)serviceOne.getPort(EndpointOne.class);
+ assertEquals("mixedType", endpoint.echo("mixedType"));
+ }
+
+
+}
\ No newline at end of file
Added: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/mixtype/WEB-INF/jboss-web.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/mixtype/WEB-INF/jboss-web.xml (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/mixtype/WEB-INF/jboss-web.xml 2011-08-29 09:47:53 UTC (rev 14909)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
+<jboss-web>
+ <context-root>mixtype</context-root>
+</jboss-web>
Added: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/mixtype/WEB-INF/jbossws-cxf.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/mixtype/WEB-INF/jbossws-cxf.xml (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/mixtype/WEB-INF/jbossws-cxf.xml 2011-08-29 09:47:53 UTC (rev 14909)
@@ -0,0 +1,11 @@
+<beans xmlns='http://www.springframework.org/schema/beans' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns:beans='http://www.springframework.org/schema/beans'
+ xmlns:jaxws='http://cxf.apache.org/jaxws'
+ xsi:schemaLocation='http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://www.w3.org/2006/07/ws-policy http://www.w3.org/2006/07/ws-policy.xsd
+ http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd'>
+
+ <jaxws:endpoint id='EndpointService' address='http://@jboss.bind.address@:8080/jaxws-cxf-mixtype'
+ implementor='org.jboss.test.ws.jaxws.cxf.mixtype.EndpointOneImpl'>
+ </jaxws:endpoint>
+
+</beans>
Added: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/mixtype/WEB-INF/web.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/mixtype/WEB-INF/web.xml (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/mixtype/WEB-INF/web.xml 2011-08-29 09:47:53 UTC (rev 14909)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/j2ee/web-app_2_5.xsd">
+ <servlet>
+ <servlet-name>Ep1Servlet</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.cxf.mixtype.EndpointOneImpl</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>Ep1Servlet</servlet-name>
+ <url-pattern>/ServiceOne/EndpointOne</url-pattern>
+ </servlet-mapping>
+</web-app>
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2011-08-26 16:08:42 UTC (rev 14908)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2011-08-29 09:47:53 UTC (rev 14909)
@@ -185,6 +185,17 @@
</classes>
</war>
+ <!-- jaxws-cxf-mixtype-->
+ <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-mixtype.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/mixtype/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/cxf/mixtype/Endpoint*.class"/>
+ </classes>
+
+ <webinf dir="${tests.output.dir}/test-resources//jaxws/cxf/mixtype/WEB-INF">
+ <include name="jboss-web.xml"/>
+ </webinf>
+ </war>
+
<!-- jaxws-samples-mtom -->
<war
warfile="${tests.output.dir}/test-libs/jaxws-samples-mtom.war"
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/EndpointOne.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/EndpointOne.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/EndpointOne.java 2011-08-29 09:47:53 UTC (rev 14909)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, 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.test.ws.jaxws.cxf.mixtype;
+
+import javax.jws.Oneway;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+@WebService(name = "EndpointOne", targetNamespace = "http://org.jboss.ws.jaxws.cxf/mixtype", serviceName = "ServiceOne")
+@SOAPBinding(style = SOAPBinding.Style.RPC)
+public interface EndpointOne
+{
+ String echo(String input);
+
+ @Oneway
+ void echoOneWay(String input);
+
+ int getCount();
+}
+
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/EndpointOneEJB3Impl.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/EndpointOneEJB3Impl.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/EndpointOneEJB3Impl.java 2011-08-29 09:47:53 UTC (rev 14909)
@@ -0,0 +1,61 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, 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.test.ws.jaxws.cxf.mixtype;
+
+import javax.ejb.Stateless;
+import javax.jws.Oneway;
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+import org.jboss.logging.Logger;
+
+@WebService(name = "EJBEndpointOne", targetNamespace = "http://org.jboss.ws.jaxws.cxf/mixtype", serviceName = "EJBServiceOne")
+@SOAPBinding(style = SOAPBinding.Style.RPC)
+@Stateless
+public class EndpointOneEJB3Impl
+{
+ private volatile static int count = 0;
+
+ @WebMethod
+ public String echo(String input)
+ {
+ Logger.getLogger(this.getClass()).info("echo: " + input);
+ count++;
+ return input;
+ }
+
+ @WebMethod
+ @Oneway
+ public void echoOneWay(String input)
+ {
+ Logger.getLogger(this.getClass()).info("echoOneWay: " + input);
+ count++;
+ }
+
+ @WebMethod
+ public int getCount()
+ {
+ return count;
+ }
+}
+
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/EndpointOneImpl.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/EndpointOneImpl.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/EndpointOneImpl.java 2011-08-29 09:47:53 UTC (rev 14909)
@@ -0,0 +1,60 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, 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.test.ws.jaxws.cxf.mixtype;
+
+
+import javax.jws.Oneway;
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+import org.jboss.logging.Logger;
+
+@WebService(name = "EndpointOne", targetNamespace = "http://org.jboss.ws.jaxws.cxf/mixtype", serviceName = "ServiceOne")
+@SOAPBinding(style = SOAPBinding.Style.RPC)
+public class EndpointOneImpl
+{
+ private volatile static int count = 0;
+
+ @WebMethod
+ public String echo(String input)
+ {
+ Logger.getLogger(this.getClass()).info("echo: " + input);
+ count++;
+ return input;
+ }
+
+ @WebMethod
+ @Oneway
+ public void echoOneWay(String input)
+ {
+ Logger.getLogger(this.getClass()).info("echoOneWay: " + input);
+ count++;
+ }
+
+ @WebMethod
+ public int getCount()
+ {
+ return count;
+ }
+}
+
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/MixedTypeTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/MixedTypeTestCase.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/MixedTypeTestCase.java 2011-08-29 09:47:53 UTC (rev 14909)
@@ -0,0 +1,68 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, 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.test.ws.jaxws.cxf.mixtype;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSCXFTestSetup;
+import org.jboss.wsf.test.JBossWSTest;
+
+public class MixedTypeTestCase extends JBossWSTest
+{
+ private final String endpointURL = "http://" + getServerHost() + ":8080/mixtype/ServiceOne/EndpointOne";
+ private final String ejbEndpointURL = "http://" + getServerHost() + ":8080/mixtype/EJBServiceOne/EJBEndpointOne";
+
+ private String targetNS = "http://org.jboss.ws.jaxws.cxf/mixtype";
+
+ public static Test suite()
+ {
+ return new JBossWSCXFTestSetup(MixedTypeTestCase.class, "jaxws-cxf-mixtype.war");
+ }
+
+ public void testEndpoint() throws Exception
+ {
+
+ URL wsdlOneURL = new URL(endpointURL + "?wsdl");
+ QName serviceOneName = new QName(targetNS, "ServiceOne");
+ Service serviceOne = Service.create(wsdlOneURL, serviceOneName);
+ EndpointOne endpoint = (EndpointOne)serviceOne.getPort(EndpointOne.class);
+ assertEquals("mixedType", endpoint.echo("mixedType"));
+
+
+ }
+
+ public void testEJBEndpoint() throws Exception
+ {
+ URL wsdlOneURL = new URL(ejbEndpointURL + "?wsdl");
+ QName serviceOneName = new QName(targetNS, "EJBServiceOne");
+ Service serviceOne = Service.create(wsdlOneURL, serviceOneName);
+ EndpointOne endpoint = (EndpointOne)serviceOne.getPort(EndpointOne.class);
+ assertEquals("mixedType", endpoint.echo("mixedType"));
+ }
+
+
+}
\ No newline at end of file
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/mixtype/WEB-INF/jboss-web.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/mixtype/WEB-INF/jboss-web.xml (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/mixtype/WEB-INF/jboss-web.xml 2011-08-29 09:47:53 UTC (rev 14909)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
+<jboss-web>
+ <context-root>mixtype</context-root>
+</jboss-web>
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/mixtype/WEB-INF/web.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/mixtype/WEB-INF/web.xml (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/mixtype/WEB-INF/web.xml 2011-08-29 09:47:53 UTC (rev 14909)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/j2ee/web-app_2_5.xsd">
+ <servlet>
+ <servlet-name>Ep1Servlet</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.cxf.mixtype.EndpointOneImpl</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>Ep1Servlet</servlet-name>
+ <url-pattern>/ServiceOne/EndpointOne</url-pattern>
+ </servlet-mapping>
+</web-app>
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2011-08-26 16:08:42 UTC (rev 14908)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-08-29 09:47:53 UTC (rev 14909)
@@ -736,6 +736,9 @@
<!-- # [AS7-1322] Implemented on AS 7.0.1 or greater only -->
<exclude>org/jboss/test/ws/publish/EndpointPublishTestCase*</exclude>
+ <!-- # Mixed type deployment -->
+ <exclude>org/jboss/test/ws/jaxws/cxf/mixtype/**</exclude>
+
</excludes>
</configuration>
</plugin>
@@ -910,6 +913,9 @@
<!-- # [AS7-1322] Implemented on AS 7.0.1 or greater only -->
<exclude>org/jboss/test/ws/publish/EndpointPublishTestCase*</exclude>
+ <!-- # Mixed type deployment -->
+ <exclude>org/jboss/test/ws/jaxws/cxf/mixtype/**</exclude>
+
</excludes>
</configuration>
</plugin>
@@ -1098,6 +1104,9 @@
<!-- # [AS7-1322] Implemented on AS 7.0.1 or greater only -->
<exclude>org/jboss/test/ws/publish/EndpointPublishTestCase*</exclude>
+ <!-- # Mixed type deployment -->
+ <exclude>org/jboss/test/ws/jaxws/cxf/mixtype/**</exclude>
+
</excludes>
</configuration>
</plugin>
@@ -1278,6 +1287,9 @@
<!-- Former JMS endpoint functionalities replaced by SOAP-over-JMS on AS7 -->
<exclude>org/jboss/test/ws/jaxws/samples/**/jmstransport/**</exclude>
+
+ <!-- # Mixed type deployment -->
+ <exclude>org/jboss/test/ws/jaxws/cxf/mixtype/**</exclude>
</excludes>
</configuration>
</plugin>
13 years, 3 months
JBossWS SVN: r14908 - in stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core/src/main/java/org/jboss/ws/core: soap and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: mmusaji
Date: 2011-08-26 12:08:42 -0400 (Fri, 26 Aug 2011)
New Revision: 14908
Modified:
stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java
stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java
stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderStax.java
stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java
Log:
JBPAPP-6864 - Removed code from previously attempted fix by mistake. Also left EnvelopeBuilderDOM.java to return actual message in cases where ignoreParseError is false but new property is not used. This allows the original message to be returned to the client as before
Modified: stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java 2011-08-26 14:27:44 UTC (rev 14907)
+++ stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java 2011-08-26 16:08:42 UTC (rev 14908)
@@ -271,7 +271,7 @@
}else {
io = new IOException("Could not transmit message");
}
-
+
io.initCause(th);
throw io;
}
Modified: stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2011-08-26 14:27:44 UTC (rev 14907)
+++ stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2011-08-26 16:08:42 UTC (rev 14908)
@@ -95,6 +95,9 @@
return null;
}
+ QName faultCode = Constants.SOAP11_FAULT_CODE_CLIENT;
+ throw new CommonSOAPFaultException(faultCode, ex.getMessage());
+
}
return build(soapMessage, domEnv);
@@ -118,6 +121,9 @@
}else if (ignoreParseError) { //kept for backward compatibility
return null;
}
+
+ QName faultCode = Constants.SOAP11_FAULT_CODE_CLIENT;
+ throw new CommonSOAPFaultException(faultCode, ex.getMessage());
}
return build(soapMessage, domEnv);
Modified: stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderStax.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderStax.java 2011-08-26 14:27:44 UTC (rev 14907)
+++ stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderStax.java 2011-08-26 16:08:42 UTC (rev 14908)
@@ -286,10 +286,6 @@
{
SOAPBody soapBody = soapEnv.getBody();
-
- if (soapBody == null) {
- soapBody = soapEnv.addBody();
- }
if (atPartMargin())
{
Modified: stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2011-08-26 14:27:44 UTC (rev 14907)
+++ stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2011-08-26 16:08:42 UTC (rev 14908)
@@ -288,15 +288,6 @@
{
envBuilder = (EnvelopeBuilder)ServiceLoader.loadService(EnvelopeBuilder.class.getName(), null);
}
- //if inputstream is empty, no need to build
- if (inputStream.markSupported()) {
- inputStream.mark(1);
- final int bytesRead = inputStream.read(new byte[1]);
- inputStream.reset();
- if (bytesRead == -1) {
- return soapMessage;
- }
- }
// Build the payload
envBuilder.setStyle(getStyle());
13 years, 4 months
JBossWS SVN: r14906 - shared-testsuite/trunk/testsuite/src/test/ant-import.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-08-26 07:54:19 -0400 (Fri, 26 Aug 2011)
New Revision: 14906
Modified:
shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml
Log:
[JBWS-2634] improve the test case - move all the common staff to shared.jar
Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml 2011-08-25 13:23:36 UTC (rev 14905)
+++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml 2011-08-26 11:54:19 UTC (rev 14906)
@@ -852,15 +852,14 @@
<!-- jaxws-jbws2634 -->
<jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2634.jar">
<fileset dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/jbws2634/shared/*.class" />
+ <include name="org/jboss/test/ws/jaxws/jbws2634/shared/**/*.class" />
+ <include name="org/jboss/test/ws/jaxws/jbws2634/webservice/EndpointIface.class" />
+ <include name="org/jboss/test/ws/jaxws/jbws2634/webservice/AbstractEndpointImpl.class" />
</fileset>
</jar>
<war warfile="${tests.output.dir}/test-libs/jaxws-jbws2634-pojo.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2634/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/jbws2634/webservice/POJOBean.class" />
- <include name="org/jboss/test/ws/jaxws/jbws2634/webservice/EndpointIface.class" />
- <include name="org/jboss/test/ws/jaxws/jbws2634/webservice/AbstractEndpointImpl.class" />
- <include name="org/jboss/test/ws/jaxws/jbws2634/shared/handlers/TestHandler.class" />
<include name="org/jboss/test/ws/jaxws/jbws2634/webservice/jaxws-handler.xml" />
</classes>
<manifest>
@@ -870,9 +869,6 @@
<jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2634-ejb3.jar">
<fileset dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/jbws2634/webservice/EJB3Bean.class" />
- <include name="org/jboss/test/ws/jaxws/jbws2634/webservice/EndpointIface.class" />
- <include name="org/jboss/test/ws/jaxws/jbws2634/webservice/AbstractEndpointImpl.class" />
- <include name="org/jboss/test/ws/jaxws/jbws2634/shared/handlers/TestHandler.class" />
<include name="org/jboss/test/ws/jaxws/jbws2634/webservice/jaxws-handler.xml" />
</fileset>
<metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2634/META-INF">
13 years, 4 months
JBossWS SVN: r14905 - stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core/src/main/java/org/jboss/ws/core/soap.
by jbossws-commits＠lists.jboss.org
Author: mmusaji
Date: 2011-08-25 09:23:36 -0400 (Thu, 25 Aug 2011)
New Revision: 14905
Modified:
stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java
Log:
JBPAPP-6864 - changed system property to org.jboss.ws.IgnoreParseError
Modified: stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2011-08-25 12:45:48 UTC (rev 14904)
+++ stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2011-08-25 13:23:36 UTC (rev 14905)
@@ -61,7 +61,7 @@
// provide logging
private static Logger log = Logger.getLogger(EnvelopeBuilderDOM.class);
- private static final String IGNORE_PARSE_ERROR_PROPERTY = System.getProperty("ignore.parse.error", "true");
+ private static final String IGNORE_PARSE_ERROR_PROPERTY = System.getProperty("org.jboss.ws.IgnoreParseError", "true");
private SOAPFactoryImpl soapFactory = new SOAPFactoryImpl();
private Style style;
13 years, 4 months
JBossWS SVN: r14904 - hudson/trunk/scripts.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-08-25 08:45:48 -0400 (Thu, 25 Aug 2011)
New Revision: 14904
Modified:
hudson/trunk/scripts/jbossws-qa.sh
Log:
Fixing hudson script for installing native before cxf on AS610 too (due to the jaxrpc stuff)
Modified: hudson/trunk/scripts/jbossws-qa.sh
===================================================================
--- hudson/trunk/scripts/jbossws-qa.sh 2011-08-25 09:39:51 UTC (rev 14903)
+++ hudson/trunk/scripts/jbossws-qa.sh 2011-08-25 12:45:48 UTC (rev 14904)
@@ -12,8 +12,8 @@
cp -r $JBOSS_INSTANCE $WORKSPACE/jboss-as
export JBOSS_HOME=$WORKSPACE/jboss-as
# HACK if running cxf on AS6, first install/update native
- if [ "$STACK_ID" = "cxf" ] && [ "$JBOSS_TARGET" = "jboss600" ]; then
- echo "cxf stack with AS 600, first installing native..."
+ if [ "$STACK_ID" = "cxf" ] && [[ $JBOSS_TARGET == jboss6* ]]; then
+ echo "cxf stack with AS 6x, first installing native..."
STACK_ID=native
ORIG_STACK_DIR=$STACK_DIR
STACK_DIR=$STACK_DIR/../../../NATIVE-BINDIST-AS-6.0.0-SUN-JDK-6/workspace/stack-native/
13 years, 4 months