[jbossws-commits] JBossWS SVN: r18313 - in stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests: src/test/java/org/jboss/test/ws/jaxws/cxf and 4 other directories.

Author: psakar Date: 2014-02-07 05:55:20 -0500 (Fri, 07 Feb 2014) New Revision: 18313 Added: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/customJaxbValidation/ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/customJaxbValidation/CustomJaxbValidationTestCase.java stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/customJaxbValidation/CustomSchemaValidationEventHandler.java stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/customJaxbValidation/HelloWS.java stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/customJaxbValidation/HelloWSImpl.java stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/customJaxbValidation/InputName.java stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/customJaxbValidation/OutputName.java stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/customJaxbValidation/ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/customJaxbValidation/WEB-INF/ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/customJaxbValidation/WEB-INF/jbossws-cxf-only-schema-validation.xml stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/customJaxbValidation/WEB-INF/jbossws-cxf.xml stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/customJaxbValidation/WEB-INF/web.xml Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml Log: adding test of custom JAXB validation handlers for outgoing messages Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2014-02-07 09:16:05 UTC (rev 18312) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2014-02-07 10:55:20 UTC (rev 18313) @@ -59,6 +59,18 @@ prefix="WEB-INF/wsdl"/> </war> + <!-- jaxws-cxf-customJaxbValidation --> + <war destfile="${tests.output.dir}/test-libs/jaxws-cxf-customJaxbValidation.war"> + <classes dir="${tests.output.dir}/test-classes"> + <exclude name="org/jboss/test/ws/jaxws/cxf/customJaxbValidation/*TestCase.class"/> + <include name="org/jboss/test/ws/jaxws/cxf/customJaxbValidation/*.class"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/cxf/customJaxbValidation/WEB-INF"> + <include name="jbossws-cxf.xml"/> + <include name="web.xml"/> + </webinf> + </war> + <!-- jaxws-cxf-descriptor --> <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-descriptor.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/descriptor/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> @@ -67,7 +79,7 @@ </classes> <classes dir="${tests.output.dir}/test-resources/jaxws/cxf/descriptor/"> <include name="cxf.xml"/> - </classes> + </classes> <webinf dir="${tests.output.dir}/test-resources/jaxws/cxf/descriptor/WEB-INF"> <include name="jbossws-cxf.xml"/> </webinf> @@ -116,7 +128,7 @@ <include name="org/jboss/test/ws/jaxws/cxf/jbws3745/SimpleService*.class" /> </classes> </war> - + <!-- saaj-soap-connection --> <war warfile="${tests.output.dir}/test-libs/saaj-soap-connection.war" @@ -127,7 +139,7 @@ <include name="org/jboss/test/ws/saaj/jbws3084/InputStreamDataSource.class"/> </classes> <zipfileset - dir="${tests.output.dir}/test-resources/saaj/jbws3084/WEB-INF/wsdl" + dir="${tests.output.dir}/test-resources/saaj/jbws3084/WEB-INF/wsdl" prefix="WEB-INF/wsdl"/> </war> Added: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/customJaxbValidation/CustomJaxbValidationTestCase.java =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/customJaxbValidation/CustomJaxbValidationTestCase.java (rev 0) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/customJaxbValidation/CustomJaxbValidationTestCase.java 2014-02-07 10:55:20 UTC (rev 18313) @@ -0,0 +1,137 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, 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.customJaxbValidation; + + + +import static org.jboss.test.ws.jaxws.cxf.customJaxbValidation.HelloWSImpl.*; + +import java.net.URL; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * [JBWS-1178] Multiple virtual host and soap:address problem + * [JBWS-864] soap:address in wsdl ignores <url-pattern> + * + * @author Thomas.Diesler(a)jboss.com + * @since 05-Oct-2006 + */ +public class CustomJaxbValidationTestCase extends JBossWSTest +{ + + + private static final String name = "jaxws-cxf-customJaxbValidation"; + private static final String NAMESPACE = createNamespaceFromPackageOfClass(HelloWS.class); + private static final QName SERVICE_QNAME = new QName(NAMESPACE, HelloWS.class.getSimpleName()); + private static final String ENDPOINT_URL = "http://" + JBossWSTestHelper.getServerHost() + ":8080/" + name + "/hello"; + private static final String WSDL_URL = ENDPOINT_URL + "?wsdl"; + private HelloWS port; + + + public static Test suite() + { + return new JBossWSTestSetup(CustomJaxbValidationTestCase.class, name + ".war"); + } + + @Override + public void setUp() throws Exception { + URL wsdl = new URL(WSDL_URL); + Service service = Service.create(wsdl, SERVICE_QNAME); + QName portQName = new QName(NAMESPACE, "hello"); + port = service.getPort(portQName, HelloWS.class); + } + + + public void testOutput() throws Exception + { + String inputName = "name"; + OutputName result = port.hello(inputName); + assertEquals(inputName, result.getName()); + } + + public void testOutputValidationFailureIsHandledByCustomSchemaValidationHandler() throws Exception + { + String inputName = SET_OUPUT_NAME_TO_NULL; + OutputName result = port.hello(inputName); + assertEquals(null, result.getName()); + } + + public void testOuputForInputName() throws Exception + { + String inputName = "name"; + OutputName result = port.helloValidateInput(new InputName(inputName)); + assertEquals(inputName, result.getName()); + } + + public void testOutputForMissingInputName() throws Exception + { + OutputName result = port.helloValidateInput(null); + assertEquals(NULL_INPUT, result.getName()); + } + + public void testInputNameValidationFailureIsHandledByCustomSchemaValidationHandler() throws Exception + { + OutputName result = port.helloValidateInput(new InputName()); + assertEquals(NULL_INPUT_NAME, result.getName()); + } + + public void testOutputValidationFailreIsHandledByCustomSchemaValidationHandlerForInputName() throws Exception + { + String inputName = HelloWSImpl.SET_OUPUT_NAME_TO_NULL; + OutputName result = port.helloValidateInput(new InputName(inputName)); + assertEquals(null, result.getName()); + } + + + static String createNamespaceFromPackageOfClass(Class<?> clazz) { + String packageName = clazz.getPackage().getName(); + String names [] = packageName.split("\\."); + List<String> namesInReverseOrder = new ArrayList<String>(); + namesInReverseOrder.addAll(Arrays.asList(names)); + Collections.reverse(namesInReverseOrder); + StringBuilder name = new StringBuilder(); + name.append("http://"); + boolean first = true; + for (String part : namesInReverseOrder) { + if (!first) + name.append("."); + else + first = false; + name.append(part); + } + name.append("/"); + return name.toString(); + } + +} Added: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/customJaxbValidation/CustomSchemaValidationEventHandler.java =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/customJaxbValidation/CustomSchemaValidationEventHandler.java (rev 0) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/customJaxbValidation/CustomSchemaValidationEventHandler.java 2014-02-07 10:55:20 UTC (rev 18313) @@ -0,0 +1,21 @@ +package org.jboss.test.ws.jaxws.cxf.customJaxbValidation; + +import javax.xml.bind.ValidationEvent; +import javax.xml.bind.ValidationEventHandler; + +public class CustomSchemaValidationEventHandler implements ValidationEventHandler { + + public CustomSchemaValidationEventHandler() { + info(getClass().getSimpleName() + " created"); + } + + private void info(String info) { + System.err.println(info); + } + + @Override + public boolean handleEvent(ValidationEvent event) { + info(getClass().getSimpleName() + " handle successfully event " + event); + return true; + } +} Added: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/customJaxbValidation/HelloWS.java =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/customJaxbValidation/HelloWS.java (rev 0) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/customJaxbValidation/HelloWS.java 2014-02-07 10:55:20 UTC (rev 18313) @@ -0,0 +1,14 @@ +/* + * To the extent possible under law, Red Hat, Inc. has dedicated all copyright + * to this software to the public domain worldwide, pursuant to the CC0 Public + * Domain Dedication. This software is distributed without any warranty. See + * <http://creativecommons.org/publicdomain/zero/1.0/>;. + */ + +package org.jboss.test.ws.jaxws.cxf.customJaxbValidation; + +(a)javax.jws.WebService(portName = "hello") +public interface HelloWS { + public OutputName hello(String name); + public OutputName helloValidateInput(InputName name); +} Added: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/customJaxbValidation/HelloWSImpl.java =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/customJaxbValidation/HelloWSImpl.java (rev 0) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/customJaxbValidation/HelloWSImpl.java 2014-02-07 10:55:20 UTC (rev 18313) @@ -0,0 +1,40 @@ +/* + * To the extent possible under law, Red Hat, Inc. has dedicated all copyright + * to this software to the public domain worldwide, pursuant to the CC0 Public + * Domain Dedication. This software is distributed without any warranty. See + * <http://creativecommons.org/publicdomain/zero/1.0/>;. + */ + +package org.jboss.test.ws.jaxws.cxf.customJaxbValidation; + +(a)javax.jws.WebService(serviceName=&quot;HelloWS&quot;, portName="hello") +public class HelloWSImpl implements HelloWS { + public static final String SET_OUPUT_NAME_TO_NULL = "SET_OUPUT_NAME_TO_NULL"; + + public static final String NULL_INPUT = "NULL_INPUT"; + public static final String NULL_INPUT_NAME = "NULL_INPUT_NAME"; + + + @Override + public OutputName hello(String name) { + System.err.println("Hello, " + name); + if (name == null) + return new OutputName(NULL_INPUT); + if (SET_OUPUT_NAME_TO_NULL.equals(name)) + return new OutputName(); + return new OutputName(name) ; + } + + @Override + public OutputName helloValidateInput(InputName input) { + System.err.println("Hello, " + (input == null ? NULL_INPUT_NAME : input.getName())); + if (input == null) + return new OutputName(NULL_INPUT); + if (input.getName() == null) + return new OutputName(NULL_INPUT_NAME); + if (SET_OUPUT_NAME_TO_NULL.equals(input.getName())) + return new OutputName(); + return new OutputName(input.getName()) ; + } + +} Added: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/customJaxbValidation/InputName.java =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/customJaxbValidation/InputName.java (rev 0) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/customJaxbValidation/InputName.java 2014-02-07 10:55:20 UTC (rev 18313) @@ -0,0 +1,25 @@ +package org.jboss.test.ws.jaxws.cxf.customJaxbValidation; + +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + +@XmlType(name = "input") +public class InputName { + private String name; + + public InputName() { + } + + public InputName(String name) { + this.name = name; + } + + @XmlElement(nillable = false, required = true) + public String getName() { + return this.name; + } + + public void setName(String name) { + this.name = name; + } +} Added: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/customJaxbValidation/OutputName.java =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/customJaxbValidation/OutputName.java (rev 0) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/customJaxbValidation/OutputName.java 2014-02-07 10:55:20 UTC (rev 18313) @@ -0,0 +1,25 @@ +package org.jboss.test.ws.jaxws.cxf.customJaxbValidation; + +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + +@XmlType(name = "output") +public class OutputName { + private String name; + + public OutputName() { + } + + public OutputName(String name) { + this.name = name; + } + + @XmlElement(nillable = false, required = true) + public String getName() { + return this.name; + } + + public void setName(String name) { + this.name = name; + } +} Added: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/customJaxbValidation/WEB-INF/jbossws-cxf-only-schema-validation.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/customJaxbValidation/WEB-INF/jbossws-cxf-only-schema-validation.xml (rev 0) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/customJaxbValidation/WEB-INF/jbossws-cxf-only-schema-validation.xml 2014-02-07 10:55:20 UTC (rev 18313) @@ -0,0 +1,20 @@ +<?xml version="1.0"?> +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:jaxws="http://cxf.apache.org/jaxws" + xmlns:cxf="http://cxf.apache.org/core" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation=" + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd + http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd"> + <jaxws:endpoint id="hello" + address="http://localhost:8080/jaxws-cxf-customJaxbValidation/hello" + implementor="org.jboss.test.ws.jaxws.cxf.customJaxbValidation.HelloWSImpl"> + <jaxws:features> + <cxf:logging/> + </jaxws:features> + <jaxws:properties> + <entry key="schema-validation-enabled" value="true"/> + </jaxws:properties> + </jaxws:endpoint> +</beans> Property changes on: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/customJaxbValidation/WEB-INF/jbossws-cxf-only-schema-validation.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/customJaxbValidation/WEB-INF/jbossws-cxf.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/customJaxbValidation/WEB-INF/jbossws-cxf.xml (rev 0) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/customJaxbValidation/WEB-INF/jbossws-cxf.xml 2014-02-07 10:55:20 UTC (rev 18313) @@ -0,0 +1,26 @@ +<?xml version="1.0"?> +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:jaxws="http://cxf.apache.org/jaxws" + xmlns:cxf="http://cxf.apache.org/core" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation=" + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd + http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd"> + <jaxws:endpoint id="hello" + address="http://localhost:8080/jaxws-cxf-customJaxbValidation/hello" + implementor="org.jboss.test.ws.jaxws.cxf.customJaxbValidation.HelloWSImpl"> + <jaxws:features> + <cxf:logging/> + </jaxws:features> + <jaxws:properties> + <entry key="jaxb-validation-event-handler"> + <bean class="org.jboss.test.ws.jaxws.cxf.customJaxbValidation.CustomSchemaValidationEventHandler" /> + </entry> + <entry key="jaxb-writer-validation-event-handler"> + <bean class="org.jboss.test.ws.jaxws.cxf.customJaxbValidation.CustomSchemaValidationEventHandler" /> + </entry> + <entry key="schema-validation-enabled" value="true"/> + </jaxws:properties> + </jaxws:endpoint> +</beans> Property changes on: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/customJaxbValidation/WEB-INF/jbossws-cxf.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/customJaxbValidation/WEB-INF/web.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/customJaxbValidation/WEB-INF/web.xml (rev 0) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/customJaxbValidation/WEB-INF/web.xml 2014-02-07 10:55:20 UTC (rev 18313) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + To the extent possible under law, Red Hat, Inc. has dedicated all copyright + to this software to the public domain worldwide, pursuant to the CC0 Public + Domain Dedication. This software is distributed without any warranty. See + <http://creativecommons.org/publicdomain/zero/1.0/>;. +--> +<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4"> + <servlet> + <servlet-name>HelloWS</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.cxf.customJaxbValidation.HelloWSImpl</servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>HelloWS</servlet-name> + <url-pattern>/hello</url-pattern> + </servlet-mapping> +</web-app> Property changes on: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/customJaxbValidation/WEB-INF/web.xml ___________________________________________________________________ Added: svn:mime-type + text/xml