JBossWS SVN: r2994 - branches/dlofthouse.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-05-07 17:24:49 -0400 (Mon, 07 May 2007)
New Revision: 2994
Removed:
branches/dlofthouse/JBWS-1627/
Log:
Branch no longer required.
17 years
- 1
- 0
JBossWS SVN: r2993 - trunk/build/etc.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-05-07 16:51:06 -0400 (Mon, 07 May 2007)
New Revision: 2993
Modified:
trunk/build/etc/wstools.bat
trunk/build/etc/wstools.sh
Log:
Add additional jars to wstools scripts.
Modified: trunk/build/etc/wstools.bat
===================================================================
--- trunk/build/etc/wstools.bat 2007-05-07 20:49:14 UTC (rev 2992)
+++ trunk/build/etc/wstools.bat 2007-05-07 20:51:06 UTC (rev 2993)
@@ -36,10 +36,14 @@
set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jbossall-client.jar
set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jbossretro-rt.jar
set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jboss-backport-concurrent.jar
+set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxrpc.jar.jar
+set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxws.jar
+set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jboss-saaj.jar
set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jbossws-client.jar
set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jbossws14-client.jar
set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/log4j.jar
set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/mail.jar
+set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/wsdl4j.jar
rem Display our environment
echo ========================================================================="
Modified: trunk/build/etc/wstools.sh
===================================================================
--- trunk/build/etc/wstools.sh 2007-05-07 20:49:14 UTC (rev 2992)
+++ trunk/build/etc/wstools.sh 2007-05-07 20:51:06 UTC (rev 2993)
@@ -53,10 +53,14 @@
WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jbossall-client.jar"
WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jbossretro-rt.jar"
WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jboss-backport-concurrent.jar"
+WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jboss-jaxrpc.jar"
+WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jboss-jaxws.jar"
+WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jboss-saaj.jar"
WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jbossws14-client.jar"
WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jbossws-client.jar"
WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/log4j.jar"
WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/mail.jar"
+WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/wsdl4j.jar"
# For Cygwin, switch paths to Windows format before running java
if $cygwin; then
17 years
- 1
- 0
JBossWS SVN: r2992 - branches/jbossws-2.0/build/etc.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-05-07 16:49:14 -0400 (Mon, 07 May 2007)
New Revision: 2992
Modified:
branches/jbossws-2.0/build/etc/wstools.bat
branches/jbossws-2.0/build/etc/wstools.sh
Log:
Add additional jars to wstools scripts.
Modified: branches/jbossws-2.0/build/etc/wstools.bat
===================================================================
--- branches/jbossws-2.0/build/etc/wstools.bat 2007-05-07 20:10:54 UTC (rev 2991)
+++ branches/jbossws-2.0/build/etc/wstools.bat 2007-05-07 20:49:14 UTC (rev 2992)
@@ -36,10 +36,14 @@
set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jbossall-client.jar
set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jbossretro-rt.jar
set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jboss-backport-concurrent.jar
+set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxrpc.jar.jar
+set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxws.jar
+set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jboss-saaj.jar
set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jbossws-client.jar
set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jbossws14-client.jar
set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/log4j.jar
set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/mail.jar
+set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/wsdl4j.jar
rem Display our environment
echo ========================================================================="
Modified: branches/jbossws-2.0/build/etc/wstools.sh
===================================================================
--- branches/jbossws-2.0/build/etc/wstools.sh 2007-05-07 20:10:54 UTC (rev 2991)
+++ branches/jbossws-2.0/build/etc/wstools.sh 2007-05-07 20:49:14 UTC (rev 2992)
@@ -53,10 +53,14 @@
WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jbossall-client.jar"
WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jbossretro-rt.jar"
WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jboss-backport-concurrent.jar"
+WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jboss-jaxrpc.jar"
+WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jboss-jaxws.jar"
+WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jboss-saaj.jar"
WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jbossws14-client.jar"
WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jbossws-client.jar"
WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/log4j.jar"
WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/mail.jar"
+WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/wsdl4j.jar"
# For Cygwin, switch paths to Windows format before running java
if $cygwin; then
17 years
- 1
- 0
JBossWS SVN: r2991 - branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy.
by jbossws-commits＠lists.jboss.org
Author: palin
Date: 2007-05-07 16:10:54 -0400 (Mon, 07 May 2007)
New Revision: 2991
Modified:
branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/PolicyAttachmentFragment.wsdl
Log:
Wip ws security policy...
Modified: branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/PolicyAttachmentFragment.wsdl
===================================================================
--- branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/PolicyAttachmentFragment.wsdl 2007-05-07 19:39:05 UTC (rev 2990)
+++ branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/PolicyAttachmentFragment.wsdl 2007-05-07 20:10:54 UTC (rev 2991)
@@ -12,6 +12,18 @@
xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...">
<wsp:Policy wsu:Id="X509EndpointPolicy" >
+ <sp:jboss-ws-security>
+ <sp:key-store-file>WEB-INF/wsse.keystore</sp:key-store-file>
+ <sp:key-store-password>jbossws</sp:key-store-password>
+ <sp:trust-store-file>WEB-INF/wsse.truststore</sp:trust-store-file>
+ <sp:trust-store-password>jbossws</sp:trust-store-password>
+ <sp:config>
+ <sp:encrypt type="x509v3" alias="wsse"/>
+ <sp:requires>
+ <sp:encryption/>
+ </sp:requires>
+ </sp:config>
+ </sp:jboss-ws-security>
</wsp:Policy>
<binding name='HelloBinding' type='tns:Hello'>
<soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
17 years
- 1
- 0
JBossWS SVN: r2990 - in branches/JBWS-856: jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: palin
Date: 2007-05-07 15:39:05 -0400 (Mon, 07 May 2007)
New Revision: 2990
Modified:
branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java
branches/JBWS-856/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/HelloJavaBean.java
branches/JBWS-856/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/SimpleEncryptTestCase.java
branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/META-INF/wsdl/HelloService.wsdl
branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/PolicyAttachmentFragment.wsdl
Log:
Partial commit: working on ws security policy sample
Modified: branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java
===================================================================
--- branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2007-05-07 13:03:45 UTC (rev 2989)
+++ branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2007-05-07 19:39:05 UTC (rev 2990)
@@ -482,6 +482,25 @@
}
WSDLService wsdlService = wsdlDefinitions.getService(epMetaData.getServiceMetaData().getServiceName().getLocalPart());
+
+ System.out.println("****** getPortName="+epMetaData.getPortName());
+ System.out.println("****** getPortTypeName="+epMetaData.getPortTypeName());
+ System.out.println("****** get mio endpoint="+wsdlService.getEndpoint(epMetaData.getPortName()));
+ System.out.println("****** Endpoints: ");
+ for (int i=0;i<wsdlService.getEndpoints().length; i++) {
+ WSDLEndpoint end = wsdlService.getEndpoints()[i];
+ System.out.println("****** "+i+") "+end);
+ System.out.println("****** "+i+") qname: "+end.getName());
+ }
+ System.out.println("****** Interfaces: ");
+ for (int i=0;i<wsdlDefinitions.getInterfaces().length; i++) {
+ System.out.println("****** "+i+") "+wsdlDefinitions.getInterfaces()[i]);
+ }
+ System.out.println("****** Bindings: ");
+ for (int i=0;i<wsdlDefinitions.getBindings().length; i++) {
+ System.out.println("****** "+i+") "+wsdlDefinitions.getBindings()[i]);
+ }
+
WSDLEndpoint wsdlEndpoint = wsdlService.getEndpoint(epMetaData.getPortName());
WSDLInterface wsdlInterface = wsdlDefinitions.getInterface(epMetaData.getPortTypeName());
WSDLBinding wsdlBinding = wsdlDefinitions.getBindingByInterfaceName(epMetaData.getPortTypeName());
Modified: branches/JBWS-856/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/HelloJavaBean.java
===================================================================
--- branches/JBWS-856/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/HelloJavaBean.java 2007-05-07 13:03:45 UTC (rev 2989)
+++ branches/JBWS-856/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/HelloJavaBean.java 2007-05-07 19:39:05 UTC (rev 2990)
@@ -30,7 +30,7 @@
import org.jboss.ws.annotation.EndpointConfig;
import org.jboss.ws.annotation.Policy;
-@WebService(name = "Hello", targetNamespace = "http://org.jboss.ws/samples/wssecurity")
+@WebService(name = "Hello", targetNamespace = "http://org.jboss.ws/samples/wssecuritypolicy")
@Policy(wsdlFragmentLocation="WEB-INF/PolicyAttachmentFragment.wsdl")
@SOAPBinding(style = SOAPBinding.Style.RPC)
public class HelloJavaBean
Modified: branches/JBWS-856/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/SimpleEncryptTestCase.java
===================================================================
--- branches/JBWS-856/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/SimpleEncryptTestCase.java 2007-05-07 13:03:45 UTC (rev 2989)
+++ branches/JBWS-856/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/SimpleEncryptTestCase.java 2007-05-07 19:39:05 UTC (rev 2990)
@@ -76,7 +76,7 @@
((ServiceExt)service).setSecurityConfig(securityURL.toExternalForm());
Hello port = (Hello)service.getPort(Hello.class);
- ((StubExt)port).setConfigName("Standard wssecuritypolicy Client");
+ ((StubExt)port).setConfigName("Standard WSSecurity Client");
Map<String, Object> reqContext = ((BindingProvider)port).getRequestContext();
reqContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxws-samples-wssecuritypolicy-encrypt");
Modified: branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/META-INF/wsdl/HelloService.wsdl
===================================================================
--- branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/META-INF/wsdl/HelloService.wsdl 2007-05-07 13:03:45 UTC (rev 2989)
+++ branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/META-INF/wsdl/HelloService.wsdl 2007-05-07 19:39:05 UTC (rev 2990)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='HelloService' targetNamespace='http://org.jboss.ws/samples/wssecurity' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.ws/samples/wssecurity' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+<definitions name='HelloService' targetNamespace='http://org.jboss.ws/samples/wssecuritypolicy' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.ws/samples/wssecuritypolicy' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
<types>
- <xs:schema targetNamespace='http://org.jboss.ws/samples/wssecurity' version='1.0' xmlns:xs='http://www.w3.org/2001/XMLSchema'>
+ <xs:schema targetNamespace='http://org.jboss.ws/samples/wssecuritypolicy' version='1.0' xmlns:xs='http://www.w3.org/2001/XMLSchema'>
<xs:complexType name='UserType'>
<xs:sequence>
<xs:element minOccurs='0' name='msg' type='xs:string'/>
@@ -38,4 +38,4 @@
<soap:address location='REPLACE_WITH_ACTUAL_URL'/>
</port>
</service>
-</definitions>
\ No newline at end of file
+</definitions>
Modified: branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/PolicyAttachmentFragment.wsdl
===================================================================
--- branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/PolicyAttachmentFragment.wsdl 2007-05-07 13:03:45 UTC (rev 2989)
+++ branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/PolicyAttachmentFragment.wsdl 2007-05-07 19:39:05 UTC (rev 2990)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<definitions name="TestService" targetNamespace="http://org.jboss.ws/jaxrpc"
- xmlns:tns="http://org.jboss.ws/jaxrpc"
+<definitions name="TestService" targetNamespace="http://org.jboss.ws/samples/wssecuritypolicy"
+ xmlns:tns="http://org.jboss.ws/samples/wssecuritypolicy"
xmlns="http://schemas.xmlsoap.org/wsdl/"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
@@ -11,36 +11,15 @@
xmlns:sp="http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd"
xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...">
- <wsp:Policy wsu:Id="X509EndpointPolicy" >
- <sp:jboss-ws-security>
- <sp:key-store-file>WEB-INF/wsse.keystore</sp:key-store-file>
- <sp:key-store-password>jbossws</sp:key-store-password>
- <sp:trust-store-file>WEB-INF/wsse.truststore</sp:trust-store-file>
- <sp:trust-store-password>jbossws</sp:trust-store-password>
- <sp:config>
- <sp:encrypt type="x509v3" alias="wsse"/>
- <sp:requires>
- <sp:encryption/>
- </sp:requires>
- </sp:config>
- </sp:jboss-ws-security>
- </wsp:Policy>
- <binding name='HelloBinding' type='tns:Hello'>
- <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
- <wsp:PolicyReference URI="#X509EndpointPolicy" wsdl:required="true" />
- <operation name='echoUserType'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body namespace='http://org.jboss.ws/samples/wssecurity' use='literal'/>
- </input>
- <output>
- <soap:body namespace='http://org.jboss.ws/samples/wssecurity' use='literal'/>
- </output>
- </operation>
- </binding>
- <service name='HelloService'>
- <port binding='tns:HelloBinding' name='HelloPort'>
- <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
- </port>
+ <wsp:Policy wsu:Id="X509EndpointPolicy" >
+ </wsp:Policy>
+ <binding name='HelloBinding' type='tns:Hello'>
+ <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <wsp:PolicyReference URI="#X509EndpointPolicy" wsdl:required="true" />
+ </binding>
+ <service name='HelloService'>
+ <port binding='tns:HelloBinding' name='HelloPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
</service>
</definitions>
17 years
- 1
- 0
JBossWS SVN: r2989 - in branches/jbossws-1.2.1.GA_JBWS-1646: jbossws-core/src/java/org/jboss/ws/tools/helpers and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-05-07 09:03:45 -0400 (Mon, 07 May 2007)
New Revision: 2989
Added:
branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1627/
branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java
branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/
branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/NickName.java
branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/Person.java
branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/PhoneBook.wsdl
branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/PhoneBook_PortType.java
branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/TelephoneNumber.java
branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/jaxrpc-mapping.xml
branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/wstools-config.xml
Removed:
branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java
branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/NickName.java
branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/Person.java
branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/PhoneBook.wsdl
branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/PhoneBook_PortType.java
branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/TelephoneNumber.java
branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/jaxrpc-mapping.xml
branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/wstools-config.xml
Modified:
branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-core/src/java/org/jboss/ws/tools/XSDTypeToJava.java
branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
Log:
JBWS-1646 - WSDL To Java - Array Unwrapping uses incorect case to reference array type.
Modified: branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-core/src/java/org/jboss/ws/tools/XSDTypeToJava.java
===================================================================
--- branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-core/src/java/org/jboss/ws/tools/XSDTypeToJava.java 2007-05-07 10:11:53 UTC (rev 2988)
+++ branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-core/src/java/org/jboss/ws/tools/XSDTypeToJava.java 2007-05-07 13:03:45 UTC (rev 2989)
@@ -63,6 +63,7 @@
protected LiteralTypeMapping typeMapping = null;
protected WSDLUtils utils = WSDLUtils.getInstance();
protected SchemaUtils schemautils = SchemaUtils.getInstance();
+ protected WSDLUtils wsdlUtils = WSDLUtils.getInstance();
protected JavaWriter jwriter = new JavaWriter();
@@ -600,6 +601,7 @@
}
else
{
+ String temp = this.fname;
// Unwrap any array wrappers
if (SchemaUtils.isWrapperArrayType(xstypedef))
{
@@ -621,8 +623,6 @@
qn = new QName(xstypedef.getNamespace(), xstypename);
}
- String temp = this.fname;
-
if (xstypename != null && xstypedef instanceof XSComplexTypeDefinition)
{
this.fname = utils.firstLetterUpperCase(xstypename);
@@ -648,15 +648,15 @@
if (tempqn != null)
qn = tempqn;
}
- String clname = "";
+ String qualifiedClassName = "";
Class cls = typeMapping.getJavaType(qn);
VAR v = null;
if (cls != null)
{
- clname = JavaUtils.getSourceName(cls);
- String primitive = utils.getPrimitive(clname);
+ qualifiedClassName = JavaUtils.getSourceName(cls);
+ String primitive = utils.getPrimitive(qualifiedClassName);
if ((!elem.getNillable()) && primitive != null)
- clname = primitive;
+ qualifiedClassName = primitive;
}
else
{
@@ -669,14 +669,15 @@
{
String nsuri = typename.getNamespaceURI();
if (!nsuri.equals(Constants.NS_SCHEMA_XSD))
- clname = pkgname + ".";
- clname += typename.getLocalPart();
+ qualifiedClassName = pkgname + ".";
+ String className = wsdlUtils.firstLetterUpperCase(typename.getLocalPart());
+ qualifiedClassName += className;
}
else if (qn != null)
- clname = qn.getLocalPart();
+ qualifiedClassName = qn.getLocalPart();
}
- v = new VAR(Introspector.decapitalize(varstr), clname, arrayType);
+ v = new VAR(Introspector.decapitalize(varstr), qualifiedClassName, arrayType);
return v;
}
Modified: branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
===================================================================
--- branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-05-07 10:11:53 UTC (rev 2988)
+++ branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-05-07 13:03:45 UTC (rev 2989)
@@ -393,7 +393,7 @@
if (isDocStyle())
{
XSTypeDefinition xt = getXSType(input);
- addJavaXMLTypeMap(xt, input.getElement().getLocalPart(), "", "", jwm, !isDocStyle());
+ addJavaXMLTypeMap(xt, input.getElement().getLocalPart(), "", "", jwm, !isWrapped());
}
else
{
@@ -407,7 +407,7 @@
if (isDocStyle())
{
XSTypeDefinition xt = getXSType(output);
- addJavaXMLTypeMap(xt, output.getElement().getLocalPart(), "", "", jwm, false);
+ addJavaXMLTypeMap(xt, output.getElement().getLocalPart(), "", "", jwm, !isWrapped());
}
else
{
@@ -711,7 +711,7 @@
tempContainingType = containingType;
}
- addJavaXMLTypeMap(typeDefinition, xe.getName(), tempContainingElement, tempContainingType, jwm, !isDocStyle());
+ addJavaXMLTypeMap(typeDefinition, xe.getName(), tempContainingElement, tempContainingType, jwm, !isWrapped());
}
}
}
Copied: branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1627 (from rev 2985, branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1627)
Deleted: branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java 2007-05-06 22:04:32 UTC (rev 2985)
+++ branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java 2007-05-07 13:03:45 UTC (rev 2989)
@@ -1,107 +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.jbws1627;
-
-import java.io.File;
-import java.io.FilenameFilter;
-
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
-import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
-import org.jboss.ws.tools.WSTools;
-
-/**
- * Test case for http://jira.jboss.com/jira/browse/JBWS-1627
- *
- * WSDL to Java, Unwrapping arrays the wrong case is used to
- * reference the generated class.
- *
- * @author darran.lofthouse(a)jboss.com
- * @since 26 Apr 2007
- */
-public class JBWS1627TestCase extends JBossWSTest
-{
-
- /**
- * Test generation of the SEI.
- *
- * @throws Exception
- */
- public void testGenerate() throws Exception
- {
- String resourceDir = "resources/tools/jbws1627";
- String toolsDir = "tools/jbws1627";
- String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
- new WSTools().generate(args);
-
- File resourceDirFile = new File(resourceDir);
- String[] expectedFiles = resourceDirFile.list(new FilenameFilter() {
- public boolean accept(File dir, String name)
- {
- return name.endsWith(".java");
- }
- });
-
- for (int i = 0; i < expectedFiles.length; i++)
- {
- String currentFile = expectedFiles[i];
-
- try
- {
- compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws1627/" + currentFile);
- }
- catch (Exception e)
- {
- throw new Exception("Validation of '" + currentFile + "' failed.", e);
- }
- }
-
- File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1627");
- String[] generatedFiles = packageDir.list();
- for (int i = 0; i < generatedFiles.length; i++)
- {
- String currentFile = generatedFiles[i];
-
- boolean matched = "PhoneBookService.java".equals(currentFile);
-
- for (int j = 0; j < expectedFiles.length && (matched == false); j++)
- matched = currentFile.equals(expectedFiles[j]);
-
- assertTrue("File '" + currentFile + "' was not expected to be generated", matched);
- }
-
- JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator();
- mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml");
-
- }
-
- private static void compareSource(final String expectedName, final String generatedName) throws Exception
- {
- File expected = new File(expectedName);
- File generated = new File(generatedName);
-
- JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
- sc.validate();
- sc.validateImports();
- }
-
-}
Copied: branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java (from rev 2985, branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java)
===================================================================
--- branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java (rev 0)
+++ branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java 2007-05-07 13:03:45 UTC (rev 2989)
@@ -0,0 +1,107 @@
+/*
+ * 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.jbws1627;
+
+import java.io.File;
+import java.io.FilenameFilter;
+
+import org.jboss.test.ws.JBossWSTest;
+import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
+import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
+import org.jboss.ws.tools.WSTools;
+
+/**
+ * Test case for http://jira.jboss.com/jira/browse/JBWS-1627
+ *
+ * WSDL to Java, Unwrapping arrays the wrong case is used to
+ * reference the generated class.
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 26 Apr 2007
+ */
+public class JBWS1627TestCase extends JBossWSTest
+{
+
+ /**
+ * Test generation of the SEI.
+ *
+ * @throws Exception
+ */
+ public void testGenerate() throws Exception
+ {
+ String resourceDir = "resources/tools/jbws1627";
+ String toolsDir = "tools/jbws1627";
+ String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
+ new WSTools().generate(args);
+
+ File resourceDirFile = new File(resourceDir);
+ String[] expectedFiles = resourceDirFile.list(new FilenameFilter() {
+ public boolean accept(File dir, String name)
+ {
+ return name.endsWith(".java");
+ }
+ });
+
+ for (int i = 0; i < expectedFiles.length; i++)
+ {
+ String currentFile = expectedFiles[i];
+
+ try
+ {
+ compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws1627/" + currentFile);
+ }
+ catch (Exception e)
+ {
+ throw new Exception("Validation of '" + currentFile + "' failed.", e);
+ }
+ }
+
+ File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1627");
+ String[] generatedFiles = packageDir.list();
+ for (int i = 0; i < generatedFiles.length; i++)
+ {
+ String currentFile = generatedFiles[i];
+
+ boolean matched = "PhoneBookService.java".equals(currentFile);
+
+ for (int j = 0; j < expectedFiles.length && (matched == false); j++)
+ matched = currentFile.equals(expectedFiles[j]);
+
+ assertTrue("File '" + currentFile + "' was not expected to be generated", matched);
+ }
+
+ JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator();
+ mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml");
+
+ }
+
+ private static void compareSource(final String expectedName, final String generatedName) throws Exception
+ {
+ File expected = new File(expectedName);
+ File generated = new File(generatedName);
+
+ JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
+ sc.validate();
+ sc.validateImports();
+ }
+
+}
Copied: branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627 (from rev 2985, branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627)
Deleted: branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/NickName.java
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/NickName.java 2007-05-06 22:04:32 UTC (rev 2985)
+++ branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/NickName.java 2007-05-07 13:03:45 UTC (rev 2989)
@@ -1,27 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Sun May 06 14:14:38 CEST 2007
- *
- * 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.jbws1627;
-
-
-public class NickName
-{
-
-protected java.lang.String name;
-public NickName(){}
-
-public NickName(java.lang.String name){
-this.name=name;
-}
-public java.lang.String getName() { return name ;}
-
-public void setName(java.lang.String name){ this.name=name; }
-
-}
Copied: branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/NickName.java (from rev 2985, branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/NickName.java)
===================================================================
--- branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/NickName.java (rev 0)
+++ branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/NickName.java 2007-05-07 13:03:45 UTC (rev 2989)
@@ -0,0 +1,27 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Sun May 06 14:14:38 CEST 2007
+ *
+ * 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.jbws1627;
+
+
+public class NickName
+{
+
+protected java.lang.String name;
+public NickName(){}
+
+public NickName(java.lang.String name){
+this.name=name;
+}
+public java.lang.String getName() { return name ;}
+
+public void setName(java.lang.String name){ this.name=name; }
+
+}
Deleted: branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/Person.java
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/Person.java 2007-05-06 22:04:32 UTC (rev 2985)
+++ branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/Person.java 2007-05-07 13:03:45 UTC (rev 2989)
@@ -1,34 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Sun May 06 14:14:38 CEST 2007
- *
- * 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.jbws1627;
-
-
-public class Person
-{
-
-protected java.lang.String surname;
-
-protected org.jboss.test.ws.jbws1627.NickName[] nickNames;
-public Person(){}
-
-public Person(java.lang.String surname, org.jboss.test.ws.jbws1627.NickName[] nickNames){
-this.surname=surname;
-this.nickNames=nickNames;
-}
-public java.lang.String getSurname() { return surname ;}
-
-public void setSurname(java.lang.String surname){ this.surname=surname; }
-
-public org.jboss.test.ws.jbws1627.NickName[] getNickNames() { return nickNames ;}
-
-public void setNickNames(org.jboss.test.ws.jbws1627.NickName[] nickNames){ this.nickNames=nickNames; }
-
-}
Copied: branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/Person.java (from rev 2985, branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/Person.java)
===================================================================
--- branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/Person.java (rev 0)
+++ branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/Person.java 2007-05-07 13:03:45 UTC (rev 2989)
@@ -0,0 +1,34 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Sun May 06 14:14:38 CEST 2007
+ *
+ * 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.jbws1627;
+
+
+public class Person
+{
+
+protected java.lang.String surname;
+
+protected org.jboss.test.ws.jbws1627.NickName[] nickNames;
+public Person(){}
+
+public Person(java.lang.String surname, org.jboss.test.ws.jbws1627.NickName[] nickNames){
+this.surname=surname;
+this.nickNames=nickNames;
+}
+public java.lang.String getSurname() { return surname ;}
+
+public void setSurname(java.lang.String surname){ this.surname=surname; }
+
+public org.jboss.test.ws.jbws1627.NickName[] getNickNames() { return nickNames ;}
+
+public void setNickNames(org.jboss.test.ws.jbws1627.NickName[] nickNames){ this.nickNames=nickNames; }
+
+}
Deleted: branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/PhoneBook.wsdl
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/PhoneBook.wsdl 2007-05-06 22:04:32 UTC (rev 2985)
+++ branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/PhoneBook.wsdl 2007-05-07 13:03:45 UTC (rev 2989)
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1627'
- xmlns='http://schemas.xmlsoap.org/wsdl/'
- xmlns:ns1='http://test.jboss.org/ws/jbws1627/types'
- xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/'
- xmlns:tns='http://test.jboss.org/ws/jbws1627'
- xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
-
- <types>
- <schema targetNamespace='http://test.jboss.org/ws/jbws1627/types'
- xmlns='http://www.w3.org/2001/XMLSchema'
- xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/'
- xmlns:tns='http://test.jboss.org/ws/jbws1627/types'
- xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
-
- <complexType name='Person'>
- <sequence>
- <element name='surname' nillable='true' type='string'/>
- <element name='nickNames' nillable='true' type='tns:ArrayOf_nickNames'/>
- </sequence>
- </complexType>
-
- <complexType name='ArrayOf_nickNames'>
- <sequence>
- <element name='names' maxOccurs='unbounded' nillable='true' type='tns:nickName'/>
- </sequence>
- </complexType>
-
- <complexType name='nickName'>
- <sequence>
- <element name='name' nillable='true' type='string'/>
- </sequence>
- </complexType>
-
- <complexType name='TelephoneNumber'>
- <sequence>
- <element name='number' nillable='true' type='string'/>
- </sequence>
- </complexType>
-
- <element name='lookup' type='tns:Person'/>
- <element name='lookupResponse' type='tns:TelephoneNumber'/>
-
- </schema>
- </types>
-
- <message name='PhoneBook_lookup'>
- <part element='ns1:lookup' name='parameters'/>
- </message>
- <message name='PhoneBook_lookupResponse'>
- <part element='ns1:lookupResponse' name='result'/>
- </message>
-
- <portType name='PhoneBook'>
- <operation name='lookup'>
- <input message='tns:PhoneBook_lookup'/>
- <output message='tns:PhoneBook_lookupResponse'/>
- </operation>
- </portType>
- <binding name='PhoneBookBinding' type='tns:PhoneBook'>
- <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
- <operation name='lookup'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body use='literal'/>
- </input>
- <output>
- <soap:body use='literal'/>
- </output>
- </operation>
- </binding>
- <service name='PhoneBook'>
- <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
- <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
- </port>
- </service>
-</definitions>
Copied: branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/PhoneBook.wsdl (from rev 2985, branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/PhoneBook.wsdl)
===================================================================
--- branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/PhoneBook.wsdl (rev 0)
+++ branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/PhoneBook.wsdl 2007-05-07 13:03:45 UTC (rev 2989)
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1627'
+ xmlns='http://schemas.xmlsoap.org/wsdl/'
+ xmlns:ns1='http://test.jboss.org/ws/jbws1627/types'
+ xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/'
+ xmlns:tns='http://test.jboss.org/ws/jbws1627'
+ xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+
+ <types>
+ <schema targetNamespace='http://test.jboss.org/ws/jbws1627/types'
+ xmlns='http://www.w3.org/2001/XMLSchema'
+ xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/'
+ xmlns:tns='http://test.jboss.org/ws/jbws1627/types'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+
+ <complexType name='Person'>
+ <sequence>
+ <element name='surname' nillable='true' type='string'/>
+ <element name='nickNames' nillable='true' type='tns:ArrayOf_nickNames'/>
+ </sequence>
+ </complexType>
+
+ <complexType name='ArrayOf_nickNames'>
+ <sequence>
+ <element name='names' maxOccurs='unbounded' nillable='true' type='tns:nickName'/>
+ </sequence>
+ </complexType>
+
+ <complexType name='nickName'>
+ <sequence>
+ <element name='name' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+
+ <complexType name='TelephoneNumber'>
+ <sequence>
+ <element name='number' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+
+ <element name='lookup' type='tns:Person'/>
+ <element name='lookupResponse' type='tns:TelephoneNumber'/>
+
+ </schema>
+ </types>
+
+ <message name='PhoneBook_lookup'>
+ <part element='ns1:lookup' name='parameters'/>
+ </message>
+ <message name='PhoneBook_lookupResponse'>
+ <part element='ns1:lookupResponse' name='result'/>
+ </message>
+
+ <portType name='PhoneBook'>
+ <operation name='lookup'>
+ <input message='tns:PhoneBook_lookup'/>
+ <output message='tns:PhoneBook_lookupResponse'/>
+ </operation>
+ </portType>
+ <binding name='PhoneBookBinding' type='tns:PhoneBook'>
+ <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='lookup'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ </binding>
+ <service name='PhoneBook'>
+ <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
Deleted: branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/PhoneBook_PortType.java
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/PhoneBook_PortType.java 2007-05-06 22:04:32 UTC (rev 2985)
+++ branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/PhoneBook_PortType.java 2007-05-07 13:03:45 UTC (rev 2989)
@@ -1,15 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Sun May 06 14:14:38 CEST 2007
- *
- * 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.jbws1627;
-public interface PhoneBook_PortType extends java.rmi.Remote
-{
-
- public org.jboss.test.ws.jbws1627.TelephoneNumber lookup(org.jboss.test.ws.jbws1627.Person lookup) throws java.rmi.RemoteException;
-}
Copied: branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/PhoneBook_PortType.java (from rev 2985, branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/PhoneBook_PortType.java)
===================================================================
--- branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/PhoneBook_PortType.java (rev 0)
+++ branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/PhoneBook_PortType.java 2007-05-07 13:03:45 UTC (rev 2989)
@@ -0,0 +1,15 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Sun May 06 14:14:38 CEST 2007
+ *
+ * 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.jbws1627;
+public interface PhoneBook_PortType extends java.rmi.Remote
+{
+
+ public org.jboss.test.ws.jbws1627.TelephoneNumber lookup(org.jboss.test.ws.jbws1627.Person lookup) throws java.rmi.RemoteException;
+}
Deleted: branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/TelephoneNumber.java
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/TelephoneNumber.java 2007-05-06 22:04:32 UTC (rev 2985)
+++ branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/TelephoneNumber.java 2007-05-07 13:03:45 UTC (rev 2989)
@@ -1,27 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Sun May 06 14:14:38 CEST 2007
- *
- * 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.jbws1627;
-
-
-public class TelephoneNumber
-{
-
-protected java.lang.String number;
-public TelephoneNumber(){}
-
-public TelephoneNumber(java.lang.String number){
-this.number=number;
-}
-public java.lang.String getNumber() { return number ;}
-
-public void setNumber(java.lang.String number){ this.number=number; }
-
-}
Copied: branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/TelephoneNumber.java (from rev 2985, branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/TelephoneNumber.java)
===================================================================
--- branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/TelephoneNumber.java (rev 0)
+++ branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/TelephoneNumber.java 2007-05-07 13:03:45 UTC (rev 2989)
@@ -0,0 +1,27 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Sun May 06 14:14:38 CEST 2007
+ *
+ * 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.jbws1627;
+
+
+public class TelephoneNumber
+{
+
+protected java.lang.String number;
+public TelephoneNumber(){}
+
+public TelephoneNumber(java.lang.String number){
+this.number=number;
+}
+public java.lang.String getNumber() { return number ;}
+
+public void setNumber(java.lang.String number){ this.number=number; }
+
+}
Deleted: branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/jaxrpc-mapping.xml
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/jaxrpc-mapping.xml 2007-05-06 22:04:32 UTC (rev 2985)
+++ branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/jaxrpc-mapping.xml 2007-05-07 13:03:45 UTC (rev 2989)
@@ -1,72 +0,0 @@
-<?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.jbws1627</package-type>
- <namespaceURI>http://test.jboss.org/ws/jbws1627/types</namespaceURI>
- </package-mapping>
- <package-mapping>
- <package-type>org.jboss.test.ws.jbws1627</package-type>
- <namespaceURI>http://test.jboss.org/ws/jbws1627</namespaceURI>
- </package-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1627.Person</java-type>
- <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1627/types'>typeNS:Person</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>surname</java-variable-name>
- <xml-element-name>surname</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>nickNames</java-variable-name>
- <xml-element-name>nickNames</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1627.NickName</java-type>
- <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1627/types'>typeNS:nickName</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>name</java-variable-name>
- <xml-element-name>name</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1627.TelephoneNumber</java-type>
- <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1627/types'>typeNS:TelephoneNumber</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>number</java-variable-name>
- <xml-element-name>number</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <service-interface-mapping>
- <service-interface>org.jboss.test.ws.jbws1627.PhoneBook_Service</service-interface>
- <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1627'>serviceNS:PhoneBook</wsdl-service-name>
- <port-mapping>
- <port-name>PhoneBookPort</port-name>
- <java-port-name>PhoneBookPort</java-port-name>
- </port-mapping>
- </service-interface-mapping>
- <service-endpoint-interface-mapping>
- <service-endpoint-interface>org.jboss.test.ws.jbws1627.PhoneBook_PortType</service-endpoint-interface>
- <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1627'>portTypeNS:PhoneBook</wsdl-port-type>
- <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1627'>bindingNS:PhoneBookBinding</wsdl-binding>
- <service-endpoint-method-mapping>
- <java-method-name>lookup</java-method-name>
- <wsdl-operation>lookup</wsdl-operation>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>org.jboss.test.ws.jbws1627.Person</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1627'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
- <wsdl-message-part-name>parameters</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <wsdl-return-value-mapping>
- <method-return-value>org.jboss.test.ws.jbws1627.TelephoneNumber</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1627'>wsdlMsgNS:PhoneBook_lookupResponse</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: branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/jaxrpc-mapping.xml (from rev 2985, branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/jaxrpc-mapping.xml)
===================================================================
--- branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/jaxrpc-mapping.xml (rev 0)
+++ branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/jaxrpc-mapping.xml 2007-05-07 13:03:45 UTC (rev 2989)
@@ -0,0 +1,72 @@
+<?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.jbws1627</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1627/types</namespaceURI>
+ </package-mapping>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws1627</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1627</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1627.Person</java-type>
+ <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1627/types'>typeNS:Person</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>surname</java-variable-name>
+ <xml-element-name>surname</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>nickNames</java-variable-name>
+ <xml-element-name>nickNames</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1627.NickName</java-type>
+ <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1627/types'>typeNS:nickName</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>name</java-variable-name>
+ <xml-element-name>name</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1627.TelephoneNumber</java-type>
+ <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1627/types'>typeNS:TelephoneNumber</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>number</java-variable-name>
+ <xml-element-name>number</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jbws1627.PhoneBook_Service</service-interface>
+ <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1627'>serviceNS:PhoneBook</wsdl-service-name>
+ <port-mapping>
+ <port-name>PhoneBookPort</port-name>
+ <java-port-name>PhoneBookPort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+ <service-endpoint-interface>org.jboss.test.ws.jbws1627.PhoneBook_PortType</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1627'>portTypeNS:PhoneBook</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1627'>bindingNS:PhoneBookBinding</wsdl-binding>
+ <service-endpoint-method-mapping>
+ <java-method-name>lookup</java-method-name>
+ <wsdl-operation>lookup</wsdl-operation>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>org.jboss.test.ws.jbws1627.Person</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1627'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
+ <wsdl-message-part-name>parameters</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>org.jboss.test.ws.jbws1627.TelephoneNumber</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1627'>wsdlMsgNS:PhoneBook_lookupResponse</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
Deleted: branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/wstools-config.xml
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/wstools-config.xml 2007-05-06 22:04:32 UTC (rev 2985)
+++ branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/wstools-config.xml 2007-05-07 13:03:45 UTC (rev 2989)
@@ -1,5 +0,0 @@
-<configuration>
- <wsdl-java location="resources/tools/jbws1627/PhoneBook.wsdl" parameter-style="bare">
- <mapping file="jaxrpc-mapping.xml"/>
- </wsdl-java>
-</configuration>
Copied: branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/wstools-config.xml (from rev 2985, branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/wstools-config.xml)
===================================================================
--- branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/wstools-config.xml (rev 0)
+++ branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/wstools-config.xml 2007-05-07 13:03:45 UTC (rev 2989)
@@ -0,0 +1,5 @@
+<configuration>
+ <wsdl-java location="resources/tools/jbws1627/PhoneBook.wsdl" parameter-style="bare">
+ <mapping file="jaxrpc-mapping.xml"/>
+ </wsdl-java>
+</configuration>
17 years
- 1
- 0
JBossWS SVN: r2988 - branches.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-05-07 06:11:53 -0400 (Mon, 07 May 2007)
New Revision: 2988
Added:
branches/jbossws-1.2.1.GA_JBWS-1646/
Log:
Branch for JBWS-1646
Copied: branches/jbossws-1.2.1.GA_JBWS-1646 (from rev 2987, tags/jbossws-1.2.1.GA)
17 years
- 1
- 0
JBossWS SVN: r2987 - in branches/JBWS-856: jbossws-tests/ant-import and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: maeste
Date: 2007-05-07 05:47:19 -0400 (Mon, 07 May 2007)
New Revision: 2987
Added:
branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/PolicyAttachmentFragment.wsdl
Modified:
branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/core/server/UnifiedDeploymentInfo.java
branches/JBWS-856/jbossws-tests/ant-import/build-samples-jaxws.xml
branches/JBWS-856/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/HelloJavaBean.java
Log:
Samples work continued
Modified: branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/core/server/UnifiedDeploymentInfo.java
===================================================================
--- branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/core/server/UnifiedDeploymentInfo.java 2007-05-06 22:32:28 UTC (rev 2986)
+++ branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/core/server/UnifiedDeploymentInfo.java 2007-05-07 09:47:19 UTC (rev 2987)
@@ -114,6 +114,9 @@
if (deploymentPath.startsWith("jar:") && deploymentPath.endsWith("!/") == false)
deploymentPath += "!/";
+ if (deploymentPath.startsWith("war:") && deploymentPath.endsWith("!/") == false)
+ deploymentPath += "!/";
+
if (deploymentPath.endsWith("/") == false)
deploymentPath += "/";
Modified: branches/JBWS-856/jbossws-tests/ant-import/build-samples-jaxws.xml
===================================================================
--- branches/JBWS-856/jbossws-tests/ant-import/build-samples-jaxws.xml 2007-05-06 22:32:28 UTC (rev 2986)
+++ branches/JBWS-856/jbossws-tests/ant-import/build-samples-jaxws.xml 2007-05-07 09:47:19 UTC (rev 2987)
@@ -457,7 +457,7 @@
</webinf>
</war>
- <!-- jaxws-samples-wssecurity-encrypt -->
+ <!-- jaxws-samples-wssecuritypolicy-encrypt -->
<war warfile="${tests.output.dir}/libs/jaxws-samples-wssecuritypolicy-encrypt.war" webxml="${tests.output.dir}/resources/jaxws/samples/wssecuritypolicy/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
<include name="org/jboss/test/ws/jaxws/samples/wssecuritypolicy/Hello.class"/>
@@ -467,7 +467,7 @@
<webinf dir="${tests.output.dir}/resources/jaxws/samples/wssecuritypolicy">
<include name="wsse.keystore"/>
<include name="wsse.truststore"/>
- <include name="PolicyAttachmetFragment.wsdl"/>
+ <include name="PolicyAttachmentFragment.wsdl"/>
</webinf>
</war>
<!-- jaxws-samples-xop-doclit -->
Modified: branches/JBWS-856/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/HelloJavaBean.java
===================================================================
--- branches/JBWS-856/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/HelloJavaBean.java 2007-05-06 22:32:28 UTC (rev 2986)
+++ branches/JBWS-856/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/HelloJavaBean.java 2007-05-07 09:47:19 UTC (rev 2987)
@@ -31,7 +31,7 @@
import org.jboss.ws.annotation.Policy;
@WebService(name = "Hello", targetNamespace = "http://org.jboss.ws/samples/wssecurity")
-@Policy(wsdlFragmentLocation="file://dati/PolicyAttachmentFragment.wsdl")
+@Policy(wsdlFragmentLocation="WEB-INF/PolicyAttachmentFragment.wsdl")
@SOAPBinding(style = SOAPBinding.Style.RPC)
public class HelloJavaBean
{
Added: branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/PolicyAttachmentFragment.wsdl
===================================================================
--- branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/PolicyAttachmentFragment.wsdl (rev 0)
+++ branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/PolicyAttachmentFragment.wsdl 2007-05-07 09:47:19 UTC (rev 2987)
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<definitions name="TestService" targetNamespace="http://org.jboss.ws/jaxrpc"
+ xmlns:tns="http://org.jboss.ws/jaxrpc"
+ xmlns="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:fab="http://www.fabrikam123.example.com/stock"
+ xmlns:rmp="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"
+ xmlns:sp="http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd"
+ xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
+ xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...">
+ <wsp:Policy wsu:Id="X509EndpointPolicy" >
+ <sp:jboss-ws-security>
+ <sp:key-store-file>WEB-INF/wsse.keystore</sp:key-store-file>
+ <sp:key-store-password>jbossws</sp:key-store-password>
+ <sp:trust-store-file>WEB-INF/wsse.truststore</sp:trust-store-file>
+ <sp:trust-store-password>jbossws</sp:trust-store-password>
+ <sp:config>
+ <sp:encrypt type="x509v3" alias="wsse"/>
+ <sp:requires>
+ <sp:encryption/>
+ </sp:requires>
+ </sp:config>
+ </sp:jboss-ws-security>
+ </wsp:Policy>
+ <binding name='HelloBinding' type='tns:Hello'>
+ <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <wsp:PolicyReference URI="#X509EndpointPolicy" wsdl:required="true" />
+ <operation name='echoUserType'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body namespace='http://org.jboss.ws/samples/wssecurity' use='literal'/>
+ </input>
+ <output>
+ <soap:body namespace='http://org.jboss.ws/samples/wssecurity' use='literal'/>
+ </output>
+ </operation>
+ </binding>
+ <service name='HelloService'>
+ <port binding='tns:HelloBinding' name='HelloPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
17 years
- 1
- 0
JBossWS SVN: r2986 - in trunk: jbossws-core/src/java/org/jboss/ws/tools/helpers and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-05-06 18:32:28 -0400 (Sun, 06 May 2007)
New Revision: 2986
Added:
trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1627/
trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java
trunk/jbossws-tests/src/resources/tools/jbws1627/
trunk/jbossws-tests/src/resources/tools/jbws1627/NickName.java
trunk/jbossws-tests/src/resources/tools/jbws1627/Person.java
trunk/jbossws-tests/src/resources/tools/jbws1627/PhoneBook.wsdl
trunk/jbossws-tests/src/resources/tools/jbws1627/PhoneBook_PortType.java
trunk/jbossws-tests/src/resources/tools/jbws1627/TelephoneNumber.java
trunk/jbossws-tests/src/resources/tools/jbws1627/jaxrpc-mapping.xml
trunk/jbossws-tests/src/resources/tools/jbws1627/wstools-config.xml
Removed:
trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java
trunk/jbossws-tests/src/resources/tools/jbws1627/NickName.java
trunk/jbossws-tests/src/resources/tools/jbws1627/Person.java
trunk/jbossws-tests/src/resources/tools/jbws1627/PhoneBook.wsdl
trunk/jbossws-tests/src/resources/tools/jbws1627/PhoneBook_PortType.java
trunk/jbossws-tests/src/resources/tools/jbws1627/TelephoneNumber.java
trunk/jbossws-tests/src/resources/tools/jbws1627/jaxrpc-mapping.xml
trunk/jbossws-tests/src/resources/tools/jbws1627/wstools-config.xml
Modified:
trunk/jbossws-core/src/java/org/jboss/ws/tools/XSDTypeToJava.java
trunk/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
Log:
JBWS-1627 - WSDL To Java - Array Unwrapping uses incorect case to reference array type.
Modified: trunk/jbossws-core/src/java/org/jboss/ws/tools/XSDTypeToJava.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/tools/XSDTypeToJava.java 2007-05-06 22:04:32 UTC (rev 2985)
+++ trunk/jbossws-core/src/java/org/jboss/ws/tools/XSDTypeToJava.java 2007-05-06 22:32:28 UTC (rev 2986)
@@ -63,6 +63,7 @@
protected LiteralTypeMapping typeMapping = null;
protected WSDLUtils utils = WSDLUtils.getInstance();
protected SchemaUtils schemautils = SchemaUtils.getInstance();
+ protected WSDLUtils wsdlUtils = WSDLUtils.getInstance();
protected JavaWriter jwriter = new JavaWriter();
@@ -600,6 +601,7 @@
}
else
{
+ String temp = this.fname;
// Unwrap any array wrappers
if (SchemaUtils.isWrapperArrayType(xstypedef))
{
@@ -621,8 +623,6 @@
qn = new QName(xstypedef.getNamespace(), xstypename);
}
- String temp = this.fname;
-
if (xstypename != null && xstypedef instanceof XSComplexTypeDefinition)
{
this.fname = utils.firstLetterUpperCase(xstypename);
@@ -648,15 +648,15 @@
if (tempqn != null)
qn = tempqn;
}
- String clname = "";
+ String qualifiedClassName = "";
Class cls = typeMapping.getJavaType(qn);
VAR v = null;
if (cls != null)
{
- clname = JavaUtils.getSourceName(cls);
- String primitive = utils.getPrimitive(clname);
+ qualifiedClassName = JavaUtils.getSourceName(cls);
+ String primitive = utils.getPrimitive(qualifiedClassName);
if ((!elem.getNillable()) && primitive != null)
- clname = primitive;
+ qualifiedClassName = primitive;
}
else
{
@@ -669,14 +669,15 @@
{
String nsuri = typename.getNamespaceURI();
if (!nsuri.equals(Constants.NS_SCHEMA_XSD))
- clname = pkgname + ".";
- clname += typename.getLocalPart();
+ qualifiedClassName = pkgname + ".";
+ String className = wsdlUtils.firstLetterUpperCase(typename.getLocalPart());
+ qualifiedClassName += className;
}
else if (qn != null)
- clname = qn.getLocalPart();
+ qualifiedClassName = qn.getLocalPart();
}
- v = new VAR(Introspector.decapitalize(varstr), clname, arrayType);
+ v = new VAR(Introspector.decapitalize(varstr), qualifiedClassName, arrayType);
return v;
}
Modified: trunk/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-05-06 22:04:32 UTC (rev 2985)
+++ trunk/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-05-06 22:32:28 UTC (rev 2986)
@@ -403,7 +403,7 @@
if (isDocStyle())
{
XSTypeDefinition xt = getXSType(input);
- addJavaXMLTypeMap(xt, input.getElement().getLocalPart(), "", "", jwm, !isDocStyle());
+ addJavaXMLTypeMap(xt, input.getElement().getLocalPart(), "", "", jwm, !isWrapped());
}
else
{
@@ -417,7 +417,7 @@
if (isDocStyle())
{
XSTypeDefinition xt = getXSType(output);
- addJavaXMLTypeMap(xt, output.getElement().getLocalPart(), "", "", jwm, false);
+ addJavaXMLTypeMap(xt, output.getElement().getLocalPart(), "", "", jwm, !isWrapped());
}
else
{
@@ -721,7 +721,7 @@
tempContainingType = containingType;
}
- addJavaXMLTypeMap(typeDefinition, xe.getName(), tempContainingElement, tempContainingType, jwm, !isDocStyle());
+ addJavaXMLTypeMap(typeDefinition, xe.getName(), tempContainingElement, tempContainingType, jwm, !isWrapped());
}
}
}
Copied: trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1627 (from rev 2985, branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1627)
Deleted: trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java 2007-05-06 22:04:32 UTC (rev 2985)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java 2007-05-06 22:32:28 UTC (rev 2986)
@@ -1,107 +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.jbws1627;
-
-import java.io.File;
-import java.io.FilenameFilter;
-
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
-import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
-import org.jboss.ws.tools.WSTools;
-
-/**
- * Test case for http://jira.jboss.com/jira/browse/JBWS-1627
- *
- * WSDL to Java, Unwrapping arrays the wrong case is used to
- * reference the generated class.
- *
- * @author darran.lofthouse(a)jboss.com
- * @since 26 Apr 2007
- */
-public class JBWS1627TestCase extends JBossWSTest
-{
-
- /**
- * Test generation of the SEI.
- *
- * @throws Exception
- */
- public void testGenerate() throws Exception
- {
- String resourceDir = "resources/tools/jbws1627";
- String toolsDir = "tools/jbws1627";
- String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
- new WSTools().generate(args);
-
- File resourceDirFile = new File(resourceDir);
- String[] expectedFiles = resourceDirFile.list(new FilenameFilter() {
- public boolean accept(File dir, String name)
- {
- return name.endsWith(".java");
- }
- });
-
- for (int i = 0; i < expectedFiles.length; i++)
- {
- String currentFile = expectedFiles[i];
-
- try
- {
- compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws1627/" + currentFile);
- }
- catch (Exception e)
- {
- throw new Exception("Validation of '" + currentFile + "' failed.", e);
- }
- }
-
- File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1627");
- String[] generatedFiles = packageDir.list();
- for (int i = 0; i < generatedFiles.length; i++)
- {
- String currentFile = generatedFiles[i];
-
- boolean matched = "PhoneBookService.java".equals(currentFile);
-
- for (int j = 0; j < expectedFiles.length && (matched == false); j++)
- matched = currentFile.equals(expectedFiles[j]);
-
- assertTrue("File '" + currentFile + "' was not expected to be generated", matched);
- }
-
- JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator();
- mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml");
-
- }
-
- private static void compareSource(final String expectedName, final String generatedName) throws Exception
- {
- File expected = new File(expectedName);
- File generated = new File(generatedName);
-
- JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
- sc.validate();
- sc.validateImports();
- }
-
-}
Copied: trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java (from rev 2985, branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java)
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java (rev 0)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java 2007-05-06 22:32:28 UTC (rev 2986)
@@ -0,0 +1,107 @@
+/*
+ * 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.jbws1627;
+
+import java.io.File;
+import java.io.FilenameFilter;
+
+import org.jboss.test.ws.JBossWSTest;
+import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
+import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
+import org.jboss.ws.tools.WSTools;
+
+/**
+ * Test case for http://jira.jboss.com/jira/browse/JBWS-1627
+ *
+ * WSDL to Java, Unwrapping arrays the wrong case is used to
+ * reference the generated class.
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 26 Apr 2007
+ */
+public class JBWS1627TestCase extends JBossWSTest
+{
+
+ /**
+ * Test generation of the SEI.
+ *
+ * @throws Exception
+ */
+ public void testGenerate() throws Exception
+ {
+ String resourceDir = "resources/tools/jbws1627";
+ String toolsDir = "tools/jbws1627";
+ String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
+ new WSTools().generate(args);
+
+ File resourceDirFile = new File(resourceDir);
+ String[] expectedFiles = resourceDirFile.list(new FilenameFilter() {
+ public boolean accept(File dir, String name)
+ {
+ return name.endsWith(".java");
+ }
+ });
+
+ for (int i = 0; i < expectedFiles.length; i++)
+ {
+ String currentFile = expectedFiles[i];
+
+ try
+ {
+ compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws1627/" + currentFile);
+ }
+ catch (Exception e)
+ {
+ throw new Exception("Validation of '" + currentFile + "' failed.", e);
+ }
+ }
+
+ File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1627");
+ String[] generatedFiles = packageDir.list();
+ for (int i = 0; i < generatedFiles.length; i++)
+ {
+ String currentFile = generatedFiles[i];
+
+ boolean matched = "PhoneBookService.java".equals(currentFile);
+
+ for (int j = 0; j < expectedFiles.length && (matched == false); j++)
+ matched = currentFile.equals(expectedFiles[j]);
+
+ assertTrue("File '" + currentFile + "' was not expected to be generated", matched);
+ }
+
+ JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator();
+ mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml");
+
+ }
+
+ private static void compareSource(final String expectedName, final String generatedName) throws Exception
+ {
+ File expected = new File(expectedName);
+ File generated = new File(generatedName);
+
+ JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
+ sc.validate();
+ sc.validateImports();
+ }
+
+}
Copied: trunk/jbossws-tests/src/resources/tools/jbws1627 (from rev 2985, branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627)
Deleted: trunk/jbossws-tests/src/resources/tools/jbws1627/NickName.java
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/NickName.java 2007-05-06 22:04:32 UTC (rev 2985)
+++ trunk/jbossws-tests/src/resources/tools/jbws1627/NickName.java 2007-05-06 22:32:28 UTC (rev 2986)
@@ -1,27 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Sun May 06 14:14:38 CEST 2007
- *
- * 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.jbws1627;
-
-
-public class NickName
-{
-
-protected java.lang.String name;
-public NickName(){}
-
-public NickName(java.lang.String name){
-this.name=name;
-}
-public java.lang.String getName() { return name ;}
-
-public void setName(java.lang.String name){ this.name=name; }
-
-}
Copied: trunk/jbossws-tests/src/resources/tools/jbws1627/NickName.java (from rev 2985, branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/NickName.java)
===================================================================
--- trunk/jbossws-tests/src/resources/tools/jbws1627/NickName.java (rev 0)
+++ trunk/jbossws-tests/src/resources/tools/jbws1627/NickName.java 2007-05-06 22:32:28 UTC (rev 2986)
@@ -0,0 +1,27 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Sun May 06 14:14:38 CEST 2007
+ *
+ * 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.jbws1627;
+
+
+public class NickName
+{
+
+protected java.lang.String name;
+public NickName(){}
+
+public NickName(java.lang.String name){
+this.name=name;
+}
+public java.lang.String getName() { return name ;}
+
+public void setName(java.lang.String name){ this.name=name; }
+
+}
Deleted: trunk/jbossws-tests/src/resources/tools/jbws1627/Person.java
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/Person.java 2007-05-06 22:04:32 UTC (rev 2985)
+++ trunk/jbossws-tests/src/resources/tools/jbws1627/Person.java 2007-05-06 22:32:28 UTC (rev 2986)
@@ -1,34 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Sun May 06 14:14:38 CEST 2007
- *
- * 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.jbws1627;
-
-
-public class Person
-{
-
-protected java.lang.String surname;
-
-protected org.jboss.test.ws.jbws1627.NickName[] nickNames;
-public Person(){}
-
-public Person(java.lang.String surname, org.jboss.test.ws.jbws1627.NickName[] nickNames){
-this.surname=surname;
-this.nickNames=nickNames;
-}
-public java.lang.String getSurname() { return surname ;}
-
-public void setSurname(java.lang.String surname){ this.surname=surname; }
-
-public org.jboss.test.ws.jbws1627.NickName[] getNickNames() { return nickNames ;}
-
-public void setNickNames(org.jboss.test.ws.jbws1627.NickName[] nickNames){ this.nickNames=nickNames; }
-
-}
Copied: trunk/jbossws-tests/src/resources/tools/jbws1627/Person.java (from rev 2985, branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/Person.java)
===================================================================
--- trunk/jbossws-tests/src/resources/tools/jbws1627/Person.java (rev 0)
+++ trunk/jbossws-tests/src/resources/tools/jbws1627/Person.java 2007-05-06 22:32:28 UTC (rev 2986)
@@ -0,0 +1,34 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Sun May 06 14:14:38 CEST 2007
+ *
+ * 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.jbws1627;
+
+
+public class Person
+{
+
+protected java.lang.String surname;
+
+protected org.jboss.test.ws.jbws1627.NickName[] nickNames;
+public Person(){}
+
+public Person(java.lang.String surname, org.jboss.test.ws.jbws1627.NickName[] nickNames){
+this.surname=surname;
+this.nickNames=nickNames;
+}
+public java.lang.String getSurname() { return surname ;}
+
+public void setSurname(java.lang.String surname){ this.surname=surname; }
+
+public org.jboss.test.ws.jbws1627.NickName[] getNickNames() { return nickNames ;}
+
+public void setNickNames(org.jboss.test.ws.jbws1627.NickName[] nickNames){ this.nickNames=nickNames; }
+
+}
Deleted: trunk/jbossws-tests/src/resources/tools/jbws1627/PhoneBook.wsdl
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/PhoneBook.wsdl 2007-05-06 22:04:32 UTC (rev 2985)
+++ trunk/jbossws-tests/src/resources/tools/jbws1627/PhoneBook.wsdl 2007-05-06 22:32:28 UTC (rev 2986)
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1627'
- xmlns='http://schemas.xmlsoap.org/wsdl/'
- xmlns:ns1='http://test.jboss.org/ws/jbws1627/types'
- xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/'
- xmlns:tns='http://test.jboss.org/ws/jbws1627'
- xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
-
- <types>
- <schema targetNamespace='http://test.jboss.org/ws/jbws1627/types'
- xmlns='http://www.w3.org/2001/XMLSchema'
- xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/'
- xmlns:tns='http://test.jboss.org/ws/jbws1627/types'
- xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
-
- <complexType name='Person'>
- <sequence>
- <element name='surname' nillable='true' type='string'/>
- <element name='nickNames' nillable='true' type='tns:ArrayOf_nickNames'/>
- </sequence>
- </complexType>
-
- <complexType name='ArrayOf_nickNames'>
- <sequence>
- <element name='names' maxOccurs='unbounded' nillable='true' type='tns:nickName'/>
- </sequence>
- </complexType>
-
- <complexType name='nickName'>
- <sequence>
- <element name='name' nillable='true' type='string'/>
- </sequence>
- </complexType>
-
- <complexType name='TelephoneNumber'>
- <sequence>
- <element name='number' nillable='true' type='string'/>
- </sequence>
- </complexType>
-
- <element name='lookup' type='tns:Person'/>
- <element name='lookupResponse' type='tns:TelephoneNumber'/>
-
- </schema>
- </types>
-
- <message name='PhoneBook_lookup'>
- <part element='ns1:lookup' name='parameters'/>
- </message>
- <message name='PhoneBook_lookupResponse'>
- <part element='ns1:lookupResponse' name='result'/>
- </message>
-
- <portType name='PhoneBook'>
- <operation name='lookup'>
- <input message='tns:PhoneBook_lookup'/>
- <output message='tns:PhoneBook_lookupResponse'/>
- </operation>
- </portType>
- <binding name='PhoneBookBinding' type='tns:PhoneBook'>
- <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
- <operation name='lookup'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body use='literal'/>
- </input>
- <output>
- <soap:body use='literal'/>
- </output>
- </operation>
- </binding>
- <service name='PhoneBook'>
- <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
- <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
- </port>
- </service>
-</definitions>
Copied: trunk/jbossws-tests/src/resources/tools/jbws1627/PhoneBook.wsdl (from rev 2985, branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/PhoneBook.wsdl)
===================================================================
--- trunk/jbossws-tests/src/resources/tools/jbws1627/PhoneBook.wsdl (rev 0)
+++ trunk/jbossws-tests/src/resources/tools/jbws1627/PhoneBook.wsdl 2007-05-06 22:32:28 UTC (rev 2986)
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1627'
+ xmlns='http://schemas.xmlsoap.org/wsdl/'
+ xmlns:ns1='http://test.jboss.org/ws/jbws1627/types'
+ xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/'
+ xmlns:tns='http://test.jboss.org/ws/jbws1627'
+ xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+
+ <types>
+ <schema targetNamespace='http://test.jboss.org/ws/jbws1627/types'
+ xmlns='http://www.w3.org/2001/XMLSchema'
+ xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/'
+ xmlns:tns='http://test.jboss.org/ws/jbws1627/types'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+
+ <complexType name='Person'>
+ <sequence>
+ <element name='surname' nillable='true' type='string'/>
+ <element name='nickNames' nillable='true' type='tns:ArrayOf_nickNames'/>
+ </sequence>
+ </complexType>
+
+ <complexType name='ArrayOf_nickNames'>
+ <sequence>
+ <element name='names' maxOccurs='unbounded' nillable='true' type='tns:nickName'/>
+ </sequence>
+ </complexType>
+
+ <complexType name='nickName'>
+ <sequence>
+ <element name='name' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+
+ <complexType name='TelephoneNumber'>
+ <sequence>
+ <element name='number' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+
+ <element name='lookup' type='tns:Person'/>
+ <element name='lookupResponse' type='tns:TelephoneNumber'/>
+
+ </schema>
+ </types>
+
+ <message name='PhoneBook_lookup'>
+ <part element='ns1:lookup' name='parameters'/>
+ </message>
+ <message name='PhoneBook_lookupResponse'>
+ <part element='ns1:lookupResponse' name='result'/>
+ </message>
+
+ <portType name='PhoneBook'>
+ <operation name='lookup'>
+ <input message='tns:PhoneBook_lookup'/>
+ <output message='tns:PhoneBook_lookupResponse'/>
+ </operation>
+ </portType>
+ <binding name='PhoneBookBinding' type='tns:PhoneBook'>
+ <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='lookup'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ </binding>
+ <service name='PhoneBook'>
+ <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
Deleted: trunk/jbossws-tests/src/resources/tools/jbws1627/PhoneBook_PortType.java
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/PhoneBook_PortType.java 2007-05-06 22:04:32 UTC (rev 2985)
+++ trunk/jbossws-tests/src/resources/tools/jbws1627/PhoneBook_PortType.java 2007-05-06 22:32:28 UTC (rev 2986)
@@ -1,15 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Sun May 06 14:14:38 CEST 2007
- *
- * 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.jbws1627;
-public interface PhoneBook_PortType extends java.rmi.Remote
-{
-
- public org.jboss.test.ws.jbws1627.TelephoneNumber lookup(org.jboss.test.ws.jbws1627.Person lookup) throws java.rmi.RemoteException;
-}
Copied: trunk/jbossws-tests/src/resources/tools/jbws1627/PhoneBook_PortType.java (from rev 2985, branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/PhoneBook_PortType.java)
===================================================================
--- trunk/jbossws-tests/src/resources/tools/jbws1627/PhoneBook_PortType.java (rev 0)
+++ trunk/jbossws-tests/src/resources/tools/jbws1627/PhoneBook_PortType.java 2007-05-06 22:32:28 UTC (rev 2986)
@@ -0,0 +1,15 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Sun May 06 14:14:38 CEST 2007
+ *
+ * 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.jbws1627;
+public interface PhoneBook_PortType extends java.rmi.Remote
+{
+
+ public org.jboss.test.ws.jbws1627.TelephoneNumber lookup(org.jboss.test.ws.jbws1627.Person lookup) throws java.rmi.RemoteException;
+}
Deleted: trunk/jbossws-tests/src/resources/tools/jbws1627/TelephoneNumber.java
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/TelephoneNumber.java 2007-05-06 22:04:32 UTC (rev 2985)
+++ trunk/jbossws-tests/src/resources/tools/jbws1627/TelephoneNumber.java 2007-05-06 22:32:28 UTC (rev 2986)
@@ -1,27 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Sun May 06 14:14:38 CEST 2007
- *
- * 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.jbws1627;
-
-
-public class TelephoneNumber
-{
-
-protected java.lang.String number;
-public TelephoneNumber(){}
-
-public TelephoneNumber(java.lang.String number){
-this.number=number;
-}
-public java.lang.String getNumber() { return number ;}
-
-public void setNumber(java.lang.String number){ this.number=number; }
-
-}
Copied: trunk/jbossws-tests/src/resources/tools/jbws1627/TelephoneNumber.java (from rev 2985, branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/TelephoneNumber.java)
===================================================================
--- trunk/jbossws-tests/src/resources/tools/jbws1627/TelephoneNumber.java (rev 0)
+++ trunk/jbossws-tests/src/resources/tools/jbws1627/TelephoneNumber.java 2007-05-06 22:32:28 UTC (rev 2986)
@@ -0,0 +1,27 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Sun May 06 14:14:38 CEST 2007
+ *
+ * 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.jbws1627;
+
+
+public class TelephoneNumber
+{
+
+protected java.lang.String number;
+public TelephoneNumber(){}
+
+public TelephoneNumber(java.lang.String number){
+this.number=number;
+}
+public java.lang.String getNumber() { return number ;}
+
+public void setNumber(java.lang.String number){ this.number=number; }
+
+}
Deleted: trunk/jbossws-tests/src/resources/tools/jbws1627/jaxrpc-mapping.xml
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/jaxrpc-mapping.xml 2007-05-06 22:04:32 UTC (rev 2985)
+++ trunk/jbossws-tests/src/resources/tools/jbws1627/jaxrpc-mapping.xml 2007-05-06 22:32:28 UTC (rev 2986)
@@ -1,72 +0,0 @@
-<?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.jbws1627</package-type>
- <namespaceURI>http://test.jboss.org/ws/jbws1627/types</namespaceURI>
- </package-mapping>
- <package-mapping>
- <package-type>org.jboss.test.ws.jbws1627</package-type>
- <namespaceURI>http://test.jboss.org/ws/jbws1627</namespaceURI>
- </package-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1627.Person</java-type>
- <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1627/types'>typeNS:Person</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>surname</java-variable-name>
- <xml-element-name>surname</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>nickNames</java-variable-name>
- <xml-element-name>nickNames</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1627.NickName</java-type>
- <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1627/types'>typeNS:nickName</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>name</java-variable-name>
- <xml-element-name>name</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1627.TelephoneNumber</java-type>
- <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1627/types'>typeNS:TelephoneNumber</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>number</java-variable-name>
- <xml-element-name>number</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <service-interface-mapping>
- <service-interface>org.jboss.test.ws.jbws1627.PhoneBook_Service</service-interface>
- <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1627'>serviceNS:PhoneBook</wsdl-service-name>
- <port-mapping>
- <port-name>PhoneBookPort</port-name>
- <java-port-name>PhoneBookPort</java-port-name>
- </port-mapping>
- </service-interface-mapping>
- <service-endpoint-interface-mapping>
- <service-endpoint-interface>org.jboss.test.ws.jbws1627.PhoneBook_PortType</service-endpoint-interface>
- <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1627'>portTypeNS:PhoneBook</wsdl-port-type>
- <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1627'>bindingNS:PhoneBookBinding</wsdl-binding>
- <service-endpoint-method-mapping>
- <java-method-name>lookup</java-method-name>
- <wsdl-operation>lookup</wsdl-operation>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>org.jboss.test.ws.jbws1627.Person</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1627'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
- <wsdl-message-part-name>parameters</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <wsdl-return-value-mapping>
- <method-return-value>org.jboss.test.ws.jbws1627.TelephoneNumber</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1627'>wsdlMsgNS:PhoneBook_lookupResponse</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: trunk/jbossws-tests/src/resources/tools/jbws1627/jaxrpc-mapping.xml (from rev 2985, branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/jaxrpc-mapping.xml)
===================================================================
--- trunk/jbossws-tests/src/resources/tools/jbws1627/jaxrpc-mapping.xml (rev 0)
+++ trunk/jbossws-tests/src/resources/tools/jbws1627/jaxrpc-mapping.xml 2007-05-06 22:32:28 UTC (rev 2986)
@@ -0,0 +1,72 @@
+<?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.jbws1627</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1627/types</namespaceURI>
+ </package-mapping>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws1627</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1627</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1627.Person</java-type>
+ <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1627/types'>typeNS:Person</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>surname</java-variable-name>
+ <xml-element-name>surname</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>nickNames</java-variable-name>
+ <xml-element-name>nickNames</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1627.NickName</java-type>
+ <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1627/types'>typeNS:nickName</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>name</java-variable-name>
+ <xml-element-name>name</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1627.TelephoneNumber</java-type>
+ <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1627/types'>typeNS:TelephoneNumber</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>number</java-variable-name>
+ <xml-element-name>number</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jbws1627.PhoneBook_Service</service-interface>
+ <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1627'>serviceNS:PhoneBook</wsdl-service-name>
+ <port-mapping>
+ <port-name>PhoneBookPort</port-name>
+ <java-port-name>PhoneBookPort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+ <service-endpoint-interface>org.jboss.test.ws.jbws1627.PhoneBook_PortType</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1627'>portTypeNS:PhoneBook</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1627'>bindingNS:PhoneBookBinding</wsdl-binding>
+ <service-endpoint-method-mapping>
+ <java-method-name>lookup</java-method-name>
+ <wsdl-operation>lookup</wsdl-operation>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>org.jboss.test.ws.jbws1627.Person</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1627'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
+ <wsdl-message-part-name>parameters</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>org.jboss.test.ws.jbws1627.TelephoneNumber</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1627'>wsdlMsgNS:PhoneBook_lookupResponse</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
Deleted: trunk/jbossws-tests/src/resources/tools/jbws1627/wstools-config.xml
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/wstools-config.xml 2007-05-06 22:04:32 UTC (rev 2985)
+++ trunk/jbossws-tests/src/resources/tools/jbws1627/wstools-config.xml 2007-05-06 22:32:28 UTC (rev 2986)
@@ -1,5 +0,0 @@
-<configuration>
- <wsdl-java location="resources/tools/jbws1627/PhoneBook.wsdl" parameter-style="bare">
- <mapping file="jaxrpc-mapping.xml"/>
- </wsdl-java>
-</configuration>
Copied: trunk/jbossws-tests/src/resources/tools/jbws1627/wstools-config.xml (from rev 2985, branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/wstools-config.xml)
===================================================================
--- trunk/jbossws-tests/src/resources/tools/jbws1627/wstools-config.xml (rev 0)
+++ trunk/jbossws-tests/src/resources/tools/jbws1627/wstools-config.xml 2007-05-06 22:32:28 UTC (rev 2986)
@@ -0,0 +1,5 @@
+<configuration>
+ <wsdl-java location="resources/tools/jbws1627/PhoneBook.wsdl" parameter-style="bare">
+ <mapping file="jaxrpc-mapping.xml"/>
+ </wsdl-java>
+</configuration>
17 years
- 1
- 0
JBossWS SVN: r2985 - in branches/jbossws-2.0: jbossws-core/src/java/org/jboss/ws/tools/helpers and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-05-06 18:04:32 -0400 (Sun, 06 May 2007)
New Revision: 2985
Added:
branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1627/
branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/NickName.java
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/Person.java
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/PhoneBook.wsdl
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/PhoneBook_PortType.java
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/TelephoneNumber.java
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/jaxrpc-mapping.xml
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/wstools-config.xml
Removed:
branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/PhoneBook.wsdl
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/wstools-config.xml
Modified:
branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/tools/XSDTypeToJava.java
branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
Log:
JBWS-1627 - WSDL To Java - Array Unwrapping uses incorect case to reference array type.
Modified: branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/tools/XSDTypeToJava.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/tools/XSDTypeToJava.java 2007-05-06 21:40:39 UTC (rev 2984)
+++ branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/tools/XSDTypeToJava.java 2007-05-06 22:04:32 UTC (rev 2985)
@@ -63,6 +63,7 @@
protected LiteralTypeMapping typeMapping = null;
protected WSDLUtils utils = WSDLUtils.getInstance();
protected SchemaUtils schemautils = SchemaUtils.getInstance();
+ protected WSDLUtils wsdlUtils = WSDLUtils.getInstance();
protected JavaWriter jwriter = new JavaWriter();
@@ -600,6 +601,7 @@
}
else
{
+ String temp = this.fname;
// Unwrap any array wrappers
if (SchemaUtils.isWrapperArrayType(xstypedef))
{
@@ -621,8 +623,6 @@
qn = new QName(xstypedef.getNamespace(), xstypename);
}
- String temp = this.fname;
-
if (xstypename != null && xstypedef instanceof XSComplexTypeDefinition)
{
this.fname = utils.firstLetterUpperCase(xstypename);
@@ -648,15 +648,15 @@
if (tempqn != null)
qn = tempqn;
}
- String clname = "";
+ String qualifiedClassName = "";
Class cls = typeMapping.getJavaType(qn);
VAR v = null;
if (cls != null)
{
- clname = JavaUtils.getSourceName(cls);
- String primitive = utils.getPrimitive(clname);
+ qualifiedClassName = JavaUtils.getSourceName(cls);
+ String primitive = utils.getPrimitive(qualifiedClassName);
if ((!elem.getNillable()) && primitive != null)
- clname = primitive;
+ qualifiedClassName = primitive;
}
else
{
@@ -669,14 +669,15 @@
{
String nsuri = typename.getNamespaceURI();
if (!nsuri.equals(Constants.NS_SCHEMA_XSD))
- clname = pkgname + ".";
- clname += typename.getLocalPart();
+ qualifiedClassName = pkgname + ".";
+ String className = wsdlUtils.firstLetterUpperCase(typename.getLocalPart());
+ qualifiedClassName += className;
}
else if (qn != null)
- clname = qn.getLocalPart();
+ qualifiedClassName = qn.getLocalPart();
}
- v = new VAR(Introspector.decapitalize(varstr), clname, arrayType);
+ v = new VAR(Introspector.decapitalize(varstr), qualifiedClassName, arrayType);
return v;
}
Modified: branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-05-06 21:40:39 UTC (rev 2984)
+++ branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-05-06 22:04:32 UTC (rev 2985)
@@ -403,7 +403,7 @@
if (isDocStyle())
{
XSTypeDefinition xt = getXSType(input);
- addJavaXMLTypeMap(xt, input.getElement().getLocalPart(), "", "", jwm, !isDocStyle());
+ addJavaXMLTypeMap(xt, input.getElement().getLocalPart(), "", "", jwm, !isWrapped());
}
else
{
@@ -417,7 +417,7 @@
if (isDocStyle())
{
XSTypeDefinition xt = getXSType(output);
- addJavaXMLTypeMap(xt, output.getElement().getLocalPart(), "", "", jwm, false);
+ addJavaXMLTypeMap(xt, output.getElement().getLocalPart(), "", "", jwm, !isWrapped());
}
else
{
@@ -721,7 +721,7 @@
tempContainingType = containingType;
}
- addJavaXMLTypeMap(typeDefinition, xe.getName(), tempContainingElement, tempContainingType, jwm, !isDocStyle());
+ addJavaXMLTypeMap(typeDefinition, xe.getName(), tempContainingElement, tempContainingType, jwm, !isWrapped());
}
}
}
Copied: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1627 (from rev 2929, branches/dlofthouse/JBWS-1627/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1627)
Deleted: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java
===================================================================
--- branches/dlofthouse/JBWS-1627/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java 2007-04-26 12:07:14 UTC (rev 2929)
+++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java 2007-05-06 22:04:32 UTC (rev 2985)
@@ -1,107 +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.jbws1627;
-
-import java.io.File;
-import java.io.FilenameFilter;
-
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
-import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
-import org.jboss.ws.tools.WSTools;
-
-/**
- * Test case for http://jira.jboss.com/jira/browse/JBWS-1627
- *
- * WSDL to Java, Unwrapping arrays the wrong case is used to
- * reference the generated class.
- *
- * @author darran.lofthouse(a)jboss.com
- * @since 26 Apr 2007
- */
-public class JBWS1627TestCase extends JBossWSTest
-{
-
- /**
- * Test generation of the SEI.
- *
- * @throws Exception
- */
- public void testGenerate() throws Exception
- {
- String resourceDir = "resources/tools/jbws1627";
- String toolsDir = "tools/jbws1627";
- String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
- new WSTools().generate(args);
-
- File resourceDirFile = new File(resourceDir);
- String[] expectedFiles = resourceDirFile.list(new FilenameFilter() {
- public boolean accept(File dir, String name)
- {
- return name.endsWith(".java");
- }
- });
-
- for (int i = 0; i < expectedFiles.length; i++)
- {
- String currentFile = expectedFiles[i];
-
- try
- {
- compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws1627/" + currentFile);
- }
- catch (Exception e)
- {
- throw new Exception("Validation of '" + currentFile + "' failed.", e);
- }
- }
-
- File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1627");
- String[] generatedFiles = packageDir.list();
- for (int i = 0; i < generatedFiles.length; i++)
- {
- String currentFile = generatedFiles[i];
-
- boolean matched = "PhoneBookService.java".equals(currentFile);
-
- for (int j = 0; j < expectedFiles.length && (matched == false); j++)
- matched = currentFile.equals(expectedFiles[j]);
-
- assertTrue("File '" + currentFile + "' was not expected to be generated", matched);
- }
-
- JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator();
- mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml");
-
- }
-
- private static void compareSource(final String expectedName, final String generatedName) throws Exception
- {
- File expected = new File(expectedName);
- File generated = new File(generatedName);
-
- JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
- sc.validate();
- sc.validateImports();
- }
-
-}
Copied: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java (from rev 2929, branches/dlofthouse/JBWS-1627/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java)
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java (rev 0)
+++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java 2007-05-06 22:04:32 UTC (rev 2985)
@@ -0,0 +1,107 @@
+/*
+ * 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.jbws1627;
+
+import java.io.File;
+import java.io.FilenameFilter;
+
+import org.jboss.test.ws.JBossWSTest;
+import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
+import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
+import org.jboss.ws.tools.WSTools;
+
+/**
+ * Test case for http://jira.jboss.com/jira/browse/JBWS-1627
+ *
+ * WSDL to Java, Unwrapping arrays the wrong case is used to
+ * reference the generated class.
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 26 Apr 2007
+ */
+public class JBWS1627TestCase extends JBossWSTest
+{
+
+ /**
+ * Test generation of the SEI.
+ *
+ * @throws Exception
+ */
+ public void testGenerate() throws Exception
+ {
+ String resourceDir = "resources/tools/jbws1627";
+ String toolsDir = "tools/jbws1627";
+ String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
+ new WSTools().generate(args);
+
+ File resourceDirFile = new File(resourceDir);
+ String[] expectedFiles = resourceDirFile.list(new FilenameFilter() {
+ public boolean accept(File dir, String name)
+ {
+ return name.endsWith(".java");
+ }
+ });
+
+ for (int i = 0; i < expectedFiles.length; i++)
+ {
+ String currentFile = expectedFiles[i];
+
+ try
+ {
+ compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws1627/" + currentFile);
+ }
+ catch (Exception e)
+ {
+ throw new Exception("Validation of '" + currentFile + "' failed.", e);
+ }
+ }
+
+ File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1627");
+ String[] generatedFiles = packageDir.list();
+ for (int i = 0; i < generatedFiles.length; i++)
+ {
+ String currentFile = generatedFiles[i];
+
+ boolean matched = "PhoneBookService.java".equals(currentFile);
+
+ for (int j = 0; j < expectedFiles.length && (matched == false); j++)
+ matched = currentFile.equals(expectedFiles[j]);
+
+ assertTrue("File '" + currentFile + "' was not expected to be generated", matched);
+ }
+
+ JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator();
+ mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml");
+
+ }
+
+ private static void compareSource(final String expectedName, final String generatedName) throws Exception
+ {
+ File expected = new File(expectedName);
+ File generated = new File(generatedName);
+
+ JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
+ sc.validate();
+ sc.validateImports();
+ }
+
+}
Copied: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627 (from rev 2929, branches/dlofthouse/JBWS-1627/jbossws-tests/src/resources/tools/jbws1627)
Added: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/NickName.java
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/NickName.java (rev 0)
+++ branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/NickName.java 2007-05-06 22:04:32 UTC (rev 2985)
@@ -0,0 +1,27 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Sun May 06 14:14:38 CEST 2007
+ *
+ * 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.jbws1627;
+
+
+public class NickName
+{
+
+protected java.lang.String name;
+public NickName(){}
+
+public NickName(java.lang.String name){
+this.name=name;
+}
+public java.lang.String getName() { return name ;}
+
+public void setName(java.lang.String name){ this.name=name; }
+
+}
Property changes on: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/NickName.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/Person.java
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/Person.java (rev 0)
+++ branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/Person.java 2007-05-06 22:04:32 UTC (rev 2985)
@@ -0,0 +1,34 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Sun May 06 14:14:38 CEST 2007
+ *
+ * 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.jbws1627;
+
+
+public class Person
+{
+
+protected java.lang.String surname;
+
+protected org.jboss.test.ws.jbws1627.NickName[] nickNames;
+public Person(){}
+
+public Person(java.lang.String surname, org.jboss.test.ws.jbws1627.NickName[] nickNames){
+this.surname=surname;
+this.nickNames=nickNames;
+}
+public java.lang.String getSurname() { return surname ;}
+
+public void setSurname(java.lang.String surname){ this.surname=surname; }
+
+public org.jboss.test.ws.jbws1627.NickName[] getNickNames() { return nickNames ;}
+
+public void setNickNames(org.jboss.test.ws.jbws1627.NickName[] nickNames){ this.nickNames=nickNames; }
+
+}
Property changes on: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/Person.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/PhoneBook.wsdl
===================================================================
--- branches/dlofthouse/JBWS-1627/jbossws-tests/src/resources/tools/jbws1627/PhoneBook.wsdl 2007-04-26 12:07:14 UTC (rev 2929)
+++ branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/PhoneBook.wsdl 2007-05-06 22:04:32 UTC (rev 2985)
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1627'
- xmlns='http://schemas.xmlsoap.org/wsdl/'
- xmlns:ns1='http://test.jboss.org/ws/jbws1627/types'
- xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/'
- xmlns:tns='http://test.jboss.org/ws/jbws1627'
- xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
-
- <types>
- <schema targetNamespace='http://test.jboss.org/ws/jbws1627/types'
- xmlns='http://www.w3.org/2001/XMLSchema'
- xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/'
- xmlns:tns='http://test.jboss.org/ws/jbws1627/types'
- xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
-
- <complexType name='Person'>
- <sequence>
- <element name='surname' nillable='true' type='string'/>
- <element name='nickNames' nillable='true' type='tns:ArrayOf_nickNames'/>
- </sequence>
- </complexType>
-
- <complexType name='ArrayOf_nickNames'>
- <sequence>
- <element name='names' maxOccurs='unbounded' nillable='true' type='tns:nickName'/>
- </sequence>
- </complexType>
-
- <complexType name='nickName'>
- <sequence>
- <element name='name' nillable='true' type='string'/>
- </sequence>
- </complexType>
-
- <complexType name='TelephoneNumber'>
- <sequence>
- <element name='number' nillable='true' type='string'/>
- </sequence>
- </complexType>
-
- <element name='lookup' type='tns:Person'/>
- <element name='lookupResponse' type='tns:TelephoneNumber'/>
-
- </schema>
- </types>
-
- <message name='PhoneBook_lookup'>
- <part element='ns1:lookup' name='parameters'/>
- </message>
- <message name='PhoneBook_lookupResponse'>
- <part element='ns1:lookupResponse' name='result'/>
- </message>
-
- <portType name='PhoneBook'>
- <operation name='lookup'>
- <input message='tns:PhoneBook_lookup'/>
- <output message='tns:PhoneBook_lookupResponse'/>
- </operation>
- </portType>
- <binding name='PhoneBookBinding' type='tns:PhoneBook'>
- <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
- <operation name='lookup'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body use='literal'/>
- </input>
- <output>
- <soap:body use='literal'/>
- </output>
- </operation>
- </binding>
- <service name='PhoneBook'>
- <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
- <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
- </port>
- </service>
-</definitions>
Copied: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/PhoneBook.wsdl (from rev 2929, branches/dlofthouse/JBWS-1627/jbossws-tests/src/resources/tools/jbws1627/PhoneBook.wsdl)
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/PhoneBook.wsdl (rev 0)
+++ branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/PhoneBook.wsdl 2007-05-06 22:04:32 UTC (rev 2985)
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1627'
+ xmlns='http://schemas.xmlsoap.org/wsdl/'
+ xmlns:ns1='http://test.jboss.org/ws/jbws1627/types'
+ xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/'
+ xmlns:tns='http://test.jboss.org/ws/jbws1627'
+ xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+
+ <types>
+ <schema targetNamespace='http://test.jboss.org/ws/jbws1627/types'
+ xmlns='http://www.w3.org/2001/XMLSchema'
+ xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/'
+ xmlns:tns='http://test.jboss.org/ws/jbws1627/types'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+
+ <complexType name='Person'>
+ <sequence>
+ <element name='surname' nillable='true' type='string'/>
+ <element name='nickNames' nillable='true' type='tns:ArrayOf_nickNames'/>
+ </sequence>
+ </complexType>
+
+ <complexType name='ArrayOf_nickNames'>
+ <sequence>
+ <element name='names' maxOccurs='unbounded' nillable='true' type='tns:nickName'/>
+ </sequence>
+ </complexType>
+
+ <complexType name='nickName'>
+ <sequence>
+ <element name='name' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+
+ <complexType name='TelephoneNumber'>
+ <sequence>
+ <element name='number' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+
+ <element name='lookup' type='tns:Person'/>
+ <element name='lookupResponse' type='tns:TelephoneNumber'/>
+
+ </schema>
+ </types>
+
+ <message name='PhoneBook_lookup'>
+ <part element='ns1:lookup' name='parameters'/>
+ </message>
+ <message name='PhoneBook_lookupResponse'>
+ <part element='ns1:lookupResponse' name='result'/>
+ </message>
+
+ <portType name='PhoneBook'>
+ <operation name='lookup'>
+ <input message='tns:PhoneBook_lookup'/>
+ <output message='tns:PhoneBook_lookupResponse'/>
+ </operation>
+ </portType>
+ <binding name='PhoneBookBinding' type='tns:PhoneBook'>
+ <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='lookup'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ </binding>
+ <service name='PhoneBook'>
+ <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
Added: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/PhoneBook_PortType.java
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/PhoneBook_PortType.java (rev 0)
+++ branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/PhoneBook_PortType.java 2007-05-06 22:04:32 UTC (rev 2985)
@@ -0,0 +1,15 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Sun May 06 14:14:38 CEST 2007
+ *
+ * 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.jbws1627;
+public interface PhoneBook_PortType extends java.rmi.Remote
+{
+
+ public org.jboss.test.ws.jbws1627.TelephoneNumber lookup(org.jboss.test.ws.jbws1627.Person lookup) throws java.rmi.RemoteException;
+}
Property changes on: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/PhoneBook_PortType.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/TelephoneNumber.java
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/TelephoneNumber.java (rev 0)
+++ branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/TelephoneNumber.java 2007-05-06 22:04:32 UTC (rev 2985)
@@ -0,0 +1,27 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Sun May 06 14:14:38 CEST 2007
+ *
+ * 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.jbws1627;
+
+
+public class TelephoneNumber
+{
+
+protected java.lang.String number;
+public TelephoneNumber(){}
+
+public TelephoneNumber(java.lang.String number){
+this.number=number;
+}
+public java.lang.String getNumber() { return number ;}
+
+public void setNumber(java.lang.String number){ this.number=number; }
+
+}
Property changes on: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/TelephoneNumber.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/jaxrpc-mapping.xml
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/jaxrpc-mapping.xml (rev 0)
+++ branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/jaxrpc-mapping.xml 2007-05-06 22:04:32 UTC (rev 2985)
@@ -0,0 +1,72 @@
+<?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.jbws1627</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1627/types</namespaceURI>
+ </package-mapping>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws1627</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1627</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1627.Person</java-type>
+ <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1627/types'>typeNS:Person</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>surname</java-variable-name>
+ <xml-element-name>surname</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>nickNames</java-variable-name>
+ <xml-element-name>nickNames</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1627.NickName</java-type>
+ <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1627/types'>typeNS:nickName</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>name</java-variable-name>
+ <xml-element-name>name</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1627.TelephoneNumber</java-type>
+ <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1627/types'>typeNS:TelephoneNumber</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>number</java-variable-name>
+ <xml-element-name>number</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jbws1627.PhoneBook_Service</service-interface>
+ <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1627'>serviceNS:PhoneBook</wsdl-service-name>
+ <port-mapping>
+ <port-name>PhoneBookPort</port-name>
+ <java-port-name>PhoneBookPort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+ <service-endpoint-interface>org.jboss.test.ws.jbws1627.PhoneBook_PortType</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1627'>portTypeNS:PhoneBook</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1627'>bindingNS:PhoneBookBinding</wsdl-binding>
+ <service-endpoint-method-mapping>
+ <java-method-name>lookup</java-method-name>
+ <wsdl-operation>lookup</wsdl-operation>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>org.jboss.test.ws.jbws1627.Person</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1627'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
+ <wsdl-message-part-name>parameters</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>org.jboss.test.ws.jbws1627.TelephoneNumber</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1627'>wsdlMsgNS:PhoneBook_lookupResponse</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: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/jaxrpc-mapping.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/wstools-config.xml
===================================================================
--- branches/dlofthouse/JBWS-1627/jbossws-tests/src/resources/tools/jbws1627/wstools-config.xml 2007-04-26 12:07:14 UTC (rev 2929)
+++ branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/wstools-config.xml 2007-05-06 22:04:32 UTC (rev 2985)
@@ -1,5 +0,0 @@
-<configuration>
- <wsdl-java location="resources/tools/jbws1627/PhoneBook.wsdl" parameter-style="bare">
- <mapping file="jaxrpc-mapping.xml"/>
- </wsdl-java>
-</configuration>
Copied: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/wstools-config.xml (from rev 2929, branches/dlofthouse/JBWS-1627/jbossws-tests/src/resources/tools/jbws1627/wstools-config.xml)
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/wstools-config.xml (rev 0)
+++ branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/wstools-config.xml 2007-05-06 22:04:32 UTC (rev 2985)
@@ -0,0 +1,5 @@
+<configuration>
+ <wsdl-java location="resources/tools/jbws1627/PhoneBook.wsdl" parameter-style="bare">
+ <mapping file="jaxrpc-mapping.xml"/>
+ </wsdl-java>
+</configuration>
17 years
- 1
- 0