JBossWS SVN: r1814 - trunk/integration-jboss40
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-05 07:15:34 -0500 (Fri, 05 Jan 2007)
New Revision: 1814
Modified:
trunk/integration-jboss40/build.xml
Log:
Fix jdk-1.4 compile issues
Modified: trunk/integration-jboss40/build.xml
===================================================================
--- trunk/integration-jboss40/build.xml 2007-01-05 12:15:29 UTC (rev 1813)
+++ trunk/integration-jboss40/build.xml 2007-01-05 12:15:34 UTC (rev 1814)
@@ -35,6 +35,7 @@
<property name="jboss42.output.lib.dir" value="${jboss42.output.dir}/lib"/>
<target name="jboss40-init" depends="prepare, thirdparty">
+ <fail message="Not available: ${jboss40.client}/jboss-client.jar" unless="jboss40.available"/>
</target>
<!-- ================================================================== -->
@@ -232,6 +233,9 @@
<metainf dir="${core.resources.dir}/jboss-saaj.jar/META-INF"/>
</jar>
+ <mkdir dir="${jboss40.output.dir}/resources/jbossws40-jdk14.sar/META-INF"/>
+ <copy tofile="${jboss40.output.dir}/resources/jbossws40-jdk14.sar/META-INF/jboss-service.xml" file="${jboss42.resources.dir}/jbossws.sar/META-INF/jboss-service-no-ejb3.xml"/>
+
<!-- Build jbossws40-jdk14.sar -->
<jar jarfile="${jboss40.output.lib.dir}/jbossws40-jdk14.sar" manifest="${output.etc.dir}/default.mf">
<fileset dir="${jboss40.output.lib.dir}">
@@ -258,8 +262,8 @@
<include name="standard-jaxws-client-config.xml"/>
<include name="standard-jaxws-endpoint-config.xml"/>
</metainf>
- <metainf dir="${jboss42.resources.dir}/jbossws.sar/META-INF">
- <include name="jboss-service*.xml"/>
+ <metainf dir="${jboss40.output.dir}/resources/jbossws40-jdk14.sar/META-INF">
+ <include name="jboss-service.xml"/>
</metainf>
</jar>
17 years, 4 months
JBossWS SVN: r1813 - in trunk/build: . ant-import etc
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-05 07:15:29 -0500 (Fri, 05 Jan 2007)
New Revision: 1813
Modified:
trunk/build/ant-import/build-setup.xml
trunk/build/etc/jbossws-component-info.xml
trunk/build/version.properties
Log:
Fix jdk-1.4 compile issues
Modified: trunk/build/ant-import/build-setup.xml
===================================================================
--- trunk/build/ant-import/build-setup.xml 2007-01-05 12:15:25 UTC (rev 1812)
+++ trunk/build/ant-import/build-setup.xml 2007-01-05 12:15:29 UTC (rev 1813)
@@ -59,6 +59,11 @@
<property name="tomcat.webapps.dir" value="${tomcat.home}/webapps"/>
<property name="tomcat.common.dir" value="${tomcat.home}/common"/>
+ <available property="jboss50.available" file="${jboss50.client}/jboss-client.jar"/>
+ <available property="jboss42.available" file="${jboss42.client}/jboss-client.jar"/>
+ <available property="jboss40.available" file="${jboss40.client}/jboss-client.jar"/>
+ <available property="tomcat.available" file="${tomcat.home}/server/lib/catalina.jar"/>
+
<!-- JDK Detection -->
<available classname="java.lang.StackTraceElement" property="HAVE_JDK_1.4"/>
<available classname="java.lang.Enum" property="HAVE_JDK_1.5"/>
Modified: trunk/build/etc/jbossws-component-info.xml
===================================================================
--- trunk/build/etc/jbossws-component-info.xml 2007-01-05 12:15:25 UTC (rev 1812)
+++ trunk/build/etc/jbossws-component-info.xml 2007-01-05 12:15:29 UTC (rev 1813)
@@ -30,6 +30,7 @@
<compatible version="@jboss-jbossxb@"/>
</import>
<import componentref="jboss/microcontainer">
+ <compatible version="1.0.2"/>
<compatible version="@jboss-microcontainer@"/>
</import>
<import componentref="jboss/remoting">
Modified: trunk/build/version.properties
===================================================================
--- trunk/build/version.properties 2007-01-05 12:15:25 UTC (rev 1812)
+++ trunk/build/version.properties 2007-01-05 12:15:29 UTC (rev 1813)
@@ -32,7 +32,7 @@
jboss-common-core=2.0.2.CR1
jboss-common-logging=2.0.1.GA
jboss-ejb3=1.0.0.CR9-jboss4.0.5
-jboss-jbossretro=1.0.2.GA
+jboss-jbossretro=1.0.4.GA
jbossas-core-libs=4.0.5.GA
jbpm-bpel=1.1.Beta2
junit=3.8.1
17 years, 4 months
JBossWS SVN: r1812 - trunk/integration-jboss50
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-05 07:15:25 -0500 (Fri, 05 Jan 2007)
New Revision: 1812
Modified:
trunk/integration-jboss50/build.xml
Log:
Fix jdk-1.4 compile issues
Modified: trunk/integration-jboss50/build.xml
===================================================================
--- trunk/integration-jboss50/build.xml 2007-01-05 12:15:18 UTC (rev 1811)
+++ trunk/integration-jboss50/build.xml 2007-01-05 12:15:25 UTC (rev 1812)
@@ -26,6 +26,7 @@
<property name="jboss50.output.lib.dir" value="${jboss50.output.dir}/lib"/>
<target name="jboss50-init" depends="prepare, thirdparty">
+ <fail message="Not available: ${jboss50.client}/jboss-client.jar" unless="jboss50.available"/>
</target>
<!-- ================================================================== -->
17 years, 4 months
JBossWS SVN: r1811 - in trunk/jbossws-tests: . src/main/java/org/jboss/test/ws src/main/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler src/main/java/org/jboss/test/ws/jaxrpc/samples/jmstransport
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-05 07:15:18 -0500 (Fri, 05 Jan 2007)
New Revision: 1811
Modified:
trunk/jbossws-tests/build.xml
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/TomcatTestDeployer.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java
Log:
Fix jdk-1.4 compile issues
Modified: trunk/jbossws-tests/build.xml
===================================================================
--- trunk/jbossws-tests/build.xml 2007-01-05 12:15:13 UTC (rev 1810)
+++ trunk/jbossws-tests/build.xml 2007-01-05 12:15:18 UTC (rev 1811)
@@ -96,8 +96,6 @@
<available property="jbossws.available" file="${jboss.home}/client/jbossall-client.jar"/>
<available property="installer.setup" file="jboss-ejb3-client.jar"/>
- <fail message="Not available: ${jboss.home}/client/jbossall-client.jar" unless="jbossws.available"/>
-
<mkdir dir="${tests.output.dir}/log"/>
<touch file="${tests.output.dir}/logtest.log"/>
@@ -112,18 +110,29 @@
-->
<target name="init" depends="prepare,thirdparty">
+ <!-- Define the jbossws.build -->
+ <condition property="jbossws.build" value="jbossws14">
+ <not>
+ <isset property="HAVE_JDK_1.5"/>
+ </not>
+ </condition>
+ <condition property="jbossws.build" value="jbossws">
+ <isset property="HAVE_JDK_1.5"/>
+ </condition>
+ <property name="jbossws.client.jar" value="${jbossws.build}-client.jar"/>
+
<!-- Define excluded tests -->
<property name="tests.excludesfile" value="${tests.resources.dir}/tests-${jbossws.integration.target}-excludes.txt"/>
<!-- The jbossws client classpath -->
<path id="jbossws.client.classpath">
- <pathelement location="${core.output.lib.dir}/jbossws-client.jar"/>
+ <pathelement location="${jboss.client}/${jbossws.client.jar}"/>
<pathelement location="${jboss.client}/activation.jar"/>
<pathelement location="${jboss.client}/commons-logging.jar"/>
<pathelement location="${jboss.client}/javassist.jar"/>
<pathelement location="${jboss.client}/jaxb-api.jar"/>
<pathelement location="${jboss.client}/jaxb-impl.jar"/>
- <pathelement location="${jboss.client}/jbossall-client.jar"/>
+ <pathelement location="${jboss.client}/jboss-backport-concurrent.jar"/>
<pathelement location="${jboss.client}/jboss-common-core.jar"/>
<pathelement location="${jboss.client}/jboss-xml-binding.jar"/>
<pathelement location="${jboss.client}/jboss-logging-spi.jar"/>
@@ -131,6 +140,8 @@
<pathelement location="${jboss.client}/jboss-jaxrpc.jar"/>
<pathelement location="${jboss.client}/jboss-jaxws.jar"/>
<pathelement location="${jboss.client}/jboss-saaj.jar"/>
+ <pathelement location="${jboss.client}/jbossall-client.jar"/>
+ <pathelement location="${jboss.client}/jbossretro-rt.jar"/>
<pathelement location="${jboss.client}/log4j.jar"/>
<pathelement location="${jboss.client}/mail.jar"/>
<pathelement location="${jboss.lib}/jboss-container.jar"/>
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/TomcatTestDeployer.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/TomcatTestDeployer.java 2007-01-05 12:15:13 UTC (rev 1810)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/TomcatTestDeployer.java 2007-01-05 12:15:18 UTC (rev 1811)
@@ -25,6 +25,7 @@
import java.io.File;
import java.io.IOException;
import java.io.InputStreamReader;
+import java.lang.reflect.Method;
import java.net.HttpURLConnection;
import java.net.MalformedURLException;
import java.net.ProtocolException;
@@ -33,7 +34,6 @@
import java.util.Map;
import org.jboss.util.Base64;
-import org.jboss.ws.integration.tomcat.wspublish;
/**
* A deployer that deploys to Tomcat
@@ -59,7 +59,11 @@
File destDir = new File(new File(url.getFile()).getParent() + "/wspublish");
destDir.mkdirs();
- URL warURL = new wspublish().process(url, destDir, null);
+ // Use reflection to invoke wspublish.process() from the tomcat integration layer
+ ClassLoader loader = Thread.currentThread().getContextClassLoader();
+ Class wspublishClass = loader.loadClass("org.jboss.ws.integration.tomcat.wspublish");
+ Method process = wspublishClass.getMethod("process", new Class[]{URL.class, File.class, String.class});
+ URL warURL = (URL)process.invoke(wspublishClass.newInstance(), new Object[]{url, destDir, null});
String path = warURL.toExternalForm();
path = path.substring(path.lastIndexOf("/"));
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase.java 2007-01-05 12:15:13 UTC (rev 1810)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase.java 2007-01-05 12:15:18 UTC (rev 1811)
@@ -101,11 +101,11 @@
ObjectName oname = ObjectNameFactory.create("jboss.ws:service=ServiceEndpointManager");
ObjectName serviceID = new ObjectName("jboss.ws:context=jaxrpc-samples-dynamichandler,endpoint=TestService");
- List<HandlerMetaData> handlers = (List<HandlerMetaData>)server.invoke(oname, "getHandlerMetaData", new Object[]{serviceID}, new String[]{"javax.management.ObjectName"});
- Iterator<HandlerMetaData> it = handlers.iterator();
+ List handlers = (List)server.invoke(oname, "getHandlerMetaData", new Object[]{serviceID}, new String[]{"javax.management.ObjectName"});
+ Iterator it = handlers.iterator();
while (it.hasNext())
{
- HandlerMetaData handlerMetaData = it.next();
+ HandlerMetaData handlerMetaData = (HandlerMetaData)it.next();
if (handlerMetaData.getHandlerClassName().equals(ServerSideHandler.class.getName()))
it.remove();
}
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java 2007-01-05 12:15:13 UTC (rev 1810)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java 2007-01-05 12:15:18 UTC (rev 1811)
@@ -8,8 +8,6 @@
// $Id$
-import java.util.concurrent.CountDownLatch;
-
import javax.jms.Message;
import javax.jms.MessageListener;
import javax.jms.Queue;
@@ -36,11 +34,8 @@
*/
public class JMSTransportTestCase extends JBossWSTest
{
- private static CountDownLatch count;
-
public static Test suite() throws Exception
{
- count = new CountDownLatch(1);
return JBossWSTestSetup.newTestSetup(JMSTransportTestCase.class, "jaxrpc-samples-jmstransport.sar");
}
@@ -93,8 +88,6 @@
sender.send(message);
sender.close();
- // Please explain to me why this does not work relieably
- // count.await();
Thread.sleep(500);
assertNotNull("Expected response message", responseListener.resMessage);
@@ -114,7 +107,6 @@
TextMessage textMessage = (TextMessage)msg;
try
{
- count.countDown();
resMessage = textMessage.getText();
}
catch (Throwable t)
17 years, 4 months
JBossWS SVN: r1810 - in trunk/jbossws-core/src/main/java/org/jboss/ws: core/utils metadata/umdm
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-05 07:15:13 -0500 (Fri, 05 Jan 2007)
New Revision: 1810
Modified:
trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/HolderUtils.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/FaultMetaData.java
Log:
Fix jdk-1.4 compile issues
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/HolderUtils.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/HolderUtils.java 2007-01-05 12:05:27 UTC (rev 1809)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/HolderUtils.java 2007-01-05 12:15:13 UTC (rev 1810)
@@ -282,6 +282,7 @@
* @param holder JAX-WS holder type
* @return generic value type
*/
+ // [JBBUILD-331] Add support for java.lang.reflect.Type
public static Type getGenericValueType(Type holder)
{
return (holder instanceof ParameterizedType) ? ((ParameterizedType)holder).getActualTypeArguments()[0] : Object.class;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/FaultMetaData.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/FaultMetaData.java 2007-01-05 12:05:27 UTC (rev 1809)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/FaultMetaData.java 2007-01-05 12:15:13 UTC (rev 1810)
@@ -25,7 +25,6 @@
import java.beans.IntrospectionException;
import java.beans.PropertyDescriptor;
-import java.lang.reflect.AnnotatedElement;
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
@@ -306,7 +305,9 @@
return getPropertyXmlName(propertySetter);
}
- private QName getPropertyXmlName(AnnotatedElement propertyMember)
+ // [JBBUILD-330] Add support for java.lang.reflect.AnnotatedElement
+ // private QName getPropertyXmlName(AnnotatedElement propertyMember)
+ private QName getPropertyXmlName(Field propertyMember)
{
QName propertyXmlName = null;
@@ -322,7 +323,26 @@
}
return propertyXmlName;
}
+
+ // [JBBUILD-330] Add support for java.lang.reflect.AnnotatedElement
+ // private QName getPropertyXmlName(AnnotatedElement propertyMember)
+ private QName getPropertyXmlName(Method propertyMember)
+ {
+ QName propertyXmlName = null;
+ XmlElement xmlElement = propertyMember.getAnnotation(XmlElement.class);
+ if (xmlElement != null)
+ propertyXmlName = new QName(xmlElement.namespace(), xmlElement.name());
+ else
+ {
+ XmlAttribute xmlAttribute = propertyMember.getAnnotation(XmlAttribute.class);
+ if (xmlAttribute != null)
+ propertyXmlName = new QName(xmlAttribute.namespace(), xmlAttribute.name());
+ // TODO should any other annotation be examined?
+ }
+ return propertyXmlName;
+ }
+
public void setAccessorFactoryCreator(AccessorFactoryCreator accessorFactoryCreator)
{
this.accessorFactoryCreator = accessorFactoryCreator;
17 years, 4 months
JBossWS SVN: r1809 - trunk/jbossws-docs/online/tutorial-doc
by jbossws-commits＠lists.jboss.org
Author: sam.griffith(a)jboss.com
Date: 2007-01-05 07:05:27 -0500 (Fri, 05 Jan 2007)
New Revision: 1809
Modified:
trunk/jbossws-docs/online/tutorial-doc/build.xml
Log:
fixed build paths for new JBossWS setup
Modified: trunk/jbossws-docs/online/tutorial-doc/build.xml
===================================================================
--- trunk/jbossws-docs/online/tutorial-doc/build.xml 2007-01-05 10:38:20 UTC (rev 1808)
+++ trunk/jbossws-docs/online/tutorial-doc/build.xml 2007-01-05 12:05:27 UTC (rev 1809)
@@ -6,7 +6,7 @@
<available property="docbook-support.available" file="${docbook-support.home}/support.xml"/>
<!-- Setup the build timestamp & build identifer properties -->
- <property file="../../../version.properties"/>
+ <property file="../../../build/version.properties"/>
<tstamp>
<format property="build.date" pattern="dd-MMM-yyyy"/>
</tstamp>
@@ -19,9 +19,9 @@
<ant antfile="${doc.module.home}/build-docbook.xml" inheritall="false">
<property name="docbook-support.home" value="${docbook-support.home}"/>
</ant>
- <copy todir="build/en" file="../../../src/main/resources/dist/Install.txt" filtering="yes" overwrite="yes">
+ <copy todir="build/en" file="../../../jbossws-core/src/main/resources/dist/Install.txt" filtering="yes" overwrite="yes">
<filterset>
- <filtersfile file="../../../version.properties"/>
+ <filtersfile file="../../../build/version.properties"/>
</filterset>
</copy>
</target>
@@ -41,7 +41,7 @@
<copy tofile="en/master.xml" file="en/master.template" filtering="yes" overwrite="yes">
<filterset>
<filter token="build.date" value="${build.date}"/>
- <filtersfile file="../../../version.properties"/>
+ <filtersfile file="../../../build/version.properties"/>
</filterset>
</copy>
</target>
17 years, 4 months
JBossWS SVN: r1808 - in branches/jbossws-1.0.4.GA_JBWS-1440/src: main/java/org/jboss/ws/tools/schema test/java/org/jboss/test/ws/tools test/java/org/jboss/test/ws/tools/jbws1428 test/resources/tools test/resources/tools/jbws1428
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-01-05 05:38:20 -0500 (Fri, 05 Jan 2007)
New Revision: 1808
Added:
branches/jbossws-1.0.4.GA_JBWS-1440/src/test/java/org/jboss/test/ws/tools/jbws1428/
branches/jbossws-1.0.4.GA_JBWS-1440/src/test/java/org/jboss/test/ws/tools/jbws1428/JBWS1428TestCase.java
branches/jbossws-1.0.4.GA_JBWS-1440/src/test/java/org/jboss/test/ws/tools/jbws1428/ValueObject.java
branches/jbossws-1.0.4.GA_JBWS-1440/src/test/java/org/jboss/test/ws/tools/jbws1428/ValueObjectSEI.java
branches/jbossws-1.0.4.GA_JBWS-1440/src/test/resources/tools/jbws1428/
branches/jbossws-1.0.4.GA_JBWS-1440/src/test/resources/tools/jbws1428/ValueObjectService.wsdl
branches/jbossws-1.0.4.GA_JBWS-1440/src/test/resources/tools/jbws1428/jaxrpc-mapping.xml
branches/jbossws-1.0.4.GA_JBWS-1440/src/test/resources/tools/jbws1428/wstools-config.xml
Removed:
branches/jbossws-1.0.4.GA_JBWS-1440/src/test/java/org/jboss/test/ws/tools/jbws1428/JBWS1428TestCase.java
branches/jbossws-1.0.4.GA_JBWS-1440/src/test/java/org/jboss/test/ws/tools/jbws1428/ValueObject.java
branches/jbossws-1.0.4.GA_JBWS-1440/src/test/java/org/jboss/test/ws/tools/jbws1428/ValueObjectSEI.java
branches/jbossws-1.0.4.GA_JBWS-1440/src/test/resources/tools/jbws1428/ValueObjectService.wsdl
branches/jbossws-1.0.4.GA_JBWS-1440/src/test/resources/tools/jbws1428/jaxrpc-mapping.xml
branches/jbossws-1.0.4.GA_JBWS-1440/src/test/resources/tools/jbws1428/wstools-config.xml
Modified:
branches/jbossws-1.0.4.GA_JBWS-1440/src/main/java/org/jboss/ws/tools/schema/SchemaTypeCreator.java
Log:
JBWS-1440 - Arrays defined with indexed properties within value type are skipped when generating the WSDL
Modified: branches/jbossws-1.0.4.GA_JBWS-1440/src/main/java/org/jboss/ws/tools/schema/SchemaTypeCreator.java
===================================================================
--- branches/jbossws-1.0.4.GA_JBWS-1440/src/main/java/org/jboss/ws/tools/schema/SchemaTypeCreator.java 2007-01-05 10:38:06 UTC (rev 1807)
+++ branches/jbossws-1.0.4.GA_JBWS-1440/src/main/java/org/jboss/ws/tools/schema/SchemaTypeCreator.java 2007-01-05 10:38:20 UTC (rev 1808)
@@ -579,9 +579,9 @@
String fieldname = prop.getName();
Class fieldType = prop.getPropertyType();
- if (prop instanceof IndexedPropertyDescriptor)
+ if (prop instanceof IndexedPropertyDescriptor && fieldType==null)
{
- log.warn("Indexed Properties are not supported skipping: " + javaType.getName() + "." + fieldname);
+ log.warn("Indexed Properties without non-indexed accessors are not supported skipping: " + javaType.getName() + "." + fieldname);
continue;
}
Copied: branches/jbossws-1.0.4.GA_JBWS-1440/src/test/java/org/jboss/test/ws/tools/jbws1428 (from rev 1647, branches/dlofthouse/JBWS-1428/src/test/java/org/jboss/test/ws/tools/jbws1428)
Deleted: branches/jbossws-1.0.4.GA_JBWS-1440/src/test/java/org/jboss/test/ws/tools/jbws1428/JBWS1428TestCase.java
===================================================================
--- branches/dlofthouse/JBWS-1428/src/test/java/org/jboss/test/ws/tools/jbws1428/JBWS1428TestCase.java 2006-12-14 13:42:11 UTC (rev 1647)
+++ branches/jbossws-1.0.4.GA_JBWS-1440/src/test/java/org/jboss/test/ws/tools/jbws1428/JBWS1428TestCase.java 2007-01-05 10:38:20 UTC (rev 1808)
@@ -1,54 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.tools.jbws1428;
-
-import java.io.FileInputStream;
-
-import org.jboss.test.ws.tools.WSToolsTest;
-import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
-import org.jboss.ws.core.utils.DOMUtils;
-import org.jboss.ws.tools.WSTools;
-import org.w3c.dom.Element;
-
-/**
- *
- * @author darran.lofthouse(a)jboss.com
- * @since 14 Dec 2006
- */
-public class JBWS1428TestCase extends WSToolsTest
-{
-
- public void testGenerate() throws Exception
- {
- String resourceDir = "resources/tools/jbws1428";
- String toolsDir = "tools/jbws1428";
- String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
- new WSTools().generate(args);
-
- Element exp = DOMUtils.parse(new FileInputStream(resourceDir + "/ValueObjectService.wsdl"));
- Element was = DOMUtils.parse(new FileInputStream(toolsDir + "/wsdl/ValueObjectService.wsdl"));
- assertEquals("WSDL Validation", exp, was);
-
- JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator();
- mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml");
- }
-}
Copied: branches/jbossws-1.0.4.GA_JBWS-1440/src/test/java/org/jboss/test/ws/tools/jbws1428/JBWS1428TestCase.java (from rev 1647, branches/dlofthouse/JBWS-1428/src/test/java/org/jboss/test/ws/tools/jbws1428/JBWS1428TestCase.java)
===================================================================
--- branches/dlofthouse/JBWS-1428/src/test/java/org/jboss/test/ws/tools/jbws1428/JBWS1428TestCase.java 2006-12-14 13:42:11 UTC (rev 1647)
+++ branches/jbossws-1.0.4.GA_JBWS-1440/src/test/java/org/jboss/test/ws/tools/jbws1428/JBWS1428TestCase.java 2007-01-05 10:38:20 UTC (rev 1808)
@@ -0,0 +1,49 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.tools.jbws1428;
+
+import org.jboss.test.ws.tools.WSToolsTest;
+import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
+import org.jboss.ws.tools.WSTools;
+
+/**
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 14 Dec 2006
+ */
+public class JBWS1428TestCase extends WSToolsTest {
+
+ public void testGenerate() throws Exception {
+ String resourceDir = "resources/tools/jbws1428";
+ String toolsDir = "tools/jbws1428";
+ String[] args = new String[] { "-dest", toolsDir, "-config",
+ resourceDir + "/wstools-config.xml" };
+ new WSTools().generate(args);
+
+ semanticallyValidateWSDL(resourceDir + "/ValueObjectService.wsdl",
+ toolsDir + "/wsdl/ValueObjectService.wsdl");
+
+ JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator();
+ mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir
+ + "/jaxrpc-mapping.xml");
+ }
+}
Deleted: branches/jbossws-1.0.4.GA_JBWS-1440/src/test/java/org/jboss/test/ws/tools/jbws1428/ValueObject.java
===================================================================
--- branches/dlofthouse/JBWS-1428/src/test/java/org/jboss/test/ws/tools/jbws1428/ValueObject.java 2006-12-14 13:42:11 UTC (rev 1647)
+++ branches/jbossws-1.0.4.GA_JBWS-1440/src/test/java/org/jboss/test/ws/tools/jbws1428/ValueObject.java 2007-01-05 10:38:20 UTC (rev 1808)
@@ -1,66 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.tools.jbws1428;
-
-/**
- *
- * @author darran.lofthouse(a)jboss.com
- * @since 14 Dec 2006
- */
-public class ValueObject
-{
-
- private String myMessage;
-
- private String[] myValues;
-
- public String getMyMessage()
- {
- return myMessage;
- }
-
- public void setMyMessage(String myMessage)
- {
- this.myMessage = myMessage;
- }
-
- public String[] getMyValues()
- {
- return myValues;
- }
-
- public void setMyValues(String[] myValues)
- {
- this.myValues = myValues;
- }
-
- public String getMyValues(int i)
- {
- return myValues[i];
- }
-
- public void setMyValues(int i, String myValues)
- {
- this.myValues[i] = myValues;
- }
-
-}
Copied: branches/jbossws-1.0.4.GA_JBWS-1440/src/test/java/org/jboss/test/ws/tools/jbws1428/ValueObject.java (from rev 1647, branches/dlofthouse/JBWS-1428/src/test/java/org/jboss/test/ws/tools/jbws1428/ValueObject.java)
Deleted: branches/jbossws-1.0.4.GA_JBWS-1440/src/test/java/org/jboss/test/ws/tools/jbws1428/ValueObjectSEI.java
===================================================================
--- branches/dlofthouse/JBWS-1428/src/test/java/org/jboss/test/ws/tools/jbws1428/ValueObjectSEI.java 2006-12-14 13:42:11 UTC (rev 1647)
+++ branches/jbossws-1.0.4.GA_JBWS-1440/src/test/java/org/jboss/test/ws/tools/jbws1428/ValueObjectSEI.java 2007-01-05 10:38:20 UTC (rev 1808)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.tools.jbws1428;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-
-/**
- *
- * @author darran.lofthouse(a)jboss.com
- * @since 14 Dec 2006
- */
-public interface ValueObjectSEI extends Remote
-{
-
- public ValueObject echo(final ValueObject value) throws RemoteException;
-
-}
Copied: branches/jbossws-1.0.4.GA_JBWS-1440/src/test/java/org/jboss/test/ws/tools/jbws1428/ValueObjectSEI.java (from rev 1647, branches/dlofthouse/JBWS-1428/src/test/java/org/jboss/test/ws/tools/jbws1428/ValueObjectSEI.java)
Copied: branches/jbossws-1.0.4.GA_JBWS-1440/src/test/resources/tools/jbws1428 (from rev 1647, branches/dlofthouse/JBWS-1428/src/test/resources/tools/jbws1428)
Deleted: branches/jbossws-1.0.4.GA_JBWS-1440/src/test/resources/tools/jbws1428/ValueObjectService.wsdl
===================================================================
--- branches/dlofthouse/JBWS-1428/src/test/resources/tools/jbws1428/ValueObjectService.wsdl 2006-12-14 13:42:11 UTC (rev 1647)
+++ branches/jbossws-1.0.4.GA_JBWS-1440/src/test/resources/tools/jbws1428/ValueObjectService.wsdl 2007-01-05 10:38:20 UTC (rev 1808)
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='ValueObjectService' targetNamespace='http://org.jboss.test.ws/jbws1428' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://org.jboss.test.ws/jbws1428/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1428' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
- <types>
- <schema targetNamespace='http://org.jboss.test.ws/jbws1428/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://org.jboss.test.ws/jbws1428/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
- <complexType name='echo'>
- <sequence>
- <element name='ValueObject_1' nillable='true' type='tns:ValueObject'/>
- </sequence>
- </complexType>
- <complexType name='echoResponse'>
- <sequence>
- <element name='result' nillable='true' type='tns:ValueObject'/>
- </sequence>
- </complexType>
- <complexType name='ValueObject'>
- <sequence>
- <element name='myMessage' nillable='true' type='string'/>
- <element maxOccurs='unbounded' minOccurs='0' name='myValues' nillable='true' type='string'/>
- </sequence>
- </complexType>
- <element name='echo' type='tns:echo'/>
- <element name='echoResponse' type='tns:echoResponse'/>
- </schema>
- </types>
- <message name='ValueObjectSEI_echo'>
- <part element='ns1:echo' name='parameters'/>
- </message>
- <message name='ValueObjectSEI_echoResponse'>
- <part element='ns1:echoResponse' name='result'/>
- </message>
- <portType name='ValueObjectSEI'>
- <operation name='echo'>
- <input message='tns:ValueObjectSEI_echo'/>
- <output message='tns:ValueObjectSEI_echoResponse'/>
- </operation>
- </portType>
- <binding name='ValueObjectSEIBinding' type='tns:ValueObjectSEI'>
- <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
- <operation name='echo'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body use='literal'/>
- </input>
- <output>
- <soap:body use='literal'/>
- </output>
- </operation>
- </binding>
- <service name='ValueObjectService'>
- <port binding='tns:ValueObjectSEIBinding' name='ValueObjectSEIPort'>
- <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
- </port>
- </service>
-</definitions>
\ No newline at end of file
Copied: branches/jbossws-1.0.4.GA_JBWS-1440/src/test/resources/tools/jbws1428/ValueObjectService.wsdl (from rev 1647, branches/dlofthouse/JBWS-1428/src/test/resources/tools/jbws1428/ValueObjectService.wsdl)
Deleted: branches/jbossws-1.0.4.GA_JBWS-1440/src/test/resources/tools/jbws1428/jaxrpc-mapping.xml
===================================================================
--- branches/dlofthouse/JBWS-1428/src/test/resources/tools/jbws1428/jaxrpc-mapping.xml 2006-12-14 13:42:11 UTC (rev 1647)
+++ branches/jbossws-1.0.4.GA_JBWS-1440/src/test/resources/tools/jbws1428/jaxrpc-mapping.xml 2007-01-05 10:38:20 UTC (rev 1808)
@@ -1,69 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'>
- <package-mapping>
- <package-type>org.jboss.test.ws.tools.jbws1428</package-type>
- <namespaceURI>http://org.jboss.test.ws/jbws1428/types</namespaceURI>
- </package-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.tools.jbws1428.ValueObject</java-type>
- <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1428/types'>typeNS:ValueObject</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>myMessage</java-variable-name>
- <xml-element-name>myMessage</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>myValues</java-variable-name>
- <xml-element-name>myValues</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.tools.jbws1428.ValueObjectSEI_echo_RequestStruct</java-type>
- <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1428/types'>typeNS:echo</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>valueObject_1</java-variable-name>
- <xml-element-name>ValueObject_1</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.tools.jbws1428.ValueObjectSEI_echo_ResponseStruct</java-type>
- <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1428/types'>typeNS:echoResponse</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>result</java-variable-name>
- <xml-element-name>result</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <service-interface-mapping>
- <service-interface>org.jboss.test.ws.tools.jbws1428.ValueObjectService</service-interface>
- <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1428'>serviceNS:ValueObjectService</wsdl-service-name>
- <port-mapping>
- <port-name>ValueObjectSEIPort</port-name>
- <java-port-name>ValueObjectSEIPort</java-port-name>
- </port-mapping>
- </service-interface-mapping>
- <service-endpoint-interface-mapping>
- <service-endpoint-interface>org.jboss.test.ws.tools.jbws1428.ValueObjectSEI</service-endpoint-interface>
- <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1428'>portTypeNS:ValueObjectSEI</wsdl-port-type>
- <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1428'>bindingNS:ValueObjectSEIBinding</wsdl-binding>
- <service-endpoint-method-mapping>
- <java-method-name>echo</java-method-name>
- <wsdl-operation>echo</wsdl-operation>
- <wrapped-element/>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>org.jboss.test.ws.tools.jbws1428.ValueObject</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1428'>wsdlMsgNS:ValueObjectSEI_echo</wsdl-message>
- <wsdl-message-part-name>ValueObject_1</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <wsdl-return-value-mapping>
- <method-return-value>org.jboss.test.ws.tools.jbws1428.ValueObject</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1428'>wsdlMsgNS:ValueObjectSEI_echoResponse</wsdl-message>
- <wsdl-message-part-name>result</wsdl-message-part-name>
- </wsdl-return-value-mapping>
- </service-endpoint-method-mapping>
- </service-endpoint-interface-mapping>
-</java-wsdl-mapping>
\ No newline at end of file
Copied: branches/jbossws-1.0.4.GA_JBWS-1440/src/test/resources/tools/jbws1428/jaxrpc-mapping.xml (from rev 1647, branches/dlofthouse/JBWS-1428/src/test/resources/tools/jbws1428/jaxrpc-mapping.xml)
Deleted: branches/jbossws-1.0.4.GA_JBWS-1440/src/test/resources/tools/jbws1428/wstools-config.xml
===================================================================
--- branches/dlofthouse/JBWS-1428/src/test/resources/tools/jbws1428/wstools-config.xml 2006-12-14 13:42:11 UTC (rev 1647)
+++ branches/jbossws-1.0.4.GA_JBWS-1440/src/test/resources/tools/jbws1428/wstools-config.xml 2007-01-05 10:38:20 UTC (rev 1808)
@@ -1,13 +0,0 @@
-<configuration xmlns="http://www.jboss.org/jbossws-tools"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd">
-
- <java-wsdl>
- <service name="ValueObjectService"
- endpoint="org.jboss.test.ws.tools.jbws1428.ValueObjectSEI" style="document" />
- <namespaces target-namespace="http://org.jboss.test.ws/jbws1428"
- type-namespace="http://org.jboss.test.ws/jbws1428/types" />
- <mapping file="jaxrpc-mapping.xml" />
- </java-wsdl>
-
-</configuration>
\ No newline at end of file
Copied: branches/jbossws-1.0.4.GA_JBWS-1440/src/test/resources/tools/jbws1428/wstools-config.xml (from rev 1647, branches/dlofthouse/JBWS-1428/src/test/resources/tools/jbws1428/wstools-config.xml)
17 years, 4 months
JBossWS SVN: r1807 - in trunk/integration-jboss42: . src/main/resources/jbossws.sar/META-INF
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-05 05:38:06 -0500 (Fri, 05 Jan 2007)
New Revision: 1807
Added:
trunk/integration-jboss42/src/main/resources/jbossws.sar/META-INF/jboss-service-no-ejb3.xml
Modified:
trunk/integration-jboss42/build.xml
Log:
Fix deploy-tomcat
Add jboss-service.xml without ejb3
Modified: trunk/integration-jboss42/build.xml
===================================================================
--- trunk/integration-jboss42/build.xml 2007-01-05 10:38:02 UTC (rev 1806)
+++ trunk/integration-jboss42/build.xml 2007-01-05 10:38:06 UTC (rev 1807)
@@ -122,7 +122,7 @@
<include name="standard-jaxws-endpoint-config.xml"/>
</metainf>
<metainf dir="${jboss42.resources.dir}/jbossws.sar/META-INF">
- <include name="jboss-service.xml"/>
+ <include name="jboss-service*.xml"/>
</metainf>
</jar>
@@ -132,7 +132,7 @@
<!-- Deployment -->
<!-- ================================================================== -->
- <!-- Deploy jbossws to the jboss42 -->
+ <!-- Deploy jbossws to jboss42 -->
<target name="deploy-jboss42" depends="jboss42-jars" description="Deploy jbossws">
<copy todir="${jboss42.home}/client" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/>
<copy todir="${jboss42.home}/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/>
Added: trunk/integration-jboss42/src/main/resources/jbossws.sar/META-INF/jboss-service-no-ejb3.xml
===================================================================
--- trunk/integration-jboss42/src/main/resources/jbossws.sar/META-INF/jboss-service-no-ejb3.xml 2007-01-05 10:38:02 UTC (rev 1806)
+++ trunk/integration-jboss42/src/main/resources/jbossws.sar/META-INF/jboss-service-no-ejb3.xml 2007-01-05 10:38:06 UTC (rev 1807)
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Id$ -->
+
+<server>
+
+ <!--
+ A deployer service for WS clients.
+ -->
+ <mbean name="jboss.ws:service=WebServiceClientDeployer" code="org.jboss.ws.integration.jboss42.WebServiceClientDeployer">
+ <depends>jboss:service=Naming</depends>
+ </mbean>
+
+ <!--
+ A deployer service for JSE endpoints.
+ -->
+ <mbean name="jboss.ws:service=WebServiceDeployerJSE" code="org.jboss.ws.integration.jboss42.DeployerInterceptorJSE">
+ <depends-list optional-attribute-name="Interceptables">
+ <depends-list-element>jboss.web:service=WebServer</depends-list-element>
+ </depends-list>
+ </mbean>
+
+ <!--
+ A deployer service for EJB2.1 endpoints.
+ -->
+ <mbean name="jboss.ws:service=DeployerInterceptorEJB21" code="org.jboss.ws.integration.jboss42.DeployerInterceptorEJB21">
+ <depends-list optional-attribute-name="Interceptables">
+ <depends-list-element>jboss.ejb:service=EJBDeployer</depends-list-element>
+ </depends-list>
+ </mbean>
+
+ <!--
+ A deployer service for EJB3 endpoints.
+ <mbean name="jboss.ws:service=DeployerInterceptorEJB3" code="org.jboss.ws.integration.jboss42.DeployerInterceptorEJB3">
+ <depends-list optional-attribute-name="Interceptables">
+ <depends-list-element>jboss.ejb3:service=EJB3Deployer</depends-list-element>
+ </depends-list>
+ </mbean>
+ -->
+
+ <!--
+ A deployer service for JSE endpoints that are nested in service archives (sar).
+ -->
+ <mbean name="jboss.ws:service=DeployerInterceptorNestedJSE" code="org.jboss.ws.integration.jboss42.DeployerInterceptorNestedJSE">
+ <depends optional-attribute-name="MainDeployer" proxy-type="attribute">jboss.system:service=MainDeployer</depends>
+ <depends>jboss.ws:service=WebServiceDeployerJSE</depends>
+ </mbean>
+
+</server>
Property changes on: trunk/integration-jboss42/src/main/resources/jbossws.sar/META-INF/jboss-service-no-ejb3.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
17 years, 4 months
JBossWS SVN: r1806 - trunk/integration-tomcat
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-05 05:38:02 -0500 (Fri, 05 Jan 2007)
New Revision: 1806
Modified:
trunk/integration-tomcat/build.xml
Log:
Fix deploy-tomcat
Add jboss-service.xml without ejb3
Modified: trunk/integration-tomcat/build.xml
===================================================================
--- trunk/integration-tomcat/build.xml 2007-01-05 10:37:57 UTC (rev 1805)
+++ trunk/integration-tomcat/build.xml 2007-01-05 10:38:02 UTC (rev 1806)
@@ -25,6 +25,8 @@
<property name="tomcat.output.classes14.dir" value="${tomcat.output.dir}/classes14"/>
<property name="tomcat.output.lib.dir" value="${tomcat.output.dir}/lib"/>
+ <available property="jbossws.thirdparty.available" file="${tomcat.output.lib.dir}/jbossws-thirdparty.jar"/>
+
<target name="tomcat-init" depends="prepare, thirdparty">
</target>
@@ -103,12 +105,34 @@
</target>
+ <target name="tomcat-thirdparty-jar" unless="jbossws.thirdparty.available">
+ <!-- Build jbossws-thirdparty.jar -->
+ <mkdir dir="${tomcat.output.lib.dir}/build"/>
+ <unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/jaxb-api.jar"/>
+ <unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/jboss-common-core.jar"/>
+ <unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/jboss-j2ee.jar"/>
+ <unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/jboss-container.jar"/>
+ <unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/jboss-dependency.jar"/>
+ <unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/jboss-logging-spi.jar"/>
+ <unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/jboss-microcontainer.jar"/>
+ <unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/jboss-remoting.jar"/>
+ <unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/jboss-xml-binding.jar"/>
+ <unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/javassist.jar"/>
+ <unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/concurrent.jar"/>
+ <unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/wsdl4j.jar"/>
+ <unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/xmlsec.jar"/>
+ <jar jarfile="${tomcat.output.lib.dir}/jbossws-thirdparty.jar" manifest="${output.etc.dir}/default.mf">
+ <fileset dir="${tomcat.output.lib.dir}/build"/>
+ </jar>
+ <delete dir="${tomcat.output.lib.dir}/build"/>
+ </target>
+
<!-- ================================================================== -->
<!-- Deployment -->
<!-- ================================================================== -->
<!-- Deploy to Tomcat -->
- <target name="deploy-tomcat" depends="tomcat-jars,tomcat-thirdparty-jar" description="Deploy JBossWS to Tomcat">
+ <target name="deploy-tomcat" depends="core-jars,tomcat-jars,tomcat-thirdparty-jar" description="Deploy JBossWS to Tomcat">
<copy todir="${tomcat.common.dir}/endorsed" file="${thirdparty.dir}/serializer.jar"/>
<copy todir="${tomcat.common.dir}/endorsed" file="${thirdparty.dir}/xalan.jar"/>
<copy todir="${tomcat.common.dir}/endorsed" file="${thirdparty.dir}/xercesImpl.jar"/>
@@ -116,37 +140,15 @@
<copy todir="${tomcat.common.dir}/lib" file="${thirdparty.dir}/log4j.jar"/>
<copy todir="${tomcat.common.dir}/lib" file="${thirdparty.dir}/mailapi.jar"/>
<copy todir="${tomcat.common.dir}/lib" file="${core.output.lib.dir}/jbossws-core.jar" overwrite="true"/>
- <copy todir="${tomcat.common.dir}/lib" file="${core.output.lib.dir}/jbossws-tomcat-integration.jar" overwrite="true"/>
- <copy todir="${tomcat.common.dir}/lib" file="${core.output.lib.dir}/jbossws-thirdparty.jar" overwrite="true"/>
<copy todir="${tomcat.common.dir}/lib" file="${core.output.lib.dir}/jboss-jaxws.jar" overwrite="true"/>
<copy todir="${tomcat.common.dir}/lib" file="${core.output.lib.dir}/jboss-jaxrpc.jar" overwrite="true"/>
<copy todir="${tomcat.common.dir}/lib" file="${core.output.lib.dir}/jboss-saaj.jar" overwrite="true"/>
+ <copy todir="${tomcat.common.dir}/lib" file="${tomcat.output.lib.dir}/jbossws-tomcat-integration.jar" overwrite="true"/>
+ <copy todir="${tomcat.common.dir}/lib" file="${tomcat.output.lib.dir}/jbossws-thirdparty.jar" overwrite="true"/>
<copy todir="${tomcat.webapps.dir}" file="${tomcat.output.lib.dir}/jbossws.war" overwrite="true"/>
<delete dir="${tomcat.webapps.dir}/jbossws"/>
</target>
- <target name="tomcat-thirdparty-jar" unless="jbossws.thirdparty.available">
- <!-- Build jbossws-thirdparty.jar -->
- <mkdir dir="${output.lib.dir}/build"/>
- <unjar dest="${output.lib.dir}/build" src="${thirdparty.dir}/jaxb-api.jar"/>
- <unjar dest="${output.lib.dir}/build" src="${thirdparty.dir}/jboss-common-core.jar"/>
- <unjar dest="${output.lib.dir}/build" src="${jboss.server.lib}/jboss-j2ee.jar"/>
- <unjar dest="${output.lib.dir}/build" src="${thirdparty.dir}/jboss-container.jar"/>
- <unjar dest="${output.lib.dir}/build" src="${thirdparty.dir}/jboss-dependency.jar"/>
- <unjar dest="${output.lib.dir}/build" src="${thirdparty.dir}/jboss-logging-spi.jar"/>
- <unjar dest="${output.lib.dir}/build" src="${thirdparty.dir}/jboss-microcontainer.jar"/>
- <unjar dest="${output.lib.dir}/build" src="${thirdparty.dir}/jboss-remoting.jar"/>
- <unjar dest="${output.lib.dir}/build" src="${thirdparty.dir}/jboss-xml-binding.jar"/>
- <unjar dest="${output.lib.dir}/build" src="${thirdparty.dir}/javassist.jar"/>
- <unjar dest="${output.lib.dir}/build" src="${thirdparty.dir}/concurrent.jar"/>
- <unjar dest="${output.lib.dir}/build" src="${thirdparty.dir}/wsdl4j.jar"/>
- <unjar dest="${output.lib.dir}/build" src="${thirdparty.dir}/xmlsec.jar"/>
- <jar jarfile="${output.lib.dir}/jbossws-thirdparty.jar" manifest="${output.etc.dir}/default.mf">
- <fileset dir="${output.lib.dir}/build"/>
- </jar>
- <delete dir="${output.lib.dir}/build"/>
- </target>
-
<target name="clean" depends="prepare" description="Cleans up most generated files.">
<delete dir="${tomcat.output.dir}"/>
</target>
17 years, 4 months
JBossWS SVN: r1805 - in trunk/integration-jboss40: . src/main/resources
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-05 05:37:57 -0500 (Fri, 05 Jan 2007)
New Revision: 1805
Removed:
trunk/integration-jboss40/src/main/resources/jbossws14.sar/
Modified:
trunk/integration-jboss40/build.xml
Log:
Fix deploy-tomcat
Add jboss-service.xml without ejb3
Modified: trunk/integration-jboss40/build.xml
===================================================================
--- trunk/integration-jboss40/build.xml 2007-01-05 10:37:52 UTC (rev 1804)
+++ trunk/integration-jboss40/build.xml 2007-01-05 10:37:57 UTC (rev 1805)
@@ -163,8 +163,8 @@
<include name="standard-jaxws-client-config.xml"/>
<include name="standard-jaxws-endpoint-config.xml"/>
</metainf>
- <metainf dir="${jboss40.resources.dir}/jbossws14.sar/META-INF">
- <include name="jboss-service.xml"/>
+ <metainf dir="${jboss42.resources.dir}/jbossws.sar/META-INF">
+ <include name="jboss-service*.xml"/>
</metainf>
</jar>
@@ -232,8 +232,8 @@
<metainf dir="${core.resources.dir}/jboss-saaj.jar/META-INF"/>
</jar>
- <!-- Build jbossws14.sar -->
- <jar jarfile="${jboss40.output.lib.dir}/jbossws14.sar" manifest="${output.etc.dir}/default.mf">
+ <!-- Build jbossws40-jdk14.sar -->
+ <jar jarfile="${jboss40.output.lib.dir}/jbossws40-jdk14.sar" manifest="${output.etc.dir}/default.mf">
<fileset dir="${jboss40.output.lib.dir}">
<include name="jbossws14-jboss40-integration.jar"/>
<include name="jbossws-context.war"/>
@@ -258,8 +258,8 @@
<include name="standard-jaxws-client-config.xml"/>
<include name="standard-jaxws-endpoint-config.xml"/>
</metainf>
- <metainf dir="${jboss40.resources.dir}/jbossws14.sar/META-INF">
- <include name="jboss-service.xml"/>
+ <metainf dir="${jboss42.resources.dir}/jbossws.sar/META-INF">
+ <include name="jboss-service*.xml"/>
</metainf>
</jar>
@@ -269,7 +269,7 @@
<!-- Deployment -->
<!-- ================================================================== -->
- <!-- Deploy jbossws to the jboss40 -->
+ <!-- Deploy jbossws to jboss40 -->
<target name="deploy-jboss40" depends="jboss40-jars" description="Deploy jbossws">
<copy todir="${jboss40.home}/client" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/>
<copy todir="${jboss40.home}/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/>
@@ -296,8 +296,8 @@
<unjar dest="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${jboss40.output.lib.dir}/jbossws40.sar"/>
</target>
- <!-- Deploy jbossws to the jboss40 jdk1.4 -->
- <target name="deploy-jboss4014" depends="jboss40-module-jars14" description="Deploy jbossws">
+ <!-- Deploy jbossws to jboss40 jdk1.4 -->
+ <target name="deploy-jboss40-jdk14" depends="jboss40-module-jars14" description="Deploy jbossws">
<copy todir="${jboss40.home}/client" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/>
<copy todir="${jboss40.home}/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/>
<delete file="${jboss40.home}/client/jbossws-client.jar"/>
@@ -323,7 +323,7 @@
<delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
<delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws14.sar"/>
<mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws14.sar"/>
- <unjar dest="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws14.sar" src="${jboss40.output.lib.dir}/jbossws14.sar"/>
+ <unjar dest="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws14.sar" src="${jboss40.output.lib.dir}/jbossws40-jdk14.sar"/>
</target>
<!-- ================================================================== -->
17 years, 4 months