JBossWS SVN: r1506 - in branches/dlofthouse/JBWS-1260/src/test: java/org/jboss/test/ws/tools java/org/jboss/test/ws/tools/jbws1260 resources/tools resources/tools/jbws1260 resources/tools/jbws1260/scenario_A resources/tools/jbws1260/scenario_B resources/tools/jbws1260/scenario_C resources/tools/jbws1260/scenario_D resources/tools/jbws1260/scenario_E resources/tools/jbws1260/scenario_F
by jbossws-commits@lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2006-11-22 16:19:18 -0500 (Wed, 22 Nov 2006)
New Revision: 1506
Added:
branches/dlofthouse/JBWS-1260/src/test/java/org/jboss/test/ws/tools/jbws1260/
branches/dlofthouse/JBWS-1260/src/test/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_A/
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_A/Anonymous.wsdl
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_A/PhoneBook_PortType.java
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_A/wstools-config.xml
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_B/
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_B/Anonymous.wsdl
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_B/PhoneBook_PortType.java
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_B/wstools-config.xml
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_C/
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_C/Anonymous.wsdl
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_C/PhoneBook_PortType.java
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_C/wstools-config.xml
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_D/
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_D/Anonymous.wsdl
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_D/PhoneBook_PortType.java
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_D/wstools-config.xml
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_E/
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_E/Anonymous.wsdl
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_E/PhoneBook_PortType.java
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_E/wstools-config.xml
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_F/
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_F/Anonymous.wsdl
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_F/PhoneBook_PortType.java
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_F/wstools-config.xml
Log:
JBWS-1260 - Set of scenarios to test parameter unwrapping for requests and responses.
Added: branches/dlofthouse/JBWS-1260/src/test/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java
===================================================================
--- branches/dlofthouse/JBWS-1260/src/test/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java 2006-11-22 21:10:20 UTC (rev 1505)
+++ branches/dlofthouse/JBWS-1260/src/test/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java 2006-11-22 21:19:18 UTC (rev 1506)
@@ -0,0 +1,87 @@
+/*
+ * 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.test.ws.tools.jbws1260;
+
+import java.io.File;
+
+import org.jboss.test.ws.JBossWSTest;
+import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
+import org.jboss.ws.tools.WSTools;
+
+/**
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since Nov 22, 2006
+ */
+public class JBWS1260TestCase extends JBossWSTest
+{
+
+ public void testScenario_A() throws Exception
+ {
+ generateScenario('A');
+ }
+
+ public void testScenario_B() throws Exception
+ {
+ generateScenario('B');
+ }
+
+ public void testScenario_C() throws Exception
+ {
+ generateScenario('C');
+ }
+
+ public void testScenario_D() throws Exception
+ {
+ generateScenario('D');
+ }
+
+ public void testScenario_E() throws Exception
+ {
+ generateScenario('E');
+ }
+
+ public void testScenario_F() throws Exception
+ {
+ generateScenario('F');
+ }
+
+ protected void generateScenario(final char scenario) throws Exception
+ {
+ String resourceDir = "resources/tools/jbws1260/scenario_" + scenario;
+ String toolsDir = "tools/jbws1260/scenario_" + scenario;
+ String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
+ new WSTools().generate(args);
+
+ compareSource(resourceDir + "/PhoneBook_PortType.java", toolsDir + "/org/jboss/test/ws/jbws1260/PhoneBook_PortType.java");
+ }
+
+ private static void compareSource(final String expectedName, final String generatedName) throws Exception
+ {
+ File expected = new File(expectedName);
+ File generated = new File(generatedName);
+
+ JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
+ sc.validate();
+ sc.validateImports();
+ }
+}
Property changes on: branches/dlofthouse/JBWS-1260/src/test/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_A/Anonymous.wsdl
===================================================================
--- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_A/Anonymous.wsdl 2006-11-22 21:10:20 UTC (rev 1505)
+++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_A/Anonymous.wsdl 2006-11-22 21:19:18 UTC (rev 1506)
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1260' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1260/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1260' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <schema targetNamespace='http://test.jboss.org/ws/jbws1260/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1260/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+
+ <element name='lookup'>
+ <complexType>
+ <sequence>
+ <element name='surname' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+ </element>
+
+ <element name='lookupResponse'>
+ <complexType>
+ <sequence>
+ <element name='number' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+ </element>
+
+ </schema>
+ </types>
+ <message name='PhoneBook_lookup'>
+ <part element='ns1:lookup' name='parameters'/>
+ </message>
+ <message name='PhoneBook_lookupResponse'>
+ <part element='ns1:lookupResponse' name='result'/>
+ </message>
+ <portType name='PhoneBook'>
+ <operation name='lookup'>
+ <input message='tns:PhoneBook_lookup'/>
+ <output message='tns:PhoneBook_lookupResponse'/>
+ </operation>
+ </portType>
+ <binding name='PhoneBookBinding' type='tns:PhoneBook'>
+ <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='lookup'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ </binding>
+ <service name='PhoneBook'>
+ <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_A/Anonymous.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_A/PhoneBook_PortType.java
===================================================================
--- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_A/PhoneBook_PortType.java 2006-11-22 21:10:20 UTC (rev 1505)
+++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_A/PhoneBook_PortType.java 2006-11-22 21:19:18 UTC (rev 1506)
@@ -0,0 +1,11 @@
+// This class was generated by the JAXRPC SI, do not edit.
+// Contents subject to change without notice.
+// JAX-RPC Standard Implementation (1.1.3, build R1)
+// Generated source version: 1.1.3
+
+package org.jboss.test.ws.jbws1260;
+
+public interface PhoneBook_PortType extends java.rmi.Remote {
+ public java.lang.String lookup(java.lang.String surname) throws
+ java.rmi.RemoteException;
+}
Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_A/PhoneBook_PortType.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_A/wstools-config.xml
===================================================================
--- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_A/wstools-config.xml 2006-11-22 21:10:20 UTC (rev 1505)
+++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_A/wstools-config.xml 2006-11-22 21:19:18 UTC (rev 1506)
@@ -0,0 +1,5 @@
+<configuration>
+ <wsdl-java location="resources/tools/jbws1260/scenario_A/Anonymous.wsdl" parameter-style="wrapped">
+ <mapping file="anonymous-mapping.xml"/>
+ </wsdl-java>
+</configuration>
Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_A/wstools-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_B/Anonymous.wsdl
===================================================================
--- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_B/Anonymous.wsdl 2006-11-22 21:10:20 UTC (rev 1505)
+++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_B/Anonymous.wsdl 2006-11-22 21:19:18 UTC (rev 1506)
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1260' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1260/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1260' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <schema targetNamespace='http://test.jboss.org/ws/jbws1260/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1260/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+
+ <element name='lookup'>
+ <complexType>
+ <sequence>
+ <element name='firstName' nillable='true' type='string'/>
+ <element name='surname' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+ </element>
+
+ <element name='lookupResponse'>
+ <complexType>
+ <sequence>
+ <element name='areaCode' nillable='true' type='string'/>
+ <element name='number' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+ </element>
+
+ </schema>
+ </types>
+ <message name='PhoneBook_lookup'>
+ <part element='ns1:lookup' name='parameters'/>
+ </message>
+ <message name='PhoneBook_lookupResponse'>
+ <part element='ns1:lookupResponse' name='result'/>
+ </message>
+ <portType name='PhoneBook'>
+ <operation name='lookup'>
+ <input message='tns:PhoneBook_lookup'/>
+ <output message='tns:PhoneBook_lookupResponse'/>
+ </operation>
+ </portType>
+ <binding name='PhoneBookBinding' type='tns:PhoneBook'>
+ <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='lookup'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ </binding>
+ <service name='PhoneBook'>
+ <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_B/Anonymous.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_B/PhoneBook_PortType.java
===================================================================
--- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_B/PhoneBook_PortType.java 2006-11-22 21:10:20 UTC (rev 1505)
+++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_B/PhoneBook_PortType.java 2006-11-22 21:19:18 UTC (rev 1506)
@@ -0,0 +1,11 @@
+// This class was generated by the JAXRPC SI, do not edit.
+// Contents subject to change without notice.
+// JAX-RPC Standard Implementation (1.1.3, build R1)
+// Generated source version: 1.1.3
+
+package org.jboss.test.ws.jbws1260;
+
+public interface PhoneBook_PortType extends java.rmi.Remote {
+ public org.jboss.test.ws.jbws1260.LookupResponse lookup(java.lang.String firstName, java.lang.String surname) throws
+ java.rmi.RemoteException;
+}
Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_B/PhoneBook_PortType.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_B/wstools-config.xml
===================================================================
--- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_B/wstools-config.xml 2006-11-22 21:10:20 UTC (rev 1505)
+++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_B/wstools-config.xml 2006-11-22 21:19:18 UTC (rev 1506)
@@ -0,0 +1,5 @@
+<configuration>
+ <wsdl-java location="resources/tools/jbws1260/scenario_B/Anonymous.wsdl" parameter-style="wrapped">
+ <mapping file="anonymous-mapping.xml"/>
+ </wsdl-java>
+</configuration>
Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_B/wstools-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_C/Anonymous.wsdl
===================================================================
--- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_C/Anonymous.wsdl 2006-11-22 21:10:20 UTC (rev 1505)
+++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_C/Anonymous.wsdl 2006-11-22 21:19:18 UTC (rev 1506)
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1260' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1260/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1260' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <schema targetNamespace='http://test.jboss.org/ws/jbws1260/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1260/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+
+ <complexType name='Person'>
+ <sequence>
+ <element name='surname' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+
+ <complexType name='TelephoneNumber'>
+ <sequence>
+ <element name='number' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+
+ <element name='lookup' type='tns:Person'/>
+ <element name='lookupResponse' type='tns:TelephoneNumber'/>
+
+ </schema>
+ </types>
+ <message name='PhoneBook_lookup'>
+ <part element='ns1:lookup' name='parameters'/>
+ </message>
+ <message name='PhoneBook_lookupResponse'>
+ <part element='ns1:lookupResponse' name='result'/>
+ </message>
+ <portType name='PhoneBook'>
+ <operation name='lookup'>
+ <input message='tns:PhoneBook_lookup'/>
+ <output message='tns:PhoneBook_lookupResponse'/>
+ </operation>
+ </portType>
+ <binding name='PhoneBookBinding' type='tns:PhoneBook'>
+ <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='lookup'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ </binding>
+ <service name='PhoneBook'>
+ <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_C/Anonymous.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_C/PhoneBook_PortType.java
===================================================================
--- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_C/PhoneBook_PortType.java 2006-11-22 21:10:20 UTC (rev 1505)
+++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_C/PhoneBook_PortType.java 2006-11-22 21:19:18 UTC (rev 1506)
@@ -0,0 +1,11 @@
+// This class was generated by the JAXRPC SI, do not edit.
+// Contents subject to change without notice.
+// JAX-RPC Standard Implementation (1.1.3, build R1)
+// Generated source version: 1.1.3
+
+package org.jboss.test.ws.jbws1260;
+
+public interface PhoneBook_PortType extends java.rmi.Remote {
+ public java.lang.String lookup(java.lang.String surname) throws
+ java.rmi.RemoteException;
+}
Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_C/PhoneBook_PortType.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_C/wstools-config.xml
===================================================================
--- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_C/wstools-config.xml 2006-11-22 21:10:20 UTC (rev 1505)
+++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_C/wstools-config.xml 2006-11-22 21:19:18 UTC (rev 1506)
@@ -0,0 +1,5 @@
+<configuration>
+ <wsdl-java location="resources/tools/jbws1260/scenario_C/Anonymous.wsdl" parameter-style="wrapped">
+ <mapping file="anonymous-mapping.xml"/>
+ </wsdl-java>
+</configuration>
Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_C/wstools-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_D/Anonymous.wsdl
===================================================================
--- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_D/Anonymous.wsdl 2006-11-22 21:10:20 UTC (rev 1505)
+++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_D/Anonymous.wsdl 2006-11-22 21:19:18 UTC (rev 1506)
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1260' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1260/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1260' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <schema targetNamespace='http://test.jboss.org/ws/jbws1260/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1260/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+
+ <complexType name='Person'>
+ <sequence>
+ <element name='firstName' nillable='true' type='string'/>
+ <element name='surname' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+
+ <complexType name='TelephoneNumber'>
+ <sequence>
+ <element name='areaCode' nillable='true' type='string'/>
+ <element name='number' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+
+ <element name='lookup' type='tns:Person'/>
+ <element name='lookupResponse' type='tns:TelephoneNumber'/>
+
+ </schema>
+ </types>
+ <message name='PhoneBook_lookup'>
+ <part element='ns1:lookup' name='parameters'/>
+ </message>
+ <message name='PhoneBook_lookupResponse'>
+ <part element='ns1:lookupResponse' name='result'/>
+ </message>
+ <portType name='PhoneBook'>
+ <operation name='lookup'>
+ <input message='tns:PhoneBook_lookup'/>
+ <output message='tns:PhoneBook_lookupResponse'/>
+ </operation>
+ </portType>
+ <binding name='PhoneBookBinding' type='tns:PhoneBook'>
+ <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='lookup'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ </binding>
+ <service name='PhoneBook'>
+ <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_D/Anonymous.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_D/PhoneBook_PortType.java
===================================================================
--- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_D/PhoneBook_PortType.java 2006-11-22 21:10:20 UTC (rev 1505)
+++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_D/PhoneBook_PortType.java 2006-11-22 21:19:18 UTC (rev 1506)
@@ -0,0 +1,11 @@
+// This class was generated by the JAXRPC SI, do not edit.
+// Contents subject to change without notice.
+// JAX-RPC Standard Implementation (1.1.3, build R1)
+// Generated source version: 1.1.3
+
+package org.jboss.test.ws.jbws1260;
+
+public interface PhoneBook_PortType extends java.rmi.Remote {
+ public org.jboss.test.ws.jbws1260.TelephoneNumber lookup(java.lang.String firstName, java.lang.String surname) throws
+ java.rmi.RemoteException;
+}
Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_D/PhoneBook_PortType.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_D/wstools-config.xml
===================================================================
--- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_D/wstools-config.xml 2006-11-22 21:10:20 UTC (rev 1505)
+++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_D/wstools-config.xml 2006-11-22 21:19:18 UTC (rev 1506)
@@ -0,0 +1,5 @@
+<configuration>
+ <wsdl-java location="resources/tools/jbws1260/scenario_D/Anonymous.wsdl" parameter-style="wrapped">
+ <mapping file="anonymous-mapping.xml"/>
+ </wsdl-java>
+</configuration>
Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_D/wstools-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_E/Anonymous.wsdl
===================================================================
--- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_E/Anonymous.wsdl 2006-11-22 21:10:20 UTC (rev 1505)
+++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_E/Anonymous.wsdl 2006-11-22 21:19:18 UTC (rev 1506)
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1260' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1260/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1260' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <schema targetNamespace='http://test.jboss.org/ws/jbws1260/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1260/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+
+ <complexType name='Person'>
+ <sequence>
+ <element name='Name'>
+ <complexType>
+ <sequence>
+ <element name='surname' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+ </element>
+ </sequence>
+ </complexType>
+
+ <complexType name='TelephoneNumber'>
+ <sequence>
+ <element name='Number'>
+ <complexType>
+ <sequence>
+ <element name='number' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+ </element>
+ </sequence>
+ </complexType>
+
+ <element name='lookup' type='tns:Person'/>
+ <element name='lookupResponse' type='tns:TelephoneNumber'/>
+
+ </schema>
+ </types>
+ <message name='PhoneBook_lookup'>
+ <part element='ns1:lookup' name='parameters'/>
+ </message>
+ <message name='PhoneBook_lookupResponse'>
+ <part element='ns1:lookupResponse' name='result'/>
+ </message>
+ <portType name='PhoneBook'>
+ <operation name='lookup'>
+ <input message='tns:PhoneBook_lookup'/>
+ <output message='tns:PhoneBook_lookupResponse'/>
+ </operation>
+ </portType>
+ <binding name='PhoneBookBinding' type='tns:PhoneBook'>
+ <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='lookup'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ </binding>
+ <service name='PhoneBook'>
+ <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_E/Anonymous.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_E/PhoneBook_PortType.java
===================================================================
--- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_E/PhoneBook_PortType.java 2006-11-22 21:10:20 UTC (rev 1505)
+++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_E/PhoneBook_PortType.java 2006-11-22 21:19:18 UTC (rev 1506)
@@ -0,0 +1,11 @@
+// This class was generated by the JAXRPC SI, do not edit.
+// Contents subject to change without notice.
+// JAX-RPC Standard Implementation (1.1.3, build R1)
+// Generated source version: 1.1.3
+
+package org.jboss.test.ws.jbws1260;
+
+public interface PhoneBook_PortType extends java.rmi.Remote {
+ public org.jboss.test.ws.jbws1260.LookupResponseNumber lookup(org.jboss.test.ws.jbws1260.LookupName name) throws
+ java.rmi.RemoteException;
+}
Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_E/PhoneBook_PortType.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_E/wstools-config.xml
===================================================================
--- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_E/wstools-config.xml 2006-11-22 21:10:20 UTC (rev 1505)
+++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_E/wstools-config.xml 2006-11-22 21:19:18 UTC (rev 1506)
@@ -0,0 +1,5 @@
+<configuration>
+ <wsdl-java location="resources/tools/jbws1260/scenario_E/Anonymous.wsdl" parameter-style="wrapped">
+ <mapping file="anonymous-mapping.xml"/>
+ </wsdl-java>
+</configuration>
Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_E/wstools-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_F/Anonymous.wsdl
===================================================================
--- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_F/Anonymous.wsdl 2006-11-22 21:10:20 UTC (rev 1505)
+++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_F/Anonymous.wsdl 2006-11-22 21:19:18 UTC (rev 1506)
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1260' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1260/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1260' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <schema targetNamespace='http://test.jboss.org/ws/jbws1260/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1260/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+
+ <complexType name='Person'>
+ <sequence>
+ <element name='Name'>
+ <complexType>
+ <sequence>
+ <element name='firstName' nillable='true' type='string'/>
+ <element name='surname' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+ </element>
+ </sequence>
+ </complexType>
+
+ <complexType name='TelephoneNumber'>
+ <sequence>
+ <element name='Number'>
+ <complexType>
+ <sequence>
+ <element name='areaCode' nillable='true' type='string'/>
+ <element name='number' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+ </element>
+ </sequence>
+ </complexType>
+
+ <element name='lookup' type='tns:Person'/>
+ <element name='lookupResponse' type='tns:TelephoneNumber'/>
+
+ </schema>
+ </types>
+ <message name='PhoneBook_lookup'>
+ <part element='ns1:lookup' name='parameters'/>
+ </message>
+ <message name='PhoneBook_lookupResponse'>
+ <part element='ns1:lookupResponse' name='result'/>
+ </message>
+ <portType name='PhoneBook'>
+ <operation name='lookup'>
+ <input message='tns:PhoneBook_lookup'/>
+ <output message='tns:PhoneBook_lookupResponse'/>
+ </operation>
+ </portType>
+ <binding name='PhoneBookBinding' type='tns:PhoneBook'>
+ <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='lookup'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ </binding>
+ <service name='PhoneBook'>
+ <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_F/Anonymous.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_F/PhoneBook_PortType.java
===================================================================
--- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_F/PhoneBook_PortType.java 2006-11-22 21:10:20 UTC (rev 1505)
+++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_F/PhoneBook_PortType.java 2006-11-22 21:19:18 UTC (rev 1506)
@@ -0,0 +1,11 @@
+// This class was generated by the JAXRPC SI, do not edit.
+// Contents subject to change without notice.
+// JAX-RPC Standard Implementation (1.1.3, build R1)
+// Generated source version: 1.1.3
+
+package org.jboss.test.ws.jbws1260;
+
+public interface PhoneBook_PortType extends java.rmi.Remote {
+ public org.jboss.test.ws.jbws1260.LookupResponseNumber lookup(org.jboss.test.ws.jbws1260.LookupName name) throws
+ java.rmi.RemoteException;
+}
Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_F/PhoneBook_PortType.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_F/wstools-config.xml
===================================================================
--- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_F/wstools-config.xml 2006-11-22 21:10:20 UTC (rev 1505)
+++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_F/wstools-config.xml 2006-11-22 21:19:18 UTC (rev 1506)
@@ -0,0 +1,5 @@
+<configuration>
+ <wsdl-java location="resources/tools/jbws1260/scenario_F/Anonymous.wsdl" parameter-style="wrapped">
+ <mapping file="anonymous-mapping.xml"/>
+ </wsdl-java>
+</configuration>
Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_F/wstools-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
17 years, 10 months
JBossWS SVN: r1505 - in trunk: . src/main/java/org/jboss/ws/integration/jboss50 src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-11-22 16:10:20 -0500 (Wed, 22 Nov 2006)
New Revision: 1505
Modified:
trunk/ant.properties.example
trunk/src/main/java/org/jboss/ws/integration/jboss50/WebMetaDataAdaptor.java
trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java
Log:
Add FIXME: [JBWS-1397] Fix <wsdl-publish-location> for jboss-5.0.x
Modified: trunk/ant.properties.example
===================================================================
--- trunk/ant.properties.example 2006-11-22 20:46:11 UTC (rev 1504)
+++ trunk/ant.properties.example 2006-11-22 21:10:20 UTC (rev 1505)
@@ -3,7 +3,7 @@
#
# Required JBoss Home
-#jboss.jdk15.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta1
+#jboss.jdk15.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta2
# Optional JBoss Home
#jboss.jdk14.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_0_4_GA/build/output/jboss-4.0.4.GA
Modified: trunk/src/main/java/org/jboss/ws/integration/jboss50/WebMetaDataAdaptor.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/integration/jboss50/WebMetaDataAdaptor.java 2006-11-22 20:46:11 UTC (rev 1504)
+++ trunk/src/main/java/org/jboss/ws/integration/jboss50/WebMetaDataAdaptor.java 2006-11-22 21:10:20 UTC (rev 1505)
@@ -36,6 +36,7 @@
import org.jboss.metadata.web.ServletMapping;
import org.jboss.ws.metadata.j2ee.UnifiedWebMetaData;
import org.jboss.ws.metadata.j2ee.UnifiedWebSecurityMetaData;
+import org.jboss.ws.metadata.j2ee.UnifiedWebMetaData.PublishLocationAdapter;
import org.jboss.ws.metadata.j2ee.UnifiedWebSecurityMetaData.UnifiedWebResourceCollection;
/**
@@ -55,11 +56,23 @@
umd.setConfigName(wmd.getConfigName());
umd.setConfigFile(wmd.getConfigFile());
umd.setSecurityDomain(wmd.getSecurityDomain());
+ umd.setPublishLocationAdapter(getPublishLocationAdpater(wmd));
umd.setSecurityMetaData(getSecurityMetaData(wmd.getSecurityContraints()));
return umd;
}
+ private static PublishLocationAdapter getPublishLocationAdpater(final WebMetaData wmd)
+ {
+ return new PublishLocationAdapter ()
+ {
+ public String getWsdlPublishLocationByName(String name)
+ {
+ return wmd.getWsdlPublishLocationByName(name);
+ }
+ };
+ }
+
protected static List<UnifiedWebSecurityMetaData> getSecurityMetaData(final Iterator securityConstraints)
{
ArrayList<UnifiedWebSecurityMetaData> unifiedsecurityMetaData = new ArrayList<UnifiedWebSecurityMetaData>();
@@ -114,15 +127,4 @@
}
return mappings;
}
-
- private static Map<String, String> getTransportGuaranties(WebMetaData wmd)
- {
- Map<String, String> mappings = new HashMap<String, String>();
- Iterator it = wmd.getSecurityContraints();
- while(it.hasNext())
- {
- WebSecurityMetaData secMetaData = (WebSecurityMetaData)it.next();
- }
- return mappings;
- }
}
Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java 2006-11-22 20:46:11 UTC (rev 1504)
+++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java 2006-11-22 21:10:20 UTC (rev 1505)
@@ -56,7 +56,8 @@
if (port == null)
{
- if (isTargetServerJBoss())
+ System.out.println("FIXME: [JBWS-1397] Fix <wsdl-publish-location> for jboss-5.0.x");
+ if (isTargetServerJBoss() && false)
{
InitialContext iniCtx = getInitialContext();
Service service = (Service)iniCtx.lookup("java:comp/env/service/TestServiceJSE");
17 years, 10 months
JBossWS SVN: r1504 - branches/dlofthouse
by jbossws-commits@lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2006-11-22 15:46:11 -0500 (Wed, 22 Nov 2006)
New Revision: 1504
Added:
branches/dlofthouse/JBWS-1260/
Log:
Create branch for JBWS-1260 work.
Copied: branches/dlofthouse/JBWS-1260 (from rev 1503, branches/jbossws-1.0)
17 years, 10 months
JBossWS SVN: r1503 - in trunk/src: main/java/org/jboss/ws/metadata/j2ee main/resources/samples/jaxrpc/docstyle main/resources/samples/jaxrpc/dynamichandler main/resources/samples/jaxrpc/exception main/resources/samples/jaxrpc/handler main/resources/samples/jaxrpc/holder main/resources/samples/jaxrpc/jmstransport main/resources/samples/jaxrpc/jsr109ejb main/resources/samples/jaxrpc/jsr109pojo main/resources/samples/jaxrpc/message main/resources/samples/jaxrpc/mtom main/resources/samples/jax
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-11-22 10:50:49 -0500 (Wed, 22 Nov 2006)
New Revision: 1503
Added:
trunk/src/test/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/jboss-web.xml
Modified:
trunk/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedApplicationMetaData.java
trunk/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedWebMetaData.java
trunk/src/main/resources/samples/jaxrpc/docstyle/build.xml
trunk/src/main/resources/samples/jaxrpc/dynamichandler/build.xml
trunk/src/main/resources/samples/jaxrpc/exception/build.xml
trunk/src/main/resources/samples/jaxrpc/handler/build.xml
trunk/src/main/resources/samples/jaxrpc/holder/build.xml
trunk/src/main/resources/samples/jaxrpc/jmstransport/build.xml
trunk/src/main/resources/samples/jaxrpc/jsr109ejb/build.xml
trunk/src/main/resources/samples/jaxrpc/jsr109pojo/build.xml
trunk/src/main/resources/samples/jaxrpc/message/build.xml
trunk/src/main/resources/samples/jaxrpc/mtom/build.xml
trunk/src/main/resources/samples/jaxrpc/oneway/build.xml
trunk/src/main/resources/samples/jaxrpc/rpcstyle/build.xml
trunk/src/main/resources/samples/jaxrpc/secureejb/build.xml
trunk/src/main/resources/samples/jaxrpc/swa/build.xml
trunk/src/main/resources/samples/jaxrpc/wsbpel/build.xml
trunk/src/main/resources/samples/jaxrpc/wseventing/build.xml
trunk/src/main/resources/samples/jaxrpc/wssecurity/build.xml
trunk/src/main/resources/samples/jaxws/jsr181ejb/build.xml
trunk/src/main/resources/samples/jaxws/jsr181pojo/build.xml
trunk/src/main/resources/samples/jaxws/wsaddressing/build.xml
trunk/src/test/ant/build-interop-jars.xml
trunk/src/test/ant/build-jars-jaxrpc.xml
trunk/src/test/ant/build-jars-jaxws.xml
trunk/src/test/build.xml
trunk/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss-client.xml
trunk/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss.xml
trunk/src/test/resources/jaxrpc/samples/jsr109pojo/rpclit/META-INF/jboss-client.xml
Log:
Implement wsdl-publish-location
Change ${build.test.dir} to ${build.tests.dir}
Modified: trunk/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedApplicationMetaData.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedApplicationMetaData.java 2006-11-22 15:29:15 UTC (rev 1502)
+++ trunk/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedApplicationMetaData.java 2006-11-22 15:50:49 UTC (rev 1503)
@@ -24,10 +24,8 @@
//$Id$
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
-import java.util.Map;
/**
* The container independent top level meta data from the jboss.xml and ejb-jar.xml descriptor.
@@ -48,7 +46,7 @@
/** The security-domain value assigned to the application */
private String securityDomain;
/** A HashMap<String, String> for webservice description publish locations */
- private Map<String, String> wsdlPublishLocationMap = new HashMap<String, String>();
+ private PublishLocationAdapter publishLocationAdapter;
public UnifiedBeanMetaData getBeanByEjbName(String ejbName)
{
@@ -112,14 +110,22 @@
this.securityDomain = securityDomain;
}
- public void setWsdlPublishLocationMap(Map<String, String> wsdlPublishLocationMap)
+ public void setPublishLocationAdapter(PublishLocationAdapter publishLocationAdapter)
{
- this.wsdlPublishLocationMap = wsdlPublishLocationMap;
+ this.publishLocationAdapter = publishLocationAdapter;
}
public String getWsdlPublishLocationByName(String name)
{
- // if not found, the we will use default
- return wsdlPublishLocationMap.get(name);
+ String publishLocation = null;
+ if (publishLocationAdapter != null)
+ publishLocation = publishLocationAdapter.getWsdlPublishLocationByName(name);
+ return publishLocation;
+
}
+
+ public interface PublishLocationAdapter
+ {
+ String getWsdlPublishLocationByName(String name);
+ }
}
Modified: trunk/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedWebMetaData.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedWebMetaData.java 2006-11-22 15:29:15 UTC (rev 1502)
+++ trunk/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedWebMetaData.java 2006-11-22 15:50:49 UTC (rev 1503)
@@ -48,10 +48,10 @@
/** The security-domain value assigned to the application */
private String securityDomain;
/** A HashMap<String, String> for webservice description publish locations */
- private Map<String, String> wsdlPublishLocationMap = new HashMap<String, String>();
+ private PublishLocationAdapter publishLocationAdapter;
/** web.xml security-constraints */
private List<UnifiedWebSecurityMetaData> securityMetaData;
-
+
public String getContextRoot()
{
return contextRoot;
@@ -121,16 +121,23 @@
{
this.securityMetaData = securityMetaData;
}
-
- public void setWsdlPublishLocationMap(Map<String, String> wsdlPublishLocationMap)
+
+ public void setPublishLocationAdapter(PublishLocationAdapter publishLocationAdapter)
{
- this.wsdlPublishLocationMap = wsdlPublishLocationMap;
+ this.publishLocationAdapter = publishLocationAdapter;
}
public String getWsdlPublishLocationByName(String name)
{
- // if not found, the we will use default
- return wsdlPublishLocationMap.get(name);
- }
-
+ String publishLocation = null;
+ if (publishLocationAdapter != null)
+ publishLocation = publishLocationAdapter.getWsdlPublishLocationByName(name);
+ return publishLocation;
+
+ }
+
+ public interface PublishLocationAdapter
+ {
+ String getWsdlPublishLocationByName(String name);
+ }
}
Modified: trunk/src/main/resources/samples/jaxrpc/docstyle/build.xml
===================================================================
--- trunk/src/main/resources/samples/jaxrpc/docstyle/build.xml 2006-11-22 15:29:15 UTC (rev 1502)
+++ trunk/src/main/resources/samples/jaxrpc/docstyle/build.xml 2006-11-22 15:50:49 UTC (rev 1503)
@@ -16,18 +16,18 @@
<!-- Define a taskdef for the wstools ant task -->
<taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
<classpath refid="compile.classpath"/>
- <classpath path="${build.test.dir}/classes"/>
+ <classpath path="${build.tests.dir}/classes"/>
</taskdef>
<!-- samples/docstyle/bare -->
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/docstyle/bare/WEB-INF"
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/docstyle/bare/WEB-INF"
config="${resources.dir}/bare/wstools-config.xml"/>
<!-- samples/docstyle/wrapped -->
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF"
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF"
config="${resources.dir}/wrapped/wstools-config.xml"/>
- <move todir="${build.test.dir}/wstools/java">
- <fileset dir="${build.test.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF"
+ <move todir="${build.tests.dir}/wstools/java">
+ <fileset dir="${build.tests.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF"
includes="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/*.java"/>
</move>
@@ -39,60 +39,60 @@
<target name="jars" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" description="build the deployments">
<!-- jaxrpc-samples-docstyle-bare -->
- <war warfile="${build.test.dir}/libs/jaxrpc-samples-docstyle-bare.war" webxml="${build.test.dir}/resources/jaxrpc/samples/docstyle/bare/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-samples-docstyle-bare.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/docstyle/bare/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialEndpointJSE.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialService.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialOrder.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialOrderResponse.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/docstyle/bare/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/docstyle/bare/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-docstyle-bare-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-docstyle-bare-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialService.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialOrder.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialOrderResponse.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/docstyle/bare/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/docstyle/bare/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/docstyle/bare/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/docstyle/bare/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
</jar>
<!-- jaxrpc-samples-docstyle-wrapped -->
- <war warfile="${build.test.dir}/libs/jaxrpc-samples-docstyle-wrapped.war" webxml="${build.test.dir}/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-samples-docstyle-wrapped.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialEndpointJSE.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService*RequestStruct.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService*ResponseStruct.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-docstyle-wrapped-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-docstyle-wrapped-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService*RequestStruct.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService*ResponseStruct.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/docstyle/wrapped/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/docstyle/wrapped/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
Modified: trunk/src/main/resources/samples/jaxrpc/dynamichandler/build.xml
===================================================================
--- trunk/src/main/resources/samples/jaxrpc/dynamichandler/build.xml 2006-11-22 15:29:15 UTC (rev 1502)
+++ trunk/src/main/resources/samples/jaxrpc/dynamichandler/build.xml 2006-11-22 15:50:49 UTC (rev 1503)
@@ -16,11 +16,11 @@
<!-- Define a taskdef for the wstools ant task -->
<taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
<classpath refid="compile.classpath"/>
- <classpath path="${build.test.dir}/classes"/>
+ <classpath path="${build.tests.dir}/classes"/>
</taskdef>
<!-- samples/dynaminchandler -->
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/dynamichandler/WEB-INF"
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/dynamichandler/WEB-INF"
config="${resources.dir}/wstools-config.xml"/>
</target>
@@ -31,28 +31,28 @@
<target name="jars" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" description="build the deployments">
<!-- jaxrpc-samples-dynamichandler -->
- <war warfile="${build.test.dir}/libs/jaxrpc-samples-dynamichandler.war" webxml="${build.test.dir}/resources/jaxrpc/samples/dynamichandler/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-samples-dynamichandler.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/dynamichandler/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*Service.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*ServiceBean.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*Handler.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/dynamichandler/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/dynamichandler/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-dynamichandler-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-dynamichandler-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*Service.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*Handler.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/dynamichandler/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/dynamichandler/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/dynamichandler/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/dynamichandler/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
Modified: trunk/src/main/resources/samples/jaxrpc/exception/build.xml
===================================================================
--- trunk/src/main/resources/samples/jaxrpc/exception/build.xml 2006-11-22 15:29:15 UTC (rev 1502)
+++ trunk/src/main/resources/samples/jaxrpc/exception/build.xml 2006-11-22 15:50:49 UTC (rev 1503)
@@ -16,11 +16,11 @@
<!-- Define a taskdef for the wstools ant task -->
<taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
<classpath refid="compile.classpath"/>
- <classpath path="${build.test.dir}/classes"/>
+ <classpath path="${build.tests.dir}/classes"/>
</taskdef>
<!-- samples/exception -->
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/exception/WEB-INF"
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/exception/WEB-INF"
config="${resources.dir}/wstools-config.xml"/>
</target>
@@ -31,29 +31,29 @@
<target name="jars" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" description="build the deployments">
<!-- jaxrpc-samples-exception -->
- <war destfile="${build.test.dir}/libs/jaxrpc-samples-exception.war" webxml="${build.test.dir}/resources/jaxrpc/samples/exception/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war destfile="${build.tests.dir}/libs/jaxrpc-samples-exception.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/exception/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/exception/*Exception.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/exception/ServerHandler.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/exception/ExceptionServiceInterface.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/exception/ExceptionBeanImpl.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/exception/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/exception/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar destfile="${build.test.dir}/libs/jaxrpc-samples-exception-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxrpc-samples-exception-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/exception/*Exception.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/exception/ExceptionServiceInterface.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/exception/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/exception/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/exception/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/exception/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
Modified: trunk/src/main/resources/samples/jaxrpc/handler/build.xml
===================================================================
--- trunk/src/main/resources/samples/jaxrpc/handler/build.xml 2006-11-22 15:29:15 UTC (rev 1502)
+++ trunk/src/main/resources/samples/jaxrpc/handler/build.xml 2006-11-22 15:50:49 UTC (rev 1503)
@@ -16,11 +16,11 @@
<!-- Define a taskdef for the wstools ant task -->
<taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
<classpath refid="compile.classpath"/>
- <classpath path="${build.test.dir}/classes"/>
+ <classpath path="${build.tests.dir}/classes"/>
</taskdef>
<!-- samples/handler -->
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/handler/WEB-INF"
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/handler/WEB-INF"
config="${resources.dir}/wstools-config.xml"/>
</target>
@@ -31,28 +31,28 @@
<target name="jars" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" description="build the deployments">
<!-- jaxrpc-samples-handler -->
- <war warfile="${build.test.dir}/libs/jaxrpc-samples-handler.war" webxml="${build.test.dir}/resources/jaxrpc/samples/handler/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-samples-handler.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/handler/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/handler/*Service.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/handler/*ServiceBean.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/handler/ServerSideHandler.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/handler/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/handler/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-handler-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-handler-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/handler/*Service.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/handler/ClientSideHandler.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/handler/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/handler/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/handler/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/handler/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
Modified: trunk/src/main/resources/samples/jaxrpc/holder/build.xml
===================================================================
--- trunk/src/main/resources/samples/jaxrpc/holder/build.xml 2006-11-22 15:29:15 UTC (rev 1502)
+++ trunk/src/main/resources/samples/jaxrpc/holder/build.xml 2006-11-22 15:50:49 UTC (rev 1503)
@@ -16,11 +16,11 @@
<!-- Define a taskdef for the wstools ant task -->
<taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
<classpath refid="compile.classpath"/>
- <classpath path="${build.test.dir}/classes"/>
+ <classpath path="${build.tests.dir}/classes"/>
</taskdef>
<!-- samples/holder -->
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/holder/WEB-INF"
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/holder/WEB-INF"
config="${resources.dir}/wstools-config.xml"/>
</target>
@@ -31,26 +31,26 @@
<target name="jars" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" description="build the deployments">
<!-- jaxrpc-samples-holder -->
- <war warfile="${build.test.dir}/libs/jaxrpc-samples-holder.war" webxml="${build.test.dir}/resources/jaxrpc/samples/holder/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-samples-holder.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/holder/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/holder/*Service.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/holder/*ServiceBean.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/holder/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/holder/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-holder-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-holder-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/holder/*Service.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/holder/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/holder/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/holder/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/holder/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
Modified: trunk/src/main/resources/samples/jaxrpc/jmstransport/build.xml
===================================================================
--- trunk/src/main/resources/samples/jaxrpc/jmstransport/build.xml 2006-11-22 15:29:15 UTC (rev 1502)
+++ trunk/src/main/resources/samples/jaxrpc/jmstransport/build.xml 2006-11-22 15:50:49 UTC (rev 1503)
@@ -16,11 +16,11 @@
<!-- Define a taskdef for the wstools ant task -->
<taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
<classpath refid="compile.classpath"/>
- <classpath path="${build.test.dir}/classes"/>
+ <classpath path="${build.tests.dir}/classes"/>
</taskdef>
<!-- samples/jmstransport -->
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/jmstransport/META-INF"
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/jmstransport/META-INF"
config="${resources.dir}/wstools-config.xml"/>
</target>
@@ -31,12 +31,12 @@
<target name="jars" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" description="build the deployments">
<!-- jaxrpc-samples-jmstransport -->
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-jmstransport.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-jmstransport.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/jmstransport/Organization.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/jmstransport/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/jmstransport/META-INF">
<include name="ejb-jar.xml"/>
<include name="jboss.xml"/>
<include name="webservices.xml"/>
@@ -44,11 +44,11 @@
<include name="wsdl/**"/>
</metainf>
</jar>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-jmstransport.sar">
- <fileset dir="${build.test.dir}/libs">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-jmstransport.sar">
+ <fileset dir="${build.tests.dir}/libs">
<include name="jaxrpc-samples-jmstransport.jar"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/jmstransport/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/jmstransport/META-INF">
<include name="jboss-service.xml"/>
</metainf>
</jar>
Modified: trunk/src/main/resources/samples/jaxrpc/jsr109ejb/build.xml
===================================================================
--- trunk/src/main/resources/samples/jaxrpc/jsr109ejb/build.xml 2006-11-22 15:29:15 UTC (rev 1502)
+++ trunk/src/main/resources/samples/jaxrpc/jsr109ejb/build.xml 2006-11-22 15:50:49 UTC (rev 1503)
@@ -16,15 +16,15 @@
<!-- Define a taskdef for the wstools ant task -->
<taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
<classpath refid="compile.classpath"/>
- <classpath path="${build.test.dir}/classes"/>
+ <classpath path="${build.tests.dir}/classes"/>
</taskdef>
<!-- samples/jsr109ejb/doclit -->
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF"
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF"
config="${resources.dir}/doclit/wstools-config.xml"/>
<!-- samples/jsr109ejb/rpclit -->
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF"
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF"
config="${resources.dir}/rpclit/wstools-config.xml"/>
</target>
@@ -35,13 +35,13 @@
<target name="jars" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" description="build the deployments">
<!-- jaxrpc-samples-jsr109ejb-rpc -->
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-jsr109ejb-rpc.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-jsr109ejb-rpc.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Type.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Service.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*EJBEndpoint.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF">
<include name="ejb-jar.xml"/>
<include name="jboss.xml"/>
<include name="jaxrpc-mapping.xml"/>
@@ -49,12 +49,12 @@
<include name="wsdl/**"/>
</metainf>
</jar>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-jsr109ejb-rpc-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-jsr109ejb-rpc-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Type.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Service.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jaxrpc-mapping.xml"/>
@@ -63,14 +63,14 @@
</jar>
<!-- jaxrpc-samples-jsr109ejb-doc -->
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-jsr109ejb-doc.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-jsr109ejb-doc.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Type.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Struct.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Service.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*EJBEndpoint.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF">
<include name="ejb-jar.xml"/>
<include name="jboss.xml"/>
<include name="jaxrpc-mapping.xml"/>
@@ -78,13 +78,13 @@
<include name="wsdl/**"/>
</metainf>
</jar>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-jsr109ejb-doc-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-jsr109ejb-doc-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Type.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Struct.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Service.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jaxrpc-mapping.xml"/>
Modified: trunk/src/main/resources/samples/jaxrpc/jsr109pojo/build.xml
===================================================================
--- trunk/src/main/resources/samples/jaxrpc/jsr109pojo/build.xml 2006-11-22 15:29:15 UTC (rev 1502)
+++ trunk/src/main/resources/samples/jaxrpc/jsr109pojo/build.xml 2006-11-22 15:50:49 UTC (rev 1503)
@@ -16,15 +16,15 @@
<!-- Define a taskdef for the wstools ant task -->
<taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
<classpath refid="compile.classpath"/>
- <classpath path="${build.test.dir}/classes"/>
+ <classpath path="${build.tests.dir}/classes"/>
</taskdef>
<!-- samples/jsr109pojo/doclit -->
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF"
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF"
config="${resources.dir}/doclit/wstools-config.xml"/>
<!-- samples/jsr109pojo/rpclit -->
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF"
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF"
config="${resources.dir}/rpclit/wstools-config.xml"/>
</target>
@@ -35,58 +35,58 @@
<target name="jars" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" description="build the deployments">
<!-- jaxrpc-samples-jsr109pojo-rpc -->
- <war warfile="${build.test.dir}/libs/jaxrpc-samples-jsr109pojo-rpc.war" webxml="${build.test.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-samples-jsr109pojo-rpc.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Type.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Service.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*JSEEndpoint.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-jsr109pojo-rpc-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-jsr109pojo-rpc-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Type.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Service.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
</jar>
<!-- jaxrpc-samples-jsr109pojo-doc -->
- <war warfile="${build.test.dir}/libs/jaxrpc-samples-jsr109pojo-doc.war" webxml="${build.test.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-samples-jsr109pojo-doc.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Type.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Struct.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Service.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*JSEEndpoint.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-jsr109pojo-doc-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-jsr109pojo-doc-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Type.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Struct.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Service.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
Modified: trunk/src/main/resources/samples/jaxrpc/message/build.xml
===================================================================
--- trunk/src/main/resources/samples/jaxrpc/message/build.xml 2006-11-22 15:29:15 UTC (rev 1502)
+++ trunk/src/main/resources/samples/jaxrpc/message/build.xml 2006-11-22 15:50:49 UTC (rev 1503)
@@ -16,11 +16,11 @@
<!-- Define a taskdef for the wstools ant task -->
<taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
<classpath refid="compile.classpath"/>
- <classpath path="${build.test.dir}/classes"/>
+ <classpath path="${build.tests.dir}/classes"/>
</taskdef>
<!-- samples/message -->
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/message/WEB-INF"
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/message/WEB-INF"
config="${resources.dir}/wstools-config.xml"/>
</target>
@@ -31,26 +31,26 @@
<target name="jars" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" description="build the deployments">
<!-- jaxrpc-samples-message -->
- <war warfile="${build.test.dir}/libs/jaxrpc-samples-message.war" webxml="${build.test.dir}/resources/jaxrpc/samples/message/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-samples-message.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/message/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/message/*Service.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/message/*ServiceBean.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/message/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/message/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-message-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-message-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/message/*Service.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/message/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/message/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/message/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/message/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
Modified: trunk/src/main/resources/samples/jaxrpc/mtom/build.xml
===================================================================
--- trunk/src/main/resources/samples/jaxrpc/mtom/build.xml 2006-11-22 15:29:15 UTC (rev 1502)
+++ trunk/src/main/resources/samples/jaxrpc/mtom/build.xml 2006-11-22 15:50:49 UTC (rev 1503)
@@ -16,11 +16,11 @@
<!-- Define a taskdef for the wstools ant task -->
<taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
<classpath refid="compile.classpath"/>
- <classpath path="${build.test.dir}/classes"/>
+ <classpath path="${build.tests.dir}/classes"/>
</taskdef>
<!-- samples/mtom - ->
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/mtom/WEB-INF"
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/mtom/WEB-INF"
config="${resources.dir}/wstools-config.xml"/>
-->
@@ -32,23 +32,23 @@
<target name="jars" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" description="build the deployments">
<!-- jaxrpc-samples-mtom -->
- <war warfile="${build.test.dir}/libs/jaxrpc-samples-mtom.war" webxml="${build.test.dir}/resources/jaxrpc/samples/mtom/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-samples-mtom.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/mtom/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/mtom/XOPTestImpl.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/mtom/XOPTest.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/mtom/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/mtom/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar destfile="${build.test.dir}/libs/jaxrpc-samples-mtom-client.jar">
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/mtom/META-INF">
+ <jar destfile="${build.tests.dir}/libs/jaxrpc-samples-mtom-client.jar">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/mtom/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/mtom/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/mtom/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
Modified: trunk/src/main/resources/samples/jaxrpc/oneway/build.xml
===================================================================
--- trunk/src/main/resources/samples/jaxrpc/oneway/build.xml 2006-11-22 15:29:15 UTC (rev 1502)
+++ trunk/src/main/resources/samples/jaxrpc/oneway/build.xml 2006-11-22 15:50:49 UTC (rev 1503)
@@ -16,11 +16,11 @@
<!-- Define a taskdef for the wstools ant task -->
<taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
<classpath refid="compile.classpath"/>
- <classpath path="${build.test.dir}/classes"/>
+ <classpath path="${build.tests.dir}/classes"/>
</taskdef>
<!-- samples/oneway -->
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/oneway/WEB-INF"
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/oneway/WEB-INF"
config="${resources.dir}/wstools-config.xml"/>
</target>
@@ -31,26 +31,26 @@
<target name="jars" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" description="build the deployments">
<!-- jaxrpc-samples-oneway -->
- <war warfile="${build.test.dir}/libs/jaxrpc-samples-oneway.war" webxml="${build.test.dir}/resources/jaxrpc/samples/oneway/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-samples-oneway.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/oneway/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/oneway/*Service.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/oneway/*ServiceBean.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/oneway/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/oneway/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-oneway-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-oneway-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/oneway/*Service.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/oneway/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/oneway/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/oneway/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/oneway/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
Modified: trunk/src/main/resources/samples/jaxrpc/rpcstyle/build.xml
===================================================================
--- trunk/src/main/resources/samples/jaxrpc/rpcstyle/build.xml 2006-11-22 15:29:15 UTC (rev 1502)
+++ trunk/src/main/resources/samples/jaxrpc/rpcstyle/build.xml 2006-11-22 15:50:49 UTC (rev 1503)
@@ -16,11 +16,11 @@
<!-- Define a taskdef for the wstools ant task -->
<taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
<classpath refid="compile.classpath"/>
- <classpath path="${build.test.dir}/classes"/>
+ <classpath path="${build.tests.dir}/classes"/>
</taskdef>
<!-- samples/rpcstyle -->
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/rpcstyle/WEB-INF"
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/rpcstyle/WEB-INF"
config="${resources.dir}/wstools-config.xml"/>
</target>
@@ -31,26 +31,26 @@
<target name="jars" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" description="build the deployments">
<!-- jaxrpc-samples-rpcstyle -->
- <war warfile="${build.test.dir}/libs/jaxrpc-samples-rpcstyle.war" webxml="${build.test.dir}/resources/jaxrpc/samples/rpcstyle/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-samples-rpcstyle.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/rpcstyle/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialEndpointJSE.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialService.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/rpcstyle/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/rpcstyle/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-rpcstyle-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-rpcstyle-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialService.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/rpcstyle/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/rpcstyle/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/rpcstyle/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/rpcstyle/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
Modified: trunk/src/main/resources/samples/jaxrpc/secureejb/build.xml
===================================================================
--- trunk/src/main/resources/samples/jaxrpc/secureejb/build.xml 2006-11-22 15:29:15 UTC (rev 1502)
+++ trunk/src/main/resources/samples/jaxrpc/secureejb/build.xml 2006-11-22 15:50:49 UTC (rev 1503)
@@ -16,11 +16,11 @@
<!-- Define a taskdef for the wstools ant task -->
<taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
<classpath refid="compile.classpath"/>
- <classpath path="${build.test.dir}/classes"/>
+ <classpath path="${build.tests.dir}/classes"/>
</taskdef>
<!-- samples/secureejb -->
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/secureejb/META-INF"
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/secureejb/META-INF"
config="${resources.dir}/wstools-config.xml"/>
</target>
@@ -31,14 +31,14 @@
<target name="jars" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" description="build the deployments">
<!-- jaxrpc-samples-secureejb -->
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-secureejb.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-secureejb.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationService.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationHome.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationRemote.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationImpl.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/secureejb/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/secureejb/META-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="ejb-jar.xml"/>
@@ -46,13 +46,13 @@
<include name="wsdl/**"/>
</metainf>
</jar>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-secureejb-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-secureejb-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationService.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationHome.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationRemote.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/secureejb/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/secureejb/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jaxrpc-mapping.xml"/>
Modified: trunk/src/main/resources/samples/jaxrpc/swa/build.xml
===================================================================
--- trunk/src/main/resources/samples/jaxrpc/swa/build.xml 2006-11-22 15:29:15 UTC (rev 1502)
+++ trunk/src/main/resources/samples/jaxrpc/swa/build.xml 2006-11-22 15:50:49 UTC (rev 1503)
@@ -16,11 +16,11 @@
<!-- Define a taskdef for the wstools ant task -->
<taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
<classpath refid="compile.classpath"/>
- <classpath path="${build.test.dir}/classes"/>
+ <classpath path="${build.tests.dir}/classes"/>
</taskdef>
<!-- samples/swa - ->
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/swa/WEB-INF"
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/swa/WEB-INF"
config="${resources.dir}/wstools-config.xml"/>
-->
@@ -32,26 +32,26 @@
<target name="jars" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" description="build the deployments">
<!-- jaxrpc-samples-swa -->
- <war warfile="${build.test.dir}/libs/jaxrpc-samples-swa.war" webxml="${build.test.dir}/resources/jaxrpc/samples/swa/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-samples-swa.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/swa/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/swa/AttachmentImpl.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/swa/Attachment.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/swa/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/swa/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar destfile="${build.test.dir}/libs/jaxrpc-samples-swa-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxrpc-samples-swa-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/swa/Attachment.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/swa/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/swa/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/swa/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/swa/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
Modified: trunk/src/main/resources/samples/jaxrpc/wsbpel/build.xml
===================================================================
--- trunk/src/main/resources/samples/jaxrpc/wsbpel/build.xml 2006-11-22 15:29:15 UTC (rev 1502)
+++ trunk/src/main/resources/samples/jaxrpc/wsbpel/build.xml 2006-11-22 15:50:49 UTC (rev 1503)
@@ -47,8 +47,8 @@
description="Generate the deployment resources.">
<!-- Package the BPEL process and related WSDL interfaces -->
- <zip destfile="${build.test.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip">
- <fileset dir="${build.test.dir}/resources/jaxrpc/samples/wsbpel/hello/bpel" />
+ <zip destfile="${build.tests.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip">
+ <fileset dir="${build.tests.dir}/resources/jaxrpc/samples/wsbpel/hello/bpel" />
</zip>
<!-- Define the servicegen ant task -->
@@ -58,24 +58,24 @@
</taskdef>
<!-- Generate binding and service elements -->
- <servicegen processfile="${build.test.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip"
- outputdir="${build.test.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/wsdl" />
+ <servicegen processfile="${build.tests.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip"
+ outputdir="${build.tests.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/wsdl" />
<!-- Define the wstools ant task -->
<taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
<classpath>
<path refid="client.classpath" />
- <path location="${build.test.dir}" />
+ <path location="${build.tests.dir}" />
<path location="${common.resources}" />
</classpath>
</taskdef>
<!-- samples/wsbpel -->
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF"
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF"
config="${resources.dir}/hello/wstools-config.xml" />
- <move todir="${build.test.dir}/wstools/java">
- <fileset dir="${build.test.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF"
+ <move todir="${build.tests.dir}/wstools/java">
+ <fileset dir="${build.tests.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF"
includes="org/**" />
</move>
</target>
@@ -86,33 +86,33 @@
description="build the deployments">
<!-- jaxrpc-samples-wsbpel -->
- <war warfile="${build.test.dir}/libs/jaxrpc-samples-wsbpel-hello.war"
- webxml="${build.test.dir}/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-samples-wsbpel-hello.war"
+ webxml="${build.tests.dir}/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/HelloWorldService.class" />
<include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/Greeter.class" />
<include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/Greeter_Impl.class" />
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wsbpel/hello/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/wsbpel/hello/WEB-INF">
<include name="webservices.xml" />
<include name="classes/bpel-application.xml" />
</webinf>
- <webinf dir="${build.test.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF">
+ <webinf dir="${build.tests.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF">
<include name="jaxrpc-mapping.xml" />
<include name="wsdl/**" />
</webinf>
</war>
- <jar destfile="${build.test.dir}/libs/jaxrpc-samples-wsbpel-hello-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxrpc-samples-wsbpel-hello-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/HelloWorldService.class" />
<include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/Greeter.class" />
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/wsbpel/hello/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/wsbpel/hello/META-INF">
<include name="application-client.xml" />
<include name="jboss-client.xml" />
</metainf>
- <metainf dir="${build.test.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF">
+ <metainf dir="${build.tests.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF">
<include name="jaxrpc-mapping.xml" />
</metainf>
</jar>
Modified: trunk/src/main/resources/samples/jaxrpc/wseventing/build.xml
===================================================================
--- trunk/src/main/resources/samples/jaxrpc/wseventing/build.xml 2006-11-22 15:29:15 UTC (rev 1502)
+++ trunk/src/main/resources/samples/jaxrpc/wseventing/build.xml 2006-11-22 15:50:49 UTC (rev 1503)
@@ -16,12 +16,12 @@
<!-- Define a taskdef for the wstools ant task -->
<taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
<classpath refid="compile.classpath"/>
- <classpath path="${build.test.dir}/classes"/>
- <classpath path="${build.test.dir}"/>
+ <classpath path="${build.tests.dir}/classes"/>
+ <classpath path="${build.tests.dir}"/>
</taskdef>
<!-- samples/wseventing
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/wseventing/WEB-INF"
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/wseventing/WEB-INF"
config="${resources.dir}/wstools-config.xml"/>
-->
@@ -33,26 +33,26 @@
<target name="jars" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" description="build the deployments">
<!-- jaxrpc-samples-eventing.war -->
- <war warfile="${build.test.dir}/libs/jaxrpc-samples-wseventing.war" webxml="${build.test.dir}/resources/jaxrpc/samples/wseventing/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-samples-wseventing.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/wseventing/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/ws/samples/wseventing/*.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/wseventing/*.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wseventing/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/wseventing/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-wseventing-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-wseventing-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/ws/samples/wseventing/*.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/wseventing/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/wseventing/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/wseventing/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/wseventing/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
Modified: trunk/src/main/resources/samples/jaxrpc/wssecurity/build.xml
===================================================================
--- trunk/src/main/resources/samples/jaxrpc/wssecurity/build.xml 2006-11-22 15:29:15 UTC (rev 1502)
+++ trunk/src/main/resources/samples/jaxrpc/wssecurity/build.xml 2006-11-22 15:50:49 UTC (rev 1503)
@@ -16,11 +16,11 @@
<!-- Define a taskdef for the wstools ant task -->
<taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
<classpath refid="compile.classpath"/>
- <classpath path="${build.test.dir}/classes"/>
+ <classpath path="${build.tests.dir}/classes"/>
</taskdef>
<!-- samples/wssecurity -->
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/wssecurity/WEB-INF"
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/wssecurity/WEB-INF"
config="${resources.dir}/wstools-config.xml"/>
</target>
@@ -31,74 +31,74 @@
<target name="jars" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" description="build the deployments">
<!-- jaxrpc-samples-wssecurity-sign -->
- <war warfile="${build.test.dir}/libs/jaxrpc-samples-wssecurity-sign.war" webxml="${build.test.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-samples-wssecurity-sign.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/HelloJavaBean.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
<include name="jboss-web.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/simple-sign">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/simple-sign">
<include name="jboss-wsse-server.xml"/>
</webinf>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/wssecurity">
<include name="wsse.keystore"/>
<include name="wsse.truststore"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-wssecurity-sign-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-wssecurity-sign-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/simple-sign/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/simple-sign/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jboss-wsse-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
</jar>
<!-- jaxrpc-samples-wssecurity-encrypt -->
- <war warfile="${build.test.dir}/libs/jaxrpc-samples-wssecurity-encrypt.war" webxml="${build.test.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-samples-wssecurity-encrypt.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/HelloJavaBean.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
<include name="jboss-web.xml"/>
<include name="webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</webinf>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/simple-encrypt">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/simple-encrypt">
<include name="jboss-wsse-server.xml"/>
</webinf>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/wssecurity">
<include name="wsse.keystore"/>
<include name="wsse.truststore"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-wssecurity-encrypt-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-wssecurity-encrypt-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/simple-encrypt/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/simple-encrypt/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jboss-wsse-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
Modified: trunk/src/main/resources/samples/jaxws/jsr181ejb/build.xml
===================================================================
--- trunk/src/main/resources/samples/jaxws/jsr181ejb/build.xml 2006-11-22 15:29:15 UTC (rev 1502)
+++ trunk/src/main/resources/samples/jaxws/jsr181ejb/build.xml 2006-11-22 15:50:49 UTC (rev 1503)
@@ -17,12 +17,12 @@
<!-- Define a taskdef for the wstools ant task -->
<taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
<classpath refid="compile.classpath"/>
- <classpath path="${build.test.dir}/classes"/>
- <classpath path="${build.test.dir}"/>
+ <classpath path="${build.tests.dir}/classes"/>
+ <classpath path="${build.tests.dir}"/>
</taskdef>
<!-- samples/jsr181ejb -->
- <wstools dest="${build.test.dir}/wstools/resources/jaxws/samples/jsr181ejb/META-INF"
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxws/samples/jsr181ejb/META-INF"
config="${resources.dir}/wstools-config.xml"/>
</target>
@@ -34,20 +34,20 @@
description="build the deployments" if="HAVE_JDK_1.5">
<!-- jaxws-samples-jsr181ejb -->
- <jar jarfile="${build.test.dir}/libs/jaxws-samples-jsr181ejb.ejb3">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxws-samples-jsr181ejb.ejb3">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/samples/jsr181ejb/EJB3Bean01.class"/>
<include name="org/jboss/test/ws/jaxws/samples/jsr181ejb/EJB3RemoteInterface.class"/>
</fileset>
- <fileset dir="${build.test.dir}/resources/jaxws/samples/jsr181ejb">
+ <fileset dir="${build.tests.dir}/resources/jaxws/samples/jsr181ejb">
<include name="config/ServerHandlers.xml"/>
</fileset>
</jar>
- <jar jarfile="${build.test.dir}/libs/jaxws-samples-jsr181ejb-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxws-samples-jsr181ejb-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/samples/jsr181ejb/EndpointInterface.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxws/samples/jsr181ejb/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxws/samples/jsr181ejb/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jaxrpc-mapping.xml"/>
Modified: trunk/src/main/resources/samples/jaxws/jsr181pojo/build.xml
===================================================================
--- trunk/src/main/resources/samples/jaxws/jsr181pojo/build.xml 2006-11-22 15:29:15 UTC (rev 1502)
+++ trunk/src/main/resources/samples/jaxws/jsr181pojo/build.xml 2006-11-22 15:50:49 UTC (rev 1503)
@@ -17,12 +17,12 @@
<!-- Define a taskdef for the wstools ant task -->
<taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
<classpath refid="compile.classpath"/>
- <classpath path="${build.test.dir}/classes"/>
- <classpath path="${build.test.dir}"/>
+ <classpath path="${build.tests.dir}/classes"/>
+ <classpath path="${build.tests.dir}"/>
</taskdef>
<!-- samples/jsr181pojo -->
- <wstools dest="${build.test.dir}/wstools/resources/jaxws/samples/jsr181pojo/META-INF"
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxws/samples/jsr181pojo/META-INF"
config="${resources.dir}/wstools-config.xml"/>
</target>
@@ -34,16 +34,16 @@
description="build the deployments" if="HAVE_JDK_1.5">
<!-- jaxws-samples-jsr181pojo -->
- <war warfile="${build.test.dir}/libs/jaxws-samples-jsr181pojo.war" webxml="${build.test.dir}/resources/jaxws/samples/jsr181pojo/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxws-samples-jsr181pojo.war" webxml="${build.tests.dir}/resources/jaxws/samples/jsr181pojo/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/JSEBean01.class"/>
</classes>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxws-samples-jsr181pojo-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxws-samples-jsr181pojo-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/EndpointInterface.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxws/samples/jsr181pojo/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxws/samples/jsr181pojo/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jaxrpc-mapping.xml"/>
Modified: trunk/src/main/resources/samples/jaxws/wsaddressing/build.xml
===================================================================
--- trunk/src/main/resources/samples/jaxws/wsaddressing/build.xml 2006-11-22 15:29:15 UTC (rev 1502)
+++ trunk/src/main/resources/samples/jaxws/wsaddressing/build.xml 2006-11-22 15:50:49 UTC (rev 1503)
@@ -17,12 +17,12 @@
<!-- Define a taskdef for the wstools ant task -->
<taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
<classpath refid="compile.classpath"/>
- <classpath path="${build.test.dir}/classes"/>
- <classpath path="${build.test.dir}"/>
+ <classpath path="${build.tests.dir}/classes"/>
+ <classpath path="${build.tests.dir}"/>
</taskdef>
<!-- samples/wsaddressing -->
- <wstools dest="${build.test.dir}/wstools/resources/jaxws/samples/wsaddressing/META-INF"
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxws/samples/wsaddressing/META-INF"
config="${resources.dir}/wstools-config.xml"/>
</target>
@@ -33,22 +33,22 @@
description="build the deployments" if="HAVE_JDK_1.5">
<!-- jaxws-samples-wsaddressing -->
- <war warfile="${build.test.dir}/libs/jaxws-samples-wsaddressing.war" webxml="${build.test.dir}/resources/jaxws/samples/wsaddressing/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxws-samples-wsaddressing.war" webxml="${build.tests.dir}/resources/jaxws/samples/wsaddressing/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpointImpl.class"/>
<include name="org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpoint.class"/>
<include name="org/jboss/test/ws/jaxws/samples/wsaddressing/ServerHandler.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxws/samples/wsaddressing/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxws/samples/wsaddressing/WEB-INF">
<include name="jaxws-handlers.xml"/>
</webinf>
</war>
- <jar destfile="${build.test.dir}/libs/jaxws-samples-wsaddressing-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxws-samples-wsaddressing-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpoint.class"/>
<include name="org/jboss/test/ws/jaxws/samples/wsaddressing/ClientHandler.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxws/samples/wsaddressing/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxws/samples/wsaddressing/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jbossws-client-config.xml"/>
Modified: trunk/src/test/ant/build-interop-jars.xml
===================================================================
--- trunk/src/test/ant/build-interop-jars.xml 2006-11-22 15:29:15 UTC (rev 1502)
+++ trunk/src/test/ant/build-interop-jars.xml 2006-11-22 15:50:49 UTC (rev 1503)
@@ -18,7 +18,7 @@
<target name="build-interop-jars">
- <mkdir dir="${build.test.dir}/libs/"/>
+ <mkdir dir="${build.tests.dir}/libs/"/>
<!-- Root.war -->
<war warfile="${build.test.dir}/libs/jbossws-interop-root.war"
@@ -32,8 +32,8 @@
</war>
<!-- BaseDataTypesDocLitB client -->
- <jar jarfile="${build.test.dir}/libs/jbossws-interop-BaseDataTypesDocLitB-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jbossws-interop-BaseDataTypesDocLitB-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/interop/microsoft/soapwsdl/BaseDataTypesDocLitB/**/*.class"/>
<include name="org/jboss/test/ws/interop/microsoft/*.class"/>
</fileset>
@@ -49,9 +49,9 @@
</jar>
<!-- BaseDataTypesDocLitB_Service.war -->
- <war warfile="${build.test.dir}/libs/jbossws-interop-BaseDataTypesDocLitB_Service.war"
+ <war warfile="${build.tests.dir}/libs/jbossws-interop-BaseDataTypesDocLitB_Service.war"
webxml="${test.resources.dir}/interop/microsoft/soapwsdl/BaseDataTypesDocLitB_Service/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/interop/microsoft/soapwsdl/BaseDataTypesDocLitB_Service/**/*.class"/>
<include name="org/jboss/test/ws/interop/microsoft/*.class"/>
</classes>
@@ -68,8 +68,8 @@
</war>
<!-- BaseDataTypesDocLitW client -->
- <jar jarfile="${build.test.dir}/libs/jbossws-interop-BaseDataTypesDocLitW-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jbossws-interop-BaseDataTypesDocLitW-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/interop/microsoft/soapwsdl/BaseDataTypesDocLitW/**/*.class"/>
<include name="org/jboss/test/ws/interop/microsoft/*.class"/>
</fileset>
@@ -85,8 +85,8 @@
</jar>
<!-- BaseDataTypesRpcLit client -->
- <jar jarfile="${build.test.dir}/libs/jbossws-interop-BaseDataTypesRpcLit-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jbossws-interop-BaseDataTypesRpcLit-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/interop/microsoft/soapwsdl/BaseDataTypesRpcLit/**/*.class"/>
<include name="org/jboss/test/ws/interop/microsoft/*.class"/>
</fileset>
@@ -102,8 +102,8 @@
</jar>
<!-- ComplexDataTypesDocLitB client -->
- <jar jarfile="${build.test.dir}/libs/jbossws-interop-ComplexDataTypesDocLitB-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jbossws-interop-ComplexDataTypesDocLitB-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/interop/microsoft/soapwsdl/ComplexDataTypesDocLitB/**/*.class"/>
<include name="org/jboss/test/ws/interop/microsoft/*.class"/>
</fileset>
@@ -119,8 +119,8 @@
</jar>
<!-- ComplexDataTypesDocLitW client -->
- <jar jarfile="${build.test.dir}/libs/jbossws-interop-ComplexDataTypesDocLitW-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jbossws-interop-ComplexDataTypesDocLitW-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/interop/microsoft/soapwsdl/ComplexDataTypesDocLitW/**/*.class"/>
<include name="org/jboss/test/ws/interop/microsoft/*.class"/>
</fileset>
@@ -136,8 +136,8 @@
</jar>
<!-- ComplexDataTypesRpcLit client -->
- <jar jarfile="${build.test.dir}/libs/jbossws-interop-ComplexDataTypesRpcLit-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jbossws-interop-ComplexDataTypesRpcLit-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/interop/microsoft/soapwsdl/ComplexDataTypesRpcLit/**/*.class"/>
<include name="org/jboss/test/ws/interop/microsoft/*.class"/>
</fileset>
@@ -153,9 +153,9 @@
</jar>
<!-- BaseDataTypesDocLitW_Service.war -->
- <war warfile="${build.test.dir}/libs/jbossws-interop-BaseDataTypesDocLitW_Service.war"
+ <war warfile="${build.tests.dir}/libs/jbossws-interop-BaseDataTypesDocLitW_Service.war"
webxml="${test.resources.dir}/interop/microsoft/soapwsdl/BaseDataTypesDocLitW_Service/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/interop/microsoft/soapwsdl/BaseDataTypesDocLitW_Service/**/*.class"/>
<include name="org/jboss/test/ws/interop/microsoft/*.class"/>
</classes>
@@ -172,9 +172,9 @@
</war>
<!-- BaseDataTypesRpcLit_Service.war -->
- <war warfile="${build.test.dir}/libs/jbossws-interop-BaseDataTypesRpcLit_Service.war"
+ <war warfile="${build.tests.dir}/libs/jbossws-interop-BaseDataTypesRpcLit_Service.war"
webxml="${test.resources.dir}/interop/microsoft/soapwsdl/BaseDataTypesRpcLit_Service/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/interop/microsoft/soapwsdl/BaseDataTypesRpcLit_Service/**/*.class"/>
<include name="org/jboss/test/ws/interop/microsoft/*.class"/>
</classes>
@@ -191,13 +191,13 @@
</war>
<!-- ComplexDataTypesDocLitB_Service.war -->
- <war warfile="${build.test.dir}/libs/jbossws-interop-ComplexDataTypesDocLitB_Service.war"
+ <war warfile="${build.tests.dir}/libs/jbossws-interop-ComplexDataTypesDocLitB_Service.war"
webxml="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesDocLitB_Service/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/interop/microsoft/soapwsdl/ComplexDataTypesDocLitB_Service/**/*.class"/>
<include name="org/jboss/test/ws/interop/microsoft/*.class"/>
</classes>
- <classes dir="${build.test.dir}/classes">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/interop/microsoft/soapwsdl/ComplexDataTypesShared/**/*.class"/>
</classes>
<webinf dir="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesDocLitB_Service/WEB-INF">
@@ -213,13 +213,13 @@
</war>
<!-- ComplexDataTypesDocLitW_Service.war -->
- <war warfile="${build.test.dir}/libs/jbossws-interop-ComplexDataTypesDocLitW_Service.war"
+ <war warfile="${build.tests.dir}/libs/jbossws-interop-ComplexDataTypesDocLitW_Service.war"
webxml="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesDocLitW_Service/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/interop/microsoft/soapwsdl/ComplexDataTypesDocLitW_Service/**/*.class"/>
<include name="org/jboss/test/ws/interop/microsoft/*.class"/>
</classes>
- <classes dir="${build.test.dir}/classes">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/interop/microsoft/soapwsdl/ComplexDataTypesShared/**/*.class"/>
</classes>
<webinf dir="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesDocLitW_Service/WEB-INF">
@@ -235,13 +235,13 @@
</war>
<!-- ComplexDataTypesRpcLit_Service.war -->
- <war warfile="${build.test.dir}/libs/jbossws-interop-ComplexDataTypesRpcLit_Service.war"
+ <war warfile="${build.tests.dir}/libs/jbossws-interop-ComplexDataTypesRpcLit_Service.war"
webxml="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesRpcLit_Service/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/interop/microsoft/soapwsdl/ComplexDataTypesRpcLit_Service/**/*.class"/>
<include name="org/jboss/test/ws/interop/microsoft/*.class"/>
</classes>
- <classes dir="${build.test.dir}/classes">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/interop/microsoft/soapwsdl/ComplexDataTypesShared/**/*.class"/>
</classes>
<webinf dir="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesRpcLit_Service/WEB-INF">
@@ -257,8 +257,8 @@
</war>
<!-- wsa10 client -->
- <jar jarfile="${build.test.dir}/libs/jbossws-interop-wsa10-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jbossws-interop-wsa10-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/interop/microsoft/addressing/wsa10/**/*.class"/>
<include name="org/jboss/test/ws/interop/microsoft/*.class"/>
</fileset>
@@ -274,9 +274,9 @@
</jar>
<!-- wsaTestService.war -->
- <war warfile="${build.test.dir}/libs/jbossws-interop-wsa10-service.war"
+ <war warfile="${build.tests.dir}/libs/jbossws-interop-wsa10-service.war"
webxml="${test.resources.dir}/interop/microsoft/addressing/wsaTestService/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/interop/microsoft/addressing/wsaTestService/**/*.class"/>
</classes>
<webinf dir="${test.resources.dir}/interop/microsoft/addressing/wsaTestService/WEB-INF">
@@ -325,8 +325,8 @@
</war>
<!-- wsse10 sign client -->
- <jar jarfile="${build.test.dir}/libs/jbossws-interop-wsse10-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jbossws-interop-wsse10-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/interop/microsoft/security/**/*.class"/>
<include name="org/jboss/test/ws/interop/microsoft/*.class"/>
</fileset>
@@ -343,9 +343,9 @@
</jar>
<!-- wsse10Sign.war -->
- <war warfile="${build.test.dir}/libs/jbossws-interop-wsse10Sign.war"
+ <war warfile="${build.tests.dir}/libs/jbossws-interop-wsse10Sign.war"
webxml="${test.resources.dir}/interop/microsoft/security/wsse10/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/interop/microsoft/security/wsse10/**/*.class"/>
<include name="org/jboss/test/ws/interop/microsoft/*.class"/>
</classes>
@@ -366,8 +366,8 @@
</war>
<!-- wsse10Encrypt client -->
- <jar jarfile="${build.test.dir}/libs/jbossws-interop-wsse10Encrypt-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jbossws-interop-wsse10Encrypt-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/interop/microsoft/security/**/*.class"/>
<include name="org/jboss/test/ws/interop/microsoft/*.class"/>
</fileset>
@@ -384,9 +384,9 @@
</jar>
<!-- wsse10Encrypt.war -->
- <war warfile="${build.test.dir}/libs/jbossws-interop-wsse10Encrypt.war"
+ <war warfile="${build.tests.dir}/libs/jbossws-interop-wsse10Encrypt.war"
webxml="${test.resources.dir}/interop/microsoft/security/wsse10Encrypt/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/interop/microsoft/security/wsse10Encrypt/**/*.class"/>
<include name="org/jboss/test/ws/interop/microsoft/*.class"/>
</classes>
@@ -407,9 +407,9 @@
</war>
<!-- mtom-utf8.war -->
- <war warfile="${build.test.dir}/libs/jbossws-interop-mtomUTF8.war"
+ <war warfile="${build.tests.dir}/libs/jbossws-interop-mtomUTF8.war"
webxml="${test.resources.dir}/interop/microsoft/mtom/utf8/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/interop/microsoft/mtom/utf8/**/*.class"/>
<include name="org/jboss/test/ws/interop/microsoft/*.class"/>
</classes>
@@ -425,8 +425,8 @@
</war>
<!-- mtom-utf8 client -->
- <jar jarfile="${build.test.dir}/libs/jbossws-interop-mtomUTF8-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jbossws-interop-mtomUTF8-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/interop/microsoft/mtom/utf8/**/*.class"/>
<include name="org/jboss/test/ws/interop/microsoft/*.class"/>
</fileset>
Modified: trunk/src/test/ant/build-jars-jaxrpc.xml
===================================================================
--- trunk/src/test/ant/build-jars-jaxrpc.xml 2006-11-22 15:29:15 UTC (rev 1502)
+++ trunk/src/test/ant/build-jars-jaxrpc.xml 2006-11-22 15:50:49 UTC (rev 1503)
@@ -19,59 +19,59 @@
<target name="build-jars" description="Build the deployments.">
<!-- jaxrpc-anonymous -->
- <war warfile="${build.test.dir}/libs/jaxrpc-anonymous.war" webxml="${build.test.dir}/resources/jaxrpc/anonymous/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-anonymous.war" webxml="${build.tests.dir}/resources/jaxrpc/anonymous/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/anonymous/AnonymousTypesTestBean.class"/>
<include name="org/jboss/test/ws/jaxrpc/anonymous/AnonymousTypesTestService.class"/>
<include name="org/jboss/test/ws/jaxrpc/anonymous/ComplexTypeRoot.class"/>
<include name="org/jboss/test/ws/jaxrpc/anonymous/ElementTypeRoot.class"/>
<include name="org/jboss/test/ws/jaxrpc/anonymous/ElementTypeInside.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/anonymous/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/anonymous/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar destfile="${build.test.dir}/libs/jaxrpc-anonymous-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxrpc-anonymous-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/anonymous/AnonymousTypesTestService.class"/>
<include name="org/jboss/test/ws/jaxrpc/anonymous/ComplexTypeRoot.class"/>
<include name="org/jboss/test/ws/jaxrpc/anonymous/ElementTypeRoot.class"/>
<include name="org/jboss/test/ws/jaxrpc/anonymous/ElementTypeInside.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/anonymous/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/anonymous/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/anonymous/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/anonymous/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
</jar>
<!-- jaxrpc-benchmark -->
- <war warfile="${build.test.dir}/libs/jaxrpc-benchmark-rpclit.war" webxml="${build.test.dir}/resources/jaxrpc/benchmark/rpclit/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-benchmark-rpclit.war" webxml="${build.tests.dir}/resources/jaxrpc/benchmark/rpclit/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<exclude name="org/jboss/test/ws/jaxrpc/benchmark/*_*.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/benchmark/*EJBEndpoint.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/benchmark/*TestCase.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/benchmark/rpclit/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/benchmark/rpclit/WEB-INF">
<include name="jboss-web.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-benchmark-rpclit.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-benchmark-rpclit.jar">
+ <fileset dir="${build.tests.dir}/classes">
<exclude name="org/jboss/test/ws/jaxrpc/benchmark/*_*.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/benchmark/*JSEEndpoint.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/benchmark/*TestCase.class"/>
<include name="org/jboss/test/ws/jaxrpc/benchmark/**/*"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/benchmark/rpclit/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/benchmark/rpclit/META-INF">
<include name="ejb-jar.xml"/>
<include name="jboss.xml"/>
<include name="jaxrpc-mapping.xml"/>
@@ -79,42 +79,42 @@
<include name="wsdl/**"/>
</metainf>
</jar>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-benchmark-rpclit-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-benchmark-rpclit-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<exclude name="org/jboss/test/ws/jaxrpc/benchmark/*_*.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/benchmark/*JSEEndpoint.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/benchmark/*EJBEndpoint.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/benchmark/*TestCase.class"/>
<include name="org/jboss/test/ws/jaxrpc/benchmark/**/*"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/benchmark/rpclit/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/benchmark/rpclit/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
</jar>
- <war warfile="${build.test.dir}/libs/jaxrpc-benchmark-doclit.war" webxml="${build.test.dir}/resources/jaxrpc/benchmark/doclit/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-benchmark-doclit.war" webxml="${build.tests.dir}/resources/jaxrpc/benchmark/doclit/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<exclude name="org/jboss/test/ws/jaxrpc/benchmark/*_arr*/**"/>
<exclude name="org/jboss/test/ws/jaxrpc/benchmark/*EJBEndpoint.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/benchmark/*TestCase.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/benchmark/doclit/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/benchmark/doclit/WEB-INF">
<include name="jboss-web.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-benchmark-doclit.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-benchmark-doclit.jar">
+ <fileset dir="${build.tests.dir}/classes">
<exclude name="org/jboss/test/ws/jaxrpc/benchmark/*_arr*/**"/>
<exclude name="org/jboss/test/ws/jaxrpc/benchmark/*JSEEndpoint.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/benchmark/*TestCase.class"/>
<include name="org/jboss/test/ws/jaxrpc/benchmark/**/*"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/benchmark/doclit/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/benchmark/doclit/META-INF">
<include name="ejb-jar.xml"/>
<include name="jboss.xml"/>
<include name="jaxrpc-mapping.xml"/>
@@ -122,15 +122,15 @@
<include name="wsdl/**"/>
</metainf>
</jar>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-benchmark-doclit-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-benchmark-doclit-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<exclude name="org/jboss/test/ws/jaxrpc/benchmark/*_arr*/**"/>
<exclude name="org/jboss/test/ws/jaxrpc/benchmark/*JSEEndpoint.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/benchmark/*EJBEndpoint.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/benchmark/*TestCase.class"/>
<include name="org/jboss/test/ws/jaxrpc/benchmark/**/*"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/benchmark/doclit/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/benchmark/doclit/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jaxrpc-mapping.xml"/>
@@ -139,245 +139,245 @@
</jar>
<!-- jaxrpc-encoded-marshalltest.war -->
- <war warfile="${build.test.dir}/libs/jaxrpc-encoded-marshalltest.war" webxml="${build.test.dir}/resources/jaxrpc/encoded/marshalltest/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-encoded-marshalltest.war" webxml="${build.tests.dir}/resources/jaxrpc/encoded/marshalltest/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/encoded/marshalltest/*.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestCase.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/encoded/marshalltest/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/encoded/marshalltest/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-encoded-marshalltest-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-encoded-marshalltest-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/encoded/marshalltest/*.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestImpl.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestCase.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/encoded/marshalltest/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/encoded/marshalltest/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/encoded/marshalltest/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/encoded/marshalltest/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
</jar>
<!-- jaxrpc-encoded-parametermode.war -->
- <war warfile="${build.test.dir}/libs/jaxrpc-encoded-parametermode.war" webxml="${build.test.dir}/resources/jaxrpc/encoded/parametermode/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-encoded-parametermode.war" webxml="${build.tests.dir}/resources/jaxrpc/encoded/parametermode/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/encoded/parametermode/*.class"/>
<include name="org/jboss/test/ws/jaxrpc/encoded/parametermode/holders/*.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/encoded/parametermode/ParameterModeTestCase.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/encoded/parametermode/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/encoded/parametermode/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-encoded-parametermode-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-encoded-parametermode-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/encoded/parametermode/*.class"/>
<include name="org/jboss/test/ws/jaxrpc/encoded/parametermode/holders/*.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/encoded/parametermode/ParameterModeTestImpl.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/encoded/parametermode/ParameterModeTestCase.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/encoded/parametermode/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/encoded/parametermode/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/encoded/parametermode/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/encoded/parametermode/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
</jar>
<!-- jaxrpc-enventry.war -->
- <war warfile="${build.test.dir}/libs/jaxrpc-enventry.war" webxml="${build.test.dir}/resources/jaxrpc/enventry/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-enventry.war" webxml="${build.tests.dir}/resources/jaxrpc/enventry/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/enventry/EnvEntryTestService.class"/>
<include name="org/jboss/test/ws/jaxrpc/enventry/EnvEntryBeanJSE.class"/>
<include name="org/jboss/test/ws/jaxrpc/enventry/ServerSideHandler.class"/>
<include name="org/jboss/test/ws/jaxrpc/enventry/EnvEntryHandler.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/enventry/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/enventry/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-enventry.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-enventry.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/enventry/EnvEntryTestService.class"/>
<include name="org/jboss/test/ws/jaxrpc/enventry/EnvEntryBeanEJB.class"/>
<include name="org/jboss/test/ws/jaxrpc/enventry/ServerSideHandler.class"/>
<include name="org/jboss/test/ws/jaxrpc/enventry/EnvEntryHandler.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/enventry/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/enventry/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/enventry/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/enventry/META-INF">
<include name="ejb-jar.xml"/>
<include name="webservices.xml"/>
</metainf>
</jar>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-enventry-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-enventry-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/enventry/EnvEntryTestService.class"/>
<include name="org/jboss/test/ws/jaxrpc/enventry/ClientSideHandler.class"/>
<include name="org/jboss/test/ws/jaxrpc/enventry/EnvEntryHandler.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/enventry/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/enventry/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/enventry/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/enventry/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
</jar>
<!-- jaxrpc-jbws231 -->
- <war warfile="${build.test.dir}/libs/jaxrpc-jbws231.war" webxml="${build.test.dir}/resources/jaxrpc/jbws231/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-jbws231.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws231/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws231/TestEndpoint.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws231/TestEndpointImpl.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws231/EyeColorType.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/jbws231/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws231/WEB-INF">
<include name="webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar destfile="${build.test.dir}/libs/jaxrpc-jbws231-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxrpc-jbws231-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws231/TestEndpoint.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws231/EyeColorType.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws231/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws231/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws231/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws231/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
</jar>
<!-- jaxrpc-jbws434 -->
- <war warfile="${build.test.dir}/libs/jaxrpc-jbws434.war" webxml="${build.test.dir}/resources/jaxrpc/jbws434/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-jbws434.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws434/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws434/TestServiceEndpoint.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws434/TestServiceEndpointImpl.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws434/ArrayOfAny*.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws434/TypeOfAny*.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/jbws434/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws434/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar destfile="${build.test.dir}/libs/jaxrpc-jbws434-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxrpc-jbws434-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws434/TestServiceEndpoint.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws434/ArrayOfAny*.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws434/TypeOfAny*.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws434/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws434/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws434/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws434/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
</jar>
<!-- jaxrpc-jbws718 -->
- <war warfile="${build.test.dir}/libs/jaxrpc-jbws718.war" webxml="${build.test.dir}/resources/jaxrpc/jbws718/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-jbws718.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws718/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws718/*.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/jbws718/*TestCase.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/jbws718/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws718/WEB-INF">
<include name="webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar destfile="${build.test.dir}/libs/jaxrpc-jbws718-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxrpc-jbws718-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws718/*.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/jbws718/*TestCase.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws718/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws718/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws718/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws718/WEB-INF">
<include name="wsdl/**"/>
<include name="jaxrpc-mapping.xml"/>
</metainf>
</jar>
<!-- jaxrpc-jbws720 -->
- <war warfile="${build.test.dir}/libs/jaxrpc-jbws720.war" webxml="${build.test.dir}/resources/jaxrpc/jbws720/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-jbws720.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws720/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws720/*.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/jbws720/*TestCase.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/jbws720/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws720/WEB-INF">
<include name="webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar destfile="${build.test.dir}/libs/jaxrpc-jbws720-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxrpc-jbws720-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws720/*.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/jbws720/*Impl.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/jbws720/*TestCase.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws720/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws720/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws720/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws720/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
</jar>
<!-- jaxrpc-jbws732 -->
- <war warfile="${build.test.dir}/libs/jaxrpc-jbws732.war" webxml="${build.test.dir}/resources/jaxrpc/jbws732/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-jbws732.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws732/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws732/*.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/jbws732/*TestCase.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/jbws732/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws732/WEB-INF">
<include name="bare-mapping.xml"/>
<include name="wrapped-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar destfile="${build.test.dir}/libs/jaxrpc-jbws732-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxrpc-jbws732-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws732/*.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/jbws732/*TestCase.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws732/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws732/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws732/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws732/WEB-INF">
<include name="bare-mapping.xml"/>
<include name="wrapped-mapping.xml"/>
<include name="wsdl/**"/>
@@ -385,40 +385,40 @@
</jar>
<!-- jaxrpc-jws775 -->
- <war destfile="${build.test.dir}/libs/jaxrpc-jbws775.war" webxml="${build.test.dir}/resources/jaxrpc/jbws775/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war destfile="${build.tests.dir}/libs/jaxrpc-jbws775.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws775/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws775/*"/>
<exclude name="org/jboss/test/ws/jaxrpc/jbws775/JBWS775TestCase.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/jbws775/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws775/WEB-INF">
<include name="webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar destfile="${build.test.dir}/libs/jaxrpc-jbws775-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxrpc-jbws775-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws775/*"/>
<exclude name="org/jboss/test/ws/jaxrpc/jbws775/*Impl.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/jbws775/JBWS775TestCase.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws775/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws775/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws775/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws775/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
</jar>
<!-- jaxrpc-jbws801 -->
- <war warfile="${build.test.dir}/libs/jaxrpc-jbws801.war" webxml="${build.test.dir}/resources/jaxrpc/jbws801/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-jbws801.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws801/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws801/LargeAttachmentImpl.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws801/LargeAttachment.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/jbws801/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws801/WEB-INF">
<include name="wsdl/LargeAttachment.wsdl"/>
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
@@ -426,67 +426,67 @@
</war>
<!-- jaxrpc-jbws807 -->
- <war warfile="${build.test.dir}/libs/jaxrpc-jbws807.war" webxml="${build.test.dir}/resources/jaxrpc/jbws807/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-jbws807.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws807/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws807/*.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/jbws807/*TestCase.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/jbws807/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws807/WEB-INF">
<include name="webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar destfile="${build.test.dir}/libs/jaxrpc-jbws807-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxrpc-jbws807-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws807/*.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/jbws807/*TestCase.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws807/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws807/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws807/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws807/WEB-INF">
<include name="wsdl/**"/>
<include name="jaxrpc-mapping.xml"/>
</metainf>
</jar>
<!-- jaxrpc-jbws812 -->
- <war warfile="${build.test.dir}/libs/jaxrpc-jbws812.war" webxml="${build.test.dir}/resources/jaxrpc/jbws812/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-jbws812.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws812/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws812/TestEndpoint.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws812/TestEndpointImpl.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws812/ServerHandler.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/jbws812/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws812/WEB-INF">
<include name="webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar destfile="${build.test.dir}/libs/jaxrpc-jbws812-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxrpc-jbws812-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws812/TestEndpoint.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws812/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws812/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws812/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws812/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
</jar>
<!-- jaxrpc-jbws950 -->
- <war warfile="${build.test.dir}/libs/jaxrpc-jbws950.war" webxml="${build.test.dir}/resources/jaxrpc/jbws950/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-jbws950.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws950/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws950/TestEndpointImpl.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws950/TestEndpoint.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws950/UserType.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/jbws950/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws950/WEB-INF">
<include name="webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
@@ -494,14 +494,14 @@
</war>
<!-- jaxrpc-jbws956 -->
- <war warfile="${build.test.dir}/libs/jaxrpc-jbws956.war" webxml="${build.test.dir}/resources/jaxrpc/jbws956/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-jbws956.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws956/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws956/TestEndpointImpl.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws956/TestEndpoint.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws956/StringArray.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws956/StringArrayArray.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/jbws956/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws956/WEB-INF">
<include name="webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
@@ -509,43 +509,43 @@
</war>
<!-- jaxrpc-jbws1010 -->
- <war warfile="${build.test.dir}/libs/jaxrpc-jbws1010.war" webxml="${build.test.dir}/resources/jaxrpc/jbws1010/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-jbws1010.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws1010/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws1010/InheritenceChildInterface.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1010/InheritenceParentInterface.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1010/TestEndpointImpl.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/jbws1010/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws1010/WEB-INF">
<include name="webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar destfile="${build.test.dir}/libs/jaxrpc-jbws1010-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxrpc-jbws1010-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws1010/InheritenceChildInterface.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1010/InheritenceParentInterface.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1010/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1010/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1010/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1010/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
</jar>
<!-- jaxrpc-jbws1011 -->
- <jar destfile="${build.test.dir}/libs/jaxrpc-jbws1011.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxrpc-jbws1011.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws1011/SimpleEntityLocal.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1011/SimpleEntityHome.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1011/SimpleEntityBean.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1011/TestEndpoint.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1011/TestEndpointBean.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1011/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1011/META-INF">
<include name="ejb-jar.xml"/>
<include name="jbosscmp-jdbc.xml"/>
<include name="jaxrpc-mapping.xml"/>
@@ -553,11 +553,11 @@
<include name="wsdl/TestService.wsdl"/>
</metainf>
</jar>
- <jar destfile="${build.test.dir}/libs/jaxrpc-jbws1011-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxrpc-jbws1011-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws1011/TestEndpoint.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1011/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1011/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jaxrpc-mapping.xml"/>
@@ -566,106 +566,106 @@
</jar>
<!-- jbossws-jbws1093 -->
- <war warfile="${build.test.dir}/libs/jaxrpc-jbws1093.war" webxml="${build.test.dir}/resources/jaxrpc/jbws1093/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-jbws1093.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws1093/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws1093/ServletTest.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1093/TestEndpoint.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1093/TestEndpointImpl.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/jbws1093/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws1093/WEB-INF">
<include name="webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar destfile="${build.test.dir}/libs/jaxrpc-jbws1093-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxrpc-jbws1093-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jbws1093/TestEndpoint.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1093/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1093/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1093/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1093/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
</jar>
<!-- jaxrpc-jbws1107 -->
- <war warfile="${build.test.dir}/libs/jaxrpc-jbws1107.war" webxml="${build.test.dir}/resources/jaxrpc/jbws1107/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-jbws1107.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws1107/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws1107/TestEndpoint.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1107/TestEndpointImpl.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/jbws1107/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws1107/WEB-INF">
<include name="webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar destfile="${build.test.dir}/libs/jaxrpc-jbws1107-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxrpc-jbws1107-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws1107/TestEndpoint.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1107/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1107/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1107/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1107/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
</jar>
<!-- jaxrpc-jbws1121 -->
- <war destfile="${build.test.dir}/libs/jaxrpc-jbws1121.war" webxml="${build.test.dir}/resources/jaxrpc/jbws1121/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war destfile="${build.tests.dir}/libs/jaxrpc-jbws1121.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws1121/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws1121/HelloWorld.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1121/HelloWorldBean.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/jbws1121/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws1121/WEB-INF">
<include name="webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="jboss-wsse-server.xml"/>
<include name="wsdl/*"/>
</webinf>
- <webinf dir="${build.test.dir}/resources/jaxrpc/jbws1121">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws1121">
<include name="wsse.keystore"/>
<include name="wsse.truststore"/>
</webinf>
</war>
- <jar destfile="${build.test.dir}/libs/jaxrpc-jbws1121-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxrpc-jbws1121-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws1121/HelloWorld.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1121/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1121/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jboss-wsse-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1121/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1121/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/*"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1121">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1121">
<include name="wsse.keystore"/>
<include name="wsse.truststore"/>
</metainf>
</jar>
- <ear destfile="${build.test.dir}/libs/jaxrpc-jbws1121.ear"
- appxml="${build.test.dir}/resources/jaxrpc/jbws1121/META-INF/application.xml">
- <fileset dir="${build.test.dir}/libs">
+ <ear destfile="${build.tests.dir}/libs/jaxrpc-jbws1121.ear"
+ appxml="${build.tests.dir}/resources/jaxrpc/jbws1121/META-INF/application.xml">
+ <fileset dir="${build.tests.dir}/libs">
<include name="jaxrpc-jbws1121-client.jar"/>
<include name="jaxrpc-jbws1121.war"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1121/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1121/META-INF">
<include name="jboss-app.xml"/>
</metainf>
</ear>
<!-- jaxrpc-jbws1124one -->
- <copy todir="${build.test.dir}/resources" overwrite="true">
+ <copy todir="${build.tests.dir}/resources" overwrite="true">
<fileset dir="${test.resources.dir}">
<include name="jaxrpc/jbws1124/META-INF/jboss-client.xml"/>
<include name="jaxrpc/jbws1124/WEB-INF/test-resource.txt"/>
@@ -675,12 +675,12 @@
<filter token="jbws1124.domain" value="jbws1124one"/>
</filterset>
</copy>
- <war warfile="${build.test.dir}/libs/jaxrpc-jbws1124one.war" webxml="${build.test.dir}/resources/jaxrpc/jbws1124/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-jbws1124one.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws1124/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws1124/TestEndpoint.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1124/TestEndpointImpl.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/jbws1124/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws1124/WEB-INF">
<include name="webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="test-resource.txt"/>
@@ -689,7 +689,7 @@
</webinf>
</war>
<!-- jaxrpc-jbws1124two -->
- <copy todir="${build.test.dir}/resources" overwrite="true">
+ <copy todir="${build.tests.dir}/resources" overwrite="true">
<fileset dir="${test.resources.dir}">
<include name="jaxrpc/jbws1124/META-INF/jboss-client.xml"/>
<include name="jaxrpc/jbws1124/WEB-INF/test-resource.txt"/>
@@ -699,12 +699,12 @@
<filter token="jbws1124.domain" value="jbws1124two"/>
</filterset>
</copy>
- <war warfile="${build.test.dir}/libs/jaxrpc-jbws1124two.war" webxml="${build.test.dir}/resources/jaxrpc/jbws1124/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-jbws1124two.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws1124/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws1124/TestEndpoint.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1124/TestEndpointImpl.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/jbws1124/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws1124/WEB-INF">
<include name="webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="test-resource.txt"/>
@@ -714,97 +714,97 @@
</war>
<!-- jaxrpc-jbws1125 -->
- <war warfile="${build.test.dir}/libs/jaxrpc-jbws1125.war" webxml="${build.test.dir}/resources/jaxrpc/jbws1125/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-jbws1125.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws1125/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws1125/TestEndpointImpl.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1125/TestEndpoint.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1125/*RequestStruct.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1125/*ResponseStruct.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/jbws1125/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws1125/WEB-INF">
<include name="webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar destfile="${build.test.dir}/libs/jaxrpc-jbws1125-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxrpc-jbws1125-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws1125/TestEndpoint.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1125/*RequestStruct.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1125/*ResponseStruct.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1125/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1125/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1125/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1125/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
</jar>
<!-- jaxrpc-jbws1148 -->
- <war warfile="${build.test.dir}/libs/jaxrpc-jbws1148.war" webxml="${build.test.dir}/resources/jaxrpc/jbws1148/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-jbws1148.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws1148/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws1148/TestEndpointImpl.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1148/TestEndpoint.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1148/TelephoneNumber.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/jbws1148/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws1148/WEB-INF">
<include name="webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-jbws1148-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-jbws1148-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws1148/TestEndpoint.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1148/TelephoneNumber.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1148/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1148/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1148/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1148/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
</metainf>
</jar>
<!-- jbossws-jbws1179 -->
- <war warfile="${build.test.dir}/libs/jaxrpc-jbws1179.war" webxml="${build.test.dir}/resources/jaxrpc/jbws1179/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-jbws1179.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws1179/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws1179/TestEndpointImpl.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1179/TestEndpoint.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/jbws1179/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws1179/WEB-INF">
<include name="webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar destfile="${build.test.dir}/libs/jaxrpc-jbws1179-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxrpc-jbws1179-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws1179/TestEndpoint.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1179/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1179/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1179/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1179/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
</jar>
<!-- jbossws-jbws1186 -->
- <war warfile="${build.test.dir}/libs/jaxrpc-jbws1186.war" webxml="${build.test.dir}/resources/jaxrpc/jbws1186/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-jbws1186.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws1186/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws1186/TestEndpointImpl.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1186/TestEndpoint.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1186/ServerHandler.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1186/UserType.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/jbws1186/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws1186/WEB-INF">
<include name="webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
@@ -812,8 +812,8 @@
</war>
<!-- jaxrpc-jbws1190 -->
- <war warfile="${build.test.dir}/libs/jaxrpc-jbws1190.war" webxml="${build.test.dir}/resources/jaxrpc/jbws1190/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-jbws1190.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws1190/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1190/TestEndpoint.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl$1.class"/>
@@ -821,42 +821,42 @@
<include name="org/jboss/test/ws/jaxrpc/jbws1190/ConfidentialEndpoint.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190Exception.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/jbws1190/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws1190/WEB-INF">
<include name="webservices.xml"/>
<include name="test-mapping.xml"/>
<include name="confidential-mapping.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-jbws1190-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-jbws1190-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws1190/TestEndpoint.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1190/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1190/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1190/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1190/WEB-INF">
<include name="test-mapping.xml"/>
</metainf>
</jar>
<!-- jaxrpcws-jbws1205 -->
- <war warfile="${build.test.dir}/libs/jaxrpc-jbws1205-simple.war" webxml="${build.test.dir}/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-jbws1205-simple.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpointImpl.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpoint.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpoint_echo_RequestStruct.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpoint_echo_ResponseStruct.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF">
<include name="webservices.xml"/>
<include name="simple-mapping.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <war warfile="${build.test.dir}/libs/jaxrpc-jbws1205-test.war" webxml="${build.test.dir}/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-jbws1205-test.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws1205/TestEndpointImpl.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1205/TestEndpointImpl$*.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1205/TestEndpoint.class"/>
@@ -865,122 +865,122 @@
<include name="org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpoint_echo_RequestStruct.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpoint_echo_ResponseStruct.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF">
<include name="webservices.xml"/>
<include name="test-mapping.xml"/>
<include name="wsdl/**"/>
<include name="jboss-web.xml"/>
</webinf>
- <webinf dir="${build.test.dir}/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF">
<include name="simple-mapping.xml"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-jbws1205-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-jbws1205-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws1205/TestEndpoint.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1205/TestException.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1205/Client/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1205/Client/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF">
<include name="test-mapping.xml"/>
</metainf>
</jar>
<!-- jaxrpc-jbws1303 -->
- <war warfile="${build.test.dir}/libs/jaxrpc-jbws1303.war" webxml="${build.test.dir}/resources/jaxrpc/jbws1303/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-jbws1303.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws1303/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws1303/*.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/jbws1303/*TestCase.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/jbws1303/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws1303/WEB-INF">
<include name="webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar destfile="${build.test.dir}/libs/jaxrpc-jbws1303-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxrpc-jbws1303-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws1303/*.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/jbws1303/*TestCase.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1303/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1303/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1303/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1303/WEB-INF">
<include name="wsdl/**"/>
<include name="jaxrpc-mapping.xml"/>
</metainf>
</jar>
<!-- jaxrpc-marshall-doclit.war -->
- <war warfile="${build.test.dir}/libs/jaxrpc-marshall-doclit.war" webxml="${build.test.dir}/resources/jaxrpc/marshall-doclit/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-marshall-doclit.war" webxml="${build.tests.dir}/resources/jaxrpc/marshall-doclit/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/marshall/StandardTypes.class"/>
<include name="org/jboss/test/ws/jaxrpc/marshall/StandardTypesBean.class"/>
<include name="org/jboss/test/ws/jaxrpc/marshall/*RequestStruct.class"/>
<include name="org/jboss/test/ws/jaxrpc/marshall/*ResponseStruct.class"/>
<include name="org/jboss/test/ws/jaxrpc/marshall/types/**"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/marshall-doclit/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/marshall-doclit/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-marshall-doclit-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-marshall-doclit-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/marshall/StandardTypes.class"/>
<include name="org/jboss/test/ws/jaxrpc/marshall/types/**"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/marshall-doclit/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/marshall-doclit/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/marshall-doclit/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/marshall-doclit/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
</metainf>
</jar>
<!-- jaxrpc-marshall-rpclit.war -->
- <war warfile="${build.test.dir}/libs/jaxrpc-marshall-rpclit.war" webxml="${build.test.dir}/resources/jaxrpc/marshall-rpclit/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-marshall-rpclit.war" webxml="${build.tests.dir}/resources/jaxrpc/marshall-rpclit/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/marshall/StandardTypes.class"/>
<include name="org/jboss/test/ws/jaxrpc/marshall/StandardTypesBean.class"/>
<include name="org/jboss/test/ws/jaxrpc/marshall/types/JavaBean.class"/>
<include name="org/jboss/test/ws/jaxrpc/marshall/types/JavaBean2.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/marshall-rpclit/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/marshall-rpclit/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-marshall-rpclit-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-marshall-rpclit-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/marshall/StandardTypes.class"/>
<include name="org/jboss/test/ws/jaxrpc/marshall/types/JavaBean.class"/>
<include name="org/jboss/test/ws/jaxrpc/marshall/types/JavaBean2.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/marshall-rpclit/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/marshall-rpclit/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/marshall-rpclit/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/marshall-rpclit/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
</metainf>
</jar>
<!-- jaxrpc-outparam.war -->
- <war warfile="${build.test.dir}/libs/jaxrpc-outparam.war" webxml="${build.test.dir}/resources/jaxrpc/outparam/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-outparam.war" webxml="${build.tests.dir}/resources/jaxrpc/outparam/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/outparam/*Service.class"/>
<include name="org/jboss/test/ws/jaxrpc/outparam/*ServiceBean.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/outparam/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/outparam/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
@@ -988,211 +988,211 @@
</war>
<!-- jaxrpc-overloaded -->
- <war warfile="${build.test.dir}/libs/jaxrpc-overloaded.war" webxml="${build.test.dir}/resources/jaxrpc/overloaded/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-overloaded.war" webxml="${build.tests.dir}/resources/jaxrpc/overloaded/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/overloaded/Overloaded.class"/>
<include name="org/jboss/test/ws/jaxrpc/overloaded/OverloadedBean.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/overloaded/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/overloaded/WEB-INF">
<include name="jboss-web.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-overloaded-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-overloaded-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/overloaded/Overloaded.class"/>
<include name="org/jboss/test/ws/jaxrpc/overloaded/OverloadedBean.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/overloaded/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/overloaded/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/overloaded/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/overloaded/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
</jar>
<!-- jaxrpc-samples-docstyle-bare -->
- <war warfile="${build.test.dir}/libs/jaxrpc-samples-docstyle-bare.war" webxml="${build.test.dir}/resources/jaxrpc/samples/docstyle/bare/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-samples-docstyle-bare.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/docstyle/bare/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialEndpointJSE.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialService.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialOrder.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialOrderResponse.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/docstyle/bare/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/docstyle/bare/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-docstyle-bare-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-docstyle-bare-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialService.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialOrder.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialOrderResponse.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/docstyle/bare/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/docstyle/bare/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/docstyle/bare/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/docstyle/bare/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
</jar>
<!-- jaxrpc-samples-docstyle-wrapped -->
- <war warfile="${build.test.dir}/libs/jaxrpc-samples-docstyle-wrapped.war" webxml="${build.test.dir}/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-samples-docstyle-wrapped.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialEndpointJSE.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService*RequestStruct.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService*ResponseStruct.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-docstyle-wrapped-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-docstyle-wrapped-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService*RequestStruct.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService*ResponseStruct.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/docstyle/wrapped/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/docstyle/wrapped/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
</jar>
<!-- jaxrpc-samples-dynamichandler -->
- <war warfile="${build.test.dir}/libs/jaxrpc-samples-dynamichandler.war" webxml="${build.test.dir}/resources/jaxrpc/samples/dynamichandler/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-samples-dynamichandler.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/dynamichandler/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*Service.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*ServiceBean.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*Handler.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/dynamichandler/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/dynamichandler/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-dynamichandler-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-dynamichandler-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*Service.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*Handler.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/dynamichandler/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/dynamichandler/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/dynamichandler/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/dynamichandler/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
</jar>
<!-- jaxrpc-samples-exception -->
- <war destfile="${build.test.dir}/libs/jaxrpc-samples-exception.war" webxml="${build.test.dir}/resources/jaxrpc/samples/exception/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war destfile="${build.tests.dir}/libs/jaxrpc-samples-exception.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/exception/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/exception/*Exception.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/exception/ServerHandler.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/exception/ExceptionServiceInterface.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/exception/ExceptionBeanImpl.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/exception/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/exception/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar destfile="${build.test.dir}/libs/jaxrpc-samples-exception-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxrpc-samples-exception-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/exception/*Exception.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/exception/ExceptionServiceInterface.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/exception/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/exception/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/exception/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/exception/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
</jar>
<!-- jaxrpc-samples-handler -->
- <war warfile="${build.test.dir}/libs/jaxrpc-samples-handler.war" webxml="${build.test.dir}/resources/jaxrpc/samples/handler/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-samples-handler.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/handler/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/handler/*Service.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/handler/*ServiceBean.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/handler/ServerSideHandler.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/handler/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/handler/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-handler-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-handler-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/handler/*Service.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/handler/ClientSideHandler.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/handler/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/handler/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/handler/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/handler/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
</jar>
<!-- jaxrpc-samples-holder -->
- <war warfile="${build.test.dir}/libs/jaxrpc-samples-holder.war" webxml="${build.test.dir}/resources/jaxrpc/samples/holder/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-samples-holder.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/holder/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/holder/*Service.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/holder/*ServiceBean.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/holder/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/holder/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-holder-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-holder-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/holder/*Service.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/holder/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/holder/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/holder/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/holder/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
</jar>
<!-- jaxrpc-samples-jmstransport -->
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-jmstransport.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-jmstransport.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/jmstransport/Organization.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/jmstransport/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/jmstransport/META-INF">
<include name="ejb-jar.xml"/>
<include name="jboss.xml"/>
<include name="webservices.xml"/>
@@ -1200,23 +1200,23 @@
<include name="wsdl/**"/>
</metainf>
</jar>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-jmstransport.sar">
- <fileset dir="${build.test.dir}/libs">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-jmstransport.sar">
+ <fileset dir="${build.tests.dir}/libs">
<include name="jaxrpc-samples-jmstransport.jar"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/jmstransport/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/jmstransport/META-INF">
<include name="jboss-service.xml"/>
</metainf>
</jar>
<!-- jaxrpc-samples-jsr109ejb-rpc -->
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-jsr109ejb-rpc.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-jsr109ejb-rpc.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Type.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Service.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*EJBEndpoint.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF">
<include name="ejb-jar.xml"/>
<include name="jboss.xml"/>
<include name="jaxrpc-mapping.xml"/>
@@ -1224,12 +1224,12 @@
<include name="wsdl/**"/>
</metainf>
</jar>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-jsr109ejb-rpc-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-jsr109ejb-rpc-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Type.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Service.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jaxrpc-mapping.xml"/>
@@ -1238,14 +1238,14 @@
</jar>
<!-- jaxrpc-samples-jsr109ejb-doc -->
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-jsr109ejb-doc.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-jsr109ejb-doc.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Type.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Struct.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Service.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*EJBEndpoint.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF">
<include name="ejb-jar.xml"/>
<include name="jboss.xml"/>
<include name="jaxrpc-mapping.xml"/>
@@ -1253,13 +1253,13 @@
<include name="wsdl/**"/>
</metainf>
</jar>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-jsr109ejb-doc-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-jsr109ejb-doc-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Type.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Struct.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Service.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jaxrpc-mapping.xml"/>
@@ -1268,173 +1268,174 @@
</jar>
<!-- jaxrpc-samples-jsr109pojo-rpc -->
- <war warfile="${build.test.dir}/libs/jaxrpc-samples-jsr109pojo-rpc.war" webxml="${build.test.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-samples-jsr109pojo-rpc.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Type.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Service.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*JSEEndpoint.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
+ <include name="jboss-web.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-jsr109pojo-rpc-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-jsr109pojo-rpc-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Type.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Service.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
</jar>
<!-- jaxrpc-samples-jsr109pojo-doc -->
- <war warfile="${build.test.dir}/libs/jaxrpc-samples-jsr109pojo-doc.war" webxml="${build.test.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-samples-jsr109pojo-doc.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Type.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Struct.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Service.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*JSEEndpoint.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-jsr109pojo-doc-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-jsr109pojo-doc-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Type.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Struct.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Service.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
</jar>
<!-- jaxrpc-samples-message -->
- <war warfile="${build.test.dir}/libs/jaxrpc-samples-message.war" webxml="${build.test.dir}/resources/jaxrpc/samples/message/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-samples-message.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/message/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/message/*Service.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/message/*ServiceBean.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/message/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/message/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-message-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-message-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/message/*Service.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/message/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/message/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/message/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/message/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
</jar>
<!-- jaxrpc-samples-mtom -->
- <war warfile="${build.test.dir}/libs/jaxrpc-samples-mtom.war" webxml="${build.test.dir}/resources/jaxrpc/samples/mtom/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-samples-mtom.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/mtom/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/mtom/XOPTestImpl.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/mtom/XOPTest.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/mtom/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/mtom/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar destfile="${build.test.dir}/libs/jaxrpc-samples-mtom-client.jar">
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/mtom/META-INF">
+ <jar destfile="${build.tests.dir}/libs/jaxrpc-samples-mtom-client.jar">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/mtom/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/mtom/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/mtom/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
</jar>
<!-- jaxrpc-samples-oneway -->
- <war warfile="${build.test.dir}/libs/jaxrpc-samples-oneway.war" webxml="${build.test.dir}/resources/jaxrpc/samples/oneway/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-samples-oneway.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/oneway/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/oneway/*Service.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/oneway/*ServiceBean.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/oneway/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/oneway/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-oneway-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-oneway-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/oneway/*Service.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/oneway/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/oneway/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/oneway/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/oneway/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
</jar>
<!-- jaxrpc-samples-rpcstyle -->
- <war warfile="${build.test.dir}/libs/jaxrpc-samples-rpcstyle.war" webxml="${build.test.dir}/resources/jaxrpc/samples/rpcstyle/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-samples-rpcstyle.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/rpcstyle/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialEndpointJSE.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialService.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/rpcstyle/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/rpcstyle/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-rpcstyle-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-rpcstyle-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialService.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/rpcstyle/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/rpcstyle/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/rpcstyle/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/rpcstyle/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
</jar>
<!-- jaxrpc-samples-secureejb -->
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-secureejb.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-secureejb.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationService.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationHome.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationRemote.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationImpl.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/secureejb/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/secureejb/META-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="ejb-jar.xml"/>
@@ -1442,13 +1443,13 @@
<include name="wsdl/**"/>
</metainf>
</jar>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-secureejb-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-secureejb-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationService.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationHome.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationRemote.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/secureejb/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/secureejb/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jaxrpc-mapping.xml"/>
@@ -1457,38 +1458,38 @@
</jar>
<!-- jaxrpc-samples-swa -->
- <war warfile="${build.test.dir}/libs/jaxrpc-samples-swa.war" webxml="${build.test.dir}/resources/jaxrpc/samples/swa/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-samples-swa.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/swa/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/swa/AttachmentImpl.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/swa/Attachment.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/swa/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/swa/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar destfile="${build.test.dir}/libs/jaxrpc-samples-swa-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxrpc-samples-swa-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/swa/Attachment.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/swa/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/swa/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/swa/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/swa/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
</jar>
<!-- jaxrpc-samples-wseventing.war -->
- <war warfile="${build.test.dir}/libs/jaxrpc-samples-wseventing.war" webxml="${build.test.dir}/resources/jaxrpc/samples/wseventing/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-samples-wseventing.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/wseventing/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/ws/samples/wseventing/*.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/wseventing/*.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wseventing/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/wseventing/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/sysmon.wsdl"/>
@@ -1496,177 +1497,177 @@
<include name="wsdl/jbwse.xsd"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-wseventing-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-wseventing-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/ws/samples/wseventing/*.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/wseventing/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/wseventing/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/wseventing/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/wseventing/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
</jar>
<!-- jaxrpc-samples-wssecurity-sign -->
- <war warfile="${build.test.dir}/libs/jaxrpc-samples-wssecurity-sign.war" webxml="${build.test.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-samples-wssecurity-sign.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/HelloJavaBean.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/simple-sign">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/simple-sign">
<include name="jboss-wsse-server.xml"/>
</webinf>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/wssecurity">
<include name="wsse.keystore"/>
<include name="wsse.truststore"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-wssecurity-sign-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-wssecurity-sign-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/simple-sign/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/simple-sign/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jboss-wsse-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
</jar>
<!-- jaxrpc-samples-wssecurity-encrypt -->
- <war warfile="${build.test.dir}/libs/jaxrpc-samples-wssecurity-encrypt.war" webxml="${build.test.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-samples-wssecurity-encrypt.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/HelloJavaBean.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
<include name="webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</webinf>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/simple-encrypt">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/simple-encrypt">
<include name="jboss-wsse-server.xml"/>
</webinf>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/wssecurity">
<include name="wsse.keystore"/>
<include name="wsse.truststore"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-wssecurity-encrypt-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-wssecurity-encrypt-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/simple-encrypt/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/simple-encrypt/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jboss-wsse-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
</jar>
<!-- jaxrpc-samples-store-pass-encrypt.war -->
- <replace file="${build.test.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/jboss-wsse-server.xml" token="${buildpath}" value="${build.test.dir}"/>
- <war warfile="${build.test.dir}/libs/jaxrpc-samples-store-pass-encrypt.war" webxml="${build.test.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <replace file="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/jboss-wsse-server.xml" token="${buildpath}" value="${build.tests.dir}"/>
+ <war warfile="${build.tests.dir}/libs/jaxrpc-samples-store-pass-encrypt.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/HelloJavaBean.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/PasswordUtil.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt">
<include name="jboss-wsse-server.xml"/>
</webinf>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/wssecurity">
<include name="wsse.keystore"/>
<include name="wsse.truststore"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-store-pass-encrypt-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-store-pass-encrypt-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jboss-wsse-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
<include name="wsdl/**"/>
<include name="jaxrpc-mapping.xml"/>
</metainf>
</jar>
<!-- jaxrpc-webserviceref -->
- <war warfile="${build.test.dir}/libs/jaxrpc-webserviceref.war" webxml="${build.test.dir}/resources/jaxrpc/webserviceref/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-webserviceref.war" webxml="${build.tests.dir}/resources/jaxrpc/webserviceref/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/webserviceref/TestEndpointImpl.class"/>
<include name="org/jboss/test/ws/jaxrpc/webserviceref/TestEndpoint.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/webserviceref/META-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/webserviceref/META-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</webinf>
- <webinf dir="${build.test.dir}/resources/jaxrpc/webserviceref/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/webserviceref/WEB-INF">
<include name="webservices.xml"/>
</webinf>
</war>
- <jar destfile="${build.test.dir}/libs/jaxrpc-webserviceref-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxrpc-webserviceref-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/webserviceref/ApplicationClient.class"/>
<include name="org/jboss/test/ws/jaxrpc/webserviceref/TestEndpointService.class"/>
<include name="org/jboss/test/ws/jaxrpc/webserviceref/TestEndpoint.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/webserviceref/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/webserviceref/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
</jar>
- <war destfile="${build.test.dir}/libs/jaxrpc-webserviceref-servlet-client.war" webxml="${build.test.dir}/resources/jaxrpc/webserviceref/servlet-client/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war destfile="${build.tests.dir}/libs/jaxrpc-webserviceref-servlet-client.war" webxml="${build.tests.dir}/resources/jaxrpc/webserviceref/servlet-client/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/webserviceref/ServletClient.class"/>
<include name="org/jboss/test/ws/jaxrpc/webserviceref/TestEndpointService.class"/>
<include name="org/jboss/test/ws/jaxrpc/webserviceref/TestEndpoint.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/webserviceref/META-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/webserviceref/META-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar destfile="${build.test.dir}/libs/jaxrpc-webserviceref-ejb-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxrpc-webserviceref-ejb-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/webserviceref/EJBClient.class"/>
<include name="org/jboss/test/ws/jaxrpc/webserviceref/EJBRemote.class"/>
<include name="org/jboss/test/ws/jaxrpc/webserviceref/EJBRemoteHome.class"/>
<include name="org/jboss/test/ws/jaxrpc/webserviceref/TestEndpointService.class"/>
<include name="org/jboss/test/ws/jaxrpc/webserviceref/TestEndpoint.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/webserviceref/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/webserviceref/META-INF">
<include name="ejb-jar.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
@@ -1674,34 +1675,34 @@
</jar>
<!-- jaxrpc-wseventing -->
- <war warfile="${build.test.dir}/libs/jaxrpc-wseventing.war" webxml="${build.test.dir}/resources/jaxrpc/wseventing/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-wseventing.war" webxml="${build.tests.dir}/resources/jaxrpc/wseventing/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/ws/eventing/*.class"/>
<include name="org/jboss/test/ws/jaxrpc/wseventing/*.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/wseventing/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/wseventing/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-wseventing-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-wseventing-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/ws/eventing/*.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/wseventing/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/wseventing/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/wseventing/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/wseventing/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
</jar>
<!-- jaxrpc-wsse-account-signup.war -->
- <war warfile="${build.test.dir}/libs/jaxrpc-wsse-account-signup.war" webxml="${build.test.dir}/resources/jaxrpc/wsse/account-signup/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-wsse-account-signup.war" webxml="${build.tests.dir}/resources/jaxrpc/wsse/account-signup/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountInfo.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignup.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupImpl.class"/>
@@ -1710,22 +1711,22 @@
<include name="org/jboss/test/ws/jaxrpc/wsse/signup/Address.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/signup/CreditCardInfo.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/wsse/account-signup/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/wsse/account-signup/WEB-INF">
<include name="jboss-web.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="jboss-wsse-server.xml"/>
<include name="wsdl/**"/>
</webinf>
- <webinf dir="${build.test.dir}/resources/jaxrpc/wsse">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/wsse">
<include name="wsse.keystore"/>
<include name="wsse.truststore"/>
</webinf>
</war>
<!-- jaxrpc-wsse-account-signup.war -->
- <war warfile="${build.test.dir}/libs/jaxrpc-wsse-account-signup.war" webxml="${build.test.dir}/resources/jaxrpc/wsse/account-signup/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-wsse-account-signup.war" webxml="${build.tests.dir}/resources/jaxrpc/wsse/account-signup/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountInfo.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignup.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupImpl.class"/>
@@ -1734,307 +1735,307 @@
<include name="org/jboss/test/ws/jaxrpc/wsse/signup/Address.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/signup/CreditCardInfo.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/wsse/account-signup/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/wsse/account-signup/WEB-INF">
<include name="jboss-web.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="jboss-wsse-server.xml"/>
<include name="wsdl/**"/>
</webinf>
- <webinf dir="${build.test.dir}/resources/jaxrpc/wsse">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/wsse">
<include name="wsse.keystore"/>
<include name="wsse.truststore"/>
</webinf>
</war>
<!-- jaxrpc-wsse-account-signup-client.jar -->
- <jar jarfile="${build.test.dir}/libs/jaxrpc-wsse-account-signup-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-wsse-account-signup-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountInfo.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignup.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/signup/Address.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/signup/CreditCardInfo.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/wsse/account-signup/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/wsse/account-signup/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jboss-wsse-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/wsse/account-signup/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/wsse/account-signup/WEB-INF">
<include name="wsdl/**"/>
<include name="jaxrpc-mapping.xml"/>
</metainf>
</jar>
<!-- jaxrpc-wsse-rpc.war -->
- <war warfile="${build.test.dir}/libs/jaxrpc-wsse-rpc.war" webxml="${build.test.dir}/resources/jaxrpc/wsse/rpc/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-wsse-rpc.war" webxml="${build.tests.dir}/resources/jaxrpc/wsse/rpc/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/HelloJavaBean.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/wsse/rpc/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/wsse/rpc/WEB-INF">
<include name="jboss-web.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="jboss-wsse-server.xml"/>
<include name="wsdl/**"/>
</webinf>
- <webinf dir="${build.test.dir}/resources/jaxrpc/wsse">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/wsse">
<include name="wsse.keystore"/>
<include name="wsse.truststore"/>
</webinf>
</war>
<!-- jaxrpc-wsse-rpc-client.jar -->
- <jar jarfile="${build.test.dir}/libs/jaxrpc-wsse-rpc-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-wsse-rpc-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/wsse/rpc/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/wsse/rpc/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jboss-wsse-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/wsse/rpc/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/wsse/rpc/WEB-INF">
<include name="wsdl/**"/>
<include name="jaxrpc-mapping.xml"/>
</metainf>
</jar>
<!-- jaxrpc-wsse-rpc-none-client -->
- <jar jarfile="${build.test.dir}/libs/jaxrpc-wsse-rpc-none-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-wsse-rpc-none-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/wsse/rpc/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/wsse/rpc/META-INF">
<include name="application-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/wsse/rpc/META-INF-no-wsse">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/wsse/rpc/META-INF-no-wsse">
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/wsse/rpc/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/wsse/rpc/WEB-INF">
<include name="wsdl/**"/>
<include name="jaxrpc-mapping.xml"/>
</metainf>
</jar>
<!-- jaxrpc-wsse-simple-sign-encrypt.war -->
- <war warfile="${build.test.dir}/libs/jaxrpc-wsse-simple-sign-encrypt.war" webxml="${build.test.dir}/resources/jaxrpc/wsse/rpc/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-wsse-simple-sign-encrypt.war" webxml="${build.tests.dir}/resources/jaxrpc/wsse/rpc/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/HelloJavaBean.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/wsse/rpc/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/wsse/rpc/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="jboss-web.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
- <webinf dir="${build.test.dir}/resources/jaxrpc/wsse/simple-sign-encrypt">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/wsse/simple-sign-encrypt">
<include name="jboss-wsse-server.xml"/>
</webinf>
- <webinf dir="${build.test.dir}/resources/jaxrpc/wsse">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/wsse">
<include name="wsse.keystore"/>
<include name="wsse.truststore"/>
</webinf>
</war>
<!-- jaxrpc-wsse-simple-encrypt-client.jar -->
- <jar jarfile="${build.test.dir}/libs/jaxrpc-wsse-simple-sign-encrypt-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-wsse-simple-sign-encrypt-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/wsse/rpc/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/wsse/rpc/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/wsse/simple-sign-encrypt">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/wsse/simple-sign-encrypt">
<include name="jboss-wsse-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/wsse/rpc/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/wsse/rpc/WEB-INF">
<include name="wsdl/**"/>
<include name="jaxrpc-mapping.xml"/>
</metainf>
</jar>
<!-- jaxrpc-wsse-sign-fault.war -->
- <war warfile="${build.test.dir}/libs/jaxrpc-wsse-sign-fault.war" webxml="${build.test.dir}/resources/jaxrpc/wsse/rpc/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-wsse-sign-fault.war" webxml="${build.tests.dir}/resources/jaxrpc/wsse/rpc/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/HelloJavaBean.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/wsse/rpc/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/wsse/rpc/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="jboss-web.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
- <webinf dir="${build.test.dir}/resources/jaxrpc/wsse/sign-fault">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/wsse/sign-fault">
<include name="jboss-wsse-server.xml"/>
</webinf>
- <webinf dir="${build.test.dir}/resources/jaxrpc/wsse">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/wsse">
<include name="wsse.keystore"/>
<include name="wsse.truststore"/>
</webinf>
</war>
<!-- jaxrpc-wsse-sign-fault-client.jar -->
- <jar jarfile="${build.test.dir}/libs/jaxrpc-wsse-sign-fault-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-wsse-sign-fault-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/wsse/rpc/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/wsse/rpc/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/wsse/sign-fault">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/wsse/sign-fault">
<include name="jboss-wsse-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/wsse/rpc/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/wsse/rpc/WEB-INF">
<include name="wsdl/**"/>
<include name="jaxrpc-mapping.xml"/>
</metainf>
</jar>
<!-- jaxrpc-wsse-sign-encrypt-fault.war -->
- <war warfile="${build.test.dir}/libs/jaxrpc-wsse-sign-encrypt-fault.war" webxml="${build.test.dir}/resources/jaxrpc/wsse/rpc/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-wsse-sign-encrypt-fault.war" webxml="${build.tests.dir}/resources/jaxrpc/wsse/rpc/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/HelloJavaBean.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/wsse/rpc/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/wsse/rpc/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="jboss-web.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
- <webinf dir="${build.test.dir}/resources/jaxrpc/wsse/sign-encrypt-fault">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/wsse/sign-encrypt-fault">
<include name="jboss-wsse-server.xml"/>
</webinf>
- <webinf dir="${build.test.dir}/resources/jaxrpc/wsse">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/wsse">
<include name="wsse.keystore"/>
<include name="wsse.truststore"/>
</webinf>
</war>
<!-- jaxrpc-wsse-sign-encrypt-fault-client.jar -->
- <jar jarfile="${build.test.dir}/libs/jaxrpc-wsse-sign-encrypt-fault-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-wsse-sign-encrypt-fault-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/wsse/rpc/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/wsse/rpc/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/wsse/sign-encrypt-fault">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/wsse/sign-encrypt-fault">
<include name="jboss-wsse-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/wsse/rpc/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/wsse/rpc/WEB-INF">
<include name="wsdl/**"/>
<include name="jaxrpc-mapping.xml"/>
</metainf>
</jar>
<!-- jaxrpc-wsse-store-pass-encrypt-class-cmd.war -->
- <replace file="${build.test.dir}/resources/jaxrpc/wsse/store-pass-encrypt-class-cmd/jboss-wsse-server.xml" token="${buildpath}" value="${build.test.dir}"/>
- <war warfile="${build.test.dir}/libs/jaxrpc-wsse-store-pass-encrypt-class-cmd.war" webxml="${build.test.dir}/resources/jaxrpc/wsse/rpc/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <replace file="${build.tests.dir}/resources/jaxrpc/wsse/store-pass-encrypt-class-cmd/jboss-wsse-server.xml" token="${buildpath}" value="${build.tests.dir}"/>
+ <war warfile="${build.tests.dir}/libs/jaxrpc-wsse-store-pass-encrypt-class-cmd.war" webxml="${build.tests.dir}/resources/jaxrpc/wsse/rpc/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/HelloJavaBean.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/PasswordUtil.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/wsse/rpc/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/wsse/rpc/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="jboss-web.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
- <webinf dir="${build.test.dir}/resources/jaxrpc/wsse/store-pass-encrypt-class-cmd">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/wsse/store-pass-encrypt-class-cmd">
<include name="jboss-wsse-server.xml"/>
</webinf>
- <webinf dir="${build.test.dir}/resources/jaxrpc/wsse">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/wsse">
<include name="wsse.keystore"/>
<include name="wsse.truststore"/>
</webinf>
</war>
<!-- jaxrpc-wsse-store-pass-encrypt-class-cmd-client.jar -->
- <jar jarfile="${build.test.dir}/libs/jaxrpc-wsse-store-pass-encrypt-class-cmd-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-wsse-store-pass-encrypt-class-cmd-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/wsse/rpc/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/wsse/rpc/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/wsse/store-pass-encrypt-class-cmd">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/wsse/store-pass-encrypt-class-cmd">
<include name="jboss-wsse-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/wsse/rpc/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/wsse/rpc/WEB-INF">
<include name="wsdl/**"/>
<include name="jaxrpc-mapping.xml"/>
</metainf>
</jar>
<!-- jaxrpc-wsse-web-client.war -->
- <war warfile="${build.test.dir}/libs/jaxrpc-wsse-web-client.war" webxml="${build.test.dir}/resources/jaxrpc/wsse/webclient/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-wsse-web-client.war" webxml="${build.tests.dir}/resources/jaxrpc/wsse/webclient/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/HelloJavaBean.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/RpcTestClientServlet.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/wsse/rpc/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/wsse/rpc/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="jboss-wsse-server.xml"/>
<include name="wsdl/**"/>
</webinf>
- <webinf dir="${build.test.dir}/resources/jaxrpc/wsse/webclient/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/wsse/webclient/WEB-INF">
<include name="jboss-web.xml"/>
<include name="jboss-wsse-client.xml"/>
</webinf>
- <webinf dir="${build.test.dir}/resources/jaxrpc/wsse">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/wsse">
<include name="wsse.keystore"/>
<include name="wsse.truststore"/>
</webinf>
</war>
<!-- jaxrpc-wsse-username -->
- <jar jarfile="${build.test.dir}/libs/jaxrpc-wsse-username.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-wsse-username.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/wsse/*Type.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/*Service.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/*Struct.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/*EJBEndpoint.class"/>
</fileset>
- <fileset dir="${build.test.dir}/resources">
+ <fileset dir="${build.tests.dir}/resources">
<include name="*.properties"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/wsse/username/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/wsse/username/META-INF">
<include name="ejb-jar.xml"/>
<include name="jboss.xml"/>
<include name="jaxrpc-mapping.xml"/>
@@ -2042,18 +2043,18 @@
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/wsse">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/wsse">
<include name="wsse.keystore"/>
<include name="wsse.truststore"/>
</metainf>
</jar>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-wsse-username-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-wsse-username-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/wsse/username/*Type.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/username/*Struct.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/username/*Service.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/wsse/username/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/wsse/username/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jaxrpc-mapping.xml"/>
@@ -2063,122 +2064,122 @@
</jar>
<!-- jaxrpc-xop-doclit -->
- <war warfile="${build.test.dir}/libs/jaxrpc-xop-doclit.war" webxml="${build.test.dir}/resources/jaxrpc/xop/doclit/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-xop-doclit.war" webxml="${build.tests.dir}/resources/jaxrpc/xop/doclit/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/xop/doclit/*.class"/>
<include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/xop/doclit/*TestCase.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/xop/doclit/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/xop/doclit/WEB-INF">
<include name="webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar destfile="${build.test.dir}/libs/jaxrpc-xop-doclit-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxrpc-xop-doclit-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/xop/doclit/*.class"/>
<include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/xop/doclit/*TestCase.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/xop/doclit/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/xop/doclit/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/xop/doclit/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/xop/doclit/WEB-INF">
<include name="wsdl/**"/>
<include name="jaxrpc-mapping.xml"/>
</metainf>
</jar>
<!-- jaxrpc-xop-doclit with handlers -->
- <war warfile="${build.test.dir}/libs/jaxrpc-xop-doclit_handler.war" webxml="${build.test.dir}/resources/jaxrpc/xop/doclit/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-xop-doclit_handler.war" webxml="${build.tests.dir}/resources/jaxrpc/xop/doclit/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/xop/doclit/*.class"/>
<include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/xop/doclit/*TestCase.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/xop/doclit/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/xop/doclit/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</webinf>
- <webinf dir="${build.test.dir}/resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF">
<include name="webservices.xml"/>
</webinf>
</war>
- <jar destfile="${build.test.dir}/libs/jaxrpc-xop-doclit_handler-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxrpc-xop-doclit_handler-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/xop/doclit/*.class"/>
<include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/xop/doclit/*TestCase.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/xop/doclit/handlerconfig/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/xop/doclit/handlerconfig/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/xop/doclit/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/xop/doclit/WEB-INF">
<include name="wsdl/**"/>
<include name="jaxrpc-mapping.xml"/>
</metainf>
</jar>
<!-- jaxrpc-xop-rpclit without handlers -->
- <war warfile="${build.test.dir}/libs/jaxrpc-xop-rpclit.war" webxml="${build.test.dir}/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-xop-rpclit.war" webxml="${build.tests.dir}/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/xop/rpclit/*.class"/>
<include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/xop/rpclit/*TestCase.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/xop/rpclit/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/xop/rpclit/WEB-INF">
<include name="webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar destfile="${build.test.dir}/libs/jaxrpc-xop-rpclit-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxrpc-xop-rpclit-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/xop/rpclit/*.class"/>
<include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/xop/rpclit/*TestCase.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/xop/rpclit/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/xop/rpclit/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/xop/rpclit/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/xop/rpclit/WEB-INF">
<include name="wsdl/**"/>
<include name="jaxrpc-mapping.xml"/>
</metainf>
</jar>
<!-- jaxrpc-xop-rpclit with handlers -->
- <war warfile="${build.test.dir}/libs/jaxrpc-xop-rpclit_handler.war" webxml="${build.test.dir}/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-xop-rpclit_handler.war" webxml="${build.tests.dir}/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/xop/rpclit/*.class"/>
<include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/xop/rpclit/*TestCase.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/xop/rpclit/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/xop/rpclit/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</webinf>
- <webinf dir="${build.test.dir}/resources/jaxrpc/xop/rpclit/handlerconfig/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/xop/rpclit/handlerconfig/WEB-INF">
<include name="webservices.xml"/>
</webinf>
</war>
- <jar destfile="${build.test.dir}/libs/jaxrpc-xop-rpclit_handler-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxrpc-xop-rpclit_handler-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/xop/rpclit/*.class"/>
<include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/xop/rpclit/*TestCase.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/xop/rpclit/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/xop/rpclit/WEB-INF">
<include name="wsdl/**"/>
<include name="jaxrpc-mapping.xml"/>
</metainf>
Modified: trunk/src/test/ant/build-jars-jaxws.xml
===================================================================
--- trunk/src/test/ant/build-jars-jaxws.xml 2006-11-22 15:29:15 UTC (rev 1502)
+++ trunk/src/test/ant/build-jars-jaxws.xml 2006-11-22 15:50:49 UTC (rev 1503)
@@ -19,78 +19,78 @@
<target name="build-jars" description="Build the deployments.">
<!-- jaxws-asynchronous -->
- <war warfile="${build.test.dir}/libs/jaxws-asynchronous.war" webxml="${build.test.dir}/resources/jaxws/asynchronous/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxws-asynchronous.war" webxml="${build.tests.dir}/resources/jaxws/asynchronous/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/asynchronous/TestEndpoint.class"/>
<include name="org/jboss/test/ws/jaxws/asynchronous/TestEndpointBean.class"/>
</classes>
</war>
<!-- jaxws-binding -->
- <war warfile="${build.test.dir}/libs/jaxws-binding.war" webxml="${build.test.dir}/resources/jaxws/binding/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxws-binding.war" webxml="${build.tests.dir}/resources/jaxws/binding/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/binding/SOAPEndpointBean.class"/>
<include name="org/jboss/test/ws/jaxws/binding/SOAPEndpoint.class"/>
</classes>
</war>
<!-- jaxws-context -->
- <war warfile="${build.test.dir}/libs/jaxws-context.war" webxml="${build.test.dir}/resources/jaxws/context/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxws-context.war" webxml="${build.tests.dir}/resources/jaxws/context/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/context/EndpointBean.class"/>
<include name="org/jboss/test/ws/jaxws/context/EndpointInterface.class"/>
</classes>
</war>
<!-- jaxws-endpoint-servlet -->
- <war warfile="${build.test.dir}/libs/jaxws-endpoint-servlet.war" webxml="${build.test.dir}/resources/jaxws/endpoint/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxws-endpoint-servlet.war" webxml="${build.tests.dir}/resources/jaxws/endpoint/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/endpoint/EndpointServlet.class"/>
<include name="org/jboss/test/ws/jaxws/endpoint/EndpointBean.class"/>
<include name="org/jboss/test/ws/jaxws/endpoint/EndpointInterface.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxws/endpoint/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxws/endpoint/WEB-INF">
<include name="wsdl/**"/>
</webinf>
</war>
<!-- jaxws-handlerscope -->
- <war warfile="${build.test.dir}/libs/jaxws-handlerscope.war" webxml="${build.test.dir}/resources/jaxws/handlerscope/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxws-handlerscope.war" webxml="${build.tests.dir}/resources/jaxws/handlerscope/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/handlerscope/SOAPEndpointBean.class"/>
<include name="org/jboss/test/ws/jaxws/handlerscope/SOAPEndpoint.class"/>
<include name="org/jboss/test/ws/jaxws/handlerscope/ProtocolHandler.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxws/handlerscope/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxws/handlerscope/WEB-INF">
<include name="jaxws-server-handlers.xml"/>
</webinf>
</war>
<!-- jaxws-jbws860 -->
- <war warfile="${build.test.dir}/libs/jaxws-jbws860.war" webxml="${build.test.dir}/resources/jaxws/jbws860/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxws-jbws860.war" webxml="${build.tests.dir}/resources/jaxws/jbws860/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/jbws860/*.class"/>
<exclude name="org/jboss/test/ws/jaxws/jbws860/*TestCase.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxws/jbws860/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxws/jbws860/WEB-INF">
<include name="jboss-web.xml"/>
</webinf>
</war>
<!-- jaxws-jbws871 -->
- <war warfile="${build.test.dir}/libs/jaxws-jbws871-rpc.war" webxml="${build.test.dir}/resources/jaxws/jbws871/WEB-INF-rpc/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxws-jbws871-rpc.war" webxml="${build.tests.dir}/resources/jaxws/jbws871/WEB-INF-rpc/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/jbws871/RpcArrayEndpoint.class"/>
<include name="org/jboss/test/ws/jaxws/jbws871/RpcArrayEndpointImpl.class"/>
</classes>
</war>
- <jar destfile="${build.test.dir}/libs/jaxws-jbws871-rpc-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxws-jbws871-rpc-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/jbws871/IntegerArray.class"/>
<include name="org/jboss/test/ws/jaxws/jbws871/RpcArrayEndpoint.class"/>
<include name="org/jboss/test/ws/jaxws/jbws871/RpcArrayEndpointService.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxws/jbws871/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxws/jbws871/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jaxrpc-mapping.xml"/>
@@ -99,25 +99,25 @@
</jar>
<!-- jaxws-jbws944 -->
- <jar jarfile="${build.test.dir}/libs/jaxws-jbws944.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxws-jbws944.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/jbws944/EJB3Bean01.class"/>
<include name="org/jboss/test/ws/jaxws/jbws944/EJB3RemoteInterface.class"/>
</fileset>
</jar>
<!-- jaxws-jbws981 -->
- <jar destfile="${build.test.dir}/libs/jaxws-jbws981.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxws-jbws981.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/jbws981/EJB3Bean.class"/>
<include name="org/jboss/test/ws/jaxws/jbws981/EJB3RemoteInterface.class"/>
</fileset>
</jar>
- <jar destfile="${build.test.dir}/libs/jaxws-jbws981-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxws-jbws981-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/jbws981/EndpointInterface.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxws/jbws981/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxws/jbws981/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jaxrpc-mapping.xml"/>
@@ -126,15 +126,15 @@
</jar>
<!-- jaxws-jbws1178 -->
- <war destfile="${build.test.dir}/libs/jaxws-jbws1178.war" webxml="${build.test.dir}/resources/jaxws/jbws1178/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war destfile="${build.tests.dir}/libs/jaxws-jbws1178.war" webxml="${build.tests.dir}/resources/jaxws/jbws1178/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/jbws1178/TestEndpoint.class"/>
</classes>
</war>
<!-- jaxws-jbws1190 -->
- <war destfile="${build.test.dir}/libs/jaxws-jbws1190.war" webxml="${build.test.dir}/resources/jaxws/jbws1190/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war destfile="${build.tests.dir}/libs/jaxws-jbws1190.war" webxml="${build.tests.dir}/resources/jaxws/jbws1190/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/jbws1190/ConfidentialEndpoint.class"/>
<include name="org/jboss/test/ws/jaxws/jbws1190/TestEndpoint.class"/>
<include name="org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl*.class"/>
@@ -143,17 +143,17 @@
</war>
<!-- jaxws-jsr181-complex -->
- <war warfile="${build.test.dir}/libs/jaxws-jsr181-complex.war" webxml="${build.test.dir}/resources/jaxws/jsr181/complex/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxws-jsr181-complex.war" webxml="${build.tests.dir}/resources/jaxws/jsr181/complex/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/jsr181/complex/*.class"/>
<include name="org/jboss/test/ws/jaxws/jsr181/complex/extra/*.class"/>
</classes>
</war>
<!-- jaxws-jsr181-handlerchain -->
- <copy todir="${build.test.dir}/classes/org/jboss/test/ws/jaxws/jsr181/handlerchain" file="${build.test.dir}/resources/jaxws/jsr181/handlerchain/jaxws-handlers.xml"/>
- <war warfile="${build.test.dir}/libs/jaxws-jsr181-handlerchain.war" webxml="${build.test.dir}/resources/jaxws/jsr181/handlerchain/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <copy todir="${build.tests.dir}/classes/org/jboss/test/ws/jaxws/jsr181/handlerchain" file="${build.tests.dir}/resources/jaxws/jsr181/handlerchain/jaxws-handlers.xml"/>
+ <war warfile="${build.tests.dir}/libs/jaxws-jsr181-handlerchain.war" webxml="${build.tests.dir}/resources/jaxws/jsr181/handlerchain/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/jsr181/handlerchain/EndpointImpl.class"/>
<include name="org/jboss/test/ws/jaxws/jsr181/handlerchain/Endpoint.class"/>
<include name="org/jboss/test/ws/jaxws/jsr181/handlerchain/*Handler.class"/>
@@ -162,15 +162,15 @@
</war>
<!-- jaxws-jsr181-oneway -->
- <war warfile="${build.test.dir}/libs/jaxws-jsr181-oneway.war" webxml="${build.test.dir}/resources/jaxws/jsr181/oneway/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxws-jsr181-oneway.war" webxml="${build.tests.dir}/resources/jaxws/jsr181/oneway/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/jsr181/oneway/PingEndpointImpl.class"/>
</classes>
</war>
<!-- jaxws-jsr181-soapbinding -->
- <war warfile="${build.test.dir}/libs/jaxws-jsr181-soapbinding.war" webxml="${build.test.dir}/resources/jaxws/jsr181/soapbinding/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxws-jsr181-soapbinding.war" webxml="${build.tests.dir}/resources/jaxws/jsr181/soapbinding/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/jsr181/soapbinding/DocWrapped.class"/>
<include name="org/jboss/test/ws/jaxws/jsr181/soapbinding/ExampleSEI.class"/>
<include name="org/jboss/test/ws/jaxws/jsr181/soapbinding/DocBareServiceImpl.class"/>
@@ -184,16 +184,16 @@
</war>
<!-- jaxws-jsr181-webmethod -->
- <war warfile="${build.test.dir}/libs/jaxws-jsr181-webmethod.war" webxml="${build.test.dir}/resources/jaxws/jsr181/webmethod/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxws-jsr181-webmethod.war" webxml="${build.tests.dir}/resources/jaxws/jsr181/webmethod/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/jsr181/webmethod/TestEndpoint.class"/>
<include name="org/jboss/test/ws/jaxws/jsr181/webmethod/TestEndpointImpl.class"/>
</classes>
</war>
<!-- jaxws-jsr181-webparam -->
- <war warfile="${build.test.dir}/libs/jaxws-jsr181-webparam.war" webxml="${build.test.dir}/resources/jaxws/jsr181/webparam/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxws-jsr181-webparam.war" webxml="${build.tests.dir}/resources/jaxws/jsr181/webparam/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/jsr181/webparam/PingService.class"/>
<include name="org/jboss/test/ws/jaxws/jsr181/webparam/PingDocument*.class"/>
<include name="org/jboss/test/ws/jaxws/jsr181/webparam/SecurityHeader.class"/>
@@ -201,8 +201,8 @@
</war>
<!-- jaxws-jsr181-webresult -->
- <war warfile="${build.test.dir}/libs/jaxws-jsr181-webresult.war" webxml="${build.test.dir}/resources/jaxws/jsr181/webresult/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxws-jsr181-webresult.war" webxml="${build.tests.dir}/resources/jaxws/jsr181/webresult/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/jsr181/webresult/CustomerService.class"/>
<include name="org/jboss/test/ws/jaxws/jsr181/webresult/CustomerRecord.class"/>
<include name="org/jboss/test/ws/jaxws/jsr181/webresult/USAddress.class"/>
@@ -210,77 +210,77 @@
</war>
<!-- jaxws-jsr181-webservice -->
- <war warfile="${build.test.dir}/libs/jaxws-jsr181-webservice01-jse.war" webxml="${build.test.dir}/resources/jaxws/jsr181/webservice/WEB-INF01/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxws-jsr181-webservice01-jse.war" webxml="${build.tests.dir}/resources/jaxws/jsr181/webservice/WEB-INF01/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/jsr181/webservice/JSEBean01.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxws/jsr181/webservice/WEB-INF01">
+ <webinf dir="${build.tests.dir}/resources/jaxws/jsr181/webservice/WEB-INF01">
<include name="jboss-web.xml"/>
</webinf>
</war>
- <war warfile="${build.test.dir}/libs/jaxws-jsr181-webservice02-jse.war" webxml="${build.test.dir}/resources/jaxws/jsr181/webservice/WEB-INF02/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxws-jsr181-webservice02-jse.war" webxml="${build.tests.dir}/resources/jaxws/jsr181/webservice/WEB-INF02/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/jsr181/webservice/JSEBean02.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxws/jsr181/webservice/WEB-INF02">
+ <webinf dir="${build.tests.dir}/resources/jaxws/jsr181/webservice/WEB-INF02">
<include name="jboss-web.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <war warfile="${build.test.dir}/libs/jaxws-jsr181-webservice03-jse.war" webxml="${build.test.dir}/resources/jaxws/jsr181/webservice/WEB-INF03/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxws-jsr181-webservice03-jse.war" webxml="${build.tests.dir}/resources/jaxws/jsr181/webservice/WEB-INF03/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/jsr181/webservice/JSEBean03.class"/>
<include name="org/jboss/test/ws/jaxws/jsr181/webservice/EndpointInterface03.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxws/jsr181/webservice/WEB-INF03">
+ <webinf dir="${build.tests.dir}/resources/jaxws/jsr181/webservice/WEB-INF03">
<include name="jboss-web.xml"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxws-jsr181-webservice01-ejb21.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxws-jsr181-webservice01-ejb21.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/jsr181/webservice/EJB21Bean01.class"/>
<include name="org/jboss/test/ws/jaxws/jsr181/webservice/EndpointInterface.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxws/jsr181/webservice/META-INF01">
+ <metainf dir="${build.tests.dir}/resources/jaxws/jsr181/webservice/META-INF01">
<include name="ejb-jar.xml"/>
</metainf>
</jar>
- <jar jarfile="${build.test.dir}/libs/jaxws-jsr181-webservice02-ejb21.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxws-jsr181-webservice02-ejb21.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/jsr181/webservice/EJB21Bean02.class"/>
<include name="org/jboss/test/ws/jaxws/jsr181/webservice/EndpointInterface.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxws/jsr181/webservice/META-INF02">
+ <metainf dir="${build.tests.dir}/resources/jaxws/jsr181/webservice/META-INF02">
<include name="ejb-jar.xml"/>
<include name="wsdl/**"/>
</metainf>
</jar>
- <jar jarfile="${build.test.dir}/libs/jaxws-jsr181-webservice03-ejb21.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxws-jsr181-webservice03-ejb21.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/jsr181/webservice/EJB21Bean03.class"/>
<include name="org/jboss/test/ws/jaxws/jsr181/webservice/EndpointInterface03.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxws/jsr181/webservice/META-INF03">
+ <metainf dir="${build.tests.dir}/resources/jaxws/jsr181/webservice/META-INF03">
<include name="ejb-jar.xml"/>
</metainf>
</jar>
- <jar jarfile="${build.test.dir}/libs/jaxws-jsr181-webservice01-ejb3.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxws-jsr181-webservice01-ejb3.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/jsr181/webservice/EJB3Bean01.class"/>
<include name="org/jboss/test/ws/jaxws/jsr181/webservice/EJB3RemoteInterface.class"/>
</fileset>
</jar>
- <jar jarfile="${build.test.dir}/libs/jaxws-jsr181-webservice02-ejb3.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxws-jsr181-webservice02-ejb3.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/jsr181/webservice/EJB3Bean02.class"/>
<include name="org/jboss/test/ws/jaxws/jsr181/webservice/EJB3RemoteInterface.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxws/jsr181/webservice/META-INF02">
+ <metainf dir="${build.tests.dir}/resources/jaxws/jsr181/webservice/META-INF02">
<include name="wsdl/**"/>
</metainf>
</jar>
- <jar jarfile="${build.test.dir}/libs/jaxws-jsr181-webservice03-ejb3.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxws-jsr181-webservice03-ejb3.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/jsr181/webservice/EJB3Bean03.class"/>
<include name="org/jboss/test/ws/jaxws/jsr181/webservice/EJB3RemoteInterface.class"/>
<include name="org/jboss/test/ws/jaxws/jsr181/webservice/EndpointInterface03.class"/>
@@ -288,8 +288,8 @@
</jar>
<!-- jaxws-logicalhandler -->
- <war warfile="${build.test.dir}/libs/jaxws-logicalhandler-source.war" webxml="${build.test.dir}/resources/jaxws/logicalhandler/WEB-INF/web-source.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxws-logicalhandler-source.war" webxml="${build.tests.dir}/resources/jaxws/logicalhandler/WEB-INF/web-source.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/logicalhandler/SOAPEndpointSourceImpl.class"/>
<include name="org/jboss/test/ws/jaxws/logicalhandler/SOAPEndpointSource.class"/>
<include name="org/jboss/test/ws/jaxws/logicalhandler/LogicalSourceHandler.class"/>
@@ -297,12 +297,12 @@
<include name="org/jboss/test/ws/jaxws/logicalhandler/Echo.class"/>
<include name="org/jboss/test/ws/jaxws/logicalhandler/EchoResponse.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxws/logicalhandler/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxws/logicalhandler/WEB-INF">
<include name="jaxws-server-source-handlers.xml"/>
</webinf>
</war>
- <war warfile="${build.test.dir}/libs/jaxws-logicalhandler-jaxb.war" webxml="${build.test.dir}/resources/jaxws/logicalhandler/WEB-INF/web-jaxb.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxws-logicalhandler-jaxb.war" webxml="${build.tests.dir}/resources/jaxws/logicalhandler/WEB-INF/web-jaxb.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/logicalhandler/SOAPEndpointJAXBImpl.class"/>
<include name="org/jboss/test/ws/jaxws/logicalhandler/SOAPEndpointJAXB.class"/>
<include name="org/jboss/test/ws/jaxws/logicalhandler/LogicalJAXBHandler.class"/>
@@ -311,60 +311,60 @@
<include name="org/jboss/test/ws/jaxws/logicalhandler/EchoResponse.class"/>
<include name="org/jboss/test/ws/jaxws/logicalhandler/ObjectFactory.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxws/logicalhandler/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxws/logicalhandler/WEB-INF">
<include name="jaxws-server-jaxb-handlers.xml"/>
</webinf>
</war>
<!-- jaxws-provider-jaxb -->
- <war warfile="${build.test.dir}/libs/jaxws-provider-jaxb.war" webxml="${build.test.dir}/resources/jaxws/provider/jaxb/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxws-provider-jaxb.war" webxml="${build.tests.dir}/resources/jaxws/provider/jaxb/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/provider/ProviderBeanJAXB.class"/>
<include name="org/jboss/test/ws/jaxws/provider/ObjectFactory.class"/>
<include name="org/jboss/test/ws/jaxws/provider/UserType.class"/>
<include name="org/jboss/test/ws/jaxws/provider/package-info.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxws/provider/shared">
+ <webinf dir="${build.tests.dir}/resources/jaxws/provider/shared">
<include name="wsdl/Provider.wsdl"/>
</webinf>
</war>
<!-- jaxws-provider-message -->
- <war warfile="${build.test.dir}/libs/jaxws-provider-message.war" webxml="${build.test.dir}/resources/jaxws/provider/message/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxws-provider-message.war" webxml="${build.tests.dir}/resources/jaxws/provider/message/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/provider/ProviderBeanMessage.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxws/provider/shared">
+ <webinf dir="${build.tests.dir}/resources/jaxws/provider/shared">
<include name="wsdl/Provider.wsdl"/>
</webinf>
</war>
<!-- jaxws-provider-payload -->
- <war warfile="${build.test.dir}/libs/jaxws-provider-payload.war" webxml="${build.test.dir}/resources/jaxws/provider/payload/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxws-provider-payload.war" webxml="${build.tests.dir}/resources/jaxws/provider/payload/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/provider/ProviderBeanPayload.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxws/provider/shared">
+ <webinf dir="${build.tests.dir}/resources/jaxws/provider/shared">
<include name="wsdl/Provider.wsdl"/>
</webinf>
</war>
<!-- jaxws-samples-jsr181ejb -->
- <jar jarfile="${build.test.dir}/libs/jaxws-samples-jsr181ejb.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxws-samples-jsr181ejb.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/samples/jsr181ejb/EJB3Bean01.class"/>
<include name="org/jboss/test/ws/jaxws/samples/jsr181ejb/EJB3RemoteInterface.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxws/samples/jsr181ejb/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxws/samples/jsr181ejb/META-INF">
<include name="jboss-wsse-server.xml"/>
<include name="wsse.*"/>
</metainf>
</jar>
- <jar jarfile="${build.test.dir}/libs/jaxws-samples-jsr181ejb-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxws-samples-jsr181ejb-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/samples/jsr181ejb/EndpointInterface.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxws/samples/jsr181ejb/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxws/samples/jsr181ejb/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jaxrpc-mapping.xml"/>
@@ -375,16 +375,16 @@
</jar>
<!-- jaxws-samples-jsr181pojo -->
- <war warfile="${build.test.dir}/libs/jaxws-samples-jsr181pojo.war" webxml="${build.test.dir}/resources/jaxws/samples/jsr181pojo/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxws-samples-jsr181pojo.war" webxml="${build.tests.dir}/resources/jaxws/samples/jsr181pojo/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/JSEBean01.class"/>
</classes>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxws-samples-jsr181pojo-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxws-samples-jsr181pojo-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/EndpointInterface.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxws/samples/jsr181pojo/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxws/samples/jsr181pojo/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jaxrpc-mapping.xml"/>
@@ -393,18 +393,18 @@
</jar>
<!-- jaxws-samples-jsr181pojo-docwrapped -->
- <war warfile="${build.test.dir}/libs/jaxws-samples-jsr181pojo-docwrapped.war" webxml="${build.test.dir}/resources/jaxws/samples/jsr181pojo/docwrapped/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxws-samples-jsr181pojo-docwrapped.war" webxml="${build.tests.dir}/resources/jaxws/samples/jsr181pojo/docwrapped/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/docwrapped/JSEBean01.class"/>
</classes>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxws-samples-jsr181pojo-docwrapped-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxws-samples-jsr181pojo-docwrapped-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/docwrapped/EndpointInterface.class"/>
<include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/docwrapped/Concat.class"/>
<include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/docwrapped/ConcatResponse.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxws/samples/jsr181pojo/docwrapped/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxws/samples/jsr181pojo/docwrapped/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jaxrpc-mapping.xml"/>
@@ -413,22 +413,22 @@
</jar>
<!-- jaxws-samples-wsaddressing -->
- <war warfile="${build.test.dir}/libs/jaxws-samples-wsaddressing.war" webxml="${build.test.dir}/resources/jaxws/samples/wsaddressing/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxws-samples-wsaddressing.war" webxml="${build.tests.dir}/resources/jaxws/samples/wsaddressing/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpointImpl.class"/>
<include name="org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpoint.class"/>
<include name="org/jboss/test/ws/jaxws/samples/wsaddressing/ServerHandler.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxws/samples/wsaddressing/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxws/samples/wsaddressing/WEB-INF">
<include name="jaxws-handlers.xml"/>
</webinf>
</war>
- <jar destfile="${build.test.dir}/libs/jaxws-samples-wsaddressing-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxws-samples-wsaddressing-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpoint.class"/>
<include name="org/jboss/test/ws/jaxws/samples/wsaddressing/ClientHandler.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxws/samples/wsaddressing/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxws/samples/wsaddressing/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jbossws-client-config.xml"/>
@@ -438,21 +438,21 @@
</jar>
<!-- jaxws-samples-retail -->
- <jar jarfile="${build.test.dir}/libs/jaxws-samples-retail.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxws-samples-retail.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/samples/retail/**/*.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxws/samples/retail/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxws/samples/retail/META-INF">
<include name="wsdl/*"/>
<include name="jaxws-handler.xml"/>
</metainf>
</jar>
- <jar jarfile="${build.test.dir}/libs/jaxws-samples-retail-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxws-samples-retail-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/samples/retail/**/*.class"/>
<exclude name="org/jboss/test/ws/jaxws/samples/retail/**/*Bean.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxws/samples/retail/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxws/samples/retail/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="wsdl/**"/>
@@ -460,21 +460,21 @@
</jar>
<!-- jaxws-webserviceref -->
- <war warfile="${build.test.dir}/libs/jaxws-webserviceref.war" webxml="${build.test.dir}/resources/jaxws/webserviceref/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxws-webserviceref.war" webxml="${build.tests.dir}/resources/jaxws/webserviceref/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.class"/>
<include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.class"/>
</classes>
</war>
- <jar destfile="${build.test.dir}/libs/jaxws-webserviceref-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxws-webserviceref-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/webserviceref/ApplicationClient.class"/>
<include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.class"/>
<include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.class"/>
<include name="org/jboss/test/ws/jaxws/webserviceref/EchoResponse.class"/>
<include name="org/jboss/test/ws/jaxws/webserviceref/Echo.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxws/webserviceref/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxws/webserviceref/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="wsdl/**"/>
@@ -483,21 +483,21 @@
<attribute name="main-class" value="org.jboss.test.ws.jaxws.webserviceref.ApplicationClient"/>
</manifest>
</jar>
- <war destfile="${build.test.dir}/libs/jaxws-webserviceref-servlet-client.war" webxml="${build.test.dir}/resources/jaxws/webserviceref/servlet-client/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war destfile="${build.tests.dir}/libs/jaxws-webserviceref-servlet-client.war" webxml="${build.tests.dir}/resources/jaxws/webserviceref/servlet-client/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/webserviceref/ServletClient.class"/>
<include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.class"/>
<include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.class"/>
<include name="org/jboss/test/ws/jaxws/webserviceref/EchoResponse.class"/>
<include name="org/jboss/test/ws/jaxws/webserviceref/Echo.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxws/webserviceref/META-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxws/webserviceref/META-INF">
<include name="jboss-web.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar destfile="${build.test.dir}/libs/jaxws-webserviceref-ejb3-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxws-webserviceref-ejb3-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/webserviceref/EJB3Client.class"/>
<include name="org/jboss/test/ws/jaxws/webserviceref/EJB3Remote.class"/>
<include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.class"/>
@@ -505,15 +505,15 @@
<include name="org/jboss/test/ws/jaxws/webserviceref/EchoResponse.class"/>
<include name="org/jboss/test/ws/jaxws/webserviceref/Echo.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxws/webserviceref/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxws/webserviceref/META-INF">
<include name="jboss.xml"/>
<include name="wsdl/**"/>
</metainf>
</jar>
<!-- jaxws-wrapped-accessor -->
- <war warfile="${build.test.dir}/libs/jaxws-wrapped-accessor.war" webxml="${build.test.dir}/resources/jaxws/wrapped/accessor/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxws-wrapped-accessor.war" webxml="${build.tests.dir}/resources/jaxws/wrapped/accessor/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/wrapped/accessor/Accessor.class"/>
<include name="org/jboss/test/ws/jaxws/wrapped/accessor/AccessorImpl.class"/>
<include name="org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/*"/>
@@ -521,8 +521,8 @@
</war>
<!-- jaxws-anonymous -->
- <war warfile="${build.test.dir}/libs/jaxws-anonymous.war" webxml="${build.test.dir}/resources/jaxws/anonymous/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxws-anonymous.war" webxml="${build.tests.dir}/resources/jaxws/anonymous/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/anonymous/Anonymous.class"/>
<include name="org/jboss/test/ws/jaxws/anonymous/AnonymousRequest.class"/>
<include name="org/jboss/test/ws/jaxws/anonymous/AnonymousResponse.class"/>
@@ -531,8 +531,8 @@
</war>
<!-- jaxws-exception -->
- <war warfile="${build.test.dir}/libs/jaxws-exception.war" webxml="${build.test.dir}/resources/jaxws/exception/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxws-exception.war" webxml="${build.tests.dir}/resources/jaxws/exception/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/exception/ExceptionEndpoint.class"/>
<include name="org/jboss/test/ws/jaxws/exception/ExceptionEndpointImpl.class"/>
<include name="org/jboss/test/ws/jaxws/exception/UserException.class"/>
@@ -540,20 +540,20 @@
</war>
<!-- jaxws-wsaddressing-action -->
- <war warfile="${build.test.dir}/libs/jaxws-wsaddressing-action-rpc.war" webxml="${build.test.dir}/resources/jaxws/wsaddressing/action/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxws-wsaddressing-action-rpc.war" webxml="${build.tests.dir}/resources/jaxws/wsaddressing/action/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/wsaddressing/action/ActionRpcEndpointImpl.class"/>
<include name="org/jboss/test/ws/jaxws/wsaddressing/action/ActionEndpoint.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxws/wsaddressing/action/META-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxws/wsaddressing/action/META-INF">
<include name="wsdl/**"/>
</webinf>
</war>
- <jar destfile="${build.test.dir}/libs/jaxws-wsaddressing-action-rpc-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxws-wsaddressing-action-rpc-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/wsaddressing/action/ActionEndpoint.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxws/wsaddressing/action/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxws/wsaddressing/action/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jbossws-client-config.xml"/>
@@ -563,50 +563,50 @@
</jar>
<!-- jaxws-wsaddressing-replyto -->
- <war warfile="${build.test.dir}/libs/jaxws-wsaddressing-initial.war" webxml="${build.test.dir}/resources/jaxws/wsaddressing/replyto/Initial-WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxws-wsaddressing-initial.war" webxml="${build.tests.dir}/resources/jaxws/wsaddressing/replyto/Initial-WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpointImpl.class"/>
<include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint.class"/>
<include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint_*_RequestStruct.class"/>
<include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint_*_ResponseStruct.class"/>
</classes>
</war>
- <jar destfile="${build.test.dir}/libs/jaxws-wsaddressing-initial-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxws-wsaddressing-initial-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint.class"/>
<include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint_*_RequestStruct.class"/>
<include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint_*_ResponseStruct.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxws/wsaddressing/replyto/Initial-META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxws/wsaddressing/replyto/Initial-META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jaxws-jbossws-client-config.xml"/>
<include name="jaxrpc-mapping.xml"/>
</metainf>
</jar>
- <war warfile="${build.test.dir}/libs/jaxws-wsaddressing-replyto.war" webxml="${build.test.dir}/resources/jaxws/wsaddressing/replyto/ReplyTo-WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxws-wsaddressing-replyto.war" webxml="${build.tests.dir}/resources/jaxws/wsaddressing/replyto/ReplyTo-WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpointImpl.class"/>
<include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint.class"/>
<include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint_*_RequestStruct.class"/>
<include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint_*_ResponseStruct.class"/>
</classes>
</war>
- <jar destfile="${build.test.dir}/libs/jaxws-wsaddressing-replyto-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxws-wsaddressing-replyto-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint.class"/>
<include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint_*_RequestStruct.class"/>
<include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint_*_ResponseStruct.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jbossws-client-config.xml"/>
<include name="jaxrpc-mapping.xml"/>
</metainf>
</jar>
- <war warfile="${build.test.dir}/libs/jaxws-wsaddressing-faultto.war" webxml="${build.test.dir}/resources/jaxws/wsaddressing/replyto/FaultTo-WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxws-wsaddressing-faultto.war" webxml="${build.tests.dir}/resources/jaxws/wsaddressing/replyto/FaultTo-WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpointImpl.class"/>
<include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultType.class"/>
<include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpoint.class"/>
@@ -614,12 +614,12 @@
</war>
<!-- jaxws-jbws1357 -->
- <war warfile="${build.test.dir}/libs/jaxws-jbws1357.war" webxml="${build.test.dir}/resources/jaxws/jbws1357/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxws-jbws1357.war" webxml="${build.tests.dir}/resources/jaxws/jbws1357/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/jbws1357/JBWS1357.class"/>
<include name="org/jboss/test/ws/jaxws/jbws1357/JBWS1357Impl.class"/>
</classes>
- <fileset dir="${build.test.dir}/resources/jaxws/jbws1357">
+ <fileset dir="${build.tests.dir}/resources/jaxws/jbws1357">
<include name="hello.jsp"/>
</fileset>
</war>
Modified: trunk/src/test/build.xml
===================================================================
--- trunk/src/test/build.xml 2006-11-22 15:29:15 UTC (rev 1502)
+++ trunk/src/test/build.xml 2006-11-22 15:50:49 UTC (rev 1503)
@@ -22,7 +22,7 @@
<property name="build.dir" value="${basedir}/output"/>
<property name="build.lib.dir" value="${build.dir}/lib"/>
<property name="build.resources.dir" value="${build.dir}/resources"/>
- <property name="build.test.dir" value="${build.dir}/tests"/>
+ <property name="build.tests.dir" value="${build.dir}/tests"/>
<property name="test.dir" value="${basedir}/src/test"/>
<property name="test.etc.dir" value="${test.dir}/etc"/>
<property name="test.java.dir" value="${test.dir}/java"/>
@@ -99,8 +99,8 @@
<fail message="Not available: ${jboss.home}/client/jbossall-client.jar" unless="jbossws.available"/>
- <mkdir dir="${build.test.dir}/log"/>
- <touch file="${build.test.dir}/logtest.log"/>
+ <mkdir dir="${build.tests.dir}/log"/>
+ <touch file="${build.tests.dir}/logtest.log"/>
<tstamp>
<format property="build.id" pattern="yyyyMMddHHmm"/>
@@ -200,27 +200,6 @@
<pathelement location="${thirdparty.dir}/wstx-lgpl-2.9.3.jar"/>
<pathelement location="${thirdparty.dir}/xmlunit1.0.jar"/>
</path>
-
- <!-- Deploy jBPM BPEL (no action if deployed already) -->
- <property name="jboss.server.deploy.jbpmbpel" value="${jboss.server.deploy}/jbpm-bpel.sar" />
- <mkdir dir="${jboss.server.deploy.jbpmbpel}" />
- <unjar dest="${jboss.server.deploy.jbpmbpel}" src="${thirdparty.dir}/jbpm-bpel.sar" overwrite="no"/>
-
- <!-- The jBPM BPEL classpath -->
- <path id="jbpmbpel.classpath">
- <path refid="jbossws.client.classpath" />
- <fileset dir="${jboss.server.lib}">
- <include name="dom4j.jar" />
- <include name="commons-collections.jar" />
- </fileset>
- <fileset dir="${jboss.server.deploy.jbpmbpel}">
- <include name="jbpm*.jar" />
- <include name="commons-lang*.jar" />
- <include name="jaxen*.jar" />
- </fileset>
- <path location="${jboss.server.deploy.jbpmbpel}" />
- <path location="${test.etc.dir}" />
- </path>
</target>
<!-- ================================================================== -->
@@ -230,8 +209,8 @@
<target name="compile" depends="compile14, compile15" description="Compile sources"/>
<target name="compile14" depends="init" unless="HAVE_JDK_1.5">
- <mkdir dir="${build.test.dir}/classes"/>
- <javac destdir="${build.test.dir}/classes" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
+ <mkdir dir="${build.tests.dir}/classes"/>
+ <javac destdir="${build.tests.dir}/classes" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
<src path="${test.java.dir}"/>
<exclude name="org/jboss/test/ws/interop/**"/>
<exclude name="org/jboss/test/ws/jaxrpc/jbws718/**"/>
@@ -242,8 +221,8 @@
</target>
<target name="compile15" depends="init" if="HAVE_JDK_1.5">
- <mkdir dir="${build.test.dir}/classes"/>
- <javac destdir="${build.test.dir}/classes" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
+ <mkdir dir="${build.tests.dir}/classes"/>
+ <javac destdir="${build.tests.dir}/classes" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
<src path="${test.java.dir}"/>
<exclude name="org/jboss/test/ws/interop/**"/>
<exclude name="org/jboss/test/ws/jaxrpc/jbws718/**"/>
@@ -253,19 +232,19 @@
</target>
<target name="compile-generated" depends="init" description="Compile generated sources">
- <mkdir dir="${build.test.dir}/classes"/>
- <javac destdir="${build.test.dir}/classes" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
- <src path="${build.test.dir}/wstools/java"/>
+ <mkdir dir="${build.tests.dir}/classes"/>
+ <javac destdir="${build.tests.dir}/classes" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
+ <src path="${build.tests.dir}/wstools/java"/>
<exclude name="org/jboss/test/ws/interop/**"/>
<classpath refid="javac.classpath"/>
</javac>
</target>
<target name="copy-resources" depends="init" description="Copy the deployment resources.">
- <copy todir="${build.test.dir}/classes" file="${test.etc.dir}/jndi.properties"/>
- <copy todir="${build.test.dir}/classes" file="${test.etc.dir}/log4j.xml"/>
+ <copy todir="${build.tests.dir}/classes" file="${test.etc.dir}/jndi.properties"/>
+ <copy todir="${build.tests.dir}/classes" file="${test.etc.dir}/log4j.xml"/>
<!-- Copy resources -->
- <copy todir="${build.test.dir}/resources">
+ <copy todir="${build.tests.dir}/resources">
<fileset dir="${test.resources.dir}">
<include name="**/*.wsdl"/>
<include name="**/*.xml"/>
@@ -273,10 +252,11 @@
</fileset>
<filterset>
<filter token="jbosstest.host.name" value="${node0}"/>
+ <filter token="wsdl-publish-location" value="${build.tests.dir}/wsdl-publish"/>
</filterset>
</copy>
<!-- Copy binary files -->
- <copy todir="${build.test.dir}/resources">
+ <copy todir="${build.tests.dir}/resources">
<fileset dir="${test.resources.dir}">
<exclude name="**/*.wsdl"/>
<exclude name="**/*.xml"/>
@@ -289,8 +269,8 @@
<!-- ================================================================== -->
<target name="main" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" description="Build the deployments.">
- <mkdir dir="${build.test.dir}/reports"/>
- <mkdir dir="${build.test.dir}/libs"/>
+ <mkdir dir="${build.tests.dir}/reports"/>
+ <mkdir dir="${build.tests.dir}/libs"/>
<ant antfile="${test.dir}/ant/build-jars-jaxrpc.xml" target="build-jars" inheritall="true"/>
<ant antfile="${test.dir}/ant/build-jars-jaxws.xml" target="build-jars" inheritall="true"/>
</target>
@@ -299,61 +279,51 @@
Generate samples sources
-->
<target name="generate-sources" depends="compile" description="Generate the deployment resources.">
- <!--
- <zip destfile="${build.test.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip">
- <fileset dir="${build.test.dir}/resources/jaxrpc/samples/wsbpel/hello/bpel" />
- </zip>
- <taskdef name="servicegen" classname="org.jbpm.bpel.ant.ServiceGeneratorTask">
- <classpath refid="jbpmbpel.classpath" />
- </taskdef>
- <servicegen processfile="${build.test.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip"
- outputdir="${build.test.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/wsdl" />
- -->
<taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
<classpath refid="jbossws.client.classpath"/>
- <classpath location="${build.test.dir}/classes"/>
- <classpath location="${build.test.dir}"/>
+ <classpath location="${build.tests.dir}/classes"/>
+ <classpath location="${build.tests.dir}"/>
</taskdef>
- <mkdir dir="${build.test.dir}/wstools/java"/>
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/jbws718/WEB-INF" config="${test.resources.dir}/jaxrpc/jbws718/wstools-config.xml"/>
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/jbws1303/WEB-INF" config="${test.resources.dir}/jaxrpc/jbws1303/wstools-config.xml"/>
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/docstyle/bare/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/docstyle/bare/wstools-config.xml"/>
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/docstyle/wrapped/wstools-config.xml"/>
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/dynamichandler/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/dynamichandler/wstools-config.xml"/>
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/exception/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/exception/wstools-config.xml"/>
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/handler/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/handler/wstools-config.xml"/>
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/holder/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/holder/wstools-config.xml"/>
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/jmstransport/META-INF" config="${test.resources.dir}/jaxrpc/samples/jmstransport/wstools-config.xml"/>
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF" config="${test.resources.dir}/jaxrpc/samples/jsr109ejb/doclit/wstools-config.xml"/>
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF" config="${test.resources.dir}/jaxrpc/samples/jsr109ejb/rpclit/wstools-config.xml"/>
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/jsr109pojo/doclit/wstools-config.xml"/>
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/jsr109pojo/rpclit/wstools-config.xml"/>
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/message/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/message/wstools-config.xml"/>
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/oneway/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/oneway/wstools-config.xml"/>
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/rpcstyle/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/rpcstyle/wstools-config.xml"/>
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/secureejb/META-INF" config="${test.resources.dir}/jaxrpc/samples/secureejb/wstools-config.xml"/>
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/wssecurity/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/wssecurity/wstools-config.xml"/>
- <wstools dest="${build.test.dir}/wstools/resources/jaxws/samples/jsr181ejb/META-INF" config="${test.resources.dir}/jaxws/samples/jsr181ejb/wstools-config.xml"/>
- <wstools dest="${build.test.dir}/wstools/resources/jaxws/samples/jsr181pojo/META-INF" config="${test.resources.dir}/jaxws/samples/jsr181pojo/wstools-config.xml"/>
- <wstools dest="${build.test.dir}/wstools/resources/jaxws/samples/jsr181pojo/docwrapped/META-INF" config="${test.resources.dir}/jaxws/samples/jsr181pojo/docwrapped/wstools-config.xml"/>
- <wstools dest="${build.test.dir}/wstools/resources/jaxws/samples/wsaddressing/META-INF" config="${test.resources.dir}/jaxws/samples/wsaddressing/wstools-config.xml"/>
- <move todir="${build.test.dir}/wstools/java">
- <fileset dir="${build.test.dir}/wstools/resources/jaxrpc/jbws718/WEB-INF" includes="org/**"/>
- <fileset dir="${build.test.dir}/wstools/resources/jaxrpc/jbws1303/WEB-INF" includes="org/**"/>
- <fileset dir="${build.test.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" includes="org/**"/>
+ <mkdir dir="${build.tests.dir}/wstools/java"/>
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/jbws718/WEB-INF" config="${test.resources.dir}/jaxrpc/jbws718/wstools-config.xml"/>
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/jbws1303/WEB-INF" config="${test.resources.dir}/jaxrpc/jbws1303/wstools-config.xml"/>
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/docstyle/bare/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/docstyle/bare/wstools-config.xml"/>
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/docstyle/wrapped/wstools-config.xml"/>
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/dynamichandler/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/dynamichandler/wstools-config.xml"/>
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/exception/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/exception/wstools-config.xml"/>
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/handler/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/handler/wstools-config.xml"/>
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/holder/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/holder/wstools-config.xml"/>
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/jmstransport/META-INF" config="${test.resources.dir}/jaxrpc/samples/jmstransport/wstools-config.xml"/>
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF" config="${test.resources.dir}/jaxrpc/samples/jsr109ejb/doclit/wstools-config.xml"/>
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF" config="${test.resources.dir}/jaxrpc/samples/jsr109ejb/rpclit/wstools-config.xml"/>
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/jsr109pojo/doclit/wstools-config.xml"/>
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/jsr109pojo/rpclit/wstools-config.xml"/>
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/message/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/message/wstools-config.xml"/>
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/oneway/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/oneway/wstools-config.xml"/>
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/rpcstyle/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/rpcstyle/wstools-config.xml"/>
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/secureejb/META-INF" config="${test.resources.dir}/jaxrpc/samples/secureejb/wstools-config.xml"/>
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/wssecurity/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/wssecurity/wstools-config.xml"/>
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxws/samples/jsr181ejb/META-INF" config="${test.resources.dir}/jaxws/samples/jsr181ejb/wstools-config.xml"/>
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxws/samples/jsr181pojo/META-INF" config="${test.resources.dir}/jaxws/samples/jsr181pojo/wstools-config.xml"/>
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxws/samples/jsr181pojo/docwrapped/META-INF" config="${test.resources.dir}/jaxws/samples/jsr181pojo/docwrapped/wstools-config.xml"/>
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxws/samples/wsaddressing/META-INF" config="${test.resources.dir}/jaxws/samples/wsaddressing/wstools-config.xml"/>
+ <move todir="${build.tests.dir}/wstools/java">
+ <fileset dir="${build.tests.dir}/wstools/resources/jaxrpc/jbws718/WEB-INF" includes="org/**"/>
+ <fileset dir="${build.tests.dir}/wstools/resources/jaxrpc/jbws1303/WEB-INF" includes="org/**"/>
+ <fileset dir="${build.tests.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" includes="org/**"/>
</move>
</target>
<target name="copy-generated" depends="init" description="Copy the deployment resources.">
<!-- Copy generated resources -->
- <copy todir="${build.test.dir}/resources">
- <fileset dir="${build.test.dir}/wstools/resources">
+ <copy todir="${build.tests.dir}/resources">
+ <fileset dir="${build.tests.dir}/wstools/resources">
<include name="**/*.wsdl"/>
<include name="**/*.xml"/>
</fileset>
</copy>
<!-- Copy resources that cannot (yet) be generated -->
- <copy todir="${build.test.dir}/resources/jaxrpc/samples" overwrite="true">
+ <copy todir="${build.tests.dir}/resources/jaxrpc/samples" overwrite="true">
<fileset dir="${test.resources.dir}/jaxrpc/samples-override"/>
<filterset>
<filter token="jbosstest.host.name" value="${node0}"/>
@@ -421,14 +391,14 @@
<!-- Common test target -->
<target name="tests-main" depends="init">
- <junit printsummary="yes" showoutput="yes" dir="${build.test.dir}">
+ <junit printsummary="yes" showoutput="yes" dir="${build.tests.dir}">
<jvmarg value="-Djava.security.manager"/>
<sysproperty key="java.security.policy" value="${test.etc.dir}/tst.policy"/>
<sysproperty key="jboss.home" value="${jboss.home}"/>
<sysproperty key="tomcat.home" value="${tomcat.home}"/>
<sysproperty key="jbosstest.host.name" value="${node0}"/>
<sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
- <sysproperty key="build.testlog" value="${build.test.dir}/log"/>
+ <sysproperty key="build.testlog" value="${build.tests.dir}/log"/>
<sysproperty key="java.endorsed.dirs" value="${jboss.home}/lib/endorsed"/>
<sysproperty key="jbosstest.server.host" value="${node0}"/>
<sysproperty key="jbossws.target.server" value="${jbossws.target.server}"/>
@@ -443,12 +413,12 @@
<sysproperty key="client.scenario" value="${client.scenario}"/>
<classpath>
<path refid="test.client.classpath"/>
- <pathelement location="${build.test.dir}/classes"/>
+ <pathelement location="${build.tests.dir}/classes"/>
</classpath>
<formatter type="plain" usefile="true"/>
<formatter type="xml" usefile="true"/>
- <batchtest todir="${build.test.dir}/reports" fork="true">
- <fileset dir="${build.test.dir}/classes" includes="${include.wildcard}" excludes="${exclude.wildcard}" excludesfile="${excludesfile}"/>
+ <batchtest todir="${build.tests.dir}/reports" fork="true">
+ <fileset dir="${build.tests.dir}/classes" includes="${include.wildcard}" excludes="${exclude.wildcard}" excludesfile="${excludesfile}"/>
</batchtest>
</junit>
</target>
@@ -458,7 +428,7 @@
ant -Dtest=org.jboss.test.ws.jaxrpc.samples.jsr109pojo.RpcJSETestCase one-test
-->
<target name="one-test" depends="init" if="test" description="Run a single unit test">
- <junit printsummary="yes" showoutput="yes" dir="${build.test.dir}">
+ <junit printsummary="yes" showoutput="yes" dir="${build.tests.dir}">
<jvmarg line="${remote.debug.line}"/>
<jvmarg value="-Djava.security.manager"/>
<sysproperty key="java.security.policy" value="${test.etc.dir}/tst.policy"/>
@@ -466,7 +436,7 @@
<sysproperty key="tomcat.home" value="${tomcat.home}"/>
<sysproperty key="jbosstest.host.name" value="${node0}"/>
<sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
- <sysproperty key="build.testlog" value="${build.test.dir}/log"/>
+ <sysproperty key="build.testlog" value="${build.tests.dir}/log"/>
<sysproperty key="java.endorsed.dirs" value="${jboss.home}/lib/endorsed"/>
<sysproperty key="jbosstest.server.host" value="${node0}"/>
<sysproperty key="jbossws.target.server" value="${jbossws.target.server}"/>
@@ -492,11 +462,11 @@
<sysproperty key="org.jboss.ws.wsse.trustStoreType" value="jks"/>
<classpath>
<path refid="test.client.classpath"/>
- <pathelement location="${build.test.dir}/classes"/>
+ <pathelement location="${build.tests.dir}/classes"/>
</classpath>
<formatter type="plain" usefile="true"/>
<formatter type="xml" usefile="true"/>
- <test todir="${build.test.dir}/reports" name="${test}" fork="true"/>
+ <test todir="${build.tests.dir}/reports" name="${test}" fork="true"/>
</junit>
</target>
@@ -506,14 +476,14 @@
<!-- Build the tests report -->
<target name="tests-report" depends="init" description="Build the tests report">
- <junitreport todir="${build.test.dir}/reports">
- <fileset dir="${build.test.dir}/reports">
+ <junitreport todir="${build.tests.dir}/reports">
+ <fileset dir="${build.tests.dir}/reports">
<include name="TEST-*.xml"/>
</fileset>
- <report format="frames" todir="${build.test.dir}/reports/html"/>
+ <report format="frames" todir="${build.tests.dir}/reports/html"/>
</junitreport>
- <zip destfile="${build.test.dir}/test-report-${build.id}.zip">
- <fileset dir="${build.test.dir}" includes="reports/**"/>
+ <zip destfile="${build.tests.dir}/test-report-${build.id}.zip">
+ <fileset dir="${build.tests.dir}" includes="reports/**"/>
</zip>
</target>
@@ -522,7 +492,7 @@
<!-- ================================================================== -->
<target name="clean" description="Delete all generated test files.">
- <delete dir="${build.test.dir}"/>
+ <delete dir="${build.tests.dir}"/>
</target>
</project>
Modified: trunk/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss-client.xml 2006-11-22 15:29:15 UTC (rev 1502)
+++ trunk/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss-client.xml 2006-11-22 15:50:49 UTC (rev 1503)
@@ -7,7 +7,7 @@
<service-ref>
<service-ref-name>service/TestServiceEJB</service-ref-name>
- <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-samples-jsr109ejb-rpc?wsdl</wsdl-override>
+ <wsdl-override>file:@wsdl-publish-location@/jsr109ejb/TestService.wsdl</wsdl-override>
</service-ref>
</jboss-client>
Modified: trunk/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss.xml 2006-11-22 15:29:15 UTC (rev 1502)
+++ trunk/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss.xml 2006-11-22 15:50:49 UTC (rev 1503)
@@ -3,6 +3,14 @@
<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
<jboss>
+
+ <webservices>
+ <webservice-description>
+ <webservice-description-name>TestService</webservice-description-name>
+ <wsdl-publish-location>file:@wsdl-publish-location@/jsr109ejb</wsdl-publish-location>
+ </webservice-description>
+ </webservices>
+
<enterprise-beans>
<session>
<ejb-name>TestService</ejb-name>
Modified: trunk/src/test/resources/jaxrpc/samples/jsr109pojo/rpclit/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/samples/jsr109pojo/rpclit/META-INF/jboss-client.xml 2006-11-22 15:29:15 UTC (rev 1502)
+++ trunk/src/test/resources/jaxrpc/samples/jsr109pojo/rpclit/META-INF/jboss-client.xml 2006-11-22 15:50:49 UTC (rev 1503)
@@ -7,7 +7,7 @@
<service-ref>
<service-ref-name>service/TestServiceJSE</service-ref-name>
- <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-samples-jsr109pojo-rpc?wsdl</wsdl-override>
+ <wsdl-override>file:@wsdl-publish-location@/jsr109pojo/TestService.wsdl</wsdl-override>
</service-ref>
</jboss-client>
Copied: trunk/src/test/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/jboss-web.xml (from rev 1432, branches/jbossws-1.0/src/test/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/jboss-web.xml)
17 years, 10 months
JBossWS SVN: r1502 - in trunk/src: main/java/org/jboss/ws/common main/java/org/jboss/ws/integration/jboss50 main/java/org/jboss/ws/jaxrpc main/java/org/jboss/ws/jaxws/spi main/java/org/jboss/ws/metadata main/resources/schema test/java/org/jboss/test/ws/jaxrpc/samples/handler test/java/org/jboss/test/ws/jaxrpc/webserviceref test/resources/jaxrpc/samples/handler test/resources/jaxrpc/samples/handler/META-INF test/resources/jaxrpc/samples-override/handler/WEB-INF
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-11-22 10:29:15 -0500 (Wed, 22 Nov 2006)
New Revision: 1502
Removed:
trunk/src/main/java/org/jboss/ws/jaxrpc/MetaDataSynchronization.java
trunk/src/test/resources/jaxrpc/samples-override/handler/WEB-INF/wsdl/
Modified:
trunk/src/main/java/org/jboss/ws/common/CommonSOAPBinding.java
trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceRefMetaDataAdaptor.java
trunk/src/main/java/org/jboss/ws/jaxrpc/ServiceImpl.java
trunk/src/main/java/org/jboss/ws/jaxws/spi/ServiceDelegateImpl.java
trunk/src/main/java/org/jboss/ws/metadata/EndpointMetaData.java
trunk/src/main/java/org/jboss/ws/metadata/HandlerMetaData.java
trunk/src/main/java/org/jboss/ws/metadata/OperationMetaData.java
trunk/src/main/java/org/jboss/ws/metadata/ParameterMetaData.java
trunk/src/main/resources/schema/jaxrpc-config_2_0.xsd
trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/ClientSideHandler.java
trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/ServerSideHandler.java
trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefClientTestCase.java
trunk/src/test/resources/jaxrpc/samples-override/handler/WEB-INF/webservices.xml
trunk/src/test/resources/jaxrpc/samples/handler/META-INF/application-client.xml
trunk/src/test/resources/jaxrpc/samples/handler/wstools-config.xml
Log:
Fix handler init params
Disable MTOM for rpc/encoded
Fix CTS expected ServiceException on unsynchronized sei
Modified: trunk/src/main/java/org/jboss/ws/common/CommonSOAPBinding.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/common/CommonSOAPBinding.java 2006-11-22 13:27:13 UTC (rev 1501)
+++ trunk/src/main/java/org/jboss/ws/common/CommonSOAPBinding.java 2006-11-22 15:29:15 UTC (rev 1502)
@@ -52,7 +52,9 @@
import org.jboss.ws.binding.EndpointInvocation;
import org.jboss.ws.binding.UnboundHeader;
import org.jboss.ws.jaxrpc.ParameterWrapping;
+import org.jboss.ws.jaxrpc.StubExt;
import org.jboss.ws.jaxrpc.Style;
+import org.jboss.ws.jaxrpc.Use;
import org.jboss.ws.metadata.OperationMetaData;
import org.jboss.ws.metadata.ParameterMetaData;
import org.jboss.ws.metadata.TypesMetaData;
@@ -134,6 +136,10 @@
if (msgContext == null)
throw new WSException("MessageContext not available");
+ // Disable MTOM for rpc/encoded
+ if (opMetaData.isRPCEncoded())
+ msgContext.setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE);
+
// Associate current message with message context
SOAPMessageImpl reqMessage = (SOAPMessageImpl)createMessage(opMetaData);
msgContext.setSOAPMessage(reqMessage);
@@ -262,6 +268,10 @@
if (msgContext == null)
throw new WSException("MessageContext not available");
+ // Disable MTOM for rpc/encoded
+ if (opMetaData.isRPCEncoded())
+ msgContext.setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE);
+
// Get the namespace registry
NamespaceRegistry namespaceRegistry = msgContext.getNamespaceRegistry();
@@ -374,6 +384,10 @@
if (msgContext == null)
throw new WSException("MessageContext not available");
+ // Disable MTOM for rpc/encoded
+ if (opMetaData.isRPCEncoded())
+ msgContext.setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE);
+
// Associate current message with message context
SOAPMessageImpl resMessage = (SOAPMessageImpl)createMessage(opMetaData);
msgContext.setSOAPMessage(resMessage);
@@ -526,6 +540,10 @@
if (msgContext == null)
throw new WSException("MessageContext not available");
+ // Disable MTOM for rpc/encoded
+ if (opMetaData.isRPCEncoded())
+ msgContext.setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE);
+
SOAPHeader soapHeader = soapEnvelope.getHeader();
SOAPBody soapBody = soapEnvelope.getBody();
Iterator bodyChildren = soapBody.getChildElements();
Modified: trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceRefMetaDataAdaptor.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceRefMetaDataAdaptor.java 2006-11-22 13:27:13 UTC (rev 1501)
+++ trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceRefMetaDataAdaptor.java 2006-11-22 15:29:15 UTC (rev 1502)
@@ -27,6 +27,8 @@
import java.util.Arrays;
import java.util.LinkedHashMap;
+import javax.xml.namespace.QName;
+
import org.jboss.webservice.metadata.serviceref.HandlerMetaData;
import org.jboss.webservice.metadata.serviceref.InitParamMetaData;
import org.jboss.webservice.metadata.serviceref.PortComponentRefMetaData;
@@ -70,8 +72,10 @@
UnifiedHandlerMetaData uhmd = new UnifiedHandlerMetaData(null);
uhmd.setHandlerName(hmd.getHandlerName());
uhmd.setHandlerClass(hmd.getHandlerClass());
- Arrays.asList(hmd.getSoapHeaders());
-
+ for(QName soapHeader : hmd.getSoapHeaders())
+ {
+ uhmd.addSoapHeader(soapHeader);
+ }
for(String portname : hmd.getPortNames())
{
uhmd.addPortName(portname);
Deleted: trunk/src/main/java/org/jboss/ws/jaxrpc/MetaDataSynchronization.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/jaxrpc/MetaDataSynchronization.java 2006-11-22 13:27:13 UTC (rev 1501)
+++ trunk/src/main/java/org/jboss/ws/jaxrpc/MetaDataSynchronization.java 2006-11-22 15:29:15 UTC (rev 1502)
@@ -1,69 +0,0 @@
-/*
-* 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.
-*/
-// $Id$
-package org.jboss.ws.jaxrpc;
-
-import java.lang.reflect.Method;
-
-import javax.xml.rpc.ServiceException;
-
-import org.jboss.logging.Logger;
-import org.jboss.ws.metadata.EndpointMetaData;
-import org.jboss.ws.metadata.OperationMetaData;
-import org.jboss.ws.Constants;
-
-/** A helper that synchronizes the SEI with the endpoint meta data
- *
- * @author Thomas.Diesler(a)jboss.org
- * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a>
- * @since 19-May-2005
- */
-public class MetaDataSynchronization
-{
- // provide logging
- private static final Logger log = Logger.getLogger(MetaDataSynchronization.class);
-
- public static void synchronizeServiceEndpointInterface(EndpointMetaData epMetaData, Class seiClass) throws ServiceException
- {
- log.debug("synchronize: [epMetaData=" + epMetaData.getQName() + ",sei=" + seiClass.getName() + "]");
-
- if (epMetaData.getServiceEndpointInterface() != seiClass)
- throw new IllegalArgumentException("Endpoint meta data SEI missmatch, expected: " + epMetaData.getServiceEndpointInterfaceName());
-
- /*
- Method[] methods = seiClass.getMethods();
- for (int i = 0; i < methods.length; i++)
- {
- Method method = methods[i];
-
- if(method.getName().endsWith(Constants.ASYNC_METHOD_SUFFIX))
- continue;
-
- log.debug("synchronize method: " + method);
-
- OperationMetaData opMetaData = epMetaData.getOperation(method);
- if (opMetaData == null)
- throw new ServiceException("Cannot obtain operation meta data for method: " + method);
- }
- */
- }
-}
Modified: trunk/src/main/java/org/jboss/ws/jaxrpc/ServiceImpl.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/jaxrpc/ServiceImpl.java 2006-11-22 13:27:13 UTC (rev 1501)
+++ trunk/src/main/java/org/jboss/ws/jaxrpc/ServiceImpl.java 2006-11-22 15:29:15 UTC (rev 1502)
@@ -312,17 +312,28 @@
if (serviceMetaData == null)
throw new ServiceException("Service meta data not available");
- EndpointMetaData epMetaData = serviceMetaData.getEndpointByServiceEndpointInterface(seiName);
- if (epMetaData == null && serviceMetaData.getEndpoints().size() == 1)
+ try
{
- epMetaData = serviceMetaData.getEndpoints().get(0);
- epMetaData.setServiceEndpointInterfaceName(seiName);
- }
+ EndpointMetaData epMetaData = serviceMetaData.getEndpointByServiceEndpointInterface(seiName);
+ if (epMetaData == null && serviceMetaData.getEndpoints().size() == 1)
+ {
+ epMetaData = serviceMetaData.getEndpoints().get(0);
+ epMetaData.setServiceEndpointInterfaceName(seiName);
+ }
- if (epMetaData == null)
- throw new ServiceException("Cannot find endpoint meta data for: " + seiName);
+ if (epMetaData == null)
+ throw new ServiceException("Cannot find endpoint meta data for: " + seiName);
- return createProxy(seiClass, epMetaData);
+ return createProxy(seiClass, epMetaData);
+ }
+ catch (ServiceException ex)
+ {
+ throw ex;
+ }
+ catch (Exception ex)
+ {
+ throw new ServiceException("Cannot create proxy", ex);
+ }
}
/**
@@ -348,24 +359,12 @@
if (epMetaData == null)
throw new ServiceException("Cannot obtain endpoint meta data for: " + portName);
- if (epMetaData.getServiceEndpointInterfaceName() == null)
- epMetaData.setServiceEndpointInterfaceName(seiName);
-
- return createProxy(seiClass, epMetaData);
- }
-
- private Remote createProxy(Class seiClass, EndpointMetaData epMetaData) throws ServiceException
- {
try
{
- MetaDataSynchronization.synchronizeServiceEndpointInterface(epMetaData, seiClass);
- CallImpl call = new CallImpl(this, epMetaData);
+ if (epMetaData.getServiceEndpointInterfaceName() == null)
+ epMetaData.setServiceEndpointInterfaceName(seiName);
- CallProxy handler = new CallProxy(call);
- ClassLoader cl = epMetaData.getClassLoader();
- Remote proxy = (Remote)Proxy.newProxyInstance(cl, new Class[] { seiClass, StubExt.class }, handler);
-
- return proxy;
+ return createProxy(seiClass, epMetaData);
}
catch (ServiceException ex)
{
@@ -377,6 +376,17 @@
}
}
+ private Remote createProxy(Class seiClass, EndpointMetaData epMetaData) throws Exception
+ {
+ CallImpl call = new CallImpl(this, epMetaData);
+
+ CallProxy handler = new CallProxy(call);
+ ClassLoader cl = epMetaData.getClassLoader();
+ Remote proxy = (Remote)Proxy.newProxyInstance(cl, new Class[] { seiClass, StubExt.class }, handler);
+
+ return proxy;
+ }
+
/**
* Get the handler chain for the given endpoint name, maybe null.
*/
Modified: trunk/src/main/java/org/jboss/ws/jaxws/spi/ServiceDelegateImpl.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/jaxws/spi/ServiceDelegateImpl.java 2006-11-22 13:27:13 UTC (rev 1501)
+++ trunk/src/main/java/org/jboss/ws/jaxws/spi/ServiceDelegateImpl.java 2006-11-22 15:29:15 UTC (rev 1502)
@@ -25,7 +25,6 @@
import java.lang.reflect.Proxy;
import java.net.URL;
-import java.net.URLClassLoader;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
@@ -45,10 +44,9 @@
import javax.xml.ws.spi.ServiceDelegate;
import org.jboss.ws.Constants;
-import org.jboss.ws.jaxrpc.MetaDataSynchronization;
import org.jboss.ws.jaxws.client.ClientImpl;
-import org.jboss.ws.jaxws.client.DispatchImpl;
import org.jboss.ws.jaxws.client.ClientProxy;
+import org.jboss.ws.jaxws.client.DispatchImpl;
import org.jboss.ws.jaxws.handler.HandlerResolverImpl;
import org.jboss.ws.metadata.ClientEndpointMetaData;
import org.jboss.ws.metadata.EndpointMetaData;
@@ -273,8 +271,6 @@
{
try
{
- MetaDataSynchronization.synchronizeServiceEndpointInterface(epMetaData, seiClass);
-
if (handlerResolver instanceof HandlerResolverImpl)
{
HandlerResolverImpl impl = ((HandlerResolverImpl)handlerResolver);
Modified: trunk/src/main/java/org/jboss/ws/metadata/EndpointMetaData.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/metadata/EndpointMetaData.java 2006-11-22 13:27:13 UTC (rev 1501)
+++ trunk/src/main/java/org/jboss/ws/metadata/EndpointMetaData.java 2006-11-22 15:29:15 UTC (rev 1502)
@@ -197,7 +197,7 @@
{
this.seiName = seiName;
this.seiClass = null;
-
+
UnifiedMetaData wsMetaData = serviceMetaData.getUnifiedMetaData();
if (wsMetaData.isEagerInitialized())
{
@@ -503,6 +503,9 @@
private void initializeInternal()
{
+ // reset sei class
+ seiClass = null;
+
// Initialize handlers
for (HandlerMetaData handler : handlers)
handler.eagerInitialize();
Modified: trunk/src/main/java/org/jboss/ws/metadata/HandlerMetaData.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/metadata/HandlerMetaData.java 2006-11-22 13:27:13 UTC (rev 1501)
+++ trunk/src/main/java/org/jboss/ws/metadata/HandlerMetaData.java 2006-11-22 15:29:15 UTC (rev 1502)
@@ -170,7 +170,7 @@
public static class HandlerInitParam implements Serializable
{
private static final long serialVersionUID = -8687875291620457318L;
-
+
// The required <handler-name> element
private String paramName;
// The required <handler-class> element
Modified: trunk/src/main/java/org/jboss/ws/metadata/OperationMetaData.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/metadata/OperationMetaData.java 2006-11-22 13:27:13 UTC (rev 1501)
+++ trunk/src/main/java/org/jboss/ws/metadata/OperationMetaData.java 2006-11-22 15:29:15 UTC (rev 1502)
@@ -141,6 +141,11 @@
return getStyle() == Style.RPC && getUse() == Use.LITERAL;
}
+ public boolean isRPCEncoded()
+ {
+ return getStyle() == Style.RPC && getUse() == Use.ENCODED;
+ }
+
public boolean isDocumentBare()
{
return getStyle() == Style.DOCUMENT && getParameterStyle() == ParameterStyle.BARE;
Modified: trunk/src/main/java/org/jboss/ws/metadata/ParameterMetaData.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/metadata/ParameterMetaData.java 2006-11-22 13:27:13 UTC (rev 1501)
+++ trunk/src/main/java/org/jboss/ws/metadata/ParameterMetaData.java 2006-11-22 15:29:15 UTC (rev 1502)
@@ -365,9 +365,10 @@
*/
public void eagerInitialize()
{
- // At some point we want to make this plugable, hardcoding
- // references like this is not very flexible.
- if (opMetaData.isDocumentWrapped())
+ // reset java type
+ javaType = null;
+
+ if (getOperationMetaData().isDocumentWrapped() && isMessageType() == false)
{
new DynamicWrapperGenerator(getClassLoader()).generate(this);
Modified: trunk/src/main/resources/schema/jaxrpc-config_2_0.xsd
===================================================================
--- trunk/src/main/resources/schema/jaxrpc-config_2_0.xsd 2006-11-22 13:27:13 UTC (rev 1501)
+++ trunk/src/main/resources/schema/jaxrpc-config_2_0.xsd 2006-11-22 15:29:15 UTC (rev 1502)
@@ -1,78 +1,82 @@
<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="urn:jboss:jaxrpc-config:2.0"
- xmlns:tns="urn:jboss:jaxrpc-config:2.0"
- xmlns:jbxb="http://www.jboss.org/xml/ns/jbxb"
- xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1">
-
- <xsd:annotation>
- <xsd:documentation>
- <![CDATA[
+<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="urn:jboss:jaxrpc-config:2.0" xmlns:tns="urn:jboss:jaxrpc-config:2.0"
+ xmlns:jbxb="http://www.jboss.org/xml/ns/jbxb" xmlns:j2ee="http://java.sun.com/xml/ns/j2ee" xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
+ attributeFormDefault="unqualified" version="1.1">
+
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
This is the schema definition for JBossWS configurations JAXRPC.
It relies on the handler definitions that are part of the standard J2EE-1.4 deployment descriptors.
]]>
- </xsd:documentation>
- </xsd:annotation>
-
- <xsd:import namespace="http://java.sun.com/xml/ns/j2ee" schemaLocation="j2ee_web_services_1_1.xsd"/>
-
- <xsd:complexType name="jaxrpcConfigType">
- <xsd:annotation>
- <xsd:appinfo>
- <jbxb:class impl="org.jboss.ws.metadata.config.WSConfig"/>
- </xsd:appinfo>
- </xsd:annotation>
- <xsd:choice>
- <xsd:element name="endpoint-config" type="tns:endpointConfigType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="client-config" type="tns:clientConfigType" minOccurs="0" maxOccurs="unbounded"/>
- </xsd:choice>
- </xsd:complexType>
-
- <xsd:element name="jaxrpc-config" type="tns:jaxrpcConfigType"/>
-
- <xsd:complexType name="endpointConfigType">
- <xsd:annotation>
- <xsd:appinfo>
- <jbxb:class impl="org.jboss.ws.metadata.config.WSEndpointConfig"/>
- </xsd:appinfo>
- </xsd:annotation>
+ </xsd:documentation>
+ </xsd:annotation>
+
+ <xsd:import namespace="http://java.sun.com/xml/ns/j2ee" schemaLocation="j2ee_web_services_1_1.xsd"/>
+
+ <xsd:complexType name="jaxrpcConfigType">
+ <xsd:annotation>
+ <xsd:appinfo>
+ <jbxb:class impl="org.jboss.ws.metadata.config.WSConfig"/>
+ </xsd:appinfo>
+ </xsd:annotation>
+ <xsd:choice>
+ <xsd:element name="endpoint-config" type="tns:endpointConfigType" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="client-config" type="tns:clientConfigType" minOccurs="0" maxOccurs="unbounded"/>
+ </xsd:choice>
+ </xsd:complexType>
+
+ <xsd:element name="jaxrpc-config" type="tns:jaxrpcConfigType"/>
+
+ <xsd:complexType name="endpointConfigType">
+ <xsd:annotation>
+ <xsd:appinfo>
+ <jbxb:class impl="org.jboss.ws.metadata.config.WSEndpointConfig"/>
+ </xsd:appinfo>
+ </xsd:annotation>
<xsd:complexContent>
<xsd:extension base="tns:commonConfigType"/>
</xsd:complexContent>
- </xsd:complexType>
-
- <xsd:complexType name="clientConfigType">
- <xsd:annotation>
- <xsd:appinfo>
- <jbxb:class impl="org.jboss.ws.metadata.config.WSClientConfig"/>
- </xsd:appinfo>
- </xsd:annotation>
+ </xsd:complexType>
+
+ <xsd:complexType name="clientConfigType">
+ <xsd:annotation>
+ <xsd:appinfo>
+ <jbxb:class impl="org.jboss.ws.metadata.config.WSClientConfig"/>
+ </xsd:appinfo>
+ </xsd:annotation>
<xsd:complexContent>
<xsd:extension base="tns:commonConfigType"/>
</xsd:complexContent>
- </xsd:complexType>
-
- <xsd:complexType name="commonConfigType">
- <xsd:sequence>
- <xsd:element name="config-name" type="xsd:string"/>
- <xsd:element name="pre-handler-chain" type="tns:handlerChainType" minOccurs="0"/>
- <xsd:element name="post-handler-chain" type="tns:handlerChainType" minOccurs="0"/>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:complexType name="handlerChainType">
- <xsd:annotation>
- <xsd:appinfo>
- <jbxb:class impl="org.jboss.ws.metadata.config.WSHandlerChainConfig"/>
- </xsd:appinfo>
- </xsd:annotation>
- <xsd:sequence>
- <xsd:element name="handler-chain-name" type="xsd:string"/>
- <xsd:element name="handler" type="j2ee:port-component_handlerType" minOccurs="0" maxOccurs="unbounded"/>
- </xsd:sequence>
- </xsd:complexType>
-
+ </xsd:complexType>
+
+ <xsd:complexType name="commonConfigType">
+ <xsd:sequence>
+ <xsd:element name="config-name" type="xsd:string"/>
+ <xsd:element name="pre-handler-chain" type="tns:handlerChainType" minOccurs="0"/>
+ <xsd:element name="post-handler-chain" type="tns:handlerChainType" minOccurs="0"/>
+ <xsd:element name="property" type="tns:propertyType" minOccurs="0" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ </xsd:complexType>
+
+ <xsd:complexType name="handlerChainType">
+ <xsd:annotation>
+ <xsd:appinfo>
+ <jbxb:class impl="org.jboss.ws.metadata.config.WSHandlerChainConfig"/>
+ </xsd:appinfo>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element name="handler-chain-name" type="xsd:string"/>
+ <xsd:element name="handler" type="j2ee:port-component_handlerType" minOccurs="0" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ </xsd:complexType>
+
+ <xsd:complexType name="propertyType">
+ <xsd:sequence>
+ <xsd:element name="property-name" type="xsd:string"/>
+ <xsd:element name="property-value" type="xsd:string"/>
+ </xsd:sequence>
+ </xsd:complexType>
+
</xsd:schema>
\ No newline at end of file
Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/ClientSideHandler.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/ClientSideHandler.java 2006-11-22 13:27:13 UTC (rev 1501)
+++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/ClientSideHandler.java 2006-11-22 15:29:15 UTC (rev 1502)
@@ -24,6 +24,7 @@
import javax.xml.namespace.QName;
import javax.xml.rpc.JAXRPCException;
import javax.xml.rpc.handler.GenericHandler;
+import javax.xml.rpc.handler.HandlerInfo;
import javax.xml.rpc.handler.MessageContext;
import javax.xml.rpc.handler.soap.SOAPMessageContext;
import javax.xml.soap.SOAPBody;
@@ -35,28 +36,36 @@
import org.jboss.logging.Logger;
+import sun.reflect.ReflectionFactory.GetReflectionFactoryAction;
+
public class ClientSideHandler extends GenericHandler
{
// Provide logging
private static Logger log = Logger.getLogger(ClientSideHandler.class);
- protected QName[] headers = new QName[]{
- new QName("http://somens", "InHeader"),
- new QName("http://somens", "OutHeader"),
- new QName("http://somens", "InOutHeader")
- };
+ protected QName[] headers;
public QName[] getHeaders()
{
return headers;
}
+ public void init(HandlerInfo info)
+ {
+ log.info("init: " + info);
+ headers = info.getHeaders();
+ }
+
public boolean handleRequest(MessageContext msgContext)
{
log.info("handleRequest");
+ QName[] headers = getHeaders();
+ if (headers == null || headers.length != 3)
+ throw new IllegalStateException("Invalid number of headers");
+
try
- {
+ {
SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage();
SOAPHeader soapHeader = soapMessage.getSOAPHeader();
Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/ServerSideHandler.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/ServerSideHandler.java 2006-11-22 13:27:13 UTC (rev 1501)
+++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/ServerSideHandler.java 2006-11-22 15:29:15 UTC (rev 1502)
@@ -24,6 +24,7 @@
import javax.xml.namespace.QName;
import javax.xml.rpc.JAXRPCException;
import javax.xml.rpc.handler.GenericHandler;
+import javax.xml.rpc.handler.HandlerInfo;
import javax.xml.rpc.handler.MessageContext;
import javax.xml.rpc.handler.soap.SOAPMessageContext;
import javax.xml.soap.Name;
@@ -42,21 +43,27 @@
// Provide logging
private static Logger log = Logger.getLogger(ServerSideHandler.class);
- protected QName[] headers = new QName[]{
- new QName("http://somens", "InHeader"),
- new QName("http://somens", "OutHeader"),
- new QName("http://somens", "InOutHeader")
- };
+ protected QName[] headers;
public QName[] getHeaders()
{
return headers;
}
+ public void init(HandlerInfo info)
+ {
+ log.info("init: " + info);
+ headers = info.getHeaders();
+ }
+
public boolean handleRequest(MessageContext msgContext)
{
log.info("handleRequest");
+ QName[] headers = getHeaders();
+ if (headers == null || headers.length != 3)
+ throw new IllegalStateException("Invalid number of headers");
+
try
{
SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage();
Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefClientTestCase.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefClientTestCase.java 2006-11-22 13:27:13 UTC (rev 1501)
+++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefClientTestCase.java 2006-11-22 15:29:15 UTC (rev 1502)
@@ -27,6 +27,8 @@
import javax.xml.namespace.QName;
import javax.xml.rpc.Service;
+import javax.xml.rpc.ServiceException;
+import javax.xml.rpc.ServiceFactory;
import junit.framework.Test;
@@ -45,7 +47,7 @@
public class WebServiceRefClientTestCase extends JBossWSTest
{
public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxrpc-webserviceref";
-
+
public static Test suite()
{
return JBossWSTestSetup.newTestSetup(WebServiceRefClientTestCase.class, "jaxrpc-webserviceref.war, jaxrpc-webserviceref-client.jar");
@@ -58,7 +60,7 @@
WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL);
assertNotNull(wsdlDefinitions);
}
-
+
public void testDynamicProxy() throws Exception
{
URL wsdlURL = new File("resources/jaxrpc/webserviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL();
@@ -72,11 +74,31 @@
assertEquals(helloWorld, retObj);
}
+ public void testDynamicProxyNeg() throws Exception
+ {
+ URL wsdlURL = new File("resources/jaxrpc/webserviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL();
+ QName qname = new QName("http://org.jboss.ws/wsref", "TestEndpointService");
+ Service service = ServiceFactory.newInstance().createService(wsdlURL, qname);
+ try
+ {
+ TestEndpoint port = (TestEndpoint)service.getPort(java.rmi.activation.Activator.class);
+ fail("Expected ServiceException, but got: " + port);
+ }
+ catch (ServiceException ex)
+ {
+ // this is tested by the CTS
+ }
+ catch (Exception ex)
+ {
+ fail("Expected ServiceException, but got: " + ex);
+ }
+ }
+
public void testApplicationClient() throws Exception
{
String helloWorld = "Hello World!";
ApplicationClient.encCtx = getInitialContext();
- ApplicationClient.main(new String[]{helloWorld});
+ ApplicationClient.main(new String[] { helloWorld });
assertEquals(helloWorld, ApplicationClient.retStr);
}
}
Modified: trunk/src/test/resources/jaxrpc/samples/handler/META-INF/application-client.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/samples/handler/META-INF/application-client.xml 2006-11-22 13:27:13 UTC (rev 1501)
+++ trunk/src/test/resources/jaxrpc/samples/handler/META-INF/application-client.xml 2006-11-22 15:29:15 UTC (rev 1502)
@@ -18,6 +18,18 @@
<handler>
<handler-name>HeaderTestHandler</handler-name>
<handler-class>org.jboss.test.ws.jaxrpc.samples.handler.ClientSideHandler</handler-class>
+ <init-param>
+ <param-name>ClientParam1</param-name>
+ <param-value>value1</param-value>
+ </init-param>
+ <init-param>
+ <param-name>ClientParam2</param-name>
+ <param-value>value2</param-value>
+ </init-param>
+ <soap-header xmlns:ns1='http://somens'>ns1:InHeader</soap-header>
+ <soap-header xmlns:ns1='http://somens'>ns1:OutHeader</soap-header>
+ <soap-header xmlns:ns1='http://somens'>ns1:InOutHeader</soap-header>
+ <soap-role>role1</soap-role>
</handler>
</service-ref>
Modified: trunk/src/test/resources/jaxrpc/samples/handler/wstools-config.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/samples/handler/wstools-config.xml 2006-11-22 13:27:13 UTC (rev 1501)
+++ trunk/src/test/resources/jaxrpc/samples/handler/wstools-config.xml 2006-11-22 15:29:15 UTC (rev 1502)
@@ -34,5 +34,17 @@
<handler>
<handler-name>HeaderTestHandler</handler-name>
<handler-class>org.jboss.test.ws.jaxrpc.samples.handler.HeaderTestHandler</handler-class>
+ <init-param>
+ <param-name>ServerParam1</param-name>
+ <param-value>value1</param-value>
+ </init-param>
+ <init-param>
+ <param-name>ServerParam2</param-name>
+ <param-value>value2</param-value>
+ </init-param>
+ <soap-header xmlns:ns1='http://somens'>ns1:InHeader</soap-header>
+ <soap-header xmlns:ns1='http://somens'>ns1:OutHeader</soap-header>
+ <soap-header xmlns:ns1='http://somens'>ns1:InOutHeader</soap-header>
+ <soap-role>role1</soap-role>
</handler>
-->
Modified: trunk/src/test/resources/jaxrpc/samples-override/handler/WEB-INF/webservices.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/samples-override/handler/WEB-INF/webservices.xml 2006-11-22 13:27:13 UTC (rev 1501)
+++ trunk/src/test/resources/jaxrpc/samples-override/handler/WEB-INF/webservices.xml 2006-11-22 15:29:15 UTC (rev 1502)
@@ -13,6 +13,18 @@
<handler>
<handler-name>HeaderTestHandler</handler-name>
<handler-class>org.jboss.test.ws.jaxrpc.samples.handler.ServerSideHandler</handler-class>
+ <init-param>
+ <param-name>ServerParam1</param-name>
+ <param-value>value1</param-value>
+ </init-param>
+ <init-param>
+ <param-name>ServerParam2</param-name>
+ <param-value>value2</param-value>
+ </init-param>
+ <soap-header xmlns:ns1='http://somens'>ns1:InHeader</soap-header>
+ <soap-header xmlns:ns1='http://somens'>ns1:OutHeader</soap-header>
+ <soap-header xmlns:ns1='http://somens'>ns1:InOutHeader</soap-header>
+ <soap-role>role1</soap-role>
</handler>
</port-component>
</webservice-description>
17 years, 10 months
JBossWS SVN: r1501 - in trunk: . src/ant src/main/resources/samples/common src/main/resources/samples/jaxrpc/wssecurity src/test/java/org/jboss/test/ws
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-11-22 08:27:13 -0500 (Wed, 22 Nov 2006)
New Revision: 1501
Modified:
trunk/build.xml
trunk/src/ant/build-samples.xml
trunk/src/ant/build-thirdparty.xml
trunk/src/main/resources/samples/common/imported-build.xml
trunk/src/main/resources/samples/common/log4j.xml
trunk/src/main/resources/samples/jaxrpc/wssecurity/build.xml
trunk/src/test/java/org/jboss/test/ws/JBossWSTestHelper.java
Log:
Decouple samples build from target container
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2006-11-22 13:12:53 UTC (rev 1500)
+++ trunk/build.xml 2006-11-22 13:27:13 UTC (rev 1501)
@@ -396,9 +396,11 @@
<!-- Deploy to Tomcat -->
<target name="deploy-tomcat" depends="main,jbossws-thirdparty-jar" description="Deploy JBossWS to Tomcat">
+ <copy todir="${tomcat.common.dir}/endorsed" file="${thirdparty.dir}/resolver.jar"/>
<copy todir="${tomcat.common.dir}/endorsed" file="${thirdparty.dir}/serializer.jar"/>
<copy todir="${tomcat.common.dir}/endorsed" file="${thirdparty.dir}/xalan.jar"/>
<copy todir="${tomcat.common.dir}/endorsed" file="${thirdparty.dir}/xercesImpl.jar"/>
+ <copy todir="${tomcat.common.dir}/endorsed" file="${thirdparty.dir}/xml-apis.jar"/>
<copy todir="${tomcat.common.dir}/lib" file="${thirdparty.dir}/activation.jar"/>
<copy todir="${tomcat.common.dir}/lib" file="${thirdparty.dir}/log4j.jar"/>
<copy todir="${tomcat.common.dir}/lib" file="${thirdparty.dir}/mailapi.jar"/>
Modified: trunk/src/ant/build-samples.xml
===================================================================
--- trunk/src/ant/build-samples.xml 2006-11-22 13:12:53 UTC (rev 1500)
+++ trunk/src/ant/build-samples.xml 2006-11-22 13:27:13 UTC (rev 1501)
@@ -31,6 +31,14 @@
<mkdir dir="${build.src.samples.dir}/lib"/>
<copy todir="${build.src.samples.dir}/lib">
+ <fileset dir="${jboss.client}">
+ <include name="commons-logging.jar"/>
+ <include name="jbossall-client.jar"/>
+ <include name="mail.jar"/>
+ <include name="jboss-aop-jdk50-client.jar"/>
+ <include name="jboss-aspect-jdk50-client.jar"/>
+ <include name="jboss-ejb3-client.jar"/>
+ </fileset>
<fileset dir="${build.lib.dir}">
<include name="jbossws-jboss-integration.jar"/>
<include name="jbossws-tomcat-integration.jar"/>
@@ -271,10 +279,13 @@
<copy todir="${build.src.samples.dir}/jaxrpc/wssecurity/java">
<fileset dir="${test.java.dir}">
<include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/**"/>
+ <exclude name="org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java"/>
</fileset>
</copy>
<copy todir="${build.src.samples.dir}/jaxrpc/wssecurity/resources">
- <fileset dir="${test.resources.dir}/jaxrpc/samples/wssecurity"/>
+ <fileset dir="${test.resources.dir}/jaxrpc/samples/wssecurity">
+ <exclude name="store-pass-encrypt/**"/>
+ </fileset>
</copy>
<!-- JAXWS samples - - - - - - - - - - - - - - - - - - - - - - -->
Modified: trunk/src/ant/build-thirdparty.xml
===================================================================
--- trunk/src/ant/build-thirdparty.xml 2006-11-22 13:12:53 UTC (rev 1500)
+++ trunk/src/ant/build-thirdparty.xml 2006-11-22 13:27:13 UTC (rev 1501)
@@ -28,6 +28,7 @@
<get src="${jboss.repository}/apache-log4j/${apache-log4j}/lib/log4j.jar" dest="${thirdparty.dir}/log4j.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/apache-xalan/${apache-xalan}/lib/serializer.jar" dest="${thirdparty.dir}/serializer.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/apache-xalan/${apache-xalan}/lib/xalan.jar" dest="${thirdparty.dir}/xalan.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/apache-xerces/${apache-xerces}/lib/resolver.jar" dest="${thirdparty.dir}/resolver.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/apache-xerces/${apache-xerces}/lib/xercesImpl.jar" dest="${thirdparty.dir}/xercesImpl.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/apache-xerces/${apache-xerces}/lib/xml-apis.jar" dest="${thirdparty.dir}/xml-apis.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/apache-xmlsec/${apache-xmlsec}/lib/xmlsec.jar" dest="${thirdparty.dir}/xmlsec.jar" usetimestamp="true" verbose="true"/>
Modified: trunk/src/main/resources/samples/common/imported-build.xml
===================================================================
--- trunk/src/main/resources/samples/common/imported-build.xml 2006-11-22 13:12:53 UTC (rev 1500)
+++ trunk/src/main/resources/samples/common/imported-build.xml 2006-11-22 13:27:13 UTC (rev 1501)
@@ -30,7 +30,7 @@
<isset property="HAVE_JDK_1.5"/>
</and>
</condition>
-
+
<!-- JBoss Home -->
<condition property="jboss.home" value="${jboss.jdk14.home}">
<not>
@@ -43,10 +43,19 @@
<property name="jboss.client" value="${jboss.home}/client"/>
<property name="jboss.lib" value="${jboss.home}/lib"/>
+ <property name="jboss.client" value="${jboss.home}/client"/>
<property name="jboss.server" value="${jboss.home}/server/${jboss.server.instance}"/>
<property name="jboss.server.lib" value="${jboss.server}/lib"/>
<property name="jboss.server.deploy" value="${jboss.server}/deploy"/>
+ <!-- Java Endorsed -->
+ <condition property="jbossws.endorsed.dirs" value="${jboss.home}/lib/endorsed">
+ <isset property="jbossws.target.server.jboss"/>
+ </condition>
+ <condition property="jbossws.endorsed.dirs" value="${tomcat.home}/common/endorsed">
+ <isset property="jbossws.target.server.tomcat"/>
+ </condition>
+
<!-- Set a hostname property based on COMPUTERNAME for win32, HOSTNAME
otherwise and initialize the node0/node1 cluster hostnames to localhost
and ${hostname} by default. If you cannot route multicast traffic between
@@ -89,11 +98,8 @@
<path id="compile.classpath">
<path refid="client.classpath"/>
- <pathelement location="${basedir}/lib/jbossws-jboss-integration.jar"/>
- <pathelement location="${basedir}/lib/jbossws-tomcat-integration.jar"/>
- <pathelement location="${jboss.server.lib}/jboss.jar"/>
- <pathelement location="${jboss.server.deploy}/ejb3.deployer/jboss-annotations-ejb3.jar"/>
- <pathelement location="${jboss.server.deploy}/ejb3.deployer/jboss-ejb3x.jar"/>
+ <pathelement location="${basedir}/lib/${jbossws.version}-jboss-integration.jar"/>
+ <pathelement location="${basedir}/lib/${jbossws.version}-tomcat-integration.jar"/>
</path>
<path id="tests.classpath">
@@ -218,8 +224,9 @@
<sysproperty key="jbosstest.host.name" value="${node0}"/>
<sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
<sysproperty key="log.dir" value="${build.test.dir}/log"/>
- <sysproperty key="java.endorsed.dirs" value="${jboss.home}/lib/endorsed"/>
+ <sysproperty key="java.endorsed.dirs" value="${jbossws.endorsed.dirs}"/>
<sysproperty key="jbosstest.server.host" value="${node0}"/>
+ <sysproperty key="jbossws.target.server" value="${jbossws.target.server}"/>
<sysproperty key="tomcat.manager.username" value="${tomcat.manager.username}"/>
<sysproperty key="tomcat.manager.password" value="${tomcat.manager.password}"/>
@@ -261,7 +268,7 @@
<sysproperty key="jbosstest.host.name" value="${node0}"/>
<sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
<sysproperty key="log.dir" value="${build.test.dir}/log"/>
- <sysproperty key="java.endorsed.dirs" value="${jboss.home}/lib/endorsed"/>
+ <sysproperty key="java.endorsed.dirs" value="${jbossws.endorsed.dirs}"/>
<sysproperty key="jbosstest.server.host" value="${node0}"/>
<sysproperty key="jbossws.target.server" value="${jbossws.target.server}"/>
<sysproperty key="tomcat.manager.username" value="${tomcat.manager.username}"/>
@@ -281,7 +288,6 @@
</classpath>
<formatter type="plain"/>
<formatter type="xml"/>
- <sysproperty key="java.endorsed.dirs" value="${jboss.home}/lib/endorsed"/>
<batchtest fork="yes" todir="${build.test.dir}/reports">
<fileset dir="${java.dir}">
<include name="org/jboss/test/ws/${test}/**/*TestCase.java"/>
Modified: trunk/src/main/resources/samples/common/log4j.xml
===================================================================
--- trunk/src/main/resources/samples/common/log4j.xml 2006-11-22 13:12:53 UTC (rev 1500)
+++ trunk/src/main/resources/samples/common/log4j.xml 2006-11-22 13:27:13 UTC (rev 1501)
@@ -59,15 +59,16 @@
<priority value="INFO"/>
</category>
- <!-- Limit apache axis to INFO as its DEBUG is even more verbose -->
- <category name="org.jboss.axis">
+ <!-- Limit JBossWS category -->
+ <category name="org.jboss.ws">
<priority value="DEBUG"/>
</category>
-
- <!-- Limit JBoss webservice category -->
- <category name="org.jboss.webservice">
- <priority value="DEBUG"/>
+
+ <!--
+ <category name="org.jboss.xb">
+ <priority value="TRACE" class="org.jboss.logging.XLevel"/>
</category>
+ -->
<!-- ======================= -->
<!-- Setup the Root category -->
Modified: trunk/src/main/resources/samples/jaxrpc/wssecurity/build.xml
===================================================================
--- trunk/src/main/resources/samples/jaxrpc/wssecurity/build.xml 2006-11-22 13:12:53 UTC (rev 1500)
+++ trunk/src/main/resources/samples/jaxrpc/wssecurity/build.xml 2006-11-22 13:27:13 UTC (rev 1501)
@@ -103,47 +103,6 @@
<include name="wsdl/**"/>
</metainf>
</jar>
-
- <!-- jaxrpc-samples-store-pass-encrypt -->
- <replace file="${build.test.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/jboss-wsse-server.xml" token="${buildpath}" value="${build.test.dir}"/>
- <war warfile="${build.test.dir}/libs/jaxrpc-samples-store-pass-encrypt.war" webxml="${build.test.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/HelloJavaBean.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/PasswordUtil.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/>
- </classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt">
- <include name="jboss-wsse-server.xml"/>
- </webinf>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/WEB-INF">
- <include name="jboss-web.xml"/>
- </webinf>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity">
- <include name="wsse.keystore"/>
- <include name="wsse.truststore"/>
- </webinf>
- </war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-store-pass-encrypt-client.jar">
- <fileset dir="${build.test.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/>
- </fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="jboss-wsse-client.xml"/>
- </metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
- <include name="wsdl/**"/>
- <include name="jaxrpc-mapping.xml"/>
- </metainf>
- </jar>
</target>
Modified: trunk/src/test/java/org/jboss/test/ws/JBossWSTestHelper.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/JBossWSTestHelper.java 2006-11-22 13:12:53 UTC (rev 1500)
+++ trunk/src/test/java/org/jboss/test/ws/JBossWSTestHelper.java 2006-11-22 13:27:13 UTC (rev 1501)
@@ -56,14 +56,14 @@
/** True, if -Djbossws.target.server=jboss */
public boolean isTargetServerJBoss()
{
- String targetServer = System.getProperty("jbossws.target.server");
+ String targetServer = getTargetServer();
return "jboss".equals(targetServer);
}
/** True, if -Djbossws.target.server=tomcat */
public boolean isTargetServerTomcat()
{
- String targetServer = System.getProperty("jbossws.target.server");
+ String targetServer = getTargetServer();
return "tomcat".equals(targetServer);
}
@@ -88,10 +88,15 @@
}
else
{
- throw new IllegalStateException("Unsupported target server");
+ throw new IllegalStateException("Unsupported target server: " + getTargetServer());
}
}
+ private String getTargetServer()
+ {
+ return System.getProperty("jbossws.target.server");
+ }
+
/** Try to discover the URL for the deployment archive */
public URL getArchiveURL(String archive) throws MalformedURLException
{
17 years, 10 months
JBossWS SVN: r1500 - in trunk/src/test: . java/org/jboss/test/ws/jaxrpc/jbws1093 java/org/jboss/test/ws/jaxrpc/jbws1190 java/org/jboss/test/ws/jaxrpc/webserviceref java/org/jboss/test/ws/tools/jbws1080
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-11-22 08:12:53 -0500 (Wed, 22 Nov 2006)
New Revision: 1500
Modified:
trunk/src/test/build.xml
trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/ServletTest.java
trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java
trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/ApplicationClient.java
trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/EJBClient.java
trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/ServletClient.java
trunk/src/test/java/org/jboss/test/ws/tools/jbws1080/JBWS1080TestCase.java
Log:
Removed Java 5.0 specific code.
Modified: trunk/src/test/build.xml
===================================================================
--- trunk/src/test/build.xml 2006-11-22 13:09:51 UTC (rev 1499)
+++ trunk/src/test/build.xml 2006-11-22 13:12:53 UTC (rev 1500)
@@ -234,6 +234,7 @@
<javac destdir="${build.test.dir}/classes" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
<src path="${test.java.dir}"/>
<exclude name="org/jboss/test/ws/interop/**"/>
+ <exclude name="org/jboss/test/ws/jaxrpc/jbws718/**"/>
<exclude name="org/jboss/test/ws/jaxws/**"/>
<exclude name="org/jboss/test/ws/tools/jsr181/**"/>
<classpath refid="javac.classpath"/>
@@ -255,7 +256,6 @@
<mkdir dir="${build.test.dir}/classes"/>
<javac destdir="${build.test.dir}/classes" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
<src path="${build.test.dir}/wstools/java"/>
- <src path="${test.java.dir}"/>
<exclude name="org/jboss/test/ws/interop/**"/>
<classpath refid="javac.classpath"/>
</javac>
Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/ServletTest.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/ServletTest.java 2006-11-22 13:09:51 UTC (rev 1499)
+++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/ServletTest.java 2006-11-22 13:12:53 UTC (rev 1500)
@@ -43,7 +43,6 @@
public static final String MESSAGE = "Success!!";
- @Override
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
{
ServletOutputStream sos = response.getOutputStream();
Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java 2006-11-22 13:09:51 UTC (rev 1499)
+++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java 2006-11-22 13:12:53 UTC (rev 1500)
@@ -81,7 +81,7 @@
String address = endpoints[0].getAddress();
assertTrue("Expected Scheme '" + scheme + "'", address.startsWith(scheme + "://"));
- assertTrue("Expected Port '" + port + "'", address.contains(":" + port + "/"));
+ assertTrue("Expected Port '" + port + "'", address.indexOf(":" + port + "/") > -1);
}
private void assertEquals(final String message, final int expected, final int actual)
Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/ApplicationClient.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/ApplicationClient.java 2006-11-22 13:09:51 UTC (rev 1499)
+++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/ApplicationClient.java 2006-11-22 13:12:53 UTC (rev 1500)
@@ -34,7 +34,7 @@
{
// Provide logging
private static Logger log = Logger.getLogger(ApplicationClient.class);
-
+
public static InitialContext encCtx;
public static String retStr;
@@ -42,8 +42,8 @@
{
String inStr = args[0];
log.info("echo: " + inStr);
-
- ArrayList<TestEndpoint> ports = new ArrayList<TestEndpoint>();
+
+ ArrayList ports = new ArrayList();
try
{
ports.add((TestEndpoint)((Service)encCtx.lookup("java:comp/env/service1")).getPort(TestEndpoint.class));
@@ -54,14 +54,15 @@
log.error("Cannot add port", ex);
throw new JAXRPCException(ex);
}
-
- for (TestEndpoint port : ports)
+
+ for (int i = 0; i < ports.size(); i++)
{
+ TestEndpoint port = (TestEndpoint)ports.get(i);
String outStr = port.echo(inStr);
if (inStr.equals(outStr) == false)
throw new JAXRPCException("Invalid echo return: " + inStr);
}
-
+
retStr = inStr;
}
}
Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/EJBClient.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/EJBClient.java 2006-11-22 13:09:51 UTC (rev 1499)
+++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/EJBClient.java 2006-11-22 13:12:53 UTC (rev 1500)
@@ -44,7 +44,7 @@
{
log.info("echo: " + inStr);
- ArrayList<TestEndpoint> ports = new ArrayList<TestEndpoint>();
+ ArrayList ports = new ArrayList();
try
{
InitialContext iniCtx = new InitialContext();
@@ -57,8 +57,9 @@
throw new JAXRPCException(ex);
}
- for (TestEndpoint port : ports)
+ for (int i = 0; i < ports.size(); i++)
{
+ TestEndpoint port = (TestEndpoint)ports.get(i);
String outStr = port.echo(inStr);
if (inStr.equals(outStr) == false)
throw new JAXRPCException("Invalid echo return: " + inStr);
Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/ServletClient.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/ServletClient.java 2006-11-22 13:09:51 UTC (rev 1499)
+++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/ServletClient.java 2006-11-22 13:12:53 UTC (rev 1500)
@@ -38,14 +38,13 @@
{
// Provide logging
private static Logger log = Logger.getLogger(ServletClient.class);
-
- @Override
+
protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException
{
String inStr = req.getParameter("echo");
log.info("doGet: " + inStr);
-
- ArrayList<TestEndpoint> ports = new ArrayList<TestEndpoint>();
+
+ ArrayList ports = new ArrayList();
try
{
InitialContext iniCtx = new InitialContext();
@@ -57,14 +56,15 @@
log.error("Cannot add port", ex);
throw new JAXRPCException(ex);
}
-
- for (TestEndpoint port : ports)
+
+ for (int i = 0; i < ports.size(); i++)
{
+ TestEndpoint port = (TestEndpoint)ports.get(i);
String outStr = port.echo(inStr);
if (inStr.equals(outStr) == false)
throw new JAXRPCException("Invalid echo return: " + inStr);
}
-
+
res.getWriter().print(inStr);
}
}
Modified: trunk/src/test/java/org/jboss/test/ws/tools/jbws1080/JBWS1080TestCase.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/tools/jbws1080/JBWS1080TestCase.java 2006-11-22 13:09:51 UTC (rev 1499)
+++ trunk/src/test/java/org/jboss/test/ws/tools/jbws1080/JBWS1080TestCase.java 2006-11-22 13:12:53 UTC (rev 1500)
@@ -47,7 +47,7 @@
}
catch (IOException e)
{
- assertTrue("Expected error", e.getMessage().contains("'{\"http://www.jboss.org/jbossws-tools\":namespaces}' is expected."));
+ assertTrue("Expected error", e.getMessage().indexOf("'{\"http://www.jboss.org/jbossws-tools\":namespaces}' is expected.") > -1);
}
}
17 years, 10 months
JBossWS SVN: r1499 - in trunk/src: main/java/org/jboss/ws/server test/java/org/jboss/test/ws/jaxrpc/marshall test/java/org/jboss/test/ws/jaxrpc/xop test/resources/jaxrpc/marshall-rpclit/META-INF test/resources/jaxrpc/marshall-rpclit/WEB-INF
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-11-22 08:09:51 -0500 (Wed, 22 Nov 2006)
New Revision: 1499
Removed:
trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPElementRPCTestCase.java
Modified:
trunk/src/main/java/org/jboss/ws/server/ServiceEndpointManager.java
trunk/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallRpcLitDIITestCase.java
trunk/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallTest.java
trunk/src/test/resources/jaxrpc/marshall-rpclit/META-INF/jboss-client.xml
trunk/src/test/resources/jaxrpc/marshall-rpclit/WEB-INF/web.xml
Log:
Log jbossws version
Modified: trunk/src/main/java/org/jboss/ws/server/ServiceEndpointManager.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/server/ServiceEndpointManager.java 2006-11-22 12:42:47 UTC (rev 1498)
+++ trunk/src/main/java/org/jboss/ws/server/ServiceEndpointManager.java 2006-11-22 13:09:51 UTC (rev 1499)
@@ -611,7 +611,7 @@
public void create() throws Exception
{
- log.info("WebServices: " + UnifiedMetaData.getImplementationVersion());
+ log.info(UnifiedMetaData.getImplementationVersion());
MBeanServer server = getJMXServer();
if (server != null)
{
Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallRpcLitDIITestCase.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallRpcLitDIITestCase.java 2006-11-22 12:42:47 UTC (rev 1498)
+++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallRpcLitDIITestCase.java 2006-11-22 13:09:51 UTC (rev 1499)
@@ -303,8 +303,8 @@
{
Call call = service.createCall();
call.setOperationName(new QName(TARGET_NAMESPACE, "base64BinaryTest"));
- call.addParameter("arrayOfbyte_1", Constants.TYPE_LITERAL_BASE64BINARY, primParams.getClass(), ParameterMode.IN);
- call.setReturnType(Constants.TYPE_LITERAL_BASE64BINARY, primParams.getClass());
+ call.addParameter("arrayOfbyte_1", Constants.TYPE_LITERAL_BASE64BINARY, byte[].class, ParameterMode.IN);
+ call.setReturnType(Constants.TYPE_LITERAL_BASE64BINARY, byte[].class);
call.setTargetEndpointAddress(TARGET_ADDRESS);
primParams = (byte[])call.invoke(new Object[] { primParams });
return primParams;
@@ -314,8 +314,8 @@
{
Call call = service.createCall();
call.setOperationName(new QName(TARGET_NAMESPACE, "hexBinaryTest"));
- call.addParameter("arrayOfbyte_1", Constants.TYPE_LITERAL_HEXBINARY, primParams.getClass(), ParameterMode.IN);
- call.setReturnType(Constants.TYPE_LITERAL_HEXBINARY, primParams.getClass());
+ call.addParameter("arrayOfbyte_1", Constants.TYPE_LITERAL_HEXBINARY, byte[].class, ParameterMode.IN);
+ call.setReturnType(Constants.TYPE_LITERAL_HEXBINARY, byte[].class);
call.setTargetEndpointAddress(TARGET_ADDRESS);
primParams = (byte[])call.invoke(new Object[] { primParams });
return primParams;
Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallTest.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallTest.java 2006-11-22 12:42:47 UTC (rev 1498)
+++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallTest.java 2006-11-22 13:09:51 UTC (rev 1499)
@@ -209,9 +209,8 @@
Object out = base64BinaryTest(in);
assertEquals(new String(in), new String((byte[])out));
- System.out.println("FIXME: [JBWS-1333] Fix marshalling of null values in base64Binary, hexBinary");
- //out = base64BinaryTest(null);
- //assertNull(out);
+ out = base64BinaryTest(null);
+ assertNull(out);
}
public void testHexBinary() throws Exception
@@ -220,9 +219,8 @@
byte[] out = hexBinaryTest(in);
assertEquals(new String(in), new String((byte[])out));
- System.out.println("FIXME: [JBWS-1333] Fix marshalling of null values in base64Binary, hexBinary");
- //out = hexBinaryTest(null);
- //assertNull(out);
+ out = hexBinaryTest(null);
+ assertNull(out);
}
public void testCalendar() throws Exception
Deleted: trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPElementRPCTestCase.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPElementRPCTestCase.java 2006-11-22 12:42:47 UTC (rev 1498)
+++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPElementRPCTestCase.java 2006-11-22 13:09:51 UTC (rev 1499)
@@ -1,132 +0,0 @@
-/*
- * 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.test.ws.jaxrpc.xop;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-
-import javax.mail.internet.ContentType;
-import javax.xml.namespace.QName;
-import javax.xml.soap.MessageFactory;
-import javax.xml.soap.MimeHeaders;
-import javax.xml.soap.SOAPBody;
-import javax.xml.soap.SOAPBodyElement;
-import javax.xml.soap.SOAPElement;
-import javax.xml.soap.SOAPEnvelope;
-import javax.xml.soap.SOAPMessage;
-
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.ws.Constants;
-import org.jboss.ws.common.CommonMessageContext;
-import org.jboss.ws.jaxrpc.Style;
-import org.jboss.ws.jaxrpc.handler.SOAPMessageContextJAXRPC;
-import org.jboss.ws.metadata.OperationMetaData;
-import org.jboss.ws.metadata.ParameterMetaData;
-import org.jboss.ws.soap.MessageContextAssociation;
-import org.jboss.ws.soap.NameImpl;
-import org.jboss.ws.soap.SOAPBodyElementRpc;
-import org.jboss.ws.soap.SOAPContentElement;
-import org.jboss.ws.soap.attachment.MimeConstants;
-import org.jboss.ws.utils.DOMUtils;
-import org.jboss.ws.utils.DOMWriter;
-
-/**
- * Test the SOAPElement
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 17-Jan-2006
- */
-public class XOPElementRPCTestCase extends JBossWSTest
-{
- private OperationMetaData opMetaData;
- private ParameterMetaData paramMetaData;
- private MessageFactory msgFactory;
- private SOAPMessage soapMessage;
- private SOAPContentElement xopElement;
-
- protected void setUp() throws Exception
- {
- super.setUp();
-
- // Setup the opMetaData
- opMetaData = new OperationMetaData(new QName("http://somens", "myOperation", "ns1"), "myOperation");
- opMetaData.getEndpointMetaData().setStyle(Style.RPC);
- paramMetaData = new ParameterMetaData(opMetaData,
- new QName("xopParam"),
- new QName(Constants.NS_XML_MIME, "base64Binary", Constants.PREFIX_XSD),
- "java.lang.String"
- );
- opMetaData.addParameter(paramMetaData);
-
- // Setup XOP element
- msgFactory = MessageFactory.newInstance();
- soapMessage = msgFactory.createMessage();
- SOAPBodyElement bodyElement = new SOAPBodyElementRpc(new NameImpl(opMetaData.getQName()));
- soapMessage.getSOAPBody().addChildElement(bodyElement);
- xopElement = new SOAPContentElement(new NameImpl(paramMetaData.getXmlName()));
- xopElement.setParamMetaData(paramMetaData);
- bodyElement.addChildElement(xopElement);
-
- // Setup the message context
- CommonMessageContext msgContext = new SOAPMessageContextJAXRPC();
- MessageContextAssociation.pushMessageContext(msgContext);
- msgContext.setOperationMetaData(opMetaData);
- msgContext.setSOAPMessage(soapMessage);
-
- }
-
- public void testSOAPMessageRoundTrip() throws Exception
- {
- System.out.println("FIXME: [JBWS-1313] Fix XOP tests in trunk");
- if (true) return;
-
- String xopContent = "This is XOP content";
- //xopElement.setXMimeContentType("text/plain");
- xopElement.setObjectValue(xopContent);
-
- // Write SOAP message as multipart/related
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- soapMessage.writeTo(baos);
- byte[] bytes = baos.toByteArray();
-
- //System.out.println(new String(bytes));
-
- // Verify mime headers
- MimeHeaders mimeHeaders = soapMessage.getMimeHeaders();
- ContentType contentType = new ContentType(mimeHeaders.getHeader(MimeConstants.CONTENT_TYPE)[0]);
- assertEquals(MimeConstants.TYPE_MULTIPART_RELATED, contentType.getBaseType());
-
- SOAPMessage soapMessage = msgFactory.createMessage(mimeHeaders, new ByteArrayInputStream(bytes));
-
- SOAPEnvelope soapEnvelope = soapMessage.getSOAPPart().getEnvelope();
- System.out.println(DOMWriter.printNode(soapEnvelope, true));
-
- SOAPBody soapBody = soapMessage.getSOAPBody();
- SOAPElement rpcElement = (SOAPElement)DOMUtils.getFirstChildElement(soapBody);
- assertEquals(new NameImpl(opMetaData.getQName()), rpcElement.getElementName());
- SOAPContentElement xopElement = (SOAPContentElement)DOMUtils.getFirstChildElement(rpcElement);
- assertEquals(new NameImpl(paramMetaData.getXmlName()), xopElement.getElementName());
- xopElement.setParamMetaData(paramMetaData);
- Object retObj = xopElement.getObjectValue();
- assertEquals(xopContent, retObj);
- }
-}
\ No newline at end of file
Modified: trunk/src/test/resources/jaxrpc/marshall-rpclit/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/marshall-rpclit/META-INF/jboss-client.xml 2006-11-22 12:42:47 UTC (rev 1498)
+++ trunk/src/test/resources/jaxrpc/marshall-rpclit/META-INF/jboss-client.xml 2006-11-22 13:09:51 UTC (rev 1499)
@@ -7,6 +7,7 @@
<service-ref>
<service-ref-name>service/StandardTypes</service-ref-name>
+ <config-name>Standard MTOM disabled client</config-name>
<wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-marshall-rpclit?wsdl</wsdl-override>
</service-ref>
Modified: trunk/src/test/resources/jaxrpc/marshall-rpclit/WEB-INF/web.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/marshall-rpclit/WEB-INF/web.xml 2006-11-22 12:42:47 UTC (rev 1498)
+++ trunk/src/test/resources/jaxrpc/marshall-rpclit/WEB-INF/web.xml 2006-11-22 13:09:51 UTC (rev 1499)
@@ -5,7 +5,12 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
- <servlet>
+ <context-param>
+ <param-name>jbossws-config-name</param-name>
+ <param-value>Standard MTOM disabled endpoint</param-value>
+ </context-param>
+
+ <servlet>
<servlet-name>StandardTypes</servlet-name>
<servlet-class>org.jboss.test.ws.jaxrpc.marshall.StandardTypesBean</servlet-class>
</servlet>
17 years, 10 months
JBossWS SVN: r1498 - trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-11-22 07:42:47 -0500 (Wed, 22 Nov 2006)
New Revision: 1498
Modified:
trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/ConfidentialEndpoint.java
Log:
javadoc
Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/ConfidentialEndpoint.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/ConfidentialEndpoint.java 2006-11-22 12:18:15 UTC (rev 1497)
+++ trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/ConfidentialEndpoint.java 2006-11-22 12:42:47 UTC (rev 1498)
@@ -25,9 +25,12 @@
import javax.jws.soap.SOAPBinding;
/**
- *
- * @author darran.lofthouse(a)jboss.com
- * @since 19-October-2006
+ If the implementation bean does not implement a service endpoint interface and
+ there are no @WebMethod annotations in the implementation bean (excluding
+ @WebMethod annotations used to exclude inherited @WebMethods), all public
+ methods other than those inherited from java.lang.Object will be exposed as Web
+ Service operations, subject to the inheritance rules specified in Common
+ Annotations for the Java Platform [12], section 2.1.
*/
@WebService(targetNamespace = "http://org.jboss/test/ws/jbws1190")
@SOAPBinding(style = SOAPBinding.Style.RPC)
17 years, 10 months
JBossWS SVN: r1497 - trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-11-22 07:18:15 -0500 (Wed, 22 Nov 2006)
New Revision: 1497
Modified:
trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java
Log:
Fix endless loop.
Fix processing of methods without @WebMethod
Modified: trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2006-11-21 20:58:12 UTC (rev 1496)
+++ trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2006-11-22 12:18:15 UTC (rev 1497)
@@ -63,9 +63,7 @@
import org.jboss.ws.WSException;
import org.jboss.ws.addressing.AddressingPropertiesImpl;
import org.jboss.ws.addressing.metadata.AddressingOpMetaExt;
-import org.jboss.ws.annotation.PortComponent;
import org.jboss.ws.deployment.UnifiedDeploymentInfo;
-import org.jboss.ws.deployment.UnifiedDeploymentInfo.DeploymentType;
import org.jboss.ws.jaxrpc.Style;
import org.jboss.ws.jaxrpc.Use;
import org.jboss.ws.jaxws.DynamicWrapperGenerator;
@@ -152,9 +150,9 @@
WebService seiAnnotation = null;
- for(Class<?> potentialSEI : sepClass.getInterfaces())
+ for (Class<?> potentialSEI : sepClass.getInterfaces())
{
- if(potentialSEI.isAnnotationPresent(WebService.class))
+ if (potentialSEI.isAnnotationPresent(WebService.class))
{
seiClass = potentialSEI;
seiName = seiClass.getName();
@@ -163,7 +161,7 @@
}
}
- if(seiAnnotation!=null)
+ if (seiAnnotation != null)
anWebService = seiAnnotation;
}
@@ -285,16 +283,16 @@
protected void createJAXBContext(EndpointMetaData epMetaData)
{
- try
- {
- String targetNS = epMetaData.getInterfaceQName().getNamespaceURI();
- log.debug("JAXBContext [types=" + javaTypes + ",tns=" + targetNS + "]");
- jaxbCtx = JAXBRIContext.newInstance(javaTypes.toArray(new Class[0]), typeRefs, targetNS, false);
- }
- catch (JAXBException ex)
- {
+ try
+ {
+ String targetNS = epMetaData.getInterfaceQName().getNamespaceURI();
+ log.debug("JAXBContext [types=" + javaTypes + ",tns=" + targetNS + "]");
+ jaxbCtx = JAXBRIContext.newInstance(javaTypes.toArray(new Class[0]), typeRefs, targetNS, false);
+ }
+ catch (JAXBException ex)
+ {
throw new IllegalStateException("Cannot build JAXB context", ex);
- }
+ }
}
protected void populateXmlTypes(EndpointMetaData epMetaData)
@@ -354,7 +352,7 @@
paramMetaData.setXmlType(xmlType);
}
- types.addTypeMapping(new TypeMappingMetaData(types, xmlType, javaName));
+ types.addTypeMapping(new TypeMappingMetaData(types, xmlType, javaName));
}
private void populateXmlType(FaultMetaData faultMetaData)
@@ -395,6 +393,12 @@
return null;
}
+ // If the implementation bean does not implement a service endpoint interface and
+ // there are no @WebMethod annotations in the implementation bean (excluding
+ // @WebMethod annotations used to exclude inherited @WebMethods), all public
+ // methods other than those inherited from java.lang.Object will be exposed as Web
+ // Service operations, subject to the inheritance rules specified in Common
+ // Annotations for the Java Platform [12], section 2.1.
protected void processWebMethods(EndpointMetaData epMetaData, Class wsClass, boolean includeAllMethods)
{
epMetaData.clearOperations();
@@ -414,28 +418,20 @@
// http://jira.jboss.org/jira/browse/JBWS-754
if (webMethodCount == 0)
{
- Class superClass = wsClass.getSuperclass();
-
- while (superClass != null)
+ Class auxClass = wsClass;
+ while (auxClass != Object.class)
{
- boolean isJDKClass = superClass.getPackage().getName().startsWith("java");
-
- if(!isJDKClass)
+ for (Method method : auxClass.getDeclaredMethods())
{
- for (Method method : superClass.getMethods())
- {
- processWebMethod(epMetaData, method);
- webMethodCount++;
- }
-
- superClass = superClass.getSuperclass();
-
+ processWebMethod(epMetaData, method);
+ webMethodCount++;
}
+ auxClass = auxClass.getSuperclass();
}
}
if (webMethodCount == 0)
- throw new WSException("At least one @WebMethod annotation is required");
+ throw new WSException("At least one @WebMethod annotation is required: " + wsClass.getName());
}
private void processWebMethod(EndpointMetaData epMetaData, Method method)
@@ -443,7 +439,7 @@
String javaName = method.getName();
// skip asnyc methods, they dont need meta data representation
- if(method.getName().endsWith(Constants.ASYNC_METHOD_SUFFIX))
+ if (method.getName().endsWith(Constants.ASYNC_METHOD_SUFFIX))
return;
ServiceMetaData serviceMetaData = epMetaData.getServiceMetaData();
@@ -792,7 +788,7 @@
private QName getWebParamName(OperationMetaData opMetaData, int index, Class javaType, WebParam webParam)
{
- String namespace = null ;
+ String namespace = null;
String name = null;
boolean header = false;
17 years, 10 months