JBossWS SVN: r3550 - in trunk/jbossws-core/src/test: java/org/jboss/test/ws/jaxws/wsaddressing and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-06-12 08:40:13 -0400 (Tue, 12 Jun 2007)
New Revision: 3550
Removed:
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/addressing/
Modified:
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/SOAPAddressingPropertiesTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java
trunk/jbossws-core/src/test/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF/jboss-client.xml
Log:
Fxi ws-addressing tests
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/SOAPAddressingPropertiesTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/SOAPAddressingPropertiesTestCase.java 2007-06-12 12:18:39 UTC (rev 3549)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/SOAPAddressingPropertiesTestCase.java 2007-06-12 12:40:13 UTC (rev 3550)
@@ -31,105 +31,140 @@
import javax.xml.soap.MessageFactory;
import javax.xml.soap.SOAPMessage;
import javax.xml.ws.addressing.AddressingBuilder;
+import javax.xml.ws.addressing.AddressingException;
import javax.xml.ws.addressing.soap.SOAPAddressingBuilder;
import javax.xml.ws.addressing.soap.SOAPAddressingProperties;
import org.jboss.util.xml.DOMUtils;
import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.ws.extensions.addressing.soap.SOAPAddressingPropertiesImpl;
/**
* Test the SOAPAddressingProperties
- *
+ *
* @author Thomas.Diesler(a)jboss.org
* @since 13-Nov-2005
*/
-public class SOAPAddressingPropertiesTestCase extends JBossWSTest
+public class SOAPAddressingPropertiesTestCase extends JBossWSTest
{
- private SOAPAddressingProperties addrProps;
-
+ private SOAPAddressingProperties addrProps;
+
private String reqEnvStr = "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>"
+ " <env:Header xmlns:wsa='http://www.w3.org/2005/08/addressing'>"
- + " <wsa:To>http://fabrikam123.example/Purchasing</wsa:To>"
+ + " <wsa:To>http://fabrikam123.example/Purchasing</wsa:To>"
+ " <wsa:ReplyTo>"
+ " <wsa:Address>http://business456.example/client1</wsa:Address>"
+ " <wsa:ReferenceParameters>"
+ " <ns1:sessionid xmlns:ns1='http://somens'>someuniqueid</ns1:sessionid>"
+ " </wsa:ReferenceParameters>"
+ " </wsa:ReplyTo>"
- + " <wsa:Action>http://fabrikam123.example/SubmitPO</wsa:Action>"
- + " <wsa:MessageID>uuid:6B29FC40-CA47-1067-B31D-00DD010662DA</wsa:MessageID>"
- + " </env:Header>"
- + " <env:Body/>"
- + "</env:Envelope>";
+ + " <wsa:Action>http://fabrikam123.example/SubmitPO</wsa:Action>"
+ + " <wsa:MessageID>uuid:6B29FC40-CA47-1067-B31D-00DD010662DA</wsa:MessageID>"
+ + " </env:Header>"
+ + " <env:Body/>"
+ + "</env:Envelope>";
private String resEnvStr = "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" +
- " <env:Header xmlns:wsa='http://www.w3.org/2005/08/addressing'>" +
- " <wsa:To>http://business456.example/client1</wsa:To>" +
- " <wsa:Action>http://fabrikam123.example/ReplyPO</wsa:Action>" +
- " <wsa:RelatesTo>uuid:6B29FC40-CA47-1067-B31D-00DD010662DA</wsa:RelatesTo>" +
- " <ns1:sessionid wsa:IsReferenceParameter='true' xmlns:ns1='http://somens'>someuniqueid</ns1:sessionid>" +
- " </env:Header>" +
- " <env:Body/>" +
- "</env:Envelope>";
+ " <env:Header xmlns:wsa='http://www.w3.org/2005/08/addressing'>" +
+ " <wsa:To>http://business456.example/client1</wsa:To>" +
+ " <wsa:Action>http://fabrikam123.example/ReplyPO</wsa:Action>" +
+ " <wsa:RelatesTo>uuid:6B29FC40-CA47-1067-B31D-00DD010662DA</wsa:RelatesTo>" +
+ " <ns1:sessionid wsa:IsReferenceParameter='true' xmlns:ns1='http://somens'>someuniqueid</ns1:sessionid>" +
+ " </env:Header>" +
+ " <env:Body/>" +
+ "</env:Envelope>";
- public void setUp() throws Exception
- {
- super.setUp();
-
- MessageFactory factory = MessageFactory.newInstance();
- SOAPMessage soapMessage = factory.createMessage(null, new ByteArrayInputStream(reqEnvStr.getBytes()));
+ private String ERRORNOUS_XML = "<soap:Envelope xmlns:soap='http://schemas.xmlsoap.org/soap/envelope/'>\n" +
+ " <soap:Header xmlns:wsa='http://www.w3.org/2005/08/addressing'>" +
+ "<wsa:Action></wsa:Action>\n" +
+ "<wsa:MessageID>urn:uuid:1fa5a31f-bbe7-4ad5-8b92-d765f4a32dc9</wsa:MessageID>\n" +
+ "<wsa:ReplyTo>\n" +
+ "<wsa:Address>http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous</wsa:Address>\n" +
+ "<wsa:ReferenceParameters>\n" +
+ "<ns1:clientid xmlns:ns1=\"http://somens\">clientid-1</ns1:clientid>\n" +
+ "</wsa:ReferenceParameters>\n" +
+ "</wsa:ReplyTo>\n" +
+ "<wsa:To>http://mycomp:8080/testws</wsa:To>\n" +
+ "</soap:Header>" +
+ " <soap:Body/>\n" +
+ "</soap:Envelope>";
+
+ public void setUp() throws Exception
+ {
+ super.setUp();
- AddressingBuilder addrBuilder = SOAPAddressingBuilder.getAddressingBuilder();
- addrProps = (SOAPAddressingProperties)addrBuilder.newAddressingProperties();
- addrProps.readHeaders(soapMessage);
- }
-
+ MessageFactory factory = MessageFactory.newInstance();
+ SOAPMessage soapMessage = factory.createMessage(null, new ByteArrayInputStream(reqEnvStr.getBytes()));
+
+ AddressingBuilder addrBuilder = SOAPAddressingBuilder.getAddressingBuilder();
+ addrProps = (SOAPAddressingProperties)addrBuilder.newAddressingProperties();
+ addrProps.readHeaders(soapMessage);
+ }
+
public void testReadHeaders() throws Exception
- {
- assertEquals(new URI("uuid:6B29FC40-CA47-1067-B31D-00DD010662DA"), addrProps.getMessageID().getURI());
- assertEquals(new URI("http://business456.example/client1"), addrProps.getReplyTo().getAddress().getURI());
- assertEquals(new URI("http://fabrikam123.example/Purchasing"), addrProps.getTo().getURI());
- assertEquals(new URI("http://fabrikam123.example/SubmitPO"), addrProps.getAction().getURI());
- }
+ {
+ assertEquals(new URI("uuid:6B29FC40-CA47-1067-B31D-00DD010662DA"), addrProps.getMessageID().getURI());
+ assertEquals(new URI("http://business456.example/client1"), addrProps.getReplyTo().getAddress().getURI());
+ assertEquals(new URI("http://fabrikam123.example/Purchasing"), addrProps.getTo().getURI());
+ assertEquals(new URI("http://fabrikam123.example/SubmitPO"), addrProps.getAction().getURI());
+ }
- public void testWriteHeaders() throws Exception
- {
- MessageFactory factory = MessageFactory.newInstance();
- SOAPMessage wasMsg = factory.createMessage();
- addrProps.writeHeaders(wasMsg);
-
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- wasMsg.writeTo(baos);
- String wasEnv = new String(baos.toByteArray());
+ public void testWriteHeaders() throws Exception
+ {
+ MessageFactory factory = MessageFactory.newInstance();
+ SOAPMessage wasMsg = factory.createMessage();
+ addrProps.writeHeaders(wasMsg);
- SOAPMessage expMsg = factory.createMessage(null, new ByteArrayInputStream(reqEnvStr.getBytes()));
- baos = new ByteArrayOutputStream();
- expMsg.writeTo(baos);
- String expEnv = new String(baos.toByteArray());
-
- assertEquals(DOMUtils.parse(expEnv), DOMUtils.parse(wasEnv));
- }
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ wasMsg.writeTo(baos);
+ String wasEnv = new String(baos.toByteArray());
- public void testReplyToHeaders() throws Exception
- {
- AddressingBuilder addrBuilder = SOAPAddressingBuilder.getAddressingBuilder();
- SOAPAddressingProperties replyProps = (SOAPAddressingProperties)addrBuilder.newAddressingProperties();
- replyProps.initializeAsReply(addrProps, false);
- replyProps.setAction(addrBuilder.newURI("http://fabrikam123.example/ReplyPO"));
-
- MessageFactory factory = MessageFactory.newInstance();
- SOAPMessage wasMsg = factory.createMessage();
- replyProps.writeHeaders(wasMsg);
-
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- wasMsg.writeTo(baos);
- String wasEnv = new String(baos.toByteArray());
+ SOAPMessage expMsg = factory.createMessage(null, new ByteArrayInputStream(reqEnvStr.getBytes()));
+ baos = new ByteArrayOutputStream();
+ expMsg.writeTo(baos);
+ String expEnv = new String(baos.toByteArray());
- SOAPMessage expMsg = factory.createMessage(null, new ByteArrayInputStream(resEnvStr.getBytes()));
- baos = new ByteArrayOutputStream();
- expMsg.writeTo(baos);
- String expEnv = new String(baos.toByteArray());
-
- assertEquals(DOMUtils.parse(expEnv), DOMUtils.parse(wasEnv));
- }
+ assertEquals(DOMUtils.parse(expEnv), DOMUtils.parse(wasEnv));
+ }
+
+ public void testReplyToHeaders() throws Exception
+ {
+ AddressingBuilder addrBuilder = SOAPAddressingBuilder.getAddressingBuilder();
+ SOAPAddressingProperties replyProps = (SOAPAddressingProperties)addrBuilder.newAddressingProperties();
+ replyProps.initializeAsReply(addrProps, false);
+ replyProps.setAction(addrBuilder.newURI("http://fabrikam123.example/ReplyPO"));
+
+ MessageFactory factory = MessageFactory.newInstance();
+ SOAPMessage wasMsg = factory.createMessage();
+ replyProps.writeHeaders(wasMsg);
+
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ wasMsg.writeTo(baos);
+ String wasEnv = new String(baos.toByteArray());
+
+ SOAPMessage expMsg = factory.createMessage(null, new ByteArrayInputStream(resEnvStr.getBytes()));
+ baos = new ByteArrayOutputStream();
+ expMsg.writeTo(baos);
+ String expEnv = new String(baos.toByteArray());
+
+ assertEquals(DOMUtils.parse(expEnv), DOMUtils.parse(wasEnv));
+ }
+
+ public void testReplyToWithoutAction() throws Exception
+ {
+ MessageFactory mf = MessageFactory.newInstance();
+ SOAPMessage message = mf.createMessage(null, new ByteArrayInputStream(ERRORNOUS_XML.getBytes()));
+
+ SOAPAddressingPropertiesImpl props = new SOAPAddressingPropertiesImpl();
+ try
+ {
+ props.readHeaders(message);
+ fail("ERRORNOUS_XML should cause a parsing exception due to missing wsa:Action value");
+ }
+ catch (AddressingException e)
+ {
+ // expected an exception
+ }
+
+ }
}
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java 2007-06-12 12:18:39 UTC (rev 3549)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java 2007-06-12 12:40:13 UTC (rev 3550)
@@ -100,7 +100,8 @@
/** This sends a fault message to the FaultTo endpoint and verfies whether we can read it of again.
*/
- public void testFaultToMessage() throws Exception
+
+ public void testFaultToMessage() throws Exception
{
String reqEnv =
"<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" +
@@ -141,15 +142,15 @@
public void testFaultTo() throws Exception
{
String lastFault = faultto.getLastFault();
-
+
/* JAX-WS 10.2.2.3: the fields of the fault message are populated according to
- * the following rules of precedence:
- *
+ * the following rules of precedence:
+ *
* faultstring
* 1. SOAPFaultException.getFault().getFaultString()
* 2. Exception.getMessage()
- * 3. Exception.toString()
- *
+ * 3. Exception.toString()
+ *
* this test used to expect the value returned by toString() */
assertEquals("Invalid Value", lastFault);
}
Modified: trunk/jbossws-core/src/test/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF/jboss-client.xml
===================================================================
--- trunk/jbossws-core/src/test/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF/jboss-client.xml 2007-06-12 12:18:39 UTC (rev 3549)
+++ trunk/jbossws-core/src/test/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF/jboss-client.xml 2007-06-12 12:40:13 UTC (rev 3550)
@@ -5,8 +5,7 @@
<jboss-client>
<jndi-name>replyto-client</jndi-name>
<service-ref>
- <service-ref-name>service/ReplyToService</service-ref-name>
- <config-name>Standard WSAddressing Client</config-name>
+ <service-ref-name>service/ReplyToService</service-ref-name>
<wsdl-override>http://@jboss.bind.address@:8080/jaxws-wsaddressing-replyto/ReplyToService?wsdl</wsdl-override>
</service-ref>
</jboss-client>
18 years, 10 months
- 1
- 0
JBossWS SVN: r3549 - branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-06-12 08:18:39 -0400 (Tue, 12 Jun 2007)
New Revision: 3549
Modified:
branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/SunRIConsumerImpl.java
Log:
Fix NPE on Exception
Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/SunRIConsumerImpl.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/SunRIConsumerImpl.java 2007-06-12 11:06:45 UTC (rev 3548)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/SunRIConsumerImpl.java 2007-06-12 12:18:39 UTC (rev 3549)
@@ -1,24 +1,24 @@
/*
-* 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.
-*/
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
package org.jboss.ws.tools.jaxws.impl;
import com.sun.tools.ws.wscompile.WsimportTool;
@@ -39,81 +39,94 @@
*/
public class SunRIConsumerImpl extends WSContractConsumer
{
- private List<File> bindingFiles = null;
- private File catalog = null;
- private boolean generateSource = false;
+ private List<File> bindingFiles;
+ private File catalog;
+ private boolean generateSource;
private File outputDir = new File("output");
- private File sourceDir = null;
- private String targetPackage = null;
- private PrintStream messageStream = null;
- private String wsdlLocation = null;
- private List<String> additionalCompilerClassPath = null;
+ private File sourceDir;
+ private String targetPackage;
+ private PrintStream messageStream;
+ private String wsdlLocation;
+ private List<String> additionalCompilerClassPath;
@Override
- public void setBindingFiles(List<File> bindingFiles) {
+ public void setBindingFiles(List<File> bindingFiles)
+ {
this.bindingFiles = bindingFiles;
}
@Override
- public void setCatalog(File catalog) {
+ public void setCatalog(File catalog)
+ {
this.catalog = catalog;
}
@Override
- public void setGenerateSource(boolean generateSource) {
+ public void setGenerateSource(boolean generateSource)
+ {
this.generateSource = generateSource;
}
@Override
- public void setMessageStream(PrintStream messageStream) {
- // TODO Auto-generated method stub
+ public void setMessageStream(PrintStream messageStream)
+ {
this.messageStream = messageStream;
}
@Override
- public void setOutputDirectory(File directory) {
- // TODO Auto-generated method stub
+ public void setOutputDirectory(File directory)
+ {
outputDir = directory;
}
@Override
- public void setSourceDirectory(File directory) {
+ public void setSourceDirectory(File directory)
+ {
sourceDir = directory;
}
@Override
- public void setTargetPackage(String targetPackage) {
+ public void setTargetPackage(String targetPackage)
+ {
this.targetPackage = targetPackage;
}
@Override
- public void setWsdlLocation(String wsdlLocation) {
+ public void setWsdlLocation(String wsdlLocation)
+ {
this.wsdlLocation = wsdlLocation;
}
- public void setAdditionalCompilerClassPath(List<String> additionalCompilerClassPath) {
+ public void setAdditionalCompilerClassPath(List<String> additionalCompilerClassPath)
+ {
this.additionalCompilerClassPath = additionalCompilerClassPath;
}
@Override
- public void consume(URL wsdl) {
+ public void consume(URL wsdl)
+ {
List<String> args = new ArrayList<String>();
- if (bindingFiles != null) {
- for (File file : bindingFiles) {
+ if (bindingFiles != null)
+ {
+ for (File file : bindingFiles)
+ {
args.add("-b");
args.add(file.getAbsolutePath());
}
}
- if (catalog != null) {
+ if (catalog != null)
+ {
args.add("-catalog");
args.add(catalog.getAbsolutePath());
}
- if (generateSource) {
+ if (generateSource)
+ {
args.add("-keep");
- if (sourceDir != null) {
+ if (sourceDir != null)
+ {
if (!sourceDir.exists() && !sourceDir.mkdirs())
throw new IllegalStateException("Could not make directory: " + sourceDir.getName());
@@ -122,20 +135,25 @@
}
}
- if (targetPackage != null) {
+ if (targetPackage != null)
+ {
args.add("-p");
args.add(targetPackage);
}
- if (wsdlLocation != null) {
+ if (wsdlLocation != null)
+ {
args.add("-wsdllocation");
args.add(wsdlLocation);
}
PrintStream stream = messageStream;
- if (stream != null) {
+ if (stream != null)
+ {
args.add("-verbose");
- } else {
+ }
+ else
+ {
stream = new NullPrintStream();
}
@@ -150,20 +168,26 @@
try
{
// enforce woodstox
- if(null == System.getProperty("javax.xml.stream.XMLInputFactory"))
+ if (null == System.getProperty("javax.xml.stream.XMLInputFactory"))
System.setProperty("javax.xml.stream.XMLInputFactory", "com.ctc.wstx.stax.WstxInputFactory");
-
+
WsimportTool compileTool = new WsimportTool(stream);
boolean success = compileTool.run(args.toArray(new String[0]));
- if(!success) throw new IllegalStateException("WsImport invocation failed");
+ if (!success)
+ throw new IllegalStateException("WsImport invocation failed");
}
catch (Throwable t)
{
- messageStream.println("Failed to invoke WsImport");
- t.printStackTrace(messageStream);
+ if (messageStream != null)
+ {
+ messageStream.println("Failed to invoke WsImport");
+ t.printStackTrace(messageStream);
+ }
+ else
+ {
+ t.printStackTrace();
+ }
}
-
}
}
-
18 years, 10 months
- 1
- 0
JBossWS SVN: r3548 - trunk/jbossws-core/ant-import-tests.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-06-12 07:06:45 -0400 (Tue, 12 Jun 2007)
New Revision: 3548
Modified:
trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml
Log:
Remove interop client jars
Modified: trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml
===================================================================
--- trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml 2007-06-12 10:58:54 UTC (rev 3547)
+++ trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml 2007-06-12 11:06:45 UTC (rev 3548)
@@ -451,22 +451,6 @@
</fileset>
</war>
- <!-- BaseDataTypesDocLitB client -->
- <jar jarfile="${tests.output.dir}/libs/jbossws-interop-BaseDataTypesDocLitB-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/interop/*.class"/>
- <include name="org/jboss/test/ws/interop/soapwsdl/basedoclitb/**/*.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF">
- <include name="wsdl/**.*"/>
- </metainf>
- <metainf dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitB/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="scenarios.xml"/>
- </metainf>
- </jar>
-
<!-- BaseDataTypesDocLitB.war -->
<war warfile="${tests.output.dir}/libs/jbossws-interop-BaseDataTypesDocLitB.war"
webxml="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/web.xml">
@@ -484,23 +468,6 @@
</fileset>
</war>
- <!-- BaseDataTypesDocLitW client -->
- <jar jarfile="${tests.output.dir}/libs/jbossws-interop-BaseDataTypesDocLitW-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/interop/soapwsdl/basedoclitw/**/*.class"/>
- <include name="org/jboss/test/ws/interop/*.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- <metainf dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitW/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="scenarios.xml"/>
- </metainf>
- </jar>
-
<!-- BaseDataTypesDocLitW.war -->
<war warfile="${tests.output.dir}/libs/jbossws-interop-BaseDataTypesDocLitW.war"
webxml="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/web.xml">
@@ -517,23 +484,6 @@
<include name="*.*"/>
</fileset>
</war>
-
- <!-- BaseDataTypesRpcLit client -->
- <jar jarfile="${tests.output.dir}/libs/jbossws-interop-BaseDataTypesRpcLit-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/interop/soapwsdl/baserpclit/**/*.class"/>
- <include name="org/jboss/test/ws/interop/*.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- <metainf dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesRpcLit/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="scenarios.xml"/>
- </metainf>
- </jar>
<!-- BaseDataTypesRpcLit.war -->
<war warfile="${tests.output.dir}/libs/jbossws-interop-BaseDataTypesRpcLit.war"
@@ -552,8 +502,6 @@
</fileset>
</war>
-
-
</target>
</project>
18 years, 10 months
- 1
- 0
JBossWS SVN: r3547 - in trunk/jbossws-core: src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitb and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-06-12 06:58:54 -0400 (Tue, 12 Jun 2007)
New Revision: 3547
Removed:
trunk/jbossws-core/ant-import-tests/build-interop.xml
Modified:
trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml
trunk/jbossws-core/ant-import-tests/build-testsuite.xml
trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitb/BaseDataTypesDocLitBTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitb/ServiceImpl.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitw/BaseDataTypesDocLitWTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitw/ServiceImpl.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/baserpclit/BaseDataTypesRpcLitTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/baserpclit/ServiceImpl.java
trunk/jbossws-core/src/test/resources/test-excludes-jboss50.txt
Log:
revamp interop endpoints
Deleted: trunk/jbossws-core/ant-import-tests/build-interop.xml
===================================================================
--- trunk/jbossws-core/ant-import-tests/build-interop.xml 2007-06-12 09:59:56 UTC (rev 3546)
+++ trunk/jbossws-core/ant-import-tests/build-interop.xml 2007-06-12 10:58:54 UTC (rev 3547)
@@ -1,401 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ============================================================ -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at http://www.gnu.org. -->
-<!-- ============================================================ -->
-
-<!-- $Id$ -->
-
-<project name="JBossWS-Interop" default="interop.build" basedir="../">
-
- <import file="../build.xml"/>
-
- <property name="jwsdp.home" value="C:/dev/env/jwsdp-1.6"/>
- <property name="wsdl.update.marker" value="${test.resources.dir}/interop/wsdl.update"/>
- <property name="jbossws.client.jar" value="jbossws-client.jar"/>
-
- <property name="test.java.dir" value="src/main/java"/>
- <property name="test.resources.dir" value="src/main/resources"/>
- <property name="build.tests.dir" value="output"/>
- <property name="build.test.dir" value="output"/>
-
- <path id="jwsdp.classpath">
- <!--fileset dir="${jwsdp.home}/jaxrpc/lib"/>
- <fileset dir="${jwsdp.home}/jwsdp-shared/lib">
- <include name="activation.jar"/>
- <include name="mail.jar"/>
- <include name="jax-qname.jar"/>
- </fileset>
- <fileset dir="${jwsdp.home}/saaj/lib"/>
- <fileset dir="${jwsdp.home}/jaxp/lib"/-->
- </path>
-
- <path id="wscompile.tools.classpath">
- <fileset dir="${env.JAVA_HOME}/lib">
- <include name="*.jar"/>
- </fileset>
- </path>
-
- <path id="build.classpath">
- <path refid="javac.classpath"/>
- </path>
-
- <!--taskdef name="wscompile" classname="com.sun.xml.rpc.tools.ant.Wscompile">
- <classpath refid="jwsdp.classpath"/>
- </taskdef>
-
- <taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
- <classpath refid="javac.classpath"/>
- <classpath path="${build.test.dir}/classes"/>
- </taskdef-->
-
- <!--
- BUILD MACROS
- -->
-
- <macrodef name="create-client">
-
- <attribute name="company"/>
- <attribute name="module"/>
- <attribute name="features"/>
- <attribute name="config" default="config.xml"/>
- <attribute name="verbose" default="false"/>
-
- <sequential>
-
- <echo>Generating interop/@{company}/@{module}</echo>
-
- <mkdir dir="${test.resources.dir}/interop/@{company}/@{module}/META-INF"/>
-
- <wscompile
- keep="true"
- client="true"
- base="${build.test.dir}/classes"
- sourceBase="${test.java.dir}"
- nonClassDir="${test.java.dir}/org/jboss/test/ws/interop/@{company}/@{module}"
- mapping="${test.resources.dir}/interop/@{company}/(a){module}/WEB-INF/jaxrpc-mapping.xml"
- features="@{features}"
- xPrintStackTrace="true"
- fork="true"
- verbose="@{verbose}"
- debug="true"
- config="${test.resources.dir}/interop/@{company}/@{module}/@{config}">
-
- <classpath>
- <path refid="wscompile.tools.classpath"/>
- <path refid="jwsdp.classpath"/>
- <path refid="build.classpath"/>
- </classpath>
- </wscompile>
- </sequential>
- </macrodef>
-
- <macrodef name="create-server">
-
- <attribute name="company"/>
- <attribute name="module"/>
- <attribute name="features"/>
- <attribute name="config" default="config.xml"/>
- <attribute name="verbose" default="false"/>
-
- <attribute name="import" default="true"/>
- <attribute name="server" default="false"/>
-
- <sequential>
-
- <echo>Generating interop/@{company}/@{module}</echo>
-
- <wscompile
- keep="true"
- import="@{import}"
- server="@{server}"
- base="${build.test.dir}/classes"
- sourceBase="${test.java.dir}"
- nonClassDir="${test.java.dir}/org/jboss/test/ws/interop/@{company}/@{module}"
- mapping="${test.resources.dir}/interop/@{company}/(a){module}/WEB-INF/jaxrpc-mapping.xml"
- features="@{features}"
- xPrintStackTrace="true"
- fork="true"
- verbose="@{verbose}"
- debug="true"
- config="${test.resources.dir}/interop/@{company}/@{module}/@{config}">
-
- <classpath>
- <path refid="wscompile.tools.classpath"/>
- <path refid="jwsdp.classpath"/>
- <path refid="build.classpath"/>
- </classpath>
- </wscompile>
-
- </sequential>
- </macrodef>
-
- <macrodef name="fetch-wsdl">
- <attribute name="company"/>
- <attribute name="module"/>
- <attribute name="source"/>
- <attribute name="localName" default="service.wsdl"/>
-
- <sequential>
-
- <mkdir dir="${test.resources.dir}/interop/@{company}/@{module}/WEB-INF"/>
- <mkdir dir="${test.resources.dir}/interop/@{company}/@{module}/WEB-INF/wsdl"/>
-
- <get src="@{source}"
- dest="${test.resources.dir}/interop/@{company}/@{module}/WEB-INF/wsdl/@{localName}"
- verbose="true"
- usetimestamp="true"/>
- </sequential>
- </macrodef>
-
- <!--
- CLIENT AND ENDPOINT GENERATION
- -->
- <target name="interop.prepare">
- <mkdir dir="${build.test.dir}/libs/"/>
- <mkdir dir="${build.test.dir}/classes/"/>
- <mkdir dir="${build.test.dir}/reports/"/>
-
- <uptodate property="create.required" targetfile="${wsdl.update.marker}" >
- <srcfiles dir= "${test.resources.dir}/interop" includes="**/WEB-INF/jaxrpc-mapping.xml"/>
- </uptodate>
- </target>
-
- <target name="sync-wsdl-files" description="sync the local WSDL copies">
- <fetch-wsdl
- source="http://131.107.72.15/SoapWsdl_BaseDataTypes_XmlFormatter_Service_Indigo/B..."
- module="soapwsdl/BaseDataTypesDocLitB"
- company="microsoft"/>
-
- <fetch-wsdl
- source="http://131.107.72.15/SoapWsdl_BaseDataTypes_XmlFormatter_Service_Indigo/B..."
- module="soapwsdl/BaseDataTypesDocLitW"
- company="microsoft"/>
-
- <fetch-wsdl
- source="http://131.107.72.15/SoapWsdl_BaseDataTypes_XmlFormatter_Service_Indigo/B..."
- module="soapwsdl/BaseDataTypesRPCLit"
- company="microsoft"/>
-
- <fetch-wsdl
- source="http://131.107.72.15/SoapWsdl_ComplexDataTypes_XmlFormatter_Service_Indig..."
- module="soapwsdl/ComplexDataTypesDocLitB"
- company="microsoft"/>
-
- <fetch-wsdl
- source="http://131.107.72.15/SoapWsdl_ComplexDataTypes_XmlFormatter_Service_Indig..."
- module="soapwsdl/ComplexDataTypesDocLitW"
- company="microsoft"/>
-
- <fetch-wsdl
- source="http://131.107.72.15/SoapWsdl_ComplexDataTypes_XmlFormatter_Service_Indig..."
- module="soapwsdl/ComplexDataTypesRpcLit"
- company="microsoft"/>
-
- <!-- OneWay.svc -->
- <fetch-wsdl source="http://131.107.72.15/WSAddressingCR_Service_WCF/WSAddressing10.svc?wsdl"
- module="addressing/wsa10"
- company="microsoft"/>
-
- <!-- touch the wsdl.update marker -->
- <touch file="${wsdl.update.marker}"/>
-
- </target>
-
- <target name="create-all" depends="interop.prepare, create-client, create-server, create-not-required"/>
-
- <target name="create-not-required" unless="create.required">
- <echo>Local WSDL copies seem to be uptodate. No build required.</echo>
- </target>
-
- <target name="re-create-all">
- <property name="create.required" value="true"/>
- <antcall target="create-all"/>
- </target>
-
- <target name="create-client" if="create.required" description="create the client side artifacts">
-
- <!--create-client
- company="microsoft" module="soapwsdl/BaseDataTypesDocLitB"
- features="documentliteral,wsi"/>
-
- <create-client
- company="microsoft" module="soapwsdl/BaseDataTypesDocLitW"
- features="documentliteral,wsi,unwrap"/>
-
- <create-client
- company="microsoft" module="soapwsdl/BaseDataTypesRPCLit"
- features="rpcliteral,wsi"/>
-
- <create-client
- company="microsoft" module="soapwsdl/ComplexDataTypesDocLitB"
- features="documentliteral,wsi"/>
-
- <create-client
- company="microsoft" module="soapwsdl/ComplexDataTypesDocLitW"
- features="documentliteral,wsi,unwrap"/>
-
- <create-client
- company="microsoft" module="soapwsdl/ComplexDataTypesRpcLit"
- features="rpcliteral,wsi"/-->
-
- </target>
-
- <target name="create-server" description="create the server side artifacts">
-
- <!--create-server
- features="documentliteral,wsi"
- module="addressing/wsaTestService"
- company="microsoft" verbose="false"/>
-
- <create-server
- features="documentliteral,wsi"
- module="soapwsdl/BaseDataTypesDocLitB_Service"
- company="microsoft" verbose="false"/>
-
- <create-server
- features="documentliteral,wsi,unwrap"
- module="soapwsdl/BaseDataTypesDocLitW_Service"
- company="microsoft" verbose="false"
- import="false" server="true"/>
-
- <create-server
- features="rpcliteral,wsi"
- module="soapwsdl/BaseDataTypesRpcLit_Service"
- company="microsoft" verbose="false"
- import="false" server="true"/-->
-
- </target>
-
- <target name="create-addressing" description="create the addressing artifcats">
- <!--create-client
- company="microsoft" module="addressing/sep06/wsa10"
- features="documentliteral,wsi,useonewayoperations,unwrap,novalidation"
- verbose="false"/-->
- <wstools dest="${test.resources.dir}/interop/microsoft/addressing/sep06/wsa10/WEB-INF"
- config="${test.resources.dir}/interop/microsoft/addressing/sep06/wsa10/wstools-config.xml"/>
- </target>
-
- <target name="create-security">
- <!--create-client
- company="microsoft" module="security/wsse10"
- features="documentliteral,wsi,useonewayoperations"
- verbose="false"/>
-
- <create-client
- company="microsoft" module="security/wsse10Encrypt"
- features="documentliteral,wsi,useonewayoperations"
- verbose="false"/-->
-
- <wstools dest="${test.resources.dir}/interop/microsoft/security/sep06/wsse10/WEB-INF"
- config="${test.resources.dir}/interop/microsoft/security/sep06/wsse10/wstools-config.xml"/>
-
- <wstools dest="${test.resources.dir}/interop/microsoft/security/sep06/wsse10Encrypt/WEB-INF"
- config="${test.resources.dir}/interop/microsoft/security/sep06/wsse10Encrypt/wstools-config.xml"/>
-
- </target>
-
- <target name="create-mtom">
- <!--create-server
- features="documentliteral,wsi"
- module="mtom/utf8"
- company="microsoft" verbose="false"
- import="false" server="true"/-->
-
- </target>
- <!--
- COMMON BUILD TARGETS
- -->
-
- <target name="interop.build" depends="interop.prepare, copy-resources, interop.compile"
- description="Compiles and builds the interop clients and endpoints">
- <ant antfile="ant-import/build-interop-jars.xml" target="build-interop-jars"/>
- </target>
-
- <target name="interop.compile" depends="interop.prepare, init" description="Compiles the interop clients and endpoints">
- <mkdir dir="${build.test.dir}/classes"/>
- <javac srcdir="${test.java.dir}" destdir="${build.test.dir}/classes"
- classpathref="build.classpath"
- source="1.5"
- nowarn="off"
- debug="on"
- fork="yes">
- <classpath refid="jwsdp.classpath"/>
- <classpath refid="javac.classpath"/>
- <include name="org/jboss/test/ws/interop/**/*"/>
- </javac>
- </target>
-
- <target name="interop.deploy" depends="interop.prepare" description="Deploy the test endpoints locally">
- <antcall target="deploy-root"/>
- <antcall target="deploy-soapwsdl"/>
- <antcall target="deploy-addressing"/>
- <antcall target="deploy-security"/>
- <antcall target="deploy-mtom"/>
- </target>
-
- <target name="deploy-root">
- <copy todir="${jboss.home}/server/default/deploy/">
- <fileset dir="${build.test.dir}/libs">
- <include name="*interop-root.war"/>
- </fileset>
- </copy>
- </target>
-
- <target name="deploy-soapwsdl">
- <copy todir="${jboss.home}/server/default/deploy/">
- <fileset dir="${build.test.dir}/libs">
- <include name="*interop*_Service.war"/>
- </fileset>
- </copy>
- </target>
-
- <target name="deploy-addressing">
- <copy todir="${jboss.home}/server/default/deploy/">
- <fileset dir="${build.test.dir}/libs">
- <include name="*interop-wsa10*.war"/>
- </fileset>
- </copy>
- </target>
-
- <target name="deploy-security">
- <copy todir="${jboss.home}/server/default/deploy/">
- <fileset dir="${build.test.dir}/libs">
- <include name="*interop-wsse*.war"/>
- </fileset>
- </copy>
- </target>
-
- <target name="deploy-mtom">
- <copy todir="${jboss.home}/server/default/deploy/">
- <fileset dir="${build.test.dir}/libs">
- <include name="*interop-mtom*.war"/>
- </fileset>
- </copy>
- </target>
-
- <target name="interop.undeploy" description="Undeploy the local test endpoints">
- <delete>
- <fileset dir="${jboss.home}/server/default/deploy/">
- <include name="*interop*.war"/>
- </fileset>
- </delete>
- </target>
-
- <target name="interop.clean" description="Clean local build artifacts">
- <delete>
- <fileset dir="${build.test.dir}/classes">
- <include name="**/interop/**/*"/>
- </fileset>
- </delete>
-
- <delete>
- <fileset dir="${build.test.dir}/libs">
- <include name="*interop*"/>
- </fileset>
- </delete>
- </target>
-
-</project>
Modified: trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml
===================================================================
--- trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml 2007-06-12 09:59:56 UTC (rev 3546)
+++ trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml 2007-06-12 10:58:54 UTC (rev 3547)
@@ -10,430 +10,550 @@
<project>
- <description>JBossWS test archive builder</description>
+ <description>JBossWS test archive builder</description>
- <!-- ================================================================== -->
- <!-- Building -->
- <!-- ================================================================== -->
+ <!-- ================================================================== -->
+ <!-- Building -->
+ <!-- ================================================================== -->
- <target name="build-jars-jaxws" description="Build the deployments.">
+ <target name="build-jars-jaxws" description="Build the deployments.">
- <mkdir dir="${tests.output.dir}/libs"/>
+ <mkdir dir="${tests.output.dir}/libs"/>
- <!-- jaxws-anonymous -->
- <war warfile="${tests.output.dir}/libs/jaxws-anonymous.war" webxml="${tests.output.dir}/resources/jaxws/anonymous/WEB-INF/web.xml">
- <classes dir="${tests.output.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"/>
- <include name="org/jboss/test/ws/jaxws/anonymous/AnonymousImpl.class"/>
- </classes>
- </war>
+ <!-- jaxws-anonymous -->
+ <war warfile="${tests.output.dir}/libs/jaxws-anonymous.war" webxml="${tests.output.dir}/resources/jaxws/anonymous/WEB-INF/web.xml">
+ <classes dir="${tests.output.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"/>
+ <include name="org/jboss/test/ws/jaxws/anonymous/AnonymousImpl.class"/>
+ </classes>
+ </war>
- <!-- jaxws-benchmark-doclit -->
- <war warfile="${tests.output.dir}/libs/jaxws-benchmark-doclit.war" webxml="${tests.output.dir}/resources/benchmark/jaxws/doclit/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/benchmark/jaxws/**/*.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/benchmark/jaxws/doclit/WEB-INF">
- <include name="wsdl/**"/>
- </webinf>
- <webinf dir="${tests.output.dir}/resources/benchmark/jaxws/doclit/WEB-INF">
- <include name="handlers.xml"/>
- </webinf>
- </war>
+ <!-- jaxws-benchmark-doclit -->
+ <war warfile="${tests.output.dir}/libs/jaxws-benchmark-doclit.war" webxml="${tests.output.dir}/resources/benchmark/jaxws/doclit/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/benchmark/jaxws/**/*.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/benchmark/jaxws/doclit/WEB-INF">
+ <include name="wsdl/**"/>
+ </webinf>
+ <webinf dir="${tests.output.dir}/resources/benchmark/jaxws/doclit/WEB-INF">
+ <include name="handlers.xml"/>
+ </webinf>
+ </war>
- <war warfile="${tests.output.dir}/libs/ri-benchmark-doclit.war" webxml="${tests.output.dir}/resources/benchmark/jaxws/doclit/ri/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/benchmark/jaxws/**/*.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/benchmark/jaxws/doclit/ri/WEB-INF">
- <include name="wsdl/**"/>
- </webinf>
- <webinf dir="${tests.output.dir}/resources/benchmark/jaxws/doclit/ri/WEB-INF">
- <include name="handlers.xml"/>
- <include name="sun-jaxws.xml"/>
- </webinf>
- </war>
+ <war warfile="${tests.output.dir}/libs/ri-benchmark-doclit.war" webxml="${tests.output.dir}/resources/benchmark/jaxws/doclit/ri/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/benchmark/jaxws/**/*.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/benchmark/jaxws/doclit/ri/WEB-INF">
+ <include name="wsdl/**"/>
+ </webinf>
+ <webinf dir="${tests.output.dir}/resources/benchmark/jaxws/doclit/ri/WEB-INF">
+ <include name="handlers.xml"/>
+ <include name="sun-jaxws.xml"/>
+ </webinf>
+ </war>
- <!-- jaxws-binding -->
- <war warfile="${tests.output.dir}/libs/jaxws-binding.war" webxml="${tests.output.dir}/resources/jaxws/binding/WEB-INF/web.xml">
- <classes dir="${tests.output.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-binding -->
+ <war warfile="${tests.output.dir}/libs/jaxws-binding.war" webxml="${tests.output.dir}/resources/jaxws/binding/WEB-INF/web.xml">
+ <classes dir="${tests.output.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-complex -->
- <war warfile="${tests.output.dir}/libs/jaxws-complex.war" webxml="${tests.output.dir}/resources/jaxws/complex/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/complex/*.class"/>
- <include name="org/jboss/test/ws/jaxws/complex/extra/*.class"/>
- <include name="org/jboss/test/ws/jaxws/complex/types/*.class"/>
- <exclude name="org/jboss/test/ws/jaxws/complex/*TestCase.class"/>
- </classes>
- </war>
+ <!-- jaxws-complex -->
+ <war warfile="${tests.output.dir}/libs/jaxws-complex.war" webxml="${tests.output.dir}/resources/jaxws/complex/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/complex/*.class"/>
+ <include name="org/jboss/test/ws/jaxws/complex/extra/*.class"/>
+ <include name="org/jboss/test/ws/jaxws/complex/types/*.class"/>
+ <exclude name="org/jboss/test/ws/jaxws/complex/*TestCase.class"/>
+ </classes>
+ </war>
- <!-- jaxws-endpoint-servlet -->
- <war warfile="${tests.output.dir}/libs/jaxws-endpoint-servlet.war" webxml="${tests.output.dir}/resources/jaxws/endpoint/WEB-INF/web.xml">
- <classes dir="${tests.output.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="${tests.output.dir}/resources/jaxws/endpoint/WEB-INF">
- <include name="wsdl/**"/>
- </webinf>
- </war>
+ <!-- jaxws-endpoint-servlet -->
+ <war warfile="${tests.output.dir}/libs/jaxws-endpoint-servlet.war" webxml="${tests.output.dir}/resources/jaxws/endpoint/WEB-INF/web.xml">
+ <classes dir="${tests.output.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="${tests.output.dir}/resources/jaxws/endpoint/WEB-INF">
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
- <!-- jaxws-handlerlifecycle -->
- <war warfile="${tests.output.dir}/libs/jaxws-handlerlifecycle.war" webxml="${tests.output.dir}/resources/jaxws/handlerlifecycle/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/handlerlifecycle/SOAPEndpointBean.class"/>
- <include name="org/jboss/test/ws/jaxws/handlerlifecycle/TrackerEndpointBean.class"/>
- <include name="org/jboss/test/ws/jaxws/handlerlifecycle/LifecycleHandler.class"/>
- <include name="org/jboss/test/ws/jaxws/handlerlifecycle/ServerHandler*.class"/>
- <include name="org/jboss/test/ws/jaxws/handlerlifecycle/PreServerHandler*.class"/>
- <include name="org/jboss/test/ws/jaxws/handlerlifecycle/PostServerHandler*.class"/>
- <include name="org/jboss/test/ws/jaxws/handlerlifecycle/HandlerTracker.class"/>
- <include name="org/jboss/test/ws/jaxws/handlerlifecycle/jaxws-server-handlers.xml"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/handlerlifecycle/WEB-INF">
- <include name="jaxws-endpoint-config.xml"/>
- </webinf>
- </war>
+ <!-- jaxws-handlerlifecycle -->
+ <war warfile="${tests.output.dir}/libs/jaxws-handlerlifecycle.war" webxml="${tests.output.dir}/resources/jaxws/handlerlifecycle/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/handlerlifecycle/SOAPEndpointBean.class"/>
+ <include name="org/jboss/test/ws/jaxws/handlerlifecycle/TrackerEndpointBean.class"/>
+ <include name="org/jboss/test/ws/jaxws/handlerlifecycle/LifecycleHandler.class"/>
+ <include name="org/jboss/test/ws/jaxws/handlerlifecycle/ServerHandler*.class"/>
+ <include name="org/jboss/test/ws/jaxws/handlerlifecycle/PreServerHandler*.class"/>
+ <include name="org/jboss/test/ws/jaxws/handlerlifecycle/PostServerHandler*.class"/>
+ <include name="org/jboss/test/ws/jaxws/handlerlifecycle/HandlerTracker.class"/>
+ <include name="org/jboss/test/ws/jaxws/handlerlifecycle/jaxws-server-handlers.xml"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/handlerlifecycle/WEB-INF">
+ <include name="jaxws-endpoint-config.xml"/>
+ </webinf>
+ </war>
- <jar jarfile="${tests.output.dir}/libs/jaxws-handlerlifecycle-client.jar">
- <metainf dir="${tests.output.dir}/resources/jaxws/handlerlifecycle/META-INF">
- <include name="*.xml"/>
- </metainf>
- </jar>
+ <jar jarfile="${tests.output.dir}/libs/jaxws-handlerlifecycle-client.jar">
+ <metainf dir="${tests.output.dir}/resources/jaxws/handlerlifecycle/META-INF">
+ <include name="*.xml"/>
+ </metainf>
+ </jar>
- <!-- jaxws-handlerscope -->
- <war warfile="${tests.output.dir}/libs/jaxws-handlerscope.war" webxml="${tests.output.dir}/resources/jaxws/handlerscope/WEB-INF/web.xml">
- <classes dir="${tests.output.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"/>
- <include name="org/jboss/test/ws/jaxws/handlerscope/jaxws-server-handlers.xml"/>
- </classes>
- </war>
+ <!-- jaxws-handlerscope -->
+ <war warfile="${tests.output.dir}/libs/jaxws-handlerscope.war" webxml="${tests.output.dir}/resources/jaxws/handlerscope/WEB-INF/web.xml">
+ <classes dir="${tests.output.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"/>
+ <include name="org/jboss/test/ws/jaxws/handlerscope/jaxws-server-handlers.xml"/>
+ </classes>
+ </war>
- <!-- jaxws-jbws860 -->
- <war warfile="${tests.output.dir}/libs/jaxws-jbws860.war" webxml="${tests.output.dir}/resources/jaxws/jbws860/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/jbws860/*.class"/>
- <exclude name="org/jboss/test/ws/jaxws/jbws860/*TestCase.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/jbws860/WEB-INF">
- <include name="jboss-web.xml"/>
- </webinf>
- </war>
+ <!-- jaxws-jbws860 -->
+ <war warfile="${tests.output.dir}/libs/jaxws-jbws860.war" webxml="${tests.output.dir}/resources/jaxws/jbws860/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws860/*.class"/>
+ <exclude name="org/jboss/test/ws/jaxws/jbws860/*TestCase.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/jbws860/WEB-INF">
+ <include name="jboss-web.xml"/>
+ </webinf>
+ </war>
- <!-- jaxws-jbws871 -->
- <war warfile="${tests.output.dir}/libs/jaxws-jbws871-rpc.war" webxml="${tests.output.dir}/resources/jaxws/jbws871/WEB-INF-rpc/web.xml">
- <classes dir="${tests.output.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="${tests.output.dir}/libs/jaxws-jbws871-rpc-client.jar">
- <fileset dir="${tests.output.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="${tests.output.dir}/resources/jaxws/jbws871/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
+ <!-- jaxws-jbws871 -->
+ <war warfile="${tests.output.dir}/libs/jaxws-jbws871-rpc.war" webxml="${tests.output.dir}/resources/jaxws/jbws871/WEB-INF-rpc/web.xml">
+ <classes dir="${tests.output.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="${tests.output.dir}/libs/jaxws-jbws871-rpc-client.jar">
+ <fileset dir="${tests.output.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="${tests.output.dir}/resources/jaxws/jbws871/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
- <!-- jaxws-jbws944 -->
- <jar jarfile="${tests.output.dir}/libs/jaxws-jbws944.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/jbws944/EJB3Bean01.class"/>
- <include name="org/jboss/test/ws/jaxws/jbws944/EJB3RemoteInterface.class"/>
- <include name="org/jboss/test/ws/jaxws/jbws944/EJB3RemoteHome.class"/>
- </fileset>
- </jar>
+ <!-- jaxws-jbws944 -->
+ <jar jarfile="${tests.output.dir}/libs/jaxws-jbws944.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws944/EJB3Bean01.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws944/EJB3RemoteInterface.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws944/EJB3RemoteHome.class"/>
+ </fileset>
+ </jar>
- <!-- jaxws-jbws981 -->
- <jar destfile="${tests.output.dir}/libs/jaxws-jbws981.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/jbws981/EJB3Bean.class"/>
- <include name="org/jboss/test/ws/jaxws/jbws981/EJB3RemoteInterface.class"/>
- <include name="org/jboss/test/ws/jaxws/jbws981/EndpointInterface.class"/>
- </fileset>
- </jar>
+ <!-- jaxws-jbws981 -->
+ <jar destfile="${tests.output.dir}/libs/jaxws-jbws981.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws981/EJB3Bean.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws981/EJB3RemoteInterface.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws981/EndpointInterface.class"/>
+ </fileset>
+ </jar>
- <!-- jaxws-jbws1178 -->
- <war destfile="${tests.output.dir}/libs/jaxws-jbws1178.war" webxml="${tests.output.dir}/resources/jaxws/jbws1178/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/jbws1178/TestEndpoint.class"/>
- </classes>
- </war>
+ <!-- jaxws-jbws1178 -->
+ <war destfile="${tests.output.dir}/libs/jaxws-jbws1178.war" webxml="${tests.output.dir}/resources/jaxws/jbws1178/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws1178/TestEndpoint.class"/>
+ </classes>
+ </war>
- <!-- jaxws-jbws1190 -->
- <war destfile="${tests.output.dir}/libs/jaxws-jbws1190.war" webxml="${tests.output.dir}/resources/jaxws/jbws1190/WEB-INF/web.xml">
- <classes dir="${tests.output.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"/>
- <include name="org/jboss/test/ws/jaxws/jbws1190/JBWS1190Exception.class"/>
- </classes>
- </war>
+ <!-- jaxws-jbws1190 -->
+ <war destfile="${tests.output.dir}/libs/jaxws-jbws1190.war" webxml="${tests.output.dir}/resources/jaxws/jbws1190/WEB-INF/web.xml">
+ <classes dir="${tests.output.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"/>
+ <include name="org/jboss/test/ws/jaxws/jbws1190/JBWS1190Exception.class"/>
+ </classes>
+ </war>
- <!-- jaxws-jbws1357 -->
- <war warfile="${tests.output.dir}/libs/jaxws-jbws1357.war" webxml="${tests.output.dir}/resources/jaxws/jbws1357/WEB-INF/web.xml">
- <classes dir="${tests.output.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="${tests.output.dir}/resources/jaxws/jbws1357">
- <include name="hello.jsp"/>
- </fileset>
- </war>
+ <!-- jaxws-jbws1357 -->
+ <war warfile="${tests.output.dir}/libs/jaxws-jbws1357.war" webxml="${tests.output.dir}/resources/jaxws/jbws1357/WEB-INF/web.xml">
+ <classes dir="${tests.output.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="${tests.output.dir}/resources/jaxws/jbws1357">
+ <include name="hello.jsp"/>
+ </fileset>
+ </war>
- <!-- jaxws-jbws1529 -->
- <war warfile="${tests.output.dir}/libs/jaxws-jbws1529.war" webxml="${tests.output.dir}/resources/jaxws/jbws1529/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/jbws1529/UserException.class"/>
- <include name="org/jboss/test/ws/jaxws/jbws1529/JBWS1529.class"/>
- <include name="org/jboss/test/ws/jaxws/jbws1529/JBWS1529Impl.class"/>
- </classes>
- </war>
+ <!-- jaxws-jbws1529 -->
+ <war warfile="${tests.output.dir}/libs/jaxws-jbws1529.war" webxml="${tests.output.dir}/resources/jaxws/jbws1529/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws1529/UserException.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws1529/JBWS1529.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws1529/JBWS1529Impl.class"/>
+ </classes>
+ </war>
- <!-- jaxws-jbws1566-->
- <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1566.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/jbws1566/**/*.class"/>
- </fileset>
- </jar>
+ <!-- jaxws-jbws1566-->
+ <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1566.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws1566/**/*.class"/>
+ </fileset>
+ </jar>
- <!-- jaxws-jbws1581 -->
- <war warfile="${tests.output.dir}/libs/jaxws-jbws1581.war" webxml="${tests.output.dir}/resources/jaxws/jbws1581/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/jbws1581/EndpointBean.class"/>
- <include name="org/jboss/test/ws/jaxws/jbws1581/EndpointInterface.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/jbws1581/WEB-INF">
- <include name="jboss-web.xml"/>
- </webinf>
- </war>
- <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1581.ear">
- <fileset dir="${tests.output.dir}/libs">
- <include name="jaxws-jbws1581.war"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/jbws1581/META-INF">
- <include name="application.xml"/>
- <include name="jboss-app.xml"/>
- </metainf>
- </jar>
- <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1581.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/jbws1581/EJB3Bean.class"/>
- <include name="org/jboss/test/ws/jaxws/jbws1581/EJB3Remote.class"/>
- <include name="org/jboss/test/ws/jaxws/jbws1581/EndpointInterface.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/jbws1581/META-INF">
- <include name="wsdl/**"/>
- </metainf>
- </jar>
+ <!-- jaxws-jbws1581 -->
+ <war warfile="${tests.output.dir}/libs/jaxws-jbws1581.war" webxml="${tests.output.dir}/resources/jaxws/jbws1581/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws1581/EndpointBean.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws1581/EndpointInterface.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/jbws1581/WEB-INF">
+ <include name="jboss-web.xml"/>
+ </webinf>
+ </war>
+ <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1581.ear">
+ <fileset dir="${tests.output.dir}/libs">
+ <include name="jaxws-jbws1581.war"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/jbws1581/META-INF">
+ <include name="application.xml"/>
+ <include name="jboss-app.xml"/>
+ </metainf>
+ </jar>
+ <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1581.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws1581/EJB3Bean.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws1581/EJB3Remote.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws1581/EndpointInterface.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/jbws1581/META-INF">
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
- <!-- jaxws-jbws1283 -->
- <jar destfile="${tests.output.dir}/libs/jaxws-jbws1283.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/jbws1283/*.*"/>
- </fileset>
- </jar>
+ <!-- jaxws-jbws1283 -->
+ <jar destfile="${tests.output.dir}/libs/jaxws-jbws1283.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws1283/*.*"/>
+ </fileset>
+ </jar>
- <!-- jaxws-jbws1422 -->
- <jar destfile="${tests.output.dir}/libs/jaxws-jbws1422.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/jbws1422/*.*"/>
- </fileset>
- </jar>
-
- <!-- jaxws-jbws1505 -->
- <jar destfile="${tests.output.dir}/libs/jaxws-jbws1505.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/jbws1505/*.*"/>
- </fileset>
- </jar>
+ <!-- jaxws-jbws1422 -->
+ <jar destfile="${tests.output.dir}/libs/jaxws-jbws1422.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws1422/*.*"/>
+ </fileset>
+ </jar>
- <!-- jaxws namespace -->
- <war warfile="${tests.output.dir}/libs/jaxws-namespace.war" webxml="${tests.output.dir}/resources/jaxws/namespace/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/namespace/EndpointBean.class"/>
- <include name="org/jboss/test/ws/jaxws/namespace/EndpointInterface.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/namespace/WEB-INF">
- <include name="jboss-web.xml"/>
- </webinf>
- </war>
+ <!-- jaxws-jbws1505 -->
+ <jar destfile="${tests.output.dir}/libs/jaxws-jbws1505.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws1505/*.*"/>
+ </fileset>
+ </jar>
- <!-- jaxws-serviceref -->
- <war warfile="${tests.output.dir}/libs/jaxws-serviceref.war" webxml="${tests.output.dir}/resources/jaxws/serviceref/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/serviceref/TestEndpointImpl.class"/>
- </classes>
- </war>
- <jar destfile="${tests.output.dir}/libs/jaxws-serviceref-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/serviceref/ApplicationClient.class"/>
- <include name="org/jboss/test/ws/jaxws/serviceref/TestEndpointService.class"/>
- <include name="org/jboss/test/ws/jaxws/serviceref/TestEndpoint.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/serviceref/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
- <war destfile="${tests.output.dir}/libs/jaxws-serviceref-servlet-client.war" webxml="${tests.output.dir}/resources/jaxws/serviceref/servlet-client/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/serviceref/ServletClient.class"/>
- <include name="org/jboss/test/ws/jaxws/serviceref/TestEndpointService.class"/>
- <include name="org/jboss/test/ws/jaxws/serviceref/TestEndpoint.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/serviceref/META-INF">
- <include name="wsdl/**"/>
- </webinf>
- <webinf dir="${tests.output.dir}/resources/jaxws/serviceref/servlet-client/WEB-INF">
- <include name="jboss-web.xml"/>
- </webinf>
- </war>
- <jar destfile="${tests.output.dir}/libs/jaxws-serviceref-ejb-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/serviceref/EJBClient.class"/>
- <include name="org/jboss/test/ws/jaxws/serviceref/EJBRemote.class"/>
- <include name="org/jboss/test/ws/jaxws/serviceref/TestEndpointService.class"/>
- <include name="org/jboss/test/ws/jaxws/serviceref/TestEndpoint.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/serviceref/META-INF">
- <include name="ejb-jar.xml"/>
- <include name="jboss.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
-
- <!-- jaxws-wrapped-accessor -->
- <war warfile="${tests.output.dir}/libs/jaxws-wrapped-accessor.war" webxml="${tests.output.dir}/resources/jaxws/wrapped/accessor/WEB-INF/web.xml">
- <classes dir="${tests.output.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/*"/>
- </classes>
- </war>
+ <!-- jaxws namespace -->
+ <war warfile="${tests.output.dir}/libs/jaxws-namespace.war" webxml="${tests.output.dir}/resources/jaxws/namespace/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/namespace/EndpointBean.class"/>
+ <include name="org/jboss/test/ws/jaxws/namespace/EndpointInterface.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/namespace/WEB-INF">
+ <include name="jboss-web.xml"/>
+ </webinf>
+ </war>
- <!-- jaxws-holder -->
- <war warfile="${tests.output.dir}/libs/jaxws-holder.war" webxml="${tests.output.dir}/resources/jaxws/holder/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/holder/HolderServiceImpl.class"/>
- </classes>
- </war>
+ <!-- jaxws-serviceref -->
+ <war warfile="${tests.output.dir}/libs/jaxws-serviceref.war" webxml="${tests.output.dir}/resources/jaxws/serviceref/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/serviceref/TestEndpointImpl.class"/>
+ </classes>
+ </war>
+ <jar destfile="${tests.output.dir}/libs/jaxws-serviceref-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/serviceref/ApplicationClient.class"/>
+ <include name="org/jboss/test/ws/jaxws/serviceref/TestEndpointService.class"/>
+ <include name="org/jboss/test/ws/jaxws/serviceref/TestEndpoint.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/serviceref/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+ <war destfile="${tests.output.dir}/libs/jaxws-serviceref-servlet-client.war" webxml="${tests.output.dir}/resources/jaxws/serviceref/servlet-client/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/serviceref/ServletClient.class"/>
+ <include name="org/jboss/test/ws/jaxws/serviceref/TestEndpointService.class"/>
+ <include name="org/jboss/test/ws/jaxws/serviceref/TestEndpoint.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/serviceref/META-INF">
+ <include name="wsdl/**"/>
+ </webinf>
+ <webinf dir="${tests.output.dir}/resources/jaxws/serviceref/servlet-client/WEB-INF">
+ <include name="jboss-web.xml"/>
+ </webinf>
+ </war>
+ <jar destfile="${tests.output.dir}/libs/jaxws-serviceref-ejb-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/serviceref/EJBClient.class"/>
+ <include name="org/jboss/test/ws/jaxws/serviceref/EJBRemote.class"/>
+ <include name="org/jboss/test/ws/jaxws/serviceref/TestEndpointService.class"/>
+ <include name="org/jboss/test/ws/jaxws/serviceref/TestEndpoint.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/serviceref/META-INF">
+ <include name="ejb-jar.xml"/>
+ <include name="jboss.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
- <!-- jaxws-wsdd -->
- <war warfile="${tests.output.dir}/libs/jaxws-wsdd.war"
- webxml="${tests.output.dir}/resources/jaxws/wsdd/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/wsdd/*.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/wsdd/WEB-INF">
- <include name="webservices.xml"/>
- </webinf>
- </war>
+ <!-- jaxws-wrapped-accessor -->
+ <war warfile="${tests.output.dir}/libs/jaxws-wrapped-accessor.war" webxml="${tests.output.dir}/resources/jaxws/wrapped/accessor/WEB-INF/web.xml">
+ <classes dir="${tests.output.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/*"/>
+ </classes>
+ </war>
- <!-- jaxws-wsaddressing-action -->
- <war warfile="${tests.output.dir}/libs/jaxws-wsaddressing-action-rpc.war" webxml="${tests.output.dir}/resources/jaxws/wsaddressing/action/WEB-INF/web.xml">
- <classes dir="${tests.output.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="${tests.output.dir}/resources/jaxws/wsaddressing/action/META-INF">
- <include name="wsdl/**"/>
- </webinf>
- </war>
- <jar destfile="${tests.output.dir}/libs/jaxws-wsaddressing-action-rpc-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/wsaddressing/action/ActionEndpoint.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/wsaddressing/action/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="jbossws-client-config.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
+ <!-- jaxws-holder -->
+ <war warfile="${tests.output.dir}/libs/jaxws-holder.war" webxml="${tests.output.dir}/resources/jaxws/holder/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/holder/HolderServiceImpl.class"/>
+ </classes>
+ </war>
- <!-- jaxws-wsaddressing-replyto -->
- <war warfile="${tests.output.dir}/libs/jaxws-wsaddressing-initial.war" webxml="${tests.output.dir}/resources/jaxws/wsaddressing/replyto/Initial-WEB-INF/web.xml">
- <classes dir="${tests.output.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="${tests.output.dir}/libs/jaxws-wsaddressing-initial-client.jar">
- <fileset dir="${tests.output.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="${tests.output.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="${tests.output.dir}/libs/jaxws-wsaddressing-replyto.war" webxml="${tests.output.dir}/resources/jaxws/wsaddressing/replyto/ReplyTo-WEB-INF/web.xml">
- <classes dir="${tests.output.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="${tests.output.dir}/libs/jaxws-wsaddressing-replyto-client.jar">
- <fileset dir="${tests.output.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="${tests.output.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="${tests.output.dir}/libs/jaxws-wsaddressing-faultto.war" webxml="${tests.output.dir}/resources/jaxws/wsaddressing/replyto/FaultTo-WEB-INF/web.xml">
- <classes dir="${tests.output.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"/>
- </classes>
- </war>
+ <!-- jaxws-wsdd -->
+ <war warfile="${tests.output.dir}/libs/jaxws-wsdd.war"
+ webxml="${tests.output.dir}/resources/jaxws/wsdd/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/wsdd/*.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/wsdd/WEB-INF">
+ <include name="webservices.xml"/>
+ </webinf>
+ </war>
- <!-- jaxws-wseventing -->
- <war warfile="${tests.output.dir}/libs/jaxws-wseventing.war" webxml="${tests.output.dir}/resources/jaxws/wseventing/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/ws/eventing/*.class"/>
- <include name="org/jboss/test/ws/jaxws/wseventing/*.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/wseventing/WEB-INF">
- <include name="wsdl/**"/>
- </webinf>
- </war>
+ <!-- jaxws-wsaddressing-action -->
+ <war warfile="${tests.output.dir}/libs/jaxws-wsaddressing-action-rpc.war" webxml="${tests.output.dir}/resources/jaxws/wsaddressing/action/WEB-INF/web.xml">
+ <classes dir="${tests.output.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="${tests.output.dir}/resources/jaxws/wsaddressing/action/META-INF">
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <jar destfile="${tests.output.dir}/libs/jaxws-wsaddressing-action-rpc-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/wsaddressing/action/ActionEndpoint.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/wsaddressing/action/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ <include name="jbossws-client-config.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
- <!-- Please add alphabetically -->
+ <!-- jaxws-wsaddressing-replyto -->
+ <war warfile="${tests.output.dir}/libs/jaxws-wsaddressing-initial.war" webxml="${tests.output.dir}/resources/jaxws/wsaddressing/replyto/Initial-WEB-INF/web.xml">
+ <classes dir="${tests.output.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="${tests.output.dir}/libs/jaxws-wsaddressing-initial-client.jar">
+ <fileset dir="${tests.output.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="${tests.output.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="${tests.output.dir}/libs/jaxws-wsaddressing-replyto.war" webxml="${tests.output.dir}/resources/jaxws/wsaddressing/replyto/ReplyTo-WEB-INF/web.xml">
+ <classes dir="${tests.output.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="${tests.output.dir}/libs/jaxws-wsaddressing-replyto-client.jar">
+ <fileset dir="${tests.output.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="${tests.output.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="${tests.output.dir}/libs/jaxws-wsaddressing-faultto.war" webxml="${tests.output.dir}/resources/jaxws/wsaddressing/replyto/FaultTo-WEB-INF/web.xml">
+ <classes dir="${tests.output.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"/>
+ </classes>
+ </war>
- </target>
+ <!-- jaxws-wseventing -->
+ <war warfile="${tests.output.dir}/libs/jaxws-wseventing.war" webxml="${tests.output.dir}/resources/jaxws/wseventing/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/ws/eventing/*.class"/>
+ <include name="org/jboss/test/ws/jaxws/wseventing/*.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/wseventing/WEB-INF">
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <!-- Please add alphabetically -->
+
+ <antcall target="build-interop-jars"/>
+
+ </target>
+
+ <target name="build-interop-jars">
+
+ <!-- Root.war -->
+ <war warfile="${tests.output.dir}/libs/jbossws-interop-root.war"
+ webxml="${tests.output.dir}/resources/interop/root/WEB-INF/web.xml">
+ <webinf dir="${tests.output.dir}/resources/interop/root/WEB-INF">
+ <include name="jboss-web.xml"/>
+ </webinf>
+ <fileset dir="${tests.output.dir}/resources/interop/root">
+ <include name="*.*"/>
+ </fileset>
+ </war>
+
+ <!-- BaseDataTypesDocLitB client -->
+ <jar jarfile="${tests.output.dir}/libs/jbossws-interop-BaseDataTypesDocLitB-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/interop/*.class"/>
+ <include name="org/jboss/test/ws/interop/soapwsdl/basedoclitb/**/*.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF">
+ <include name="wsdl/**.*"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitB/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ <include name="scenarios.xml"/>
+ </metainf>
+ </jar>
+
+ <!-- BaseDataTypesDocLitB.war -->
+ <war warfile="${tests.output.dir}/libs/jbossws-interop-BaseDataTypesDocLitB.war"
+ webxml="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/interop/soapwsdl/basedoclitb/**/*.class"/>
+ <include name="org/jboss/test/ws/interop/*.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF">
+ <include name="wsdl/**.*"/>
+ <include name="jboss-web.xml"/>
+ <include name="scenarios.xml"/>
+ </webinf>
+ <fileset dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitB">
+ <include name="*.*"/>
+ </fileset>
+ </war>
+
+ <!-- BaseDataTypesDocLitW client -->
+ <jar jarfile="${tests.output.dir}/libs/jbossws-interop-BaseDataTypesDocLitW-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/interop/soapwsdl/basedoclitw/**/*.class"/>
+ <include name="org/jboss/test/ws/interop/*.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitW/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ <include name="scenarios.xml"/>
+ </metainf>
+ </jar>
+
+ <!-- BaseDataTypesDocLitW.war -->
+ <war warfile="${tests.output.dir}/libs/jbossws-interop-BaseDataTypesDocLitW.war"
+ webxml="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/interop/soapwsdl/basedoclitw/**/*.class"/>
+ <include name="org/jboss/test/ws/interop/*.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF">
+ <include name="wsdl/**"/>
+ <include name="jboss-web.xml"/>
+ <include name="scenarios.xml"/>
+ </webinf>
+ <fileset dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitW">
+ <include name="*.*"/>
+ </fileset>
+ </war>
+
+ <!-- BaseDataTypesRpcLit client -->
+ <jar jarfile="${tests.output.dir}/libs/jbossws-interop-BaseDataTypesRpcLit-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/interop/soapwsdl/baserpclit/**/*.class"/>
+ <include name="org/jboss/test/ws/interop/*.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesRpcLit/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ <include name="scenarios.xml"/>
+ </metainf>
+ </jar>
+
+ <!-- BaseDataTypesRpcLit.war -->
+ <war warfile="${tests.output.dir}/libs/jbossws-interop-BaseDataTypesRpcLit.war"
+ webxml="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/interop/soapwsdl/baserpclit/**/*.class"/>
+ <include name="org/jboss/test/ws/interop/*.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF">
+ <include name="wsdl/**"/>
+ <include name="jboss-web.xml"/>
+ <include name="scenarios.xml"/>
+ </webinf>
+ <fileset dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesRpcLit">
+ <include name="*.*"/>
+ </fileset>
+ </war>
+
+
+
+ </target>
+
</project>
Modified: trunk/jbossws-core/ant-import-tests/build-testsuite.xml
===================================================================
--- trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-06-12 09:59:56 UTC (rev 3546)
+++ trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-06-12 10:58:54 UTC (rev 3547)
@@ -9,221 +9,221 @@
<!-- $Id$ -->
<project>
-
- <property name="tests.output.dir" value="${core.dir}/output/tests"/>
- <import file="${build.dir}/ant-import/build-testsuite.xml"/>
-
- <property name="tests.dir" value="${core.dir}/src/test"/>
- <property name="tests.java.dir" value="${tests.dir}/java"/>
- <property name="tests.resources.dir" value="${tests.dir}/resources"/>
-
- <!-- Define excluded tests -->
- <property name="excludes-short-name" value="test-excludes-${jbossws.integration.target}.txt"/>
- <property name="excludesfile" value="${core.dir}/src/test/resources/${excludes-short-name}"/>
-
- <!--
- Init the various classpaths
- -->
- <target name="tests-init" depends="thirdparty-classpath,tests-classpath">
- <path id="ws.stack.classpath">
- <pathelement location="${core.dir}/output/lib/jboss-jaxrpc.jar"/>
- <pathelement location="${core.dir}/output/lib/jboss-jaxws.jar"/>
- <pathelement location="${core.dir}/output/lib/jboss-saaj.jar"/>
- <pathelement location="${core.dir}/output/lib/jbossws-core.jar"/>
- <pathelement location="${core.dir}/output/lib/jbossws-client.jar"/>
- </path>
+ <property name="tests.output.dir" value="${core.dir}/output/tests"/>
+ <import file="${build.dir}/ant-import/build-testsuite.xml"/>
- <path id="tests.extra.classpath">
- <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
- <pathelement location="${core.dir}/thirdparty/ejb3.deployer/jboss-annotations-ejb3.jar"/>
- <pathelement location="${core.dir}/thirdparty/ejb3.deployer/jboss-ejb3.jar"/>
- <pathelement location="${core.dir}/thirdparty/jboss-remoting.jar"/>
- <pathelement location="${core.dir}/thirdparty/policy.jar"/>
- <pathelement location="${core.dir}/thirdparty/qdox.jar"/>
- <pathelement location="${core.dir}/thirdparty/wsdl4j.jar"/>
- <pathelement location="${core.dir}/thirdparty/xmlunit.jar"/>
- <pathelement location="${core.dir}/thirdparty/wstx.jar"/>
- </path>
+ <property name="tests.dir" value="${core.dir}/src/test"/>
+ <property name="tests.java.dir" value="${tests.dir}/java"/>
+ <property name="tests.resources.dir" value="${tests.dir}/resources"/>
- <!-- The jBPM BPEL classpath -->
- <path id="jbpm.bpel.classpath">
- <path refid="ws.stack.classpath"/>
- <pathelement location="${core.dir}/thirdparty/jbpm-bpel"/> <!-- jbpm.cfg.xml -->
- <pathelement location="${core.dir}/thirdparty/jbpm-bpel/jbpm-bpel.jar" />
- <pathelement location="${core.dir}/thirdparty/jbpm-bpel/jbpm-jpdl.jar" />
- <pathelement location="${core.dir}/thirdparty/jbpm-bpel/commons-lang.jar" />
- <pathelement location="${core.dir}/thirdparty/commons-collections.jar"/>
- <pathelement location="${core.dir}/thirdparty/commons-logging.jar"/>
- <pathelement location="${core.dir}/thirdparty/dom4j.jar"/>
- <pathelement location="${core.dir}/thirdparty/jaxen.jar"/>
- <pathelement location="${core.dir}/thirdparty/wsdl4j.jar"/>
- <pathelement location="${core.dir}/thirdparty/jboss-logging-log4j.jar"/>
- <!--
- <pathelement location="${core.dir}/thirdparty/log4j.jar"/>
- <pathelement location="${tests.etc.dir}"/>
- -->
- </path>
-
- </target>
+ <!-- Define excluded tests -->
+ <property name="excludes-short-name" value="test-excludes-${jbossws.integration.target}.txt"/>
+ <property name="excludesfile" value="${core.dir}/src/test/resources/${excludes-short-name}"/>
- <!-- ================================================================== -->
- <!-- Generating sources -->
- <!-- ================================================================== -->
+ <!--
+ Init the various classpaths
+ -->
+ <target name="tests-init" depends="thirdparty-classpath,tests-classpath">
- <target name="wsconsume" depends="tests-init" description="Consume JAX-WS contracts">
+ <path id="ws.stack.classpath">
+ <pathelement location="${core.dir}/output/lib/jboss-jaxrpc.jar"/>
+ <pathelement location="${core.dir}/output/lib/jboss-jaxws.jar"/>
+ <pathelement location="${core.dir}/output/lib/jboss-saaj.jar"/>
+ <pathelement location="${core.dir}/output/lib/jbossws-core.jar"/>
+ <pathelement location="${core.dir}/output/lib/jbossws-client.jar"/>
+ </path>
- <!-- Define the JAX-WS wsconsume task -->
- <taskdef name="wsconsume" classname="org.jboss.wsf.spi.tools.ant.WSConsumeTask">
- <classpath refid="ws.stack.classpath"/>
- <classpath location="${spi.dir}/output/lib/jbossws-spi.jar"/>
-
- <classpath location="${core.dir}/thirdparty/jaxb-xjc.jar"/>
- <classpath location="${core.dir}/thirdparty/jaxb-impl.jar"/>
- <classpath location="${core.dir}/thirdparty/jaxws-rt.jar"/>
- <classpath location="${core.dir}/thirdparty/jaxws-tools.jar"/>
- <classpath location="${core.dir}/thirdparty/stax-api.jar"/>
- <classpath location="${core.dir}/thirdparty/stax-ex.jar"/>
- <classpath location="${core.dir}/thirdparty/streambuffer.jar"/>
- <classpath location="${core.dir}/thirdparty/wstx.jar"/>
- </taskdef>
+ <path id="tests.extra.classpath">
+ <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
+ <pathelement location="${core.dir}/thirdparty/ejb3.deployer/jboss-annotations-ejb3.jar"/>
+ <pathelement location="${core.dir}/thirdparty/ejb3.deployer/jboss-ejb3.jar"/>
+ <pathelement location="${core.dir}/thirdparty/jboss-remoting.jar"/>
+ <pathelement location="${core.dir}/thirdparty/policy.jar"/>
+ <pathelement location="${core.dir}/thirdparty/qdox.jar"/>
+ <pathelement location="${core.dir}/thirdparty/wsdl4j.jar"/>
+ <pathelement location="${core.dir}/thirdparty/xmlunit.jar"/>
+ <pathelement location="${core.dir}/thirdparty/wstx.jar"/>
+ </path>
- <wsconsume wsdl="${tests.resources.dir}/benchmark/jaxws/doclit/WEB-INF/wsdl/BenchmarkWebService.wsdl" package="org.jboss.test.ws.benchmark.jaxws.doclit" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>
- <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.basedoclitb" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>
- <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.basedoclitw" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>
- <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.baserpclit" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>
- <wsconsume wsdl="${tests.resources.dir}/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl" package="org.jboss.test.ws.jaxws.complex" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>
- <wsconsume wsdl="${tests.resources.dir}/jaxws/holder/META-INF/wsdl/HolderService.wsdl" package="org.jboss.test.ws.jaxws.holder" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>
- <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecuritypolicy/WEB-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecuritypolicy" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>
- <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecurityAnnotatedpolicy/META-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecurityAnnotatedpolicy" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>
- <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecurity/META-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecurity" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>
- </target>
+ <!-- The jBPM BPEL classpath -->
+ <path id="jbpm.bpel.classpath">
+ <path refid="ws.stack.classpath"/>
+ <pathelement location="${core.dir}/thirdparty/jbpm-bpel"/> <!-- jbpm.cfg.xml -->
+ <pathelement location="${core.dir}/thirdparty/jbpm-bpel/jbpm-bpel.jar" />
+ <pathelement location="${core.dir}/thirdparty/jbpm-bpel/jbpm-jpdl.jar" />
+ <pathelement location="${core.dir}/thirdparty/jbpm-bpel/commons-lang.jar" />
+ <pathelement location="${core.dir}/thirdparty/commons-collections.jar"/>
+ <pathelement location="${core.dir}/thirdparty/commons-logging.jar"/>
+ <pathelement location="${core.dir}/thirdparty/dom4j.jar"/>
+ <pathelement location="${core.dir}/thirdparty/jaxen.jar"/>
+ <pathelement location="${core.dir}/thirdparty/wsdl4j.jar"/>
+ <pathelement location="${core.dir}/thirdparty/jboss-logging-log4j.jar"/>
+ <!--
+ <pathelement location="${core.dir}/thirdparty/log4j.jar"/>
+ <pathelement location="${tests.etc.dir}"/>
+ -->
+ </path>
- <!--
- Generate BPEL sources
- -->
- <target name="servicegen" depends="tests-compile" description="Generate the BPEL resources.">
- <!-- create jbpm process archives -->
- <mkdir dir="${tests.output.dir}/libs"/>
- <zip destfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip">
- <fileset dir="${tests.resources.dir}/jaxrpc/samples/wsbpel/hello/bpel" />
- </zip>
- <!-- Copy the BPEL sar -->
- <copy file="${core.dir}/thirdparty/jbpm-bpel.sar" todir="${tests.output.dir}/libs"/>
+ </target>
- <!-- generate wsdl binding and service definitions for bpel processes -->
- <taskdef name="servicegen" classname="org.jbpm.bpel.ant.ServiceGeneratorTask">
- <classpath refid="jbpm.bpel.classpath"/>
- </taskdef>
- <servicegen processfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip"
- outputdir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/wsdl"
- bindingfile="hello-binding-.wsdl" servicefile="hello-service.wsdl" />
- </target>
+ <!-- ================================================================== -->
+ <!-- Generating sources -->
+ <!-- ================================================================== -->
- <!--
- Generate JAX-RPC sources
- -->
- <target name="wstools" depends="tests-compile" description="Generate the JAX-RPC artifacts.">
-
- <!-- Define the JAX-RPC tools task -->
- <taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
- <classpath refid="ws.stack.classpath"/>
- <classpath refid="thirdparty.classpath"/>
- <classpath location="${core.dir}/thirdparty/concurrent.jar"/>
- <classpath location="${tests.output.dir}/classes"/>
- <classpath location="${tests.output.dir}"/>
- </taskdef>
-
- <!-- Generate JAX-RPC artifacts -->
- <mkdir dir="${tests.output.dir}/wstools/java"/>
- <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/docstyle/wrapped/wstools-config.xml"/>
- <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/bare/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/docstyle/bare/wstools-config.xml"/>
- <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/dynamichandler/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/dynamichandler/wstools-config.xml"/>
- <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/exception/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/exception/wstools-config.xml"/>
- <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/handler/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/handler/wstools-config.xml"/>
- <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/holder/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/holder/wstools-config.xml"/>
- <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jmstransport/META-INF" config="${tests.resources.dir}/jaxrpc/samples/jmstransport/wstools-config.xml"/>
- <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109ejb/doclit/wstools-config.xml"/>
- <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109ejb/rpclit/wstools-config.xml"/>
- <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109pojo/doclit/wstools-config.xml"/>
- <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109pojo/rpclit/wstools-config.xml"/>
- <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/message/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/message/wstools-config.xml"/>
- <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/oneway/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/oneway/wstools-config.xml"/>
- <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/rpcstyle/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/rpcstyle/wstools-config.xml"/>
- <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/secureejb/META-INF" config="${tests.resources.dir}/jaxrpc/samples/secureejb/wstools-config.xml"/>
- <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wsbpel/hello/wstools-config.xml"/>
- <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wssecurity/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wssecurity/wstools-config.xml"/>
- <move todir="${tests.output.dir}/wstools/java">
- <fileset dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" includes="org/**"/>
- </move>
-
- <!-- Copy generated resources -->
- <copy todir="${tests.output.dir}/resources">
- <fileset dir="${tests.output.dir}/wstools/resources">
- <include name="**/*.wsdl"/>
- <include name="**/*.xml"/>
- </fileset>
- </copy>
- <!-- Copy resources that cannot (yet) be generated -->
- <copy todir="${tests.output.dir}/resources/jaxrpc/samples" overwrite="true">
- <fileset dir="${tests.resources.dir}/jaxrpc/samples-override"/>
- <filterset>
- <filter token="jboss.bind.address" value="${node0}"/>
- </filterset>
- </copy>
- </target>
-
- <!--
- Generate JAX-WS sources
- -->
- <target name="wsprovide" depends="tests-compile" description="Provide the JAX-WS contracts.">
+ <target name="wsconsume" depends="tests-init" description="Consume JAX-WS contracts">
- <!-- Define the JAX-WS wsprovide task -->
- <taskdef name="wsprovide" classname="org.jboss.wsf.spi.tools.ant.WSProvideTask">
- <classpath refid="ws.stack.classpath"/>
- <classpath refid="thirdparty.classpath"/>
- <classpath location="${core.dir}/thirdparty/concurrent.jar"/>
- <classpath location="${thirdparty.dir}/commons-logging.jar"/>
- <classpath location="${tests.output.dir}/classes"/>
- <classpath location="${tests.output.dir}/resources/jaxws/samples/wssecurityAnnotatedpolicy"/>
- </taskdef>
+ <!-- Define the JAX-WS wsconsume task -->
+ <taskdef name="wsconsume" classname="org.jboss.wsf.spi.tools.ant.WSConsumeTask">
+ <classpath refid="ws.stack.classpath"/>
+ <classpath location="${spi.dir}/output/lib/jbossws-spi.jar"/>
- <wsprovide resourcedestdir="${tests.output.dir}/wsprovide/resources/jaxws/samples/wssecurity" genwsdl="true" sei="org.jboss.test.ws.jaxws.samples.wssecurity.HelloJavaBean"/>
- <wsprovide resourcedestdir="${tests.output.dir}/wsprovide/resources/jaxws/samples/wssecurityAnnotatedpolicy" genwsdl="true" sei="org.jboss.test.ws.jaxws.samples.wssecurityAnnotatedpolicy.HelloJavaBean"/>
- </target>
-
- <target name="tests-compile-generated-resources" depends="servicegen,wstools,wsprovide">
- <macro-compile-classes srcdir="${tests.output.dir}/wstools/java" excludesfile="${excludesfile}"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Compiling -->
- <!-- ================================================================== -->
+ <classpath location="${core.dir}/thirdparty/jaxb-xjc.jar"/>
+ <classpath location="${core.dir}/thirdparty/jaxb-impl.jar"/>
+ <classpath location="${core.dir}/thirdparty/jaxws-rt.jar"/>
+ <classpath location="${core.dir}/thirdparty/jaxws-tools.jar"/>
+ <classpath location="${core.dir}/thirdparty/stax-api.jar"/>
+ <classpath location="${core.dir}/thirdparty/stax-ex.jar"/>
+ <classpath location="${core.dir}/thirdparty/streambuffer.jar"/>
+ <classpath location="${core.dir}/thirdparty/wstx.jar"/>
+ </taskdef>
- <target name="tests-compile" depends="wsconsume,tests-classpath" description="Compile sources">
- <macro-compile-classes srcdir="${tests.output.dir}/wsconsume/java" excludesfile="${excludesfile}"/>
- <macro-compile-classes srcdir="${testsuite.dir}/src/java" excludesfile="${excludesfile}"/>
- <macro-compile-classes srcdir="${core.dir}/src/test/java" excludesfile="${excludesfile}"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Building -->
- <!-- ================================================================== -->
-
- <!-- Copy resources -->
- <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources.">
- <macro-copy-resources srcdir="${testsuite.dir}/src"/>
- <macro-copy-resources srcdir="${tests.dir}"/>
- </target>
-
- <target name="tests-jars" depends="wsconsume,tests-compile,tests-copy-resources,tests-compile-generated-resources" description="Build the deployments.">
- <ant antfile="${core.dir}/ant-import-tests/build-jars-jaxrpc.xml" target="build-jars-jaxrpc"/>
- <ant antfile="${core.dir}/ant-import-tests/build-samples-jaxrpc.xml" target="build-samples-jaxrpc"/>
- <ant antfile="${core.dir}/ant-import-tests/build-jars-jaxws.xml" target="build-jars-jaxws"/>
- <ant antfile="${core.dir}/ant-import-tests/build-samples-jaxws.xml" target="build-samples-jaxws"/>
- <ant antfile="${testsuite.dir}/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/>
- </target>
+ <wsconsume wsdl="${tests.resources.dir}/benchmark/jaxws/doclit/WEB-INF/wsdl/BenchmarkWebService.wsdl" package="org.jboss.test.ws.benchmark.jaxws.doclit" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>
+ <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.basedoclitb" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>
+ <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.basedoclitw" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>
+ <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.baserpclit" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>
+ <wsconsume wsdl="${tests.resources.dir}/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl" package="org.jboss.test.ws.jaxws.complex" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>
+ <wsconsume wsdl="${tests.resources.dir}/jaxws/holder/META-INF/wsdl/HolderService.wsdl" package="org.jboss.test.ws.jaxws.holder" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>
+ <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecuritypolicy/WEB-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecuritypolicy" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>
+ <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecurityAnnotatedpolicy/META-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecurityAnnotatedpolicy" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>
+ <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecurity/META-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecurity" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>
+ </target>
- <target name="tests-main" depends="tests-jars" description="Build the deployments."/>
-
+ <!--
+ Generate BPEL sources
+ -->
+ <target name="servicegen" depends="tests-compile" description="Generate the BPEL resources.">
+ <!-- create jbpm process archives -->
+ <mkdir dir="${tests.output.dir}/libs"/>
+ <zip destfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip">
+ <fileset dir="${tests.resources.dir}/jaxrpc/samples/wsbpel/hello/bpel" />
+ </zip>
+ <!-- Copy the BPEL sar -->
+ <copy file="${core.dir}/thirdparty/jbpm-bpel.sar" todir="${tests.output.dir}/libs"/>
+
+ <!-- generate wsdl binding and service definitions for bpel processes -->
+ <taskdef name="servicegen" classname="org.jbpm.bpel.ant.ServiceGeneratorTask">
+ <classpath refid="jbpm.bpel.classpath"/>
+ </taskdef>
+ <servicegen processfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip"
+ outputdir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/wsdl"
+ bindingfile="hello-binding-.wsdl" servicefile="hello-service.wsdl" />
+ </target>
+
+ <!--
+ Generate JAX-RPC sources
+ -->
+ <target name="wstools" depends="tests-compile" description="Generate the JAX-RPC artifacts.">
+
+ <!-- Define the JAX-RPC tools task -->
+ <taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
+ <classpath refid="ws.stack.classpath"/>
+ <classpath refid="thirdparty.classpath"/>
+ <classpath location="${core.dir}/thirdparty/concurrent.jar"/>
+ <classpath location="${tests.output.dir}/classes"/>
+ <classpath location="${tests.output.dir}"/>
+ </taskdef>
+
+ <!-- Generate JAX-RPC artifacts -->
+ <mkdir dir="${tests.output.dir}/wstools/java"/>
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/docstyle/wrapped/wstools-config.xml"/>
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/bare/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/docstyle/bare/wstools-config.xml"/>
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/dynamichandler/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/dynamichandler/wstools-config.xml"/>
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/exception/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/exception/wstools-config.xml"/>
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/handler/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/handler/wstools-config.xml"/>
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/holder/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/holder/wstools-config.xml"/>
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jmstransport/META-INF" config="${tests.resources.dir}/jaxrpc/samples/jmstransport/wstools-config.xml"/>
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109ejb/doclit/wstools-config.xml"/>
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109ejb/rpclit/wstools-config.xml"/>
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109pojo/doclit/wstools-config.xml"/>
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109pojo/rpclit/wstools-config.xml"/>
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/message/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/message/wstools-config.xml"/>
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/oneway/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/oneway/wstools-config.xml"/>
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/rpcstyle/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/rpcstyle/wstools-config.xml"/>
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/secureejb/META-INF" config="${tests.resources.dir}/jaxrpc/samples/secureejb/wstools-config.xml"/>
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wsbpel/hello/wstools-config.xml"/>
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wssecurity/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wssecurity/wstools-config.xml"/>
+ <move todir="${tests.output.dir}/wstools/java">
+ <fileset dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" includes="org/**"/>
+ </move>
+
+ <!-- Copy generated resources -->
+ <copy todir="${tests.output.dir}/resources">
+ <fileset dir="${tests.output.dir}/wstools/resources">
+ <include name="**/*.wsdl"/>
+ <include name="**/*.xml"/>
+ </fileset>
+ </copy>
+ <!-- Copy resources that cannot (yet) be generated -->
+ <copy todir="${tests.output.dir}/resources/jaxrpc/samples" overwrite="true">
+ <fileset dir="${tests.resources.dir}/jaxrpc/samples-override"/>
+ <filterset>
+ <filter token="jboss.bind.address" value="${node0}"/>
+ </filterset>
+ </copy>
+ </target>
+
+ <!--
+ Generate JAX-WS sources
+ -->
+ <target name="wsprovide" depends="tests-compile" description="Provide the JAX-WS contracts.">
+
+ <!-- Define the JAX-WS wsprovide task -->
+ <taskdef name="wsprovide" classname="org.jboss.wsf.spi.tools.ant.WSProvideTask">
+ <classpath refid="ws.stack.classpath"/>
+ <classpath refid="thirdparty.classpath"/>
+ <classpath location="${core.dir}/thirdparty/concurrent.jar"/>
+ <classpath location="${thirdparty.dir}/commons-logging.jar"/>
+ <classpath location="${tests.output.dir}/classes"/>
+ <classpath location="${tests.output.dir}/resources/jaxws/samples/wssecurityAnnotatedpolicy"/>
+ </taskdef>
+
+ <wsprovide resourcedestdir="${tests.output.dir}/wsprovide/resources/jaxws/samples/wssecurity" genwsdl="true" sei="org.jboss.test.ws.jaxws.samples.wssecurity.HelloJavaBean"/>
+ <wsprovide resourcedestdir="${tests.output.dir}/wsprovide/resources/jaxws/samples/wssecurityAnnotatedpolicy" genwsdl="true" sei="org.jboss.test.ws.jaxws.samples.wssecurityAnnotatedpolicy.HelloJavaBean"/>
+ </target>
+
+ <target name="tests-compile-generated-resources" depends="servicegen,wstools,wsprovide">
+ <macro-compile-classes srcdir="${tests.output.dir}/wstools/java" excludesfile="${excludesfile}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Compiling -->
+ <!-- ================================================================== -->
+
+ <target name="tests-compile" depends="wsconsume,tests-classpath" description="Compile sources">
+ <macro-compile-classes srcdir="${tests.output.dir}/wsconsume/java" excludesfile="${excludesfile}"/>
+ <macro-compile-classes srcdir="${testsuite.dir}/src/java" excludesfile="${excludesfile}"/>
+ <macro-compile-classes srcdir="${core.dir}/src/test/java" excludesfile="${excludesfile}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Building -->
+ <!-- ================================================================== -->
+
+ <!-- Copy resources -->
+ <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources.">
+ <macro-copy-resources srcdir="${testsuite.dir}/src"/>
+ <macro-copy-resources srcdir="${tests.dir}"/>
+ </target>
+
+ <target name="tests-jars" depends="wsconsume,tests-compile,tests-copy-resources,tests-compile-generated-resources" description="Build the deployments.">
+ <ant antfile="${core.dir}/ant-import-tests/build-jars-jaxrpc.xml" target="build-jars-jaxrpc"/>
+ <ant antfile="${core.dir}/ant-import-tests/build-samples-jaxrpc.xml" target="build-samples-jaxrpc"/>
+ <ant antfile="${core.dir}/ant-import-tests/build-jars-jaxws.xml" target="build-jars-jaxws"/>
+ <ant antfile="${core.dir}/ant-import-tests/build-samples-jaxws.xml" target="build-samples-jaxws"/>
+ <ant antfile="${testsuite.dir}/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/>
+ </target>
+
+ <target name="tests-main" depends="tests-jars" description="Build the deployments."/>
+
</project>
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitb/BaseDataTypesDocLitBTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitb/BaseDataTypesDocLitBTestCase.java 2007-06-12 09:59:56 UTC (rev 3546)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitb/BaseDataTypesDocLitBTestCase.java 2007-06-12 10:58:54 UTC (rev 3547)
@@ -56,10 +56,10 @@
if (targetPort == null)
{
URL wsdlLocation = new File("resources/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/wsdl/service.wsdl").toURL();
- Service service = Service.create(wsdlLocation, new QName("", "BaseDataTypesDocLitBService") );
+ Service service = Service.create(wsdlLocation, new QName("http://tempuri.org/", "BaseDataTypesDocLitBService") );
targetPort = service.getPort(IBaseDataTypesDocLitB.class);
((BindingProvider)targetPort).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
- "http://jbossws.demo.jboss.com:8080/basedoclitb/endpoint");
+ "http://"+getServerHost()+":8080/basedoclitb/endpoint");
proxy = (BaseDataTypesSEI)BaseDataTypesProxy.newInstance(targetPort);
}
}
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitb/ServiceImpl.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitb/ServiceImpl.java 2007-06-12 09:59:56 UTC (rev 3546)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitb/ServiceImpl.java 2007-06-12 10:58:54 UTC (rev 3547)
@@ -37,9 +37,12 @@
* @since 29.01.2007
*/
@WebService(
- endpointInterface = "org.jboss.test.ws.interop.soapwsdl.basedoclitb.IBaseDataTypesDocLitB"
+ endpointInterface = "org.jboss.test.ws.interop.soapwsdl.basedoclitb.IBaseDataTypesDocLitB",
+ serviceName = "BaseDataTypesDocLitBService",
+ targetNamespace = "http://tempuri.org/"
)
-public class ServiceImpl implements IBaseDataTypesDocLitB {
+public class ServiceImpl implements IBaseDataTypesDocLitB
+{
@WebMethod(operationName = "RetBool", action = "http://tempuri.org/IBaseDataTypesDocLitB/RetBool")
@WebResult(name = "RetBoolResult", targetNamespace = "http://tempuri.org/", partName = "RetBoolResult")
public boolean retBool(@WebParam(name = "inBool", targetNamespace = "http://tempuri.org/", partName = "inBool") boolean inBool) {
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitw/BaseDataTypesDocLitWTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitw/BaseDataTypesDocLitWTestCase.java 2007-06-12 09:59:56 UTC (rev 3546)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitw/BaseDataTypesDocLitWTestCase.java 2007-06-12 10:58:54 UTC (rev 3547)
@@ -55,11 +55,11 @@
if (targetPort == null)
{
URL wsdlLocation = new File("resources/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/wsdl/service.wsdl").toURL();
- Service service = Service.create(wsdlLocation, new QName("", "BaseDataTypesDocLitWService") );
+ Service service = Service.create(wsdlLocation, new QName("http://tempuri.org/", "BaseDataTypesDocLitWService") );
BaseDataTypesDocLitWTestCase.targetPort = service.getPort(IBaseDataTypesDocLitW.class);
((BindingProvider)BaseDataTypesDocLitWTestCase.targetPort).getRequestContext().put(
BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
- "http://jbossws.demo.jboss.com:8080/basedoclitw/endpoint");
+ "http://"+getServerHost()+":8080/basedoclitw/endpoint");
BaseDataTypesDocLitWTestCase.proxy = (BaseDataTypesSEI) BaseDataTypesProxy.newInstance(BaseDataTypesDocLitWTestCase.targetPort);
}
}
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitw/ServiceImpl.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitw/ServiceImpl.java 2007-06-12 09:59:56 UTC (rev 3546)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitw/ServiceImpl.java 2007-06-12 10:58:54 UTC (rev 3547)
@@ -39,9 +39,12 @@
* @since 29.01.2007
*/
@WebService(
- endpointInterface = "org.jboss.test.ws.interop.soapwsdl.basedoclitw.IBaseDataTypesDocLitW"
+ endpointInterface = "org.jboss.test.ws.interop.soapwsdl.basedoclitw.IBaseDataTypesDocLitW",
+ serviceName = "BaseDataTypesDocLitWService",
+ targetNamespace = "http://tempuri.org/"
)
-public class ServiceImpl implements IBaseDataTypesDocLitW {
+public class ServiceImpl implements IBaseDataTypesDocLitW
+{
@WebMethod(operationName = "RetBool", action = "http://tempuri.org/IBaseDataTypesDocLitW/RetBool")
@WebResult(name = "RetBoolResult", targetNamespace = "http://tempuri.org/")
@RequestWrapper(localName = "RetBool", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.basedoclitw.RetBool")
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/baserpclit/BaseDataTypesRpcLitTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/baserpclit/BaseDataTypesRpcLitTestCase.java 2007-06-12 09:59:56 UTC (rev 3546)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/baserpclit/BaseDataTypesRpcLitTestCase.java 2007-06-12 10:58:54 UTC (rev 3547)
@@ -57,11 +57,11 @@
if (targetPort == null)
{
URL wsdlLocation = new File("resources/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF/wsdl/service.wsdl").toURL();
- Service service = Service.create(wsdlLocation, new QName("", "BaseDataTypesRpcLitService") );
+ Service service = Service.create(wsdlLocation, new QName("http://tempuri.org/", "BaseDataTypesRpcLitService") );
targetPort = service.getPort(IBaseDataTypesRpcLit.class);
((BindingProvider)targetPort).getRequestContext().put(
BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
- "http://jbossws.demo.jboss.com:8080/baserpclit/endpoint");
+ "http://"+getServerHost()+":8080/baserpclit/endpoint");
proxy = (BaseDataTypesSEI)BaseDataTypesProxy.newInstance(targetPort);
}
}
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/baserpclit/ServiceImpl.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/baserpclit/ServiceImpl.java 2007-06-12 09:59:56 UTC (rev 3546)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/baserpclit/ServiceImpl.java 2007-06-12 10:58:54 UTC (rev 3547)
@@ -37,139 +37,142 @@
* @since 29.01.2007
*/
@WebService(
- endpointInterface = "org.jboss.test.ws.interop.soapwsdl.baserpclit.IBaseDataTypesRpcLit"
+ endpointInterface = "org.jboss.test.ws.interop.soapwsdl.baserpclit.IBaseDataTypesRpcLit",
+ serviceName = "BaseDataTypesRpcLitService",
+ targetNamespace = "http://tempuri.org/"
)
-public class ServiceImpl implements IBaseDataTypesRpcLit {
+public class ServiceImpl implements IBaseDataTypesRpcLit
+{
- @WebMethod(operationName = "RetBool", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetBool")
- @WebResult(name = "RetBoolResult", partName = "RetBoolResult")
- public boolean retBool(@WebParam(name = "inBool", partName = "inBool") boolean inBool) {
- return inBool;
- }
+ @WebMethod(operationName = "RetBool", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetBool")
+ @WebResult(name = "RetBoolResult", partName = "RetBoolResult")
+ public boolean retBool(@WebParam(name = "inBool", partName = "inBool") boolean inBool) {
+ return inBool;
+ }
- @WebMethod(operationName = "RetByte", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetByte")
- @WebResult(name = "RetByteResult", partName = "RetByteResult")
- public short retByte(@WebParam(name = "inByte", partName = "inByte") short inByte) {
- return inByte;
- }
+ @WebMethod(operationName = "RetByte", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetByte")
+ @WebResult(name = "RetByteResult", partName = "RetByteResult")
+ public short retByte(@WebParam(name = "inByte", partName = "inByte") short inByte) {
+ return inByte;
+ }
- @WebMethod(operationName = "RetSByte", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetSByte")
- @WebResult(name = "RetSByteResult", partName = "RetSByteResult")
- public byte retSByte(@WebParam(name = "inSByte", partName = "inSByte") byte inSByte) {
- return inSByte;
- }
+ @WebMethod(operationName = "RetSByte", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetSByte")
+ @WebResult(name = "RetSByteResult", partName = "RetSByteResult")
+ public byte retSByte(@WebParam(name = "inSByte", partName = "inSByte") byte inSByte) {
+ return inSByte;
+ }
- @WebMethod(operationName = "RetByteArray", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetByteArray")
- @WebResult(name = "RetByteArrayResult", partName = "RetByteArrayResult")
- public byte[] retByteArray(@WebParam(name = "inByteArray", partName = "inByteArray") byte[] inByteArray) {
- return inByteArray;
- }
+ @WebMethod(operationName = "RetByteArray", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetByteArray")
+ @WebResult(name = "RetByteArrayResult", partName = "RetByteArrayResult")
+ public byte[] retByteArray(@WebParam(name = "inByteArray", partName = "inByteArray") byte[] inByteArray) {
+ return inByteArray;
+ }
- @WebMethod(operationName = "RetChar", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetChar")
- @WebResult(name = "RetCharResult", partName = "RetCharResult")
- public int retChar(@WebParam(name = "inChar", partName = "inChar") int inChar) {
- return inChar;
- }
+ @WebMethod(operationName = "RetChar", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetChar")
+ @WebResult(name = "RetCharResult", partName = "RetCharResult")
+ public int retChar(@WebParam(name = "inChar", partName = "inChar") int inChar) {
+ return inChar;
+ }
- @WebMethod(operationName = "RetDecimal", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetDecimal")
- @WebResult(name = "RetDecimalResult", partName = "RetDecimalResult")
- public BigDecimal retDecimal(@WebParam(name = "inDecimal", partName = "inDecimal") BigDecimal inDecimal) {
- return inDecimal;
- }
+ @WebMethod(operationName = "RetDecimal", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetDecimal")
+ @WebResult(name = "RetDecimalResult", partName = "RetDecimalResult")
+ public BigDecimal retDecimal(@WebParam(name = "inDecimal", partName = "inDecimal") BigDecimal inDecimal) {
+ return inDecimal;
+ }
- @WebMethod(operationName = "RetFloat", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetFloat")
- @WebResult(name = "RetFloatResult", partName = "RetFloatResult")
- public float retFloat(@WebParam(name = "inFloat", partName = "inFloat") float inFloat) {
- return inFloat;
- }
+ @WebMethod(operationName = "RetFloat", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetFloat")
+ @WebResult(name = "RetFloatResult", partName = "RetFloatResult")
+ public float retFloat(@WebParam(name = "inFloat", partName = "inFloat") float inFloat) {
+ return inFloat;
+ }
- @WebMethod(operationName = "RetDouble", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetDouble")
- @WebResult(name = "RetDoubleResult", partName = "RetDoubleResult")
- public double retDouble(@WebParam(name = "inDouble", partName = "inDouble") double inDouble) {
- return inDouble;
- }
+ @WebMethod(operationName = "RetDouble", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetDouble")
+ @WebResult(name = "RetDoubleResult", partName = "RetDoubleResult")
+ public double retDouble(@WebParam(name = "inDouble", partName = "inDouble") double inDouble) {
+ return inDouble;
+ }
- @WebMethod(operationName = "RetSingle", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetSingle")
- @WebResult(name = "RetSingleResult", partName = "RetSingleResult")
- public float retSingle(@WebParam(name = "inSingle", partName = "inSingle") float inSingle) {
- return inSingle;
- }
+ @WebMethod(operationName = "RetSingle", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetSingle")
+ @WebResult(name = "RetSingleResult", partName = "RetSingleResult")
+ public float retSingle(@WebParam(name = "inSingle", partName = "inSingle") float inSingle) {
+ return inSingle;
+ }
- @WebMethod(operationName = "RetInt", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetInt")
- @WebResult(name = "RetIntResult", partName = "RetIntResult")
- public int retInt(@WebParam(name = "inInt", partName = "inInt") int inInt) {
- return inInt;
- }
+ @WebMethod(operationName = "RetInt", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetInt")
+ @WebResult(name = "RetIntResult", partName = "RetIntResult")
+ public int retInt(@WebParam(name = "inInt", partName = "inInt") int inInt) {
+ return inInt;
+ }
- @WebMethod(operationName = "RetShort", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetShort")
- @WebResult(name = "RetShortResult", partName = "RetShortResult")
- public short retShort(@WebParam(name = "inShort", partName = "inShort") short inShort) {
- return inShort;
- }
+ @WebMethod(operationName = "RetShort", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetShort")
+ @WebResult(name = "RetShortResult", partName = "RetShortResult")
+ public short retShort(@WebParam(name = "inShort", partName = "inShort") short inShort) {
+ return inShort;
+ }
- @WebMethod(operationName = "RetLong", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetLong")
- @WebResult(name = "RetLongResult", partName = "RetLongResult")
- public long retLong(@WebParam(name = "inLong", partName = "inLong") long inLong) {
- return inLong;
- }
+ @WebMethod(operationName = "RetLong", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetLong")
+ @WebResult(name = "RetLongResult", partName = "RetLongResult")
+ public long retLong(@WebParam(name = "inLong", partName = "inLong") long inLong) {
+ return inLong;
+ }
- @WebMethod(operationName = "RetObject", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetObject")
- @WebResult(name = "RetObjectResult", partName = "RetObjectResult")
- public Object retObject(@WebParam(name = "inObject", partName = "inObject") Object inObject) {
- return inObject;
- }
+ @WebMethod(operationName = "RetObject", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetObject")
+ @WebResult(name = "RetObjectResult", partName = "RetObjectResult")
+ public Object retObject(@WebParam(name = "inObject", partName = "inObject") Object inObject) {
+ return inObject;
+ }
- @WebMethod(operationName = "RetUInt", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetUInt")
- @WebResult(name = "RetUIntResult", partName = "RetUIntResult")
- public long retUInt(@WebParam(name = "inUInt", partName = "inUInt") long inUInt) {
- return inUInt;
- }
+ @WebMethod(operationName = "RetUInt", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetUInt")
+ @WebResult(name = "RetUIntResult", partName = "RetUIntResult")
+ public long retUInt(@WebParam(name = "inUInt", partName = "inUInt") long inUInt) {
+ return inUInt;
+ }
- @WebMethod(operationName = "RetUShort", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetUShort")
- @WebResult(name = "RetUShortResult", partName = "RetUShortResult")
- public int retUShort(@WebParam(name = "inUShort", partName = "inUShort") int inUShort) {
- return inUShort;
- }
+ @WebMethod(operationName = "RetUShort", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetUShort")
+ @WebResult(name = "RetUShortResult", partName = "RetUShortResult")
+ public int retUShort(@WebParam(name = "inUShort", partName = "inUShort") int inUShort) {
+ return inUShort;
+ }
- @WebMethod(operationName = "RetULong", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetULong")
- @WebResult(name = "RetULongResult", partName = "RetULongResult")
- public BigInteger retULong(@WebParam(name = "inULong", partName = "inULong") BigInteger inULong) {
- return inULong;
- }
+ @WebMethod(operationName = "RetULong", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetULong")
+ @WebResult(name = "RetULongResult", partName = "RetULongResult")
+ public BigInteger retULong(@WebParam(name = "inULong", partName = "inULong") BigInteger inULong) {
+ return inULong;
+ }
- @WebMethod(operationName = "RetString", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetString")
- @WebResult(name = "RetStringResult", partName = "RetStringResult")
- public String retString(@WebParam(name = "inString", partName = "inString") String inString) {
- return inString;
- }
+ @WebMethod(operationName = "RetString", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetString")
+ @WebResult(name = "RetStringResult", partName = "RetStringResult")
+ public String retString(@WebParam(name = "inString", partName = "inString") String inString) {
+ return inString;
+ }
- @WebMethod(operationName = "RetGuid", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetGuid")
- @WebResult(name = "RetGuidResult", partName = "RetGuidResult")
- public String retGuid(@WebParam(name = "inGuid", partName = "inGuid") String inGuid) {
- return inGuid;
- }
+ @WebMethod(operationName = "RetGuid", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetGuid")
+ @WebResult(name = "RetGuidResult", partName = "RetGuidResult")
+ public String retGuid(@WebParam(name = "inGuid", partName = "inGuid") String inGuid) {
+ return inGuid;
+ }
- @WebMethod(operationName = "RetUri", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetUri")
- @WebResult(name = "RetUriResult", partName = "RetUriResult")
- public String retUri(@WebParam(name = "inUri", partName = "inUri") String inUri) {
- return inUri;
- }
+ @WebMethod(operationName = "RetUri", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetUri")
+ @WebResult(name = "RetUriResult", partName = "RetUriResult")
+ public String retUri(@WebParam(name = "inUri", partName = "inUri") String inUri) {
+ return inUri;
+ }
- @WebMethod(operationName = "RetDateTime", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetDateTime")
- @WebResult(name = "RetDateTimeResult", partName = "RetDateTimeResult")
- public XMLGregorianCalendar retDateTime(@WebParam(name = "inDateTime", partName = "inDateTime") XMLGregorianCalendar inDateTime) {
- return inDateTime;
- }
+ @WebMethod(operationName = "RetDateTime", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetDateTime")
+ @WebResult(name = "RetDateTimeResult", partName = "RetDateTimeResult")
+ public XMLGregorianCalendar retDateTime(@WebParam(name = "inDateTime", partName = "inDateTime") XMLGregorianCalendar inDateTime) {
+ return inDateTime;
+ }
- @WebMethod(operationName = "RetTimeSpan", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetTimeSpan")
- @WebResult(name = "RetTimeSpanResult", partName = "RetTimeSpanResult")
- public Duration retTimeSpan(@WebParam(name = "inTimeSpan", partName = "inTimeSpan") Duration inTimeSpan) {
- return inTimeSpan;
- }
+ @WebMethod(operationName = "RetTimeSpan", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetTimeSpan")
+ @WebResult(name = "RetTimeSpanResult", partName = "RetTimeSpanResult")
+ public Duration retTimeSpan(@WebParam(name = "inTimeSpan", partName = "inTimeSpan") Duration inTimeSpan) {
+ return inTimeSpan;
+ }
- @WebMethod(operationName = "RetQName", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetQName")
- @WebResult(name = "RetQNameResult", partName = "RetQNameResult")
- public QName retQName(@WebParam(name = "inQName", partName = "inQName") QName inQName) {
- return inQName;
- }
+ @WebMethod(operationName = "RetQName", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetQName")
+ @WebResult(name = "RetQNameResult", partName = "RetQNameResult")
+ public QName retQName(@WebParam(name = "inQName", partName = "inQName") QName inQName) {
+ return inQName;
+ }
}
Modified: trunk/jbossws-core/src/test/resources/test-excludes-jboss50.txt
===================================================================
--- trunk/jbossws-core/src/test/resources/test-excludes-jboss50.txt 2007-06-12 09:59:56 UTC (rev 3546)
+++ trunk/jbossws-core/src/test/resources/test-excludes-jboss50.txt 2007-06-12 10:58:54 UTC (rev 3547)
@@ -1,5 +1,5 @@
# Always exclude
-org/jboss/test/ws/interop/**
+#org/jboss/test/ws/interop/**
org/jboss/test/ws/benchmark/**
# Fix before JBoss50 goes final
18 years, 10 months
- 1
- 0
JBossWS SVN: r3546 - in trunk/integration: spi/src/main/java/org/jboss/ws/integration and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-06-12 05:59:56 -0400 (Tue, 12 Jun 2007)
New Revision: 3546
Added:
trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandlerFactory.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/ServiceLoader.java
Modified:
trunk/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml
trunk/integration/xfire/version.properties
Log:
Fix ServiceRefHandler loading
Modified: trunk/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml
===================================================================
--- trunk/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml 2007-06-12 08:39:59 UTC (rev 3545)
+++ trunk/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml 2007-06-12 09:59:56 UTC (rev 3546)
@@ -34,8 +34,7 @@
</bean>
<!-- Bind Service objects in client environment context -->
- <!-- The bean name is compiled into the server. Changeit with the next release. -->
- <bean name="ServiceRefHandler" class="org.jboss.ws.core.client.ServiceRefHandlerImpl"/>
+ <bean name="WSServiceRefHandler" class="org.jboss.ws.core.client.ServiceRefHandlerImpl"/>
<!-- Locate the single instance of the kernel -->
<bean name="WSKernelLocator" class="org.jboss.ws.integration.KernelLocator">
Added: trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandlerFactory.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandlerFactory.java (rev 0)
+++ trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandlerFactory.java 2007-06-12 09:59:56 UTC (rev 3546)
@@ -0,0 +1,76 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ws.integration;
+
+import org.jboss.kernel.Kernel;
+import org.jboss.kernel.spi.registry.KernelRegistry;
+import org.jboss.kernel.spi.registry.KernelRegistryEntry;
+import org.jboss.wsf.spi.utils.ServiceLoader;
+
+// $Id$
+
+/**
+ * A factory for the ServiceRefHandler
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 05-May-2004
+ */
+public abstract class ServiceRefHandlerFactory
+{
+ public static ServiceRefHandler getServiceRefHandler()
+ {
+ ServiceRefHandler handler;
+ if (KernelLocator.getKernel() != null)
+ {
+ handler = getServerSideServiceRefHandler();
+ }
+ else
+ {
+ handler = getClientSideServiceRefHandler();
+ }
+ return handler;
+ }
+
+ private static ServiceRefHandler getServerSideServiceRefHandler()
+ {
+ Kernel kernel = KernelLocator.getKernel();
+ KernelRegistry registry = kernel.getRegistry();
+ KernelRegistryEntry entry = registry.getEntry("WSServiceRefHandler");
+ ServiceRefHandler handler = (ServiceRefHandler)entry.getTarget();
+
+ // Try legancy JBossAS-4.2 name
+ if (handler == null)
+ {
+ entry = registry.getEntry("ServiceRefHandler");
+ handler = (ServiceRefHandler)entry.getTarget();
+ }
+ return handler;
+ }
+
+ private static ServiceRefHandler getClientSideServiceRefHandler()
+ {
+ String propName = ServiceRefHandler.class.getName();
+ String defaultImpl = "org.jboss.ws.core.client.ServiceRefHandlerImpl";
+ ServiceRefHandler handler = (ServiceRefHandler)ServiceLoader.loadService(propName, defaultImpl);
+ return handler;
+ }
+}
Property changes on: trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandlerFactory.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/ServiceLoader.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/ServiceLoader.java (rev 0)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/ServiceLoader.java 2007-06-12 09:59:56 UTC (rev 3546)
@@ -0,0 +1,251 @@
+/*
+ * 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.wsf.spi.utils;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.Properties;
+
+// $Id$
+
+/**
+ * Load a service class using this ordered lookup procedure
+ *
+ * @author Thomas.Diesler(a)jboss.com
+ * @since 14-Dec-2006
+ */
+public abstract class ServiceLoader
+{
+ /**
+ * This method uses the algirithm below using the JAXWS Provider as an example.
+ *
+ * 1. If a resource with the name of META-INF/services/javax.xml.ws.spi.Provider exists, then
+ * its first line, if present, is used as the UTF-8 encoded name of the implementation class.
+ *
+ * 2. If the ${java.home}/lib/jaxws.properties file exists and it is readable by the
+ * java.util.Properties.load(InputStream) method and it contains an entry whose key is
+ * javax.xml.ws.spi.Provider, then the value of that entry is used as the name of the implementation class.
+ *
+ * 3. If a system property with the name javax.xml.ws.spi.Provider is defined, then its value is used
+ * as the name of the implementation class.
+ *
+ * 4. Finally, a default implementation class name is used.
+ */
+ public static Object loadService(String propertyName, String defaultFactory)
+ {
+ Object factory = loadFromServices(propertyName, null);
+ if (factory == null)
+ {
+ factory = loadFromPropertiesFile(propertyName, null);
+ }
+ if (factory == null)
+ {
+ factory = loadFromSystemProperty(propertyName, defaultFactory);
+ }
+ return factory;
+ }
+
+ /** Use the Services API (as detailed in the JAR specification), if available, to determine the classname.
+ */
+ public static Object loadFromServices(String propertyName, String defaultFactory)
+ {
+ Object factory = null;
+ String factoryName = null;
+ ClassLoader loader = Thread.currentThread().getContextClassLoader();
+
+ // Use the Services API (as detailed in the JAR specification), if available, to determine the classname.
+ String filename = "META-INF/services/" + propertyName;
+ InputStream inStream = loader.getResourceAsStream(filename);
+ if (inStream != null)
+ {
+ try
+ {
+ BufferedReader br = new BufferedReader(new InputStreamReader(inStream, "UTF-8"));
+ factoryName = br.readLine();
+ br.close();
+ if (factoryName != null)
+ {
+ Class factoryClass = loader.loadClass(factoryName);
+ factory = factoryClass.newInstance();
+ }
+ }
+ catch (Throwable t)
+ {
+ throw new IllegalStateException("Failed to load " + propertyName + ": " + factoryName, t);
+ }
+ }
+
+ // Use the default factory implementation class.
+ if (factory == null && defaultFactory != null)
+ {
+ factory = loadDefault(defaultFactory);
+ }
+
+ return factory;
+ }
+
+ /** Use the system property
+ */
+ public static Object loadFromSystemProperty(String propertyName, String defaultFactory)
+ {
+ Object factory = null;
+ ClassLoader loader = Thread.currentThread().getContextClassLoader();
+
+ PrivilegedAction action = new PropertyAccessAction(propertyName);
+ String factoryName = (String)AccessController.doPrivileged(action);
+ if (factoryName != null)
+ {
+ try
+ {
+ //if(log.isDebugEnabled()) log.debug("Load from system property: " + factoryName);
+ Class factoryClass = loader.loadClass(factoryName);
+ factory = factoryClass.newInstance();
+ }
+ catch (Throwable t)
+ {
+ throw new IllegalStateException("Failed to load " + propertyName + ": " + factoryName, t);
+ }
+ }
+
+ // Use the default factory implementation class.
+ if (factory == null && defaultFactory != null)
+ {
+ factory = loadDefault(defaultFactory);
+ }
+
+ return factory;
+ }
+
+ /**
+ * Use the properties file "${java.home}/lib/jaxws.properties" in the JRE directory.
+ * This configuration file is in standard java.util.Properties format and contains the
+ * fully qualified name of the implementation class with the key being the system property defined above.
+ */
+ public static Object loadFromPropertiesFile(String propertyName, String defaultFactory)
+ {
+ Object factory = null;
+ String factoryName = null;
+ ClassLoader loader = Thread.currentThread().getContextClassLoader();
+
+ // Use the properties file "lib/jaxm.properties" in the JRE directory.
+ // This configuration file is in standard java.util.Properties format and contains the fully qualified name of the implementation class with the key being the system property defined above.
+ PrivilegedAction action = new PropertyAccessAction("java.home");
+ String javaHome = (String)AccessController.doPrivileged(action);
+ File jaxmFile = new File(javaHome + "/lib/jaxws.properties");
+ if (jaxmFile.exists())
+ {
+ try
+ {
+ action = new PropertyFileAccessAction(jaxmFile.getCanonicalPath());
+ Properties jaxmProperties = (Properties)AccessController.doPrivileged(action);
+ factoryName = jaxmProperties.getProperty(propertyName);
+ if (factoryName != null)
+ {
+ //if(log.isDebugEnabled()) log.debug("Load from " + jaxmFile + ": " + factoryName);
+ Class factoryClass = loader.loadClass(factoryName);
+ factory = factoryClass.newInstance();
+ }
+ }
+ catch (Throwable t)
+ {
+ throw new IllegalStateException("Failed to load " + propertyName + ": " + factoryName, t);
+ }
+ }
+
+ // Use the default factory implementation class.
+ if (factory == null && defaultFactory != null)
+ {
+ factory = loadDefault(defaultFactory);
+ }
+
+ return factory;
+ }
+
+ private static Object loadDefault(String defaultFactory)
+ {
+ Object factory = null;
+ ClassLoader loader = Thread.currentThread().getContextClassLoader();
+
+ // Use the default factory implementation class.
+ if (defaultFactory != null)
+ {
+ try
+ {
+ //if(log.isDebugEnabled()) log.debug("Load from default: " + factoryName);
+ Class factoryClass = loader.loadClass(defaultFactory);
+ factory = factoryClass.newInstance();
+ }
+ catch (Throwable t)
+ {
+ throw new IllegalStateException("Failed to load: " + defaultFactory, t);
+ }
+ }
+
+ return factory;
+ }
+
+ private static class PropertyAccessAction implements PrivilegedAction
+ {
+ private String name;
+
+ PropertyAccessAction(String name)
+ {
+ this.name = name;
+ }
+
+ public Object run()
+ {
+ return System.getProperty(name);
+ }
+ }
+
+ private static class PropertyFileAccessAction implements PrivilegedAction
+ {
+ private String filename;
+
+ PropertyFileAccessAction(String filename)
+ {
+ this.filename = filename;
+ }
+
+ public Object run()
+ {
+ try
+ {
+ InputStream inStream = new FileInputStream(filename);
+ Properties props = new Properties();
+ props.load(inStream);
+ return props;
+ }
+ catch (IOException ex)
+ {
+ throw new SecurityException("Cannot load properties: " + filename, ex);
+ }
+ }
+ }
+}
Property changes on: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/ServiceLoader.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/integration/xfire/version.properties
===================================================================
--- trunk/integration/xfire/version.properties 2007-06-12 08:39:59 UTC (rev 3545)
+++ trunk/integration/xfire/version.properties 2007-06-12 09:59:56 UTC (rev 3546)
@@ -1,7 +1,7 @@
# $Id: version.properties 2928 2007-04-26 10:53:56Z thomas.diesler(a)jboss.com $
-sunri.implementation.title=JBoss Web Services - JBossWS/SunRI
+sunri.implementation.title=JBoss Web Services - JBossWS/XFire
# Thirdparty library versions
ibm-wsdl4j=1.6.2
18 years, 10 months
- 1
- 0
JBossWS SVN: r3545 - branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-06-12 04:39:59 -0400 (Tue, 12 Jun 2007)
New Revision: 3545
Modified:
branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/AddressingPropertiesImpl.java
Log:
Avoid double initilization
Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/AddressingPropertiesImpl.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/AddressingPropertiesImpl.java 2007-06-12 08:39:29 UTC (rev 3544)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/AddressingPropertiesImpl.java 2007-06-12 08:39:59 UTC (rev 3545)
@@ -80,6 +80,8 @@
private Map<QName, AddressingType> addrTypes = new HashMap<QName, AddressingType>();
+ private boolean initialized = false;
+
public AttributedURI getTo()
{
return to;
@@ -166,6 +168,8 @@
*/
public void initializeAsDestination(EndpointReference epr)
{
+ if(initialized) return;
+
if (epr == null)
throw new IllegalArgumentException("Invalid null endpoint reference");
@@ -178,6 +182,8 @@
soapElement.setAttributeNS(getNamespaceURI(), "wsa:IsReferenceParameter", "true");
addElement(soapElement);
}
+
+ this.initialized = true;
}
/**
@@ -193,6 +199,8 @@
*/
public void initializeAsReply(AddressingProperties props, boolean isFault)
{
+ if(initialized) return;
+
EndpointReference epr = (isFault ? props.getFaultTo() : null);
if (epr == null)
{
@@ -216,6 +224,8 @@
Relationship rel = builder.newRelationship(props.getMessageID().getURI());
this.relatesTo = new Relationship[] { rel };
}
+
+ this.initialized = true;
}
// Map interface ****************************************************************
18 years, 10 months
- 1
- 0
JBossWS SVN: r3544 - in branches/jbossws-2.0/jbossws-core/src: test/java/org/jboss/test/ws/jaxws and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-06-12 04:39:29 -0400 (Tue, 12 Jun 2007)
New Revision: 3544
Added:
branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/addressing/
branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/addressing/AddressingTestCase.java
Modified:
branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/soap/SOAPAddressingPropertiesImpl.java
Log:
Assert on required wsa headers
Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/soap/SOAPAddressingPropertiesImpl.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/soap/SOAPAddressingPropertiesImpl.java 2007-06-12 08:32:04 UTC (rev 3543)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/soap/SOAPAddressingPropertiesImpl.java 2007-06-12 08:39:29 UTC (rev 3544)
@@ -23,28 +23,6 @@
//$Id$
-import java.lang.reflect.Array;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-import javax.xml.soap.SOAPElement;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPFactory;
-import javax.xml.soap.SOAPHeader;
-import javax.xml.soap.SOAPHeaderElement;
-import javax.xml.soap.SOAPMessage;
-import javax.xml.ws.addressing.AddressingConstants;
-import javax.xml.ws.addressing.AddressingException;
-import javax.xml.ws.addressing.ReferenceParameters;
-import javax.xml.ws.addressing.Relationship;
-import javax.xml.ws.addressing.soap.SOAPAddressingBuilder;
-import javax.xml.ws.addressing.soap.SOAPAddressingProperties;
-
import org.jboss.util.NotImplementedException;
import org.jboss.ws.core.soap.NameImpl;
import org.jboss.ws.core.soap.SOAPFactoryImpl;
@@ -57,6 +35,22 @@
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
+import javax.xml.namespace.QName;
+import javax.xml.soap.*;
+import javax.xml.ws.addressing.AddressingConstants;
+import javax.xml.ws.addressing.AddressingException;
+import javax.xml.ws.addressing.ReferenceParameters;
+import javax.xml.ws.addressing.Relationship;
+import javax.xml.ws.addressing.soap.SOAPAddressingBuilder;
+import javax.xml.ws.addressing.soap.SOAPAddressingProperties;
+import java.lang.reflect.Array;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
/**
* Subimplementation of <code>AddressingProperties</code> includes methods that
* read and write the Message Addressing Properties to a <code>SOAPMessage</code>.
@@ -71,6 +65,28 @@
private NamespaceRegistry nsRegistry = new NamespaceRegistry();
+ private String getRequiredHeaderContent(SOAPHeader soapHeader, QName qname)
+ {
+ Element element = DOMUtils.getFirstChildElement(soapHeader, qname);
+ if(null == element) throw new AddressingException("Required element "+qname+" is missing");
+
+ String value = DOMUtils.getTextContent(element);
+ if(null == value || value.equals("")) throw new AddressingException("Required element "+qname+" is missing");
+
+ return value;
+ }
+
+ private String getOptionalHeaderContent(SOAPHeader soapHeader, QName qname)
+ {
+ Element element = DOMUtils.getFirstChildElement(soapHeader, qname);
+ if (element != null)
+ {
+ return DOMUtils.getTextContent(element);
+ }
+
+ return null;
+ }
+
public void readHeaders(SOAPMessage message) throws AddressingException
{
try
@@ -79,100 +95,96 @@
SOAPAddressingBuilder builder = new SOAPAddressingBuilderImpl();
AddressingConstants ADDR = builder.newAddressingConstants();
+ registerNamespaces(ADDR, soapHeader);
+
+ // required elements
+ String action = getRequiredHeaderContent(soapHeader, ADDR.getActionQName());
+ String to = getRequiredHeaderContent(soapHeader, ADDR.getToQName());
- Element wsaAction = DOMUtils.getFirstChildElement(soapHeader, ADDR.getActionQName());
- if (wsaAction != null)
- {
- // Register wsa namespace
- nsRegistry.registerURI(ADDR.getNamespaceURI(), ADDR.getNamespacePrefix());
+ // wsa:Action
+ // This REQUIRED element of type xs:anyURI conveys the [action] property.
+ // The [children] of this element convey the value of this property.
+ setAction(builder.newURI(action));
- // Register namespaces
- NamedNodeMap attribs = soapHeader.getAttributes();
- for (int i = 0; i < attribs.getLength(); i++)
- {
- Attr attr = (Attr)attribs.item(i);
- String attrName = attr.getName();
- String attrValue = attr.getValue();
- if (attrName.startsWith("xmlns:"))
- {
- String prefix = attrName.substring(6);
- nsRegistry.registerURI(attrValue, prefix);
- }
- }
+ // wsa:To
+ // This REQUIRED element (of type xs:anyURI) provides the value for the [destination] property.
+ setTo(builder.newURI(to));
- // Read wsa:To
- Element wsaTo = DOMUtils.getFirstChildElement(soapHeader, ADDR.getToQName());
- if (wsaTo != null)
- {
- String to = DOMUtils.getTextContent(wsaTo);
- setTo(builder.newURI(to));
- }
+ // Read wsa:From
+ // This OPTIONAL element (of type wsa:EndpointReferenceType) provides the value for the [source endpoint] property.
+ Element wsaFrom = DOMUtils.getFirstChildElement(soapHeader, ADDR.getFromQName());
+ if (wsaFrom != null)
+ {
+ EndpointReferenceImpl ref = new EndpointReferenceImpl(wsaFrom);
+ setReplyTo(ref);
+ }
- // Read wsa:From
- Element wsaFrom = DOMUtils.getFirstChildElement(soapHeader, ADDR.getFromQName());
- if (wsaFrom != null)
- {
- EndpointReferenceImpl ref = new EndpointReferenceImpl(wsaFrom);
- setReplyTo(ref);
- }
+ // Read wsa:ReplyTo
+ // This OPTIONAL element (of type wsa:EndpointReferenceType) provides the value for the [reply endpoint] property.
+ // This element MUST be present if a reply is expected. If this element is present, wsa:MessageID MUST be present.
+ Element wsaReplyTo = DOMUtils.getFirstChildElement(soapHeader, ADDR.getReplyToQName());
+ if (wsaReplyTo != null)
+ {
+ EndpointReferenceImpl ref = new EndpointReferenceImpl(wsaReplyTo);
+ setReplyTo(ref);
+ }
+
+ // Read wsa:FaultTo
+ // This OPTIONAL element (of type wsa:EndpointReferenceType) provides the value for the [fault endpoint] property.
+ // If this element is present, wsa:MessageID MUST be present.
+ Element wsaFaultTo = DOMUtils.getFirstChildElement(soapHeader, ADDR.getFaultToQName());
+ if (wsaFaultTo != null)
+ {
+ EndpointReferenceImpl ref = new EndpointReferenceImpl(wsaFaultTo);
+ setFaultTo(ref);
+ }
- // Read wsa:ReplyTo
- Element wsaReplyTo = DOMUtils.getFirstChildElement(soapHeader, ADDR.getReplyToQName());
- if (wsaReplyTo != null)
- {
- EndpointReferenceImpl ref = new EndpointReferenceImpl(wsaReplyTo);
- setReplyTo(ref);
- }
+ // Read wsa:MessageID
+ // This OPTIONAL element conveys the [message id] property.
+ // This element MUST be present if wsa:ReplyTo or wsa:FaultTo is present.
+ if(wsaReplyTo!=null || wsaFaultTo!=null)
+ {
+ String msgIdValue = getRequiredHeaderContent(soapHeader, ADDR.getMessageIDQName());
+ setMessageID(builder.newURI(msgIdValue));
+ }
+ else
+ {
+ String messageID = getOptionalHeaderContent(soapHeader, ADDR.getMessageIDQName());
+ if(messageID!=null) setMessageID(builder.newURI(messageID));
+ }
+
+ // Read wsa:RelatesTo
+ // This OPTIONAL (repeating) element information item contributes one abstract [relationship] property value,
+ // in the form of a (URI, QName) pair.
+ // The [children] property of this element (which is of type xs:anyURI) conveys the [message id]
+ // of the related message. This element MUST be present if the message is a reply.
+ Iterator itRelatesTo = DOMUtils.getChildElements(soapHeader, ADDR.getRelatesToQName());
+ List<Relationship> relList = new ArrayList<Relationship>();
+ while (itRelatesTo.hasNext())
+ {
+ Element wsaRelatesTo = (Element)itRelatesTo.next();
+ QName type = DOMUtils.getAttributeValueAsQName(wsaRelatesTo, ADDR.getRelationshipTypeName());
+ String uri = DOMUtils.getTextContent(wsaRelatesTo);
+ Relationship rel = builder.newRelationship(new URI(uri));
+ rel.setType(type);
+ relList.add(rel);
+ }
+ Relationship[] relArr = (Relationship[])Array.newInstance(Relationship.class, relList.size());
+ relList.toArray(relArr);
+ setRelatesTo(relArr);
- // Read wsa:FaultTo
- Element wsaFaultTo = DOMUtils.getFirstChildElement(soapHeader, ADDR.getFaultToQName());
- if (wsaFaultTo != null)
- {
- EndpointReferenceImpl ref = new EndpointReferenceImpl(wsaFaultTo);
- setFaultTo(ref);
- }
-
- // Read wsa:Action
- String action = DOMUtils.getTextContent(wsaAction);
- setAction(builder.newURI(action));
-
- // Read wsa:MessageID
- Element wsaMessageId = DOMUtils.getFirstChildElement(soapHeader, ADDR.getMessageIDQName());
- if (wsaMessageId != null)
- {
- String messageID = DOMUtils.getTextContent(wsaMessageId);
- setMessageID(builder.newURI(messageID));
- }
-
- // Read wsa:RelatesTo
- Iterator itRelatesTo = DOMUtils.getChildElements(soapHeader, ADDR.getRelatesToQName());
- List<Relationship> relList = new ArrayList<Relationship>();
- while (itRelatesTo.hasNext())
- {
- Element wsaRelatesTo = (Element)itRelatesTo.next();
- QName type = DOMUtils.getAttributeValueAsQName(wsaRelatesTo, ADDR.getRelationshipTypeName());
- String uri = DOMUtils.getTextContent(wsaRelatesTo);
- Relationship rel = builder.newRelationship(new URI(uri));
- rel.setType(type);
- relList.add(rel);
- }
- Relationship[] relArr = (Relationship[])Array.newInstance(Relationship.class, relList.size());
- relList.toArray(relArr);
- setRelatesTo(relArr);
- }
-
- // Read wsa:ReferenceParameters
- QName refQName = new QName(getNamespaceURI(), "IsReferenceParameter");
- ReferenceParameters refParams = getReferenceParameters();
- Iterator it = soapHeader.examineAllHeaderElements();
- while (it.hasNext())
- {
- SOAPHeaderElement headerElement = (SOAPHeaderElement)it.next();
- if ("true".equals(DOMUtils.getAttributeValue(headerElement, refQName)))
- {
- refParams.addElement(headerElement);
- }
- }
+ // Read wsa:ReferenceParameters
+ QName refQName = new QName(getNamespaceURI(), "IsReferenceParameter");
+ ReferenceParameters refParams = getReferenceParameters();
+ Iterator it = soapHeader.examineAllHeaderElements();
+ while (it.hasNext())
+ {
+ SOAPHeaderElement headerElement = (SOAPHeaderElement)it.next();
+ if ("true".equals(DOMUtils.getAttributeValue(headerElement, refQName)))
+ {
+ refParams.addElement(headerElement);
+ }
+ }
}
catch (SOAPException ex)
{
@@ -184,6 +196,26 @@
}
}
+ private void registerNamespaces(AddressingConstants ADDR, SOAPHeader soapHeader)
+ {
+ // Register wsa namespace
+ nsRegistry.registerURI(ADDR.getNamespaceURI(), ADDR.getNamespacePrefix());
+
+ // Register namespaces
+ NamedNodeMap attribs = soapHeader.getAttributes();
+ for (int i = 0; i < attribs.getLength(); i++)
+ {
+ Attr attr = (Attr)attribs.item(i);
+ String attrName = attr.getName();
+ String attrValue = attr.getValue();
+ if (attrName.startsWith("xmlns:"))
+ {
+ String prefix = attrName.substring(6);
+ nsRegistry.registerURI(attrValue, prefix);
+ }
+ }
+ }
+
public void writeHeaders(SOAPMessage message) throws AddressingException
{
try
Added: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/addressing/AddressingTestCase.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/addressing/AddressingTestCase.java (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/addressing/AddressingTestCase.java 2007-06-12 08:39:29 UTC (rev 3544)
@@ -0,0 +1,75 @@
+/*
+ * 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.jaxws.addressing;
+
+import junit.framework.TestCase;
+
+import javax.xml.soap.MessageFactory;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.ws.addressing.AddressingException;
+import java.io.ByteArrayInputStream;
+
+import org.jboss.ws.extensions.addressing.soap.SOAPAddressingPropertiesImpl;
+
+/**
+ * Verify the ws-addressing parsing logic
+ *
+ * @author Heiko.Braun(a)jboss.com
+ * @version $Revision$
+ */
+public class AddressingTestCase extends TestCase
+{
+
+ private String ERRORNOUS_XML = "<soap:Envelope xmlns:soap='http://schemas.xmlsoap.org/soap/envelope/'>\n" +
+ " <soap:Header xmlns:wsa='http://www.w3.org/2005/08/addressing'>" +
+ "<wsa:Action></wsa:Action>\n" +
+ "<wsa:MessageID>urn:uuid:1fa5a31f-bbe7-4ad5-8b92-d765f4a32dc9</wsa:MessageID>\n" +
+ "<wsa:ReplyTo>\n" +
+ "<wsa:Address>http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous</wsa:Address>\n" +
+ "<wsa:ReferenceParameters>\n" +
+ "<ns1:clientid xmlns:ns1=\"http://somens\">clientid-1</ns1:clientid>\n" +
+ "</wsa:ReferenceParameters>\n" +
+ "</wsa:ReplyTo>\n" +
+ "<wsa:To>http://mycomp:8080/testws</wsa:To>\n" +
+ "</soap:Header>" +
+ " <soap:Body/>\n" +
+ "</soap:Envelope>";
+
+
+ public void testReplyToWithoutAction() throws Exception
+ {
+ MessageFactory mf = MessageFactory.newInstance();
+ SOAPMessage message = mf.createMessage(null, new ByteArrayInputStream(ERRORNOUS_XML.getBytes()));
+
+ SOAPAddressingPropertiesImpl props = new SOAPAddressingPropertiesImpl();
+ try
+ {
+ props.readHeaders(message);
+ fail("ERRORNOUS_XML should cause a parsing exception due to missing wsa:Action value");
+ }
+ catch (AddressingException e)
+ {
+ // expected an exception
+ }
+
+ }
+}
Property changes on: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/addressing/AddressingTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
18 years, 10 months
- 1
- 0
JBossWS SVN: r3543 - trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/soap.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-06-12 04:32:04 -0400 (Tue, 12 Jun 2007)
New Revision: 3543
Modified:
trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/soap/SOAPAddressingPropertiesImpl.java
Log:
Rely on AddressingException's
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/soap/SOAPAddressingPropertiesImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/soap/SOAPAddressingPropertiesImpl.java 2007-06-12 08:25:32 UTC (rev 3542)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/soap/SOAPAddressingPropertiesImpl.java 2007-06-12 08:32:04 UTC (rev 3543)
@@ -68,17 +68,17 @@
private String getRequiredHeaderContent(SOAPHeader soapHeader, QName qname)
{
Element element = DOMUtils.getFirstChildElement(soapHeader, qname);
- if(null == element) throw new IllegalArgumentException("Required element "+qname+" is missing");
+ if(null == element) throw new AddressingException("Required element "+qname+" is missing");
String value = DOMUtils.getTextContent(element);
- if(null == value || value.equals("")) throw new IllegalArgumentException("Required element "+qname+" is missing");
+ if(null == value || value.equals("")) throw new AddressingException("Required element "+qname+" is missing");
return value;
}
private String getOptionalHeaderContent(SOAPHeader soapHeader, QName qname)
{
- Element element = DOMUtils.getFirstChildElement(soapHeader, ADDR.getMessageIDQName());
+ Element element = DOMUtils.getFirstChildElement(soapHeader, qname);
if (element != null)
{
return DOMUtils.getTextContent(element);
18 years, 10 months
- 1
- 0
JBossWS SVN: r3542 - branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-06-12 04:25:32 -0400 (Tue, 12 Jun 2007)
New Revision: 3542
Modified:
branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/BackwardCompatibleContextRootDeployer.java
branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/BackwardCompatibleURLPatternDeployer.java
Log:
Fix tokenizer issue with leading '/'
Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/BackwardCompatibleContextRootDeployer.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/BackwardCompatibleContextRootDeployer.java 2007-06-11 21:37:00 UTC (rev 3541)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/BackwardCompatibleContextRootDeployer.java 2007-06-12 08:25:32 UTC (rev 3542)
@@ -23,6 +23,8 @@
//$Id$
+import java.util.StringTokenizer;
+
import org.jboss.wsf.spi.deployment.ContextRootDeployer;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Endpoint;
@@ -52,13 +54,14 @@
String urlPattern = getUrlPattern(dep, ep);
if (urlPattern != null)
{
- String[] tokens = urlPattern.split("/");
- if (tokens.length > 1)
+ StringTokenizer st = new StringTokenizer(urlPattern, "/");
+ if (st.countTokens() > 1)
{
- if (contextRoot != null && contextRoot.equals(tokens[0]) == false)
- throw new IllegalStateException("All endpoints must share the same <context-root>: " + contextRoot + "!=" + tokens[0]);
+ String firstToken = st.nextToken();
+ if (contextRoot != null && contextRoot.equals(firstToken) == false)
+ throw new IllegalStateException("All endpoints must share the same <context-root>: " + contextRoot + "!=" + firstToken);
- contextRoot = tokens[0];
+ contextRoot = firstToken;
}
}
}
Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/BackwardCompatibleURLPatternDeployer.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/BackwardCompatibleURLPatternDeployer.java 2007-06-11 21:37:00 UTC (rev 3541)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/BackwardCompatibleURLPatternDeployer.java 2007-06-12 08:25:32 UTC (rev 3542)
@@ -23,6 +23,8 @@
//$Id$
+import java.util.StringTokenizer;
+
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.URLPatternDeployer;
@@ -52,8 +54,8 @@
if (urlPattern.startsWith("/") == false)
urlPattern = "/" + urlPattern;
- String[] tokens = urlPattern.split("/");
- if (tokens.length > 1 && urlPattern.startsWith(contextRoot))
+ StringTokenizer st = new StringTokenizer(urlPattern, "/");
+ if (st.countTokens() > 1 && urlPattern.startsWith(contextRoot))
{
urlPattern = urlPattern.substring(contextRoot.length());
}
18 years, 10 months
- 1
- 0
JBossWS SVN: r3541 - branches.
by jbossws-commits＠lists.jboss.org
Author: richard_opalka
Date: 2007-06-11 17:37:00 -0400 (Mon, 11 Jun 2007)
New Revision: 3541
Removed:
branches/ropalka/
Log:
removing wrongly created branch
18 years, 10 months
- 1
- 0