JBossWS SVN: r3680 - in branches/jbossws-2.0: jbossws-core/ant-import and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-06-21 12:08:28 -0400 (Thu, 21 Jun 2007)
New Revision: 3680
Modified:
branches/jbossws-2.0/build/ant-import/build-testsuite.xml
branches/jbossws-2.0/jbossws-core/ant-import-tests/build-jars-jaxws.xml
branches/jbossws-2.0/jbossws-core/ant-import/build-thirdparty.xml
branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1665/JBWS1665TestCase.java
Log:
[JBWS-1665] incorrect wsdl generation
Modified: branches/jbossws-2.0/build/ant-import/build-testsuite.xml
===================================================================
--- branches/jbossws-2.0/build/ant-import/build-testsuite.xml 2007-06-21 15:50:44 UTC (rev 3679)
+++ branches/jbossws-2.0/build/ant-import/build-testsuite.xml 2007-06-21 16:08:28 UTC (rev 3680)
@@ -146,12 +146,11 @@
<pathelement location="${jboss.client}/jboss-ejb3-client.jar"/>
<pathelement location="${jboss.client}/jboss-j2ee.jar"/>
<pathelement location="${jboss.client}/jboss-xml-binding.jar"/>
+ <pathelement location="${jboss.client}/jbosssx-client.jar"/>
<pathelement location="${jboss.client}/mail.jar"/>
- <pathelement location="${jboss.client}/wsdl4j.jar"/>
<pathelement location="${jboss.client}/stax-api.jar"/>
- <pathelement location="${jboss.client}/jbosssx-client.jar"/>
+ <pathelement location="${jboss.client}/wsdl4j.jar"/>
<pathelement location="${jboss.server.lib}/servlet-api.jar"/>
- <pathelement location="${jboss.client}/junit.jar"/>
</path>
<path id="tests.client.classpath">
<pathelement location="${jboss.client}/commons-logging.jar"/>
Modified: branches/jbossws-2.0/jbossws-core/ant-import/build-thirdparty.xml
===================================================================
--- branches/jbossws-2.0/jbossws-core/ant-import/build-thirdparty.xml 2007-06-21 15:50:44 UTC (rev 3679)
+++ branches/jbossws-2.0/jbossws-core/ant-import/build-thirdparty.xml 2007-06-21 16:08:28 UTC (rev 3680)
@@ -115,8 +115,8 @@
<pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
<pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-annotations-ejb3.jar"/>
<pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-ejb3x.jar"/>
- <pathelement location="${thirdparty.dir}/ant.jar"/>
- <pathelement location="${thirdparty.dir}/activation.jar"/>
+ <pathelement location="${thirdparty.dir}/ant.jar"/>
+ <pathelement location="${thirdparty.dir}/activation.jar"/>
<pathelement location="${thirdparty.dir}/dom4j.jar"/>
<pathelement location="${thirdparty.dir}/getopt.jar"/>
<pathelement location="${thirdparty.dir}/javassist.jar"/>
@@ -133,16 +133,15 @@
<pathelement location="${thirdparty.dir}/jboss-remoting.jar"/>
<pathelement location="${thirdparty.dir}/jboss-xml-binding.jar"/>
<pathelement location="${thirdparty.dir}/jbosssx.jar"/>
- <pathelement location="${thirdparty.dir}/junit.jar"/>
<pathelement location="${thirdparty.dir}/mail.jar"/>
+ <pathelement location="${thirdparty.dir}/policy.jar"/>
<pathelement location="${thirdparty.dir}/servlet-api.jar"/>
<pathelement location="${thirdparty.dir}/stax-api.jar"/>
<pathelement location="${thirdparty.dir}/wsdl4j.jar"/>
<pathelement location="${thirdparty.dir}/wstx.jar"/>
+ <pathelement location="${thirdparty.dir}/xalan.jar"/>
<pathelement location="${thirdparty.dir}/xmlsec.jar"/>
<pathelement location="${thirdparty.dir}/xercesImpl.jar"/>
- <pathelement location="${thirdparty.dir}/xalan.jar"/>
- <pathelement location="${thirdparty.dir}/policy.jar"/>
</path>
</target>
Modified: branches/jbossws-2.0/jbossws-core/ant-import-tests/build-jars-jaxws.xml
===================================================================
--- branches/jbossws-2.0/jbossws-core/ant-import-tests/build-jars-jaxws.xml 2007-06-21 15:50:44 UTC (rev 3679)
+++ branches/jbossws-2.0/jbossws-core/ant-import-tests/build-jars-jaxws.xml 2007-06-21 16:08:28 UTC (rev 3680)
@@ -160,19 +160,6 @@
</fileset>
</jar>
- <!-- jaxws-jbws1665 -->
- <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1665.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/jbws1665/CoordinateData.class"/>
- <include name="org/jboss/test/ws/jaxws/jbws1665/JBWS1665TestCase.class"/>
- <include name="org/jboss/test/ws/jaxws/jbws1665/PropertyData.class"/>
- <include name="org/jboss/test/ws/jaxws/jbws1665/TraceData.class"/>
- <include name="org/jboss/test/ws/jaxws/jbws1665/TracePollData.class"/>
- <include name="org/jboss/test/ws/jaxws/jbws1665/TrackingServiceBean.class"/>
- <include name="org/jboss/test/ws/jaxws/jbws1665/TrackingServiceInterface.class"/>
- </fileset>
- </jar>
-
<!-- jaxws-jbws981 -->
<jar destfile="${tests.output.dir}/libs/jaxws-jbws981.jar">
<fileset dir="${tests.output.dir}/classes">
@@ -308,6 +295,18 @@
</classes>
</war>
+ <!-- jaxws-jbws1665 -->
+ <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1665.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws1665/CoordinateData.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws1665/PropertyData.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws1665/TraceData.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws1665/TracePollData.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws1665/TrackingServiceBean.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws1665/TrackingServiceInterface.class"/>
+ </fileset>
+ </jar>
+
<!-- jaxws-jbws1666 -->
<war destfile="${tests.output.dir}/libs/jaxws-jbws1666.war" webxml="${tests.output.dir}/resources/jaxws/jbws1666/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1665/JBWS1665TestCase.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1665/JBWS1665TestCase.java 2007-06-21 15:50:44 UTC (rev 3679)
+++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1665/JBWS1665TestCase.java 2007-06-21 16:08:28 UTC (rev 3680)
@@ -45,7 +45,7 @@
*/
public class JBWS1665TestCase extends JBossWSTest
{
- public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws1655/TrackingServiceBean";
+ public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws1665/TrackingServiceBean";
public static Test suite()
{
16 years, 11 months
JBossWS SVN: r3679 - in branches/jbossws-2.0/jbossws-core/src: main/java/org/jboss/ws/metadata/umdm and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-06-21 11:50:44 -0400 (Thu, 21 Jun 2007)
New Revision: 3679
Modified:
branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshaller.java
branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java
branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java
branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1422/IWebsvc.java
branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1422/IWebsvcImpl.java
branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1422/JBWS1422TestCase.java
Log:
[JBWS-771] Use part names that are friendly to .NET
Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshaller.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshaller.java 2007-06-21 15:21:13 UTC (rev 3678)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshaller.java 2007-06-21 15:50:44 UTC (rev 3679)
@@ -72,7 +72,7 @@
// [JBWS-859] SOAPMessageUnMarshaller doesn't support HTTP server response [204] - No Content
SOAPMessage soapMsg = null;
- if (resCode != HttpServletResponse.SC_NO_CONTENT)
+ if (resCode != null && resCode != HttpServletResponse.SC_NO_CONTENT)
{
MimeHeaders mimeHeaders = getMimeHeaders(metadata);
soapMsg = new MessageFactoryImpl().createMessage(mimeHeaders, inputStream, true);
Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java 2007-06-21 15:21:13 UTC (rev 3678)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java 2007-06-21 15:50:44 UTC (rev 3679)
@@ -30,6 +30,7 @@
import java.util.Set;
import java.util.StringTokenizer;
+import javax.jws.soap.SOAPBinding.ParameterStyle;
import javax.xml.namespace.QName;
import javax.xml.rpc.ParameterMode;
@@ -104,8 +105,14 @@
this.xmlName = xmlName;
this.opMetaData = opMetaData;
this.mode = ParameterMode.IN;
- this.partName = xmlName.getLocalPart();
this.javaTypeName = javaTypeName;
+
+ // [JBWS-771] Use part names that are friendly to .NET
+ if (opMetaData.getEndpointMetaData().getParameterStyle() == ParameterStyle.WRAPPED)
+ partName = "parameters";
+ else
+ partName = xmlName.getLocalPart();
+
}
private static boolean matchParameter(Method method, int index, Class expectedType, Set<Integer> matches, boolean exact, boolean holder)
Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java 2007-06-21 15:21:13 UTC (rev 3678)
+++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java 2007-06-21 15:50:44 UTC (rev 3679)
@@ -243,9 +243,9 @@
String xmlMessage = " ";
MessageFactory factory = MessageFactory.newInstance();
factory.createMessage(null,new ByteArrayInputStream(xmlMessage.getBytes()));
- fail("IOException expected");
+ fail("Exception expected");
}
- catch (IOException e)
+ catch (Exception e)
{
// ignore
}
Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1422/IWebsvc.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1422/IWebsvc.java 2007-06-21 15:21:13 UTC (rev 3678)
+++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1422/IWebsvc.java 2007-06-21 15:50:44 UTC (rev 3679)
@@ -21,15 +21,15 @@
*/
package org.jboss.test.ws.jaxws.jbws1422;
+import javax.jws.WebParam;
import javax.jws.WebService;
-import javax.jws.WebParam;
import javax.jws.soap.SOAPBinding;
-import javax.ejb.Remote;
-@WebService(name="test")
-@SOAPBinding(style= SOAPBinding.Style.DOCUMENT, use= SOAPBinding.Use.LITERAL, parameterStyle= SOAPBinding.ParameterStyle.WRAPPED)
-@Remote
-public interface IWebsvc {
+@WebService
+@SOAPBinding(style = SOAPBinding.Style.DOCUMENT, use = SOAPBinding.Use.LITERAL, parameterStyle = SOAPBinding.ParameterStyle.WRAPPED)
+public interface IWebsvc
+{
- String cancel(@WebParam(name="nBarFoo") String myfoobar);
+ String cancel(@WebParam(name = "nBarFoo")
+ String myfoobar);
}
Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1422/IWebsvcImpl.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1422/IWebsvcImpl.java 2007-06-21 15:21:13 UTC (rev 3678)
+++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1422/IWebsvcImpl.java 2007-06-21 15:50:44 UTC (rev 3679)
@@ -22,25 +22,16 @@
package org.jboss.test.ws.jaxws.jbws1422;
import javax.ejb.Stateless;
-import javax.jws.WebService;
import javax.jws.WebParam;
+import javax.jws.WebService;
-/**
- * @author Heiko.Braun(a)jboss.com
- * @version $Revision$
- */
@Stateless
-@WebService(
- endpointInterface = "org.jboss.test.ws.jaxws.jbws1422.IWebsvc",
- serviceName = "JBWS1422Service",
- targetNamespace = "http://org.jboss.test.ws/jbws1422"
-)
-
+@WebService(endpointInterface = "org.jboss.test.ws.jaxws.jbws1422.IWebsvc", serviceName = "JBWS1422Service")
public class IWebsvcImpl implements IWebsvc
{
- public String cancel(@WebParam(name = "nBarFoo")String myfoobar)
- {
- return "Cancelled";
- }
+ public String cancel(@WebParam(name = "nBarFoo") String myfoobar)
+ {
+ return "Cancelled-" + myfoobar;
+ }
}
Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1422/JBWS1422TestCase.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1422/JBWS1422TestCase.java 2007-06-21 15:21:13 UTC (rev 3678)
+++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1422/JBWS1422TestCase.java 2007-06-21 15:50:44 UTC (rev 3679)
@@ -21,30 +21,35 @@
*/
package org.jboss.test.ws.jaxws.jbws1422;
+// $Id$
+
+import java.net.URL;
+
+import javax.wsdl.Definition;
+import javax.wsdl.Message;
+import javax.wsdl.factory.WSDLFactory;
+import javax.wsdl.xml.WSDLReader;
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
import junit.framework.Test;
-import org.jboss.ws.WSException;
+
import org.jboss.wsf.spi.test.JBossWSTest;
import org.jboss.wsf.spi.test.JBossWSTestSetup;
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import java.net.URL;
-
/**
- * If @WebParam.name starts with one lower-case character followed
- * by an upper-case character a NPE is thrown on deployment.
- *
- * http://jira.jboss.org/jira/browse/JBWS-1422
- *
- * @version $Revision:1370 $
+ * [JBWS-1422] NPE if @WebParam.name like "mX.."
+ * [JBWS-771] Use part names that are friendly to .NET
+ *
+ * @author Thomas.Diesler(a)jboss.com
*/
public class JBWS1422TestCase extends JBossWSTest
{
- private String targetNS = "http://org.jboss.test.ws/jbws1422";
- private IWebsvc port;
- private URL wsdlURL;
+ private static final String TARGET_NAMESPACE = "http://jbws1422.jaxws.ws.test.jboss.org/";
+ private static URL wsdlURL;
+ private static IWebsvc port;
- public static Test suite()
+ public static Test suite()
{
return JBossWSTestSetup.newTestSetup(JBWS1422TestCase.class, "jaxws-jbws1422.jar");
}
@@ -52,31 +57,40 @@
@Override
protected void setUp() throws Exception
{
- super.setUp();
+ if (port == null)
+ {
+ QName serviceName = new QName(TARGET_NAMESPACE, "JBWS1422Service");
+ wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1422/IWebsvcImpl?wsdl");
- QName serviceName = new QName(targetNS, "JBWS1422Service");
- wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1422/IWebsvcImpl?wsdl");
+ Service service = Service.create(wsdlURL, serviceName);
+ port = service.getPort(IWebsvc.class);
+ }
+ }
- Service service = Service.create(wsdlURL, serviceName);
- port = service.getPort(IWebsvc.class);
+ public void testDeployment() throws Exception
+ {
+ String result = port.cancel("myFooBar");
+ assertEquals("Cancelled-myFooBar", result);
}
+
+ // [JBWS-771] Use part names that are friendly to .NET
+ public void testMessagePartNames() throws Exception
+ {
+ Definition wsdl = getWSDLDefinition(wsdlURL.toExternalForm());
+
+ Message wsdlReqMessage = wsdl.getMessage(new QName(TARGET_NAMESPACE, "IWebsvc_cancel"));
+ assertNotNull("Expected part with name 'parameters' in: " + wsdlReqMessage, wsdlReqMessage.getPart("parameters"));
+
+ Message wsdlResMessage = wsdl.getMessage(new QName(TARGET_NAMESPACE, "IWebsvc_cancelResponse"));
+ assertNotNull("Expected part with name 'parameters' in: " + wsdlResMessage, wsdlResMessage.getPart("parameters"));
+ }
+
+ private Definition getWSDLDefinition(String wsdlLocation) throws Exception
+ {
+ WSDLFactory wsdlFactory = WSDLFactory.newInstance();
+ WSDLReader wsdlReader = wsdlFactory.newWSDLReader();
- /**
- *
- * @throws Exception
- */
- public void testDeployment() throws Exception
- {
- try
- {
- String result = port.cancel("myFooBar");
- assertNotNull(result);
- assertEquals("Cancelled", result);
- }
- catch (Exception ex)
- {
- WSException.rethrow(ex);
- }
- }
-
+ Definition definition = wsdlReader.readWSDL(null, wsdlLocation);
+ return definition;
+ }
}
16 years, 11 months
JBossWS SVN: r3678 - in branches/jbossws-2.0: jbossws-core/ant-import and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: david.boeren
Date: 2007-06-21 11:21:13 -0400 (Thu, 21 Jun 2007)
New Revision: 3678
Modified:
branches/jbossws-2.0/build/ant-import/build-testsuite.xml
branches/jbossws-2.0/jbossws-core/ant-import-tests/build-jars-jaxws.xml
branches/jbossws-2.0/jbossws-core/ant-import/build-thirdparty.xml
branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1665/JBWS1665TestCase.java
Log:
Updating unit tests for JBWS-1665
Modified: branches/jbossws-2.0/build/ant-import/build-testsuite.xml
===================================================================
--- branches/jbossws-2.0/build/ant-import/build-testsuite.xml 2007-06-21 14:40:45 UTC (rev 3677)
+++ branches/jbossws-2.0/build/ant-import/build-testsuite.xml 2007-06-21 15:21:13 UTC (rev 3678)
@@ -151,6 +151,7 @@
<pathelement location="${jboss.client}/stax-api.jar"/>
<pathelement location="${jboss.client}/jbosssx-client.jar"/>
<pathelement location="${jboss.server.lib}/servlet-api.jar"/>
+ <pathelement location="${jboss.client}/junit.jar"/>
</path>
<path id="tests.client.classpath">
<pathelement location="${jboss.client}/commons-logging.jar"/>
Modified: branches/jbossws-2.0/jbossws-core/ant-import/build-thirdparty.xml
===================================================================
--- branches/jbossws-2.0/jbossws-core/ant-import/build-thirdparty.xml 2007-06-21 14:40:45 UTC (rev 3677)
+++ branches/jbossws-2.0/jbossws-core/ant-import/build-thirdparty.xml 2007-06-21 15:21:13 UTC (rev 3678)
@@ -133,6 +133,7 @@
<pathelement location="${thirdparty.dir}/jboss-remoting.jar"/>
<pathelement location="${thirdparty.dir}/jboss-xml-binding.jar"/>
<pathelement location="${thirdparty.dir}/jbosssx.jar"/>
+ <pathelement location="${thirdparty.dir}/junit.jar"/>
<pathelement location="${thirdparty.dir}/mail.jar"/>
<pathelement location="${thirdparty.dir}/servlet-api.jar"/>
<pathelement location="${thirdparty.dir}/stax-api.jar"/>
Modified: branches/jbossws-2.0/jbossws-core/ant-import-tests/build-jars-jaxws.xml
===================================================================
--- branches/jbossws-2.0/jbossws-core/ant-import-tests/build-jars-jaxws.xml 2007-06-21 14:40:45 UTC (rev 3677)
+++ branches/jbossws-2.0/jbossws-core/ant-import-tests/build-jars-jaxws.xml 2007-06-21 15:21:13 UTC (rev 3678)
@@ -160,6 +160,19 @@
</fileset>
</jar>
+ <!-- jaxws-jbws1665 -->
+ <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1665.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws1665/CoordinateData.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws1665/JBWS1665TestCase.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws1665/PropertyData.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws1665/TraceData.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws1665/TracePollData.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws1665/TrackingServiceBean.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws1665/TrackingServiceInterface.class"/>
+ </fileset>
+ </jar>
+
<!-- jaxws-jbws981 -->
<jar destfile="${tests.output.dir}/libs/jaxws-jbws981.jar">
<fileset dir="${tests.output.dir}/classes">
Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1665/JBWS1665TestCase.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1665/JBWS1665TestCase.java 2007-06-21 14:40:45 UTC (rev 3677)
+++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1665/JBWS1665TestCase.java 2007-06-21 15:21:13 UTC (rev 3678)
@@ -23,13 +23,18 @@
// $Id: $
+import java.io.File;
+import java.io.Writer;
import java.net.MalformedURLException;
import java.net.URL;
import junit.framework.Test;
+import org.jboss.ws.Constants;
+import org.jboss.ws.tools.wsdl.WSDLWriter;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory;
+import org.jboss.wsf.spi.utils.IOUtils;
import org.jboss.wsf.spi.test.JBossWSTest;
import org.jboss.wsf.spi.test.JBossWSTestSetup;
@@ -40,36 +45,30 @@
*/
public class JBWS1665TestCase extends JBossWSTest
{
- public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws1655/TrackingService";
+ public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws1655/TrackingServiceBean";
-// public static Test suite()
-// {
-// return JBossWSTestSetup.newTestSetup(JBWS1665TestCase.class, "jaxws-jbws1665.jar");
-// }
-
- public void testWebService() throws Exception
+ public static Test suite()
{
- System.out.println("FIXME: [JBWS-1665] incorrect wsdl generation");
-
- //assertWSDLAccess();
-
- // Need to validate the WSDL is property populated. Several fields such as
- // element names are being left blank. This is related to case 16130. The
- // entire generated wsdl is attached to the case.
-
- /*
- QName serviceName = new QName("http://org.jboss.ws/jbws1665", "EJB3BeanService");
- URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
- Service service = Service.create(wsdlURL, serviceName);
- TrackingServiceInterface port = (TrackingServiceInterface)service.getPort(TrackingServiceInterface.class);
- */
+ return JBossWSTestSetup.newTestSetup(JBWS1665TestCase.class, "jaxws-jbws1665.jar");
}
- private void assertWSDLAccess() throws MalformedURLException
+ public void testWebService() throws Exception
{
URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance();
WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL);
assertNotNull(wsdlDefinitions);
+
+ // This turns out to be unnecessary, as the invalid WSDL cannot be parsed
+ // by the WSDLDefinitionsFactory and has already failed.
+ /*
+ File wsdlDir = new File("./tools/jbws1665");
+ wsdlDir.mkdirs();
+ String wsdlPath = wsdlDir + "/" + "JBWS1665.wsdl";
+
+ Writer fw = IOUtils.getCharsetFileWriter(new File(wsdlPath), Constants.DEFAULT_XML_CHARSET);
+ new WSDLWriter(wsdlDefinitions).write(fw, Constants.DEFAULT_XML_CHARSET);
+ fw.close();
+ */
}
}
16 years, 11 months
JBossWS SVN: r3677 - in branches/jbossws-2.0: jbossws-core/src/main/java/org/jboss/ws/core and 5 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-06-21 10:40:45 -0400 (Thu, 21 Jun 2007)
New Revision: 3677
Added:
branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPFaultException.java
Modified:
branches/jbossws-2.0/integration/native/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java
branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java
branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java
branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java
branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java
branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPEnvelopeImpl.java
branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java
Log:
[JBWS-805] Fault code is always 'Client'
Modified: branches/jbossws-2.0/integration/native/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java
===================================================================
--- branches/jbossws-2.0/integration/native/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2007-06-21 13:10:11 UTC (rev 3676)
+++ branches/jbossws-2.0/integration/native/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2007-06-21 14:40:45 UTC (rev 3677)
@@ -58,6 +58,7 @@
import org.jboss.ws.core.CommonBinding;
import org.jboss.ws.core.CommonBindingProvider;
import org.jboss.ws.core.CommonMessageContext;
+import org.jboss.ws.core.CommonSOAPFaultException;
import org.jboss.ws.core.HTTPMessageImpl;
import org.jboss.ws.core.MessageAbstraction;
import org.jboss.ws.core.MessageTrace;
@@ -339,7 +340,7 @@
{
QName faultCode = Constants.SOAP11_FAULT_CODE_SERVER;
String faultString = "Endpoint cannot handle requests in state: " + state;
- throw new SOAPFaultException(faultCode, faultString, null, null);
+ throw new CommonSOAPFaultException(faultCode, faultString);
}
log.debug("BEGIN handleRequest: " + ep.getName());
Added: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPFaultException.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPFaultException.java (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPFaultException.java 2007-06-21 14:40:45 UTC (rev 3677)
@@ -0,0 +1,55 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.ws.core;
+
+// $Id: SOAPFaultException.java 3509 2007-06-08 15:50:12Z thomas.diesler(a)jboss.com $
+
+import javax.xml.namespace.QName;
+
+/**
+ * The SOAPFaultException exception represents a SOAP fault.
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ */
+public class CommonSOAPFaultException extends RuntimeException
+{
+ private QName faultCode;
+ private String faultString;
+
+ public CommonSOAPFaultException(QName faultCode, String faultString)
+ {
+ super(faultString);
+
+ this.faultCode = faultCode;
+ this.faultString = faultString;
+ }
+
+ public QName getFaultCode()
+ {
+ return faultCode;
+ }
+
+ public String getFaultString()
+ {
+ return faultString;
+ }
+}
Property changes on: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPFaultException.java
___________________________________________________________________
Name: svn:executable
+ *
Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java 2007-06-21 13:10:11 UTC (rev 3676)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java 2007-06-21 14:40:45 UTC (rev 3677)
@@ -39,7 +39,6 @@
import javax.xml.soap.SOAPElement;
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPFault;
-import javax.xml.soap.SOAPMessage;
import javax.xml.transform.Result;
import javax.xml.transform.Source;
import javax.xml.transform.dom.DOMSource;
@@ -48,7 +47,7 @@
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
import org.jboss.ws.core.CommonMessageContext;
-import org.jboss.ws.core.MessageAbstraction;
+import org.jboss.ws.core.CommonSOAPFaultException;
import org.jboss.ws.core.jaxrpc.binding.BindingException;
import org.jboss.ws.core.jaxrpc.binding.DeserializerFactoryBase;
import org.jboss.ws.core.jaxrpc.binding.DeserializerSupport;
@@ -181,9 +180,18 @@
{
faultEx = (SOAPFaultException)reqEx;
}
+ else if (reqEx instanceof CommonSOAPFaultException)
+ {
+ CommonSOAPFaultException soapEx = (CommonSOAPFaultException)reqEx;
+ QName faultCode = soapEx.getFaultCode();
+ String faultString = soapEx.getFaultString();
+ Throwable cause = soapEx.getCause();
+ faultEx = new SOAPFaultException(faultCode, faultString, null, null);
+ faultEx.initCause(cause);
+ }
else
{
- QName faultCode = Constants.SOAP11_FAULT_CODE_CLIENT;
+ QName faultCode = Constants.SOAP11_FAULT_CODE_SERVER;
String faultString = (reqEx.getMessage() != null ? reqEx.getMessage() : reqEx.toString());
faultEx = new SOAPFaultException(faultCode, faultString, null, null);
faultEx.initCause(reqEx);
Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java 2007-06-21 13:10:11 UTC (rev 3676)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java 2007-06-21 14:40:45 UTC (rev 3677)
@@ -26,7 +26,6 @@
import javax.xml.soap.SOAPElement;
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPFault;
-import javax.xml.soap.SOAPMessage;
import javax.xml.transform.Result;
import javax.xml.transform.Source;
import javax.xml.transform.dom.DOMSource;
@@ -36,7 +35,7 @@
import org.jboss.logging.Logger;
import org.jboss.ws.Constants;
import org.jboss.ws.core.CommonMessageContext;
-import org.jboss.ws.core.MessageAbstraction;
+import org.jboss.ws.core.CommonSOAPFaultException;
import org.jboss.ws.core.jaxrpc.SOAPFaultHelperJAXRPC;
import org.jboss.ws.core.jaxrpc.binding.BindingException;
import org.jboss.ws.core.jaxrpc.binding.DeserializerFactoryBase;
@@ -153,10 +152,8 @@
{
faultMessage = toSOAPMessage((SOAPFaultException)reqEx);
}
- else if (reqEx instanceof javax.xml.rpc.soap.SOAPFaultException)
+ else if (reqEx instanceof CommonSOAPFaultException)
{
- /* this exception should not occur in JAX-WS endpoints, but JBossWS
- * throws it to signal internal error conditions */
faultMessage = SOAPFaultHelperJAXRPC.exceptionToFaultMessage(reqEx);
}
else
Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2007-06-21 13:10:11 UTC (rev 3676)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2007-06-21 14:40:45 UTC (rev 3677)
@@ -44,6 +44,7 @@
import org.jboss.ws.core.CommonBindingProvider;
import org.jboss.ws.core.CommonMessageContext;
import org.jboss.ws.core.CommonSOAPBinding;
+import org.jboss.ws.core.CommonSOAPFaultException;
import org.jboss.ws.core.DirectionHolder;
import org.jboss.ws.core.EndpointInvocation;
import org.jboss.ws.core.MessageAbstraction;
@@ -413,12 +414,12 @@
if (soapHeader != null && soapHeader.examineMustUnderstandHeaderElements(Constants.URI_SOAP11_NEXT_ACTOR).hasNext())
{
QName faultCode = Constants.SOAP11_FAULT_CODE_MUST_UNDERSTAND;
- throw new SOAPFaultException(faultCode, faultString, null, null);
+ throw new CommonSOAPFaultException(faultCode, faultString);
}
else
{
QName faultCode = Constants.SOAP11_FAULT_CODE_CLIENT;
- throw new SOAPFaultException(faultCode, faultString, null, null);
+ throw new CommonSOAPFaultException(faultCode, faultString);
}
}
}
Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2007-06-21 13:10:11 UTC (rev 3676)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2007-06-21 14:40:45 UTC (rev 3677)
@@ -41,6 +41,7 @@
import org.jboss.logging.Logger;
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
+import org.jboss.ws.core.CommonSOAPFaultException;
import org.jboss.wsf.spi.utils.DOMUtils;
import org.w3c.dom.Comment;
import org.w3c.dom.Document;
@@ -88,7 +89,8 @@
{
return null;
}
- throw ex;
+ QName faultCode = Constants.SOAP11_FAULT_CODE_CLIENT;
+ throw new CommonSOAPFaultException(faultCode, ex.getMessage());
}
return build(soapMessage, domEnv);
@@ -108,7 +110,8 @@
{
return null;
}
- throw ex;
+ QName faultCode = Constants.SOAP11_FAULT_CODE_CLIENT;
+ throw new CommonSOAPFaultException(faultCode, ex.getMessage());
}
return build(soapMessage, domEnv);
Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPEnvelopeImpl.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPEnvelopeImpl.java 2007-06-21 13:10:11 UTC (rev 3676)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPEnvelopeImpl.java 2007-06-21 14:40:45 UTC (rev 3677)
@@ -37,6 +37,7 @@
import javax.xml.soap.SOAPMessage;
import org.jboss.ws.Constants;
+import org.jboss.ws.core.CommonSOAPFaultException;
import org.w3c.dom.Document;
/**
@@ -199,7 +200,7 @@
{
QName faultCode = Constants.SOAP11_FAULT_CODE_VERSION_MISMATCH;
String faultString = "Invalid SOAP envelope namespace: " + namespaceURI;
- throw new SOAPFaultException(faultCode, faultString, null, null);
+ throw new CommonSOAPFaultException(faultCode, faultString);
}
}
}
Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java 2007-06-21 13:10:11 UTC (rev 3676)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java 2007-06-21 14:40:45 UTC (rev 3677)
@@ -35,6 +35,7 @@
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
import org.jboss.ws.core.CommonMessageContext;
+import org.jboss.ws.core.CommonSOAPFaultException;
import org.jboss.ws.core.StubExt;
import org.jboss.ws.core.soap.SOAPMessageImpl;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
@@ -98,9 +99,9 @@
return operation.getConfig();
}
- private static SOAPFaultException convertToFault(WSSecurityException e)
+ private static CommonSOAPFaultException convertToFault(WSSecurityException e)
{
- return new SOAPFaultException(e.getFaultCode(), e.getFaultString(), null, null);
+ return new CommonSOAPFaultException(e.getFaultCode(), e.getFaultString());
}
public static void handleInbound(CommonMessageContext ctx) throws SOAPException, SOAPFaultException
16 years, 11 months
JBossWS SVN: r3676 - branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/soap.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-06-21 09:10:11 -0400 (Thu, 21 Jun 2007)
New Revision: 3676
Modified:
branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshaller.java
Log:
[JBWS-859] SOAPMessageUnMarshaller doesn't support HTTP server response [204] - No Content
Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshaller.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshaller.java 2007-06-21 11:19:01 UTC (rev 3675)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshaller.java 2007-06-21 13:10:11 UTC (rev 3676)
@@ -54,6 +54,7 @@
{
validResponseCodes.add(HttpServletResponse.SC_OK);
validResponseCodes.add(HttpServletResponse.SC_ACCEPTED);
+ validResponseCodes.add(HttpServletResponse.SC_NO_CONTENT);
validResponseCodes.add(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
}
@@ -69,8 +70,13 @@
if (resCode != null && validResponseCodes.contains(resCode) == false)
throw new WSException("Invalid HTTP server response [" + resCode + "] - " + resMessage);
- MimeHeaders mimeHeaders = getMimeHeaders(metadata);
- SOAPMessage soapMsg = new MessageFactoryImpl().createMessage(mimeHeaders, inputStream, true);
+ // [JBWS-859] SOAPMessageUnMarshaller doesn't support HTTP server response [204] - No Content
+ SOAPMessage soapMsg = null;
+ if (resCode != HttpServletResponse.SC_NO_CONTENT)
+ {
+ MimeHeaders mimeHeaders = getMimeHeaders(metadata);
+ soapMsg = new MessageFactoryImpl().createMessage(mimeHeaders, inputStream, true);
+ }
return soapMsg;
}
16 years, 11 months
JBossWS SVN: r3675 - branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/common/soap.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-06-21 07:19:01 -0400 (Thu, 21 Jun 2007)
New Revision: 3675
Modified:
branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java
Log:
[JBWS-862] Return SOAP Fault for invalid soap messages
Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java 2007-06-21 10:21:47 UTC (rev 3674)
+++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java 2007-06-21 11:19:01 UTC (rev 3675)
@@ -234,4 +234,20 @@
//System.out.println(wasBody);
assertEquals(expBody, wasBody);
}
+
+ // [JBWS-862] Return SOAP Fault for invalid soap messages
+ public void testBlankSOAPMessage() throws Exception
+ {
+ try
+ {
+ String xmlMessage = " ";
+ MessageFactory factory = MessageFactory.newInstance();
+ factory.createMessage(null,new ByteArrayInputStream(xmlMessage.getBytes()));
+ fail("IOException expected");
+ }
+ catch (IOException e)
+ {
+ // ignore
+ }
+ }
}
\ No newline at end of file
16 years, 11 months
JBossWS SVN: r3674 - in branches/jbossws-2.0: integration/spi/src/main/java/org/jboss/wsf/spi/deployment and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-06-21 06:21:47 -0400 (Thu, 21 Jun 2007)
New Revision: 3674
Modified:
branches/jbossws-2.0/integration/native/src/main/java/org/jboss/wsf/stack/jbws/LifecycleHandlerImpl.java
branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicDeployerManager.java
branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicLifecycleHandler.java
branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java
branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java
branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/EventSource.java
Log:
Fix typo STOPED
Modified: branches/jbossws-2.0/integration/native/src/main/java/org/jboss/wsf/stack/jbws/LifecycleHandlerImpl.java
===================================================================
--- branches/jbossws-2.0/integration/native/src/main/java/org/jboss/wsf/stack/jbws/LifecycleHandlerImpl.java 2007-06-21 10:16:58 UTC (rev 3673)
+++ branches/jbossws-2.0/integration/native/src/main/java/org/jboss/wsf/stack/jbws/LifecycleHandlerImpl.java 2007-06-21 10:21:47 UTC (rev 3674)
@@ -44,7 +44,7 @@
public void stop(Endpoint endpoint)
{
super.stop(endpoint);
- log.info("WebService stoped: " + getEndpointAddress(endpoint));
+ log.info("WebService stopped: " + getEndpointAddress(endpoint));
}
private String getEndpointAddress(Endpoint ep)
Modified: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicDeployerManager.java
===================================================================
--- branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicDeployerManager.java 2007-06-21 10:16:58 UTC (rev 3673)
+++ branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicDeployerManager.java 2007-06-21 10:21:47 UTC (rev 3674)
@@ -103,7 +103,7 @@
failsafeStop(deployer, dep);
}
- dep.setState(DeploymentState.STOPED);
+ dep.setState(DeploymentState.STOPPED);
// destroy the deployment
for (int i = deployers.size(); 0 < i; i--)
Modified: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicLifecycleHandler.java
===================================================================
--- branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicLifecycleHandler.java 2007-06-21 10:16:58 UTC (rev 3673)
+++ branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicLifecycleHandler.java 2007-06-21 10:21:47 UTC (rev 3674)
@@ -75,7 +75,7 @@
if (ep.getEndpointMetrics() != null)
ep.getEndpointMetrics().stop();
- ep.setState(EndpointState.STOPED);
+ ep.setState(EndpointState.STOPPED);
}
public void destroy(Endpoint ep)
Modified: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java
===================================================================
--- branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java 2007-06-21 10:16:58 UTC (rev 3673)
+++ branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java 2007-06-21 10:21:47 UTC (rev 3674)
@@ -44,7 +44,7 @@
public enum DeploymentState
{
- UNDEFINED, CREATED, STARTED, STOPED, DESTROYED
+ UNDEFINED, CREATED, STARTED, STOPPED, DESTROYED
};
/** Get the root file for this deployment */
Modified: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java
===================================================================
--- branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java 2007-06-21 10:16:58 UTC (rev 3673)
+++ branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java 2007-06-21 10:21:47 UTC (rev 3674)
@@ -47,7 +47,7 @@
public enum EndpointState
{
- UNDEFINED, CREATED, STARTED, STOPED, DESTROYED
+ UNDEFINED, CREATED, STARTED, STOPPED, DESTROYED
};
/** Get the service this endpoint belongs to */
Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/EventSource.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/EventSource.java 2007-06-21 10:16:58 UTC (rev 3673)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/EventSource.java 2007-06-21 10:21:47 UTC (rev 3674)
@@ -36,7 +36,7 @@
{
enum State
{
- CREATED, STARTED, STOPED, DESTROYED
+ CREATED, STARTED, STOPPED, DESTROYED
}
private State state;
16 years, 11 months
JBossWS SVN: r3673 - branches/jbossws-2.0/integration/native/ant-import.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-06-21 06:16:58 -0400 (Thu, 21 Jun 2007)
New Revision: 3673
Modified:
branches/jbossws-2.0/integration/native/ant-import/macros-deploy-native.xml
Log:
Sort jars alphabeticaly
Modified: branches/jbossws-2.0/integration/native/ant-import/macros-deploy-native.xml
===================================================================
--- branches/jbossws-2.0/integration/native/ant-import/macros-deploy-native.xml 2007-06-21 09:37:24 UTC (rev 3672)
+++ branches/jbossws-2.0/integration/native/ant-import/macros-deploy-native.xml 2007-06-21 10:16:58 UTC (rev 3673)
@@ -48,9 +48,9 @@
<include name="jaxb-xjc.jar"/>
<include name="jaxws-tools.jar"/>
<include name="jaxws-rt.jar"/>
+ <include name="stax-ex.jar"/>
+ <include name="streambuffer.jar"/>
<include name="wsdl4j.jar"/>
- <include name="streambuffer.jar"/>
- <include name="stax-ex.jar"/>
</fileset>
</copy>
<copy todir="${jboss50.home}/lib" overwrite="true">
@@ -101,14 +101,14 @@
<include name="jaxb-xjc.jar"/>
<include name="jaxws-tools.jar"/>
<include name="jaxws-rt.jar"/>
- <include name="streambuffer.jar"/>
- <include name="stax-ex.jar"/>
<include name="jboss-jaxrpc.jar"/>
<include name="jboss-jaxws.jar"/>
<include name="jboss-saaj.jar"/>
<include name="jbossws-client.jar"/>
<include name="jbossws-jboss50.jar"/>
<include name="policy.jar"/>
+ <include name="stax-ex.jar"/>
+ <include name="streambuffer.jar"/>
<include name="wsdl4j.jar"/>
<!-- Remove only, do not deploy -->
<include name="jbossws-wsconsume-impl.jar"/>
@@ -159,9 +159,9 @@
<include name="jaxb-xjc.jar"/>
<include name="jaxws-tools.jar"/>
<include name="jaxws-rt.jar"/>
+ <include name="stax-ex.jar"/>
+ <include name="streambuffer.jar"/>
<include name="wsdl4j.jar"/>
- <include name="streambuffer.jar"/>
- <include name="stax-ex.jar"/>
</fileset>
</copy>
@@ -199,14 +199,14 @@
<include name="jaxb-xjc.jar"/>
<include name="jaxws-tools.jar"/>
<include name="jaxws-rt.jar"/>
- <include name="streambuffer.jar"/>
- <include name="stax-ex.jar"/>
<include name="jboss-jaxrpc.jar"/>
<include name="jboss-jaxws.jar"/>
<include name="jboss-saaj.jar"/>
<include name="jbossws-client.jar"/>
<include name="jbossws-jboss42.jar"/>
<include name="policy.jar"/>
+ <include name="stax-ex.jar"/>
+ <include name="streambuffer.jar"/>
<include name="wsdl4j.jar"/>
<!-- Remove only, do not deploy -->
<include name="jbossws-wsconsume-impl.jar"/>
@@ -263,10 +263,10 @@
<include name="jaxb-xjc.jar"/>
<include name="jaxws-tools.jar"/>
<include name="jaxws-rt.jar"/>
+ <include name="stax-api.jar"/>
+ <include name="stax-ex.jar"/>
+ <include name="streambuffer.jar"/>
<include name="wsdl4j.jar"/>
- <include name="streambuffer.jar"/>
- <include name="stax-ex.jar"/>
- <include name="stax-api.jar"/>
</fileset>
</copy>
@@ -325,8 +325,6 @@
<include name="jaxb-xjc.jar"/>
<include name="jaxws-tools.jar"/>
<include name="jaxws-rt.jar"/>
- <include name="streambuffer.jar"/>
- <include name="stax-ex.jar"/>
<include name="jboss-jaxrpc.jar"/>
<include name="jboss-jaxws.jar"/>
<include name="jboss-saaj.jar"/>
@@ -334,6 +332,8 @@
<include name="jbossws-jboss40.jar"/>
<include name="policy.jar"/>
<include name="stax-api.jar"/>
+ <include name="stax-ex.jar"/>
+ <include name="streambuffer.jar"/>
<include name="wsdl4j.jar"/>
<!-- Remove only, do not deploy -->
<include name="jbossws-wsconsume-impl.jar"/>
16 years, 11 months
JBossWS SVN: r3672 - branches/jbossws-2.0/integration/native/ant-import.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-06-21 05:37:24 -0400 (Thu, 21 Jun 2007)
New Revision: 3672
Modified:
branches/jbossws-2.0/integration/native/ant-import/macros-deploy-native.xml
Log:
Fix dependencies upon stax libraries for AS 4.0.x
Modified: branches/jbossws-2.0/integration/native/ant-import/macros-deploy-native.xml
===================================================================
--- branches/jbossws-2.0/integration/native/ant-import/macros-deploy-native.xml 2007-06-21 09:33:15 UTC (rev 3671)
+++ branches/jbossws-2.0/integration/native/ant-import/macros-deploy-native.xml 2007-06-21 09:37:24 UTC (rev 3672)
@@ -176,7 +176,6 @@
<unjar dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native42.sar"/>
<mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
<unzip dest="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
-
</sequential>
</macrodef>
@@ -267,6 +266,7 @@
<include name="wsdl4j.jar"/>
<include name="streambuffer.jar"/>
<include name="stax-ex.jar"/>
+ <include name="stax-api.jar"/>
</fileset>
</copy>
@@ -285,8 +285,7 @@
<mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
<unjar dest="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native40.sar"/>
<mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- <unzip dest="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
-
+ <unzip dest="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
</sequential>
</macrodef>
16 years, 11 months
JBossWS SVN: r3671 - in branches/jbossws-2.0/build: hudson/hudson-home and 5 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-06-21 05:33:15 -0400 (Thu, 21 Jun 2007)
New Revision: 3671
Added:
branches/jbossws-2.0/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2-JDK6/
Removed:
branches/jbossws-2.0/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2_JDK6/
Modified:
branches/jbossws-2.0/build/ant.properties.example
branches/jbossws-2.0/build/build.sh
branches/jbossws-2.0/build/hudson/hudson-home/config.xml
branches/jbossws-2.0/build/hudson/hudson-home/jobs/Core-Tests-ALL/config.xml
branches/jbossws-2.0/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2-JDK6/config.xml
branches/jbossws-2.0/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml
branches/jbossws-2.0/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml
Log:
Add JDK6 tests view and all target
Modified: branches/jbossws-2.0/build/ant.properties.example
===================================================================
--- branches/jbossws-2.0/build/ant.properties.example 2007-06-21 09:30:49 UTC (rev 3670)
+++ branches/jbossws-2.0/build/ant.properties.example 2007-06-21 09:33:15 UTC (rev 3671)
@@ -55,7 +55,7 @@
#force.thirdparty.get=true
# JDK settings
-jdk6.home=/opt/jdk1.6.0_01
+#jdk6.home=/usr/java/jdk1.6
# Java Compiler options
javac.debug=yes
Modified: branches/jbossws-2.0/build/build.sh
===================================================================
--- branches/jbossws-2.0/build/build.sh 2007-06-21 09:30:49 UTC (rev 3670)
+++ branches/jbossws-2.0/build/build.sh 2007-06-21 09:33:15 UTC (rev 3671)
@@ -6,7 +6,7 @@
## Users should be sure to execute this file rather than 'ant' to ensure ##
## the correct version is being used with the correct configuration. ##
## ##
-## NOTE: Uncomment the JDK6 property if you are running JDK 1.6 ##
+## NOTE: Uncomment the JDK6 property if you are running JDK 1.6 ##
## ##
### ====================================================================== ###
Modified: branches/jbossws-2.0/build/hudson/hudson-home/config.xml
===================================================================
--- branches/jbossws-2.0/build/hudson/hudson-home/config.xml 2007-06-21 09:30:49 UTC (rev 3670)
+++ branches/jbossws-2.0/build/hudson/hudson-home/config.xml 2007-06-21 09:33:15 UTC (rev 3671)
@@ -54,6 +54,7 @@
<string>Core-Tests-ALL</string>
<string>Core-Tests-AS-5.0</string>
<string>Core-Tests-AS-4.2</string>
+ <string>Core-Tests-AS-4.2-JDK6</string>
<string>Core-Tests-AS-4.0</string>
</jobNames>
<name>Core Tests</name>
Modified: branches/jbossws-2.0/build/hudson/hudson-home/jobs/Core-Tests-ALL/config.xml
===================================================================
--- branches/jbossws-2.0/build/hudson/hudson-home/jobs/Core-Tests-ALL/config.xml 2007-06-21 09:30:49 UTC (rev 3670)
+++ branches/jbossws-2.0/build/hudson/hudson-home/jobs/Core-Tests-ALL/config.xml 2007-06-21 09:33:15 UTC (rev 3671)
@@ -3,7 +3,7 @@
<builders class="vector"/>
<publishers class="vector">
<hudson.tasks.BuildTrigger>
- <childProjects>Core-Tests-AS-5.0, Core-Tests-AS-4.2, Core-Tests-AS-4.0</childProjects>
+ <childProjects>Core-Tests-AS-5.0, Core-Tests-AS-4.2, Core-Tests-AS-4.2-JDK6, Core-Tests-AS-4.0</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
<buildWrappers class="vector"/>
Modified: branches/jbossws-2.0/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml
===================================================================
--- branches/jbossws-2.0/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml 2007-06-21 09:30:49 UTC (rev 3670)
+++ branches/jbossws-2.0/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml 2007-06-21 09:33:15 UTC (rev 3671)
@@ -85,7 +85,12 @@
<canRoam>true</canRoam>
<disabled>false</disabled>
<enableRemoteTrigger>false</enableRemoteTrigger>
- <triggers class="vector"/>
+ <triggers class="vector">
+ <hudson.triggers.SCMTrigger>
+ <spec># Every 30 minutes after the hour
+30 * * * *</spec>
+ </hudson.triggers.SCMTrigger>
+ </triggers>
<logRotator>
<daysToKeep>-1</daysToKeep>
<numToKeep>20</numToKeep>
Copied: branches/jbossws-2.0/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2-JDK6 (from rev 3668, branches/jbossws-2.0/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2_JDK6)
Modified: branches/jbossws-2.0/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2-JDK6/config.xml
===================================================================
--- branches/jbossws-2.0/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2_JDK6/config.xml 2007-06-20 17:35:10 UTC (rev 3668)
+++ branches/jbossws-2.0/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2-JDK6/config.xml 2007-06-21 09:33:15 UTC (rev 3671)
@@ -6,7 +6,7 @@
#
# Module settings
#
-MODULE=JBWS-CoreTests-AS-4.2_JDK6
+MODULE=JBWS-CoreTests-AS-4.2-JDK6
WORKSPACE=`pwd`
JBWSDIR=$WORKSPACE/jbossws
Modified: branches/jbossws-2.0/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml
===================================================================
--- branches/jbossws-2.0/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml 2007-06-21 09:30:49 UTC (rev 3670)
+++ branches/jbossws-2.0/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml 2007-06-21 09:33:15 UTC (rev 3671)
@@ -85,12 +85,7 @@
<canRoam>true</canRoam>
<disabled>false</disabled>
<enableRemoteTrigger>false</enableRemoteTrigger>
- <triggers class="vector">
- <hudson.triggers.SCMTrigger>
- <spec># Every 10 minutes
-*/10 * * * *</spec>
- </hudson.triggers.SCMTrigger>
- </triggers>
+ <triggers class="vector"/>
<logRotator>
<daysToKeep>28</daysToKeep>
<numToKeep>-1</numToKeep>
16 years, 11 months