JBossWS SVN: r7852 - legacy/branches.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2008-07-18 06:18:42 -0400 (Fri, 18 Jul 2008)
New Revision: 7852
Added:
legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/
Log:
[JBPAPP-989] Branch for patch.
Copied: legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989 (from rev 7851, legacy/tags/jbossws-1.2.1.GA_CP02)
17 years, 9 months
JBossWS SVN: r7851 - stack/native/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-07-18 04:09:13 -0400 (Fri, 18 Jul 2008)
New Revision: 7851
Modified:
stack/native/trunk/profiles.xml.example
Log:
Using AS 4.2.3 tag
Modified: stack/native/trunk/profiles.xml.example
===================================================================
--- stack/native/trunk/profiles.xml.example 2008-07-18 08:08:47 UTC (rev 7850)
+++ stack/native/trunk/profiles.xml.example 2008-07-18 08:09:13 UTC (rev 7851)
@@ -14,7 +14,7 @@
<java.jdk15.home>/usr/java/jdk1.5</java.jdk15.home>
<jboss421.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_1_GA/build/output/jboss-4.2.1.GA</jboss421.home>
<jboss422.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA</jboss422.home>
- <jboss423.home>/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.3.GA</jboss423.home>
+ <jboss423.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_3_GA/build/output/jboss-4.2.3.GA</jboss423.home>
<jboss500.home>/home/tdiesler/svn/jbossas/tags/JBoss_5_0_0_CR1/build/output/jboss-5.0.0.CR1</jboss500.home>
<jboss501.home>/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.CR2</jboss501.home>
</properties>
17 years, 9 months
JBossWS SVN: r7850 - stack/metro/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-07-18 04:08:47 -0400 (Fri, 18 Jul 2008)
New Revision: 7850
Modified:
stack/metro/trunk/profiles.xml.example
Log:
Using AS 4.2.3 tag
Modified: stack/metro/trunk/profiles.xml.example
===================================================================
--- stack/metro/trunk/profiles.xml.example 2008-07-18 08:08:30 UTC (rev 7849)
+++ stack/metro/trunk/profiles.xml.example 2008-07-18 08:08:47 UTC (rev 7850)
@@ -13,7 +13,7 @@
<properties>
<jboss421.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_1_GA/build/output/jboss-4.2.1.GA</jboss421.home>
<jboss422.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA</jboss422.home>
- <jboss423.home>/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.3.GA</jboss423.home>
+ <jboss423.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_3_GA/build/output/jboss-4.2.3.GA</jboss423.home>
<jboss500.home>/home/tdiesler/svn/jbossas/tags/JBoss_5_0_0_CR1/build/output/jboss-5.0.0.CR1</jboss500.home>
<jboss501.home>/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.CR2</jboss501.home>
</properties>
17 years, 9 months
JBossWS SVN: r7849 - stack/cxf/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-07-18 04:08:30 -0400 (Fri, 18 Jul 2008)
New Revision: 7849
Modified:
stack/cxf/trunk/profiles.xml.example
Log:
Using AS 4.2.3 tag
Modified: stack/cxf/trunk/profiles.xml.example
===================================================================
--- stack/cxf/trunk/profiles.xml.example 2008-07-18 08:07:00 UTC (rev 7848)
+++ stack/cxf/trunk/profiles.xml.example 2008-07-18 08:08:30 UTC (rev 7849)
@@ -13,7 +13,7 @@
<properties>
<jboss421.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_1_GA/build/output/jboss-4.2.1.GA</jboss421.home>
<jboss422.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA</jboss422.home>
- <jboss423.home>/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.3.GA</jboss423.home>
+ <jboss423.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_3_GA/build/output/jboss-4.2.3.GA</jboss423.home>
<jboss500.home>/home/tdiesler/svn/jbossas/tags/JBoss_5_0_0_CR1/build/output/jboss-5.0.0.CR1</jboss500.home>
<jboss501.home>/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.CR2</jboss501.home>
</properties>
17 years, 9 months
JBossWS SVN: r7848 - framework/trunk/hudson.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-07-18 04:07:00 -0400 (Fri, 18 Jul 2008)
New Revision: 7848
Modified:
framework/trunk/hudson/ant.properties.example
Log:
Using AS 4.2.3 tag
Modified: framework/trunk/hudson/ant.properties.example
===================================================================
--- framework/trunk/hudson/ant.properties.example 2008-07-18 06:36:33 UTC (rev 7847)
+++ framework/trunk/hudson/ant.properties.example 2008-07-18 08:07:00 UTC (rev 7848)
@@ -34,7 +34,7 @@
hudson.jboss422.build=jboss-4.2.2.GA
hudson.jboss422.rev=HEAD
-hudson.jboss423.url=https://svn.jboss.org/repos/jbossas/branches/Branch_4_2
+hudson.jboss423.url=https://svn.jboss.org/repos/jbossas/tags/JBoss_4_2_3_GA
hudson.jboss423.build=jboss-4.2.3.GA
hudson.jboss423.rev=HEAD
17 years, 9 months
JBossWS SVN: r7847 - stack/native/trunk/modules/core.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-07-18 02:36:33 -0400 (Fri, 18 Jul 2008)
New Revision: 7847
Modified:
stack/native/trunk/modules/core/pom.xml
Log:
Reverting jbossxb dependency update
Modified: stack/native/trunk/modules/core/pom.xml
===================================================================
--- stack/native/trunk/modules/core/pom.xml 2008-07-17 17:04:31 UTC (rev 7846)
+++ stack/native/trunk/modules/core/pom.xml 2008-07-18 06:36:33 UTC (rev 7847)
@@ -78,7 +78,7 @@
<groupId>org.jboss</groupId>
<artifactId>jbossxb</artifactId>
<scope>provided</scope>
- <version>2.0.0.CR11</version>
+ <version>1.0.0.SP2</version>
</dependency>
<dependency>
<groupId>xalan</groupId>
17 years, 9 months
JBossWS SVN: r7846 - in stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/src: main/java/org/jboss/ws/tools/helpers and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2008-07-17 13:04:31 -0400 (Thu, 17 Jul 2008)
New Revision: 7846
Added:
stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/src/test/resources/tools/jbpapp921/jaxrpc-mapping.xml
stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/src/test/resources/tools/jbpapp921/webservices.xml
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/helpers/MappingFileGeneratorHelper.java
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/wstools-config.xml
Log:
[JBPAPP-876] WSDL to Java, hyphen in PortType not being mapped correctly in generated descriptors.
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-07-17 16:41:55 UTC (rev 7845)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2008-07-17 17:04:31 UTC (rev 7846)
@@ -655,7 +655,7 @@
private void createSEIFile(WSDLInterface intf, File loc) throws IOException
{
- String seiName = ToolsUtils.convertInvalidCharacters(getServiceEndpointInterfaceName(intf));
+ String seiName = getServiceEndpointInterfaceName(intf);
StringBuilder buf = new StringBuilder();
utils.writeJbossHeader(buf);
@@ -680,6 +680,7 @@
seiName += "_PortType";
seiName = JavaUtils.capitalize(seiName);
+ seiName = ToolsUtils.convertInvalidCharacters(seiName);
return seiName;
}
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2008-07-17 16:41:55 UTC (rev 7845)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2008-07-17 17:04:31 UTC (rev 7846)
@@ -194,6 +194,7 @@
String javaPortName = utils.chopPortType(portName);
if (wsdlDefinitions.getService(javaPortName) != null)
javaPortName += "_PortType";
+ javaPortName = ToolsUtils.convertInvalidCharacters(javaPortName);
ServiceEndpointInterfaceMapping seim = new ServiceEndpointInterfaceMapping(jwm);
String className = ToolsUtils.firstLetterUpperCase(javaPortName);
Modified: 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/java/org/jboss/test/ws/tools/jbpapp921/JBPAPP921TestCase.java 2008-07-17 16:41:55 UTC (rev 7845)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/src/test/java/org/jboss/test/ws/tools/jbpapp921/JBPAPP921TestCase.java 2008-07-17 17:04:31 UTC (rev 7846)
@@ -26,7 +26,9 @@
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.common.DOMUtils;
import org.jboss.wsf.test.JBossWSTest;
+import org.w3c.dom.Element;
public class JBPAPP921TestCase extends JBossWSTest
{
@@ -37,9 +39,18 @@
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");
+
+ JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator();
+ File jaxrpcMapping = new File(resourceDir + "/jaxrpc-mapping.xml");
+ mappingValidator.validate(jaxrpcMapping.getAbsolutePath(), toolsDir + "/jaxrpc-mapping.xml");
+
+ Element exp = DOMUtils.parse(new File(resourceDir + "/webservices.xml").toURL().openStream());
+ Element act = DOMUtils.parse(new File(toolsDir + "/webservices.xml").toURL().openStream());
+ assertEquals(exp, act);
}
private static void compareSource(final String fileName) throws Exception
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/src/test/resources/tools/jbpapp921/jaxrpc-mapping.xml (from rev 7845, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbpapp921/jaxrpc-mapping.xml)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/src/test/resources/tools/jbpapp921/jaxrpc-mapping.xml (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/src/test/resources/tools/jbpapp921/jaxrpc-mapping.xml 2008-07-17 17:04:31 UTC (rev 7846)
@@ -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.jbpapp921</package-type>
+ <namespaceURI>http://org.jboss.test.ws.jbpapp921</namespaceURI>
+ </package-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jbpapp921.Models_ServiceIM_ServiceProxy</service-interface>
+ <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws.jbpapp921'>serviceNS:models_ServiceIM_ServiceProxy</wsdl-service-name>
+ <port-mapping>
+ <port-name>validationEventPort</port-name>
+ <java-port-name>validationEventPort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+ <service-endpoint-interface>org.jboss.test.ws.jbpapp921.ValidationEvent_test</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws.jbpapp921'>portTypeNS:validationEvent-test</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws.jbpapp921'>bindingNS:validationEventBinding</wsdl-binding>
+ <service-endpoint-method-mapping>
+ <java-method-name>validateClaim</java-method-name>
+ <wsdl-operation>validateClaim</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.jbpapp921'>wsdlMsgNS:ValidationEvent_validateClaim</wsdl-message>
+ <wsdl-message-part-name>lifecycleId</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <method-param-parts-mapping>
+ <param-position>1</param-position>
+ <param-type>java.lang.String</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws.jbpapp921'>wsdlMsgNS:ValidationEvent_validateClaim</wsdl-message>
+ <wsdl-message-part-name>claim</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>int</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws.jbpapp921'>wsdlMsgNS:ValidationEvent_validateClaimResponse</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
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/src/test/resources/tools/jbpapp921/webservices.xml (from rev 7845, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbpapp921/webservices.xml)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/src/test/resources/tools/jbpapp921/webservices.xml (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/src/test/resources/tools/jbpapp921/webservices.xml 2008-07-17 17:04:31 UTC (rev 7846)
@@ -0,0 +1,15 @@
+<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>models_ServiceIM_ServiceProxy</webservice-description-name>
+ <wsdl-file>WEB-INF/wsdl/test.wsdl</wsdl-file>
+ <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
+ <port-component>
+ <port-component-name>validationEventPort</port-component-name>
+ <wsdl-port xmlns:portNS='http://org.jboss.test.ws.jbpapp921'>portNS:validationEventPort</wsdl-port>
+ <service-endpoint-interface>org.jboss.test.ws.jbpapp921.ValidationEvent_test</service-endpoint-interface>
+ <service-impl-bean>
+ <servlet-link>TestEndpoint</servlet-link>
+ </service-impl-bean>
+ </port-component>
+ </webservice-description>
+</webservices>
\ No newline at end of file
Modified: 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_CP01_JBPAPP-876/src/test/resources/tools/jbpapp921/wstools-config.xml 2008-07-17 16:41:55 UTC (rev 7845)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP01_JBPAPP-876/src/test/resources/tools/jbpapp921/wstools-config.xml 2008-07-17 17:04:31 UTC (rev 7846)
@@ -1,4 +1,6 @@
<configuration>
<wsdl-java location="resources/tools/jbpapp921/test.wsdl">
+ <mapping file="jaxrpc-mapping.xml"/>
+ <webservices servlet-link="TestEndpoint" />
</wsdl-java>
</configuration>
\ No newline at end of file
17 years, 9 months
JBossWS SVN: r7845 - in stack/native/branches/jbossws-native-2.0.1.SP2_CP/src: main/java/org/jboss/ws/tools/helpers and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2008-07-17 12:41:55 -0400 (Thu, 17 Jul 2008)
New Revision: 7845
Added:
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbpapp921/jaxrpc-mapping.xml
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbpapp921/webservices.xml
Modified:
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/WSDLToJava.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
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_CP/src/test/resources/tools/jbpapp921/wstools-config.xml
Log:
[JBPAPP-985] WSDL to Java, hyphen in PortType not being mapped correctly in generated descriptors.
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/WSDLToJava.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2008-07-17 15:45:20 UTC (rev 7844)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2008-07-17 16:41:55 UTC (rev 7845)
@@ -655,7 +655,7 @@
private void createSEIFile(WSDLInterface intf, File loc) throws IOException
{
- String seiName = ToolsUtils.convertInvalidCharacters(getServiceEndpointInterfaceName(intf));
+ String seiName = getServiceEndpointInterfaceName(intf);
StringBuilder buf = new StringBuilder();
utils.writeJbossHeader(buf);
@@ -680,6 +680,7 @@
seiName += "_PortType";
seiName = JavaUtils.capitalize(seiName);
+ seiName = ToolsUtils.convertInvalidCharacters(seiName);
return seiName;
}
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2008-07-17 15:45:20 UTC (rev 7844)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2008-07-17 16:41:55 UTC (rev 7845)
@@ -194,6 +194,7 @@
String javaPortName = utils.chopPortType(portName);
if (wsdlDefinitions.getService(javaPortName) != null)
javaPortName += "_PortType";
+ javaPortName = ToolsUtils.convertInvalidCharacters(javaPortName);
ServiceEndpointInterfaceMapping seim = new ServiceEndpointInterfaceMapping(jwm);
String className = ToolsUtils.firstLetterUpperCase(javaPortName);
Modified: 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_CP/src/test/java/org/jboss/test/ws/tools/jbpapp921/JBPAPP921TestCase.java 2008-07-17 15:45:20 UTC (rev 7844)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbpapp921/JBPAPP921TestCase.java 2008-07-17 16:41:55 UTC (rev 7845)
@@ -26,7 +26,9 @@
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.common.DOMUtils;
import org.jboss.wsf.test.JBossWSTest;
+import org.w3c.dom.Element;
public class JBPAPP921TestCase extends JBossWSTest
{
@@ -37,9 +39,18 @@
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");
+
+ JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator();
+ File jaxrpcMapping = new File(resourceDir + "/jaxrpc-mapping.xml");
+ mappingValidator.validate(jaxrpcMapping.getAbsolutePath(), toolsDir + "/jaxrpc-mapping.xml");
+
+ Element exp = DOMUtils.parse(new File(resourceDir + "/webservices.xml").toURL().openStream());
+ Element act = DOMUtils.parse(new File(toolsDir + "/webservices.xml").toURL().openStream());
+ assertEquals(exp, act);
}
private static void compareSource(final String fileName) throws Exception
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbpapp921/jaxrpc-mapping.xml (from rev 7844, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbpapp921/jaxrpc-mapping.xml)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbpapp921/jaxrpc-mapping.xml (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbpapp921/jaxrpc-mapping.xml 2008-07-17 16:41:55 UTC (rev 7845)
@@ -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.jbpapp921</package-type>
+ <namespaceURI>http://org.jboss.test.ws.jbpapp921</namespaceURI>
+ </package-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jbpapp921.Models_ServiceIM_ServiceProxy</service-interface>
+ <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws.jbpapp921'>serviceNS:models_ServiceIM_ServiceProxy</wsdl-service-name>
+ <port-mapping>
+ <port-name>validationEventPort</port-name>
+ <java-port-name>validationEventPort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+ <service-endpoint-interface>org.jboss.test.ws.jbpapp921.ValidationEvent_test</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws.jbpapp921'>portTypeNS:validationEvent-test</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws.jbpapp921'>bindingNS:validationEventBinding</wsdl-binding>
+ <service-endpoint-method-mapping>
+ <java-method-name>validateClaim</java-method-name>
+ <wsdl-operation>validateClaim</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.jbpapp921'>wsdlMsgNS:ValidationEvent_validateClaim</wsdl-message>
+ <wsdl-message-part-name>lifecycleId</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <method-param-parts-mapping>
+ <param-position>1</param-position>
+ <param-type>java.lang.String</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws.jbpapp921'>wsdlMsgNS:ValidationEvent_validateClaim</wsdl-message>
+ <wsdl-message-part-name>claim</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>int</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws.jbpapp921'>wsdlMsgNS:ValidationEvent_validateClaimResponse</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
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbpapp921/webservices.xml (from rev 7844, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbpapp921/webservices.xml)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbpapp921/webservices.xml (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbpapp921/webservices.xml 2008-07-17 16:41:55 UTC (rev 7845)
@@ -0,0 +1,15 @@
+<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>models_ServiceIM_ServiceProxy</webservice-description-name>
+ <wsdl-file>WEB-INF/wsdl/test.wsdl</wsdl-file>
+ <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
+ <port-component>
+ <port-component-name>validationEventPort</port-component-name>
+ <wsdl-port xmlns:portNS='http://org.jboss.test.ws.jbpapp921'>portNS:validationEventPort</wsdl-port>
+ <service-endpoint-interface>org.jboss.test.ws.jbpapp921.ValidationEvent_test</service-endpoint-interface>
+ <service-impl-bean>
+ <servlet-link>TestEndpoint</servlet-link>
+ </service-impl-bean>
+ </port-component>
+ </webservice-description>
+</webservices>
\ No newline at end of file
Modified: 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_CP/src/test/resources/tools/jbpapp921/wstools-config.xml 2008-07-17 15:45:20 UTC (rev 7844)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbpapp921/wstools-config.xml 2008-07-17 16:41:55 UTC (rev 7845)
@@ -1,4 +1,6 @@
<configuration>
<wsdl-java location="resources/tools/jbpapp921/test.wsdl">
+ <mapping file="jaxrpc-mapping.xml"/>
+ <webservices servlet-link="TestEndpoint" />
</wsdl-java>
</configuration>
\ No newline at end of file
17 years, 9 months
JBossWS SVN: r7844 - in stack/native/trunk/modules: core/src/main/java/org/jboss/ws/tools/helpers and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2008-07-17 11:45:20 -0400 (Thu, 17 Jul 2008)
New Revision: 7844
Added:
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbpapp921/jaxrpc-mapping.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbpapp921/webservices.xml
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/helpers/MappingFileGeneratorHelper.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbpapp921/JBPAPP921TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/validation/JaxrpcMappingValidator.java
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbpapp921/wstools-config.xml
Log:
[JBWS-2260] WSDL to Java, hyphen in PortType not being mapped correctly in generated descriptors.
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-07-17 14:33:28 UTC (rev 7843)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2008-07-17 15:45:20 UTC (rev 7844)
@@ -655,7 +655,7 @@
private void createSEIFile(WSDLInterface intf, File loc) throws IOException
{
- String seiName = ToolsUtils.convertInvalidCharacters(getServiceEndpointInterfaceName(intf));
+ String seiName = getServiceEndpointInterfaceName(intf);
StringBuilder buf = new StringBuilder();
utils.writeJbossHeader(buf);
@@ -680,6 +680,7 @@
seiName += "_PortType";
seiName = JavaUtils.capitalize(seiName);
+ seiName = ToolsUtils.convertInvalidCharacters(seiName);
return seiName;
}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2008-07-17 14:33:28 UTC (rev 7843)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2008-07-17 15:45:20 UTC (rev 7844)
@@ -200,6 +200,7 @@
String javaPortName = utils.chopPortType(portName);
if (wsdlDefinitions.getService(javaPortName) != null)
javaPortName += "_PortType";
+ javaPortName = ToolsUtils.convertInvalidCharacters(javaPortName);
ServiceEndpointInterfaceMapping seim = new ServiceEndpointInterfaceMapping(jwm);
String className = ToolsUtils.firstLetterUpperCase(javaPortName);
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbpapp921/JBPAPP921TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbpapp921/JBPAPP921TestCase.java 2008-07-17 14:33:28 UTC (rev 7843)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbpapp921/JBPAPP921TestCase.java 2008-07-17 15:45:20 UTC (rev 7844)
@@ -22,12 +22,13 @@
package org.jboss.test.ws.tools.jbpapp921;
import java.io.File;
-import java.util.Arrays;
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.common.DOMUtils;
import org.jboss.wsf.test.JBossWSTest;
+import org.w3c.dom.Element;
public class JBPAPP921TestCase extends JBossWSTest
{
@@ -36,11 +37,19 @@
public void testGenerate() throws Exception
{
- String realResourceDir = getResourceFile("tools/jbpapp921").getAbsolutePath();
+ String realResourceDir = getResourceFile("tools/jbpapp921").getAbsolutePath();
String[] args = new String[] { "-dest", toolsDir, "-config", realResourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
compareSource("Models_ServiceIM_ServiceProxyService.java");
compareSource("ValidationEvent_test.java");
+
+ JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator();
+ File jaxrpcMapping = getResourceFile(resourceDir + "/jaxrpc-mapping.xml");
+ mappingValidator.validate(jaxrpcMapping.getAbsolutePath(), toolsDir + "/jaxrpc-mapping.xml");
+
+ Element exp = DOMUtils.parse(getResourceFile(resourceDir + "/webservices.xml").toURL().openStream());
+ Element act = DOMUtils.parse(new File(toolsDir + "/webservices.xml").toURL().openStream());
+ assertEquals(exp, act);
}
private void compareSource(final String fileName) throws Exception
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/validation/JaxrpcMappingValidator.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/validation/JaxrpcMappingValidator.java 2008-07-17 14:33:28 UTC (rev 7843)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/validation/JaxrpcMappingValidator.java 2008-07-17 15:45:20 UTC (rev 7844)
@@ -41,7 +41,6 @@
import org.jboss.ws.metadata.jaxrpcmapping.WsdlMessageMapping;
import org.jboss.ws.metadata.jaxrpcmapping.WsdlReturnValueMapping;
import org.jboss.ws.metadata.wsdl.WSDLUtils;
-import org.jboss.wsf.test.JBossWSTest;
/**
* Validates a JAXRPC Mapping File against another
Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbpapp921/jaxrpc-mapping.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbpapp921/jaxrpc-mapping.xml (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbpapp921/jaxrpc-mapping.xml 2008-07-17 15:45:20 UTC (rev 7844)
@@ -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.jbpapp921</package-type>
+ <namespaceURI>http://org.jboss.test.ws.jbpapp921</namespaceURI>
+ </package-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jbpapp921.Models_ServiceIM_ServiceProxy</service-interface>
+ <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws.jbpapp921'>serviceNS:models_ServiceIM_ServiceProxy</wsdl-service-name>
+ <port-mapping>
+ <port-name>validationEventPort</port-name>
+ <java-port-name>validationEventPort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+ <service-endpoint-interface>org.jboss.test.ws.jbpapp921.ValidationEvent_test</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws.jbpapp921'>portTypeNS:validationEvent-test</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws.jbpapp921'>bindingNS:validationEventBinding</wsdl-binding>
+ <service-endpoint-method-mapping>
+ <java-method-name>validateClaim</java-method-name>
+ <wsdl-operation>validateClaim</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.jbpapp921'>wsdlMsgNS:ValidationEvent_validateClaim</wsdl-message>
+ <wsdl-message-part-name>lifecycleId</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <method-param-parts-mapping>
+ <param-position>1</param-position>
+ <param-type>java.lang.String</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws.jbpapp921'>wsdlMsgNS:ValidationEvent_validateClaim</wsdl-message>
+ <wsdl-message-part-name>claim</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>int</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws.jbpapp921'>wsdlMsgNS:ValidationEvent_validateClaimResponse</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/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbpapp921/jaxrpc-mapping.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbpapp921/webservices.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbpapp921/webservices.xml (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbpapp921/webservices.xml 2008-07-17 15:45:20 UTC (rev 7844)
@@ -0,0 +1,15 @@
+<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>models_ServiceIM_ServiceProxy</webservice-description-name>
+ <wsdl-file>WEB-INF/wsdl/test.wsdl</wsdl-file>
+ <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
+ <port-component>
+ <port-component-name>validationEventPort</port-component-name>
+ <wsdl-port xmlns:portNS='http://org.jboss.test.ws.jbpapp921'>portNS:validationEventPort</wsdl-port>
+ <service-endpoint-interface>org.jboss.test.ws.jbpapp921.ValidationEvent_test</service-endpoint-interface>
+ <service-impl-bean>
+ <servlet-link>TestEndpoint</servlet-link>
+ </service-impl-bean>
+ </port-component>
+ </webservice-description>
+</webservices>
\ No newline at end of file
Property changes on: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbpapp921/webservices.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbpapp921/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbpapp921/wstools-config.xml 2008-07-17 14:33:28 UTC (rev 7843)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbpapp921/wstools-config.xml 2008-07-17 15:45:20 UTC (rev 7844)
@@ -1,4 +1,6 @@
<configuration>
<wsdl-java location="@test.resources.directory(a)/tools/jbpapp921/test.wsdl">
+ <mapping file="jaxrpc-mapping.xml"/>
+ <webservices servlet-link="TestEndpoint" />
</wsdl-java>
</configuration>
\ No newline at end of file
17 years, 9 months
JBossWS SVN: r7843 - stack/native/trunk/modules/testsuite/native-tests/scripts.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2008-07-17 10:33:28 -0400 (Thu, 17 Jul 2008)
New Revision: 7843
Modified:
stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wstools.xml
Log:
Remove invalid fix.
Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wstools.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wstools.xml 2008-07-17 10:28:49 UTC (rev 7842)
+++ stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wstools.xml 2008-07-17 14:33:28 UTC (rev 7843)
@@ -26,7 +26,6 @@
</classpath>
</taskdef>
- <macro-wstools dest="tools/jbpapp921" config="tools/jbpapp921/wstools-config.xml"/>
<macro-wstools dest="jaxrpc/samples/docstyle/wrapped/WEB-INF" config="jaxrpc/samples/docstyle/wrapped/wstools-config.xml"/>
<macro-wstools dest="jaxrpc/samples/docstyle/bare/WEB-INF" config="jaxrpc/samples/docstyle/bare/wstools-config.xml"/>
<macro-wstools dest="jaxrpc/samples/dynamichandler/WEB-INF" config="jaxrpc/samples/dynamichandler/wstools-config.xml"/>
17 years, 9 months