JBossWS SVN: r5934 - stack/native/trunk/ant-import.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-03-12 05:18:51 -0400 (Wed, 12 Mar 2008)
New Revision: 5934
Modified:
stack/native/trunk/ant-import/build-deploy.xml
stack/native/trunk/ant-import/build-prepare-deploy.xml
Log:
Deploy juddi-service.sar
Modified: stack/native/trunk/ant-import/build-deploy.xml
===================================================================
--- stack/native/trunk/ant-import/build-deploy.xml 2008-03-12 09:13:27 UTC (rev 5933)
+++ stack/native/trunk/ant-import/build-deploy.xml 2008-03-12 09:18:51 UTC (rev 5934)
@@ -35,6 +35,7 @@
<copy todir="${jboss421.home}" overwrite="true">
<fileset dir="${deploy.structure.jboss42}"/>
</copy>
+ <unzip dest="${jboss421.server.deploy}/juddi-service.sar" src="${deploy.artifacts.dir}/lib/juddi-service.sar"/>
<chmod dir="${jboss421.home}/bin" perm="+x" includes="*.sh"/>
<!-- Extras for jboss-4.2.1 -->
@@ -53,6 +54,7 @@
<target name="undeploy-jboss421" depends="prepare" description="Remove jbossws from jboss421">
<fail message="Not available: ${jboss421.available.file}" unless="jboss421.available"/>
<macro-undeploy-jbossws targetdir="${jboss421.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
+ <delete dir="${jboss421.server.deploy}/juddi-service.sar"/>
</target>
<!-- ================================================================== -->
@@ -64,12 +66,14 @@
<copy todir="${jboss422.home}" overwrite="true">
<fileset dir="${deploy.structure.jboss42}"/>
</copy>
+ <unzip dest="${jboss422.server.deploy}/juddi-service.sar" src="${deploy.artifacts.dir}/lib/juddi-service.sar"/>
<chmod dir="${jboss422.home}/bin" perm="+x" includes="*.sh"/>
</target>
<target name="undeploy-jboss422" depends="prepare" description="Remove jbossws from jboss422">
<fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/>
<macro-undeploy-jbossws targetdir="${jboss422.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
+ <delete dir="${jboss422.server.deploy}/juddi-service.sar"/>
</target>
<!-- ================================================================== -->
@@ -81,12 +85,14 @@
<copy todir="${jboss423.home}" overwrite="true">
<fileset dir="${deploy.structure.jboss42}"/>
</copy>
+ <unzip dest="${jboss423.server.deploy}/juddi-service.sar" src="${deploy.artifacts.dir}/lib/juddi-service.sar"/>
<chmod dir="${jboss423.home}/bin" perm="+x" includes="*.sh"/>
</target>
<target name="undeploy-jboss423" depends="prepare" description="Remove jbossws from jboss423">
<fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/>
<macro-undeploy-jbossws targetdir="${jboss423.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
+ <delete dir="${jboss423.server.deploy}/juddi-service.sar"/>
</target>
<!-- ================================================================== -->
@@ -110,12 +116,14 @@
<copy todir="${jboss500.home}" overwrite="true">
<fileset dir="${deploy.structure.jboss50}"/>
</copy>
+ <unzip dest="${jboss500.server.deploy}/juddi-service.sar" src="${deploy.artifacts.dir}/lib/juddi-service.sar"/>
<chmod dir="${jboss500.home}/bin" perm="+x" includes="*.sh"/>
</target>
<target name="undeploy-jboss500" depends="prepare" description="Remove jbossws from jboss500">
<fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
<macro-undeploy-jbossws targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
+ <delete dir="${jboss500.server.deploy}/juddi-service.sar"/>
</target>
<!-- ================================================================== -->
@@ -127,12 +135,14 @@
<copy todir="${jboss501.home}" overwrite="true">
<fileset dir="${deploy.structure.jboss50}"/>
</copy>
+ <unzip dest="${jboss501.server.deploy}/juddi-service.sar" src="${deploy.artifacts.dir}/lib/juddi-service.sar"/>
<chmod dir="${jboss501.home}/bin" perm="+x" includes="*.sh"/>
</target>
<target name="undeploy-jboss501" depends="prepare" description="Remove jbossws from jboss501">
<fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/>
<macro-undeploy-jbossws targetdir="${jboss501.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
+ <delete dir="${jboss501.server.deploy}/juddi-service.sar"/>
</target>
<!-- ================================================================== -->
Modified: stack/native/trunk/ant-import/build-prepare-deploy.xml
===================================================================
--- stack/native/trunk/ant-import/build-prepare-deploy.xml 2008-03-12 09:13:27 UTC (rev 5933)
+++ stack/native/trunk/ant-import/build-prepare-deploy.xml 2008-03-12 09:18:51 UTC (rev 5934)
@@ -30,6 +30,7 @@
<patternset refid="jbossws.lib.endorsed.patternset"/>
<patternset refid="jbossws.server.lib.patternset"/>
<patternset refid="jbossws.service.lib.patternset"/>
+ <include name="juddi-service.sar"/>
</fileset>
<fileset dir="${core.output.lib.dir}">
<patternset refid="jbossws.client.patternset"/>
18 years, 1 month
- 1
- 0
JBossWS SVN: r5933 - in stack/native/trunk/src/test: resources/tools/jbws1217 and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: mageshbk(a)jboss.com
Date: 2008-03-12 05:13:27 -0400 (Wed, 12 Mar 2008)
New Revision: 5933
Added:
stack/native/trunk/src/test/resources/tools/jbws1217/BaseException.java
stack/native/trunk/src/test/resources/tools/jbws1217/Test.java
stack/native/trunk/src/test/resources/tools/jbws1217/TestException.java
Removed:
stack/native/trunk/src/test/resources/tools/jbws1217/BaseException.java
stack/native/trunk/src/test/resources/tools/jbws1217/MySEI.java
stack/native/trunk/src/test/resources/tools/jbws1217/MySEIService.java
stack/native/trunk/src/test/resources/tools/jbws1217/TestException.java
Modified:
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1217/JBWS1217TestCase.java
stack/native/trunk/src/test/resources/tools/jbws1217/MultiplePackageNamespace.wsdl
stack/native/trunk/src/test/resources/tools/jbws1217/jaxrpc-mapping.xml
stack/native/trunk/src/test/resources/tools/jbws1217/wstools-config.xml
Log:
[JBWS-1217] Fixed testcase to check for array types also
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1217/JBWS1217TestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1217/JBWS1217TestCase.java 2008-03-12 09:11:48 UTC (rev 5932)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1217/JBWS1217TestCase.java 2008-03-12 09:13:27 UTC (rev 5933)
@@ -44,10 +44,9 @@
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
- compareSource(resourceDir + "/MySEIService.java", toolsDir + "/org/jboss/test/ws/jbws1217/MySEIService.java");
- compareSource(resourceDir + "/MySEI.java", toolsDir + "/org/jboss/test/ws/jbws1217/MySEI.java");
- compareSource(resourceDir + "/TestException.java", toolsDir + "/com/other/exception/TestException.java");
- compareSource(resourceDir + "/BaseException.java", toolsDir + "/com/other/base/BaseException.java");
+ compareSource(resourceDir + "/Test.java", toolsDir + "/org/jboss/test/ws/jbws1217/Test.java");
+ compareSource(resourceDir + "/TestException.java", toolsDir + "/org/jboss/test/ws/jbws1217/exception/TestException.java");
+ compareSource(resourceDir + "/BaseException.java", toolsDir + "/org/jboss/test/ws/jbws1217/base/BaseException.java");
JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator();
mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml");
Deleted: stack/native/trunk/src/test/resources/tools/jbws1217/BaseException.java
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws1217/BaseException.java 2008-03-12 09:11:48 UTC (rev 5932)
+++ stack/native/trunk/src/test/resources/tools/jbws1217/BaseException.java 2008-03-12 09:13:27 UTC (rev 5933)
@@ -1,18 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Sun Feb 24 03:13:31 IST 2008
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-
-package com.other.base;
-
-
-public class BaseException
- extends Exception{
-public BaseException(){
-}
-}
Added: stack/native/trunk/src/test/resources/tools/jbws1217/BaseException.java
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws1217/BaseException.java (rev 0)
+++ stack/native/trunk/src/test/resources/tools/jbws1217/BaseException.java 2008-03-12 09:13:27 UTC (rev 5933)
@@ -0,0 +1,18 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Wed Mar 12 14:18:42 IST 2008
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1217.base;
+
+
+public class BaseException
+ extends Exception{
+public BaseException(){
+}
+}
Modified: stack/native/trunk/src/test/resources/tools/jbws1217/MultiplePackageNamespace.wsdl
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws1217/MultiplePackageNamespace.wsdl 2008-03-12 09:11:48 UTC (rev 5932)
+++ stack/native/trunk/src/test/resources/tools/jbws1217/MultiplePackageNamespace.wsdl 2008-03-12 09:13:27 UTC (rev 5933)
@@ -1,54 +1,144 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='MySEIService' targetNamespace='http://org.jboss.test.ws/jbws1217' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://other.com' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1217' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
- <types>
- <schema targetNamespace='http://other.com' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://other.com' xmlns:ns1='http://other.com.base' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
- <import namespace='http://other.com.base'/>
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='TestService' targetNamespace='http://org.jboss.test.ws.jbws1217' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://com.other.base' xmlns:ns2='http://com.other.exception' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws.jbws1217' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <schema targetNamespace='http://com.other.exception' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:ns2='http://com.other.base' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://com.other.exception' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+ <import namespace='http://com.other.base'/>
<complexType name='TestException'>
<complexContent>
- <extension base="ns1:BaseException">
- <sequence/>
+ <extension base='ns2:BaseException'>
+ <sequence/>
</extension>
</complexContent>
- </complexType>
- <element name='TestException' type='tns:TestException'/>
+ </complexType>
+ <element name='TestException' type='tns:TestException'/>
</schema>
- <schema targetNamespace='http://other.com.base' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://other.com.base' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+ <schema targetNamespace='http://com.other.base' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:ns1='http://com.other.exception' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://com.other.base' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+ <import namespace='http://com.other.exception'/>
<complexType name='BaseException'>
<sequence/>
</complexType>
- <element name="BaseException" type="tns:BaseException"/>
- </schema>
- </types>
- <message name='MySEI_testException'/>
- <message name='MySEI_testExceptionResponse'/>
- <message name='TestException'>
- <part element='ns1:TestException' name='TestException'/>
- </message>
- <portType name='MySEI'>
- <operation name='testException'>
- <input message='tns:MySEI_testException'/>
- <output message='tns:MySEI_testExceptionResponse'/>
- <fault message='tns:TestException' name='TestException'/>
- </operation>
- </portType>
- <binding name='MySEIBinding' type='tns:MySEI'>
- <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
- <operation name='testException'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body namespace='http://org.jboss.test.ws/jbws1217' use='literal'/>
- </input>
- <output>
- <soap:body namespace='http://org.jboss.test.ws/jbws1217' use='literal'/>
- </output>
- <fault name='TestException'>
- <soap:fault name='TestException' use='literal'/>
- </fault>
- </operation>
- </binding>
- <service name='MySEIService'>
- <port binding='tns:MySEIBinding' name='MySEIPort'>
- <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
- </port>
- </service>
+ <complexType name='BaseException.Array'>
+ <sequence>
+ <element maxOccurs='unbounded' minOccurs='0' name='value' nillable='true' type='tns:BaseException'/>
+ </sequence>
+ </complexType>
+ <element name='BaseException' type='tns:BaseException'/>
+ </schema>
+ </types>
+ <message name='Test_getException' xmlns='http://schemas.xmlsoap.org/wsdl/'/>
+ <message name='Test_getExceptionResponse'>
+ <part name='result' type='ns1:BaseException'/>
+ </message>
+ <message name='TestException'>
+ <part element='ns2:TestException' name='TestException'/>
+ </message>
+ <message name='Test_getExceptions'/>
+ <message name='Test_getExceptionsResponse'>
+ <part name='result' type='ns1:BaseException.Array'/>
+ </message>
+ <message name='Test_setException'>
+ <part name='BaseException_1' type='ns1:BaseException'/>
+ </message>
+ <message name='Test_setExceptionResponse'/>
+ <message name='Test_setExceptions'>
+ <part name='arrayOfBaseException_1' type='ns1:BaseException.Array'/>
+ </message>
+ <message name='Test_setExceptionsResponse'/>
+ <message name='Test_testException'/>
+ <message name='Test_testExceptionResponse'/>
+ <portType name='Test'>
+ <operation name='getException'>
+ <input message='tns:Test_getException'/>
+ <output message='tns:Test_getExceptionResponse'/>
+ <fault message='tns:TestException' name='TestException'/>
+ </operation>
+ <operation name='getExceptions'>
+ <input message='tns:Test_getExceptions'/>
+ <output message='tns:Test_getExceptionsResponse'/>
+ <fault message='tns:TestException' name='TestException'/>
+ </operation>
+ <operation name='setException' parameterOrder='BaseException_1'>
+ <input message='tns:Test_setException'/>
+ <output message='tns:Test_setExceptionResponse'/>
+ <fault message='tns:TestException' name='TestException'/>
+ </operation>
+ <operation name='setExceptions' parameterOrder='arrayOfBaseException_1'>
+ <input message='tns:Test_setExceptions'/>
+ <output message='tns:Test_setExceptionsResponse'/>
+ <fault message='tns:TestException' name='TestException'/>
+ </operation>
+ <operation name='testException'>
+ <input message='tns:Test_testException'/>
+ <output message='tns:Test_testExceptionResponse'/>
+ <fault message='tns:TestException' name='TestException'/>
+ </operation>
+ </portType>
+ <binding name='TestBinding' type='tns:Test'>
+ <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='getException'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body namespace='http://org.jboss.test.ws.jbws1217' use='literal'/>
+ </input>
+ <output>
+ <soap:body namespace='http://org.jboss.test.ws.jbws1217' use='literal'/>
+ </output>
+ <fault name='TestException'>
+ <soap:fault name='TestException' use='literal'/>
+ </fault>
+ </operation>
+ <operation name='getExceptions'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body namespace='http://org.jboss.test.ws.jbws1217' use='literal'/>
+ </input>
+ <output>
+ <soap:body namespace='http://org.jboss.test.ws.jbws1217' use='literal'/>
+ </output>
+ <fault name='TestException'>
+ <soap:fault name='TestException' use='literal'/>
+ </fault>
+ </operation>
+ <operation name='setException'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body namespace='http://org.jboss.test.ws.jbws1217' use='literal'/>
+ </input>
+ <output>
+ <soap:body namespace='http://org.jboss.test.ws.jbws1217' use='literal'/>
+ </output>
+ <fault name='TestException'>
+ <soap:fault name='TestException' use='literal'/>
+ </fault>
+ </operation>
+ <operation name='setExceptions'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body namespace='http://org.jboss.test.ws.jbws1217' use='literal'/>
+ </input>
+ <output>
+ <soap:body namespace='http://org.jboss.test.ws.jbws1217' use='literal'/>
+ </output>
+ <fault name='TestException'>
+ <soap:fault name='TestException' use='literal'/>
+ </fault>
+ </operation>
+ <operation name='testException'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body namespace='http://org.jboss.test.ws.jbws1217' use='literal'/>
+ </input>
+ <output>
+ <soap:body namespace='http://org.jboss.test.ws.jbws1217' use='literal'/>
+ </output>
+ <fault name='TestException'>
+ <soap:fault name='TestException' use='literal'/>
+ </fault>
+ </operation>
+ </binding>
+ <service name='TestService'>
+ <port binding='tns:TestBinding' name='TestPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
</definitions>
\ No newline at end of file
Deleted: stack/native/trunk/src/test/resources/tools/jbws1217/MySEI.java
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws1217/MySEI.java 2008-03-12 09:11:48 UTC (rev 5932)
+++ stack/native/trunk/src/test/resources/tools/jbws1217/MySEI.java 2008-03-12 09:13:27 UTC (rev 5933)
@@ -1,15 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Sun Feb 24 03:13:31 IST 2008
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-package org.jboss.test.ws.jbws1217;
-public interface MySEI extends java.rmi.Remote
-{
-
- public void testException() throws com.other.exception.TestException, java.rmi.RemoteException;
-}
Deleted: stack/native/trunk/src/test/resources/tools/jbws1217/MySEIService.java
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws1217/MySEIService.java 2008-03-12 09:11:48 UTC (rev 5932)
+++ stack/native/trunk/src/test/resources/tools/jbws1217/MySEIService.java 2008-03-12 09:13:27 UTC (rev 5933)
@@ -1,19 +0,0 @@
-/*
-* JBoss, the OpenSource EJB server
-* Distributable under LGPL license. See terms of license at gnu.org.
-*/
-
-//Auto Generated by jbossws - Please do not edit!!!
-
-package org.jboss.test.ws.jbws1217;
-
-
-import javax.xml.rpc.*;
-
-
-public interface MySEIService extends javax.xml.rpc.Service
-{
-
- public org.jboss.test.ws.jbws1217.MySEI getMySEIPort() throws ServiceException;
-
-}
Added: stack/native/trunk/src/test/resources/tools/jbws1217/Test.java
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws1217/Test.java (rev 0)
+++ stack/native/trunk/src/test/resources/tools/jbws1217/Test.java 2008-03-12 09:13:27 UTC (rev 5933)
@@ -0,0 +1,19 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Wed Mar 12 14:18:42 IST 2008
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+package org.jboss.test.ws.jbws1217;
+public interface Test extends java.rmi.Remote
+{
+
+ public org.jboss.test.ws.jbws1217.base.BaseException getException() throws org.jboss.test.ws.jbws1217.exception.TestException, java.rmi.RemoteException;
+ public org.jboss.test.ws.jbws1217.base.BaseException[] getExceptions() throws org.jboss.test.ws.jbws1217.exception.TestException, java.rmi.RemoteException;
+ public void setException(org.jboss.test.ws.jbws1217.base.BaseException baseException_1) throws org.jboss.test.ws.jbws1217.exception.TestException, java.rmi.RemoteException;
+ public void setExceptions(org.jboss.test.ws.jbws1217.base.BaseException[] arrayOfBaseException_1) throws org.jboss.test.ws.jbws1217.exception.TestException, java.rmi.RemoteException;
+ public void testException() throws org.jboss.test.ws.jbws1217.exception.TestException, java.rmi.RemoteException;
+}
Property changes on: stack/native/trunk/src/test/resources/tools/jbws1217/Test.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: stack/native/trunk/src/test/resources/tools/jbws1217/TestException.java
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws1217/TestException.java 2008-03-12 09:11:48 UTC (rev 5932)
+++ stack/native/trunk/src/test/resources/tools/jbws1217/TestException.java 2008-03-12 09:13:27 UTC (rev 5933)
@@ -1,18 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Sun Feb 24 03:13:31 IST 2008
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-
-package com.other.exception;
-
-
-public class TestException
- extends com.other.base.BaseException{
-public TestException(){
-}
-}
Added: stack/native/trunk/src/test/resources/tools/jbws1217/TestException.java
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws1217/TestException.java (rev 0)
+++ stack/native/trunk/src/test/resources/tools/jbws1217/TestException.java 2008-03-12 09:13:27 UTC (rev 5933)
@@ -0,0 +1,18 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Wed Mar 12 14:18:42 IST 2008
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1217.exception;
+
+
+public class TestException
+ extends org.jboss.test.ws.jbws1217.base.BaseException{
+public TestException(){
+}
+}
Modified: stack/native/trunk/src/test/resources/tools/jbws1217/jaxrpc-mapping.xml
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws1217/jaxrpc-mapping.xml 2008-03-12 09:11:48 UTC (rev 5932)
+++ stack/native/trunk/src/test/resources/tools/jbws1217/jaxrpc-mapping.xml 2008-03-12 09:13:27 UTC (rev 5933)
@@ -1,43 +1,87 @@
<?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>com.other.base</package-type>
- <namespaceURI>http://other.com.base</namespaceURI>
+ <package-type>org.jboss.test.ws.jbws1217.base</package-type>
+ <namespaceURI>http://com.other.base</namespaceURI>
</package-mapping>
<package-mapping>
<package-type>org.jboss.test.ws.jbws1217</package-type>
- <namespaceURI>http://org.jboss.test.ws/jbws1217</namespaceURI>
+ <namespaceURI>http://org.jboss.test.ws.jbws1217</namespaceURI>
</package-mapping>
<package-mapping>
- <package-type>com.other.exception</package-type>
- <namespaceURI>http://other.com</namespaceURI>
+ <package-type>org.jboss.test.ws.jbws1217.exception</package-type>
+ <namespaceURI>http://com.other.exception</namespaceURI>
</package-mapping>
<java-xml-type-mapping>
- <java-type>com.other.base.BaseException</java-type>
- <root-type-qname xmlns:typeNS='http://other.com.base'>typeNS:BaseException</root-type-qname>
+ <java-type>org.jboss.test.ws.jbws1217.base.BaseException</java-type>
+ <root-type-qname xmlns:typeNS='http://com.other.base'>typeNS:BaseException</root-type-qname>
<qname-scope>complexType</qname-scope>
</java-xml-type-mapping>
<java-xml-type-mapping>
- <java-type>com.other.exception.TestException</java-type>
- <root-type-qname xmlns:typeNS='http://other.com'>typeNS:TestException</root-type-qname>
+ <java-type>org.jboss.test.ws.jbws1217.exception.TestException</java-type>
+ <root-type-qname xmlns:typeNS='http://com.other.exception'>typeNS:TestException</root-type-qname>
<qname-scope>complexType</qname-scope>
</java-xml-type-mapping>
<exception-mapping>
- <exception-type>com.other.exception.TestException</exception-type>
- <wsdl-message xmlns:exMsgNS='http://org.jboss.test.ws/jbws1217'>exMsgNS:TestException</wsdl-message>
+ <exception-type>org.jboss.test.ws.jbws1217.exception.TestException</exception-type>
+ <wsdl-message xmlns:exMsgNS='http://org.jboss.test.ws.jbws1217'>exMsgNS:TestException</wsdl-message>
</exception-mapping>
<service-interface-mapping>
- <service-interface>org.jboss.test.ws.jbws1217.MySEIService</service-interface>
- <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1217'>serviceNS:MySEIService</wsdl-service-name>
+ <service-interface>org.jboss.test.ws.jbws1217.TestService</service-interface>
+ <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws.jbws1217'>serviceNS:TestService</wsdl-service-name>
<port-mapping>
- <port-name>MySEIPort</port-name>
- <java-port-name>MySEIPort</java-port-name>
+ <port-name>TestPort</port-name>
+ <java-port-name>TestPort</java-port-name>
</port-mapping>
</service-interface-mapping>
<service-endpoint-interface-mapping>
- <service-endpoint-interface>org.jboss.test.ws.jbws1217.MySEI</service-endpoint-interface>
- <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1217'>portTypeNS:MySEI</wsdl-port-type>
- <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1217'>bindingNS:MySEIBinding</wsdl-binding>
+ <service-endpoint-interface>org.jboss.test.ws.jbws1217.Test</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws.jbws1217'>portTypeNS:Test</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws.jbws1217'>bindingNS:TestBinding</wsdl-binding>
<service-endpoint-method-mapping>
+ <java-method-name>getException</java-method-name>
+ <wsdl-operation>getException</wsdl-operation>
+ <wsdl-return-value-mapping>
+ <method-return-value>org.jboss.test.ws.jbws1217.base.BaseException</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws.jbws1217'>wsdlMsgNS:Test_getExceptionResponse</wsdl-message>
+ <wsdl-message-part-name>result</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ <service-endpoint-method-mapping>
+ <java-method-name>getExceptions</java-method-name>
+ <wsdl-operation>getExceptions</wsdl-operation>
+ <wsdl-return-value-mapping>
+ <method-return-value>org.jboss.test.ws.jbws1217.base.BaseException[]</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws.jbws1217'>wsdlMsgNS:Test_getExceptionsResponse</wsdl-message>
+ <wsdl-message-part-name>result</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ <service-endpoint-method-mapping>
+ <java-method-name>setException</java-method-name>
+ <wsdl-operation>setException</wsdl-operation>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>org.jboss.test.ws.jbws1217.base.BaseException</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws.jbws1217'>wsdlMsgNS:Test_setException</wsdl-message>
+ <wsdl-message-part-name>BaseException_1</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ </service-endpoint-method-mapping>
+ <service-endpoint-method-mapping>
+ <java-method-name>setExceptions</java-method-name>
+ <wsdl-operation>setExceptions</wsdl-operation>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>org.jboss.test.ws.jbws1217.base.BaseException[]</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws.jbws1217'>wsdlMsgNS:Test_setExceptions</wsdl-message>
+ <wsdl-message-part-name>arrayOfBaseException_1</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ </service-endpoint-method-mapping>
+ <service-endpoint-method-mapping>
<java-method-name>testException</java-method-name>
<wsdl-operation>testException</wsdl-operation>
</service-endpoint-method-mapping>
Modified: stack/native/trunk/src/test/resources/tools/jbws1217/wstools-config.xml
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws1217/wstools-config.xml 2008-03-12 09:11:48 UTC (rev 5932)
+++ stack/native/trunk/src/test/resources/tools/jbws1217/wstools-config.xml 2008-03-12 09:13:27 UTC (rev 5933)
@@ -1,8 +1,8 @@
<configuration xmlns="http://www.jboss.org/jbossws-tools">
<global>
- <package-namespace package="com.other.exception" namespace="http://other.com"/>
- <package-namespace package="com.other.base" namespace="http://other.com.base"/>
- <package-namespace package="org.jboss.test.ws.jbws1217" namespace="http://org.jboss.test.ws/jbws1217"/>
+ <package-namespace package="org.jboss.test.ws.jbws1217.exception" namespace="http://com.other.exception"/>
+ <package-namespace package="org.jboss.test.ws.jbws1217.base" namespace="http://com.other.base"/>
+ <package-namespace package="org.jboss.test.ws.jbws1217" namespace="http://org.jboss.test.ws.jbws1217"/>
</global>
<wsdl-java location="resources/tools/jbws1217/MultiplePackageNamespace.wsdl">
<mapping file="jaxrpc-mapping.xml" />
18 years, 1 month
- 1
- 0
JBossWS SVN: r5932 - in stack/native/trunk/src/test: resources/tools/jbws2018 and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: mageshbk(a)jboss.com
Date: 2008-03-12 05:11:48 -0400 (Wed, 12 Mar 2008)
New Revision: 5932
Modified:
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws2018/Test.java
stack/native/trunk/src/test/resources/tools/jbws2018/TestService.wsdl
stack/native/trunk/src/test/resources/tools/jbws2018/jaxrpc-mapping.xml
Log:
[JBWS-2018] Added additional methods to SEI
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws2018/Test.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws2018/Test.java 2008-03-12 08:46:14 UTC (rev 5931)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws2018/Test.java 2008-03-12 09:11:48 UTC (rev 5932)
@@ -24,6 +24,7 @@
import java.rmi.Remote;
import java.rmi.RemoteException;
+import org.jboss.test.ws.jbws2018.base.BaseException;
import org.jboss.test.ws.jbws2018.exception.TestException;
/**
@@ -34,8 +35,8 @@
{
public void testException() throws TestException, RemoteException;
- public TestException getException() throws RemoteException;
- public void setException(TestException error) throws RemoteException;
- public TestException[] getExceptions() throws RemoteException;
- public void getExceptions(TestException[] errors) throws RemoteException;
+ public BaseException getException() throws TestException, RemoteException;
+ public void setException(BaseException error) throws TestException, RemoteException;
+ public BaseException[] getExceptions() throws TestException, RemoteException;
+ public void setExceptions(BaseException[] errors) throws TestException, RemoteException;
}
Modified: stack/native/trunk/src/test/resources/tools/jbws2018/TestService.wsdl
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws2018/TestService.wsdl 2008-03-12 08:46:14 UTC (rev 5931)
+++ stack/native/trunk/src/test/resources/tools/jbws2018/TestService.wsdl 2008-03-12 09:11:48 UTC (rev 5932)
@@ -10,11 +10,6 @@
</extension>
</complexContent>
</complexType>
- <complexType name='TestException.Array'>
- <sequence>
- <element maxOccurs='unbounded' minOccurs='0' name='value' nillable='true' type='tns:TestException'/>
- </sequence>
- </complexType>
<element name='TestException' type='tns:TestException'/>
</schema>
<schema targetNamespace='http://com.other.base' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:ns1='http://com.other.exception' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://com.other.base' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
@@ -22,47 +17,56 @@
<complexType name='BaseException'>
<sequence/>
</complexType>
+ <complexType name='BaseException.Array'>
+ <sequence>
+ <element maxOccurs='unbounded' minOccurs='0' name='value' nillable='true' type='tns:BaseException'/>
+ </sequence>
+ </complexType>
<element name='BaseException' type='tns:BaseException'/>
</schema>
</types>
<message name='Test_getException' xmlns='http://schemas.xmlsoap.org/wsdl/'/>
<message name='Test_getExceptionResponse'>
- <part name='result' type='ns2:TestException'/>
+ <part name='result' type='ns1:BaseException'/>
</message>
- <message name='Test_getExceptions'>
- <part name='arrayOfTestException_1' type='ns2:TestException.Array'/>
+ <message name='TestException'>
+ <part element='ns2:TestException' name='TestException'/>
</message>
- <message name='Test_getExceptionsResponse'/>
- <message name='Test_getExceptions2'/>
- <message name='Test_getExceptions2Response'>
- <part name='result' type='ns2:TestException.Array'/>
+ <message name='Test_getExceptions'/>
+ <message name='Test_getExceptionsResponse'>
+ <part name='result' type='ns1:BaseException.Array'/>
</message>
<message name='Test_setException'>
- <part name='TestException_1' type='ns2:TestException'/>
+ <part name='BaseException_1' type='ns1:BaseException'/>
</message>
<message name='Test_setExceptionResponse'/>
+ <message name='Test_setExceptions'>
+ <part name='arrayOfBaseException_1' type='ns1:BaseException.Array'/>
+ </message>
+ <message name='Test_setExceptionsResponse'/>
<message name='Test_testException'/>
<message name='Test_testExceptionResponse'/>
- <message name='TestException'>
- <part element='ns2:TestException' name='TestException'/>
- </message>
<portType name='Test'>
<operation name='getException'>
<input message='tns:Test_getException'/>
<output message='tns:Test_getExceptionResponse'/>
+ <fault message='tns:TestException' name='TestException'/>
</operation>
- <operation name='getExceptions' parameterOrder='arrayOfTestException_1'>
+ <operation name='getExceptions'>
<input message='tns:Test_getExceptions'/>
<output message='tns:Test_getExceptionsResponse'/>
+ <fault message='tns:TestException' name='TestException'/>
</operation>
- <operation name='getExceptions2'>
- <input message='tns:Test_getExceptions2'/>
- <output message='tns:Test_getExceptions2Response'/>
- </operation>
- <operation name='setException' parameterOrder='TestException_1'>
+ <operation name='setException' parameterOrder='BaseException_1'>
<input message='tns:Test_setException'/>
<output message='tns:Test_setExceptionResponse'/>
+ <fault message='tns:TestException' name='TestException'/>
</operation>
+ <operation name='setExceptions' parameterOrder='arrayOfBaseException_1'>
+ <input message='tns:Test_setExceptions'/>
+ <output message='tns:Test_setExceptionsResponse'/>
+ <fault message='tns:TestException' name='TestException'/>
+ </operation>
<operation name='testException'>
<input message='tns:Test_testException'/>
<output message='tns:Test_testExceptionResponse'/>
@@ -79,6 +83,9 @@
<output>
<soap:body namespace='http://org.jboss.test.ws.jbws2018' use='literal'/>
</output>
+ <fault name='TestException'>
+ <soap:fault name='TestException' use='literal'/>
+ </fault>
</operation>
<operation name='getExceptions'>
<soap:operation soapAction=''/>
@@ -88,8 +95,11 @@
<output>
<soap:body namespace='http://org.jboss.test.ws.jbws2018' use='literal'/>
</output>
+ <fault name='TestException'>
+ <soap:fault name='TestException' use='literal'/>
+ </fault>
</operation>
- <operation name='getExceptions2'>
+ <operation name='setException'>
<soap:operation soapAction=''/>
<input>
<soap:body namespace='http://org.jboss.test.ws.jbws2018' use='literal'/>
@@ -97,8 +107,11 @@
<output>
<soap:body namespace='http://org.jboss.test.ws.jbws2018' use='literal'/>
</output>
+ <fault name='TestException'>
+ <soap:fault name='TestException' use='literal'/>
+ </fault>
</operation>
- <operation name='setException'>
+ <operation name='setExceptions'>
<soap:operation soapAction=''/>
<input>
<soap:body namespace='http://org.jboss.test.ws.jbws2018' use='literal'/>
@@ -106,6 +119,9 @@
<output>
<soap:body namespace='http://org.jboss.test.ws.jbws2018' use='literal'/>
</output>
+ <fault name='TestException'>
+ <soap:fault name='TestException' use='literal'/>
+ </fault>
</operation>
<operation name='testException'>
<soap:operation soapAction=''/>
Modified: stack/native/trunk/src/test/resources/tools/jbws2018/jaxrpc-mapping.xml
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws2018/jaxrpc-mapping.xml 2008-03-12 08:46:14 UTC (rev 5931)
+++ stack/native/trunk/src/test/resources/tools/jbws2018/jaxrpc-mapping.xml 2008-03-12 09:11:48 UTC (rev 5932)
@@ -41,7 +41,7 @@
<java-method-name>getException</java-method-name>
<wsdl-operation>getException</wsdl-operation>
<wsdl-return-value-mapping>
- <method-return-value>org.jboss.test.ws.jbws2018.exception.TestException</method-return-value>
+ <method-return-value>org.jboss.test.ws.jbws2018.base.BaseException</method-return-value>
<wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws.jbws2018'>wsdlMsgNS:Test_getExceptionResponse</wsdl-message>
<wsdl-message-part-name>result</wsdl-message-part-name>
</wsdl-return-value-mapping>
@@ -55,10 +55,10 @@
<wsdl-operation>setException</wsdl-operation>
<method-param-parts-mapping>
<param-position>0</param-position>
- <param-type>org.jboss.test.ws.jbws2018.exception.TestException</param-type>
+ <param-type>org.jboss.test.ws.jbws2018.base.BaseException</param-type>
<wsdl-message-mapping>
<wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws.jbws2018'>wsdlMsgNS:Test_setException</wsdl-message>
- <wsdl-message-part-name>TestException_1</wsdl-message-part-name>
+ <wsdl-message-part-name>BaseException_1</wsdl-message-part-name>
<parameter-mode>IN</parameter-mode>
</wsdl-message-mapping>
</method-param-parts-mapping>
@@ -66,24 +66,24 @@
<service-endpoint-method-mapping>
<java-method-name>getExceptions</java-method-name>
<wsdl-operation>getExceptions</wsdl-operation>
+ <wsdl-return-value-mapping>
+ <method-return-value>org.jboss.test.ws.jbws2018.base.BaseException[]</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws.jbws2018'>wsdlMsgNS:Test_getExceptionsResponse</wsdl-message>
+ <wsdl-message-part-name>result</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ <service-endpoint-method-mapping>
+ <java-method-name>setExceptions</java-method-name>
+ <wsdl-operation>setExceptions</wsdl-operation>
<method-param-parts-mapping>
<param-position>0</param-position>
- <param-type>org.jboss.test.ws.jbws2018.exception.TestException[]</param-type>
+ <param-type>org.jboss.test.ws.jbws2018.base.BaseException[]</param-type>
<wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws.jbws2018'>wsdlMsgNS:Test_getExceptions</wsdl-message>
- <wsdl-message-part-name>arrayOfTestException_1</wsdl-message-part-name>
+ <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws.jbws2018'>wsdlMsgNS:Test_setExceptions</wsdl-message>
+ <wsdl-message-part-name>arrayOfBaseException_1</wsdl-message-part-name>
<parameter-mode>IN</parameter-mode>
</wsdl-message-mapping>
</method-param-parts-mapping>
</service-endpoint-method-mapping>
- <service-endpoint-method-mapping>
- <java-method-name>getExceptions</java-method-name>
- <wsdl-operation>getExceptions2</wsdl-operation>
- <wsdl-return-value-mapping>
- <method-return-value>org.jboss.test.ws.jbws2018.exception.TestException[]</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws.jbws2018'>wsdlMsgNS:Test_getExceptions2Response</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
18 years, 1 month
- 1
- 0
JBossWS SVN: r5931 - stack/native/trunk/src/main/distro.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-03-12 04:46:14 -0400 (Wed, 12 Mar 2008)
New Revision: 5931
Modified:
stack/native/trunk/src/main/distro/bin-dist-build.xml
Log:
Fix thirdparty.dir in bin-dist
Modified: stack/native/trunk/src/main/distro/bin-dist-build.xml
===================================================================
--- stack/native/trunk/src/main/distro/bin-dist-build.xml 2008-03-12 08:35:19 UTC (rev 5930)
+++ stack/native/trunk/src/main/distro/bin-dist-build.xml 2008-03-12 08:46:14 UTC (rev 5931)
@@ -12,43 +12,43 @@
<!-- $Id: bin-dist-build.xml 4081 2007-08-02 09:23:17Z thomas.diesler(a)jboss.com $ -->
<project default="main" basedir="." name="JBossWS-Native">
-
- <!-- ================================================================== -->
- <!-- Setup -->
- <!-- ================================================================== -->
-
- <property name="build.dir" value="${basedir}/build"/>
- <property name="docs.dir" value="${basedir}/docs"/>
- <property name="thirdparty.dir" value="${basedir}/deploy"/>
- <property name="tests.dir" value="${basedir}/tests"/>
- <property name="tests.output.dir" value="${basedir}/output"/>
+ <!-- ================================================================== -->
+ <!-- Setup -->
+ <!-- ================================================================== -->
+
+ <property name="build.dir" value="${basedir}/build"/>
+ <property name="docs.dir" value="${basedir}/docs"/>
+ <property name="thirdparty.dir" value="${basedir}/deploy/lib"/>
+ <property name="tests.dir" value="${basedir}/tests"/>
+ <property name="tests.output.dir" value="${basedir}/output"/>
+
<property name="deploy.artifacts.dir" value="${basedir}/deploy"/>
<property name="deploy.structure.jboss42" value="${basedir}/output/deploy-jboss42"/>
<property name="deploy.structure.jboss50" value="${basedir}/output/deploy-jboss50"/>
- <property name="jbossws.default.deploy.conf" value="${build.dir}/jbossws-default-deploy.conf"/>
+ <property name="jbossws.default.deploy.conf" value="${build.dir}/jbossws-default-deploy.conf"/>
- <property file="${basedir}/ant.properties"/>
- <property file="${basedir}/version.properties"/>
-
+ <property file="${basedir}/ant.properties"/>
+ <property file="${basedir}/version.properties"/>
+
<property name="jboss421.lib" value="${jboss421.home}/lib"/>
<property name="jboss421.client" value="${jboss421.home}/client"/>
<property name="jboss421.server" value="${jboss421.home}/server/${jboss.server.instance}"/>
<property name="jboss421.server.lib" value="${jboss421.server}/lib"/>
<property name="jboss421.server.deploy" value="${jboss421.server}/deploy"/>
-
+
<property name="jboss422.lib" value="${jboss422.home}/lib"/>
<property name="jboss422.client" value="${jboss422.home}/client"/>
<property name="jboss422.server" value="${jboss422.home}/server/${jboss.server.instance}"/>
<property name="jboss422.server.lib" value="${jboss422.server}/lib"/>
<property name="jboss422.server.deploy" value="${jboss422.server}/deploy"/>
-
+
<property name="jboss423.lib" value="${jboss423.home}/lib"/>
<property name="jboss423.client" value="${jboss423.home}/client"/>
<property name="jboss423.server" value="${jboss423.home}/server/${jboss.server.instance}"/>
<property name="jboss423.server.lib" value="${jboss423.server}/lib"/>
<property name="jboss423.server.deploy" value="${jboss423.server}/deploy"/>
-
+
<property name="jboss500.lib" value="${jboss500.home}/lib"/>
<property name="jboss500.client" value="${jboss500.home}/client"/>
<property name="jboss500.server" value="${jboss500.home}/server/${jboss.server.instance}"/>
@@ -64,7 +64,7 @@
<property name="jboss501.server.deployers" value="${jboss501.server}/deployers"/>
<property name="jboss.server.instance.${jboss.server.instance}" value="true"/>
-
+
<property name="jboss421.available.file" value="${jboss421.client}/jboss-client.jar"/>
<property name="jboss422.available.file" value="${jboss422.client}/jboss-client.jar"/>
<property name="jboss423.available.file" value="${jboss423.client}/jboss-client.jar"/>
@@ -96,96 +96,94 @@
<available classname="java.io.Console" property="HAVE_JDK_1.6"/>
<fail message="JDK1.5 or above is required" unless="HAVE_JDK_1.5"/>
-
- <import file="${basedir}/build/build-deploy.xml"/>
- <import file="${basedir}/build/build-project-gen.xml"/>
- <import file="${basedir}/build/jbossws-deploy-macros.xml"/>
- <import file="${basedir}/tests/ant-import/build-testsuite.xml"/>
-
- <!-- ================================================================== -->
- <!-- Initialization -->
- <!-- ================================================================== -->
-
- <target name="prepare">
-
- <!-- Define jboss.home -->
- <condition property="jboss.home" value="${jboss500.home}">
- <equals arg1="${jbossws.integration.target}" arg2="jboss50"/>
- </condition>
- <condition property="jboss.home" value="${jboss422.home}">
- <equals arg1="${jbossws.integration.target}" arg2="jboss42"/>
- </condition>
- <condition property="jboss.home" value="${jboss423.home}">
- <equals arg1="${jbossws.integration.target}" arg2="jboss43"/>
- </condition>
-
- <!-- Define excludesfile -->
+
+ <import file="${basedir}/build/build-deploy.xml"/>
+ <import file="${basedir}/build/build-project-gen.xml"/>
+ <import file="${basedir}/build/jbossws-deploy-macros.xml"/>
+ <import file="${basedir}/tests/ant-import/build-testsuite.xml"/>
+
+ <!-- ================================================================== -->
+ <!-- Initialization -->
+ <!-- ================================================================== -->
+
+ <target name="prepare">
+
+ <!-- Define jboss.home -->
+ <condition property="jboss.home" value="${jboss500.home}">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss50"/>
+ </condition>
+ <condition property="jboss.home" value="${jboss422.home}">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss42"/>
+ </condition>
+ <condition property="jboss.home" value="${jboss423.home}">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss43"/>
+ </condition>
+
+ <!-- Define excludesfile -->
<property name="excludesfile" value="${tests.dir}/resources/test-excludes-${jbossws.integration.target}.txt"/>
-
- </target>
-
- <target name="tests-init" depends="prepare,tests-classpath">
-
- <path id="ws.stack.classpath">
- <pathelement location="${thirdparty.dir}/jbossws-common.jar"/>
- <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-jaxrpc.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-jaxws.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-saaj.jar"/>
- <pathelement location="${thirdparty.dir}/jbossws-core.jar"/>
- <pathelement location="${thirdparty.dir}/jbossws-client.jar"/>
- </path>
-
- <path id="tests.extra.classpath">
- <pathelement location="${thirdparty.dir}/policy.jar"/>
- <pathelement location="${thirdparty.dir}/jaxws-tools.jar"/>
- <pathelement location="${thirdparty.dir}/wstx.jar"/>
- <pathelement location="${basedir}/tools/lib/junit.jar"/>
- </path>
-
- </target>
-
- <!-- ================================================================== -->
- <!-- Compile -->
- <!-- ================================================================== -->
-
- <target name="tests-compile" depends="tests-init" description="Compile sources">
- <macro-compile-classes srcdir="${tests.dir}/java" excludesfile="${excludesfile}"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Building -->
- <!-- ================================================================== -->
-
- <!-- Copy resources -->
- <target name="tests-copy-resources" depends="tests-init">
- <macro-copy-resources srcdir="${tests.dir}"/>
- </target>
-
- <target name="tests-jars" depends="tests-compile,tests-copy-resources">
- <ant antfile="${tests.dir}/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/>
- </target>
-
- <target name="tests-main" depends="tests-jars" description="Build the test deployments."/>
-
+
+ </target>
+
+ <target name="tests-init" depends="prepare,tests-classpath">
+
+ <path id="ws.stack.classpath">
+ <pathelement location="${thirdparty.dir}/jbossws-common.jar"/>
+ <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/>
+ <pathelement location="${thirdparty.dir}/jboss-jaxrpc.jar"/>
+ <pathelement location="${thirdparty.dir}/jboss-jaxws.jar"/>
+ <pathelement location="${thirdparty.dir}/jboss-saaj.jar"/>
+ <pathelement location="${thirdparty.dir}/jbossws-core.jar"/>
+ <pathelement location="${thirdparty.dir}/jbossws-client.jar"/>
+ </path>
+
+ <path id="tests.extra.classpath">
+ <pathelement location="${thirdparty.dir}/policy.jar"/>
+ <pathelement location="${thirdparty.dir}/jaxws-tools.jar"/>
+ <pathelement location="${thirdparty.dir}/wstx.jar"/>
+ <pathelement location="${basedir}/tools/lib/junit.jar"/>
+ </path>
+
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Compile -->
+ <!-- ================================================================== -->
+
+ <target name="tests-compile" depends="tests-init" description="Compile sources">
+ <macro-compile-classes srcdir="${tests.dir}/java" excludesfile="${excludesfile}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Building -->
+ <!-- ================================================================== -->
+
+ <!-- Copy resources -->
+ <target name="tests-copy-resources" depends="tests-init">
+ <macro-copy-resources srcdir="${tests.dir}"/>
+ </target>
+
+ <target name="tests-jars" depends="tests-compile,tests-copy-resources">
+ <ant antfile="${tests.dir}/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/>
+ </target>
+
+ <target name="tests-main" depends="tests-jars" description="Build the test deployments."/>
+
<!-- dummy targets -->
- <target name="jars-jboss50" depends="prepare"/>
- <target name="jars-jboss42" depends="prepare"/>
- <target name="prepare-deploy" depends="prepare"/>
+ <target name="prepare-deploy" depends="prepare"/>
- <!-- ================================================================== -->
- <!-- Miscellaneous -->
- <!-- ================================================================== -->
-
- <target name="clean" depends="prepare" description="Cleans up most generated files.">
- <delete dir="${tests.output.dir}"/>
- </target>
-
- <target name="clobber" depends="clean" description="Cleans up all generated files.">
- </target>
-
- <target name="main" depends="most" description="Executes the default target (most)."/>
-
- <target name="most" depends="tests-main" description="Builds almost everything."/>
-
-</project>
+ <!-- ================================================================== -->
+ <!-- Miscellaneous -->
+ <!-- ================================================================== -->
+
+ <target name="clean" depends="prepare" description="Cleans up most generated files.">
+ <delete dir="${tests.output.dir}"/>
+ </target>
+
+ <target name="clobber" depends="clean" description="Cleans up all generated files.">
+ </target>
+
+ <target name="main" depends="most" description="Executes the default target (most)."/>
+
+ <target name="most" depends="tests-main" description="Builds almost everything."/>
+
+</project>
\ No newline at end of file
18 years, 1 month
- 1
- 0
JBossWS SVN: r5930 - stack/native/trunk/ant-import.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-03-12 04:35:19 -0400 (Wed, 12 Mar 2008)
New Revision: 5930
Modified:
stack/native/trunk/ant-import/jbossws-deploy-macros.xml
Log:
Fix jars included in the AS42 jbossws.sar
Modified: stack/native/trunk/ant-import/jbossws-deploy-macros.xml
===================================================================
--- stack/native/trunk/ant-import/jbossws-deploy-macros.xml 2008-03-12 07:48:05 UTC (rev 5929)
+++ stack/native/trunk/ant-import/jbossws-deploy-macros.xml 2008-03-12 08:35:19 UTC (rev 5930)
@@ -14,8 +14,9 @@
<project>
<!--
- These patterns should be common for all supported containers
- Exceptions must be defined in the individual deploy macros.
+ These patterns should be common for all supported containers.
+ All jars must also be declared in component-info.xml to ensure
+ that the AS build uses the same version.
-->
<patternset id="jbossws.bin.patternset">
<include name="**/wsconsume.bat"/>
@@ -43,9 +44,11 @@
<include name="**/jboss-jaxws-ext.jar"/>
<include name="**/jboss-saaj.jar"/>
<include name="**/policy.jar"/>
+ <include name="**/stax-api.jar"/>
<include name="**/stax-ex.jar"/>
<include name="**/streambuffer.jar"/>
<include name="**/wsdl4j.jar"/>
+ <include name="**/wstx.jar"/>
</patternset>
<patternset id="jbossws.lib.patternset">
@@ -178,6 +181,10 @@
<fileset dir="@{thirdpartydir}">
<patternset refid="jbossws.service.lib.patternset"/>
<include name="**/jbossws-deploy.conf"/>
+ <include name="**/jaxb-api.jar"/>
+ <include name="**/jaxb-impl.jar"/>
+ <include name="**/stax-api.jar"/>
+ <include name="**/wstx.jar"/>
</fileset>
</copy>
<unzip dest="@{targetdir}/jbossws-context.war" overwrite="true">
18 years, 1 month
- 1
- 0
JBossWS SVN: r5929 - in stack/native/trunk/src/test: resources/tools and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: mageshbk(a)jboss.com
Date: 2008-03-12 03:48:05 -0400 (Wed, 12 Mar 2008)
New Revision: 5929
Added:
stack/native/trunk/src/test/resources/tools/jbws2018/
stack/native/trunk/src/test/resources/tools/jbws2018/TestService.wsdl
stack/native/trunk/src/test/resources/tools/jbws2018/jaxrpc-mapping.xml
stack/native/trunk/src/test/resources/tools/jbws2018/wstools-config.xml
Removed:
stack/native/trunk/src/test/resources/tools/jbws-2018/
Modified:
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws2018/JBWS2018TestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws2018/Test.java
Log:
[JBWS-2018] Fixed testcase folder name and included array types checking
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws2018/JBWS2018TestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws2018/JBWS2018TestCase.java 2008-03-12 07:43:46 UTC (rev 5928)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws2018/JBWS2018TestCase.java 2008-03-12 07:48:05 UTC (rev 5929)
@@ -39,8 +39,8 @@
{
public final void testMultiplePackageNameSpace() throws Exception
{
- String resourceDir = "resources/tools/jbws-2018";
- String toolsDir = "tools/jbws-2018";
+ String resourceDir = "resources/tools/jbws2018";
+ String toolsDir = "tools/jbws2018";
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws2018/Test.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws2018/Test.java 2008-03-12 07:43:46 UTC (rev 5928)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws2018/Test.java 2008-03-12 07:48:05 UTC (rev 5929)
@@ -34,4 +34,8 @@
{
public void testException() throws TestException, RemoteException;
+ public TestException getException() throws RemoteException;
+ public void setException(TestException error) throws RemoteException;
+ public TestException[] getExceptions() throws RemoteException;
+ public void getExceptions(TestException[] errors) throws RemoteException;
}
Added: stack/native/trunk/src/test/resources/tools/jbws2018/TestService.wsdl
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws2018/TestService.wsdl (rev 0)
+++ stack/native/trunk/src/test/resources/tools/jbws2018/TestService.wsdl 2008-03-12 07:48:05 UTC (rev 5929)
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='TestService' targetNamespace='http://org.jboss.test.ws.jbws2018' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://com.other.base' xmlns:ns2='http://com.other.exception' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws.jbws2018' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <schema targetNamespace='http://com.other.exception' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:ns2='http://com.other.base' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://com.other.exception' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+ <import namespace='http://com.other.base'/>
+ <complexType name='TestException'>
+ <complexContent>
+ <extension base='ns2:BaseException'>
+ <sequence/>
+ </extension>
+ </complexContent>
+ </complexType>
+ <complexType name='TestException.Array'>
+ <sequence>
+ <element maxOccurs='unbounded' minOccurs='0' name='value' nillable='true' type='tns:TestException'/>
+ </sequence>
+ </complexType>
+ <element name='TestException' type='tns:TestException'/>
+ </schema>
+ <schema targetNamespace='http://com.other.base' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:ns1='http://com.other.exception' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://com.other.base' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+ <import namespace='http://com.other.exception'/>
+ <complexType name='BaseException'>
+ <sequence/>
+ </complexType>
+ <element name='BaseException' type='tns:BaseException'/>
+ </schema>
+ </types>
+ <message name='Test_getException' xmlns='http://schemas.xmlsoap.org/wsdl/'/>
+ <message name='Test_getExceptionResponse'>
+ <part name='result' type='ns2:TestException'/>
+ </message>
+ <message name='Test_getExceptions'>
+ <part name='arrayOfTestException_1' type='ns2:TestException.Array'/>
+ </message>
+ <message name='Test_getExceptionsResponse'/>
+ <message name='Test_getExceptions2'/>
+ <message name='Test_getExceptions2Response'>
+ <part name='result' type='ns2:TestException.Array'/>
+ </message>
+ <message name='Test_setException'>
+ <part name='TestException_1' type='ns2:TestException'/>
+ </message>
+ <message name='Test_setExceptionResponse'/>
+ <message name='Test_testException'/>
+ <message name='Test_testExceptionResponse'/>
+ <message name='TestException'>
+ <part element='ns2:TestException' name='TestException'/>
+ </message>
+ <portType name='Test'>
+ <operation name='getException'>
+ <input message='tns:Test_getException'/>
+ <output message='tns:Test_getExceptionResponse'/>
+ </operation>
+ <operation name='getExceptions' parameterOrder='arrayOfTestException_1'>
+ <input message='tns:Test_getExceptions'/>
+ <output message='tns:Test_getExceptionsResponse'/>
+ </operation>
+ <operation name='getExceptions2'>
+ <input message='tns:Test_getExceptions2'/>
+ <output message='tns:Test_getExceptions2Response'/>
+ </operation>
+ <operation name='setException' parameterOrder='TestException_1'>
+ <input message='tns:Test_setException'/>
+ <output message='tns:Test_setExceptionResponse'/>
+ </operation>
+ <operation name='testException'>
+ <input message='tns:Test_testException'/>
+ <output message='tns:Test_testExceptionResponse'/>
+ <fault message='tns:TestException' name='TestException'/>
+ </operation>
+ </portType>
+ <binding name='TestBinding' type='tns:Test'>
+ <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='getException'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body namespace='http://org.jboss.test.ws.jbws2018' use='literal'/>
+ </input>
+ <output>
+ <soap:body namespace='http://org.jboss.test.ws.jbws2018' use='literal'/>
+ </output>
+ </operation>
+ <operation name='getExceptions'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body namespace='http://org.jboss.test.ws.jbws2018' use='literal'/>
+ </input>
+ <output>
+ <soap:body namespace='http://org.jboss.test.ws.jbws2018' use='literal'/>
+ </output>
+ </operation>
+ <operation name='getExceptions2'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body namespace='http://org.jboss.test.ws.jbws2018' use='literal'/>
+ </input>
+ <output>
+ <soap:body namespace='http://org.jboss.test.ws.jbws2018' use='literal'/>
+ </output>
+ </operation>
+ <operation name='setException'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body namespace='http://org.jboss.test.ws.jbws2018' use='literal'/>
+ </input>
+ <output>
+ <soap:body namespace='http://org.jboss.test.ws.jbws2018' use='literal'/>
+ </output>
+ </operation>
+ <operation name='testException'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body namespace='http://org.jboss.test.ws.jbws2018' use='literal'/>
+ </input>
+ <output>
+ <soap:body namespace='http://org.jboss.test.ws.jbws2018' use='literal'/>
+ </output>
+ <fault name='TestException'>
+ <soap:fault name='TestException' use='literal'/>
+ </fault>
+ </operation>
+ </binding>
+ <service name='TestService'>
+ <port binding='tns:TestBinding' name='TestPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Property changes on: stack/native/trunk/src/test/resources/tools/jbws2018/TestService.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/resources/tools/jbws2018/jaxrpc-mapping.xml
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws2018/jaxrpc-mapping.xml (rev 0)
+++ stack/native/trunk/src/test/resources/tools/jbws2018/jaxrpc-mapping.xml 2008-03-12 07:48:05 UTC (rev 5929)
@@ -0,0 +1,89 @@
+<?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.jbws2018.exception</package-type>
+ <namespaceURI>http://com.other.exception</namespaceURI>
+ </package-mapping>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws2018.base</package-type>
+ <namespaceURI>http://com.other.base</namespaceURI>
+ </package-mapping>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws2018</package-type>
+ <namespaceURI>http://org.jboss.test.ws.jbws2018</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws2018.exception.TestException</java-type>
+ <root-type-qname xmlns:typeNS='http://com.other.exception'>typeNS:TestException</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws2018.base.BaseException</java-type>
+ <root-type-qname xmlns:typeNS='http://com.other.base'>typeNS:BaseException</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ </java-xml-type-mapping>
+ <exception-mapping>
+ <exception-type>org.jboss.test.ws.jbws2018.exception.TestException</exception-type>
+ <wsdl-message xmlns:exMsgNS='http://org.jboss.test.ws.jbws2018'>exMsgNS:TestException</wsdl-message>
+ </exception-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jbws2018.TestService</service-interface>
+ <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws.jbws2018'>serviceNS:TestService</wsdl-service-name>
+ <port-mapping>
+ <port-name>TestPort</port-name>
+ <java-port-name>TestPort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+ <service-endpoint-interface>org.jboss.test.ws.jbws2018.Test</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws.jbws2018'>portTypeNS:Test</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws.jbws2018'>bindingNS:TestBinding</wsdl-binding>
+ <service-endpoint-method-mapping>
+ <java-method-name>getException</java-method-name>
+ <wsdl-operation>getException</wsdl-operation>
+ <wsdl-return-value-mapping>
+ <method-return-value>org.jboss.test.ws.jbws2018.exception.TestException</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws.jbws2018'>wsdlMsgNS:Test_getExceptionResponse</wsdl-message>
+ <wsdl-message-part-name>result</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ <service-endpoint-method-mapping>
+ <java-method-name>testException</java-method-name>
+ <wsdl-operation>testException</wsdl-operation>
+ </service-endpoint-method-mapping>
+ <service-endpoint-method-mapping>
+ <java-method-name>setException</java-method-name>
+ <wsdl-operation>setException</wsdl-operation>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>org.jboss.test.ws.jbws2018.exception.TestException</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws.jbws2018'>wsdlMsgNS:Test_setException</wsdl-message>
+ <wsdl-message-part-name>TestException_1</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ </service-endpoint-method-mapping>
+ <service-endpoint-method-mapping>
+ <java-method-name>getExceptions</java-method-name>
+ <wsdl-operation>getExceptions</wsdl-operation>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>org.jboss.test.ws.jbws2018.exception.TestException[]</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws.jbws2018'>wsdlMsgNS:Test_getExceptions</wsdl-message>
+ <wsdl-message-part-name>arrayOfTestException_1</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ </service-endpoint-method-mapping>
+ <service-endpoint-method-mapping>
+ <java-method-name>getExceptions</java-method-name>
+ <wsdl-operation>getExceptions2</wsdl-operation>
+ <wsdl-return-value-mapping>
+ <method-return-value>org.jboss.test.ws.jbws2018.exception.TestException[]</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws.jbws2018'>wsdlMsgNS:Test_getExceptions2Response</wsdl-message>
+ <wsdl-message-part-name>result</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ </service-endpoint-interface-mapping>
+</java-wsdl-mapping>
\ No newline at end of file
Property changes on: stack/native/trunk/src/test/resources/tools/jbws2018/jaxrpc-mapping.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/resources/tools/jbws2018/wstools-config.xml
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws2018/wstools-config.xml (rev 0)
+++ stack/native/trunk/src/test/resources/tools/jbws2018/wstools-config.xml 2008-03-12 07:48:05 UTC (rev 5929)
@@ -0,0 +1,16 @@
+<configuration xmlns="http://www.jboss.org/jbossws-tools"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd">
+ <global>
+ <package-namespace package="org.jboss.test.ws.jbws2018.base" namespace="http://com.other.base"/>
+ <package-namespace package="org.jboss.test.ws.jbws2018.exception" namespace="http://com.other.exception"/>
+ </global>
+
+ <java-wsdl>
+ <service name="TestService" style="rpc" endpoint="org.jboss.test.ws.jbws2018.Test"/>
+ <namespaces target-namespace="http://org.jboss.test.ws.jbws2018" type-namespace="http://org.jboss.test.ws.jbws2018"/>
+ <mapping file="jaxrpc-mapping.xml" />
+ <webservices ejb-link="TestEJB"/>
+ </java-wsdl>
+
+</configuration>
\ No newline at end of file
Property changes on: stack/native/trunk/src/test/resources/tools/jbws2018/wstools-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
18 years, 1 month
- 1
- 0
JBossWS SVN: r5928 - in stack/native/trunk/src/main/java/org/jboss/ws/tools: wsdl and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: mageshbk(a)jboss.com
Date: 2008-03-12 03:43:46 -0400 (Wed, 12 Mar 2008)
New Revision: 5928
Modified:
stack/native/trunk/src/main/java/org/jboss/ws/tools/schema/SchemaTypeCreator.java
stack/native/trunk/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java
Log:
[JBWS-2018] Fixed array types package lookup
Modified: stack/native/trunk/src/main/java/org/jboss/ws/tools/schema/SchemaTypeCreator.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/tools/schema/SchemaTypeCreator.java 2008-03-12 07:11:50 UTC (rev 5927)
+++ stack/native/trunk/src/main/java/org/jboss/ws/tools/schema/SchemaTypeCreator.java 2008-03-12 07:43:46 UTC (rev 5928)
@@ -567,7 +567,7 @@
if (xmlType != null)
{
name = xmlType.getLocalPart();
- namespace = xmlType.getNamespaceURI();
+ namespace = getNamespace(componentType, xmlType.getNamespaceURI()); //xmlType.getNamespaceURI();
}
else
{
@@ -706,6 +706,11 @@
if (javaType.isPrimitive())
return Constants.NS_JBOSSWS_URI + "/primitives";
+ while (javaType.isArray())
+ {
+ javaType = javaType.getComponentType();
+ }
+
Package javaPackage = javaType.getPackage();
if (javaPackage == null)
{
Modified: stack/native/trunk/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java 2008-03-12 07:11:50 UTC (rev 5927)
+++ stack/native/trunk/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java 2008-03-12 07:43:46 UTC (rev 5928)
@@ -547,6 +547,10 @@
protected String getNamespace(Class type, String defaultNS)
{
+ while (type.isArray())
+ {
+ type = type.getComponentType();
+ }
Package pkg = type.getPackage();
String pkgName = null;
if (pkg != null)
18 years, 1 month
- 1
- 0
JBossWS SVN: r5927 - stack/native/trunk/ant-import.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-03-12 03:11:50 -0400 (Wed, 12 Mar 2008)
New Revision: 5927
Modified:
stack/native/trunk/ant-import/build-deploy.xml
stack/native/trunk/ant-import/jbossws-default-deploy.conf
stack/native/trunk/ant-import/jbossws-deploy-macros.xml
Log:
Explicitly delete jbossws.sar
Modified: stack/native/trunk/ant-import/build-deploy.xml
===================================================================
--- stack/native/trunk/ant-import/build-deploy.xml 2008-03-12 00:52:02 UTC (rev 5926)
+++ stack/native/trunk/ant-import/build-deploy.xml 2008-03-12 07:11:50 UTC (rev 5927)
@@ -145,7 +145,7 @@
<fileset id="jbossws.deploy.fileset" dir="@{deploystructure}" excludes="**/jbossws.sar/**"/>
<property name="jbossws.deploy.fileset" refid="jbossws.deploy.fileset"/>
<property name="jbossws.sar.dir" value="@{deploystructure}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <echo file="${jbossws.sar.dir}/jbossws-deploy.conf" message="${jbossws.deploy.fileset} server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <echo file="${jbossws.sar.dir}/jbossws-deploy.conf" message="${jbossws.deploy.fileset}"/>
<replace file="${jbossws.sar.dir}/jbossws-deploy.conf" token=";" value=" "/>
</sequential>
</macrodef>
Modified: stack/native/trunk/ant-import/jbossws-default-deploy.conf
===================================================================
--- stack/native/trunk/ant-import/jbossws-default-deploy.conf 2008-03-12 00:52:02 UTC (rev 5926)
+++ stack/native/trunk/ant-import/jbossws-default-deploy.conf 2008-03-12 07:11:50 UTC (rev 5927)
@@ -1 +1 @@
-bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-client.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/default/lib/jboss-jaxrpc.jar server/default/lib/jboss-jaxws-ext.jar server/default/lib/jboss-jaxws.jar server/default/lib/jboss-saaj.jar server/default/lib/jbossws-common.jar server/default/lib/jbossws-framework.jar server/default/lib/jbossws-spi.jar server/default/deploy/jbossws.sar
\ No newline at end of file
+bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-client.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/default/lib/jboss-jaxrpc.jar server/default/lib/jboss-jaxws-ext.jar server/default/lib/jboss-jaxws.jar server/default/lib/jboss-saaj.jar server/default/lib/jbossws-common.jar server/default/lib/jbossws-framework.jar server/default/lib/jbossws-spi.jar
\ No newline at end of file
Modified: stack/native/trunk/ant-import/jbossws-deploy-macros.xml
===================================================================
--- stack/native/trunk/ant-import/jbossws-deploy-macros.xml 2008-03-12 00:52:02 UTC (rev 5926)
+++ stack/native/trunk/ant-import/jbossws-deploy-macros.xml 2008-03-12 07:11:50 UTC (rev 5927)
@@ -259,7 +259,9 @@
<!-- ================================================================== -->
<macrodef name="macro-undeploy-jbossws">
+ <!-- The location of the default file list -->
<attribute name="defaultconf"/>
+ <!-- The jbossws.sar directory -->
<attribute name="targetdir"/>
<sequential>
<loadfile property="jbossws.deploy.conf" srcfile="@{targetdir}/jbossws-deploy.conf" failonerror="false"/>
@@ -267,6 +269,7 @@
<delete>
<fileset dir="@{targetdir}/../../../.." includes="${jbossws.deploy.conf}"/>
</delete>
+ <delete dir="@{targetdir}"/>
</sequential>
</macrodef>
18 years, 1 month
- 1
- 0
JBossWS SVN: r5926 - in stack/native/trunk/src: test/java/org/jboss/test/ws/jaxrpc/wsse and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-03-11 20:52:02 -0400 (Tue, 11 Mar 2008)
New Revision: 5926
Modified:
stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/auth/callback/UsernameTokenCallback.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RoundTripTestCase.java
Log:
Fixing error
Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/auth/callback/UsernameTokenCallback.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/auth/callback/UsernameTokenCallback.java 2008-03-12 00:35:29 UTC (rev 5925)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/auth/callback/UsernameTokenCallback.java 2008-03-12 00:52:02 UTC (rev 5926)
@@ -54,7 +54,6 @@
@SuppressWarnings("unchecked")
public void init(Map options)
{
- //System.out.println("Chiamato init!!!");
// Ask for MapCallback to obtain the digest parameters
info = new MapCallback();
Callback[] callbacks = { info };
@@ -63,7 +62,6 @@
public void preDigest(MessageDigest digest)
{
- //System.out.println("Chiamato pre!!!");
try
{
String nonce = (String)info.getInfo(NONCE);
@@ -81,7 +79,6 @@
public void postDigest(MessageDigest digest)
{
-// System.out.println("Chiamato post!!!");
}
@SuppressWarnings("unchecked")
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RoundTripTestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RoundTripTestCase.java 2008-03-12 00:35:29 UTC (rev 5925)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RoundTripTestCase.java 2008-03-12 00:52:02 UTC (rev 5926)
@@ -192,7 +192,7 @@
targets.add(target);
operations.add(new EncryptionOperation(targets, "wsse", null, null, null));
- operations.add(new SendUsernameOperation("hi", "there"));
+ operations.add(new SendUsernameOperation("hi", "there",false,false,false));
return operations;
}
18 years, 1 month
- 1
- 0
JBossWS SVN: r5925 - in stack/native/trunk/src/main/java/org/jboss/ws: extensions/security and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-03-11 20:35:29 -0400 (Tue, 11 Mar 2008)
New Revision: 5925
Added:
stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/auth/
stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/auth/callback/
stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/auth/callback/UsernameTokenCallback.java
stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/auth/callback/UsernameTokenCallbackHandler.java
Modified:
stack/native/trunk/src/main/java/org/jboss/ws/core/utils/ThreadLocalAssociation.java
stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/Constants.java
stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/Util.java
stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java
stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/element/UsernameToken.java
stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/operation/ReceiveUsernameOperation.java
stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/operation/SendUsernameOperation.java
Log:
[JBWS-1988] Adding support for digest and nonce (still without nonce and created timestamp cache)
Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/utils/ThreadLocalAssociation.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/core/utils/ThreadLocalAssociation.java 2008-03-12 00:33:29 UTC (rev 5924)
+++ stack/native/trunk/src/main/java/org/jboss/ws/core/utils/ThreadLocalAssociation.java 2008-03-12 00:35:29 UTC (rev 5925)
@@ -27,6 +27,7 @@
import java.util.List;
import java.util.Stack;
+import org.jboss.security.auth.callback.CallbackHandlerPolicyContextHandler;
import org.jboss.ws.core.CommonMessageContext;
import org.jboss.ws.extensions.security.SecurityStore;
@@ -54,7 +55,7 @@
* Public keys used to sign incoming message
*/
private static ThreadLocal<List<PublicKey>> signatureKeysAssoc = new ThreadLocal<List<PublicKey>>();
-
+
public static ThreadLocal<Stack<CommonMessageContext>> localMsgContextAssoc()
{
return msgContextAssoc;
@@ -69,11 +70,16 @@
{
return signatureKeysAssoc;
}
-
+
public static void clear()
{
msgContextAssoc.remove();
strTransformAssoc.remove();
signatureKeysAssoc.remove();
+ //This removes a custom callback security handler that might have
+ //been set if using UsernameTokenProfile with digest; doing this
+ //here won't be required anymore once our custom security manager
+ //will be used in our wsse implementation.
+ CallbackHandlerPolicyContextHandler.setCallbackHandler(null);
}
}
Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/Constants.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/Constants.java 2008-03-12 00:33:29 UTC (rev 5924)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/Constants.java 2008-03-12 00:35:29 UTC (rev 5925)
@@ -57,6 +57,10 @@
public static final String WSU_ID = WSU_PREFIX + ":" + ID;
public static final String BASE64_ENCODING_TYPE = WSS_SOAP_NS + "#Base64Binary";
+
+ public static final String PASSWORD_TEXT_TYPE = WSSE_NS + "#PasswordText";
+
+ public static final String PASSWORD_DIGEST_TYPE = WSSE_NS + "#PasswordDigest";
public static final String WSSE_HEADER = WSSE_PREFIX + ":Security";
Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/Util.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/Util.java 2008-03-12 00:33:29 UTC (rev 5924)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/Util.java 2008-03-12 00:35:29 UTC (rev 5925)
@@ -21,11 +21,16 @@
*/
package org.jboss.ws.extensions.security;
+//$Id$
+
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
import java.util.ArrayList;
import java.util.List;
import javax.xml.namespace.QName;
+import org.jboss.util.Base64;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -36,7 +41,20 @@
public class Util
{
public static int count = 0;
-
+ private static SecureRandom pseudoRng;
+
+ static
+ {
+ try
+ {
+ pseudoRng = SecureRandom.getInstance("SHA1PRNG");
+ pseudoRng.setSeed(System.currentTimeMillis());
+ }
+ catch (NoSuchAlgorithmException e)
+ {
+ }
+ }
+
public static String assignWsuId(Element element)
{
String id = element.getAttributeNS(Constants.WSU_NS, Constants.ID);
@@ -214,4 +232,11 @@
return id.toString();
}
+
+ public static String generateNonce()
+ {
+ byte[] bytes = new byte[32];
+ pseudoRng.nextBytes(bytes);
+ return Base64.encodeBytes(bytes);
+ }
}
Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java 2008-03-12 00:33:29 UTC (rev 5924)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java 2008-03-12 00:35:29 UTC (rev 5925)
@@ -53,6 +53,7 @@
import org.jboss.ws.metadata.wsse.Requires;
import org.jboss.ws.metadata.wsse.Sign;
import org.jboss.ws.metadata.wsse.Timestamp;
+import org.jboss.ws.metadata.wsse.Username;
import org.jboss.ws.metadata.wsse.WSSecurityConfiguration;
import org.jboss.wsf.common.DOMWriter;
import org.w3c.dom.Element;
@@ -196,9 +197,10 @@
operations.add(new TimestampOperation(timestamp.getTtl()));
}
- if (config.getUsername() != null && user != null && password != null)
+ Username username = config.getUsername();
+ if (username != null && user != null && password != null)
{
- operations.add(new SendUsernameOperation(user, password));
+ operations.add(new SendUsernameOperation(user, password, username.isDigestPassword(), username.isUseNonce(), username.isUseCreated()));
}
Sign sign = config.getSign();
@@ -208,7 +210,7 @@
if (sign.isIncludeTimestamp())
{
if (timestamp == null)
- operations.add(new TimestampOperation(null)); //TODO!! check this null
+ operations.add(new TimestampOperation(null));
if (targets != null && targets.size() > 0)
targets.add(new WsuIdTarget("timestamp"));
Added: stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/auth/callback/UsernameTokenCallback.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/auth/callback/UsernameTokenCallback.java (rev 0)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/auth/callback/UsernameTokenCallback.java 2008-03-12 00:35:29 UTC (rev 5925)
@@ -0,0 +1,113 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ws.extensions.security.auth.callback;
+
+//$Id$
+
+import java.io.UnsupportedEncodingException;
+import java.security.MessageDigest;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
+
+import org.jboss.crypto.digest.DigestCallback;
+import org.jboss.security.Base64Encoder;
+import org.jboss.security.auth.callback.MapCallback;
+import org.jboss.ws.WSException;
+
+/**
+ * An implementation of DigestCallback that generates password
+ * digests according to the UsernameTokenProfile 1.0 specification.
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 12-Mar-2008
+ *
+ */
+public class UsernameTokenCallback implements DigestCallback
+{
+ public static final String NONCE = "nonce";
+ public static final String CREATED = "created";
+
+ private MapCallback info;
+
+ @SuppressWarnings("unchecked")
+ public void init(Map options)
+ {
+ //System.out.println("Chiamato init!!!");
+ // Ask for MapCallback to obtain the digest parameters
+ info = new MapCallback();
+ Callback[] callbacks = { info };
+ options.put("callbacks", callbacks);
+ }
+
+ public void preDigest(MessageDigest digest)
+ {
+ //System.out.println("Chiamato pre!!!");
+ try
+ {
+ String nonce = (String)info.getInfo(NONCE);
+ if (nonce != null)
+ digest.update(nonce.getBytes("UTF-8"));
+ String created = (String)info.getInfo(CREATED);
+ if (created != null)
+ digest.update(created.getBytes("UTF-8"));
+ }
+ catch (UnsupportedEncodingException e)
+ {
+ throw new WSException(e);
+ }
+ }
+
+ public void postDigest(MessageDigest digest)
+ {
+// System.out.println("Chiamato post!!!");
+ }
+
+ @SuppressWarnings("unchecked")
+ public static void main(String[] args) throws Exception
+ {
+ if (args.length != 3)
+ {
+ System.err.println("Usage: UsernameTokenCallback nonce created password");
+ System.err.println(" - nonce : the nonce");
+ System.err.println(" - created : the creation timestamp");
+ System.err.println(" - password : the plain text password");
+ System.exit(1);
+ }
+ String nonce = args[0];
+ String created = args[1];
+ String password = args[2];
+
+ MessageDigest digest = MessageDigest.getInstance("SHA");
+ UsernameTokenCallback utc = new UsernameTokenCallback();
+ Map options = new HashMap();
+ utc.init(options);
+ CallbackHandler cbh = new UsernameTokenCallbackHandler(nonce, created);
+ cbh.handle((Callback[])options.get("callbacks"));
+ utc.preDigest(digest);
+ byte[] result = digest.digest(password.getBytes("UTF-8"));
+ System.out.println("UsernameToken password digest: " + Base64Encoder.encode(result));
+ }
+
+}
Property changes on: stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/auth/callback/UsernameTokenCallback.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/auth/callback/UsernameTokenCallbackHandler.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/auth/callback/UsernameTokenCallbackHandler.java (rev 0)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/auth/callback/UsernameTokenCallbackHandler.java 2008-03-12 00:35:29 UTC (rev 5925)
@@ -0,0 +1,79 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ws.extensions.security.auth.callback;
+
+//$Id$
+
+import java.io.IOException;
+
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.UnsupportedCallbackException;
+
+import org.jboss.security.auth.callback.MapCallback;
+
+/**
+ * A callback handler to be used to pass parameters to the
+ * UsernameTokenCallback.
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 12-Mar-2008
+ *
+ */
+public class UsernameTokenCallbackHandler implements CallbackHandler
+{
+ private String nonce;
+ private String created;
+
+ public UsernameTokenCallbackHandler(String nonce, String created)
+ {
+ this.created = created;
+ this.nonce = nonce;
+ }
+
+ public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException
+ {
+ boolean foundCallback = false;
+ Callback firstUnknown = null;
+ int count = callbacks != null ? callbacks.length : 0;
+ for(int n = 0; n < count; n ++)
+ {
+ Callback c = callbacks[n];
+ if( c instanceof MapCallback )
+ {
+ //set parameters to the MapCallback the UsernameTokenCallback
+ //created and set up in the init method
+ MapCallback mc = (MapCallback) c;
+ mc.setInfo(UsernameTokenCallback.NONCE, nonce);
+ mc.setInfo(UsernameTokenCallback.CREATED, created);
+ foundCallback = true;
+ }
+ else if( firstUnknown == null )
+ {
+ firstUnknown = c;
+ }
+ }
+ if( foundCallback == false )
+ throw new UnsupportedCallbackException(firstUnknown, "Unrecognized Callback");
+ }
+
+}
Property changes on: stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/auth/callback/UsernameTokenCallbackHandler.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/element/UsernameToken.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/element/UsernameToken.java 2008-03-12 00:33:29 UTC (rev 5924)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/element/UsernameToken.java 2008-03-12 00:35:29 UTC (rev 5925)
@@ -21,10 +21,15 @@
*/
package org.jboss.ws.extensions.security.element;
+import java.util.Iterator;
+
+import javax.xml.namespace.QName;
+
import org.apache.xml.security.utils.XMLUtils;
import org.jboss.ws.extensions.security.Constants;
import org.jboss.ws.extensions.security.Util;
import org.jboss.ws.extensions.security.exception.WSSecurityException;
+import org.jboss.wsf.common.DOMUtils;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -38,6 +43,12 @@
private String username;
private String password;
+
+ private boolean digest;
+
+ private String nonce;
+
+ private String created;
private Document doc;
@@ -45,13 +56,17 @@
private Element cachedElement;
- public UsernameToken(String username, String password, Document doc)
+ public UsernameToken(String username, String password, Document doc, boolean digest, String nonce, String created)
{
this.username = username;
this.password = password;
this.doc = doc;
+ this.digest = digest;
+ this.nonce = nonce;
+ this.created = created;
}
+ @SuppressWarnings("unchecked")
public UsernameToken(Element element) throws WSSecurityException
{
this.doc = element.getOwnerDocument();
@@ -72,6 +87,24 @@
throw new WSSecurityException("Password child expected in UsernameToken element");
this.password = XMLUtils.getFullTextChildrenFromElement(child);
+ String passwordType = child.getAttribute("Type");
+ this.digest = Constants.PASSWORD_DIGEST_TYPE.equals(passwordType);
+
+ Iterator<Element> itNonce = DOMUtils.getChildElements(element, new QName(Constants.WSSE_NS, "Nonce"));
+ if (itNonce != null && itNonce.hasNext())
+ {
+ Element elem = itNonce.next();
+ String encodingType = elem.getAttribute("EncodingType");
+ if (encodingType != null && !Constants.BASE64_ENCODING_TYPE.equalsIgnoreCase(encodingType))
+ throw new WSSecurityException("Unsupported nonce encoding type: " + encodingType);
+ this.nonce = XMLUtils.getFullTextChildrenFromElement(elem);
+ }
+
+ Iterator<Element> itCreated = DOMUtils.getChildElements(element, new QName(Constants.WSSE_NS, "Created"));
+ if (itCreated != null && itCreated.hasNext())
+ {
+ this.created = XMLUtils.getFullTextChildrenFromElement(itCreated.next());
+ }
}
public String getId()
@@ -121,8 +154,24 @@
element.appendChild(child);
child = doc.createElementNS(Constants.WSSE_NS, Constants.WSSE_PREFIX + ":" + "Password");
child.appendChild(doc.createTextNode(password));
+ child.setAttribute("Type", digest ? Constants.PASSWORD_DIGEST_TYPE : Constants.PASSWORD_TEXT_TYPE);
element.appendChild(child);
-
+ if (digest)
+ {
+ if (nonce != null)
+ {
+ child = doc.createElementNS(Constants.WSSE_NS, Constants.WSSE_PREFIX + ":" + "Nonce");
+ child.appendChild(doc.createTextNode(nonce));
+ child.setAttribute("EncodingType", Constants.BASE64_ENCODING_TYPE);
+ element.appendChild(child);
+ }
+ if (created != null)
+ {
+ child = doc.createElementNS(Constants.WSSE_NS, Constants.WSSE_PREFIX + ":" + "Created");
+ child.appendChild(doc.createTextNode(created));
+ element.appendChild(child);
+ }
+ }
cachedElement = element;
return cachedElement;
}
@@ -131,4 +180,19 @@
{
return null;
}
+
+ public boolean isDigest()
+ {
+ return digest;
+ }
+
+ public String getNonce()
+ {
+ return nonce;
+ }
+
+ public String getCreated()
+ {
+ return created;
+ }
}
Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/operation/ReceiveUsernameOperation.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/operation/ReceiveUsernameOperation.java 2008-03-12 00:33:29 UTC (rev 5924)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/operation/ReceiveUsernameOperation.java 2008-03-12 00:35:29 UTC (rev 5925)
@@ -23,9 +23,13 @@
// $Id$
+import javax.security.auth.callback.CallbackHandler;
+
import org.jboss.logging.Logger;
+import org.jboss.security.auth.callback.CallbackHandlerPolicyContextHandler;
import org.jboss.ws.extensions.security.SecurityStore;
import org.jboss.ws.extensions.security.SimplePrincipal;
+import org.jboss.ws.extensions.security.auth.callback.UsernameTokenCallbackHandler;
import org.jboss.ws.extensions.security.element.SecurityHeader;
import org.jboss.ws.extensions.security.element.Token;
import org.jboss.ws.extensions.security.element.UsernameToken;
@@ -58,6 +62,11 @@
SecurityAdaptor securityAdaptor = secAdapterfactory.newSecurityAdapter();
Logger.getLogger(this.getClass()).info("Username: " + user.getUsername());
Logger.getLogger(this.getClass()).info("Password: " + user.getPassword());
+ if (user.isDigest())
+ {
+ CallbackHandler handler = new UsernameTokenCallbackHandler(user.getNonce(), user.getCreated());
+ CallbackHandlerPolicyContextHandler.setCallbackHandler(handler);
+ }
securityAdaptor.setPrincipal(new SimplePrincipal(user.getUsername()));
securityAdaptor.setCredential(user.getPassword());
}
Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/operation/SendUsernameOperation.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/operation/SendUsernameOperation.java 2008-03-12 00:33:29 UTC (rev 5924)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/operation/SendUsernameOperation.java 2008-03-12 00:35:29 UTC (rev 5925)
@@ -21,25 +21,94 @@
*/
package org.jboss.ws.extensions.security.operation;
+//$Id$
+
+import java.security.MessageDigest;
+import java.util.Calendar;
+import java.util.GregorianCalendar;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.TimeZone;
+
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
+
+import org.jboss.logging.Logger;
+import org.jboss.security.Base64Encoder;
import org.jboss.ws.extensions.security.SecurityStore;
+import org.jboss.ws.extensions.security.Util;
+import org.jboss.ws.extensions.security.auth.callback.UsernameTokenCallback;
+import org.jboss.ws.extensions.security.auth.callback.UsernameTokenCallbackHandler;
import org.jboss.ws.extensions.security.element.SecurityHeader;
import org.jboss.ws.extensions.security.element.UsernameToken;
import org.jboss.ws.extensions.security.exception.WSSecurityException;
+import org.jboss.xb.binding.SimpleTypeBindings;
import org.w3c.dom.Document;
public class SendUsernameOperation implements EncodingOperation
{
+ private static Logger log = Logger.getLogger(SendUsernameOperation.class);
+
private String username;
private String credential;
+ private boolean digestPassword;
+ private boolean useNonce;
+ private boolean useCreated;
- public SendUsernameOperation(String username, String credential)
+ public SendUsernameOperation(String username, String credential, boolean digestPassword, boolean useNonce, boolean useCreated)
{
this.username = username;
this.credential = credential;
+ this.digestPassword = digestPassword;
+ this.useNonce = useNonce;
+ this.useCreated = useCreated;
}
public void process(Document message, SecurityHeader header, SecurityStore store) throws WSSecurityException
{
- header.addToken(new UsernameToken(username, credential, message));
+ String created = useCreated ? getCurrentTimestampAsString() : null;
+ String nonce = useNonce ? Util.generateNonce() : null;
+ String password = digestPassword ? createPasswordDigest(nonce, created, credential) : credential;
+ header.addToken(new UsernameToken(username, password, message, digestPassword, nonce, created));
}
+
+
+ private static String getCurrentTimestampAsString()
+ {
+ Calendar timestamp = new GregorianCalendar(TimeZone.getTimeZone("UTC"));
+ return SimpleTypeBindings.marshalDateTime(timestamp);
+ }
+
+ /**
+ * Calculate the password digest using a MessageDigest and the UsernameTokenCallback/CallbackHandler
+ */
+ @SuppressWarnings("unchecked")
+ public static String createPasswordDigest(String nonce, String created, String password)
+ {
+ String passwordHash = null;
+ try
+ {
+ // convert password to byte data
+ byte[] passBytes = password.getBytes("UTF-8");
+ // prepare the username token digest callback
+ UsernameTokenCallback callback = new UsernameTokenCallback();
+ Map options = new HashMap();
+ callback.init(options);
+ // add the username token callback handler to provide the parameters
+ CallbackHandler handler = new UsernameTokenCallbackHandler(nonce, created);
+ handler.handle((Callback[])options.get("callbacks"));
+ // calculate the hash and apply the encoding.
+ MessageDigest md = MessageDigest.getInstance("SHA");
+ callback.preDigest(md);
+ md.update(passBytes);
+ callback.postDigest(md);
+ byte[] hash = md.digest();
+ passwordHash = Base64Encoder.encode(hash);
+ }
+ catch(Exception e)
+ {
+ log.error("Password hash calculation failed ", e);
+ }
+ return passwordHash;
+ }
}
18 years, 1 month
- 1
- 0