JBossWS SVN: r7761 - in stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/src: main/java/org/jboss/ws/tools/client and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2008-06-30 09:23:47 -0400 (Mon, 30 Jun 2008)
New Revision: 7761
Added:
stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/src/test/java/org/jboss/test/ws/tools/jbpapp921/
stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/src/test/java/org/jboss/test/ws/tools/jbpapp921/JBPAPP921TestCase.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/src/test/resources/tools/jbpapp921/
stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/src/test/resources/tools/jbpapp921/Models_ServiceIM_ServiceProxyService.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/src/test/resources/tools/jbpapp921/ValidationEvent_test.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/src/test/resources/tools/jbpapp921/test.wsdl
stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/src/test/resources/tools/jbpapp921/wstools-config.xml
Removed:
stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/src/test/java/org/jboss/test/ws/tools/jbpapp921/JBPAPP921TestCase.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/src/test/resources/tools/jbpapp921/Models_ServiceIM_ServiceProxyService.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/src/test/resources/tools/jbpapp921/ValidationEvent_test.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/src/test/resources/tools/jbpapp921/test.wsdl
stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/src/test/resources/tools/jbpapp921/wstools-config.xml
Modified:
stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/src/main/java/org/jboss/ws/tools/JavaWriter.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/src/main/java/org/jboss/ws/tools/WSDLToJava.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/src/main/java/org/jboss/ws/tools/client/ServiceCreator.java
Log:
[JBPAPP-876] WSDL To Java doesn't handle hyphens in PortType properly.
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/src/main/java/org/jboss/ws/tools/JavaWriter.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/src/main/java/org/jboss/ws/tools/JavaWriter.java 2008-06-30 13:21:55 UTC (rev 7760)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/src/main/java/org/jboss/ws/tools/JavaWriter.java 2008-06-30 13:23:47 UTC (rev 7761)
@@ -198,7 +198,7 @@
if (needToCreatePackageStructure(location, packageName))
newLoc = utils.createPackage(location.getPath(), packageName);
else newLoc = location;
- String classname = utils.chop(filename, ".java");
+ String classname = ToolsUtils.convertInvalidCharacters(utils.chop(filename, ".java"));
File sei = utils.createPhysicalFile(newLoc, classname);
StringBuilder buffer = new StringBuilder();
utils.writeJbossHeader(buffer);
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/src/main/java/org/jboss/ws/tools/WSDLToJava.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2008-06-30 13:21:55 UTC (rev 7760)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2008-06-30 13:23:47 UTC (rev 7761)
@@ -655,7 +655,7 @@
private void createSEIFile(WSDLInterface intf, File loc) throws IOException
{
- String seiName = getServiceEndpointInterfaceName(intf);
+ String seiName = ToolsUtils.convertInvalidCharacters(getServiceEndpointInterfaceName(intf));
StringBuilder buf = new StringBuilder();
utils.writeJbossHeader(buf);
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/src/main/java/org/jboss/ws/tools/client/ServiceCreator.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/src/main/java/org/jboss/ws/tools/client/ServiceCreator.java 2008-06-30 13:21:55 UTC (rev 7760)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/src/main/java/org/jboss/ws/tools/client/ServiceCreator.java 2008-06-30 13:23:47 UTC (rev 7761)
@@ -33,6 +33,7 @@
import org.jboss.ws.metadata.wsdl.WSDLEndpoint;
import org.jboss.ws.metadata.wsdl.WSDLService;
import org.jboss.ws.metadata.wsdl.WSDLUtils;
+import org.jboss.ws.tools.ToolsUtils;
import org.jboss.ws.tools.interfaces.ServiceCreatorIntf;
import org.jboss.wsf.common.JavaUtils;
@@ -214,6 +215,7 @@
if (wsdl.getInterface(new QName(wsdl.getTargetNamespace(), serviceName)) != null)
serviceName = new StringBuilder(serviceName).insert(serviceName.lastIndexOf("Service"), '_').toString();
+ serviceName = ToolsUtils.convertInvalidCharacters(serviceName);
serviceName = JavaUtils.capitalize(serviceName);
StringBuilder buf = new StringBuilder();
@@ -239,13 +241,27 @@
writer.close();
}
+ public static String removeHyphens(final String component)
+ {
+ String result = component;
+ for (int i = 0; i < result.length(); i++)
+ {
+ if (result.charAt(i) == '-')
+ {
+ result = result.replace(result.charAt(i), '_');
+ }
+ }
+
+ return result;
+ }
+
private String generateServiceMethodForWSDLEndpoint(WSDLEndpoint endpt)
{
StringBuilder buf = new StringBuilder(" public ");
QName bindName = endpt.getBinding();
WSDLBinding wbind = wsdl.getBinding(bindName);
- buf.append(getReturnType(wbind)).append(" get");
+ buf.append(removeHyphens(getReturnType(wbind))).append(" get");
buf.append(endpt.getName().getLocalPart()).append("()").append(" throws ServiceException;").append(newLine(1));
return buf.toString();
}
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/src/test/java/org/jboss/test/ws/tools/jbpapp921 (from rev 7745, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbpapp921)
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/src/test/java/org/jboss/test/ws/tools/jbpapp921/JBPAPP921TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbpapp921/JBPAPP921TestCase.java 2008-06-26 21:48:53 UTC (rev 7745)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/src/test/java/org/jboss/test/ws/tools/jbpapp921/JBPAPP921TestCase.java 2008-06-30 13:23:47 UTC (rev 7761)
@@ -1,54 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, 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.test.ws.tools.jbpapp921;
-
-import java.io.File;
-
-import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
-import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
-import org.jboss.ws.tools.WSTools;
-import org.jboss.wsf.test.JBossWSTest;
-
-public class JBPAPP921TestCase extends JBossWSTest
-{
-
- private static final String resourceDir = "resources/tools/jbpapp921";
- private static final String toolsDir = "tools/jbpapp921";
-
- public void testGenerate() throws Exception
- {
- String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
- new WSTools().generate(args);
- compareSource("Models_ServiceIM_ServiceProxyService.java");
- compareSource("ValidationEvent_test.java");
- }
-
- private static void compareSource(final String fileName) throws Exception
- {
- File expected = new File(resourceDir + "/" + fileName);
- File generated = new File(toolsDir + "/org/jboss/test/ws/jbpapp921/" + fileName);
-
- JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
- sc.validate();
- sc.validateImports();
- }
-}
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/src/test/java/org/jboss/test/ws/tools/jbpapp921/JBPAPP921TestCase.java (from rev 7745, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbpapp921/JBPAPP921TestCase.java)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/src/test/java/org/jboss/test/ws/tools/jbpapp921/JBPAPP921TestCase.java (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/src/test/java/org/jboss/test/ws/tools/jbpapp921/JBPAPP921TestCase.java 2008-06-30 13:23:47 UTC (rev 7761)
@@ -0,0 +1,54 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, 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.test.ws.tools.jbpapp921;
+
+import java.io.File;
+
+import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
+import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
+import org.jboss.ws.tools.WSTools;
+import org.jboss.wsf.test.JBossWSTest;
+
+public class JBPAPP921TestCase extends JBossWSTest
+{
+
+ private static final String resourceDir = "resources/tools/jbpapp921";
+ private static final String toolsDir = "tools/jbpapp921";
+
+ public void testGenerate() throws Exception
+ {
+ String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
+ new WSTools().generate(args);
+ compareSource("Models_ServiceIM_ServiceProxyService.java");
+ compareSource("ValidationEvent_test.java");
+ }
+
+ private static void compareSource(final String fileName) throws Exception
+ {
+ File expected = new File(resourceDir + "/" + fileName);
+ File generated = new File(toolsDir + "/org/jboss/test/ws/jbpapp921/" + fileName);
+
+ JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
+ sc.validate();
+ sc.validateImports();
+ }
+}
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/src/test/resources/tools/jbpapp921 (from rev 7745, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbpapp921)
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/src/test/resources/tools/jbpapp921/Models_ServiceIM_ServiceProxyService.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbpapp921/Models_ServiceIM_ServiceProxyService.java 2008-06-26 21:48:53 UTC (rev 7745)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/src/test/resources/tools/jbpapp921/Models_ServiceIM_ServiceProxyService.java 2008-06-30 13:23:47 UTC (rev 7761)
@@ -1,19 +0,0 @@
-/*
-* JBoss, the OpenSource EJB server
-* Distributable under LGPL license. See terms of license at gnu.org.
-*/
-
-//Auto Generated by jbossws - Please do not edit!!!
-
-package org.jboss.test.ws.jbpapp921;
-
-
-import javax.xml.rpc.*;
-
-
-public interface Models_ServiceIM_ServiceProxyService extends javax.xml.rpc.Service
-{
-
- public org.jboss.test.ws.jbpapp921.ValidationEvent_test getvalidationEventPort() throws ServiceException;
-
-}
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/src/test/resources/tools/jbpapp921/Models_ServiceIM_ServiceProxyService.java (from rev 7745, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbpapp921/Models_ServiceIM_ServiceProxyService.java)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/src/test/resources/tools/jbpapp921/Models_ServiceIM_ServiceProxyService.java (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/src/test/resources/tools/jbpapp921/Models_ServiceIM_ServiceProxyService.java 2008-06-30 13:23:47 UTC (rev 7761)
@@ -0,0 +1,19 @@
+/*
+* JBoss, the OpenSource EJB server
+* Distributable under LGPL license. See terms of license at gnu.org.
+*/
+
+//Auto Generated by jbossws - Please do not edit!!!
+
+package org.jboss.test.ws.jbpapp921;
+
+
+import javax.xml.rpc.*;
+
+
+public interface Models_ServiceIM_ServiceProxyService extends javax.xml.rpc.Service
+{
+
+ public org.jboss.test.ws.jbpapp921.ValidationEvent_test getvalidationEventPort() throws ServiceException;
+
+}
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/src/test/resources/tools/jbpapp921/ValidationEvent_test.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbpapp921/ValidationEvent_test.java 2008-06-26 21:48:53 UTC (rev 7745)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/src/test/resources/tools/jbpapp921/ValidationEvent_test.java 2008-06-30 13:23:47 UTC (rev 7761)
@@ -1,15 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Thu Jun 26 14:46:54 EDT 2008
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-package org.jboss.test.ws.jbpapp921;
-public interface ValidationEvent_test extends java.rmi.Remote
-{
-
- public int validateClaim(java.lang.String lifecycleId, java.lang.String claim) throws java.rmi.RemoteException;
-}
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/src/test/resources/tools/jbpapp921/ValidationEvent_test.java (from rev 7745, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbpapp921/ValidationEvent_test.java)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/src/test/resources/tools/jbpapp921/ValidationEvent_test.java (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/src/test/resources/tools/jbpapp921/ValidationEvent_test.java 2008-06-30 13:23:47 UTC (rev 7761)
@@ -0,0 +1,15 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Thu Jun 26 14:46:54 EDT 2008
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+package org.jboss.test.ws.jbpapp921;
+public interface ValidationEvent_test extends java.rmi.Remote
+{
+
+ public int validateClaim(java.lang.String lifecycleId, java.lang.String claim) throws java.rmi.RemoteException;
+}
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/src/test/resources/tools/jbpapp921/test.wsdl
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbpapp921/test.wsdl 2008-06-26 21:48:53 UTC (rev 7745)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/src/test/resources/tools/jbpapp921/test.wsdl 2008-06-30 13:23:47 UTC (rev 7761)
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name="models_ServiceIM_ServiceProxy"
- targetNamespace="http://org.jboss.test.ws.jbpapp921"
- xmlns:tns="http://org.jboss.test.ws.jbpapp921"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns="http://schemas.xmlsoap.org/wsdl/">
- <types>
- </types>
- <message name="ValidationEvent_validateClaim">
- <part name="lifecycleId" type="xsd:string" />
- <part name="claim" type="xsd:string" />
- </message>
- <message name="ValidationEvent_validateClaimResponse">
- <part name="result" type="xsd:int" />
- </message>
- <portType name="validationEvent-test">
- <operation name="validateClaim"
- parameterOrder="lifecycleId claim">
- <input message="tns:ValidationEvent_validateClaim" />
- <output message="tns:ValidationEvent_validateClaimResponse" />
- </operation>
- </portType>
- <binding name="validationEventBinding"
- type="tns:validationEvent-test">
- <soap:binding style="rpc"
- transport="http://schemas.xmlsoap.org/soap/http" />
- <operation name="validateClaim">
- <soap:operation soapAction="" />
- <input>
- <soap:body use="literal"
- namespace="http://org.jboss.test.ws.jbpapp921" />
- </input>
- <output>
- <soap:body use="literal"
- namespace="http://org.jboss.test.ws.jbpapp921" />
- </output>
- </operation>
- </binding>
- <service name="models_ServiceIM_ServiceProxy">
- <port name="validationEventPort"
- binding="tns:validationEventBinding">
- <soap:address
- location="http://localhost:8080/BusinessProcessModeling-ejb/BusinessProcessModeling..." />
- </port>
- </service>
-</definitions>
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/src/test/resources/tools/jbpapp921/test.wsdl (from rev 7745, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbpapp921/test.wsdl)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/src/test/resources/tools/jbpapp921/test.wsdl (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/src/test/resources/tools/jbpapp921/test.wsdl 2008-06-30 13:23:47 UTC (rev 7761)
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name="models_ServiceIM_ServiceProxy"
+ targetNamespace="http://org.jboss.test.ws.jbpapp921"
+ xmlns:tns="http://org.jboss.test.ws.jbpapp921"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns="http://schemas.xmlsoap.org/wsdl/">
+ <types>
+ </types>
+ <message name="ValidationEvent_validateClaim">
+ <part name="lifecycleId" type="xsd:string" />
+ <part name="claim" type="xsd:string" />
+ </message>
+ <message name="ValidationEvent_validateClaimResponse">
+ <part name="result" type="xsd:int" />
+ </message>
+ <portType name="validationEvent-test">
+ <operation name="validateClaim"
+ parameterOrder="lifecycleId claim">
+ <input message="tns:ValidationEvent_validateClaim" />
+ <output message="tns:ValidationEvent_validateClaimResponse" />
+ </operation>
+ </portType>
+ <binding name="validationEventBinding"
+ type="tns:validationEvent-test">
+ <soap:binding style="rpc"
+ transport="http://schemas.xmlsoap.org/soap/http" />
+ <operation name="validateClaim">
+ <soap:operation soapAction="" />
+ <input>
+ <soap:body use="literal"
+ namespace="http://org.jboss.test.ws.jbpapp921" />
+ </input>
+ <output>
+ <soap:body use="literal"
+ namespace="http://org.jboss.test.ws.jbpapp921" />
+ </output>
+ </operation>
+ </binding>
+ <service name="models_ServiceIM_ServiceProxy">
+ <port name="validationEventPort"
+ binding="tns:validationEventBinding">
+ <soap:address
+ location="http://localhost:8080/BusinessProcessModeling-ejb/BusinessProcessModeling..." />
+ </port>
+ </service>
+</definitions>
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/src/test/resources/tools/jbpapp921/wstools-config.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbpapp921/wstools-config.xml 2008-06-26 21:48:53 UTC (rev 7745)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/src/test/resources/tools/jbpapp921/wstools-config.xml 2008-06-30 13:23:47 UTC (rev 7761)
@@ -1,4 +0,0 @@
-<configuration>
- <wsdl-java location="resources/tools/jbpapp921/test.wsdl">
- </wsdl-java>
-</configuration>
\ No newline at end of file
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/src/test/resources/tools/jbpapp921/wstools-config.xml (from rev 7745, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbpapp921/wstools-config.xml)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/src/test/resources/tools/jbpapp921/wstools-config.xml (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/src/test/resources/tools/jbpapp921/wstools-config.xml 2008-06-30 13:23:47 UTC (rev 7761)
@@ -0,0 +1,4 @@
+<configuration>
+ <wsdl-java location="resources/tools/jbpapp921/test.wsdl">
+ </wsdl-java>
+</configuration>
\ No newline at end of file
16 years, 6 months
- 1
- 0
JBossWS SVN: r7760 - stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2008-06-30 09:21:55 -0400 (Mon, 30 Jun 2008)
New Revision: 7760
Modified:
stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/version.properties
Log:
[JBPAPP-876] Set the version.
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/version.properties
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/version.properties 2008-06-27 16:04:15 UTC (rev 7759)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/version.properties 2008-06-30 13:21:55 UTC (rev 7760)
@@ -5,8 +5,8 @@
specification.vendor=JBoss (http://www.jboss.org)
specification.version=jbossws-2.0
-version.id=2.0.1.SP2_CP01
-repository.id=2.0.1.SP2_CP01
+version.id=2.0.1.SP2_CP01_JBPAPP-876
+repository.id=2.0.1.SP2_CP01_JBPAPP-876
implementation.title=JBoss Web Services - Native
implementation.url=http://www.jboss.org/products/jbossws
16 years, 6 months
- 1
- 0
JBossWS SVN: r7759 - stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools.
by jbossws-commits＠lists.jboss.org
Author: david.boeren
Date: 2008-06-27 12:04:15 -0400 (Fri, 27 Jun 2008)
New Revision: 7759
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/WSDLToJava.java
Log:
Restore Magesh's changes that got overwritten.
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/WSDLToJava.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2008-06-27 15:14:42 UTC (rev 7758)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2008-06-27 16:04:15 UTC (rev 7759)
@@ -205,7 +205,7 @@
if (namespacePackageMap == null)
namespacePackageMap = new HashMap<String, String>();
String pkg = iter.next();
- namespacePackageMap.put(map.get(pkg), pkg);
+ namespacePackageMap.put(pkg, map.get(pkg));
}
}
@@ -326,7 +326,6 @@
JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdl.getWsdlTypes());
QName faultXMLName = intfFault.getElement();
QName faultXMLType = intfFault.getXmlType();
-
XSElementDeclaration xe = xsmodel.getElementDeclaration(faultXMLName.getLocalPart(), faultXMLName.getNamespaceURI());
XSTypeDefinition xt = xe.getTypeDefinition();
if (!xt.getAnonymous())
@@ -338,7 +337,8 @@
if (cl == null)
{
String faultTypeName = (!xt.getAnonymous()) ? faultXMLType.getLocalPart() : faultXMLName.getLocalPart();
- buf.append(seiPkgName + "." + JavaUtils.capitalize(faultTypeName));
+ String packageName = getPackageName(xt.getNamespace());
+ buf.append(packageName + "." + JavaUtils.capitalize(faultTypeName));
}
else buf.append(cl.getName());
buf.append(",");
@@ -534,7 +534,6 @@
if (unwrappedElement)
{
buf.append(tempBuf);
-
// We need a wrapper class generated
generateJavaSource(wrapper, WSDLUtils.getSchemaModel(wsdl.getWsdlTypes()), containingElement);
@@ -639,11 +638,12 @@
className = className.substring(1);
className = ToolsUtils.convertInvalidCharacters(className);
className = utils.firstLetterUpperCase(className);
- className = seiPkgName + "." + className + arraySuffix;
+ String packageName = getPackageName(xt.getNamespace());
+ className = packageName + "." + className + arraySuffix;
if (holder)
{
- className = holderWriter.getOrCreateHolder(className, getLocationForJavaGeneration());
+ className = holderWriter.getOrCreateHolder(className, getLocationForJavaGeneration(packageName));
}
buf.append(className);
@@ -762,7 +762,8 @@
className = className.substring(1);
className = ToolsUtils.convertInvalidCharacters(className);
className = utils.firstLetterUpperCase(className);
- return seiPkgName + "." + className + arraySuffix;
+ String packageName = getPackageName(xt.getNamespace());
+ return packageName + "." + className + arraySuffix;
}
if (cls.isArray())
@@ -806,9 +807,9 @@
return paramName;
}
- private File getLocationForJavaGeneration()
+ private File getLocationForJavaGeneration(String packageName)
{
- return new File(this.directoryToGenerate + "/" + seiPkgName.replace(".", "/"));
+ return new File(this.directoryToGenerate + "/" + packageName.replace('.', '/'));
}
private void generateJavaSource(XSComplexTypeDefinition xt, JBossXSModel xsmodel, String containingElement) throws IOException
@@ -818,10 +819,16 @@
private void generateJavaSource(XSComplexTypeDefinition xt, JBossXSModel xsmodel, String containingElement, boolean exception) throws IOException
{
- XSDTypeToJava xtj = new XSDTypeToJava(generateSerializableTypes);
-
+ XSDTypeToJava xtj = new XSDTypeToJava(namespacePackageMap, generateSerializableTypes);
xtj.setTypeMapping(this.typeMapping);
- xtj.createJavaFile((XSComplexTypeDefinition)xt, containingElement, getLocationForJavaGeneration(), seiPkgName, xsmodel, exception);
+ String targetNS = wsdl.getTargetNamespace();
+ String tgtNS = xt.getNamespace();
+ String packName = getPackageName(tgtNS);
+ if(!tgtNS.equals(targetNS))
+ {
+ File dir = utils.createPackage(this.directoryToGenerate, packName);
+ }
+ xtj.createJavaFile((XSComplexTypeDefinition)xt, containingElement, this.directoryToGenerate, packName, xsmodel, exception);
}
public void setParameterStyle(String paramStyle)
@@ -829,4 +836,20 @@
this.parameterStyle = paramStyle;
}
+ private String getPackageName(String targetNamespace)
+ {
+ //Get it from global config
+ if (namespacePackageMap != null)
+ {
+ String pkg = namespacePackageMap.get(targetNamespace);
+ if (pkg != null)
+ {
+ return pkg;
+ }
+ }
+ //return NamespacePackageMapping.getJavaPackageName(targetNamespace);
+ //Default behaviour will always generate all classes in the SEI package only
+ return seiPkgName;
+ }
}
+
16 years, 6 months
- 1
- 0
JBossWS SVN: r7758 - in stack/native: tags and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2008-06-27 11:14:42 -0400 (Fri, 27 Jun 2008)
New Revision: 7758
Added:
stack/native/tags/jbossws-native-2.0.1.SP2_CP02/
Removed:
stack/native/branches/jbossws-native-2.0.1.SP2_CP02/
Log:
[JBPAPP-791] Release and upgrade to JBossWS 2.0.1.SP2_CP02.
Copied: stack/native/tags/jbossws-native-2.0.1.SP2_CP02 (from rev 7757, stack/native/branches/jbossws-native-2.0.1.SP2_CP02)
16 years, 6 months
- 1
- 0
JBossWS SVN: r7757 - stack/native/branches/jbossws-native-2.0.1.SP2_CP02.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2008-06-27 11:12:30 -0400 (Fri, 27 Jun 2008)
New Revision: 7757
Modified:
stack/native/branches/jbossws-native-2.0.1.SP2_CP02/version.properties
Log:
[JBPAPP-791] Release and upgrade to JBossWS 2.0.1.SP2_CP02.
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP02/version.properties
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP02/version.properties 2008-06-27 15:09:50 UTC (rev 7756)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP02/version.properties 2008-06-27 15:12:30 UTC (rev 7757)
@@ -5,8 +5,8 @@
specification.vendor=JBoss (http://www.jboss.org)
specification.version=jbossws-2.0
-version.id=2.0.1.SP2_CP
-repository.id=2.0.1.SP2_CP
+version.id=2.0.1.SP2_CP02
+repository.id=2.0.1.SP2_CP02
implementation.title=JBoss Web Services - Native
implementation.url=http://www.jboss.org/products/jbossws
16 years, 6 months
- 1
- 0
JBossWS SVN: r7756 - stack/native/branches.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2008-06-27 11:09:50 -0400 (Fri, 27 Jun 2008)
New Revision: 7756
Added:
stack/native/branches/jbossws-native-2.0.1.SP2_CP02/
Log:
[JBPAPP-791] Release and upgrade to JBossWS 2.0.1.SP2_CP02.
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP02 (from rev 7755, stack/native/branches/jbossws-native-2.0.1.SP2_CP)
16 years, 6 months
- 1
- 0
JBossWS SVN: r7755 - in stack/native/branches/dlofthouse/JBWS-2234/modules: core/src/main/java/org/jboss/ws/core/jaxrpc and 11 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2008-06-27 10:35:33 -0400 (Fri, 27 Jun 2008)
New Revision: 7755
Added:
stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/
stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/JBWS2234TestCase.java
stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestEndpoint.java
stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestEndpointImpl.java
stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestException.java
stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestHandler.java
stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/
stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/
stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/application-client.xml
stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/jboss-client.xml
stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/
stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/jaxrpc-mapping.xml
stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/web.xml
stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/webservices.xml
stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/wsdl/
stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/wsdl/TestService.wsdl
stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/wstools-config.xml
Modified:
stack/native/branches/dlofthouse/JBWS-2234/modules/core/src/main/java/org/jboss/ws/core/CommonSOAP12Binding.java
stack/native/branches/dlofthouse/JBWS-2234/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAP11BindingJAXRPC.java
stack/native/branches/dlofthouse/JBWS-2234/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAP12BindingJAXRPC.java
stack/native/branches/dlofthouse/JBWS-2234/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java
stack/native/branches/dlofthouse/JBWS-2234/modules/core/src/main/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java
stack/native/branches/dlofthouse/JBWS-2234/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/MessageBinding.java
stack/native/branches/dlofthouse/JBWS-2234/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/PayloadBinding.java
stack/native/branches/dlofthouse/JBWS-2234/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/SOAP11BindingJAXWS.java
stack/native/branches/dlofthouse/JBWS-2234/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/SOAP12BindingJAXWS.java
stack/native/branches/dlofthouse/JBWS-2234/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerChainExecutor.java
stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml
Log:
New test case and prototype fixes.
Modified: stack/native/branches/dlofthouse/JBWS-2234/modules/core/src/main/java/org/jboss/ws/core/CommonSOAP12Binding.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-2234/modules/core/src/main/java/org/jboss/ws/core/CommonSOAP12Binding.java 2008-06-27 14:34:04 UTC (rev 7754)
+++ stack/native/branches/dlofthouse/JBWS-2234/modules/core/src/main/java/org/jboss/ws/core/CommonSOAP12Binding.java 2008-06-27 14:35:33 UTC (rev 7755)
@@ -51,7 +51,7 @@
msgFactory.setEnvNamespace(Constants.NS_SOAP12_ENV);
}
- /** Create the SOAP-1.1 message */
+ /** Create the SOAP-1.2 message */
protected MessageAbstraction createMessage(OperationMetaData opMetaData) throws SOAPException
{
return (MessageAbstraction)msgFactory.createMessage();
Modified: stack/native/branches/dlofthouse/JBWS-2234/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAP11BindingJAXRPC.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-2234/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAP11BindingJAXRPC.java 2008-06-27 14:34:04 UTC (rev 7754)
+++ stack/native/branches/dlofthouse/JBWS-2234/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAP11BindingJAXRPC.java 2008-06-27 14:35:33 UTC (rev 7755)
@@ -60,7 +60,7 @@
public SOAPMessage createFaultMessageFromException(Exception ex)
{
- return SOAPFaultHelperJAXRPC.exceptionToFaultMessage(ex);
+ return SOAPFaultHelperJAXRPC.exceptionToFaultMessage(ex, this);
}
protected void throwFaultException(SOAPFaultImpl fault) throws Exception
Modified: stack/native/branches/dlofthouse/JBWS-2234/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAP12BindingJAXRPC.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-2234/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAP12BindingJAXRPC.java 2008-06-27 14:34:04 UTC (rev 7754)
+++ stack/native/branches/dlofthouse/JBWS-2234/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAP12BindingJAXRPC.java 2008-06-27 14:35:33 UTC (rev 7755)
@@ -60,7 +60,7 @@
public SOAPMessage createFaultMessageFromException(Exception ex)
{
- return SOAPFaultHelperJAXRPC.exceptionToFaultMessage(ex);
+ return SOAPFaultHelperJAXRPC.exceptionToFaultMessage(ex, this);
}
@Override
Modified: stack/native/branches/dlofthouse/JBWS-2234/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-2234/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java 2008-06-27 14:34:04 UTC (rev 7754)
+++ stack/native/branches/dlofthouse/JBWS-2234/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java 2008-06-27 14:35:33 UTC (rev 7755)
@@ -47,6 +47,7 @@
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
import org.jboss.ws.core.CommonMessageContext;
+import org.jboss.ws.core.CommonSOAPBinding;
import org.jboss.ws.core.CommonSOAPFaultException;
import org.jboss.ws.core.binding.BindingException;
import org.jboss.ws.core.binding.AbstractDeserializerFactory;
@@ -172,7 +173,7 @@
/** Translate the request exception into a SOAPFault message.
*/
- public static SOAPMessageImpl exceptionToFaultMessage(Exception reqEx)
+ public static SOAPMessageImpl exceptionToFaultMessage(Exception reqEx, CommonSOAPBinding binding)
{
// Get or create the SOAPFaultException
SOAPFaultException faultEx;
@@ -202,7 +203,7 @@
try
{
- SOAPMessageImpl faultMessage = toSOAPMessage(faultEx);
+ SOAPMessageImpl faultMessage = toSOAPMessage(faultEx, binding);
return faultMessage;
}
catch (RuntimeException rte)
@@ -216,7 +217,7 @@
}
}
- private static SOAPMessageImpl toSOAPMessage(SOAPFaultException faultEx) throws SOAPException
+ private static SOAPMessageImpl toSOAPMessage(SOAPFaultException faultEx, CommonSOAPBinding binding) throws SOAPException
{
assertFaultCode(faultEx.getFaultCode());
@@ -224,8 +225,7 @@
SerializationContext serContext = (msgContext != null ? msgContext.getSerializationContext() : new SerializationContextJAXRPC());
NamespaceRegistry nsRegistry = serContext.getNamespaceRegistry();
- MessageFactory factory = new MessageFactoryImpl();
- SOAPMessageImpl soapMessage = (SOAPMessageImpl)factory.createMessage();
+ SOAPMessageImpl soapMessage = (SOAPMessageImpl)binding.getMessageFactory().createMessage();
SOAPEnvelopeImpl soapEnvelope = (SOAPEnvelopeImpl)soapMessage.getSOAPPart().getEnvelope();
SOAPBody soapBody = soapEnvelope.getBody();
Modified: stack/native/branches/dlofthouse/JBWS-2234/modules/core/src/main/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-2234/modules/core/src/main/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java 2008-06-27 14:34:04 UTC (rev 7754)
+++ stack/native/branches/dlofthouse/JBWS-2234/modules/core/src/main/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java 2008-06-27 14:35:33 UTC (rev 7755)
@@ -35,6 +35,7 @@
import org.jboss.logging.Logger;
import org.jboss.ws.Constants;
import org.jboss.ws.core.CommonMessageContext;
+import org.jboss.ws.core.CommonSOAPBinding;
import org.jboss.ws.core.CommonSOAPFaultException;
import org.jboss.ws.core.binding.BindingException;
import org.jboss.ws.core.binding.AbstractDeserializerFactory;
@@ -144,7 +145,7 @@
}
/** Translate the request exception into a SOAPFault message. */
- public static SOAPMessageImpl exceptionToFaultMessage(Exception reqEx)
+ public static SOAPMessageImpl exceptionToFaultMessage(Exception reqEx, CommonSOAPBinding binding)
{
log.error("SOAP request exception", reqEx);
@@ -167,7 +168,7 @@
}
else if (reqEx instanceof CommonSOAPFaultException)
{
- faultMessage = SOAPFaultHelperJAXRPC.exceptionToFaultMessage(reqEx);
+ faultMessage = SOAPFaultHelperJAXRPC.exceptionToFaultMessage(reqEx, binding);
}
else
{
@@ -183,10 +184,9 @@
}
}
- private static SOAPMessageImpl toSOAPMessage(SOAPFaultException faultEx) throws SOAPException
- {
- MessageFactory factory = MessageFactory.newInstance();
- SOAPMessageImpl soapMessage = (SOAPMessageImpl)factory.createMessage();
+ private static SOAPMessageImpl toSOAPMessage(SOAPFaultException faultEx, CommonSOAPBinding binding) throws SOAPException
+ {
+ SOAPMessageImpl soapMessage = (SOAPMessageImpl)binding.getMessageFactory().createMessage();
SOAPBody soapBody = soapMessage.getSOAPBody();
populateSOAPFault(soapBody, faultEx);
Modified: stack/native/branches/dlofthouse/JBWS-2234/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/MessageBinding.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-2234/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/MessageBinding.java 2008-06-27 14:34:04 UTC (rev 7754)
+++ stack/native/branches/dlofthouse/JBWS-2234/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/MessageBinding.java 2008-06-27 14:35:33 UTC (rev 7755)
@@ -124,7 +124,7 @@
public MessageAbstraction bindFaultMessage(Exception ex)
{
- SOAPMessageImpl faultMessage = SOAPFaultHelperJAXWS.exceptionToFaultMessage(ex);
+ SOAPMessageImpl faultMessage = SOAPFaultHelperJAXWS.exceptionToFaultMessage(ex, null);
CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext();
if (msgContext != null)
{
Modified: stack/native/branches/dlofthouse/JBWS-2234/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/PayloadBinding.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-2234/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/PayloadBinding.java 2008-06-27 14:34:04 UTC (rev 7754)
+++ stack/native/branches/dlofthouse/JBWS-2234/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/PayloadBinding.java 2008-06-27 14:35:33 UTC (rev 7755)
@@ -156,7 +156,7 @@
public MessageAbstraction bindFaultMessage(Exception ex)
{
- SOAPMessageImpl faultMessage = SOAPFaultHelperJAXWS.exceptionToFaultMessage(ex);
+ SOAPMessageImpl faultMessage = SOAPFaultHelperJAXWS.exceptionToFaultMessage(ex, null);
CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext();
if (msgContext != null)
{
Modified: stack/native/branches/dlofthouse/JBWS-2234/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/SOAP11BindingJAXWS.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-2234/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/SOAP11BindingJAXWS.java 2008-06-27 14:34:04 UTC (rev 7754)
+++ stack/native/branches/dlofthouse/JBWS-2234/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/SOAP11BindingJAXWS.java 2008-06-27 14:35:33 UTC (rev 7755)
@@ -101,7 +101,7 @@
public SOAPMessage createFaultMessageFromException(Exception ex)
{
- return SOAPFaultHelperJAXWS.exceptionToFaultMessage(ex);
+ return SOAPFaultHelperJAXWS.exceptionToFaultMessage(ex, this);
}
protected void throwFaultException(SOAPFaultImpl fault) throws Exception
Modified: stack/native/branches/dlofthouse/JBWS-2234/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/SOAP12BindingJAXWS.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-2234/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/SOAP12BindingJAXWS.java 2008-06-27 14:34:04 UTC (rev 7754)
+++ stack/native/branches/dlofthouse/JBWS-2234/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/SOAP12BindingJAXWS.java 2008-06-27 14:35:33 UTC (rev 7755)
@@ -109,7 +109,7 @@
public SOAPMessage createFaultMessageFromException(Exception ex)
{
- return SOAPFaultHelperJAXWS.exceptionToFaultMessage(ex);
+ return SOAPFaultHelperJAXWS.exceptionToFaultMessage(ex, this);
}
protected void throwFaultException(SOAPFaultImpl fault) throws Exception
Modified: stack/native/branches/dlofthouse/JBWS-2234/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerChainExecutor.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-2234/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerChainExecutor.java 2008-06-27 14:34:04 UTC (rev 7754)
+++ stack/native/branches/dlofthouse/JBWS-2234/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerChainExecutor.java 2008-06-27 14:35:33 UTC (rev 7755)
@@ -167,7 +167,7 @@
return doNext;
}
- public boolean handleFault(MessageContext msgContext, Exception ex)
+ private boolean handleFault(MessageContext msgContext, Exception ex)
{
isOutbound = (Boolean)msgContext.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY);
if (isOutbound == null)
@@ -189,7 +189,7 @@
{
if (soapMessage == null || soapMessage.getSOAPBody().getFault() == null)
{
- soapMessage = SOAPFaultHelperJAXWS.exceptionToFaultMessage(ex);
+ soapMessage = SOAPFaultHelperJAXWS.exceptionToFaultMessage(ex, null);
soapContext.setMessage(soapMessage);
}
}
@@ -200,7 +200,7 @@
}
int index = getFirstHandler();
-
+
Handler currHandler = null;
try
{
Modified: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml
===================================================================
--- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2008-06-27 14:34:04 UTC (rev 7754)
+++ stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2008-06-27 14:35:33 UTC (rev 7755)
@@ -2694,6 +2694,34 @@
</metainf>
</jar>
+ <!-- jaxrpc-jbws2234 -->
+ <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws2234.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws2234/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxrpc/jbws2234/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/jbws2234/TestEndpointImpl.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/jbws2234/TestException.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/jbws2234/TestHandler.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws2234/WEB-INF">
+ <include name="webservices.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="custom-endpoint-config.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws2234-client.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jbws2234/TestEndpoint.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws2234/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws2234/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
<!-- jaxrpc-marshall-doclit.war -->
<war warfile="${tests.output.dir}/test-libs/jaxrpc-marshall-doclit.war" webxml="${tests.output.dir}/test-resources/jaxrpc/marshall-doclit/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
Added: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/JBWS2234TestCase.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/JBWS2234TestCase.java (rev 0)
+++ stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/JBWS2234TestCase.java 2008-06-27 14:35:33 UTC (rev 7755)
@@ -0,0 +1,89 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, 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.test.ws.jaxrpc.jbws2234;
+
+import javax.naming.InitialContext;
+import javax.xml.rpc.Service;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * @author darran.lofthouse(a)jboss.com
+ * @since June 21, 2008
+ */
+public class JBWS2234TestCase extends JBossWSTest
+{
+ private static TestEndpoint port;
+
+ public static Test suite() throws Exception
+ {
+ return new JBossWSTestSetup(JBWS2234TestCase.class, "jaxrpc-jbws2234.war, jaxrpc-jbws2234-client.jar");
+ }
+
+ public void setUp() throws Exception
+ {
+ super.setUp();
+ if (port == null)
+ {
+ InitialContext iniCtx = getInitialContext();
+ Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService");
+ port = (TestEndpoint)service.getPort(TestEndpoint.class);
+ }
+ }
+
+ public void testCall() throws Exception
+ {
+ final String message = "Hello!!";
+ String response = port.echo(message);
+
+ assertEquals(message, response);
+ }
+
+ public void testCheckedException() throws Exception
+ {
+ try
+ {
+ port.echo(TestEndpointImpl.TEST_EXCEPTION);
+ fail("Excpected TestException not thrown.");
+ }
+ catch (TestException te)
+ {
+ }
+ }
+
+ public void testRuntimeException()
+ {
+ try
+ {
+ port.echo(TestEndpointImpl.RUNTIME_EXCEPTION);
+ fail("Excpected Exception not thrown.");
+ }
+ catch (Exception e)
+ {
+ assertEquals(TestEndpointImpl.RUNTIME_EXCEPTION, e.getMessage());
+ }
+ }
+}
Property changes on: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/JBWS2234TestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestEndpoint.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestEndpoint.java (rev 0)
+++ stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestEndpoint.java 2008-06-27 14:35:33 UTC (rev 7755)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, 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.test.ws.jaxrpc.jbws2234;
+
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+
+/**
+ * @author darran.lofthouse(a)jboss.com
+ * @since June 21, 2008
+ */
+public interface TestEndpoint extends Remote
+{
+
+ public String echo(final String message) throws TestException, RemoteException;
+
+}
Property changes on: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestEndpoint.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestEndpointImpl.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestEndpointImpl.java (rev 0)
+++ stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestEndpointImpl.java 2008-06-27 14:35:33 UTC (rev 7755)
@@ -0,0 +1,48 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, 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.test.ws.jaxrpc.jbws2234;
+
+/**
+ * @author darran.lofthouse(a)jboss.com
+ * @since June 21, 2008
+ */
+public class TestEndpointImpl implements TestEndpoint
+{
+
+ public static final String TEST_EXCEPTION = "TestException";
+
+ public static final String RUNTIME_EXCEPTION = "RuntimeException";
+
+ public String echo(String message) throws TestException
+ {
+ if (TEST_EXCEPTION.equals(message))
+ {
+ throw new TestException();
+ }
+ else if (RUNTIME_EXCEPTION.equals(message))
+ {
+ throw new RuntimeException("Simulated failure");
+ }
+ return message;
+ }
+
+}
Property changes on: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestEndpointImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestException.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestException.java (rev 0)
+++ stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestException.java 2008-06-27 14:35:33 UTC (rev 7755)
@@ -0,0 +1,31 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, 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.test.ws.jaxrpc.jbws2234;
+
+/**
+ * @author darran.lofthouse(a)jboss.com
+ * @since June 21, 2008
+ */
+public class TestException extends Exception
+{
+
+}
Property changes on: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestException.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestHandler.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestHandler.java (rev 0)
+++ stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestHandler.java 2008-06-27 14:35:33 UTC (rev 7755)
@@ -0,0 +1,87 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, 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.test.ws.jaxrpc.jbws2234;
+
+import javax.xml.namespace.QName;
+import javax.xml.rpc.handler.GenericHandler;
+import javax.xml.rpc.handler.MessageContext;
+import javax.xml.rpc.handler.soap.SOAPMessageContext;
+import javax.xml.soap.SOAPEnvelope;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.soap.SOAPPart;
+
+/**
+ * @author darran.lofthouse(a)jboss.com
+ * @since June 21, 2008
+ */
+public class TestHandler extends GenericHandler
+{
+
+ private static final String SOAP_1_2 = "http://www.w3.org/2003/05/soap-envelope";
+
+ @Override
+ public QName[] getHeaders()
+ {
+ return null;
+ }
+
+ public boolean handleMessage(final MessageContext msgContext)
+ {
+ try
+ {
+ SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage();
+ SOAPPart part = soapMessage.getSOAPPart();
+ SOAPEnvelope envelope = part.getEnvelope();
+
+ String namespace = envelope.getNamespaceURI();
+ if (SOAP_1_2.equals(namespace) == false)
+ {
+ throw new RuntimeException("Expected '" + SOAP_1_2 + "' namespace, actual '" + namespace + "'");
+ }
+ }
+ catch (SOAPException e)
+ {
+ throw new RuntimeException(e);
+ }
+ return true;
+ }
+
+ @Override
+ public boolean handleFault(final MessageContext msgContext)
+ {
+ return handleMessage(msgContext);
+ }
+
+ @Override
+ public boolean handleRequest(MessageContext msgContext)
+ {
+ return handleMessage(msgContext);
+ }
+
+ @Override
+ public boolean handleResponse(MessageContext msgContext)
+ {
+ return handleMessage(msgContext);
+ }
+
+}
Property changes on: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestHandler.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/application-client.xml
===================================================================
--- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/application-client.xml (rev 0)
+++ stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/application-client.xml 2008-06-27 14:35:33 UTC (rev 7755)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<application-client xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd"
+ version="1.4">
+
+ <display-name>TestService</display-name>
+
+ <service-ref>
+ <service-ref-name>service/TestService</service-ref-name>
+ <service-interface>javax.xml.rpc.Service</service-interface>
+ <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file>
+ <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
+ <port-component-ref>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws2234.TestEndpoint</service-endpoint-interface>
+ </port-component-ref>
+ </service-ref>
+
+</application-client>
+
Property changes on: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/application-client.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/jboss-client.xml
===================================================================
--- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/jboss-client.xml (rev 0)
+++ stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/jboss-client.xml 2008-06-27 14:35:33 UTC (rev 7755)
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+
+<!DOCTYPE jboss-client PUBLIC
+ "-//JBoss//DTD Application Client 4.0//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+
+<jboss-client>
+ <jndi-name>jbossws-client</jndi-name>
+
+ <service-ref>
+ <service-ref-name>service/TestService</service-ref-name>
+ <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws2234/TestEndpoint?wsdl</wsdl-override>
+ </service-ref>
+
+</jboss-client>
Property changes on: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/jboss-client.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/jaxrpc-mapping.xml
===================================================================
--- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/jaxrpc-mapping.xml (rev 0)
+++ stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/jaxrpc-mapping.xml 2008-06-27 14:35:33 UTC (rev 7755)
@@ -0,0 +1,46 @@
+<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jaxrpc.jbws2234</package-type>
+ <namespaceURI>http://org.jboss.test.ws/jbws2234/types</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jaxrpc.jbws2234.TestException</java-type>
+ <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws2234/types'>typeNS:TestException</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ </java-xml-type-mapping>
+ <exception-mapping>
+ <exception-type>org.jboss.test.ws.jaxrpc.jbws2234.TestException</exception-type>
+ <wsdl-message xmlns:exMsgNS='http://org.jboss.test.ws/jbws2234'>exMsgNS:TestException</wsdl-message>
+ </exception-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jaxrpc.jbws2234.TestService</service-interface>
+ <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws2234'>serviceNS:TestService</wsdl-service-name>
+ <port-mapping>
+ <port-name>TestEndpointPort</port-name>
+ <java-port-name>TestEndpointPort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws2234.TestEndpoint</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws2234'>portTypeNS:TestEndpoint</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws2234'>bindingNS:TestEndpointBinding</wsdl-binding>
+ <service-endpoint-method-mapping>
+ <java-method-name>echo</java-method-name>
+ <wsdl-operation>echo</wsdl-operation>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>java.lang.String</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws2234'>wsdlMsgNS:TestEndpoint_echo</wsdl-message>
+ <wsdl-message-part-name>String_1</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>java.lang.String</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws2234'>wsdlMsgNS:TestEndpoint_echoResponse</wsdl-message>
+ <wsdl-message-part-name>result</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ </service-endpoint-interface-mapping>
+</java-wsdl-mapping>
\ No newline at end of file
Property changes on: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/jaxrpc-mapping.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/web.xml
===================================================================
--- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/web.xml (rev 0)
+++ stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/web.xml 2008-06-27 14:35:33 UTC (rev 7755)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+ version="2.4">
+
+ <servlet>
+ <servlet-name>TestEndpoint</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxrpc.jbws2234.TestEndpointImpl</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>TestEndpoint</servlet-name>
+ <url-pattern>/TestEndpoint</url-pattern>
+ </servlet-mapping>
+
+</web-app>
+
Property changes on: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/webservices.xml
===================================================================
--- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/webservices.xml (rev 0)
+++ stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/webservices.xml 2008-06-27 14:35:33 UTC (rev 7755)
@@ -0,0 +1,19 @@
+<webservices version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd'>
+ <webservice-description>
+ <webservice-description-name>TestService</webservice-description-name>
+ <wsdl-file>WEB-INF/wsdl/TestService.wsdl</wsdl-file>
+ <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
+ <port-component>
+ <port-component-name>TestEndpointPort</port-component-name>
+ <wsdl-port xmlns:portNS='http://org.jboss.test.ws/jbws2234'>portNS:TestEndpointPort</wsdl-port>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws2234.TestEndpoint</service-endpoint-interface>
+ <service-impl-bean>
+ <servlet-link>TestEndpoint</servlet-link>
+ </service-impl-bean>
+ <handler>
+ <handler-name>TestHandler</handler-name>
+ <handler-class>org.jboss.test.ws.jaxrpc.jbws2234.TestHandler</handler-class>
+ </handler>
+ </port-component>
+ </webservice-description>
+</webservices>
\ No newline at end of file
Property changes on: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/webservices.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/wsdl/TestService.wsdl
===================================================================
--- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/wsdl/TestService.wsdl (rev 0)
+++ stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/wsdl/TestService.wsdl 2008-06-27 14:35:33 UTC (rev 7755)
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws2234' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://org.jboss.test.ws/jbws2234/types' xmlns:soap12='http://schemas.xmlsoap.org/wsdl/soap12/' xmlns:tns='http://org.jboss.test.ws/jbws2234' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <schema targetNamespace='http://org.jboss.test.ws/jbws2234/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://org.jboss.test.ws/jbws2234/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+ <complexType name='TestException'>
+ <sequence/>
+ </complexType>
+ <element name='TestException' type='tns:TestException'/>
+ </schema>
+ </types>
+ <message name='TestEndpoint_echo' xmlns='http://schemas.xmlsoap.org/wsdl/'>
+ <part name='String_1' type='xsd:string'/>
+ </message>
+ <message name='TestEndpoint_echoResponse'>
+ <part name='result' type='xsd:string'/>
+ </message>
+ <message name='TestException'>
+ <part element='ns1:TestException' name='TestException'/>
+ </message>
+ <portType name='TestEndpoint'>
+ <operation name='echo' parameterOrder='String_1'>
+ <input message='tns:TestEndpoint_echo'/>
+ <output message='tns:TestEndpoint_echoResponse'/>
+ <fault message='tns:TestException' name='TestException'/>
+ </operation>
+ </portType>
+ <binding name='TestEndpointBinding' type='tns:TestEndpoint'>
+ <soap12:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='echo'>
+ <soap12:operation soapAction=''/>
+ <input>
+ <soap12:body namespace='http://org.jboss.test.ws/jbws2234' use='literal'/>
+ </input>
+ <output>
+ <soap12:body namespace='http://org.jboss.test.ws/jbws2234' use='literal'/>
+ </output>
+ <fault name='TestException'>
+ <soap12:fault name='TestException' use='literal'/>
+ </fault>
+ </operation>
+ </binding>
+ <service name='TestService'>
+ <port binding='tns:TestEndpointBinding' name='TestEndpointPort'>
+ <soap12:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Property changes on: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/wsdl/TestService.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/wstools-config.xml
===================================================================
--- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/wstools-config.xml (rev 0)
+++ stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/wstools-config.xml 2008-06-27 14:35:33 UTC (rev 7755)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ wstools.sh -cp ../../../../../target/test-classes -config wstools-config.xml
+-->
+
+<configuration xmlns="http://www.jboss.org/jbossws-tools"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd">
+
+ <java-wsdl>
+ <service name="TestService" endpoint="org.jboss.test.ws.jaxrpc.jbws2234.TestEndpoint" style="rpc">
+ </service>
+ <namespaces target-namespace="http://org.jboss.test.ws/jbws2234" type-namespace="http://org.jboss.test.ws/jbws2234/types"/>
+ <mapping file="jaxrpc-mapping.xml"/>
+ <webservices servlet-link="TestEndpoint"/>
+ </java-wsdl>
+
+</configuration>
Property changes on: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/wstools-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
16 years, 6 months
- 1
- 0
JBossWS SVN: r7754 - stack/native/branches/dlofthouse.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2008-06-27 10:34:04 -0400 (Fri, 27 Jun 2008)
New Revision: 7754
Added:
stack/native/branches/dlofthouse/JBWS-2234/
Log:
Create development branch.
Copied: stack/native/branches/dlofthouse/JBWS-2234 (from rev 7753, stack/native/trunk)
16 years, 6 months
- 1
- 0
JBossWS SVN: r7753 - stack/native/branches/dlofthouse.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2008-06-27 10:32:06 -0400 (Fri, 27 Jun 2008)
New Revision: 7753
Removed:
stack/native/branches/dlofthouse/JBPAPP-881/
Log:
No longer required.
16 years, 6 months
- 1
- 0
JBossWS SVN: r7752 - stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools.
by jbossws-commits＠lists.jboss.org
Author: david.boeren
Date: 2008-06-27 10:06:09 -0400 (Fri, 27 Jun 2008)
New Revision: 7752
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/JavaWriter.java
Log:
JBAPP-921, fixed clean/build regression for TrivialServiceDocWrappedTestCase.
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/JavaWriter.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/JavaWriter.java 2008-06-27 14:03:06 UTC (rev 7751)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/JavaWriter.java 2008-06-27 14:06:09 UTC (rev 7752)
@@ -198,7 +198,7 @@
if (needToCreatePackageStructure(location, packageName))
newLoc = utils.createPackage(location.getPath(), packageName);
else newLoc = location;
- String classname = utils.chop(ToolsUtils.convertInvalidCharacters(filename), ".java");
+ String classname = ToolsUtils.convertInvalidCharacters(utils.chop(filename, ".java"));
File sei = utils.createPhysicalFile(newLoc, classname);
StringBuilder buffer = new StringBuilder();
utils.writeJbossHeader(buffer);
@@ -398,4 +398,4 @@
buf.append(" " + internalName + "){ this." + internalName + "=" + internalName + "; }");
}
-}
\ No newline at end of file
+}
16 years, 6 months
- 1
- 0