February 2008 - jbossws-commits - Jboss List Archives

JBossWS SVN: r5704 - in stack/native/trunk: ant-import and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-02-15 10:17:51 -0500 (Fri, 15 Feb 2008) New Revision: 5704 Modified: stack/native/trunk/ant-import/build-bin-dist.xml stack/native/trunk/ant-import/build-release.xml stack/native/trunk/build.xml stack/native/trunk/version.properties Log: version.id=3.0.1-native-2.0.4.GA Modified: stack/native/trunk/ant-import/build-bin-dist.xml =================================================================== --- stack/native/trunk/ant-import/build-bin-dist.xml 2008-02-15 13:23:05 UTC (rev 5703) +++ stack/native/trunk/ant-import/build-bin-dist.xml 2008-02-15 15:17:51 UTC (rev 5704) @@ -12,153 +12,150 @@  <project> - -  -  -  - - <target name="build-bin-dist" depends="jars, javadoc" description="Build the binary distribution"> - -  - <property name="dist.name" value="${specification.version}-metro-${version.id}"/> - - <property name="bindist.dir" value="${core.output.dir}/jbossws-native-dist"/> - <property name="bindist.build.dir" value="${bindist.dir}/build"/> - <property name="bindist.bin.dir" value="${bindist.dir}/bin"/> - <property name="bindist.lib.dir" value="${bindist.dir}/lib"/> - <property name="bindist.docs.dir" value="${bindist.dir}/docs"/> - <property name="bindist.tests.dir" value="${bindist.dir}/tests"/> - <property name="bindist.tools.dir" value="${bindist.dir}/tools"/> - - <delete dir="${bindist.dir}"/> - <mkdir dir="${bindist.build.dir}"/> - <mkdir dir="${bindist.bin.dir}"/> - <mkdir dir="${bindist.docs.dir}"/> - <mkdir dir="${bindist.tests.dir}"/> - <mkdir dir="${bindist.tools.dir}"/> - -  - <copy tofile="${bindist.dir}/ant.properties" file="${core.distro.dir}/ant.properties.example"> + +  +  +  + + <target name="build-bin-dist" depends="jars, javadoc" description="Build the binary distribution"> + + <property name="bindist.dir" value="${core.output.dir}/jbossws-native-dist"/> + <property name="bindist.build.dir" value="${bindist.dir}/build"/> + <property name="bindist.bin.dir" value="${bindist.dir}/bin"/> + <property name="bindist.lib.dir" value="${bindist.dir}/lib"/> + <property name="bindist.docs.dir" value="${bindist.dir}/docs"/> + <property name="bindist.tests.dir" value="${bindist.dir}/tests"/> + <property name="bindist.tools.dir" value="${bindist.dir}/tools"/> + + <delete dir="${bindist.dir}"/> + <mkdir dir="${bindist.build.dir}"/> + <mkdir dir="${bindist.bin.dir}"/> + <mkdir dir="${bindist.docs.dir}"/> + <mkdir dir="${bindist.tests.dir}"/> + <mkdir dir="${bindist.tools.dir}"/> + +  + <copy tofile="${bindist.dir}/ant.properties" file="${core.distro.dir}/ant.properties.example"> <filterset> <filtersfile file="${core.dir}/ant.properties"/> </filterset> </copy> - <copy tofile="${bindist.dir}/version.properties" file="${core.dir}/version.properties"/> - <copy tofile="${bindist.dir}/build.xml" file="${core.distro.dir}/bin-dist-build.xml"/> - <copy tofile="${bindist.build.dir}/build-deploy.xml" file="${core.distro.dir}/bin-dist-deploy.xml"/> - <copy tofile="${bindist.build.dir}/build-project-gen.xml" file="${core.distro.dir}/bin-dist-project-gen.xml"/> - -  - <copy todir="${bindist.build.dir}"> - <fileset dir="${core.dir}/ant-import"> - <include name="macros-deploy-framework.xml"/> - <include name="macros-deploy-native.xml"/> - </fileset> - <fileset dir="${core.distro.dir}"> - <include name="user-project-build.xml"/> - <include name="eclipse.project"/> - <include name="eclipse.classpath"/> - </fileset> - </copy> - - <unzip dest="${bindist.bin.dir}" src="${thirdparty.dir}/jbossws-framework-scripts.zip"/> - - <copy todir="${bindist.bin.dir}"> - <fileset dir="${core.dir}/src/main/etc"> - <include name="*.sh"/> - <include name="*.bat"/> - </fileset> - </copy> - - <chmod dir="${bindist.bin.dir}" perm="+x" includes="**/*.sh"/> - -  - <copy todir="${bindist.docs.dir}" > - <fileset dir="${core.output.dir}"> + <copy tofile="${bindist.dir}/version.properties" file="${core.dir}/version.properties"/> + <copy tofile="${bindist.dir}/build.xml" file="${core.distro.dir}/bin-dist-build.xml"/> + <copy tofile="${bindist.build.dir}/build-deploy.xml" file="${core.distro.dir}/bin-dist-deploy.xml"/> + <copy tofile="${bindist.build.dir}/build-project-gen.xml" file="${core.distro.dir}/bin-dist-project-gen.xml"/> + +  + <copy todir="${bindist.build.dir}"> + <fileset dir="${core.dir}/ant-import"> + <include name="macros-deploy-framework.xml"/> + <include name="macros-deploy-native.xml"/> + </fileset> + <fileset dir="${core.distro.dir}"> + <include name="user-project-build.xml"/> + <include name="eclipse.project"/> + <include name="eclipse.classpath"/> + </fileset> + </copy> + + <unzip dest="${bindist.bin.dir}" src="${thirdparty.dir}/jbossws-framework-scripts.zip"/> + + <copy todir="${bindist.bin.dir}"> + <fileset dir="${core.dir}/src/main/etc"> + <include name="*.sh"/> + <include name="*.bat"/> + </fileset> + </copy> + + <chmod dir="${bindist.bin.dir}" perm="+x" includes="**/*.sh"/> + +  + <copy todir="${bindist.docs.dir}"> + <fileset dir="${core.output.dir}"> <include name="apidocs/**"/> </fileset> - </copy> - <copy todir="${bindist.docs.dir}" filtering="yes"> - <fileset dir="${core.distro.dir}"> + </copy> + <copy todir="${bindist.docs.dir}" filtering="yes"> + <fileset dir="${core.distro.dir}"> <include name="Install.txt"/> <include name="ReleaseNotes.txt"/> </fileset> <filterset> <filtersfile file="${core.dir}/version.properties"/> </filterset> - </copy> - - <copy todir="${bindist.docs.dir}"> - <fileset dir="${core.etc.dir}"> - <include name="JBossORG-EULA.txt"/> - </fileset> - </copy> - -  - <copy todir="${bindist.lib.dir}" overwrite="true"> - <fileset dir="${thirdparty.dir}"> - <include name="jbossws-common.jar"/> - <include name="jbossws-framework.jar"/> - <include name="jbossws-framework-scripts.zip"/> - <include name="jbossws-spi.jar"/> - <include name="jbossws-jboss421.jar"/> - </fileset> - <fileset dir="${core.dir}/output/lib"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> + </copy> + + <copy todir="${bindist.docs.dir}"> + <fileset dir="${core.etc.dir}"> + <include name="JBossORG-EULA.txt"/> + </fileset> + </copy> + +  + <copy todir="${bindist.lib.dir}" overwrite="true"> + <fileset dir="${thirdparty.dir}"> + <include name="jbossws-common.jar"/> + <include name="jbossws-framework.jar"/> + <include name="jbossws-framework-scripts.zip"/> + <include name="jbossws-spi.jar"/> + <include name="jbossws-jboss421.jar"/> + </fileset> + <fileset dir="${core.dir}/output/lib"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> <include name="jboss-jaxws-ext.jar"/> <include name="jboss-saaj.jar"/> - <include name="jbossws-client.jar"/> - <include name="jbossws-core.jar"/> - <include name="jbossws-core-scripts.zip"/> - </fileset> - <fileset dir="${core.dir}/output/lib"> - <include name="jbossws-context.war"/> - <include name="jbossws-native40.sar"/> - <include name="jbossws-native42.sar"/> - <include name="jbossws-native50.sar"/> - </fileset> - <fileset dir="${thirdparty.dir}"> - <include name="getopt.jar"/> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - <include name="jaxb-xjc.jar"/> - <include name="jaxws-tools.jar"/> - <include name="jaxws-rt.jar"/> + <include name="jbossws-client.jar"/> + <include name="jbossws-core.jar"/> + <include name="jbossws-core-scripts.zip"/> + </fileset> + <fileset dir="${core.dir}/output/lib"> + <include name="jbossws-context.war"/> + <include name="jbossws-native40.sar"/> + <include name="jbossws-native42.sar"/> + <include name="jbossws-native50.sar"/> + </fileset> + <fileset dir="${thirdparty.dir}"> + <include name="getopt.jar"/> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="jaxb-xjc.jar"/> + <include name="jaxws-tools.jar"/> + <include name="jaxws-rt.jar"/> <include name="jboss-xml-binding.jar"/> - <include name="juddi-service.sar"/> - <include name="policy.jar"/> - <include name="stax-api.jar"/> - <include name="stax-ex.jar"/> - <include name="streambuffer.jar"/> - <include name="wsdl4j.jar"/> - <include name="wstx.jar"/> - </fileset> - </copy> - -  - <copy todir="${bindist.tests.dir}" overwrite="true"> - <fileset dir="${core.dir}/src/test-framework"/> - <fileset dir="${core.dir}/src/test"> - <include name="resources/test-excludes-*.txt"/> - </fileset> - </copy> - -  - <copy todir="${bindist.tools.dir}" overwrite="true"> - <fileset dir="${core.dir}/tools/ant"/> - </copy> - <copy todir="${bindist.dir}" overwrite="true"> - <fileset dir="${core.dir}"> - <include name="build.bat"/> - <include name="build.sh"/> - </fileset> - </copy> - <chmod file="${bindist.dir}/build.sh" perm="+x"/> - - <zip destfile="${core.output.dir}/${dist-name}.zip"> - <fileset dir="${core.output.dir}" includes="jbossws-native-dist/**"/> - </zip> - </target> - -</project> + <include name="juddi-service.sar"/> + <include name="policy.jar"/> + <include name="stax-api.jar"/> + <include name="stax-ex.jar"/> + <include name="streambuffer.jar"/> + <include name="wsdl4j.jar"/> + <include name="wstx.jar"/> + </fileset> + </copy> + +  + <copy todir="${bindist.tests.dir}" overwrite="true"> + <fileset dir="${core.dir}/src/test-framework"/> + <fileset dir="${core.dir}/src/test"> + <include name="resources/test-excludes-*.txt"/> + </fileset> + </copy> + +  + <copy todir="${bindist.tools.dir}" overwrite="true"> + <fileset dir="${core.dir}/tools/ant"/> + </copy> + <copy todir="${bindist.dir}" overwrite="true"> + <fileset dir="${core.dir}"> + <include name="build.bat"/> + <include name="build.sh"/> + </fileset> + </copy> + <chmod file="${bindist.dir}/build.sh" perm="+x"/> + + <zip destfile="${core.output.dir}/jbossws-${version.id}.zip"> + <fileset dir="${core.output.dir}" includes="jbossws-native-dist/**"/> + </zip> + </target> + +</project> \ No newline at end of file Modified: stack/native/trunk/ant-import/build-release.xml =================================================================== --- stack/native/trunk/ant-import/build-release.xml 2008-02-15 13:23:05 UTC (rev 5703) +++ stack/native/trunk/ant-import/build-release.xml 2008-02-15 15:17:51 UTC (rev 5704) @@ -19,7 +19,7 @@ <echo message="*"/> <echo message="* Almost there, please do these steps manually"/> <echo message="*"/> - <echo message="* - Create SVN tag: jbossws-native-${version.id}"/> + <echo message="* - Create SVN tag: jbossws-${version.id}"/> <echo message="* - Release the jbossws-${version.id} version in JIRA"/> <echo message="* - Update portal-content/project.xml"/> <echo message="* - Update portal-content/counter.xml"/> @@ -124,14 +124,14 @@  <copy todir="${portal.downloads}" overwrite="true"> <fileset dir="${core.dir}/output"> - <include name="jbossws-native-src-${version.id}.zip"/> - <include name="jbossws-native-${version.id}.zip"/> + <include name="jbossws-${version.id}-src.zip"/> + <include name="jbossws-${version.id}.zip"/> </fileset> </copy>  - <copy tofile="${portal.downloads}/ReleaseNotes-${version.id}.txt" file="${core.dir}/output/jbossws-native-${version.id}/docs/ReleaseNotes.txt" overwrite="true"/> - <copy tofile="${portal.downloads}/Install-${version.id}.txt" file="${core.dir}/output/jbossws-native-${version.id}/docs/Install.txt" overwrite="true"/> + <copy tofile="${portal.downloads}/ReleaseNotes-${version.id}.txt" file="${core.dir}/output/jbossws-${version.id}/docs/ReleaseNotes.txt" overwrite="true"/> + <copy tofile="${portal.downloads}/Install-${version.id}.txt" file="${core.dir}/output/jbossws-${version.id}/docs/Install.txt" overwrite="true"/> </target> <target name="check-portal-content" depends="prepare" unless="jbossws.portal.content.available"> @@ -147,9 +147,9 @@  <target name="build-src-dist" description="Build the source distribution"> <property name="build.src.dist" value="${core.dir}/output/src-dist"/> - <delete dir="${build.src.dist}/jbossws-native-src-${version.id}"/> - <mkdir dir="${build.src.dist}/jbossws-native-src-${version.id}"/> - <copy todir="${build.src.dist}/jbossws-native-src-${version.id}"> + <delete dir="${build.src.dist}/jbossws-${version.id}-src"/> + <mkdir dir="${build.src.dist}/jbossws-${version.id}-src"/> + <copy todir="${build.src.dist}/jbossws-${version.id}-src"> <fileset dir="${basedir}"> <exclude name="**/*.md5"/> <exclude name="**/output*/**"/> @@ -157,8 +157,8 @@ <exclude name="mergeinfo.txt"/> </fileset> </copy> - <zip destfile="${core.dir}/output/jbossws-native-src-${version.id}.zip" basedir="${build.src.dist}" - includes="jbossws-native-src-${version.id}/**"/> + <zip destfile="${core.dir}/output/jbossws-${version.id}-src.zip" basedir="${build.src.dist}" + includes="jbossws-${version.id}-src/**"/> </target> </project> Modified: stack/native/trunk/build.xml =================================================================== --- stack/native/trunk/build.xml 2008-02-15 13:23:05 UTC (rev 5703) +++ stack/native/trunk/build.xml 2008-02-15 15:17:51 UTC (rev 5704) @@ -164,7 +164,7 @@ <filter token="java.vm.version" value="${java.vm.version}"/> <filter token="java.vm.vendor" value="${java.vm.vendor}"/> <filter token="build.id" value="${build.id}"/> - <filter token="implementation.version" value="${specification.version}-native-${version.id}"/> + <filter token="implementation.version" value="jbossws-${version.id}"/> <filtersfile file="${core.dir}/version.properties"/> </filterset> </copy> @@ -310,7 +310,7 @@ </fileset> <filterset> <filter token="build.id" value="${build.id}"/> - <filter token="implementation.version" value="${specification.version}-native-${version.id}"/> + <filter token="implementation.version" value="jbossws-${version.id}"/> <filtersfile file="${core.dir}/version.properties"/> </filterset> </copy> Modified: stack/native/trunk/version.properties =================================================================== --- stack/native/trunk/version.properties 2008-02-15 13:23:05 UTC (rev 5703) +++ stack/native/trunk/version.properties 2008-02-15 15:17:51 UTC (rev 5704) @@ -5,7 +5,7 @@ specification.vendor=JBoss (http://www.jboss.org) specification.version=jbossws-3.0 -version.id=2.0.4.DEV +version.id=3.0.1-native-2.0.4.GA repository.id=snapshot implementation.title=JBoss Web Services - Native @@ -24,10 +24,9 @@ wscommons-policy=1.0 # Dependend integration projects -jbossws-spi=snapshot -jbossws-common=snapshot +jbossws-spi=1.0.1.GA +jbossws-common=1.0.3.GA jbossws-framework=snapshot -jbossws-jboss40=4.0.5.SP2 jbossws-jboss42=4.2.1.GA # JBossAS-5.0

16 years, 11 months

1
0
0 / 0

JBossWS SVN: r5703 - in stack/metro/trunk/src/main: java/org/jboss/wsf/stack/metro/tools and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-02-15 08:23:05 -0500 (Fri, 15 Feb 2008) New Revision: 5703 Added: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/client/MetroServiceObjectFactory.java stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/client/MetroServiceReferenceable.java stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/tools/MetroConsumerFactoryImpl.java stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/tools/MetroConsumerImpl.java stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/tools/MetroProviderFactoryImpl.java stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/tools/MetroProviderImpl.java Removed: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/client/SunRIServiceObjectFactory.java stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/client/SunRIServiceReferenceable.java stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/tools/SunRIConsumerFactoryImpl.java stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/tools/SunRIConsumerImpl.java stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/tools/SunRIProviderFactoryImpl.java stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/tools/SunRIProviderImpl.java Modified: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/client/MetroServiceRefBinderJAXWS.java stack/metro/trunk/src/main/resources/jbossws-metro-client.jar/META-INF/services/org.jboss.wsf.spi.tools.ConsumerFactoryImpl stack/metro/trunk/src/main/resources/jbossws-metro-client.jar/META-INF/services/org.jboss.wsf.spi.tools.ProviderFactoryImpl Log: [JBWS-1994] finalized refactoring Added: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/client/MetroServiceObjectFactory.java =================================================================== --- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/client/MetroServiceObjectFactory.java (rev 0) +++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/client/MetroServiceObjectFactory.java 2008-02-15 13:23:05 UTC (rev 5703) @@ -0,0 +1,213 @@ +/* + * 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.stack.metro.client; + +import org.jboss.wsf.spi.WSFException; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; + +import javax.naming.*; +import javax.naming.spi.ObjectFactory; +import javax.xml.namespace.QName; +import javax.xml.ws.Service; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.lang.reflect.Constructor; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.net.URL; +import java.util.Hashtable; +import org.jboss.logging.Logger; + +/** + * This ServiceObjectFactory reconstructs a javax.xml.ws.Service + * for a given WSDL when the webservice client does a JNDI lookup + * + * @see MetroServiceReferenceable + * + * @author Heiko.Braun(a)jboss.com + * Created: Jul 12, 2007 + * */ +public class MetroServiceObjectFactory implements ObjectFactory +{ + protected final Logger log = Logger.getLogger(MetroServiceObjectFactory.class); + + /** + * Creates an object using the location or reference information specified. + * <p/> + * + * @param obj The possibly null object containing location or reference + * information that can be used in creating an object. + * @param name The name of this object relative to <code>nameCtx</code>, + * or null if no name is specified. + * @param nameCtx The context relative to which the <code>name</code> + * parameter is specified, or null if <code>name</code> is + * relative to the default initial context. + * @param environment The possibly null environment that is used in + * creating the object. + * @return The object created; null if an object cannot be created. + * @throws Exception if this object factory encountered an exception + * while attempting to create an object, and no other object factories are + * to be tried. + * @see javax.naming.spi.NamingManager#getObjectInstance + * @see javax.naming.spi.NamingManager#getURLContext + */ + public Object getObjectInstance(Object obj, Name name, Context nameCtx, Hashtable environment) throws Exception + { + try + { + Reference ref = (Reference)obj; + + // Get the target class name + String targetClassName = (String)ref.get(MetroServiceReferenceable.TARGET_CLASS_NAME).getContent(); + + // Unmarshall the UnifiedServiceRef + UnifiedServiceRefMetaData serviceRef = unmarshallServiceRef(ref); + String serviceRefName = serviceRef.getServiceRefName(); + QName serviceQName = serviceRef.getServiceQName(); + + String serviceImplClass = serviceRef.getServiceImplClass(); + if (serviceImplClass == null) + serviceImplClass = (String)ref.get(MetroServiceReferenceable.SERVICE_IMPL_CLASS).getContent(); + + // If the target defaults to javax.xml.ws.Service, use the service as the target + if (Service.class.getName().equals(targetClassName)) + targetClassName = serviceImplClass; + + log.debug("getObjectInstance [name=" + serviceRefName + ",service=" + serviceImplClass + ",target=" + targetClassName + "]"); + + // Load the service class + ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader(); + Class serviceClass = ctxLoader.loadClass(serviceImplClass); + Class targetClass = (targetClassName != null ? ctxLoader.loadClass(targetClassName) : null); + + if (Service.class.isAssignableFrom(serviceClass) == false) + throw new IllegalArgumentException("WebServiceRef type '" + serviceClass + "' is not assignable to javax.xml.ws.Service"); + + // Receives either a javax.xml.ws.Service or a dynamic proxy + Object target; + + // Get the URL to the wsdl + URL wsdlURL = serviceRef.getWsdlLocation(); + + // Generic javax.xml.ws.Service + if (serviceClass == Service.class) + { + if (wsdlURL != null) + { + target = Service.create(wsdlURL, serviceQName); + } + else + { + throw new IllegalArgumentException("Cannot create generic javax.xml.ws.Service without wsdlLocation: " + serviceRefName); + } + } + // Generated javax.xml.ws.Service subclass + else + { + if (wsdlURL != null) + { + Constructor ctor = serviceClass.getConstructor(new Class[] { URL.class, QName.class }); + target = ctor.newInstance(new Object[] { wsdlURL, serviceQName }); + } + else + { + target = (Service)serviceClass.newInstance(); + } + } + + // Configure the service + configureService((Service)target, serviceRef); + + if (targetClassName != null && targetClassName.equals(serviceImplClass) == false) + { + try + { + Object port = null; + if (serviceClass != Service.class) + { + for (Method method : serviceClass.getDeclaredMethods()) + { + String methodName = method.getName(); + Class retType = method.getReturnType(); + if (methodName.startsWith("get") && targetClass.isAssignableFrom(retType)) + { + port = method.invoke(target, new Object[0]); + target = port; + break; + } + } + } + + if (port == null) + { + Method method = serviceClass.getMethod("getPort", new Class[] { Class.class }); + port = method.invoke(target, new Object[] { targetClass }); + target = port; + } + } + catch (InvocationTargetException ex) + { + throw ex.getTargetException(); + } + } + + return target; + } + catch (Throwable ex) + { + WSFException.rethrow("Cannot create service", ex); + return null; + } + } + + + private void configureService(Service service, UnifiedServiceRefMetaData serviceRef) + { + log.warn("Service configuration not available in Sun-RI"); + } + + private UnifiedServiceRefMetaData unmarshallServiceRef(Reference ref) throws ClassNotFoundException, NamingException + { + UnifiedServiceRefMetaData sref; + RefAddr refAddr = ref.get(MetroServiceReferenceable.SERVICE_REF_META_DATA); + ByteArrayInputStream bais = new ByteArrayInputStream((byte[])refAddr.getContent()); + try + { + ObjectInputStream ois = new ObjectInputStream(bais); + sref = (UnifiedServiceRefMetaData)ois.readObject(); + ois.close(); + } + catch (IOException e) + { + throw new NamingException("Cannot unmarshall service ref meta data, cause: " + e.toString()); + } + + // Verify it. There is some know coinstraints + if(null == sref.getServiceQName()) + throw new IllegalArgumentException("ServiceQName may not be null. " + + "Specify a service QName in the <service-ref> declaration, or thorugh the @WebServiceClient annotation."); + + return sref; + } +} + Property changes on: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/client/MetroServiceObjectFactory.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/client/MetroServiceRefBinderJAXWS.java =================================================================== --- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/client/MetroServiceRefBinderJAXWS.java 2008-02-15 12:50:14 UTC (rev 5702) +++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/client/MetroServiceRefBinderJAXWS.java 2008-02-15 13:23:05 UTC (rev 5703) @@ -216,6 +216,6 @@ */ protected Referenceable buildServiceReferenceable(String serviceImplClass, String targetClassName, UnifiedServiceRefMetaData serviceRef) { - return new SunRIServiceReferenceable(serviceImplClass, targetClassName, serviceRef); + return new MetroServiceReferenceable(serviceImplClass, targetClassName, serviceRef); } } Added: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/client/MetroServiceReferenceable.java =================================================================== --- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/client/MetroServiceReferenceable.java (rev 0) +++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/client/MetroServiceReferenceable.java 2008-02-15 13:23:05 UTC (rev 5703) @@ -0,0 +1,88 @@ +/* + * 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.stack.metro.client; + +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; + +import javax.naming.*; +import java.io.ByteArrayOutputStream; +import java.io.ObjectOutputStream; +import java.io.IOException; + +/** + * A JNDI reference to a javax.xml.ws.Service + * + * It holds the information to reconstrut the javax.xml.ws.Service + * when the client does a JNDI lookup. + * + * @author Heiko.Braun(a)jboss.com + */ +public class MetroServiceReferenceable implements Referenceable +{ + public static final String SERVICE_REF_META_DATA = "SERVICE_REF_META_DATA"; + public static final String SERVICE_IMPL_CLASS = "SERVICE_CLASS_NAME"; + public static final String TARGET_CLASS_NAME = "TARGET_CLASS_NAME"; + + private String serviceImplClass; + private String targetClassName; + private UnifiedServiceRefMetaData serviceRef; + + public MetroServiceReferenceable(String serviceImplClass, String targetClassName, UnifiedServiceRefMetaData serviceRef) + { + this.serviceImplClass = serviceImplClass; + this.targetClassName = targetClassName; + this.serviceRef = serviceRef; + } + + /** + * Retrieves the Reference of this object. + * + * @return The non-null Reference of this object. + * @throws javax.naming.NamingException If a naming exception was encountered while retrieving the reference. + */ + public Reference getReference() throws NamingException + { + Reference myRef = new Reference(MetroServiceReferenceable.class.getName(), MetroServiceObjectFactory.class.getName(), null); + + myRef.add(new StringRefAddr(SERVICE_IMPL_CLASS, serviceImplClass)); + myRef.add(new StringRefAddr(TARGET_CLASS_NAME, targetClassName)); + myRef.add(new BinaryRefAddr(SERVICE_REF_META_DATA, marshall(serviceRef))); + + return myRef; + } + + private byte[] marshall(Object obj) throws NamingException + { + ByteArrayOutputStream baos = new ByteArrayOutputStream(512); + try + { + ObjectOutputStream oos = new ObjectOutputStream(baos); + oos.writeObject(obj); + oos.close(); + } + catch (IOException e) + { + throw new NamingException("Cannot marshall object, cause: " + e.toString()); + } + return baos.toByteArray(); + } +} Property changes on: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/client/MetroServiceReferenceable.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/client/SunRIServiceObjectFactory.java =================================================================== --- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/client/SunRIServiceObjectFactory.java 2008-02-15 12:50:14 UTC (rev 5702) +++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/client/SunRIServiceObjectFactory.java 2008-02-15 13:23:05 UTC (rev 5703) @@ -1,213 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.metro.client; - -import org.jboss.wsf.spi.WSFException; -import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; - -import javax.naming.*; -import javax.naming.spi.ObjectFactory; -import javax.xml.namespace.QName; -import javax.xml.ws.Service; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.ObjectInputStream; -import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.net.URL; -import java.util.Hashtable; -import org.jboss.logging.Logger; - -/** - * This ServiceObjectFactory reconstructs a javax.xml.ws.Service - * for a given WSDL when the webservice client does a JNDI lookup - * - * @see SunRIServiceReferenceable - * - * @author Heiko.Braun(a)jboss.com - * Created: Jul 12, 2007 - * */ -public class SunRIServiceObjectFactory implements ObjectFactory -{ - protected final Logger log = Logger.getLogger(SunRIServiceObjectFactory.class); - - /** - * Creates an object using the location or reference information specified. - * <p/> - * - * @param obj The possibly null object containing location or reference - * information that can be used in creating an object. - * @param name The name of this object relative to <code>nameCtx</code>, - * or null if no name is specified. - * @param nameCtx The context relative to which the <code>name</code> - * parameter is specified, or null if <code>name</code> is - * relative to the default initial context. - * @param environment The possibly null environment that is used in - * creating the object. - * @return The object created; null if an object cannot be created. - * @throws Exception if this object factory encountered an exception - * while attempting to create an object, and no other object factories are - * to be tried. - * @see javax.naming.spi.NamingManager#getObjectInstance - * @see javax.naming.spi.NamingManager#getURLContext - */ - public Object getObjectInstance(Object obj, Name name, Context nameCtx, Hashtable environment) throws Exception - { - try - { - Reference ref = (Reference)obj; - - // Get the target class name - String targetClassName = (String)ref.get(SunRIServiceReferenceable.TARGET_CLASS_NAME).getContent(); - - // Unmarshall the UnifiedServiceRef - UnifiedServiceRefMetaData serviceRef = unmarshallServiceRef(ref); - String serviceRefName = serviceRef.getServiceRefName(); - QName serviceQName = serviceRef.getServiceQName(); - - String serviceImplClass = serviceRef.getServiceImplClass(); - if (serviceImplClass == null) - serviceImplClass = (String)ref.get(SunRIServiceReferenceable.SERVICE_IMPL_CLASS).getContent(); - - // If the target defaults to javax.xml.ws.Service, use the service as the target - if (Service.class.getName().equals(targetClassName)) - targetClassName = serviceImplClass; - - log.debug("getObjectInstance [name=" + serviceRefName + ",service=" + serviceImplClass + ",target=" + targetClassName + "]"); - - // Load the service class - ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader(); - Class serviceClass = ctxLoader.loadClass(serviceImplClass); - Class targetClass = (targetClassName != null ? ctxLoader.loadClass(targetClassName) : null); - - if (Service.class.isAssignableFrom(serviceClass) == false) - throw new IllegalArgumentException("WebServiceRef type '" + serviceClass + "' is not assignable to javax.xml.ws.Service"); - - // Receives either a javax.xml.ws.Service or a dynamic proxy - Object target; - - // Get the URL to the wsdl - URL wsdlURL = serviceRef.getWsdlLocation(); - - // Generic javax.xml.ws.Service - if (serviceClass == Service.class) - { - if (wsdlURL != null) - { - target = Service.create(wsdlURL, serviceQName); - } - else - { - throw new IllegalArgumentException("Cannot create generic javax.xml.ws.Service without wsdlLocation: " + serviceRefName); - } - } - // Generated javax.xml.ws.Service subclass - else - { - if (wsdlURL != null) - { - Constructor ctor = serviceClass.getConstructor(new Class[] { URL.class, QName.class }); - target = ctor.newInstance(new Object[] { wsdlURL, serviceQName }); - } - else - { - target = (Service)serviceClass.newInstance(); - } - } - - // Configure the service - configureService((Service)target, serviceRef); - - if (targetClassName != null && targetClassName.equals(serviceImplClass) == false) - { - try - { - Object port = null; - if (serviceClass != Service.class) - { - for (Method method : serviceClass.getDeclaredMethods()) - { - String methodName = method.getName(); - Class retType = method.getReturnType(); - if (methodName.startsWith("get") && targetClass.isAssignableFrom(retType)) - { - port = method.invoke(target, new Object[0]); - target = port; - break; - } - } - } - - if (port == null) - { - Method method = serviceClass.getMethod("getPort", new Class[] { Class.class }); - port = method.invoke(target, new Object[] { targetClass }); - target = port; - } - } - catch (InvocationTargetException ex) - { - throw ex.getTargetException(); - } - } - - return target; - } - catch (Throwable ex) - { - WSFException.rethrow("Cannot create service", ex); - return null; - } - } - - - private void configureService(Service service, UnifiedServiceRefMetaData serviceRef) - { - log.warn("Service configuration not available in Sun-RI"); - } - - private UnifiedServiceRefMetaData unmarshallServiceRef(Reference ref) throws ClassNotFoundException, NamingException - { - UnifiedServiceRefMetaData sref; - RefAddr refAddr = ref.get(SunRIServiceReferenceable.SERVICE_REF_META_DATA); - ByteArrayInputStream bais = new ByteArrayInputStream((byte[])refAddr.getContent()); - try - { - ObjectInputStream ois = new ObjectInputStream(bais); - sref = (UnifiedServiceRefMetaData)ois.readObject(); - ois.close(); - } - catch (IOException e) - { - throw new NamingException("Cannot unmarshall service ref meta data, cause: " + e.toString()); - } - - // Verify it. There is some know coinstraints - if(null == sref.getServiceQName()) - throw new IllegalArgumentException("ServiceQName may not be null. " + - "Specify a service QName in the <service-ref> declaration, or thorugh the @WebServiceClient annotation."); - - return sref; - } -} - Deleted: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/client/SunRIServiceReferenceable.java =================================================================== --- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/client/SunRIServiceReferenceable.java 2008-02-15 12:50:14 UTC (rev 5702) +++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/client/SunRIServiceReferenceable.java 2008-02-15 13:23:05 UTC (rev 5703) @@ -1,88 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.metro.client; - -import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; - -import javax.naming.*; -import java.io.ByteArrayOutputStream; -import java.io.ObjectOutputStream; -import java.io.IOException; - -/** - * A JNDI reference to a javax.xml.ws.Service - * - * It holds the information to reconstrut the javax.xml.ws.Service - * when the client does a JNDI lookup. - * - * @author Heiko.Braun(a)jboss.com - */ -public class SunRIServiceReferenceable implements Referenceable -{ - public static final String SERVICE_REF_META_DATA = "SERVICE_REF_META_DATA"; - public static final String SERVICE_IMPL_CLASS = "SERVICE_CLASS_NAME"; - public static final String TARGET_CLASS_NAME = "TARGET_CLASS_NAME"; - - private String serviceImplClass; - private String targetClassName; - private UnifiedServiceRefMetaData serviceRef; - - public SunRIServiceReferenceable(String serviceImplClass, String targetClassName, UnifiedServiceRefMetaData serviceRef) - { - this.serviceImplClass = serviceImplClass; - this.targetClassName = targetClassName; - this.serviceRef = serviceRef; - } - - /** - * Retrieves the Reference of this object. - * - * @return The non-null Reference of this object. - * @throws javax.naming.NamingException If a naming exception was encountered while retrieving the reference. - */ - public Reference getReference() throws NamingException - { - Reference myRef = new Reference(SunRIServiceReferenceable.class.getName(), SunRIServiceObjectFactory.class.getName(), null); - - myRef.add(new StringRefAddr(SERVICE_IMPL_CLASS, serviceImplClass)); - myRef.add(new StringRefAddr(TARGET_CLASS_NAME, targetClassName)); - myRef.add(new BinaryRefAddr(SERVICE_REF_META_DATA, marshall(serviceRef))); - - return myRef; - } - - private byte[] marshall(Object obj) throws NamingException - { - ByteArrayOutputStream baos = new ByteArrayOutputStream(512); - try - { - ObjectOutputStream oos = new ObjectOutputStream(baos); - oos.writeObject(obj); - oos.close(); - } - catch (IOException e) - { - throw new NamingException("Cannot marshall object, cause: " + e.toString()); - } - return baos.toByteArray(); - } -} Added: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/tools/MetroConsumerFactoryImpl.java =================================================================== --- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/tools/MetroConsumerFactoryImpl.java (rev 0) +++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/tools/MetroConsumerFactoryImpl.java 2008-02-15 13:23:05 UTC (rev 5703) @@ -0,0 +1,38 @@ +/* + * 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.stack.metro.tools; + +import org.jboss.wsf.spi.tools.WSContractConsumerFactory; +import org.jboss.wsf.spi.tools.WSContractConsumer; + +/** + * Creates a WSContractConsumer that delegates to the Metro. + * + * @author <a href="jason.greene(a)jboss.com">Jason T. Greene</a> + * @version $Revision:2311 $ + */ +public class MetroConsumerFactoryImpl implements WSContractConsumerFactory +{ + public WSContractConsumer createConsumer() { + return new MetroConsumerImpl(); + } +} Property changes on: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/tools/MetroConsumerFactoryImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/tools/MetroConsumerImpl.java =================================================================== --- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/tools/MetroConsumerImpl.java (rev 0) +++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/tools/MetroConsumerImpl.java 2008-02-15 13:23:05 UTC (rev 5703) @@ -0,0 +1,203 @@ +/* + * 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.stack.metro.tools; + +import org.jboss.wsf.spi.tools.WSContractConsumer; + +import java.io.File; +import java.io.PrintStream; +import java.util.List; +import java.util.ArrayList; +import java.net.URL; + +import com.sun.tools.ws.wscompile.WsimportTool; + +/** + * WSContractConsumer that delegates to the Sun CompileTool. + * + * @author <a href="jason.greene(a)jboss.com">Jason T. Greene</a> + * @author <a href="heiko.braun(a)jboss.com">Heiko Braun</a> + * @version $Revision$ + */ +public class MetroConsumerImpl extends WSContractConsumer +{ + private List<File> bindingFiles = null; + private File catalog = null; + private boolean generateSource = false; + private File outputDir = new File("output"); + private File sourceDir = null; + private String targetPackage = null; + private PrintStream messageStream = null; + private String wsdlLocation = null; + private List<String> additionalCompilerClassPath = new ArrayList<String>(); + private String target = "2.0"; + + @Override + public void setBindingFiles(List<File> bindingFiles) { + this.bindingFiles = bindingFiles; + } + + @Override + public void setCatalog(File catalog) { + this.catalog = catalog; + } + + @Override + public void setGenerateSource(boolean generateSource) { + this.generateSource = generateSource; + } + + @Override + public void setMessageStream(PrintStream messageStream) { + // TODO Auto-generated method stub + this.messageStream = messageStream; + } + + @Override + public void setOutputDirectory(File directory) { + // TODO Auto-generated method stub + outputDir = directory; + } + + @Override + public void setSourceDirectory(File directory) { + sourceDir = directory; + } + + @Override + public void setTargetPackage(String targetPackage) { + this.targetPackage = targetPackage; + } + + @Override + public void setWsdlLocation(String wsdlLocation) { + this.wsdlLocation = wsdlLocation; + } + + public void setAdditionalCompilerClassPath(List<String> additionalCompilerClassPath) { + this.additionalCompilerClassPath = additionalCompilerClassPath; + } + + @Override + public void setTarget(String target) { + this.target = target; + } + + @Override + public void consume(URL wsdl) { + List<String> args = new ArrayList<String>(); + if (bindingFiles != null) { + for (File file : bindingFiles) { + args.add("-b"); + args.add(file.getAbsolutePath()); + + } + } + + if (catalog != null) { + args.add("-catalog"); + args.add(catalog.getAbsolutePath()); + } + + if (generateSource) { + args.add("-keep"); + if (sourceDir != null) { + if (!sourceDir.exists() && !sourceDir.mkdirs()) + throw new IllegalStateException("Could not make directory: " + sourceDir.getName()); + + args.add("-s"); + args.add(sourceDir.getAbsolutePath()); + } + } + + if (targetPackage != null) { + args.add("-p"); + args.add(targetPackage); + } + + if (wsdlLocation != null) { + args.add("-wsdllocation"); + args.add(wsdlLocation); + } + + PrintStream stream = messageStream; + if (stream != null) { + args.add("-verbose"); + } else { + stream = new NullPrintStream(); + } + + if (!outputDir.exists() && !outputDir.mkdirs()) + throw new IllegalStateException("Could not make directory: " + outputDir.getName()); + + // Always add the output directory and the wsdl location + args.add("-d"); + args.add(outputDir.getAbsolutePath()); + + // Always set the target + if(!target.equals("2.0")) + throw new IllegalArgumentException("WSConsume (metro) only supports JAX-WS 2.0"); + + args.add("-target"); + args.add(target); + + // finally the WSDL file + args.add(wsdl.toString()); + + // See WsimportTool#compileGeneratedClasses() + if(!additionalCompilerClassPath.isEmpty()) + { + StringBuffer javaCP = new StringBuffer(); + for(String s : additionalCompilerClassPath) + { + javaCP.append(s).append(File.pathSeparator); + } + System.setProperty("java.class.path", javaCP.toString()); + } + + try + { + // enforce woodstox + if(null == System.getProperty("javax.xml.stream.XMLInputFactory")) + System.setProperty("javax.xml.stream.XMLInputFactory", "com.ctc.wstx.stax.WstxInputFactory"); + + WsimportTool compileTool = new WsimportTool(stream); + boolean success = compileTool.run(args.toArray(new String[0])); + + if(!success) throw new IllegalStateException("WsImport invocation failed"); + } + catch (Throwable t) + { + if (messageStream != null) + { + messageStream.println("Failed to invoke WsImport"); + t.printStackTrace(messageStream); + } + else + { + t.printStackTrace(); + } + } + + } + +} Property changes on: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/tools/MetroConsumerImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/tools/MetroProviderFactoryImpl.java =================================================================== --- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/tools/MetroProviderFactoryImpl.java (rev 0) +++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/tools/MetroProviderFactoryImpl.java 2008-02-15 13:23:05 UTC (rev 5703) @@ -0,0 +1,39 @@ +/* + * 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.stack.metro.tools; + +import org.jboss.wsf.spi.tools.WSContractProviderFactory; +import org.jboss.wsf.spi.tools.WSContractProvider; + +/** + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +public class MetroProviderFactoryImpl implements WSContractProviderFactory +{ + public WSContractProvider createProvider(ClassLoader loader) + { + WSContractProvider metroProvider = new MetroProviderImpl(); + metroProvider.setClassLoader(loader); + return metroProvider; + } +} Property changes on: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/tools/MetroProviderFactoryImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/tools/MetroProviderImpl.java =================================================================== --- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/tools/MetroProviderImpl.java (rev 0) +++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/tools/MetroProviderImpl.java 2008-02-15 13:23:05 UTC (rev 5703) @@ -0,0 +1,193 @@ +/* + * 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.stack.metro.tools; + +import org.jboss.wsf.spi.tools.WSContractProvider; + +import java.io.File; +import java.io.PrintStream; +import java.util.List; +import java.util.ArrayList; +import java.net.URLClassLoader; +import java.net.URL; + +import com.sun.tools.ws.wscompile.WsgenTool; + +/** + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +public class MetroProviderImpl extends WSContractProvider +{ + + private ClassLoader loader; + private boolean generateWsdl = false; + private boolean generateSource = false; + private File outputDir = new File("output"); + private File resourceDir = null; + private File sourceDir = null; + private PrintStream messageStream = new NullPrintStream(); + + public MetroProviderImpl() + { + } + + public void setGenerateWsdl(boolean generateWsdl) + { + this.generateWsdl = generateWsdl; + } + + public void setGenerateSource(boolean generateSource) + { + this.generateSource = generateSource; + } + + public void setOutputDirectory(File directory) + { + this.outputDir = directory; + } + + public void setResourceDirectory(File directory) + { + this.resourceDir = directory; + } + + public void setSourceDirectory(File directory) + { + this.sourceDir = directory; + } + + public void setClassLoader(ClassLoader loader) + { + this.loader = loader; + } + + public void setMessageStream(PrintStream messageStream) + { + this.messageStream = messageStream; + } + + public void provide(String endpointClass) + { + try + { + provide(loader.loadClass(endpointClass)); + } + catch (ClassNotFoundException e) + { + throw new IllegalArgumentException("Class not found: " + endpointClass); + } + } + + public void provide(Class<?> endpointClass) + { + // Swap the context classloader + // The '--classpath' switch might provide an URLClassLoader + ClassLoader oldLoader = Thread.currentThread().getContextClassLoader(); + + if(loader!=null) + Thread.currentThread().setContextClassLoader(loader); + + try + { + List<String> args = new ArrayList<String>(); + + // Use the output directory as the default + File resourceDir = (this.resourceDir != null) ? this.resourceDir : outputDir; + File sourceDir = (this.sourceDir != null) ? this.sourceDir : outputDir; + + if (generateSource) { + args.add("-keep"); + if (sourceDir != null) { + if (!sourceDir.exists() && !sourceDir.mkdirs()) + throw new IllegalStateException("Could not make directory: " + sourceDir.getName()); + + args.add("-s"); + args.add(sourceDir.getAbsolutePath()); + } + } + + // -d <directory> + if (!outputDir.exists() && !outputDir.mkdirs()) + throw new IllegalStateException("Could not make directory: " + outputDir.getName()); + + args.add("-d"); + args.add(outputDir.getAbsolutePath()); + + // -r <directory> + if (resourceDir != null) { + if (!resourceDir.exists() && !resourceDir.mkdirs()) + throw new IllegalStateException("Could not make directory: " + resourceDir.getName()); + args.add("-r"); + args.add(resourceDir.getAbsolutePath()); + } + + // -s <directory> + if (sourceDir != null) { + if (!sourceDir.exists() && !sourceDir.mkdirs()) + throw new IllegalStateException("Could not make directory: " + sourceDir.getName()); + args.add("-s"); + args.add(sourceDir.getAbsolutePath()); + } + + // -verbose + PrintStream stream = messageStream; + if (stream != null) { + args.add("-verbose"); + } else { + stream = new NullPrintStream(); + } + + // -wsdl[:protocol] + if (generateWsdl) { + args.add("-wsdl"); + } + + // --classpath + if(loader instanceof URLClassLoader) + { + StringBuilder builder = new StringBuilder(); + URLClassLoader urlLoader = (URLClassLoader)loader; + for(URL url : urlLoader.getURLs()) + { + builder.append(url.toExternalForm()); + builder.append(File.pathSeparator); + } + + args.add("-classpath"); + args.add(builder.toString()); + } + + // the SEI + args.add(endpointClass.getCanonicalName()); + + WsgenTool tool = new WsgenTool(messageStream); + tool.run(args.toArray(new String[0])); + + } + finally{ + Thread.currentThread().setContextClassLoader(oldLoader); + } + } + + +} Property changes on: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/tools/MetroProviderImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/tools/SunRIConsumerFactoryImpl.java =================================================================== --- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/tools/SunRIConsumerFactoryImpl.java 2008-02-15 12:50:14 UTC (rev 5702) +++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/tools/SunRIConsumerFactoryImpl.java 2008-02-15 13:23:05 UTC (rev 5703) @@ -1,38 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.metro.tools; - -import org.jboss.wsf.spi.tools.WSContractConsumerFactory; -import org.jboss.wsf.spi.tools.WSContractConsumer; - -/** - * Creates a WSContractConsumer that delegates to the Sun RI. - * - * @author <a href="jason.greene(a)jboss.com">Jason T. Greene</a> - * @version $Revision:2311 $ - */ -public class SunRIConsumerFactoryImpl implements WSContractConsumerFactory -{ - public WSContractConsumer createConsumer() { - return new SunRIConsumerImpl(); - } -} Deleted: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/tools/SunRIConsumerImpl.java =================================================================== --- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/tools/SunRIConsumerImpl.java 2008-02-15 12:50:14 UTC (rev 5702) +++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/tools/SunRIConsumerImpl.java 2008-02-15 13:23:05 UTC (rev 5703) @@ -1,203 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.metro.tools; - -import org.jboss.wsf.spi.tools.WSContractConsumer; - -import java.io.File; -import java.io.PrintStream; -import java.util.List; -import java.util.ArrayList; -import java.net.URL; - -import com.sun.tools.ws.wscompile.WsimportTool; - -/** - * WSContractConsumer that delegates to the Sun CompileTool. - * - * @author <a href="jason.greene(a)jboss.com">Jason T. Greene</a> - * @author <a href="heiko.braun(a)jboss.com">Heiko Braun</a> - * @version $Revision$ - */ -public class SunRIConsumerImpl extends WSContractConsumer -{ - private List<File> bindingFiles = null; - private File catalog = null; - private boolean generateSource = false; - private File outputDir = new File("output"); - private File sourceDir = null; - private String targetPackage = null; - private PrintStream messageStream = null; - private String wsdlLocation = null; - private List<String> additionalCompilerClassPath = new ArrayList<String>(); - private String target = "2.0"; - - @Override - public void setBindingFiles(List<File> bindingFiles) { - this.bindingFiles = bindingFiles; - } - - @Override - public void setCatalog(File catalog) { - this.catalog = catalog; - } - - @Override - public void setGenerateSource(boolean generateSource) { - this.generateSource = generateSource; - } - - @Override - public void setMessageStream(PrintStream messageStream) { - // TODO Auto-generated method stub - this.messageStream = messageStream; - } - - @Override - public void setOutputDirectory(File directory) { - // TODO Auto-generated method stub - outputDir = directory; - } - - @Override - public void setSourceDirectory(File directory) { - sourceDir = directory; - } - - @Override - public void setTargetPackage(String targetPackage) { - this.targetPackage = targetPackage; - } - - @Override - public void setWsdlLocation(String wsdlLocation) { - this.wsdlLocation = wsdlLocation; - } - - public void setAdditionalCompilerClassPath(List<String> additionalCompilerClassPath) { - this.additionalCompilerClassPath = additionalCompilerClassPath; - } - - @Override - public void setTarget(String target) { - this.target = target; - } - - @Override - public void consume(URL wsdl) { - List<String> args = new ArrayList<String>(); - if (bindingFiles != null) { - for (File file : bindingFiles) { - args.add("-b"); - args.add(file.getAbsolutePath()); - - } - } - - if (catalog != null) { - args.add("-catalog"); - args.add(catalog.getAbsolutePath()); - } - - if (generateSource) { - args.add("-keep"); - if (sourceDir != null) { - if (!sourceDir.exists() && !sourceDir.mkdirs()) - throw new IllegalStateException("Could not make directory: " + sourceDir.getName()); - - args.add("-s"); - args.add(sourceDir.getAbsolutePath()); - } - } - - if (targetPackage != null) { - args.add("-p"); - args.add(targetPackage); - } - - if (wsdlLocation != null) { - args.add("-wsdllocation"); - args.add(wsdlLocation); - } - - PrintStream stream = messageStream; - if (stream != null) { - args.add("-verbose"); - } else { - stream = new NullPrintStream(); - } - - if (!outputDir.exists() && !outputDir.mkdirs()) - throw new IllegalStateException("Could not make directory: " + outputDir.getName()); - - // Always add the output directory and the wsdl location - args.add("-d"); - args.add(outputDir.getAbsolutePath()); - - // Always set the target - if(!target.equals("2.0")) - throw new IllegalArgumentException("WSConsume (metro) only supports JAX-WS 2.0"); - - args.add("-target"); - args.add(target); - - // finally the WSDL file - args.add(wsdl.toString()); - - // See WsimportTool#compileGeneratedClasses() - if(!additionalCompilerClassPath.isEmpty()) - { - StringBuffer javaCP = new StringBuffer(); - for(String s : additionalCompilerClassPath) - { - javaCP.append(s).append(File.pathSeparator); - } - System.setProperty("java.class.path", javaCP.toString()); - } - - try - { - // enforce woodstox - if(null == System.getProperty("javax.xml.stream.XMLInputFactory")) - System.setProperty("javax.xml.stream.XMLInputFactory", "com.ctc.wstx.stax.WstxInputFactory"); - - WsimportTool compileTool = new WsimportTool(stream); - boolean success = compileTool.run(args.toArray(new String[0])); - - if(!success) throw new IllegalStateException("WsImport invocation failed"); - } - catch (Throwable t) - { - if (messageStream != null) - { - messageStream.println("Failed to invoke WsImport"); - t.printStackTrace(messageStream); - } - else - { - t.printStackTrace(); - } - } - - } - -} Deleted: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/tools/SunRIProviderFactoryImpl.java =================================================================== --- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/tools/SunRIProviderFactoryImpl.java 2008-02-15 12:50:14 UTC (rev 5702) +++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/tools/SunRIProviderFactoryImpl.java 2008-02-15 13:23:05 UTC (rev 5703) @@ -1,39 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.metro.tools; - -import org.jboss.wsf.spi.tools.WSContractProviderFactory; -import org.jboss.wsf.spi.tools.WSContractProvider; - -/** - * @author Heiko.Braun(a)jboss.com - * @version $Revision$ - */ -public class SunRIProviderFactoryImpl implements WSContractProviderFactory -{ - public WSContractProvider createProvider(ClassLoader loader) - { - WSContractProvider sunRIProvider = new SunRIProviderImpl(); - sunRIProvider.setClassLoader(loader); - return sunRIProvider; - } -} Deleted: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/tools/SunRIProviderImpl.java =================================================================== --- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/tools/SunRIProviderImpl.java 2008-02-15 12:50:14 UTC (rev 5702) +++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/tools/SunRIProviderImpl.java 2008-02-15 13:23:05 UTC (rev 5703) @@ -1,193 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.metro.tools; - -import org.jboss.wsf.spi.tools.WSContractProvider; - -import java.io.File; -import java.io.PrintStream; -import java.util.List; -import java.util.ArrayList; -import java.net.URLClassLoader; -import java.net.URL; - -import com.sun.tools.ws.wscompile.WsgenTool; - -/** - * @author Heiko.Braun(a)jboss.com - * @version $Revision$ - */ -public class SunRIProviderImpl extends WSContractProvider -{ - - private ClassLoader loader; - private boolean generateWsdl = false; - private boolean generateSource = false; - private File outputDir = new File("output"); - private File resourceDir = null; - private File sourceDir = null; - private PrintStream messageStream = new NullPrintStream(); - - public SunRIProviderImpl() - { - } - - public void setGenerateWsdl(boolean generateWsdl) - { - this.generateWsdl = generateWsdl; - } - - public void setGenerateSource(boolean generateSource) - { - this.generateSource = generateSource; - } - - public void setOutputDirectory(File directory) - { - this.outputDir = directory; - } - - public void setResourceDirectory(File directory) - { - this.resourceDir = directory; - } - - public void setSourceDirectory(File directory) - { - this.sourceDir = directory; - } - - public void setClassLoader(ClassLoader loader) - { - this.loader = loader; - } - - public void setMessageStream(PrintStream messageStream) - { - this.messageStream = messageStream; - } - - public void provide(String endpointClass) - { - try - { - provide(loader.loadClass(endpointClass)); - } - catch (ClassNotFoundException e) - { - throw new IllegalArgumentException("Class not found: " + endpointClass); - } - } - - public void provide(Class<?> endpointClass) - { - // Swap the context classloader - // The '--classpath' switch might provide an URLClassLoader - ClassLoader oldLoader = Thread.currentThread().getContextClassLoader(); - - if(loader!=null) - Thread.currentThread().setContextClassLoader(loader); - - try - { - List<String> args = new ArrayList<String>(); - - // Use the output directory as the default - File resourceDir = (this.resourceDir != null) ? this.resourceDir : outputDir; - File sourceDir = (this.sourceDir != null) ? this.sourceDir : outputDir; - - if (generateSource) { - args.add("-keep"); - if (sourceDir != null) { - if (!sourceDir.exists() && !sourceDir.mkdirs()) - throw new IllegalStateException("Could not make directory: " + sourceDir.getName()); - - args.add("-s"); - args.add(sourceDir.getAbsolutePath()); - } - } - - // -d <directory> - if (!outputDir.exists() && !outputDir.mkdirs()) - throw new IllegalStateException("Could not make directory: " + outputDir.getName()); - - args.add("-d"); - args.add(outputDir.getAbsolutePath()); - - // -r <directory> - if (resourceDir != null) { - if (!resourceDir.exists() && !resourceDir.mkdirs()) - throw new IllegalStateException("Could not make directory: " + resourceDir.getName()); - args.add("-r"); - args.add(resourceDir.getAbsolutePath()); - } - - // -s <directory> - if (sourceDir != null) { - if (!sourceDir.exists() && !sourceDir.mkdirs()) - throw new IllegalStateException("Could not make directory: " + sourceDir.getName()); - args.add("-s"); - args.add(sourceDir.getAbsolutePath()); - } - - // -verbose - PrintStream stream = messageStream; - if (stream != null) { - args.add("-verbose"); - } else { - stream = new NullPrintStream(); - } - - // -wsdl[:protocol] - if (generateWsdl) { - args.add("-wsdl"); - } - - // --classpath - if(loader instanceof URLClassLoader) - { - StringBuilder builder = new StringBuilder(); - URLClassLoader urlLoader = (URLClassLoader)loader; - for(URL url : urlLoader.getURLs()) - { - builder.append(url.toExternalForm()); - builder.append(File.pathSeparator); - } - - args.add("-classpath"); - args.add(builder.toString()); - } - - // the SEI - args.add(endpointClass.getCanonicalName()); - - WsgenTool tool = new WsgenTool(messageStream); - tool.run(args.toArray(new String[0])); - - } - finally{ - Thread.currentThread().setContextClassLoader(oldLoader); - } - } - - -} Modified: stack/metro/trunk/src/main/resources/jbossws-metro-client.jar/META-INF/services/org.jboss.wsf.spi.tools.ConsumerFactoryImpl =================================================================== --- stack/metro/trunk/src/main/resources/jbossws-metro-client.jar/META-INF/services/org.jboss.wsf.spi.tools.ConsumerFactoryImpl 2008-02-15 12:50:14 UTC (rev 5702) +++ stack/metro/trunk/src/main/resources/jbossws-metro-client.jar/META-INF/services/org.jboss.wsf.spi.tools.ConsumerFactoryImpl 2008-02-15 13:23:05 UTC (rev 5703) @@ -1 +1 @@ -org.jboss.wsf.stack.metro.tools.SunRIConsumerFactoryImpl \ No newline at end of file +org.jboss.wsf.stack.metro.tools.MetroConsumerFactoryImpl \ No newline at end of file Modified: stack/metro/trunk/src/main/resources/jbossws-metro-client.jar/META-INF/services/org.jboss.wsf.spi.tools.ProviderFactoryImpl =================================================================== --- stack/metro/trunk/src/main/resources/jbossws-metro-client.jar/META-INF/services/org.jboss.wsf.spi.tools.ProviderFactoryImpl 2008-02-15 12:50:14 UTC (rev 5702) +++ stack/metro/trunk/src/main/resources/jbossws-metro-client.jar/META-INF/services/org.jboss.wsf.spi.tools.ProviderFactoryImpl 2008-02-15 13:23:05 UTC (rev 5703) @@ -1 +1 @@ -org.jboss.wsf.stack.metro.tools.SunRIProviderFactoryImpl \ No newline at end of file +org.jboss.wsf.stack.metro.tools.MetroProviderFactoryImpl \ No newline at end of file

16 years, 11 months

1
0
0 / 0

JBossWS SVN: r5702 - framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-02-15 07:50:14 -0500 (Fri, 15 Feb 2008) New Revision: 5702 Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java Log: SunRI is Metro Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java 2008-02-15 12:29:00 UTC (rev 5701) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java 2008-02-15 12:50:14 UTC (rev 5702) @@ -155,7 +155,7 @@ { Object content = dh.getContent(); - // SunRI returns an ByteArrayInputStream + // Metro returns an ByteArrayInputStream if (content instanceof InputStream) { BufferedReader br = new BufferedReader(new InputStreamReader((InputStream)content));

16 years, 11 months

1
0
0 / 0

JBossWS SVN: r5701 - stack/cxf/trunk.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-02-15 07:29:00 -0500 (Fri, 15 Feb 2008) New Revision: 5701 Modified: stack/cxf/trunk/version.properties Log: use snapshot versions of common and framework Modified: stack/cxf/trunk/version.properties =================================================================== --- stack/cxf/trunk/version.properties 2008-02-15 12:25:46 UTC (rev 5700) +++ stack/cxf/trunk/version.properties 2008-02-15 12:29:00 UTC (rev 5701) @@ -35,8 +35,8 @@ # Thirdparty library versions jbossws-spi=1.0.1.GA -jbossws-common=1.0.3.GA -jbossws-framework=3.0.0.GA +jbossws-common=snapshot +jbossws-framework=snapshot jbossws-jboss42=4.2.1.GA apache-xml-commons=1.2

16 years, 11 months

1
0
0 / 0

JBossWS SVN: r5700 - in stack/metro/trunk: src/main/distro and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-02-15 07:25:46 -0500 (Fri, 15 Feb 2008) New Revision: 5700 Modified: stack/metro/trunk/src/main/distro/ReleaseNotes.txt stack/metro/trunk/src/test/resources/test-excludes-jboss422.txt stack/metro/trunk/src/test/resources/test-excludes-jboss423.txt stack/metro/trunk/src/test/resources/test-excludes-jboss500.txt stack/metro/trunk/src/test/resources/test-excludes-jboss501.txt stack/metro/trunk/version.properties Log: [JBWS-1944] refactoring Modified: stack/metro/trunk/src/main/distro/ReleaseNotes.txt =================================================================== --- stack/metro/trunk/src/main/distro/ReleaseNotes.txt 2008-02-15 12:22:14 UTC (rev 5699) +++ stack/metro/trunk/src/main/distro/ReleaseNotes.txt 2008-02-15 12:25:46 UTC (rev 5700) @@ -28,8 +28,8 @@ Bug * [JBWS-1669] - Fix WebServiceContext.getMessageContext() for EJB endpoints - * [JBWS-1681] - Fix SunRI XOP contentType handling - * [JBWS-1684] - Fix @WebServiceRef with SunRI + * [JBWS-1681] - Fix Metro XOP contentType handling + * [JBWS-1684] - Fix @WebServiceRef with Metro * [JBWS-1772] - WSConsume output is not correctly redirected Feature Request @@ -39,16 +39,16 @@ Task - * [JBWS-1670] - SunRI client does not throw UserException - * [JBWS-1675] - Redirect SunRI logging to jboss log + * [JBWS-1670] - Metro client does not throw UserException + * [JBWS-1675] - Redirect Metro logging to jboss log * [JBWS-1951] - Release jbossws-metro-1.0.0 binary * [JBWS-1954] - Include Metro specific tests in hudson QA * [JBWS-1955] - Use stable Metro CVS tag/version Errata - * [JBWS-1671] SunRI client handler cannot set mime header - * [JBWS-1672] SunRI does not respect @HandlerChain on client SEI + * [JBWS-1671] Metro client handler cannot set mime header + * [JBWS-1672] Metro does not respect @HandlerChain on client SEI * [JBWS-1772] WSConsume output is not correctly redirected * [JBWS-1777] WSProvide output is not correctly redirected * [JBWS-1776] Verify isolated classloading with WSProvide Modified: stack/metro/trunk/src/test/resources/test-excludes-jboss422.txt =================================================================== --- stack/metro/trunk/src/test/resources/test-excludes-jboss422.txt 2008-02-15 12:22:14 UTC (rev 5699) +++ stack/metro/trunk/src/test/resources/test-excludes-jboss422.txt 2008-02-15 12:25:46 UTC (rev 5700) @@ -2,9 +2,9 @@ # $Id: test-excludes.txt 3907 2007-07-17 12:55:40Z thomas.diesler(a)jboss.com $ # -# [JBWS-1673] Fix JAXR samples for SunRI +# [JBWS-1673] Fix JAXR samples for Metro org/jboss/test/ws/jaxws/samples/jaxr/** -# [JBWS-1674] Fix @WebServiceRef with SunRI +# [JBWS-1674] Fix @WebServiceRef with Metro org/jboss/test/ws/jaxws/samples/retail/** org/jboss/test/ws/jaxws/samples/webserviceref/** Modified: stack/metro/trunk/src/test/resources/test-excludes-jboss423.txt =================================================================== --- stack/metro/trunk/src/test/resources/test-excludes-jboss423.txt 2008-02-15 12:22:14 UTC (rev 5699) +++ stack/metro/trunk/src/test/resources/test-excludes-jboss423.txt 2008-02-15 12:25:46 UTC (rev 5700) @@ -11,9 +11,9 @@ # ################################################################### -# [JBWS-1673] Fix JAXR samples for SunRI +# [JBWS-1673] Fix JAXR samples for Metro org/jboss/test/ws/jaxws/samples/jaxr/** -# [JBWS-1674] Fix @WebServiceRef with SunRI +# [JBWS-1674] Fix @WebServiceRef with Metro org/jboss/test/ws/jaxws/samples/retail/** org/jboss/test/ws/jaxws/samples/webserviceref/** Modified: stack/metro/trunk/src/test/resources/test-excludes-jboss500.txt =================================================================== --- stack/metro/trunk/src/test/resources/test-excludes-jboss500.txt 2008-02-15 12:22:14 UTC (rev 5699) +++ stack/metro/trunk/src/test/resources/test-excludes-jboss500.txt 2008-02-15 12:25:46 UTC (rev 5700) @@ -2,10 +2,10 @@ # $Id: test-excludes.txt 3907 2007-07-17 12:55:40Z thomas.diesler(a)jboss.com $ # -# [JBWS-1673] Fix JAXR samples for SunRI +# [JBWS-1673] Fix JAXR samples for Metro org/jboss/test/ws/jaxws/samples/jaxr/** -# [JBWS-1674] Fix @WebServiceRef with SunRI +# [JBWS-1674] Fix @WebServiceRef with Metro org/jboss/test/ws/jaxws/samples/retail/** # [EJBTHREE-1150] WebServiceContext injection requires mapped-name Modified: stack/metro/trunk/src/test/resources/test-excludes-jboss501.txt =================================================================== --- stack/metro/trunk/src/test/resources/test-excludes-jboss501.txt 2008-02-15 12:22:14 UTC (rev 5699) +++ stack/metro/trunk/src/test/resources/test-excludes-jboss501.txt 2008-02-15 12:25:46 UTC (rev 5700) @@ -2,10 +2,10 @@ # $Id$ # -# [JBWS-1673] Fix JAXR samples for SunRI +# [JBWS-1673] Fix JAXR samples for Metro org/jboss/test/ws/jaxws/samples/jaxr/** -# [JBWS-1674] Fix @WebServiceRef with SunRI +# [JBWS-1674] Fix @WebServiceRef with Metro org/jboss/test/ws/jaxws/samples/retail/** # [EJBTHREE-1150] WebServiceContext injection requires mapped-name Modified: stack/metro/trunk/version.properties =================================================================== --- stack/metro/trunk/version.properties 2008-02-15 12:22:14 UTC (rev 5699) +++ stack/metro/trunk/version.properties 2008-02-15 12:25:46 UTC (rev 5700) @@ -15,7 +15,7 @@ # Thirdparty library versions jbossws-spi=1.0.1.GA -jbossws-common=1.0.3.GA +jbossws-common=snapshot jbossws-framework=snapshot jbossws-jboss42=4.2.1.GA

16 years, 11 months

1
0
0 / 0

JBossWS SVN: r5699 - in framework/trunk: src/test/java/org/jboss/test/ws/jaxws/samples/handlerchain and 3 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-02-15 07:22:14 -0500 (Fri, 15 Feb 2008) New Revision: 5699 Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBareTestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.java framework/trunk/version.properties Log: [JBWS-1944] refactoring Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.java =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.java 2008-02-15 12:20:33 UTC (rev 5698) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.java 2008-02-15 12:22:14 UTC (rev 5699) @@ -69,7 +69,7 @@ } else { - System.out.println("FIXME: [JBWS-1671] SunRI client handler cannot set mime header"); + System.out.println("FIXME: [JBWS-1671] Metro client handler cannot set mime header"); } bindingProvider.getBinding().setHandlerChain(handlerChain); @@ -85,9 +85,9 @@ Service service = Service.create(wsdlURL, serviceName); EndpointWithHandlerChain port = (EndpointWithHandlerChain)service.getPort(EndpointWithHandlerChain.class); - if (isIntegrationSunRI()) + if (isIntegrationMetro()) { - System.out.println("FIXME: [JBWS-1672] SunRI does not respect @HandlerChain on client SEI"); + System.out.println("FIXME: [JBWS-1672] Metro does not respect @HandlerChain on client SEI"); } else if (isIntegrationCXF()) { Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.java =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.java 2008-02-15 12:20:33 UTC (rev 5698) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.java 2008-02-15 12:22:14 UTC (rev 5699) @@ -60,9 +60,9 @@ String retStr = port.echo("hello"); StringBuffer expStr = new StringBuffer("hello"); - if (isIntegrationSunRI()) + if (isIntegrationMetro()) { - System.out.println("FIXME: [JBWS-1672] SunRI does not respect @HandlerChain on client SEI"); + System.out.println("FIXME: [JBWS-1672] Metro does not respect @HandlerChain on client SEI"); } else if (isIntegrationCXF()) { @@ -81,9 +81,9 @@ expStr.append(":Outbound:LogicalJAXBHandler"); expStr.append(":Outbound:ProtocolHandler"); expStr.append(":Outbound:PortHandler"); - if (isIntegrationSunRI()) + if (isIntegrationMetro()) { - System.out.println("FIXME: [JBWS-1672] SunRI does not respect @HandlerChain on client SEI"); + System.out.println("FIXME: [JBWS-1672] Metro does not respect @HandlerChain on client SEI"); } else if (isIntegrationCXF()) { Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.java =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.java 2008-02-15 12:20:33 UTC (rev 5698) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.java 2008-02-15 12:22:14 UTC (rev 5699) @@ -56,9 +56,9 @@ String retStr = port.echo("hello"); StringBuffer expStr = new StringBuffer("hello"); - if (isIntegrationSunRI()) + if (isIntegrationMetro()) { - System.out.println("FIXME: [JBWS-1672] SunRI does not respect @HandlerChain on client SEI"); + System.out.println("FIXME: [JBWS-1672] Metro does not respect @HandlerChain on client SEI"); } else if (isIntegrationCXF()) { @@ -77,9 +77,9 @@ expStr.append(":Outbound:LogicalSourceHandler"); expStr.append(":Outbound:ProtocolHandler"); expStr.append(":Outbound:PortHandler"); - if (isIntegrationSunRI()) + if (isIntegrationMetro()) { - System.out.println("FIXME: [JBWS-1672] SunRI does not respect @HandlerChain on client SEI"); + System.out.println("FIXME: [JBWS-1672] Metro does not respect @HandlerChain on client SEI"); } else if (isIntegrationCXF()) { @@ -105,9 +105,9 @@ String retStr = port.echo("hello"); StringBuffer expStr = new StringBuffer("hello"); - if (isIntegrationSunRI()) + if (isIntegrationMetro()) { - System.out.println("FIXME: [JBWS-1672] SunRI does not respect @HandlerChain on client SEI"); + System.out.println("FIXME: [JBWS-1672] Metro does not respect @HandlerChain on client SEI"); } else if (isIntegrationCXF()) { @@ -126,9 +126,9 @@ expStr.append(":Outbound:LogicalSourceHandler"); expStr.append(":Outbound:ProtocolHandler"); expStr.append(":Outbound:PortHandler"); - if (isIntegrationSunRI()) + if (isIntegrationMetro()) { - System.out.println("FIXME: [JBWS-1672] SunRI does not respect @HandlerChain on client SEI"); + System.out.println("FIXME: [JBWS-1672] Metro does not respect @HandlerChain on client SEI"); } else if (isIntegrationCXF()) { Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBareTestCase.java =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBareTestCase.java 2008-02-15 12:20:33 UTC (rev 5698) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBareTestCase.java 2008-02-15 12:22:14 UTC (rev 5699) @@ -72,7 +72,7 @@ public void testDataHandlerRoundtrip() throws Exception { - if(isIntegrationSunRI() && isTargetJBoss50()) + if(isIntegrationMetro() && isTargetJBoss50()) { System.out.println("FIXME JBWS-1949: Metro MTOM ignores content-type on attachment part"); return; @@ -96,7 +96,7 @@ */ public void testDataHandlerResponseOptimzed() throws Exception { - if(isIntegrationSunRI() && isTargetJBoss50()) + if(isIntegrationMetro() && isTargetJBoss50()) { System.out.println("FIXME JBWS-1949: Metro MTOM ignores content-type on attachment part"); return; Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java 2008-02-15 12:20:33 UTC (rev 5698) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java 2008-02-15 12:22:14 UTC (rev 5699) @@ -71,7 +71,7 @@ public void testParameterAnnotation() throws Exception { - if(isIntegrationSunRI() && isTargetJBoss50()) + if(isIntegrationMetro() && isTargetJBoss50()) { System.out.println("FIXME JBWS-1949: Metro MTOM ignores content-type on attachment part"); return; @@ -92,7 +92,7 @@ { Object content = dh.getContent(); - // SunRI returns an ByteArrayInputStream + // Metro returns an ByteArrayInputStream if (content instanceof InputStream) { BufferedReader br = new BufferedReader(new InputStreamReader((InputStream)content)); Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.java =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.java 2008-02-15 12:20:33 UTC (rev 5698) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.java 2008-02-15 12:22:14 UTC (rev 5699) @@ -180,7 +180,7 @@ public void testMessageStream() throws Exception { - if(isIntegrationSunRI()) + if(isIntegrationMetro()) { System.out.println("FIXME [JBWS-1777] WSProvide output is not correctly redirected"); return; Modified: framework/trunk/version.properties =================================================================== --- framework/trunk/version.properties 2008-02-15 12:20:33 UTC (rev 5698) +++ framework/trunk/version.properties 2008-02-15 12:22:14 UTC (rev 5699) @@ -14,7 +14,7 @@ implementation.vendor.id=http://www.jboss.org # Thirdparty library versions -jbossws-common=1.0.3.GA +jbossws-common=snapshot jbossws-spi=1.0.1.GA junit=3.8.1

16 years, 11 months

1
0
0 / 0

JBossWS SVN: r5698 - common/trunk.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-02-15 07:20:33 -0500 (Fri, 15 Feb 2008) New Revision: 5698 Modified: common/trunk/version.properties Log: [JBWS-1944] create new snapshot Modified: common/trunk/version.properties =================================================================== --- common/trunk/version.properties 2008-02-15 12:11:38 UTC (rev 5697) +++ common/trunk/version.properties 2008-02-15 12:20:33 UTC (rev 5698) @@ -5,8 +5,8 @@ specification.vendor=JBoss (http://www.jboss.org) specification.version=jbossws-2.0 -version.id=1.0.4.DEV -repository.id=1.0.4.DEV +version.id=snapshot +repository.id=snapshot implementation.url=http://www.jboss.org/products/jbossws implementation.vendor=JBoss Inc.

16 years, 11 months

1
0
0 / 0

JBossWS SVN: r5697 - common/trunk/src/main/java/org/jboss/wsf/test.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-02-15 07:11:38 -0500 (Fri, 15 Feb 2008) New Revision: 5697 Modified: common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java Log: [JBWS-1944] refactoring Modified: common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2008-02-15 11:27:43 UTC (rev 5696) +++ common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2008-02-15 12:11:38 UTC (rev 5697) @@ -87,9 +87,9 @@ } - public boolean isIntegrationSunRI() + public boolean isIntegrationMetro() { - return delegate.isIntegrationSunRI(); + return delegate.isIntegrationMetro(); } public boolean isIntegrationCXF() Modified: common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2008-02-15 11:27:43 UTC (rev 5696) +++ common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2008-02-15 12:11:38 UTC (rev 5697) @@ -99,7 +99,7 @@ return vendor.indexOf("JBoss") != -1; } - public boolean isIntegrationSunRI() + public boolean isIntegrationMetro() { String vendor = getImplementationVendor(); return vendor.indexOf("Sun") != -1;

16 years, 11 months

1
0
0 / 0

JBossWS SVN: r5696 - framework/trunk/src/test/ant-import.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-02-15 06:27:43 -0500 (Fri, 15 Feb 2008) New Revision: 5696 Modified: framework/trunk/src/test/ant-import/build-testsuite.xml Log: Remove tests-classpath40 Modified: framework/trunk/src/test/ant-import/build-testsuite.xml =================================================================== --- framework/trunk/src/test/ant-import/build-testsuite.xml 2008-02-15 11:22:42 UTC (rev 5695) +++ framework/trunk/src/test/ant-import/build-testsuite.xml 2008-02-15 11:27:43 UTC (rev 5696) @@ -110,78 +110,8 @@ </tstamp> </target> - <target name="tests-classpath" depends="tests-classpath-jboss50,tests-classpath-jboss42,tests-classpath-jboss40,tests-classpath-jboss40-no-ejb3"/> + <target name="tests-classpath" depends="tests-classpath-jboss50,tests-classpath-jboss42"/> - <target name="tests-classpath-jboss50" depends="tests-prepare" if="jbossws.integration.jboss50"> - - <path id="tests.javac.classpath"> - <path refid="ws.stack.classpath"/> - <path refid="tests.extra.classpath"/> - <pathelement location="${jboss.client}/activation.jar"/> - <pathelement location="${jboss.client}/jaxws-tools.jar"/> - <pathelement location="${jboss.client}/jboss-wsit-tools.jar"/> - <pathelement location="${jboss.client}/jboss-annotations-ejb3.jar"/> - <pathelement location="${jboss.client}/jboss-common-core.jar"/> - <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/> - <pathelement location="${jboss.client}/jboss-ejb3-ext-api.jar"/> - <pathelement location="${jboss.client}/jboss-logging-spi.jar"/> - <pathelement location="${jboss.client}/jboss-metadata.jar"/> - <pathelement location="${jboss.client}/jboss-remoting.jar"/> - <pathelement location="${jboss.client}/jboss-xml-binding.jar"/> - <pathelement location="${jboss.client}/mail.jar"/> - <pathelement location="${jboss.client}/wsdl4j.jar"/> - <pathelement location="${jboss.server.lib}/jboss-javaee.jar"/> - <pathelement location="${jboss.server.lib}/jbosssx.jar"/> - <pathelement location="${jboss.server.lib}/servlet-api.jar"/> - </path> - -  - <path id="tests.client.classpath"> - <path refid="ws.stack.classpath"/> - <path refid="tests.extra.classpath"/> - <pathelement location="${jboss.client}/activation.jar"/> - <pathelement location="${jboss.client}/javassist.jar"/> - <pathelement location="${jboss.client}/jaxb-api.jar"/> - <pathelement location="${jboss.client}/jaxb-impl.jar"/> - <pathelement location="${jboss.client}/jaxb-xjc.jar"/> - <pathelement location="${jboss.client}/jaxws-tools.jar"/> - <pathelement location="${jboss.client}/jboss-wsit-tools.jar"/> - <pathelement location="${jboss.client}/jboss-container-metadata.jar"/> - <pathelement location="${jboss.client}/jboss-ejb3-ext-api.jar"/> - <pathelement location="${jboss.client}/jboss-metadata.jar"/> - <pathelement location="${jboss.client}/jboss-remoting.jar"/> - <pathelement location="${jboss.client}/jboss-xml-binding.jar"/> - <pathelement location="${jboss.client}/jbossall-client.jar"/> - <pathelement location="${jboss.client}/jbossws-jboss50.jar"/> - <pathelement location="${jboss.client}/jaxws-tools.jar"/> - <pathelement location="${jboss.client}/jboss-wsit-tools.jar"/> - <pathelement location="${jboss.client}/log4j.jar"/> - <pathelement location="${jboss.client}/mail.jar"/> - <pathelement location="${jboss.client}/stax-api.jar"/> - <pathelement location="${jboss.client}/trove.jar"/> -  - <pathelement location="${jboss.lib}/jboss-aop-jdk50.jar"/> - <pathelement location="${jboss.lib}/jboss-container.jar"/> - <pathelement location="${jboss.lib}/jboss-vfs.jar"/> - <pathelement location="${jboss.server.lib}/jboss.jar"/> - <pathelement location="${jboss.server.lib}/jbosssx.jar"/> - <pathelement location="${jboss.server.lib}/hibernate3.jar"/> - <pathelement location="${jboss.server.lib}/jnpserver.jar"/> - <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi.jar"/> - <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi-saaj.jar"/> - <pathelement location="${jboss.server.deploy}/juddi-service.sar/scout.jar"/> - <pathelement location="${tools.jar}"/> -  - <pathelement location="${jboss.server.deployers}/jbossweb.deployer/jbossweb.jar"/> - </path> - </target> - <target name="tests-classpath-jboss42" depends="tests-prepare" if="jbossws.integration.jboss42"> <path id="tests.javac.classpath"> @@ -247,115 +177,73 @@ </path> </target> - <target name="tests-classpath-jboss40" depends="tests-prepare" if="jbossws.integration.jboss40"> + <target name="tests-classpath-jboss50" depends="tests-prepare" if="jbossws.integration.jboss50"> + <path id="tests.javac.classpath"> <path refid="ws.stack.classpath"/> <path refid="tests.extra.classpath"/> <pathelement location="${jboss.client}/activation.jar"/> - <pathelement location="${jboss.client}/jaxb-api.jar"/> - <pathelement location="${jboss.client}/jaxb-impl.jar"/> <pathelement location="${jboss.client}/jaxws-tools.jar"/> <pathelement location="${jboss.client}/jboss-wsit-tools.jar"/> <pathelement location="${jboss.client}/jboss-annotations-ejb3.jar"/> - <pathelement location="${jboss.client}/jboss-common-client.jar"/> - <pathelement location="${jboss.client}/jboss-ejb3x.jar"/> + <pathelement location="${jboss.client}/jboss-common-core.jar"/> <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/> - <pathelement location="${jboss.client}/jboss-j2ee.jar"/> + <pathelement location="${jboss.client}/jboss-ejb3-ext-api.jar"/> + <pathelement location="${jboss.client}/jboss-logging-spi.jar"/> + <pathelement location="${jboss.client}/jboss-metadata.jar"/> <pathelement location="${jboss.client}/jboss-remoting.jar"/> <pathelement location="${jboss.client}/jboss-xml-binding.jar"/> <pathelement location="${jboss.client}/mail.jar"/> - <pathelement location="${jboss.client}/wsdl4j.jar"/> - <pathelement location="${jboss.client}/stax-api.jar"/> - <pathelement location="${jboss.client}/jbosssx-client.jar"/> - <pathelement location="${jboss.server.lib}/javax.servlet.jar"/> + <pathelement location="${jboss.client}/wsdl4j.jar"/> + <pathelement location="${jboss.server.lib}/jboss-javaee.jar"/> + <pathelement location="${jboss.server.lib}/jbosssx.jar"/> + <pathelement location="${jboss.server.lib}/servlet-api.jar"/> </path>  <path id="tests.client.classpath"> <path refid="ws.stack.classpath"/> <path refid="tests.extra.classpath"/> - <pathelement location="${jboss.client}/commons-logging.jar"/> - <pathelement location="${jboss.client}/javassist.jar"/> - <pathelement location="${jboss.client}/jaxb-xjc.jar"/> - <pathelement location="${jboss.client}/jaxws-tools.jar"/> - <pathelement location="${jboss.client}/jboss-wsit-tools.jar"/> - <pathelement location="${jboss.client}/jboss-aop-jdk50-client.jar"/> - <pathelement location="${jboss.client}/jboss-aspect-jdk50-client.jar"/> - <pathelement location="${jboss.client}/jboss-ejb3x.jar"/> - <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/> - <pathelement location="${jboss.client}/jboss-saaj.jar"/> - <pathelement location="${jboss.client}/jbossws-jboss40.jar"/> - <pathelement location="${jboss.client}/jboss-remoting.jar"/> - <pathelement location="${jboss.client}/jbossall-client.jar"/> - <pathelement location="${jboss.client}/log4j.jar"/> - <pathelement location="${jboss.client}/mail.jar"/> - <pathelement location="${jboss.client}/stax-api.jar"/> - <pathelement location="${jboss.client}/jboss-xml-binding.jar"/> -  - <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi.jar"/> - <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi-saaj.jar"/> - <pathelement location="${jboss.server.deploy}/juddi-service.sar/scout.jar"/> - <pathelement location="${tools.jar}"/> -  - <pathelement location="${jboss.server.deploy}/jbossweb-tomcat55.sar/tomcat-coyote.jar"/> - <pathelement location="${jboss.server.deploy}/jbossweb-tomcat55.sar/tomcat-http.jar"/> - <pathelement location="${jboss.server.deploy}/jbossweb-tomcat55.sar/tomcat-util.jar"/> - </path> - </target> - - <target name="tests-classpath-jboss40-no-ejb3" depends="tests-prepare" if="jbossws.integration.jboss405.no.ejb3"> - <path id="tests.javac.classpath"> - <path refid="ws.stack.classpath"/> - <path refid="tests.extra.classpath"/> <pathelement location="${jboss.client}/activation.jar"/> + <pathelement location="${jboss.client}/javassist.jar"/> <pathelement location="${jboss.client}/jaxb-api.jar"/> <pathelement location="${jboss.client}/jaxb-impl.jar"/> + <pathelement location="${jboss.client}/jaxb-xjc.jar"/> <pathelement location="${jboss.client}/jaxws-tools.jar"/> <pathelement location="${jboss.client}/jboss-wsit-tools.jar"/> - <pathelement location="${jboss.client}/jboss-common-client.jar"/> - <pathelement location="${jboss.client}/jboss-j2ee.jar"/> + <pathelement location="${jboss.client}/jboss-container-metadata.jar"/> + <pathelement location="${jboss.client}/jboss-ejb3-ext-api.jar"/> + <pathelement location="${jboss.client}/jboss-metadata.jar"/> <pathelement location="${jboss.client}/jboss-remoting.jar"/> <pathelement location="${jboss.client}/jboss-xml-binding.jar"/> - <pathelement location="${jboss.client}/mail.jar"/> - <pathelement location="${jboss.client}/wsdl4j.jar"/> - <pathelement location="${jboss.client}/stax-api.jar"/> - <pathelement location="${jboss.client}/jbosssx-client.jar"/> - <pathelement location="${jboss.server.lib}/javax.servlet.jar"/> - </path> - -  - <path id="tests.client.classpath"> - <path refid="ws.stack.classpath"/> - <path refid="tests.extra.classpath"/> - <pathelement location="${jboss.client}/commons-logging.jar"/> - <pathelement location="${jboss.client}/javassist.jar"/> - <pathelement location="${jboss.client}/jaxb-xjc.jar"/> + <pathelement location="${jboss.client}/jbossall-client.jar"/> + <pathelement location="${jboss.client}/jbossws-jboss50.jar"/> <pathelement location="${jboss.client}/jaxws-tools.jar"/> <pathelement location="${jboss.client}/jboss-wsit-tools.jar"/> - <pathelement location="${jboss.client}/jboss-saaj.jar"/> - <pathelement location="${jboss.client}/jbossws-jboss40.jar"/> - <pathelement location="${jboss.client}/jbossall-client.jar"/> <pathelement location="${jboss.client}/log4j.jar"/> <pathelement location="${jboss.client}/mail.jar"/> <pathelement location="${jboss.client}/stax-api.jar"/> - <pathelement location="${jboss.client}/jboss-xml-binding.jar"/> + <pathelement location="${jboss.client}/trove.jar"/>  + <pathelement location="${jboss.lib}/jboss-aop-jdk50.jar"/> + <pathelement location="${jboss.lib}/jboss-container.jar"/> + <pathelement location="${jboss.lib}/jboss-vfs.jar"/> + <pathelement location="${jboss.server.lib}/jboss.jar"/> + <pathelement location="${jboss.server.lib}/jbosssx.jar"/> + <pathelement location="${jboss.server.lib}/hibernate3.jar"/> + <pathelement location="${jboss.server.lib}/jnpserver.jar"/> <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi.jar"/> <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi-saaj.jar"/> <pathelement location="${jboss.server.deploy}/juddi-service.sar/scout.jar"/> <pathelement location="${tools.jar}"/> +  + <pathelement location="${jboss.server.deployers}/jbossweb.deployer/jbossweb.jar"/> </path> </target>

16 years, 11 months

1
0
0 / 0

JBossWS SVN: r5695 - framework/trunk/hudson/hudson-home.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-02-15 06:22:42 -0500 (Fri, 15 Feb 2008) New Revision: 5695 Modified: framework/trunk/hudson/hudson-home/config.xml Log: Define TCK Native Tests Modified: framework/trunk/hudson/hudson-home/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/config.xml 2008-02-15 11:19:56 UTC (rev 5694) +++ framework/trunk/hudson/hudson-home/config.xml 2008-02-15 11:22:42 UTC (rev 5695) @@ -3,7 +3,7 @@ <numExecutors>1</numExecutors> <useSecurity>true</useSecurity> <systemMessage> -<![CDATA[ + <![CDATA[ <h2>JBossWS-(a)version.id@ QA Environment</h2> <table> @@ -22,7 +22,7 @@ <tr><th align=left>@hudson.jboss501.build@</th><td>-r(a)hudson.jboss501.rev@ @hudson.jboss501.url@</td></tr> <tr><td colspan=2></td></tr> </table> -]]> +]]> </systemMessage> <jdks/> <slaves/> @@ -43,12 +43,12 @@ </jobNames> <name>AS Tests</name> <description> -<![CDATA[ + <![CDATA[ Run the JBossAS webservice testsuite. <p/> Make sure you have sucessfuly build the <a href="/hudson/view/Target%20Container">Target Container</a> -]]> - </description> +]]> + </description> </view>  @@ -79,34 +79,14 @@ </jobNames> <name>Native Tests</name> <description> -<![CDATA[ + <![CDATA[ Run the JBossWS testsuite. <p/> Make sure you have sucessfuly build the <a href="/hudson/view/Target%20Container">Target Container</a> -]]> +]]> </description> </view> -  - <view> - <owner reference="../../.."/> - <jobNames class="tree-set"> - <no-comparator/> - <string>Native-Tck14-Jaxr-AS-4.2.3</string> - <string>Native-Tck14-Jaxrpc-AS-4.2.3</string> - <string>Native-Tck14-Saaj-AS-4.2.3</string> - <string>Native-Tck14-Webservices-AS-4.2.3</string> - </jobNames> - <name>Native TCK Tests</name> - <description> -<![CDATA[ - Run the WebService TCK. - <p/> - Make sure you have sucessfuly build the <a href="/hudson/view/Target%20Container">Target Container</a> and <a href="/hudson/job/TCK-1.4">TCK-1.4</a> -]]> - </description> - </view> -  <view> <owner reference="../../.."/> @@ -128,11 +108,11 @@ </jobNames> <name>Metro Tests</name> <description> -<![CDATA[ + <![CDATA[ Run the Metro testsuite. <p/> Make sure you have sucessfuly build the <a href="/hudson/view/Target%20Container">Target Container</a> -]]> +]]> </description> </view> @@ -153,11 +133,11 @@ </jobNames> <name>CXF Tests</name> <description> -<![CDATA[ + <![CDATA[ Run the CXF testsuite. <p/> Make sure you have sucessfuly build the <a href="/hudson/view/Target%20Container">Target Container</a> -]]> +]]> </description> </view> @@ -171,7 +151,7 @@ </jobNames> <name>Release QA</name> <description> -<![CDATA[ + <![CDATA[ A collection of jobs that cover the JBossWS release matrix. <p/> <table border=1> @@ -183,10 +163,30 @@ <tr align=center><th align=left>AS-5.0.0</th> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td></tr> <tr align=center><th align=left>AS-5.0.1</th> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td></tr> </table> -]]> - </description> +]]> + </description> </view> +  + <view> + <owner reference="../../.."/> + <jobNames class="tree-set"> + <no-comparator/> + <string>Native-Tck14-Jaxr-AS-4.2.3</string> + <string>Native-Tck14-Jaxrpc-AS-4.2.3</string> + <string>Native-Tck14-Saaj-AS-4.2.3</string> + <string>Native-Tck14-Webservices-AS-4.2.3</string> + </jobNames> + <name>TCK Native Tests</name> + <description> + <![CDATA[ + Run the WebService TCK. + <p/> + Make sure you have sucessfuly build the <a href="/hudson/view/Target%20Container">Target Container</a> and <a href="/hudson/job/TCK-1.4">TCK-1.4</a> +]]> + </description> + </view> +  <view> <owner reference="../../.."/> @@ -199,12 +199,11 @@ <string>AS-5.0.1</string> </jobNames> <name>Target Container</name> - <description> -<![CDATA[ + <description> <![CDATA[ Build the supported target container. A successful build is a prerequisite for any testrun that targets the container. -]]> +]]> </description> </view> </views> -</hudson> +</hudson> \ No newline at end of file

16 years, 11 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits February 2008