JBossWS SVN: r9599 - in stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws: cxf/wsrm/basic-doc/WEB-INF and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-03-13 11:15:28 -0400 (Fri, 13 Mar 2009)
New Revision: 9599
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/descriptor/WEB-INF/jbossws-cxf.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-doc/WEB-INF/jbossws-cxf.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/jbossws-cxf.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/jbossws-cxf.xml
Log:
[JBWS-2562] fix wrong namespace to schema file mappings
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/descriptor/WEB-INF/jbossws-cxf.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/descriptor/WEB-INF/jbossws-cxf.xml 2009-03-13 14:11:50 UTC (rev 9598)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/descriptor/WEB-INF/jbossws-cxf.xml 2009-03-13 15:15:28 UTC (rev 9599)
@@ -1,7 +1,7 @@
<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/11/ws-policy.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='TestService' address='http://@jboss.bind.address@:8080/jaxws-cxf-descriptor'
@@ -13,4 +13,4 @@
</jaxws:endpoint>
-</beans>
\ No newline at end of file
+</beans>
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-doc/WEB-INF/jbossws-cxf.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-doc/WEB-INF/jbossws-cxf.xml 2009-03-13 14:11:50 UTC (rev 9598)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-doc/WEB-INF/jbossws-cxf.xml 2009-03-13 15:15:28 UTC (rev 9599)
@@ -2,7 +2,7 @@
xmlns:jaxws='http://cxf.apache.org/jaxws' xmlns:p="http://cxf.apache.org/policy"
xsi:schemaLocation='http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd
- http://www.w3.org/2006/07/ws-policy http://www.w3.org/2006/11/ws-policy.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'>
<wsp:Policy wsu:Id="RM" xmlns:wsp="http://www.w3.org/2006/07/ws-policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...">
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/jbossws-cxf.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/jbossws-cxf.xml 2009-03-13 14:11:50 UTC (rev 9598)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/jbossws-cxf.xml 2009-03-13 15:15:28 UTC (rev 9599)
@@ -2,7 +2,7 @@
xmlns:jaxws='http://cxf.apache.org/jaxws' xmlns:p="http://cxf.apache.org/policy"
xsi:schemaLocation='http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd
- http://www.w3.org/2006/07/ws-policy http://www.w3.org/2006/11/ws-policy.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'>
<wsp:Policy wsu:Id="RM" xmlns:wsp="http://www.w3.org/2006/07/ws-policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...">
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/jbossws-cxf.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/jbossws-cxf.xml 2009-03-13 14:11:50 UTC (rev 9598)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/jbossws-cxf.xml 2009-03-13 15:15:28 UTC (rev 9599)
@@ -10,7 +10,7 @@
http://cxf.apache.org/policy
http://cxf.apache.org/schemas/policy.xsd
http://www.w3.org/2006/07/ws-policy
- http://www.w3.org/2006/11/ws-policy.xsd
+ http://www.w3.org/2006/07/ws-policy.xsd
http://cxf.apache.org/jaxws
http://cxf.apache.org/schemas/jaxws.xsd'>
17 years, 1 month
JBossWS SVN: r9598 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-03-13 10:11:50 -0400 (Fri, 13 Mar 2009)
New Revision: 9598
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-2529][CXF-2112] Excluding test
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2009-03-13 13:53:39 UTC (rev 9597)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2009-03-13 14:11:50 UTC (rev 9598)
@@ -47,6 +47,9 @@
# [CXF-2110] Missing parameterOrder attribute in java2wsdl generated RPC wsdls
org/jboss/test/ws/jaxws/jbws2528/**
+# [CXF-2112] Missing element in generated WSDL definition
+org/jboss/test/ws/jaxws/jbws2529/**
+
# [JBWS-981] @WebContext defined virtual hosts only being fixed for JBoss 5
org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-03-13 13:53:39 UTC (rev 9597)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-03-13 14:11:50 UTC (rev 9598)
@@ -44,6 +44,9 @@
# [CXF-2110] Missing parameterOrder attribute in java2wsdl generated RPC wsdls
org/jboss/test/ws/jaxws/jbws2528/**
+# [CXF-2112] Missing element in generated WSDL definition
+org/jboss/test/ws/jaxws/jbws2529/**
+
# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-03-13 13:53:39 UTC (rev 9597)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-03-13 14:11:50 UTC (rev 9598)
@@ -44,6 +44,9 @@
# [CXF-2110] Missing parameterOrder attribute in java2wsdl generated RPC wsdls
org/jboss/test/ws/jaxws/jbws2528/**
+# [CXF-2112] Missing element in generated WSDL definition
+org/jboss/test/ws/jaxws/jbws2529/**
+
# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-03-13 13:53:39 UTC (rev 9597)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-03-13 14:11:50 UTC (rev 9598)
@@ -44,6 +44,9 @@
# [CXF-2110] Missing parameterOrder attribute in java2wsdl generated RPC wsdls
org/jboss/test/ws/jaxws/jbws2528/**
+# [CXF-2112] Missing element in generated WSDL definition
+org/jboss/test/ws/jaxws/jbws2529/**
+
# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-03-13 13:53:39 UTC (rev 9597)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-03-13 14:11:50 UTC (rev 9598)
@@ -44,6 +44,9 @@
# [CXF-2110] Missing parameterOrder attribute in java2wsdl generated RPC wsdls
org/jboss/test/ws/jaxws/jbws2528/**
+# [CXF-2112] Missing element in generated WSDL definition
+org/jboss/test/ws/jaxws/jbws2529/**
+
# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
17 years, 1 month
JBossWS SVN: r9597 - in framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws: jbws2529 and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-03-13 09:53:39 -0400 (Fri, 13 Mar 2009)
New Revision: 9597
Added:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2529/
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2529/Address.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2529/JBWS2529Endpoint.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2529/JBWS2529TestCase.java
Log:
[JBWS-2529] Adding testcase
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2529/Address.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2529/Address.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2529/Address.java 2009-03-13 13:53:39 UTC (rev 9597)
@@ -0,0 +1,124 @@
+/*
+ * 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.jbws2529;
+
+public class Address
+{
+
+ private String email = "";
+ private String phone = "";
+ private String street = "";
+ private String city = "San Francisco";
+ private String state = "CA";
+ private String zipcode = "94104";
+ private String country = "U.S.";
+
+ public Address(String email, String phone, String street, String city, String state, String zipcode, String country)
+ {
+ this.email = email;
+ this.phone = phone;
+ this.street = street;
+ this.city = city;
+ this.state = state;
+ this.zipcode = zipcode;
+ this.country = country;
+ }
+
+ public Address()
+ {
+ }
+
+ public String getEmail()
+ {
+ return email;
+ }
+
+ public void setEmail(String email)
+ {
+ this.email = email;
+ }
+
+ public String getPhone()
+ {
+ return phone;
+ }
+
+ public void setPhone(String phone)
+ {
+ this.phone = phone;
+ }
+
+ public String getStreet()
+ {
+ return street;
+ }
+
+ public void setStreet(String street)
+ {
+ this.street = street;
+ }
+
+ public String getCity()
+ {
+ return city;
+ }
+
+ public void setCity(String city)
+ {
+ this.city = city;
+ }
+
+ public String getState()
+ {
+ return state;
+ }
+
+ public void setState(String state)
+ {
+ this.state = state;
+ }
+
+ public String getZipcode()
+ {
+ return zipcode;
+ }
+
+ public void setZipcode(String zipcode)
+ {
+ this.zipcode = zipcode;
+ }
+
+ public String getCountry()
+ {
+ return country;
+ }
+
+ public void setCountry(String country)
+ {
+ this.country = country;
+ }
+
+ public String toString()
+ {
+ return "email:" + email + " phone:" + phone + " street:" + street + " city:" + city + " state:" + state + " zipcode:" + zipcode + " country:" + country;
+ }
+}
Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2529/Address.java
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2529/JBWS2529Endpoint.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2529/JBWS2529Endpoint.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2529/JBWS2529Endpoint.java 2009-03-13 13:53:39 UTC (rev 9597)
@@ -0,0 +1,46 @@
+/*
+ * 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.jbws2529;
+
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+@WebService
+@SOAPBinding(style = SOAPBinding.Style.DOCUMENT, use = SOAPBinding.Use.LITERAL, parameterStyle = SOAPBinding.ParameterStyle.BARE)
+public class JBWS2529Endpoint
+{
+ @WebMethod(operationName = "hello", action = "urn:Hello")
+ public String hello(@WebParam(name = "string1") String name)
+ {
+ return "hello : " + name;
+ }
+
+ @WebMethod(operationName = "helloWrapped", action = "urn:HelloWrapped")
+ @SOAPBinding(style = SOAPBinding.Style.DOCUMENT, use = SOAPBinding.Use.LITERAL, parameterStyle = SOAPBinding.ParameterStyle.WRAPPED)
+ public String helloWrapped(@WebParam(name = "string8") String name, Address address)
+ {
+ return "helloWrapped : " + name;
+ }
+
+}
Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2529/JBWS2529Endpoint.java
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: 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 (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2529/JBWS2529TestCase.java 2009-03-13 13:53:39 UTC (rev 9597)
@@ -0,0 +1,115 @@
+/*
+ * 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.jbws2529;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.util.List;
+
+import javax.xml.namespace.QName;
+
+import org.jboss.wsf.common.DOMUtils;
+import org.jboss.wsf.test.JBossWSTest;
+import org.w3c.dom.Element;
+
+/**
+ * [JBWS-2529] Missing type in generated WSDL part definition
+ *
+ * http://jira.jboss.org/jira/browse/JBWS-2529
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 13-Mar-2009
+ */
+public class JBWS2529TestCase extends JBossWSTest
+{
+ private static final String FS = System.getProperty("file.separator"); // '/' on unix, '\' on windows
+ private static final String PS = System.getProperty("path.separator"); // ':' on unix, ';' on windows
+ private static final String EXT = ":".equals( PS ) ? ".sh" : ".bat";
+ private static final String XML_SCHEMA_NS = "http://www.w3.org/2001/XMLSchema";
+
+ private String ENDPOINT_CLASS;
+
+ private String JBOSS_HOME;
+ private String CLASSES_DIR;
+ private String TEST_DIR;
+
+ private String origJavaHome;
+
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+
+ JBOSS_HOME = System.getProperty("jboss.home");
+ CLASSES_DIR = System.getProperty("test.classes.directory");
+ ENDPOINT_CLASS = "org.jboss.test.ws.jaxws.jbws2529.JBWS2529Endpoint";
+ TEST_DIR = createResourceFile("..").getAbsolutePath();
+ origJavaHome = System.getProperty("java.home");
+
+
+ // the script requires the system JAVA_HOME, which points to the JDK not the JRE
+ if(origJavaHome.indexOf(FS + "jre")!=-1)
+ {
+ String JDK_HOME = origJavaHome.substring(0, origJavaHome.indexOf(FS + "jre"));
+ System.setProperty("java.home", JDK_HOME);
+ }
+ }
+
+ protected void tearDown() throws Exception
+ {
+ // reset surefire's JAVA_HOME
+ System.setProperty("java.home", origJavaHome);
+ }
+
+ public void test() throws Exception
+ {
+ File destDir = new File(TEST_DIR, "wsprovide" + FS + "java");
+ String absOutput = destDir.getAbsolutePath();
+ 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");
+ Element root = DOMUtils.parse(new FileInputStream(wsdl));
+ QName schemaQName = new QName(XML_SCHEMA_NS,"schema");
+ Element schema = null;
+ if (root.getLocalName().equals(schemaQName.getLocalPart()) && root.getNamespaceURI().equals(schemaQName.getNamespaceURI()))
+ {
+ schema = root;
+ }
+ else
+ {
+ schema = (Element)DOMUtils.getChildElements(root, new QName(XML_SCHEMA_NS,"schema"), true).next();
+ }
+ List<Element> elements = DOMUtils.getChildElementsAsList(schema, new QName(XML_SCHEMA_NS,"element"));
+ boolean foundRequest = false;
+ boolean foundResponse = false;
+ for (Element el : elements)
+ {
+ if ("helloWrapped".equals(el.getAttribute("name")))
+ foundRequest = true;
+ if ("helloWrappedResponse".equals(el.getAttribute("name")))
+ foundResponse = true;
+ }
+ assertTrue("helloWrapped element not found!", foundRequest);
+ assertTrue("helloWrappedResponse element not found!", foundResponse);
+ }
+
+}
Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2529/JBWS2529TestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
17 years, 1 month
JBossWS SVN: r9596 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-03-12 13:39:52 -0400 (Thu, 12 Mar 2009)
New Revision: 9596
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-2528][CXF-2110] Excluding test
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2009-03-12 17:29:52 UTC (rev 9595)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2009-03-12 17:39:52 UTC (rev 9596)
@@ -44,6 +44,9 @@
# [CXF-2006] RespectBinding feature and not understood required extensibility elements
org/jboss/test/ws/jaxws/jbws2449/**
+# [CXF-2110] Missing parameterOrder attribute in java2wsdl generated RPC wsdls
+org/jboss/test/ws/jaxws/jbws2528/**
+
# [JBWS-981] @WebContext defined virtual hosts only being fixed for JBoss 5
org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-03-12 17:29:52 UTC (rev 9595)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-03-12 17:39:52 UTC (rev 9596)
@@ -41,6 +41,9 @@
# [CXF-2006] RespectBinding feature and not understood required extensibility elements
org/jboss/test/ws/jaxws/jbws2449/**
+# [CXF-2110] Missing parameterOrder attribute in java2wsdl generated RPC wsdls
+org/jboss/test/ws/jaxws/jbws2528/**
+
# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-03-12 17:29:52 UTC (rev 9595)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-03-12 17:39:52 UTC (rev 9596)
@@ -41,6 +41,9 @@
# [CXF-2006] RespectBinding feature and not understood required extensibility elements
org/jboss/test/ws/jaxws/jbws2449/**
+# [CXF-2110] Missing parameterOrder attribute in java2wsdl generated RPC wsdls
+org/jboss/test/ws/jaxws/jbws2528/**
+
# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-03-12 17:29:52 UTC (rev 9595)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-03-12 17:39:52 UTC (rev 9596)
@@ -41,6 +41,9 @@
# [CXF-2006] RespectBinding feature and not understood required extensibility elements
org/jboss/test/ws/jaxws/jbws2449/**
+# [CXF-2110] Missing parameterOrder attribute in java2wsdl generated RPC wsdls
+org/jboss/test/ws/jaxws/jbws2528/**
+
# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-03-12 17:29:52 UTC (rev 9595)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-03-12 17:39:52 UTC (rev 9596)
@@ -41,6 +41,9 @@
# [CXF-2006] RespectBinding feature and not understood required extensibility elements
org/jboss/test/ws/jaxws/jbws2449/**
+# [CXF-2110] Missing parameterOrder attribute in java2wsdl generated RPC wsdls
+org/jboss/test/ws/jaxws/jbws2528/**
+
# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
17 years, 1 month
JBossWS SVN: r9595 - in framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws: jbws2528 and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-03-12 13:29:52 -0400 (Thu, 12 Mar 2009)
New Revision: 9595
Added:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2528/
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2528/Employee.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2528/EmployeeType.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2528/JBWS2528Endpoint.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2528/JBWS2528TestCase.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2528/Name.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2528/NameException.java
Log:
[JBWS-2528] Adding testcase
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2528/Employee.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2528/Employee.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2528/Employee.java 2009-03-12 17:29:52 UTC (rev 9595)
@@ -0,0 +1,119 @@
+/*
+ * 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.jbws2528;
+
+public class Employee
+{
+
+ private Name name;
+ private String dept;
+ private Float salary;
+ private String address;
+ private String title;
+ private int type;
+
+ public Employee(Name name, String dept, Float salary, String address, String title, int type)
+ {
+ this.name = name;
+ this.dept = dept;
+ this.salary = salary;
+ this.address = address;
+ this.title = title;
+ this.type = type;
+ }
+
+ public Employee()
+ {
+ name = new Name();
+ dept = "";
+ salary = 0F;
+ address = "";
+ title = "";
+ type = EmployeeType.PERMANENT;
+ }
+
+ public String toString()
+ {
+ return name + "::" + dept + "::" + salary + "::" + address + "::" + title + "::" + type;
+ }
+
+ public Name getName()
+ {
+ return name;
+ }
+
+ public void setName(Name name)
+ {
+ this.name = name;
+ }
+
+ public String getDept()
+ {
+ return dept;
+ }
+
+ public void setDept(String dept)
+ {
+ this.dept = dept;
+ }
+
+ public Float getSalary()
+ {
+ return salary;
+ }
+
+ public void setSalary(Float salary)
+ {
+ this.salary = salary;
+ }
+
+ public String getAddress()
+ {
+ return address;
+ }
+
+ public void setAddress(String address)
+ {
+ this.address = address;
+ }
+
+ public String getTitle()
+ {
+ return title;
+ }
+
+ public void setTitle(String title)
+ {
+ this.title = title;
+ }
+
+ public int getType()
+ {
+ return type;
+ }
+
+ public void setType(int type)
+ {
+ this.type = type;
+ }
+
+}
Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2528/Employee.java
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2528/EmployeeType.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2528/EmployeeType.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2528/EmployeeType.java 2009-03-12 17:29:52 UTC (rev 9595)
@@ -0,0 +1,29 @@
+/*
+ * 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.jbws2528;
+
+public final class EmployeeType
+{
+ public static final int PERMANENT = 0;
+ public static final int TEMP = 1;
+ public static final int CONTRACTOR = 2;
+}
Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2528/EmployeeType.java
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2528/JBWS2528Endpoint.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2528/JBWS2528Endpoint.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2528/JBWS2528Endpoint.java 2009-03-12 17:29:52 UTC (rev 9595)
@@ -0,0 +1,44 @@
+/*
+ * 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.jbws2528;
+
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+import javax.xml.ws.Holder;
+
+@WebService
+@SOAPBinding(style = SOAPBinding.Style.RPC, use = SOAPBinding.Use.LITERAL)
+public class JBWS2528Endpoint
+{
+
+ @WebMethod
+ public String hello3(@WebParam(name = "id", targetNamespace = "hello3/Name", header = true) String name,
+ @WebParam(name = "Name", mode = WebParam.Mode.OUT) Holder<Name> name2,
+ @WebParam(name = "Employee", mode = WebParam.Mode.INOUT) Holder<Employee> employee)
+ throws NameException
+ {
+ return "Hello " + name;
+ }
+}
Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2528/JBWS2528Endpoint.java
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2528/JBWS2528TestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2528/JBWS2528TestCase.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2528/JBWS2528TestCase.java 2009-03-12 17:29:52 UTC (rev 9595)
@@ -0,0 +1,102 @@
+/*
+ * 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.jbws2528;
+
+import java.io.File;
+import java.net.URL;
+import java.util.List;
+
+import javax.wsdl.Definition;
+import javax.wsdl.Operation;
+import javax.wsdl.PortType;
+import javax.wsdl.factory.WSDLFactory;
+import javax.wsdl.xml.WSDLReader;
+import javax.xml.namespace.QName;
+
+import org.jboss.wsf.test.JBossWSTest;
+
+/**
+ * [JBWS-2528] Missing parameterOrder in portType/operation
+ *
+ * http://jira.jboss.org/jira/browse/JBWS-2528
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 12-Mar-2009
+ */
+public class JBWS2528TestCase extends JBossWSTest
+{
+ private static final String FS = System.getProperty("file.separator"); // '/' on unix, '\' on windows
+ private static final String PS = System.getProperty("path.separator"); // ':' on unix, ';' on windows
+ private static final String EXT = ":".equals( PS ) ? ".sh" : ".bat";
+
+ private String ENDPOINT_CLASS;
+
+ private String JBOSS_HOME;
+ private String CLASSES_DIR;
+ private String TEST_DIR;
+
+ private String origJavaHome;
+
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+
+ JBOSS_HOME = System.getProperty("jboss.home");
+ CLASSES_DIR = System.getProperty("test.classes.directory");
+ ENDPOINT_CLASS = "org.jboss.test.ws.jaxws.jbws2528.JBWS2528Endpoint";
+ TEST_DIR = createResourceFile("..").getAbsolutePath();
+ origJavaHome = System.getProperty("java.home");
+
+
+ // the script requires the system JAVA_HOME, which points to the JDK not the JRE
+ if(origJavaHome.indexOf(FS + "jre")!=-1)
+ {
+ String JDK_HOME = origJavaHome.substring(0, origJavaHome.indexOf(FS + "jre"));
+ System.setProperty("java.home", JDK_HOME);
+ }
+ }
+
+ protected void tearDown() throws Exception
+ {
+ // reset surefire's JAVA_HOME
+ System.setProperty("java.home", origJavaHome);
+ }
+
+ public void test() throws Exception
+ {
+ File destDir = new File(TEST_DIR, "wsprovide" + FS + "java");
+ String absOutput = destDir.getAbsolutePath();
+ String command = JBOSS_HOME + FS + "bin" + FS + "wsprovide" + EXT + " -k -w -o " + absOutput + " --classpath " + CLASSES_DIR + " " + ENDPOINT_CLASS;
+ executeCommand(command, "wsprovide");
+
+ URL wsdlURL = new File(destDir, "JBWS2528EndpointService.wsdl").toURL();
+ WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader();
+ Definition wsdlDefinition = wsdlReader.readWSDL(wsdlURL.toString());
+ PortType portType = wsdlDefinition.getPortType(new QName("http://jbws2528.jaxws.ws.test.jboss.org/", "JBWS2528Endpoint"));
+ Operation op = (Operation)portType.getOperations().get(0);
+ List<String> parOrder = op.getParameterOrdering();
+ assertEquals("id", parOrder.get(0));
+ assertEquals("Name", parOrder.get(1));
+ assertEquals("Employee", parOrder.get(2));
+ }
+
+}
Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2528/JBWS2528TestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2528/Name.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2528/Name.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2528/Name.java 2009-03-12 17:29:52 UTC (rev 9595)
@@ -0,0 +1,64 @@
+/*
+ * 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.jbws2528;
+
+public class Name implements java.io.Serializable
+{
+
+ private String firstName = "";
+ private String lastName = "";
+
+ public Name(String firstName, String lastName)
+ {
+ this.firstName = firstName;
+ this.lastName = lastName;
+ }
+
+ public Name()
+ {
+ }
+
+ public String getFirstName()
+ {
+ return firstName;
+ }
+
+ public void setFirstName(String firstName)
+ {
+ this.firstName = firstName;
+ }
+
+ public String getLastName()
+ {
+ return lastName;
+ }
+
+ public void setLastName(String lastName)
+ {
+ this.lastName = lastName;
+ }
+
+ public String toString()
+ {
+ return "First Name:" + firstName + " Last Name:" + lastName;
+ }
+}
Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2528/Name.java
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2528/NameException.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2528/NameException.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2528/NameException.java 2009-03-12 17:29:52 UTC (rev 9595)
@@ -0,0 +1,49 @@
+/*
+ * 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.jbws2528;
+
+public class NameException extends Exception
+{
+ private String first = "";
+
+ public NameException(String first)
+ {
+ super(first + " is an invalid first name.");
+ this.first = first;
+ }
+
+ public NameException()
+ {
+ super();
+ }
+
+ public String getFirst()
+ {
+ return first;
+ }
+
+ public void setFirst(String first)
+ {
+ this.first = first;
+ }
+
+}
Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2528/NameException.java
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
17 years, 1 month
JBossWS SVN: r9594 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2527.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-03-12 13:29:25 -0400 (Thu, 12 Mar 2009)
New Revision: 9594
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2527/JBWS2527TestCase.java
Log:
Adding comment
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2527/JBWS2527TestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2527/JBWS2527TestCase.java 2009-03-12 14:42:57 UTC (rev 9593)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2527/JBWS2527TestCase.java 2009-03-12 17:29:25 UTC (rev 9594)
@@ -26,13 +26,10 @@
import java.net.HttpURLConnection;
import java.net.URL;
-import junit.framework.Test;
-
import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestSetup;
/**
- * JBWS-2527 testcase
+ * JBWS-2527 testcase: BeanFactory not initialized or already closed
*
* @author richard.opalka(a)jboss.com
*/
17 years, 1 month
JBossWS SVN: r9593 - in stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1772/src/main/java/org/jboss/ws/core: jaxws/handler and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-03-12 10:42:57 -0400 (Thu, 12 Mar 2009)
New Revision: 9593
Modified:
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1772/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerDelegateJAXRPC.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1772/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerDelegateJAXWS.java
Log:
[JBPAPP-1772] ConcurrentModificationException in initHandlerChain().
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1772/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerDelegateJAXRPC.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1772/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerDelegateJAXRPC.java 2009-03-12 14:32:42 UTC (rev 9592)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1772/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerDelegateJAXRPC.java 2009-03-12 14:42:57 UTC (rev 9593)
@@ -88,10 +88,16 @@
// Initialize the handler chain
if (isInitialized() == false)
{
- initHandlerChain(sepMetaData, HandlerType.PRE);
- initHandlerChain(sepMetaData, HandlerType.ENDPOINT);
- initHandlerChain(sepMetaData, HandlerType.POST);
- setInitialized(true);
+ synchronized (sepMetaData)
+ {
+ if (isInitialized() == false)
+ {
+ initHandlerChain(sepMetaData, HandlerType.PRE);
+ initHandlerChain(sepMetaData, HandlerType.ENDPOINT);
+ initHandlerChain(sepMetaData, HandlerType.POST);
+ setInitialized(true);
+ }
+ }
}
boolean status = true;
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1772/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerDelegateJAXWS.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1772/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerDelegateJAXWS.java 2009-03-12 14:32:42 UTC (rev 9592)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1772/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerDelegateJAXWS.java 2009-03-12 14:42:57 UTC (rev 9593)
@@ -77,11 +77,17 @@
// Initialize the handler chain
if (isInitialized() == false)
{
- EndpointConfigMetaData ecmd = sepMetaData.getEndpointConfigMetaData();
- resolver.initHandlerChain(ecmd, HandlerType.PRE, true);
- resolver.initHandlerChain(ecmd, HandlerType.ENDPOINT, true);
- resolver.initHandlerChain(ecmd, HandlerType.POST, true);
- setInitialized(true);
+ synchronized (resolver)
+ {
+ if (isInitialized() == false)
+ {
+ EndpointConfigMetaData ecmd = sepMetaData.getEndpointConfigMetaData();
+ resolver.initHandlerChain(ecmd, HandlerType.PRE, true);
+ resolver.initHandlerChain(ecmd, HandlerType.ENDPOINT, true);
+ resolver.initHandlerChain(ecmd, HandlerType.POST, true);
+ setInitialized(true);
+ }
+ }
}
HandlerChainExecutor executor = createExecutor(sepMetaData, type);
17 years, 1 month
JBossWS SVN: r9592 - in stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core: jaxws/handler and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-03-12 10:32:42 -0400 (Thu, 12 Mar 2009)
New Revision: 9592
Modified:
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerDelegateJAXRPC.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerDelegateJAXWS.java
Log:
[JBPAPP-1760] ConcurrentModificationException in initHandlerChain().
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerDelegateJAXRPC.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerDelegateJAXRPC.java 2009-03-12 14:10:30 UTC (rev 9591)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerDelegateJAXRPC.java 2009-03-12 14:32:42 UTC (rev 9592)
@@ -88,10 +88,16 @@
// Initialize the handler chain
if (isInitialized() == false)
{
- initHandlerChain(sepMetaData, HandlerType.PRE);
- initHandlerChain(sepMetaData, HandlerType.ENDPOINT);
- initHandlerChain(sepMetaData, HandlerType.POST);
- setInitialized(true);
+ synchronized (sepMetaData)
+ {
+ if (isInitialized() == false)
+ {
+ initHandlerChain(sepMetaData, HandlerType.PRE);
+ initHandlerChain(sepMetaData, HandlerType.ENDPOINT);
+ initHandlerChain(sepMetaData, HandlerType.POST);
+ setInitialized(true);
+ }
+ }
}
boolean status = true;
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerDelegateJAXWS.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerDelegateJAXWS.java 2009-03-12 14:10:30 UTC (rev 9591)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerDelegateJAXWS.java 2009-03-12 14:32:42 UTC (rev 9592)
@@ -77,11 +77,17 @@
// Initialize the handler chain
if (isInitialized() == false)
{
- EndpointConfigMetaData ecmd = sepMetaData.getEndpointConfigMetaData();
- resolver.initHandlerChain(ecmd, HandlerType.PRE, true);
- resolver.initHandlerChain(ecmd, HandlerType.ENDPOINT, true);
- resolver.initHandlerChain(ecmd, HandlerType.POST, true);
- setInitialized(true);
+ synchronized (resolver)
+ {
+ if (isInitialized() == false)
+ {
+ EndpointConfigMetaData ecmd = sepMetaData.getEndpointConfigMetaData();
+ resolver.initHandlerChain(ecmd, HandlerType.PRE, true);
+ resolver.initHandlerChain(ecmd, HandlerType.ENDPOINT, true);
+ resolver.initHandlerChain(ecmd, HandlerType.POST, true);
+ setInitialized(true);
+ }
+ }
}
HandlerChainExecutor executor = createExecutor(sepMetaData, type);
17 years, 1 month
JBossWS SVN: r9591 - stack/metro/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-03-12 10:10:30 -0400 (Thu, 12 Mar 2009)
New Revision: 9591
Modified:
stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss510.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss600.txt
Log:
[JBWS-2308][JBWS-2574] excluding all test cases
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-03-12 12:57:35 UTC (rev 9590)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-03-12 14:10:30 UTC (rev 9591)
@@ -24,7 +24,7 @@
org/jboss/test/ws/jaxws/jbws1190/**
# [JBWS-2308] faultCode argument for createFault was passed NULL
-org/jboss/test/ws/jaxws/jbws2308/JBWS2308ServletTestCase.*
+org/jboss/test/ws/jaxws/jbws2308/*TestCase.*
# [JBWS-2329] Failed to deploy service with multiple bindings
org/jboss/test/ws/jaxws/jbws2278/**
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-03-12 12:57:35 UTC (rev 9590)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-03-12 14:10:30 UTC (rev 9591)
@@ -24,7 +24,7 @@
org/jboss/test/ws/jaxws/jbws1190/**
# [JBWS-2308] faultCode argument for createFault was passed NULL
-org/jboss/test/ws/jaxws/jbws2308/JBWS2308ServletTestCase.*
+org/jboss/test/ws/jaxws/jbws2308/*TestCase.*
# [JBWS-2329] Failed to deploy service with multiple bindings
org/jboss/test/ws/jaxws/jbws2278/**
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-03-12 12:57:35 UTC (rev 9590)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-03-12 14:10:30 UTC (rev 9591)
@@ -24,7 +24,7 @@
org/jboss/test/ws/jaxws/jbws1190/**
# [JBWS-2308] faultCode argument for createFault was passed NULL
-org/jboss/test/ws/jaxws/jbws2308/JBWS2308ServletTestCase.*
+org/jboss/test/ws/jaxws/jbws2308/*TestCase.*
# [JBWS-2329] Failed to deploy service with multiple bindings
org/jboss/test/ws/jaxws/jbws2278/**
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-03-12 12:57:35 UTC (rev 9590)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-03-12 14:10:30 UTC (rev 9591)
@@ -24,7 +24,7 @@
org/jboss/test/ws/jaxws/jbws1190/**
# [JBWS-2308] faultCode argument for createFault was passed NULL
-org/jboss/test/ws/jaxws/jbws2308/JBWS2308ServletTestCase.*
+org/jboss/test/ws/jaxws/jbws2308/*TestCase.*
# [JBWS-2329] Failed to deploy service with multiple bindings
org/jboss/test/ws/jaxws/jbws2278/**
17 years, 1 month