JBossWS SVN: r3297 - in trunk/build/hudson/hudson-home/jobs: Core-Tests-AS-5.0 and 12 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-05-30 04:01:59 -0400 (Wed, 30 May 2007)
New Revision: 3297
Modified:
trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml
Log:
Explicitly tests-clean
Modified: trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml 2007-05-30 07:21:11 UTC (rev 3296)
+++ trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml 2007-05-30 08:01:59 UTC (rev 3297)
@@ -39,7 +39,7 @@
#
# execute tests
#
-ant $ENVIRONMENT tests 2>&1 | tee $WORKSPACE/tests.out
+ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
#
Modified: trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml 2007-05-30 07:21:11 UTC (rev 3296)
+++ trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml 2007-05-30 08:01:59 UTC (rev 3297)
@@ -39,7 +39,7 @@
#
# execute tests
#
-ant $ENVIRONMENT tests 2>&1 | tee $WORKSPACE/tests.out
+ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
#
Modified: trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml 2007-05-30 07:21:11 UTC (rev 3296)
+++ trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml 2007-05-30 08:01:59 UTC (rev 3297)
@@ -48,7 +48,7 @@
#
# execute tests
#
-ant $ENVIRONMENT tests 2>&1 | tee $WORKSPACE/tests.out
+ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
#
Modified: trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml 2007-05-30 07:21:11 UTC (rev 3296)
+++ trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml 2007-05-30 08:01:59 UTC (rev 3297)
@@ -48,7 +48,7 @@
#
# execute tests
#
-ant $ENVIRONMENT tests 2>&1 | tee $WORKSPACE/tests.out
+ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
#
Modified: trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-4.2/config.xml 2007-05-30 07:21:11 UTC (rev 3296)
+++ trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-4.2/config.xml 2007-05-30 08:01:59 UTC (rev 3297)
@@ -48,7 +48,7 @@
#
# execute tests
#
-ant $ENVIRONMENT tests 2>&1 | tee $WORKSPACE/tests.out
+ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
#
Modified: trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-5.0/config.xml 2007-05-30 07:21:11 UTC (rev 3296)
+++ trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-5.0/config.xml 2007-05-30 08:01:59 UTC (rev 3297)
@@ -48,7 +48,7 @@
#
# execute tests
#
-ant $ENVIRONMENT tests 2>&1 | tee $WORKSPACE/tests.out
+ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
#
Modified: trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-4.2/config.xml 2007-05-30 07:21:11 UTC (rev 3296)
+++ trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-4.2/config.xml 2007-05-30 08:01:59 UTC (rev 3297)
@@ -48,7 +48,7 @@
#
# execute tests
#
-ant $ENVIRONMENT tests 2>&1 | tee $WORKSPACE/tests.out
+ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
#
Modified: trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-5.0/config.xml 2007-05-30 07:21:11 UTC (rev 3296)
+++ trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-5.0/config.xml 2007-05-30 08:01:59 UTC (rev 3297)
@@ -48,7 +48,7 @@
#
# execute tests
#
-ant $ENVIRONMENT tests 2>&1 | tee $WORKSPACE/tests.out
+ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
#
Modified: trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml 2007-05-30 07:21:11 UTC (rev 3296)
+++ trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml 2007-05-30 08:01:59 UTC (rev 3297)
@@ -40,7 +40,7 @@
#
# execute tests
#
-ant $ENVIRONMENT tests 2>&1 | tee $WORKSPACE/tests.out
+ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
#
Modified: trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml 2007-05-30 07:21:11 UTC (rev 3296)
+++ trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml 2007-05-30 08:01:59 UTC (rev 3297)
@@ -40,7 +40,7 @@
#
# execute tests
#
-ant $ENVIRONMENT tests 2>&1 | tee $WORKSPACE/tests.out
+ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
#
Modified: trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml 2007-05-30 07:21:11 UTC (rev 3296)
+++ trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml 2007-05-30 08:01:59 UTC (rev 3297)
@@ -40,7 +40,7 @@
#
# execute tests
#
-ant $ENVIRONMENT tests 2>&1 | tee $WORKSPACE/tests.out
+ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
#
Modified: trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml 2007-05-30 07:21:11 UTC (rev 3296)
+++ trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml 2007-05-30 08:01:59 UTC (rev 3297)
@@ -40,7 +40,7 @@
#
# execute tests
#
-ant $ENVIRONMENT tests 2>&1 | tee $WORKSPACE/tests.out
+ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
#
Modified: trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml 2007-05-30 07:21:11 UTC (rev 3296)
+++ trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml 2007-05-30 08:01:59 UTC (rev 3297)
@@ -40,7 +40,7 @@
#
# execute tests
#
-ant $ENVIRONMENT tests 2>&1 | tee $WORKSPACE/tests.out
+ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
#
Modified: trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml 2007-05-30 07:21:11 UTC (rev 3296)
+++ trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml 2007-05-30 08:01:59 UTC (rev 3297)
@@ -40,7 +40,7 @@
#
# execute tests
#
-ant $ENVIRONMENT tests 2>&1 | tee $WORKSPACE/tests.out
+ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
#
16 years, 11 months
- 1
- 0
JBossWS SVN: r3296 - in trunk: integration/spi/src/main/java/org/jboss/wsf/spi/tools and 5 other directories.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-05-30 03:21:11 -0400 (Wed, 30 May 2007)
New Revision: 3296
Added:
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/WSContractConsumer.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/WSContractConsumerFactory.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/WSContractProvider.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/WSContractProviderFactory.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/ant/package.html
Removed:
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/api/
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/spi/
Modified:
trunk/integration/spi/build.xml
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/ant/wsconsume.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/ant/wsprovide.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/command/wsconsume.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/command/wsprovide.java
trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/tools/SunRIConsumerFactoryImpl.java
trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/tools/SunRIConsumerImpl.java
trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderFactoryImpl.java
trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java
trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/SunRIConsumerFactoryImpl.java
trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/SunRIConsumerImpl.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jaxws/WSContractProviderTestCase.java
Log:
Less packages for the tools SPI
Modified: trunk/integration/spi/build.xml
===================================================================
--- trunk/integration/spi/build.xml 2007-05-30 07:17:39 UTC (rev 3295)
+++ trunk/integration/spi/build.xml 2007-05-30 07:21:11 UTC (rev 3296)
@@ -127,17 +127,21 @@
<mkdir dir="${spi.output.apidocs.dir}"/>
<javadoc destdir="${spi.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API">
- <classpath refid="spi.classpath"/>
+ <classpath refid="thirdparty.classpath"/>
<packageset dir="${spi.java.dir}" defaultexcludes="yes">
<include name="org/jboss/ws/**"/>
+ <include name="org/jboss/wsf/**"/>
</packageset>
- <doctitle><![CDATA[<h1>JBossWS</h1>]]></doctitle>
+ <doctitle><![CDATA[<h1>JBoss Web Service Framework - SPI</h1>]]></doctitle>
<tag name="todo" scope="all" description="To do:"/>
- <group title="Core" packages="org.jboss.ws.spi*"/>
- <group title="Metadata" packages="org.jboss.ws.metadata*"/>
- <group title="spi" packages="org.jboss.ws.spi*"/>
- <group title="Extensions" packages="org.jboss.ws.extensions*"/>
- <group title="Tools" packages="org.jboss.ws.tools*"/>
+ <group title="Integration (AS 4.2 backwards compatibility)" packages="org.jboss.ws.integration*"/>
+ <group title="Annotations" packages="org.jboss.wsf.spi.annotation*"/>
+ <group title="Deployment" packages="org.jboss.wsf.spi.deployment*"/>
+ <group title="Invocation" packages="org.jboss.wsf.spi.invocation*"/>
+ <group title="Management" packages="org.jboss.wsf.spi.management*"/>
+ <group title="Handler" packages="org.jboss.wsf.spi.handler*"/>
+ <group title="MetaData" packages="org.jboss.wsf.spi.metadata*"/>
+ <group title="Tools" packages="org.jboss.wsf.spi.tools*"/>
</javadoc>
</target>
Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/WSContractConsumer.java (from rev 3289, trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/api/WSContractConsumer.java)
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/WSContractConsumer.java (rev 0)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/WSContractConsumer.java 2007-05-30 07:21:11 UTC (rev 3296)
@@ -0,0 +1,188 @@
+/*
+* 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.tools;
+
+import org.jboss.ws.integration.FactoryLoader;
+import org.jboss.wsf.spi.tools.WSContractConsumerFactory;
+
+import java.io.File;
+import java.io.PrintStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.List;
+
+/**
+ * WSContractConsumer is responsible for generating JAX-WS client and server
+ * artifacts from the specified WSDL file. To implement a client, one would use
+ * the generated ___Service.java file. For a server, one only needs to provide
+ * an implementation class that implements the generated service endpoint
+ * interface.
+ *
+ * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a>
+ * @version $Revision$
+ */
+public abstract class WSContractConsumer
+{
+ private static String DEFAULT_PROVIDER = "org.jboss.ws.tools.jaxws.impl.SunRIConsumerFactoryImpl";
+ public static final String PROVIDER_PROPERTY = "org.jboss.wsf.tools.ConsumerFactoryImpl";
+
+ /**
+ * Obtain a new instance of a WSContractProvider. This will use the current
+ * thread's context class loader to locate the WSContractProviderFactory
+ * implementation.
+ *
+ * @return a new WSContractProvider
+ */
+ public static WSContractConsumer newInstance()
+ {
+ return newInstance(Thread.currentThread().getContextClassLoader());
+ }
+
+ /**
+ * Obtain a new instance of a WSContractConsumer. The specified ClassLoader will be used to
+ * locate the WebServiceImporterProvide implementation
+ *
+ * @param loader the ClassLoader to use
+ * @return a new WSContractConsumer
+ */
+ public static WSContractConsumer newInstance(ClassLoader loader)
+ {
+ ClassLoader oldLoader = Thread.currentThread().getContextClassLoader();
+ try
+ {
+ Thread.currentThread().setContextClassLoader(loader);
+ WSContractConsumerFactory factory = (WSContractConsumerFactory)
+ FactoryLoader.loadFactory(PROVIDER_PROPERTY, DEFAULT_PROVIDER);
+ return factory.createConsumer();
+ }
+ finally{
+ Thread.currentThread().setContextClassLoader(oldLoader);
+ }
+ }
+
+ /**
+ * Specifies the JAX-WS and JAXB binding files to use on import operations.
+ *
+ * @param bindingFiles list of JAX-WS or JAXB binding files
+ */
+ public abstract void setBindingFiles(List<File> bindingFiles);
+
+ /**
+ * Sets the OASIS XML Catalog file to use for entity resolution.
+ *
+ * @param catalog the OASIS XML Catalog file
+ */
+ public abstract void setCatalog(File catalog);
+
+ /**
+ * Sets the main output directory. If the directory does not exist, it will be created.
+ *
+ * @param directory the root directory for generated files
+ */
+ public abstract void setOutputDirectory(File directory);
+
+ /**
+ * Sets the source directory. This directory will contain any generated Java source.
+ * If the directory does not exist, it will be created. If not specified,
+ * the output directory will be used instead.
+ *
+ * @param directory the root directory for generated source code
+ */
+ public abstract void setSourceDirectory(File directory);
+
+ /**
+ * Enables/Disables Java source generation.
+ *
+ * @param generateSource whether or not to generate Java source.
+ */
+ public abstract void setGenerateSource(boolean generateSource);
+
+
+ /**
+ * Sets the target package for generated source. If not specified the default
+ * is based off of the XML namespace.
+ *
+ * @param targetPackage the target package for generated source
+ */
+ public abstract void setTargetPackage(String targetPackage);
+
+ /**
+ * Sets the @(a)WebService.wsdlLocation and @(a)WebServiceClient.wsdlLocation attributes to a custom value.
+ *
+ * @param wsdlLocation the custom WSDL location to use in generated source
+ */
+ public abstract void setWsdlLocation(String wsdlLocation);
+
+ /**
+ * Sets the PrintStream to use for status feedback. The simplest example
+ * would be to use System.out.
+ *
+ * @param messageStream the stream to use for status messages:
+ */
+ public abstract void setMessageStream(PrintStream messageStream);
+
+
+ /**
+ * Sets the additional classpath to use if/when invoking the Java compiler.
+ * Typically an implementation will use the system <code>java.class.path</code>
+ * property. So for most normal applications this method is not needed. However,
+ * if this API is being used from an isolated classloader, then it needs to
+ * be called in order to reference all jars that are required by the
+ * implementation.
+ *
+ * @param classPath a list of strings where each entry references a
+ * single jar or directory
+ */
+ public abstract void setAdditionalCompilerClassPath(List<String> classPath);
+
+ /**
+ * Generate the required artifacts using the specified WSDL URL. This method
+ * may be called more than once, although this is probably not desireable
+ *
+ * @param wsdl the URL of the WSDL
+ */
+ public abstract void consume(URL wsdl);
+
+ /**
+ * Generate the required artifacts using the specified WSDL. This method
+ * may be called more than once, although this is probably not desireable.
+ * The passed string is expect to either be a valid URL, or a local file path.
+ *
+ * @param wsdl a URL or local file path
+ * @throws MalformedURLException if wsdl is not a legal URL or local file
+ */
+ public void consume(String wsdl) throws MalformedURLException
+ {
+ URL url = null;
+ try
+ {
+ url = new URL(wsdl);
+ }
+ catch (MalformedURLException e)
+ {
+ File file = new File(wsdl);
+ url = file.toURL();
+ }
+
+ consume(url);
+ }
+}
Property changes on: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/WSContractConsumer.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/WSContractConsumerFactory.java (from rev 3289, trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/spi/WSContractConsumerFactory.java)
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/WSContractConsumerFactory.java (rev 0)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/WSContractConsumerFactory.java 2007-05-30 07:21:11 UTC (rev 3296)
@@ -0,0 +1,40 @@
+/*
+ * 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.tools;
+
+import org.jboss.wsf.spi.tools.WSContractConsumer;
+
+/**
+ * WSContractConsumerFactory defines the contract for a WSContractConsumer factory.
+ *
+ * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a>
+ */
+public interface WSContractConsumerFactory
+{
+ /**
+ * Create a new WSContractConsumer. There are no restrictions on how this
+ * should be performed.
+ *
+ * @return a new WSContractConsumer
+ */
+ public WSContractConsumer createConsumer();
+}
Property changes on: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/WSContractConsumerFactory.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/WSContractProvider.java (from rev 3289, trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/api/WSContractProvider.java)
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/WSContractProvider.java (rev 0)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/WSContractProvider.java 2007-05-30 07:21:11 UTC (rev 3296)
@@ -0,0 +1,159 @@
+package org.jboss.wsf.spi.tools;
+
+import org.jboss.wsf.spi.tools.WSContractProviderFactory;
+import org.jboss.ws.integration.FactoryLoader;
+
+import java.io.File;
+import java.io.PrintStream;
+
+
+/**
+ * WSContractProvider is responsible for generating the required portable
+ * JAX-WS artifacts for a service endpoint implementation. This includes class
+ * files for wrapper types and fault beans. WSDL may be optionally generated as
+ * well using this API.
+ *
+ * <p>The following example generates class files, source files and WSDL for an
+ * endpoint:</p>
+ * <pre>
+ * WSContractProvider provider = WSContractProvider.newInstance();
+ * provider.setGenerateSource(true);
+ * provider.setGenerateWsdl(true);
+ * provider.setOutputDirectory(new File("output"));
+ * provider.setMessageStream(System.out);
+ * provider.provide(TestMe.class);
+ * </pre>
+ *
+ * <p>Thread-Safety:</p>
+ * This class expects to be thread-confined, so it can not be shared between threads.
+ *
+ * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a>
+ */
+public abstract class WSContractProvider
+{
+ private static String DEFAULT_PROVIDER = "org.jboss.ws.tools.jaxws.impl.JBossWSProviderFactoryImpl";
+ public static final String PROVIDER_PROPERTY = "org.jboss.wsf.tools.ProviderFactoryImpl";
+
+ protected WSContractProvider()
+ {
+
+ }
+
+ /**
+ * Obtain a new instance of a WSContractProvider. This will use the current
+ * thread's context class loader to locate the WSContractProviderFactory
+ * implementation.
+ *
+ * @return a new WSContractProvider
+ */
+ public static WSContractProvider newInstance()
+ {
+ return newInstance(Thread.currentThread().getContextClassLoader());
+ }
+
+ /**
+ * Obtain a new instance of a WSContractProvider. The specified ClassLoader will be used to
+ * locate the WSContractProviderFactory implementation
+ *
+ * @param loader the ClassLoader to use
+ * @return a new WSContractProvider
+ */
+ public static WSContractProvider newInstance(ClassLoader loader)
+ {
+ ClassLoader oldLoader = Thread.currentThread().getContextClassLoader();
+ try
+ {
+ Thread.currentThread().setContextClassLoader(loader);
+ WSContractProviderFactory factory = (WSContractProviderFactory)
+ FactoryLoader.loadFactory(PROVIDER_PROPERTY, DEFAULT_PROVIDER);
+ return factory.createProvider(loader);
+ }
+ finally{
+ Thread.currentThread().setContextClassLoader(oldLoader);
+ }
+ }
+
+ /**
+ * Enables/Disables WSDL generation.
+ *
+ * @param generateWsdl whether or not to generate WSDL
+ */
+ public abstract void setGenerateWsdl(boolean generateWsdl);
+
+ /**
+ * Enables/Disables Java source generation.
+ *
+ * @param generateSource whether or not to generate Java source.
+ */
+ public abstract void setGenerateSource(boolean generateSource);
+
+ /**
+ * Sets the main output directory. If the directory does not exist, it will be created.
+ *
+ * @param directory the root directory for generated files
+ */
+ public abstract void setOutputDirectory(File directory);
+
+ /**
+ * Sets the resource directory. This directory will contain any generated
+ * WSDL and XSD files. If the directory does not exist, it will be created.
+ * If not specified, the output directory will be used instead.
+ *
+ * @param directory the root directory for generated resource files
+ */
+ public abstract void setResourceDirectory(File directory);
+
+ /**
+ * Sets the source directory. This directory will contain any generated Java source.
+ * If the directory does not exist, it will be created. If not specified,
+ * the output directory will be used instead.
+ *
+ * @param directory the root directory for generated source code
+ */
+ public abstract void setSourceDirectory(File directory);
+
+ /**
+ * Sets the ClassLoader used to discover types. This defaults to the one used
+ * in instantiation.
+ *
+ * @param loader the ClassLoader to use
+ */
+ public abstract void setClassLoader(ClassLoader loader);
+
+ /**
+ * Generates artifacts using the current settings. This method may be invoked
+ * more than once (e.g. multiple endpoints).
+ *
+ * @param endpointClass the name of the endpoint implementation bean
+ * @throws RuntimeException if any error occurs during processing, or the class is not found
+ */
+ public abstract void provide(String endpointClass);
+
+ /**
+ * Generates artifacts using the current settings. This method may be invoked
+ * more than once (e.g. multiple endpoints).
+ *
+ * @param endpointClass the endpoint implementation bean
+ * @throws RuntimeException if any error occurs during processing
+ */
+ public abstract void provide(Class<?> endpointClass);
+
+ /**
+ * Sets the PrintStream to use for status feedback. The simplest example
+ * would be to use System.out.
+ *
+ * <p>Example output:</p>
+ * <pre>
+ * Generating WSDL:
+ * TestMeService.wsdl
+ * Writing Source:
+ * org/jboss/ws/tools/jaxws/TestMe.java
+ * org/jboss/ws/tools/jaxws/TestMeResponse.java
+ * Writing Classes:
+ * org/jboss/ws/tools/jaxws/TestMe.class
+ * org/jboss/ws/tools/jaxws/TestMeResponse.class
+ * </pre>
+ * @param messageStream the stream to use for status messages:
+ */
+ public abstract void setMessageStream(PrintStream messageStream);
+}
Property changes on: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/WSContractProvider.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/WSContractProviderFactory.java (from rev 3289, trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/spi/WSContractProviderFactory.java)
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/WSContractProviderFactory.java (rev 0)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/WSContractProviderFactory.java 2007-05-30 07:21:11 UTC (rev 3296)
@@ -0,0 +1,43 @@
+/*
+ * 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.tools;
+
+import org.jboss.wsf.spi.tools.WSContractProvider;
+
+/**
+ * WSContractProviderFactory defines the contract for a WSContractProvider factory.
+ *
+ * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a>
+ */
+public interface WSContractProviderFactory
+{
+ /**
+ * Create a new WSContractProvider. There are no restrictions on how this
+ * should be performed. The passed ClassLoader is the one used in
+ * {@link WSContractProvider#newInstance(ClassLoader)}. This loader
+ * should be made available to the generated WSContractProvider.
+ *
+ * @param loader the ClassLoader for type discovery
+ * @return a new WSContractProvider
+ */
+ public WSContractProvider createProvider(ClassLoader loader);
+}
Property changes on: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/WSContractProviderFactory.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/ant/package.html
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/ant/package.html (rev 0)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/ant/package.html 2007-05-30 07:21:11 UTC (rev 3296)
@@ -0,0 +1,187 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+<head>
+</head>
+<body bgcolor="white">
+
+Provides classes and interfaces for handling text, dates, numbers, currency, messages and
+collation in a manner independent of natural languages. This means your main application
+or applet can be written to be language-independent, and it can rely upon
+separate, dynamically-linked localized resources. This allows the flexibility
+of adding localizations for new localizations at any time.
+<p>
+These classes are capable of formatting dates, numbers, and messages, parsing;
+searching and sorting strings; and iterating over characters, words, sentences,
+and line breaks. This package contains three main groups of classes and
+interfaces:
+<ul>
+<li>Classes for formatting and parsing
+<li>Classes for iteration over text
+<li>Classes for string collation
+</ul>
+
+
+</ul>
+<h3>Formatting and Parsing</h3>
+
+<em>Formatting</em> is the conversion of number and date objects to
+strings. <em>P</em><em>arsing</em> is the reverse operation of
+converting strings into number and date objects.
+<p>
+
+Dates and numbers are represented internally in a
+locale-independent way. For example, dates are kept as milliseconds
+since January 1, 1970, 00:00:00 UCT. When these objects are printed or
+displayed, they must be converted to localized strings. The
+locale-specific parts of a date string, such as the time zone string,
+are separately imported from a locale-specific resource bundle.
+<p>
+
+The <code>format()</code> method converts the <code>Date</code>
+object from -604656780000 milliseconds to the form "Tuesday, November
+3, 1997 9:47am CST" for the U. S. English locale. The figure shows how the
+<code>format()</code> method of subclasses of <code>Format</code>
+enable instances of <code>Number</code>, <code>Date</code>,
+<code>String</code>, and other objects to be formatted to
+locale-specific strings.
+<p>
+
+Conversely, the <code>parseObject()</code> method (and
+<code>parse()</code> method in subclasses) perform the reverse
+operation of parsing localized strings and converting them to
+<code>Number</code>, <code>Date</code>,<code> </code>and
+<code>String</code> objects. The figure
+shows how the <code>parse()</code> method is complementary to
+<code>format()</code>. Any <code>String</code> formatted by
+<code>format()</code> is guaranteed to be parseable by
+<code>parseObject()</code>.
+<p>
+
+Java provides six subclasses of {@link Format} for formatting
+dates, numbers, and messages: {@link DateFormat},
+{@link SimpleDateFormat}, {@link NumberFormat},
+{@link DecimalFormat}, {@link ChoiceFormat}, and
+{@link MessageFormat}.
+
+<h3>String Collation</h3>
+
+The term "<em>collate"</em> means to determine the proper sort
+sequence for two or more strings. It can also tell if two strings
+match, for searching. The <code>Collator</code> class and its subclass
+<code>RuleBasedCollator</code> perform locale-sensitive string
+comparison. You use these classes to build searching and alphabetical
+sorting routines for natural language text. They can distinguish
+characters based on the base character, accent marks, and
+uppercase/lowercase properties.
+<p>
+
+{@link Collator} is an abstract base class. Subclasses
+implement specific collation strategies. One subclass,
+{@link RuleBasedCollator}, is currently provided and is
+applicable to a wide set of languages. Other subclasses may be created
+to handle more specialized
+needs. {@link CollationElementIterator} provides an iterator for
+stepping through each character of a locale-specific string according
+to the rules of a specific <code>Collator</code>
+object. {@link CollationKey} enables fast sorting of strings by
+representing a string as a sort key under the rules of a specific
+<code>Collator</code> object.
+
+<h3>Word Breaks</h3>
+
+While the Java types <code>char</code> and <code>Character</code>
+represent Unicode characters, sometimes Unicode characters combine to
+form a more complex character that has its own semantic value, a
+<em>user character</em>. The {@link BreakIterator} class makes it
+possible to iterate over these user characters. A break iterator can
+find the location of character, word, or sentence boundaries or
+potential line-break boundaries. This makes it possible for a program
+to properly select characters for text operations such as highlighting
+a character, cutting a word, moving to the next sentence, or
+word-wrapping at a line ending. These operations are performed in a
+locale-sensitive manner, meaning that they honor the boundaries of
+text for a particular locale.
+
+
+<h3>Locale-Sensitive Classes</h3>
+
+Many, but not all, of the classes in java.text are locale-sensitive,
+meaning you have to create a different instance for each locale. The
+following table lists which are locale-sensitive and which are not.
+<p>
+
+<table border=1 cellspacing=0 cellpadding=6>
+<tr valign=top>
+<td>
+<b>Locale-Sensitive Classes</b><br>
+
+NumberFormat<br>
+DecimalFormat<br>
+DecimalFormatSymbols<br>
+MessageFormat<br>
+DateFormat<br>
+SimpleDateFormat<br>
+DateFormatSymbols<br>
+Collator<br>
+RuleBasedCollator<br>
+CollationElementIterator<br>
+CollationKey<br>
+BreakIterator<br>
+</td>
+
+<td>
+<b>Locale-Independent Classes</b><br>
+
+Format<br>
+ChoiceFormat<br>
+FieldPosition<br>
+ParsePosition<br>
+ParseException<br>
+StringCharacterIterator<br>
+CharacterIterator
+</td>
+</tr>
+
+</table>
+
+<p>
+
+
+<h2>Package Specification</h2>
+
+ (none)
+
+
+<h2>Related Documentation </h2>
+
+The following classes are used by the java.text classes.
+<ul>
+ <li>{@link java.lang.Character} (for getType)
+ <li>{@link java.util.Locale}
+ <li>{@link java.util.Calendar}
+ <li>{@link java.util.GregorianCalendar}
+ <li>{@link java.util.Date}
+ <li>{@link java.util.ResourceBundle}
+ <li>{@link java.util.ListResourceBundle}
+ <li>{@link java.util.PropertyResourceBundle}
+ <li>{@link java.util.TimeZone}
+ <li>{@link java.util.SimpleTimeZone}
+</ul>
+
+
+For overviews, tutorials, examples, guides, and tool documentation, please see:
+<ul>
+ <li><a href="http://java.sun.com/products/jdk/1.1/docs/guide/intl/index.html">JDK 1.1.x Internationalization Documentation</a>
+
+ <li><a href="http://java.sun.com/products/jdk/1.2/docs/guide/intl/index.html">JDK 1.2.x Input Method Framework Documentation</a>
+</ul>
+<br>
+
+@since JDK1.1
+
+
+<!-- This file was created with Quadralay WebWorks Publisher 3.5.0 -->
+<!-- Last updated: Thu Jan 15 10:16:56 1998 -->
+
+</body>
+</html>
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/ant/wsconsume.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/ant/wsconsume.java 2007-05-30 07:17:39 UTC (rev 3295)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/ant/wsconsume.java 2007-05-30 07:21:11 UTC (rev 3296)
@@ -28,7 +28,7 @@
import org.apache.tools.ant.types.CommandlineJava;
import org.apache.tools.ant.types.FileSet;
import org.apache.tools.ant.types.Path;
-import org.jboss.wsf.spi.tools.api.WSContractConsumer;
+import org.jboss.wsf.spi.tools.WSContractConsumer;
import java.io.File;
import java.io.PrintStream;
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/ant/wsprovide.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/ant/wsprovide.java 2007-05-30 07:17:39 UTC (rev 3295)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/ant/wsprovide.java 2007-05-30 07:21:11 UTC (rev 3296)
@@ -31,7 +31,7 @@
import org.apache.tools.ant.types.CommandlineJava;
import org.apache.tools.ant.types.Path;
import org.apache.tools.ant.types.Reference;
-import org.jboss.wsf.spi.tools.api.WSContractProvider;
+import org.jboss.wsf.spi.tools.WSContractProvider;
import java.io.File;
import java.io.PrintStream;
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/command/wsconsume.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/command/wsconsume.java 2007-05-30 07:17:39 UTC (rev 3295)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/command/wsconsume.java 2007-05-30 07:21:11 UTC (rev 3296)
@@ -23,7 +23,7 @@
import gnu.getopt.Getopt;
import gnu.getopt.LongOpt;
-import org.jboss.wsf.spi.tools.api.WSContractConsumer;
+import org.jboss.wsf.spi.tools.WSContractConsumer;
import java.io.File;
import java.io.PrintStream;
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/command/wsprovide.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/command/wsprovide.java 2007-05-30 07:17:39 UTC (rev 3295)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/command/wsprovide.java 2007-05-30 07:21:11 UTC (rev 3296)
@@ -24,7 +24,7 @@
import gnu.getopt.Getopt;
import gnu.getopt.LongOpt;
import org.jboss.wsf.spi.utils.JavaUtils;
-import org.jboss.wsf.spi.tools.api.WSContractProvider;
+import org.jboss.wsf.spi.tools.WSContractProvider;
import java.io.File;
import java.io.PrintStream;
Modified: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/tools/SunRIConsumerFactoryImpl.java
===================================================================
--- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/tools/SunRIConsumerFactoryImpl.java 2007-05-30 07:17:39 UTC (rev 3295)
+++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/tools/SunRIConsumerFactoryImpl.java 2007-05-30 07:21:11 UTC (rev 3296)
@@ -21,8 +21,8 @@
*/
package org.jboss.wsf.stack.sunri.tools;
-import org.jboss.wsf.spi.tools.spi.WSContractConsumerFactory;
-import org.jboss.wsf.spi.tools.api.WSContractConsumer;
+import org.jboss.wsf.spi.tools.WSContractConsumerFactory;
+import org.jboss.wsf.spi.tools.WSContractConsumer;
/**
* Creates a WSContractConsumer that delegates to the Sun RI.
Modified: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/tools/SunRIConsumerImpl.java
===================================================================
--- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/tools/SunRIConsumerImpl.java 2007-05-30 07:17:39 UTC (rev 3295)
+++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/tools/SunRIConsumerImpl.java 2007-05-30 07:21:11 UTC (rev 3296)
@@ -21,7 +21,7 @@
*/
package org.jboss.wsf.stack.sunri.tools;
-import org.jboss.wsf.spi.tools.api.WSContractConsumer;
+import org.jboss.wsf.spi.tools.WSContractConsumer;
import java.io.File;
import java.io.PrintStream;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderFactoryImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderFactoryImpl.java 2007-05-30 07:17:39 UTC (rev 3295)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderFactoryImpl.java 2007-05-30 07:21:11 UTC (rev 3296)
@@ -21,8 +21,8 @@
*/
package org.jboss.ws.tools.jaxws.impl;
-import org.jboss.wsf.spi.tools.api.WSContractProvider;
-import org.jboss.wsf.spi.tools.spi.WSContractProviderFactory;
+import org.jboss.wsf.spi.tools.WSContractProvider;
+import org.jboss.wsf.spi.tools.WSContractProviderFactory;
/**
* Creates a JBossWS WSContractProvider implementation.
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java 2007-05-30 07:17:39 UTC (rev 3295)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java 2007-05-30 07:21:11 UTC (rev 3296)
@@ -28,7 +28,7 @@
import static org.jboss.wsf.spi.deployment.Deployment.DeploymentType.JAXWS_EJB3;
import static org.jboss.wsf.spi.deployment.Deployment.DeploymentType.JAXWS_JSE;
import org.jboss.ws.integration.ResourceLoaderAdapter;
-import org.jboss.wsf.spi.tools.api.WSContractProvider;
+import org.jboss.wsf.spi.tools.WSContractProvider;
import org.jboss.ws.metadata.builder.jaxws.JAXWSWebServiceMetaDataBuilder;
import org.jboss.ws.metadata.umdm.UnifiedMetaData;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/SunRIConsumerFactoryImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/SunRIConsumerFactoryImpl.java 2007-05-30 07:17:39 UTC (rev 3295)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/SunRIConsumerFactoryImpl.java 2007-05-30 07:21:11 UTC (rev 3296)
@@ -21,8 +21,8 @@
*/
package org.jboss.ws.tools.jaxws.impl;
-import org.jboss.wsf.spi.tools.api.WSContractConsumer;
-import org.jboss.wsf.spi.tools.spi.WSContractConsumerFactory;
+import org.jboss.wsf.spi.tools.WSContractConsumer;
+import org.jboss.wsf.spi.tools.WSContractConsumerFactory;
/**
* Creates a WSContractConsumer that delegates to the Sun RI.
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/SunRIConsumerImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/SunRIConsumerImpl.java 2007-05-30 07:17:39 UTC (rev 3295)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/SunRIConsumerImpl.java 2007-05-30 07:21:11 UTC (rev 3296)
@@ -22,7 +22,7 @@
package org.jboss.ws.tools.jaxws.impl;
import com.sun.tools.ws.wscompile.WsimportTool;
-import org.jboss.wsf.spi.tools.api.WSContractConsumer;
+import org.jboss.wsf.spi.tools.WSContractConsumer;
import java.io.File;
import java.io.PrintStream;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jaxws/WSContractProviderTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jaxws/WSContractProviderTestCase.java 2007-05-30 07:17:39 UTC (rev 3295)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jaxws/WSContractProviderTestCase.java 2007-05-30 07:21:11 UTC (rev 3296)
@@ -28,7 +28,7 @@
import org.jboss.test.ws.JBossWSTest;
import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory;
-import org.jboss.wsf.spi.tools.api.WSContractProvider;
+import org.jboss.wsf.spi.tools.WSContractProvider;
import org.jboss.wsf.spi.utils.JavaUtils;
/**
16 years, 11 months
- 1
- 0
JBossWS SVN: r3295 - in trunk/integration: sunri/src/main/etc and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-05-30 03:17:39 -0400 (Wed, 30 May 2007)
New Revision: 3295
Modified:
trunk/integration/native/src/main/etc/bindist-build.xml
trunk/integration/sunri/src/main/etc/bindist-build.xml
trunk/integration/xfire/src/main/etc/bindist-build.xml
Log:
Fix distro reference to jbossws-spi.jar
Modified: trunk/integration/native/src/main/etc/bindist-build.xml
===================================================================
--- trunk/integration/native/src/main/etc/bindist-build.xml 2007-05-30 07:12:42 UTC (rev 3294)
+++ trunk/integration/native/src/main/etc/bindist-build.xml 2007-05-30 07:17:39 UTC (rev 3295)
@@ -89,6 +89,7 @@
</path>
<path id="tests.extra.classpath">
+ <pathelement location="${lib.dir}/jbossws-spi.jar"/>
<pathelement location="${thirdparty.dir}/policy.jar"/>
</path>
Modified: trunk/integration/sunri/src/main/etc/bindist-build.xml
===================================================================
--- trunk/integration/sunri/src/main/etc/bindist-build.xml 2007-05-30 07:12:42 UTC (rev 3294)
+++ trunk/integration/sunri/src/main/etc/bindist-build.xml 2007-05-30 07:17:39 UTC (rev 3295)
@@ -99,6 +99,7 @@
</path>
<path id="tests.extra.classpath">
+ <pathelement location="${lib.dir}/jbossws-spi.jar"/>
</path>
</target>
Modified: trunk/integration/xfire/src/main/etc/bindist-build.xml
===================================================================
--- trunk/integration/xfire/src/main/etc/bindist-build.xml 2007-05-30 07:12:42 UTC (rev 3294)
+++ trunk/integration/xfire/src/main/etc/bindist-build.xml 2007-05-30 07:17:39 UTC (rev 3295)
@@ -118,6 +118,7 @@
</path>
<path id="tests.extra.classpath">
+ <pathelement location="${lib.dir}/jbossws-spi.jar"/>
</path>
</target>
16 years, 11 months
- 1
- 0
JBossWS SVN: r3294 - trunk/integration/native/ant-import.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-05-30 03:12:42 -0400 (Wed, 30 May 2007)
New Revision: 3294
Modified:
trunk/integration/native/ant-import/build-deploy.xml
Log:
Fix reference to jboss42.home
Modified: trunk/integration/native/ant-import/build-deploy.xml
===================================================================
--- trunk/integration/native/ant-import/build-deploy.xml 2007-05-30 07:09:22 UTC (rev 3293)
+++ trunk/integration/native/ant-import/build-deploy.xml 2007-05-30 07:12:42 UTC (rev 3294)
@@ -81,7 +81,7 @@
<macro-undeploy-native42>
<delete-tasks>
<delete>
- <fileset dir="${jboss50.home}/bin">
+ <fileset dir="${jboss42.home}/bin">
<include name="ws*.sh"/>
<include name="ws*.bat"/>
</fileset>
16 years, 11 months
- 1
- 0
JBossWS SVN: r3293 - in trunk/integration: xfire/src/test/resources and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-05-30 03:09:22 -0400 (Wed, 30 May 2007)
New Revision: 3293
Modified:
trunk/integration/sunri/src/test/resources/excludes-jboss42.txt
trunk/integration/sunri/src/test/resources/excludes-jboss50.txt
trunk/integration/xfire/src/test/resources/excludes-jboss42.txt
trunk/integration/xfire/src/test/resources/excludes-jboss50.txt
Log:
Exclude samples swaref
Modified: trunk/integration/sunri/src/test/resources/excludes-jboss42.txt
===================================================================
--- trunk/integration/sunri/src/test/resources/excludes-jboss42.txt 2007-05-30 07:07:01 UTC (rev 3292)
+++ trunk/integration/sunri/src/test/resources/excludes-jboss42.txt 2007-05-30 07:09:22 UTC (rev 3293)
@@ -13,6 +13,7 @@
org/jboss/test/ws/jaxws/samples/provider/**
org/jboss/test/ws/jaxws/samples/retail/**
org/jboss/test/ws/jaxws/samples/soapbinding/**
+org/jboss/test/ws/jaxws/samples/swaref/**
org/jboss/test/ws/jaxws/samples/webmethod/**
org/jboss/test/ws/jaxws/samples/webservice/**
org/jboss/test/ws/jaxws/samples/webserviceref/**
Modified: trunk/integration/sunri/src/test/resources/excludes-jboss50.txt
===================================================================
--- trunk/integration/sunri/src/test/resources/excludes-jboss50.txt 2007-05-30 07:07:01 UTC (rev 3292)
+++ trunk/integration/sunri/src/test/resources/excludes-jboss50.txt 2007-05-30 07:09:22 UTC (rev 3293)
@@ -12,6 +12,7 @@
org/jboss/test/ws/jaxws/samples/provider/**
org/jboss/test/ws/jaxws/samples/retail/**
org/jboss/test/ws/jaxws/samples/soapbinding/**
+org/jboss/test/ws/jaxws/samples/swaref/**
org/jboss/test/ws/jaxws/samples/webmethod/**
org/jboss/test/ws/jaxws/samples/webservice/**
org/jboss/test/ws/jaxws/samples/webserviceref/**
Modified: trunk/integration/xfire/src/test/resources/excludes-jboss42.txt
===================================================================
--- trunk/integration/xfire/src/test/resources/excludes-jboss42.txt 2007-05-30 07:07:01 UTC (rev 3292)
+++ trunk/integration/xfire/src/test/resources/excludes-jboss42.txt 2007-05-30 07:09:22 UTC (rev 3293)
@@ -13,6 +13,7 @@
org/jboss/test/ws/jaxws/samples/provider/**
org/jboss/test/ws/jaxws/samples/retail/**
org/jboss/test/ws/jaxws/samples/soapbinding/**
+org/jboss/test/ws/jaxws/samples/swaref/**
org/jboss/test/ws/jaxws/samples/webmethod/**
org/jboss/test/ws/jaxws/samples/webparam/**
org/jboss/test/ws/jaxws/samples/webresult/**
Modified: trunk/integration/xfire/src/test/resources/excludes-jboss50.txt
===================================================================
--- trunk/integration/xfire/src/test/resources/excludes-jboss50.txt 2007-05-30 07:07:01 UTC (rev 3292)
+++ trunk/integration/xfire/src/test/resources/excludes-jboss50.txt 2007-05-30 07:09:22 UTC (rev 3293)
@@ -13,6 +13,7 @@
org/jboss/test/ws/jaxws/samples/provider/**
org/jboss/test/ws/jaxws/samples/retail/**
org/jboss/test/ws/jaxws/samples/soapbinding/**
+org/jboss/test/ws/jaxws/samples/swaref/**
org/jboss/test/ws/jaxws/samples/webmethod/**
org/jboss/test/ws/jaxws/samples/webparam/**
org/jboss/test/ws/jaxws/samples/webresult/**
16 years, 11 months
- 1
- 0
JBossWS SVN: r3292 - in trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples: oneway and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-05-30 03:07:01 -0400 (Wed, 30 May 2007)
New Revision: 3292
Modified:
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointJAXBImpl.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSourceDocImpl.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSourceRpcImpl.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/oneway/PingEndpointImpl.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/DocBareServiceImpl.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/DocWrapped.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/DocWrappedServiceImpl.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/ExampleSEI.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/ExampleServiceImpl.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webmethod/TestEndpointImpl.java
Log:
Fix sample service names
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointJAXBImpl.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointJAXBImpl.java 2007-05-29 16:28:58 UTC (rev 3291)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointJAXBImpl.java 2007-05-30 07:07:01 UTC (rev 3292)
@@ -33,7 +33,7 @@
import org.jboss.logging.Logger;
-@WebService(name = "SOAPEndpoint", targetNamespace = "http://org.jboss.ws/jaxws/samples/logicalhandler")
+@WebService(name = "SOAPEndpoint", serviceName = "SOAPEndpointService", targetNamespace = "http://org.jboss.ws/jaxws/samples/logicalhandler")
@HandlerChain(file = "jaxws-server-jaxb-handlers.xml")
public class SOAPEndpointJAXBImpl
{
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSourceDocImpl.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSourceDocImpl.java 2007-05-29 16:28:58 UTC (rev 3291)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSourceDocImpl.java 2007-05-30 07:07:01 UTC (rev 3292)
@@ -33,7 +33,7 @@
import org.jboss.logging.Logger;
-@WebService(name = "SOAPEndpointDoc", targetNamespace = "http://org.jboss.ws/jaxws/samples/logicalhandler")
+@WebService(name = "SOAPEndpointDoc", serviceName = "SOAPEndpointDocService", targetNamespace = "http://org.jboss.ws/jaxws/samples/logicalhandler")
@HandlerChain(file = "jaxws-server-source-handlers.xml")
public class SOAPEndpointSourceDocImpl
{
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSourceRpcImpl.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSourceRpcImpl.java 2007-05-29 16:28:58 UTC (rev 3291)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSourceRpcImpl.java 2007-05-30 07:07:01 UTC (rev 3292)
@@ -31,7 +31,7 @@
import org.jboss.logging.Logger;
-@WebService(name = "SOAPEndpointRpc", targetNamespace = "http://org.jboss.ws/jaxws/samples/logicalhandler")
+@WebService(name = "SOAPEndpointRpc", serviceName = "SOAPEndpointRpcService", targetNamespace = "http://org.jboss.ws/jaxws/samples/logicalhandler")
@HandlerChain(file = "jaxws-server-source-handlers.xml")
@SOAPBinding(style = Style.RPC)
public class SOAPEndpointSourceRpcImpl
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/oneway/PingEndpointImpl.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/oneway/PingEndpointImpl.java 2007-05-29 16:28:58 UTC (rev 3291)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/oneway/PingEndpointImpl.java 2007-05-30 07:07:01 UTC (rev 3292)
@@ -34,7 +34,7 @@
* @author Thomas.Diesler(a)jboss.org
* @since 07-Oct-2005
*/
-@WebService (name="PingEndpoint")
+@WebService (name="PingEndpoint", serviceName="PingEndpointService")
@SOAPBinding(style = SOAPBinding.Style.RPC)
public class PingEndpointImpl
{
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/DocBareServiceImpl.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/DocBareServiceImpl.java 2007-05-29 16:28:58 UTC (rev 3291)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/DocBareServiceImpl.java 2007-05-30 07:07:01 UTC (rev 3292)
@@ -36,7 +36,7 @@
* @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a>
* @since 16-Oct-2005
*/
-@WebService(name = "DocBare")
+@WebService(name = "DocBare", serviceName="DocBareService")
@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
public class DocBareServiceImpl
{
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/DocWrapped.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/DocWrapped.java 2007-05-29 16:28:58 UTC (rev 3291)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/DocWrapped.java 2007-05-30 07:07:01 UTC (rev 3292)
@@ -38,8 +38,7 @@
@WebMethod(operationName = "SubmitNamespacedPO")
@WebResult(name = "NamespacedPurchaseOrderAck", targetNamespace = "http://namespace/result")
- public PurchaseOrderAck submitNamespacedPO(
- @WebParam(name = "NamespacedPurchaseOrder", targetNamespace = "http://namespace/purchase")
- PurchaseOrder purchaseOrder, @WebParam(name = "NamespacedString", targetNamespace = "http://namespace/string")
- String string);
+ public PurchaseOrderAck submitNamespacedPO(@WebParam(name = "NamespacedPurchaseOrder", targetNamespace = "http://namespace/purchase")
+ PurchaseOrder purchaseOrder, @WebParam(name = "NamespacedString", targetNamespace = "http://namespace/string")
+ String string);
}
\ No newline at end of file
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/DocWrappedServiceImpl.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/DocWrappedServiceImpl.java 2007-05-29 16:28:58 UTC (rev 3291)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/DocWrappedServiceImpl.java 2007-05-30 07:07:01 UTC (rev 3292)
@@ -33,7 +33,7 @@
* @since 16-Oct-2005
*/
-@WebService(endpointInterface = "org.jboss.test.ws.jaxws.samples.soapbinding.DocWrapped", name="DocWrapped")
+@WebService(name="DocWrapped", serviceName="DocWrappedService", endpointInterface = "org.jboss.test.ws.jaxws.samples.soapbinding.DocWrapped")
public class DocWrappedServiceImpl implements DocWrapped
{
// Provide logging
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/ExampleSEI.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/ExampleSEI.java 2007-05-29 16:28:58 UTC (rev 3291)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/ExampleSEI.java 2007-05-30 07:07:01 UTC (rev 3292)
@@ -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.test.ws.jaxws.samples.soapbinding;
import java.rmi.Remote;
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/ExampleServiceImpl.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/ExampleServiceImpl.java 2007-05-29 16:28:58 UTC (rev 3291)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/ExampleServiceImpl.java 2007-05-30 07:07:01 UTC (rev 3292)
@@ -32,7 +32,7 @@
* @since 16-Oct-2005
*/
-@WebService(endpointInterface="org.jboss.test.ws.jaxws.samples.soapbinding.ExampleSEI", name="Example")
+@WebService(name="Example", serviceName="ExampleService", endpointInterface="org.jboss.test.ws.jaxws.samples.soapbinding.ExampleSEI")
public class ExampleServiceImpl
{
// Provide logging
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webmethod/TestEndpointImpl.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webmethod/TestEndpointImpl.java 2007-05-29 16:28:58 UTC (rev 3291)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webmethod/TestEndpointImpl.java 2007-05-30 07:07:01 UTC (rev 3292)
@@ -32,7 +32,7 @@
* @since 12-Aug-2005
*/
-@WebService(endpointInterface = "org.jboss.test.ws.jaxws.samples.webmethod.TestEndpoint", name="TestEndpoint")
+@WebService(name="TestEndpoint", serviceName="TestEndpointService", endpointInterface = "org.jboss.test.ws.jaxws.samples.webmethod.TestEndpoint")
public class TestEndpointImpl
{
// Provide logging
16 years, 11 months
- 1
- 0
JBossWS SVN: r3291 - in trunk: integration/native and 7 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-05-29 12:28:58 -0400 (Tue, 29 May 2007)
New Revision: 3291
Modified:
trunk/build/build.xml
trunk/integration/native/ant-import/build-deploy.xml
trunk/integration/native/build.xml
trunk/integration/sunri/build.xml
trunk/integration/sunri/src/test/resources/excludes-jboss50.txt
trunk/integration/xfire/build.xml
trunk/jbossws-core/build.xml
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousProxyTestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpoint.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpointBean.java
Log:
Enable SunRI jaxws/asynchronous
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2007-05-29 15:16:17 UTC (rev 3290)
+++ trunk/build/build.xml 2007-05-29 16:28:58 UTC (rev 3291)
@@ -153,13 +153,17 @@
</target>
<target name="most" description="Builds almost everything." depends="prepare">
+ <ant antfile="${core.dir}/build.xml" target="most" inheritall="false"/>
<ant antfile="${int.native.dir}/build.xml" target="most" inheritall="false"/>
<ant antfile="${int.sunri.dir}/build.xml" target="most" inheritall="false"/>
<ant antfile="${int.xfire.dir}/build.xml" target="most" inheritall="false"/>
- <ant antfile="${core.dir}/build.xml" target="tests-main" inheritall="false"/>
</target>
- <target name="all" description="Create a distribution zip file" depends="most"> <!--build-bin-dist,build-src-dist -->
+ <target name="all" description="Create a distribution zip file" depends="prepare">
+ <ant antfile="${core.dir}/build.xml" target="all" inheritall="false"/>
+ <ant antfile="${int.native.dir}/build.xml" target="all" inheritall="false"/>
+ <ant antfile="${int.sunri.dir}/build.xml" target="all" inheritall="false"/>
+ <ant antfile="${int.xfire.dir}/build.xml" target="all" inheritall="false"/>
</target>
</project>
Modified: trunk/integration/native/ant-import/build-deploy.xml
===================================================================
--- trunk/integration/native/ant-import/build-deploy.xml 2007-05-29 15:16:17 UTC (rev 3290)
+++ trunk/integration/native/ant-import/build-deploy.xml 2007-05-29 16:28:58 UTC (rev 3291)
@@ -21,7 +21,6 @@
<!-- Deploy jbossws to jboss50 -->
<target name="deploy-jboss50" depends="jars-jboss50,undeploy-jboss50" description="Deploy jbossws to jboss50">
- <ant antfile="${int.jboss50.dir}/build.xml" target="jars" inheritall="false"/>
<ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/>
<ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/>
<macro-deploy-native50
@@ -58,7 +57,8 @@
<!-- Deploy jbossws to jboss42 -->
<target name="deploy-jboss42" depends="jars-jboss42,undeploy-jboss42" description="Deploy jbossws to jboss42">
- <ant antfile="${int.jboss42.dir}/build.xml" target="jars" inheritall="false"/>
+ <ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/>
+ <ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/>
<macro-deploy-native42
spilibs="${spi.dir}/output/lib"
jbosslibs="${int.jboss42.dir}/output/lib"
Modified: trunk/integration/native/build.xml
===================================================================
--- trunk/integration/native/build.xml 2007-05-29 15:16:17 UTC (rev 3290)
+++ trunk/integration/native/build.xml 2007-05-29 16:28:58 UTC (rev 3291)
@@ -40,7 +40,7 @@
<!-- ================================================================== -->
<target name="init" depends="prepare,thirdparty">
- <ant antfile="${core.dir}/build.xml" target="main" inheritall="false"/>
+ <ant antfile="${core.dir}/build.xml" target="jars" inheritall="false"/>
</target>
<!-- ================================================================== -->
@@ -229,9 +229,8 @@
<target name="main" description="Executes the default target (most)." depends="most"/>
- <target name="most" description="Builds almost everything." depends="jars"/>
+ <target name="most" description="Builds almost everything." depends="jars,tests-main"/>
- <target name="all" description="Create a distribution zip file" depends="most">
- </target>
+ <target name="all" description="Create a distribution zip file" depends="most,binary-dist"/>
</project>
Modified: trunk/integration/sunri/build.xml
===================================================================
--- trunk/integration/sunri/build.xml 2007-05-29 15:16:17 UTC (rev 3290)
+++ trunk/integration/sunri/build.xml 2007-05-29 16:28:58 UTC (rev 3291)
@@ -244,9 +244,8 @@
<target name="main" description="Executes the default target (most)." depends="most"/>
- <target name="most" description="Builds almost everything." depends="jars"/>
+ <target name="most" description="Builds almost everything." depends="jars,tests-main"/>
- <target name="all" description="Create a distribution zip file" depends="most,tests-main">
- </target>
+ <target name="all" description="Create a distribution zip file" depends="most,binary-dist"/>
</project>
Modified: trunk/integration/sunri/src/test/resources/excludes-jboss50.txt
===================================================================
--- trunk/integration/sunri/src/test/resources/excludes-jboss50.txt 2007-05-29 15:16:17 UTC (rev 3290)
+++ trunk/integration/sunri/src/test/resources/excludes-jboss50.txt 2007-05-29 16:28:58 UTC (rev 3291)
@@ -2,7 +2,6 @@
# $Id$
#
-org/jboss/test/ws/jaxws/samples/asynchronous/**
org/jboss/test/ws/jaxws/samples/context/**
org/jboss/test/ws/jaxws/samples/exception/**
org/jboss/test/ws/jaxws/samples/handlerchain/**
Modified: trunk/integration/xfire/build.xml
===================================================================
--- trunk/integration/xfire/build.xml 2007-05-29 15:16:17 UTC (rev 3290)
+++ trunk/integration/xfire/build.xml 2007-05-29 16:28:58 UTC (rev 3291)
@@ -239,9 +239,8 @@
<target name="main" description="Executes the default target (most)." depends="most"/>
- <target name="most" description="Builds almost everything." depends="jars"/>
+ <target name="most" description="Builds almost everything." depends="jars,tests-main"/>
- <target name="all" description="Create a distribution zip file" depends="most,tests-main">
- </target>
+ <target name="all" description="Create a distribution zip file" depends="most,binary-dist"/>
</project>
Modified: trunk/jbossws-core/build.xml
===================================================================
--- trunk/jbossws-core/build.xml 2007-05-29 15:16:17 UTC (rev 3290)
+++ trunk/jbossws-core/build.xml 2007-05-29 16:28:58 UTC (rev 3291)
@@ -237,9 +237,9 @@
<target name="main" description="Executes the default target (most)." depends="most"/>
- <target name="most" description="Builds almost everything." depends="jars"/>
+ <target name="most" description="Builds almost everything." depends="jars,tests-jars"/>
- <target name="all" description="Create a distribution zip file" depends="most,tests-jars">
+ <target name="all" description="Create a distribution zip file" depends="most">
</target>
</project>
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2007-05-29 15:16:17 UTC (rev 3290)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2007-05-29 16:28:58 UTC (rev 3291)
@@ -293,7 +293,7 @@
String serviceName = anWebService.serviceName();
if (serviceName.length() == 0)
- serviceName = name + "Service";
+ serviceName = WSDLUtils.getJustClassName(sepClass) + "Service";
String serviceNS = anWebService.targetNamespace();
if (serviceNS.length() == 0)
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousProxyTestCase.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousProxyTestCase.java 2007-05-29 15:16:17 UTC (rev 3290)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousProxyTestCase.java 2007-05-29 16:28:58 UTC (rev 3291)
@@ -72,23 +72,6 @@
assertEquals("Async", retStr);
}
- public void testInvokeAsyncReentrant() throws Exception
- {
- System.out.println("FIXME: [JBWS-1294] Add support for mapping async methods");
- if (true) return;
-
- TestEndpoint port = createProxy();
- Response response = port.echoAsync("Async");
-
- // do something in between
- String retStr = port.echo("Sync");
- assertEquals("Sync", retStr);
-
- // access future
- retStr = (String) response.get();
- assertEquals("Async", retStr);
- }
-
public void testInvokeAsyncHandler() throws Exception
{
AsyncHandler<String> handler = new AsyncHandler<String>()
@@ -121,7 +104,7 @@
private TestEndpoint createProxy() throws MalformedURLException
{
URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-samples-asynchronous?wsdl");
- QName serviceName = new QName(targetNS, "TestEndpointService");
+ QName serviceName = new QName(targetNS, "TestEndpointBeanService");
Service service = Service.create(wsdlURL, serviceName);
return (TestEndpoint)service.getPort(TestEndpoint.class);
}
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpoint.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpoint.java 2007-05-29 15:16:17 UTC (rev 3290)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpoint.java 2007-05-29 16:28:58 UTC (rev 3291)
@@ -1,3 +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.
+ */
package org.jboss.test.ws.jaxws.samples.asynchronous;
import java.util.concurrent.Future;
@@ -11,28 +32,17 @@
import javax.xml.ws.AsyncHandler;
import javax.xml.ws.Response;
-/**
- * This class was generated by the JAXWS SI.
- * JAX-WS RI 2.0_01-b59-fcs
- * Generated source version: 2.0
- *
- */
@WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/jaxws/asynchronous")
@SOAPBinding(style = Style.RPC)
public interface TestEndpoint
{
@WebMethod(operationName = "echo")
- public Response<String> echoAsync(@WebParam(name = "String_1", partName = "String_1")
- String string1);
+ public Response<String> echoAsync(@WebParam(name = "String_1") String string1);
@WebMethod(operationName = "echo")
- public Future<?> echoAsync(@WebParam(name = "String_1", partName = "String_1")
- String string1, @WebParam(name = "asyncHandler", partName = "asyncHandler")
- AsyncHandler<String> asyncHandler);
+ public Future<?> echoAsync(@WebParam(name = "String_1") String string1, @WebParam(name = "asyncHandler") AsyncHandler<String> asyncHandler);
@WebMethod
- @WebResult(name = "result", partName = "result")
- public String echo(@WebParam(name = "String_1", partName = "String_1")
- String string1);
-
+ @WebResult(name = "result")
+ public String echo(@WebParam(name = "String_1") String string1);
}
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpointBean.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpointBean.java 2007-05-29 15:16:17 UTC (rev 3290)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpointBean.java 2007-05-29 16:28:58 UTC (rev 3291)
@@ -23,16 +23,24 @@
// $Id$
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebResult;
import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+import javax.jws.soap.SOAPBinding.Style;
import org.jboss.logging.Logger;
-@WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/jaxws/asynchronous", endpointInterface = "org.jboss.test.ws.jaxws.samples.asynchronous.TestEndpoint")
+@WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/jaxws/asynchronous")
+@SOAPBinding(style = Style.RPC)
public class TestEndpointBean
{
private static Logger log = Logger.getLogger(TestEndpointBean.class);
- public String echo(String msg)
+ @WebMethod
+ @WebResult(name = "result")
+ public String echo(@WebParam(name = "String_1") String msg)
{
log.info("echo: " + msg);
return msg;
16 years, 11 months
- 1
- 0
JBossWS SVN: r3290 - in branches/dlofthouse/JBWS-1597/jbossws-tests/src: resources/tools/jbws1597 and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-05-29 11:16:17 -0400 (Tue, 29 May 2007)
New Revision: 3290
Added:
branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/
branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/PhoneBook.wsdl
branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/wstools-config.xml
Modified:
branches/dlofthouse/JBWS-1597/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java
Log:
A doc/lit with one in and one out header.
Modified: branches/dlofthouse/JBWS-1597/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java
===================================================================
--- branches/dlofthouse/JBWS-1597/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java 2007-05-29 15:07:21 UTC (rev 3289)
+++ branches/dlofthouse/JBWS-1597/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java 2007-05-29 15:16:17 UTC (rev 3290)
@@ -51,7 +51,12 @@
{
generateScenario("doclit_inout");
}
-
+
+ public void testGenerateDocLitInAndOut() throws Exception
+ {
+ generateScenario("doclit_in_and_out");
+ }
+
protected void generateScenario(final String scenario) throws Exception
{
String resourceDir = "resources/tools/jbws1597/" + scenario;
Added: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/PhoneBook.wsdl
===================================================================
--- branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/PhoneBook.wsdl (rev 0)
+++ branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/PhoneBook.wsdl 2007-05-29 15:16:17 UTC (rev 3290)
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='PhoneBook'
+ targetNamespace='http://test.jboss.org/ws/jbws1597'
+ xmlns='http://schemas.xmlsoap.org/wsdl/'
+ xmlns:ns1='http://test.jboss.org/ws/jbws1597/types'
+ xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/'
+ xmlns:tns='http://test.jboss.org/ws/jbws1597'
+ xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <schema targetNamespace='http://test.jboss.org/ws/jbws1597/types'
+ xmlns='http://www.w3.org/2001/XMLSchema'
+ xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/'
+ xmlns:tns='http://test.jboss.org/ws/jbws1597/types'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+
+ <complexType name='Person'>
+ <sequence>
+ <element name='firstName' nillable='true' type='string'/>
+ <element name='surname' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+
+ <complexType name='NickName'>
+ <sequence>
+ <element name='name' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+
+ <complexType name='TelephoneNumber'>
+ <sequence>
+ <element name='areaCode' nillable='true' type='string'/>
+ <element name='number' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+
+ <complexType name='BillingAccount'>
+ <sequence>
+ <element name='sortCode' nillable='true' type='string'/>
+ <element name='accountNumber' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+
+ <element name='lookup' type='tns:Person'/>
+ <element name='lookupResponse' type='tns:TelephoneNumber'/>
+ <element name='nickName' type='tns:NickName'/>
+ <element name='billingAccount' type='tns:BillingAccount'/>
+ </schema>
+ </types>
+
+ <message name='PhoneBook_lookup'>
+ <part element='ns1:lookup' name='parameters'/>
+ <part element='ns1:nickName' name='inHeader'/>
+ </message>
+
+ <message name='PhoneBook_lookupResponse'>
+ <part element='ns1:lookupResponse' name='result'/>
+ <part element='ns1:billingAccount' name='outHeader'/>
+ </message>
+
+ <portType name='PhoneBook'>
+ <operation name='lookup'>
+ <input message='tns:PhoneBook_lookup'/>
+ <output message='tns:PhoneBook_lookupResponse'/>
+ </operation>
+ </portType>
+
+ <binding name='PhoneBookBinding' type='tns:PhoneBook'>
+ <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='lookup'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal' parts='parameters' />
+ <soap:header use='literal' message='tns:PhoneBook_lookup' part='inHeader' />
+ </input>
+ <output>
+ <soap:body use='literal' parts='result' />
+ <soap:header use='literal' message='tns:PhoneBook_lookupResponse' part='outHeader' />
+ </output>
+ </operation>
+ </binding>
+ <service name='PhoneBook'>
+ <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Property changes on: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/PhoneBook.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/wstools-config.xml
===================================================================
--- branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/wstools-config.xml (rev 0)
+++ branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/wstools-config.xml 2007-05-29 15:16:17 UTC (rev 3290)
@@ -0,0 +1,6 @@
+<configuration>
+ <wsdl-java location="resources/tools/jbws1597/doclit_in_and_out/PhoneBook.wsdl"
+ parameter-style="bare">
+ <mapping file="jaxrpc-mapping.xml"/>
+ </wsdl-java>
+</configuration>
Property changes on: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/wstools-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
16 years, 11 months
- 1
- 0
JBossWS SVN: r3289 - trunk/testsuite/ant-import.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-05-29 11:07:21 -0400 (Tue, 29 May 2007)
New Revision: 3289
Modified:
trunk/testsuite/ant-import/build-jars-jaxws.xml
Log:
Add missing swaref jars
Modified: trunk/testsuite/ant-import/build-jars-jaxws.xml
===================================================================
--- trunk/testsuite/ant-import/build-jars-jaxws.xml 2007-05-29 14:57:26 UTC (rev 3288)
+++ trunk/testsuite/ant-import/build-jars-jaxws.xml 2007-05-29 15:07:21 UTC (rev 3289)
@@ -209,7 +209,15 @@
<include name="org/jboss/test/ws/jaxws/samples/soapbinding/PurchaseOrderAck.class"/>
</classes>
</war>
-
+
+ <!-- jaxws-samples-swaref -->
+ <jar jarfile="${tests.output.dir}/libs/jaxws-samples-swaref.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/swaref/*.class"/>
+ <exclude name="org/jboss/test/ws/jaxws/samples/swaref/*Test*.class"/>
+ </fileset>
+ </jar>
+
<!-- jaxws-samples-webmethod -->
<war warfile="${tests.output.dir}/libs/jaxws-samples-webmethod.war" webxml="${tests.output.dir}/resources/jaxws/samples/webmethod/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
16 years, 11 months
- 1
- 0
JBossWS SVN: r3288 - trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-05-29 10:57:26 -0400 (Tue, 29 May 2007)
New Revision: 3288
Modified:
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/DHResponse.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMEndpointBean.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMProtocolHandler.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPTestCase.java
Log:
Fix xop test cases
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/DHResponse.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/DHResponse.java 2007-05-29 14:57:05 UTC (rev 3287)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/DHResponse.java 2007-05-29 14:57:26 UTC (rev 3288)
@@ -39,7 +39,7 @@
this.dataHandler = dataHandler;
}
- @XmlMimeType("image/jpeg")
+ @XmlMimeType("text/plain")
public DataHandler getDataHandler() {
return dataHandler;
}
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMEndpointBean.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMEndpointBean.java 2007-05-29 14:57:05 UTC (rev 3287)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMEndpointBean.java 2007-05-29 14:57:26 UTC (rev 3288)
@@ -49,7 +49,8 @@
throw new WebServiceException(e);
}
- return new DHResponse(request.getDataHandler());
+ DataHandler responseData = new DataHandler("Server data", "text/plain");
+ return new DHResponse(responseData);
}
public ImageResponse echoImage(ImageRequest request)
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMProtocolHandler.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMProtocolHandler.java 2007-05-29 14:57:05 UTC (rev 3287)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMProtocolHandler.java 2007-05-29 14:57:26 UTC (rev 3288)
@@ -21,6 +21,12 @@
*/
package org.jboss.test.ws.jaxws.samples.xop.doclit;
+import org.jboss.logging.Logger;
+import org.jboss.wsf.spi.handler.GenericSOAPHandler;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import javax.xml.soap.SOAPBody;
import javax.xml.soap.SOAPEnvelope;
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPMessage;
@@ -28,13 +34,10 @@
import javax.xml.ws.handler.MessageContext;
import javax.xml.ws.handler.soap.SOAPMessageContext;
-import org.jboss.logging.Logger;
-import org.jboss.wsf.spi.handler.GenericSOAPHandler;
-import org.jboss.wsf.spi.utils.DOMWriter;
-
/**
* A MTOM handler should see the conceptual payload,
* which means an inlined representation of the binary data.
+ * It checks existence of the xop:Include element.
*/
public class MTOMProtocolHandler extends GenericSOAPHandler
{
@@ -42,22 +45,26 @@
protected boolean handleOutbound(MessageContext msgContext)
{
- return dumpMessage(msgContext);
+ return verifyXOPPackage(msgContext);
}
protected boolean handleInbound(MessageContext msgContext)
{
- return dumpMessage(msgContext);
+ return verifyXOPPackage(msgContext);
}
- private boolean dumpMessage(MessageContext context)
+ private boolean verifyXOPPackage(MessageContext context)
{
try
{
SOAPMessageContext msgContext = (SOAPMessageContext)context;
SOAPMessage soapMsg = msgContext.getMessage();
SOAPEnvelope soapEnv = soapMsg.getSOAPPart().getEnvelope();
- log.info(DOMWriter.printNode(soapEnv, true));
+ SOAPBody body = soapEnv.getBody();
+ boolean found = scanNodes(body.getChildNodes());
+
+ if(found) throw new IllegalStateException("XOP request not properly inlined");
+
}
catch (SOAPException ex)
{
@@ -66,4 +73,24 @@
return true;
}
+
+ private boolean scanNodes(NodeList nodes)
+ {
+ boolean found = false;
+ for(int i = 0; i<nodes.getLength(); i++)
+ {
+ Node n = nodes.item(i);
+ if("Include".equals(n.getLocalName()))
+ {
+ found = true;
+ break;
+ }
+ else
+ {
+ found = scanNodes(n.getChildNodes());
+ }
+ }
+
+ return found;
+ }
}
\ No newline at end of file
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java 2007-05-29 14:57:05 UTC (rev 3287)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java 2007-05-29 14:57:26 UTC (rev 3288)
@@ -54,28 +54,20 @@
return binding;
}
- public void testDHRoundtrip() throws Exception
- {
- getBinding().setMTOMEnabled(true);
+ /**
+ * Marshalling/Unmarshalling of DataHandler types is different
+ * when handlers are in place.
+ * @throws Exception
+ */
+ public abstract void testDHRoundtrip() throws Exception;
- DataHandler dh = new DataHandler(imgFile.toURL());
- DHResponse response = getPort().echoDataHandler(new DHRequest(dh));
- assertNotNull(response);
- assertEquals("image/jpeg", response.getDataHandler().getContentType());
- assertTrue(response.getDataHandler().getContent() instanceof BufferedImage);
- }
+ /**
+ * Marshalling/Unmarshalling of DataHandler types is different
+ * when handlers are in place.
+ * @throws Exception
+ */
+ public abstract void testDHResponseOptimzed() throws Exception;
- public void testDHResponseOptimzed() throws Exception
- {
- getBinding().setMTOMEnabled(false);
-
- DataHandler dh = new DataHandler(imgFile.toURL());
- DHResponse response = getPort().echoDataHandler(new DHRequest(dh));
- assertNotNull(response);
- assertEquals("application/octet-stream", response.getDataHandler().getContentType());
- assertTrue("Wrong java type returned", response.getDataHandler().getContent() instanceof InputStream);
- }
-
public void testImgRoundtrip() throws Exception
{
getBinding().setMTOMEnabled(true);
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java 2007-05-29 14:57:05 UTC (rev 3287)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java 2007-05-29 14:57:26 UTC (rev 3288)
@@ -21,21 +21,22 @@
*/
package org.jboss.test.ws.jaxws.samples.xop.doclit;
-// $Id: $
+// $Revision: $
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
+import junit.framework.Test;
+import org.jboss.test.ws.JBossWSTestSetup;
import javax.xml.namespace.QName;
import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Service;
import javax.xml.ws.handler.Handler;
import javax.xml.ws.soap.SOAPBinding;
+import javax.activation.DataHandler;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+import java.io.InputStream;
-import junit.framework.Test;
-
-import org.jboss.test.ws.JBossWSTestSetup;
-
/**
* Test service endpoint capability to process inlined and optimized
* requests transparently. Both client and service endpoint do have handlers in place.
@@ -51,7 +52,7 @@
*/
public class XOPHandlerTestCase extends XOPBase
{
- public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-samples-xop-doclit/MTOMService";
+ public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-samples-xop-doclit/bare";
public static Test suite()
{
@@ -64,7 +65,7 @@
QName serviceName = new QName("http://doclit.xop.samples.jaxws.ws.test.jboss.org/", "MTOMService");
URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
- javax.xml.ws.Service service = javax.xml.ws.Service.create(wsdlURL, serviceName);
+ Service service = Service.create(wsdlURL, serviceName);
port = service.getPort(MTOMEndpoint.class);
// enable MTOM
@@ -76,4 +77,34 @@
handlerChain.add(new MTOMProtocolHandler());
binding.setHandlerChain(handlerChain);
}
+
+ /**
+ * Consumption of inlined data should will always result on 'application/octet-stream'
+ * @throws Exception
+ */
+ public void testDHRoundtrip() throws Exception
+ {
+ getBinding().setMTOMEnabled(true);
+
+ DataHandler dh = new DataHandler("Client Data", "text/plain");
+ DHResponse response = getPort().echoDataHandler(new DHRequest(dh));
+ assertNotNull(response);
+ assertEquals("application/octet-stream", response.getDataHandler().getContentType());
+ assertTrue("Wrong java type returned", response.getDataHandler().getContent() instanceof InputStream);
+ }
+
+ /**
+ * Consumption of inlined data should will always result on 'application/octet-stream'
+ * @throws Exception
+ */
+ public void testDHResponseOptimzed() throws Exception
+ {
+ getBinding().setMTOMEnabled(false);
+
+ DataHandler dh = new DataHandler("Client data", "text/plain");
+ DHResponse response = getPort().echoDataHandler(new DHRequest(dh));
+ assertNotNull(response);
+ assertEquals("application/octet-stream", response.getDataHandler().getContentType());
+ assertTrue("Wrong java type returned", response.getDataHandler().getContent() instanceof InputStream);
+ }
}
\ No newline at end of file
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPTestCase.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPTestCase.java 2007-05-29 14:57:05 UTC (rev 3287)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPTestCase.java 2007-05-29 14:57:26 UTC (rev 3288)
@@ -22,11 +22,13 @@
package org.jboss.test.ws.jaxws.samples.xop.doclit;
import java.net.URL;
+import java.io.InputStream;
import javax.xml.namespace.QName;
import javax.xml.ws.BindingProvider;
import javax.xml.ws.Service;
import javax.xml.ws.soap.SOAPBinding;
+import javax.activation.DataHandler;
import junit.framework.Test;
@@ -47,7 +49,7 @@
public class XOPTestCase extends XOPBase
{
- public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-samples-xop-doclit/MTOMService";
+ public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-samples-xop-doclit/bare";
public static Test suite()
{
@@ -68,4 +70,34 @@
binding.setMTOMEnabled(true);
}
+
+ /**
+ * Consumption of XOP packages (not inlined) should reslve the correct java type.
+ * @throws Exception
+ */
+ public void testDHRoundtrip() throws Exception
+ {
+ getBinding().setMTOMEnabled(true);
+
+ DataHandler dh = new DataHandler("Client Data", "text/plain");
+ DHResponse response = getPort().echoDataHandler(new DHRequest(dh));
+ assertNotNull(response);
+ assertEquals("text/plain", response.getDataHandler().getContentType());
+ assertTrue("Server data".equals( response.getDataHandler().getContent() ));
+ }
+
+ /**
+ * Consumption of XOP packages (not inlined) should reslve the correct java type.
+ * @throws Exception
+ */
+ public void testDHResponseOptimzed() throws Exception
+ {
+ getBinding().setMTOMEnabled(false);
+
+ DataHandler dh = new DataHandler("Client data", "text/plain");
+ DHResponse response = getPort().echoDataHandler(new DHRequest(dh));
+ assertNotNull(response);
+ assertEquals("text/plain", response.getDataHandler().getContentType());
+ assertTrue("Server data".equals( response.getDataHandler().getContent() ));
+ }
}
\ No newline at end of file
16 years, 11 months
- 1
- 0