August 2007 - jbossws-commits - Jboss List Archives

JBossWS SVN: r4117 - in container/jboss40: trunk and 2 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-08-02 12:53:25 -0400 (Thu, 02 Aug 2007) New Revision: 4117 Added: container/jboss40/trunk/ container/jboss40/trunk/ant-import/build-thirdparty.xml container/jboss40/trunk/ant.properties.example container/jboss40/trunk/build.xml container/jboss40/trunk/version.properties Removed: container/jboss40/trunk/ant-import/build-thirdparty.xml container/jboss40/trunk/build.xml Modified: container/jboss40/trunk/.classpath container/jboss40/trunk/.project container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/WebServiceClientDeployer.java Log: Initial commit Copied: container/jboss40/trunk (from rev 4106, trunk/integration/jboss40) Modified: container/jboss40/trunk/.classpath =================================================================== --- trunk/integration/jboss40/.classpath 2007-08-02 15:05:43 UTC (rev 4106) +++ container/jboss40/trunk/.classpath 2007-08-02 16:53:25 UTC (rev 4117) @@ -3,15 +3,14 @@ <classpathentry excluding="org/jboss/wsf/container/jboss42/jms/" kind="src" path="src/main/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-4.0.x"/> - <classpathentry combineaccessrules="false" kind="src" path="/integration-jboss42"/> <classpathentry combineaccessrules="false" kind="src" path="/jbossws-core"/> <classpathentry combineaccessrules="false" kind="src" path="/spi"/> - <classpathentry combineaccessrules="false" kind="src" path="/integration-framework"/> <classpathentry kind="lib" path="/integration-framework/thirdparty/dom4j.jar"/> <classpathentry kind="lib" path="/integration-framework/thirdparty/jaxrpc-api.jar"/> <classpathentry kind="lib" path="/integration-framework/thirdparty/jaxws-api.jar"/> <classpathentry kind="lib" path="/integration-framework/thirdparty/jsr181-api.jar"/> <classpathentry kind="lib" path="/integration-framework/thirdparty/saaj-api.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/common"/> + <classpathentry combineaccessrules="false" kind="src" path="/container-jboss42"/> <classpathentry kind="output" path="output/eclipse"/> </classpath> Modified: container/jboss40/trunk/.project =================================================================== --- trunk/integration/jboss40/.project 2007-08-02 15:05:43 UTC (rev 4106) +++ container/jboss40/trunk/.project 2007-08-02 16:53:25 UTC (rev 4117) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>integration-jboss40</name> + <name>container-jboss40</name> <comment></comment> <projects> </projects> Deleted: container/jboss40/trunk/ant-import/build-thirdparty.xml =================================================================== --- trunk/integration/jboss40/ant-import/build-thirdparty.xml 2007-08-02 15:05:43 UTC (rev 4106) +++ container/jboss40/trunk/ant-import/build-thirdparty.xml 2007-08-02 16:53:25 UTC (rev 4117) @@ -1,62 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - - - - -<project> - -  -  -  - - <target name="thirdparty" depends="thirdparty-get,thirdparty-classpath"> - </target> - - <target name="thirdparty-init" depends="prepare"/> - -  - <target name="thirdparty-get" depends="thirdparty-init" - description="Gets the thirdparty libraries"/> - - <target name="thirdparty-classpath" depends="thirdparty-get"> - -  - <path id="jbws40.integration.classpath"> - <pathelement location="${core.dir}/output/lib/jbossws-core.jar"/> - <pathelement location="${framework.dir}/output/lib/jbossws-framework.jar"/> - <pathelement location="${framework.dir}/thirdparty/jbossws-common.jar"/> - <pathelement location="${framework.dir}/thirdparty/jbossws-spi.jar"/> - <pathelement location="${framework.dir}/thirdparty/jaxws-api.jar"/> - <pathelement location="${framework.dir}/thirdparty/jaxrpc-api.jar"/> - <pathelement location="${framework.dir}/thirdparty/jsr181-api.jar"/> - <pathelement location="${framework.dir}/thirdparty/saaj-api.jar"/> - <pathelement location="${jboss40.lib}/jboss-common.jar"/> - <pathelement location="${jboss40.lib}/jboss-jmx.jar"/> - <pathelement location="${jboss40.lib}/jboss-system.jar"/> - <pathelement location="${jboss40.lib}/jboss-xml-binding.jar"/> - <pathelement location="${jboss40.server.lib}/dom4j.jar"/> - <pathelement location="${jboss40.server.lib}/jboss.jar"/> - <pathelement location="${jboss40.server.lib}/jboss-j2ee.jar"/> - <pathelement location="${jboss40.server.lib}/jbosssx.jar"/> - <pathelement location="${jboss40.server.lib}/javax.servlet.jar"/> - <pathelement location="${jboss40.server.deploy}/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar"/> - <pathelement location="${jboss40.server.deploy}/jboss-bean.deployer/jboss-dependency.jar"/> - <pathelement location="${jboss40.server.deploy}/jboss-bean.deployer/jboss-microcontainer.jar"/> - <pathelement location="${jboss40.server.deploy}/ejb3.deployer/jboss-annotations-ejb3.jar"/> - <pathelement location="${jboss40.server.deploy}/ejb3.deployer/jboss-ejb3x.jar"/> - <pathelement location="${jboss40.server.deploy}/ejb3.deployer/jboss-ejb3.jar"/> - </path> - - </target> - -</project> Copied: container/jboss40/trunk/ant-import/build-thirdparty.xml (from rev 4109, trunk/integration/jboss40/ant-import/build-thirdparty.xml) =================================================================== --- container/jboss40/trunk/ant-import/build-thirdparty.xml (rev 0) +++ container/jboss40/trunk/ant-import/build-thirdparty.xml 2007-08-02 16:53:25 UTC (rev 4117) @@ -0,0 +1,61 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project> + +  +  +  + + <target name="thirdparty" depends="thirdparty-get,thirdparty-classpath"> + </target> + + <target name="thirdparty-init" depends="prepare"/> + +  + <target name="thirdparty-get" depends="thirdparty-init" + description="Gets the thirdparty libraries"/> + + <target name="thirdparty-classpath" depends="thirdparty-get"> + +  + <path id="jbws40.integration.classpath"> + <pathelement location="${framework.dir}/output/lib/jbossws-framework.jar"/> + <pathelement location="${framework.dir}/thirdparty/jbossws-common.jar"/> + <pathelement location="${framework.dir}/thirdparty/jbossws-spi.jar"/> + <pathelement location="${framework.dir}/thirdparty/jaxws-api.jar"/> + <pathelement location="${framework.dir}/thirdparty/jaxrpc-api.jar"/> + <pathelement location="${framework.dir}/thirdparty/jsr181-api.jar"/> + <pathelement location="${framework.dir}/thirdparty/saaj-api.jar"/> + <pathelement location="${jboss40.lib}/jboss-common.jar"/> + <pathelement location="${jboss40.lib}/jboss-jmx.jar"/> + <pathelement location="${jboss40.lib}/jboss-system.jar"/> + <pathelement location="${jboss40.lib}/jboss-xml-binding.jar"/> + <pathelement location="${jboss40.server.lib}/dom4j.jar"/> + <pathelement location="${jboss40.server.lib}/jboss.jar"/> + <pathelement location="${jboss40.server.lib}/jboss-j2ee.jar"/> + <pathelement location="${jboss40.server.lib}/jbosssx.jar"/> + <pathelement location="${jboss40.server.lib}/javax.servlet.jar"/> + <pathelement location="${jboss40.server.deploy}/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar"/> + <pathelement location="${jboss40.server.deploy}/jboss-bean.deployer/jboss-dependency.jar"/> + <pathelement location="${jboss40.server.deploy}/jboss-bean.deployer/jboss-microcontainer.jar"/> + <pathelement location="${jboss40.server.deploy}/ejb3.deployer/jboss-annotations-ejb3.jar"/> + <pathelement location="${jboss40.server.deploy}/ejb3.deployer/jboss-ejb3x.jar"/> + <pathelement location="${jboss40.server.deploy}/ejb3.deployer/jboss-ejb3.jar"/> + </path> + + </target> + +</project> Added: container/jboss40/trunk/ant.properties.example =================================================================== --- container/jboss40/trunk/ant.properties.example (rev 0) +++ container/jboss40/trunk/ant.properties.example 2007-08-02 16:53:25 UTC (rev 4117) @@ -0,0 +1,26 @@ +# +# A sample ant properties file +# +# $Id: ant.properties.example 3995 2007-07-26 08:52:45Z thomas.diesler(a)jboss.com $ + +# JBoss Home +#jboss40.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA-ejb3 + +# The JBoss settings +jboss.server.instance=default + +# JBoss Repository +#jboss.repository=file:/home/tdiesler/svn/jboss.local.repository +jboss.repository=http://repository.jboss.org + +# JBossWS Release +jboss.local.repository=/home/tdiesler/svn/jboss.local.repository + +# Force thirdparty HTTP get +#force.thirdparty.get=true + +# Java Compiler options +javac.debug=yes +javac.deprecation=no +javac.fail.onerror=yes +javac.verbose=no Deleted: container/jboss40/trunk/build.xml =================================================================== --- trunk/integration/jboss40/build.xml 2007-08-02 15:05:43 UTC (rev 4106) +++ container/jboss40/trunk/build.xml 2007-08-02 16:53:25 UTC (rev 4117) @@ -1,168 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - - - - -<project default="main" basedir="../.." name="JBossWS-JBoss40"> - - <import file="${basedir}/build/ant-import/build-setup.xml"/> - - <import file="${int.jboss40.dir}/ant-import/build-release.xml"/> - <import file="${int.jboss40.dir}/ant-import/build-thirdparty.xml"/> - -  -  -  - - <property name="jbws40.dir" value="${int.jboss40.dir}"/> - <property name="jbws40.src.dir" value="${jbws40.dir}/src/main"/> - <property name="jbws40.etc.dir" value="${jbws40.src.dir}/etc"/> - <property name="jbws40.java.dir" value="${jbws40.src.dir}/java"/> - <property name="jbws40.resources.dir" value="${jbws40.src.dir}/resources"/> - <property name="jbws40.output.dir" value="${jbws40.dir}/output"/> - <property name="jbws40.output.apidocs.dir" value="${jbws40.output.dir}/apidocs"/> - <property name="jbws40.output.classes.dir" value="${jbws40.output.dir}/classes"/> - <property name="jbws40.output.etc.dir" value="${jbws40.output.dir}/etc"/> - <property name="jbws40.output.lib.dir" value="${jbws40.output.dir}/lib"/> - - <property name="jbws42.dir" value="${int.jboss42.dir}"/> - <property name="jbws42.src.dir" value="${jbws42.dir}/src/main"/> - <property name="jbws42.etc.dir" value="${jbws42.src.dir}/etc"/> - <property name="jbws42.java.dir" value="${jbws42.src.dir}/java"/> - <property name="jbws42.resources.dir" value="${jbws42.src.dir}/resources"/> - -  -  -  - - <target name="init" depends="prepare, thirdparty"> - <fail message="Not available: ${jboss40.available.file}" unless="jboss40.available"/> - <ant antfile="${core.dir}/build.xml" target="jars" inheritall="false"/> - </target> - -  -  -  - -  - - <target name="compile" depends="init,compile-classes,compile-etc" description="Compile all source files."/> - -  - <target name="compile-classes" depends="init"> - <mkdir dir="${jbws40.output.classes.dir}"/> - <javac srcdir="${jbws40.java.dir}" sourcepath="" destdir="${jbws40.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" - deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> - <src path="${jbws40.java.dir}"/> - <src path="${jbws42.java.dir}"/> - <include name="org/jboss/ws/integration/**"/> - <include name="org/jboss/wsf/container/jboss40/**"/> - <include name="org/jboss/wsf/container/jboss42/**"/> - <exclude name="org/jboss/wsf/container/jboss42/jms/**"/> - <exclude name="org/jboss/wsf/container/jboss42/EJBArchiveMetaDataAdapterEJB21.java"/> - <exclude name="org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java"/> - <exclude name="org/jboss/wsf/container/jboss42/InvocationHandlerFactoryImpl.java"/> - <classpath refid="jbws40.integration.classpath"/> - </javac> - </target> - -  - <target name="compile-etc" depends="init"> - <mkdir dir="${jbws40.output.etc.dir}"/> - <copy todir="${jbws40.output.etc.dir}" filtering="yes"> - <fileset dir="${build.dir}/etc"> - <include name="default.mf"/> - </fileset> - <filterset> - <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="jbossws-${version.id}"/> - <filtersfile file="${build.dir}/version.properties"/> - </filterset> - </copy> - </target> - -  -  -  - -  - <target name="jars" depends="compile,module-jars" description="Builds all jar files."> - </target> - -  - <target name="module-jars" depends="init"> - -  - <mkdir dir="${jbws40.output.lib.dir}"/> - <jar jarfile="${jbws40.output.lib.dir}/jbossws-jboss40.jar" manifest="${jbws40.output.etc.dir}/default.mf"> - <fileset dir="${jbws40.output.classes.dir}"> - <include name="org/jboss/ws/integration/**"/> - <include name="org/jboss/wsf/container/jboss40/**"/> - <include name="org/jboss/wsf/container/jboss42/**"/> - </fileset> - <metainf dir="${jbws40.resources.dir}/jbossws-jboss40.jar/META-INF"/> - </jar> - -  - <zip zipfile="${jbws40.output.lib.dir}/jbossws-jboss40-src.zip" > - <fileset dir="${jbws40.java.dir}"/> - <fileset dir="${jbws42.java.dir}"/> - </zip> - - </target> - -  - <target name="javadoc" depends="init" description="Generate the Javadoc"> - - <mkdir dir="${jbws40.output.apidocs.dir}"/> - <javadoc destdir="${jbws40.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API"> - <classpath> - <path refid="jbws40.integration.classpath"/> - </classpath> - <packageset dir="${jbws40.java.dir}" defaultexcludes="yes"> - <include name="org/jboss/wsf/**"/> - </packageset> - <doctitle><![CDATA[<h1>JBoss Web Service Framework - Container integration AS 4.0</h1>]]></doctitle> - <tag name="todo" scope="all" description="To do:"/> - </javadoc> - </target> - -  -  -  - - <target name="clean" depends="prepare" description="Cleans up most generated files."> - <delete dir="${jbws40.output.dir}"/> - </target> - - <target name="clobber" depends="clean" description="Cleans up all generated files."> - </target> - - <target name="main" description="Executes the default target (most)." depends="most"/> - - <target name="most" description="Builds almost everything." depends="jars"/> - - <target name="all" description="Create a distribution zip file" depends="main"> - </target> - -</project> Copied: container/jboss40/trunk/build.xml (from rev 4109, trunk/integration/jboss40/build.xml) =================================================================== --- container/jboss40/trunk/build.xml (rev 0) +++ container/jboss40/trunk/build.xml 2007-08-02 16:53:25 UTC (rev 4117) @@ -0,0 +1,167 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project default="main" basedir="." name="JBossWS-JBoss40"> + + <import file="${basedir}/ant-import/build-setup.xml"/> + <import file="${basedir}/ant-import/build-release.xml"/> + <import file="${basedir}/ant-import/build-thirdparty.xml"/> + +  +  +  + + <property name="jbws40.dir" value="${int.jboss40.dir}"/> + <property name="jbws40.src.dir" value="${jbws40.dir}/src/main"/> + <property name="jbws40.etc.dir" value="${jbws40.src.dir}/etc"/> + <property name="jbws40.java.dir" value="${jbws40.src.dir}/java"/> + <property name="jbws40.resources.dir" value="${jbws40.src.dir}/resources"/> + <property name="jbws40.output.dir" value="${jbws40.dir}/output"/> + <property name="jbws40.output.apidocs.dir" value="${jbws40.output.dir}/apidocs"/> + <property name="jbws40.output.classes.dir" value="${jbws40.output.dir}/classes"/> + <property name="jbws40.output.etc.dir" value="${jbws40.output.dir}/etc"/> + <property name="jbws40.output.lib.dir" value="${jbws40.output.dir}/lib"/> + + <property name="jbws42.dir" value="${int.jboss42.dir}"/> + <property name="jbws42.src.dir" value="${jbws42.dir}/src/main"/> + <property name="jbws42.etc.dir" value="${jbws42.src.dir}/etc"/> + <property name="jbws42.java.dir" value="${jbws42.src.dir}/java"/> + <property name="jbws42.resources.dir" value="${jbws42.src.dir}/resources"/> + +  +  +  + + <target name="init" depends="prepare, thirdparty"> + <fail message="Not available: ${jboss40.available.file}" unless="jboss40.available"/> + </target> + +  +  +  + +  + + <target name="compile" depends="init,compile-classes,compile-etc" description="Compile all source files."/> + +  + <target name="compile-classes" depends="init"> + <mkdir dir="${jbws40.output.classes.dir}"/> + <javac srcdir="${jbws40.java.dir}" sourcepath="" destdir="${jbws40.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" + deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> + <src path="${jbws40.java.dir}"/> + <src path="${jbws42.java.dir}"/> + <include name="org/jboss/ws/integration/**"/> + <include name="org/jboss/wsf/container/jboss40/**"/> + <include name="org/jboss/wsf/container/jboss42/**"/> + <exclude name="org/jboss/wsf/container/jboss42/jms/**"/> + <exclude name="org/jboss/wsf/container/jboss42/EJBArchiveMetaDataAdapterEJB21.java"/> + <exclude name="org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java"/> + <exclude name="org/jboss/wsf/container/jboss42/InvocationHandlerFactoryImpl.java"/> + <classpath refid="jbws40.integration.classpath"/> + </javac> + </target> + +  + <target name="compile-etc" depends="init"> + <mkdir dir="${jbws40.output.etc.dir}"/> + <copy todir="${jbws40.output.etc.dir}" filtering="yes"> + <fileset dir="${build.dir}/etc"> + <include name="default.mf"/> + </fileset> + <filterset> + <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="jbossws-${version.id}"/> + <filtersfile file="${build.dir}/version.properties"/> + </filterset> + </copy> + </target> + +  +  +  + +  + <target name="jars" depends="compile,module-jars" description="Builds all jar files."> + </target> + +  + <target name="module-jars" depends="init"> + +  + <mkdir dir="${jbws40.output.lib.dir}"/> + <jar jarfile="${jbws40.output.lib.dir}/jbossws-jboss40.jar" manifest="${jbws40.output.etc.dir}/default.mf"> + <fileset dir="${jbws40.output.classes.dir}"> + <include name="org/jboss/ws/integration/**"/> + <include name="org/jboss/wsf/container/jboss40/**"/> + <include name="org/jboss/wsf/container/jboss42/**"/> + </fileset> + <metainf dir="${jbws40.resources.dir}/jbossws-jboss40.jar/META-INF"/> + </jar> + +  + <zip zipfile="${jbws40.output.lib.dir}/jbossws-jboss40-src.zip" > + <fileset dir="${jbws40.java.dir}"/> + <fileset dir="${jbws42.java.dir}"/> + </zip> + + </target> + +  + <target name="javadoc" depends="init" description="Generate the Javadoc"> + + <mkdir dir="${jbws40.output.apidocs.dir}"/> + <javadoc destdir="${jbws40.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API"> + <classpath> + <path refid="jbws40.integration.classpath"/> + </classpath> + <packageset dir="${jbws40.java.dir}" defaultexcludes="yes"> + <include name="org/jboss/wsf/**"/> + </packageset> + <doctitle><![CDATA[<h1>JBoss Web Service Framework - Container integration AS 4.0</h1>]]></doctitle> + <tag name="todo" scope="all" description="To do:"/> + </javadoc> + </target> + +  +  +  + + <target name="clean" depends="prepare" description="Cleans up most generated files."> + <delete dir="${jbws40.output.dir}"/> + </target> + + <target name="clobber" depends="clean" description="Cleans up all generated files."> + <delete dir="${jbws40.dir}/thirdparty"/> + </target> + + <target name="main" description="Executes the default target (most)." depends="most"/> + + <target name="most" description="Builds almost everything." depends="jars"/> + + <target name="all" description="Create a distribution zip file" depends="main"> + </target> + +</project> Modified: container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/WebServiceClientDeployer.java =================================================================== --- trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceClientDeployer.java 2007-08-02 15:05:43 UTC (rev 4106) +++ container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/WebServiceClientDeployer.java 2007-08-02 16:53:25 UTC (rev 4117) @@ -34,8 +34,8 @@ import org.jboss.deployment.DeploymentInfo; import org.jboss.system.ServiceMBeanSupport; import org.jboss.webservice.metadata.serviceref.ServiceRefMetaData; -import org.jboss.wsf.framework.deployment.ResourceLoaderAdapter; -import org.jboss.wsf.framework.deployment.URLLoaderAdapter; +import org.jboss.wsf.common.ResourceLoaderAdapter; +import org.jboss.wsf.common.URLLoaderAdapter; import org.jboss.wsf.spi.SPIProvider; import org.jboss.wsf.spi.SPIProviderResolver; import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; Added: container/jboss40/trunk/version.properties =================================================================== --- container/jboss40/trunk/version.properties (rev 0) +++ container/jboss40/trunk/version.properties 2007-08-02 16:53:25 UTC (rev 4117) @@ -0,0 +1,20 @@ + +# $Id: version.properties 3956 2007-07-19 18:03:54Z thomas.diesler(a)jboss.com $ + +specification.title=JBossWS +specification.vendor=JBoss (http://www.jboss.org) +specification.version=jbossws-2.0 + +version.id=2.0.1.CR1 +repository.id=2.0.1.CR1 + +implementation.title=JBoss Web Services - Integration JBoss40 +implementation.url=http://www.jboss.org/products/jbossws +implementation.vendor=JBoss Inc. +implementation.vendor.id=http://www.jboss.org + +# Thirdparty library versions +jbossws-common=2.0.1.CR1 +jbossws-spi=2.0.1.CR1 +sun-jaxrpc=1.1 +sun-jaxws=2.1.1 \ No newline at end of file

17 years, 4 months

1
0
0 / 0

JBossWS SVN: r4116 - in container/jboss42: trunk and 3 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-08-02 12:39:02 -0400 (Thu, 02 Aug 2007) New Revision: 4116 Added: container/jboss42/trunk/ container/jboss42/trunk/ant-import/build-setup.xml container/jboss42/trunk/ant.properties.example container/jboss42/trunk/src/main/etc/default.mf container/jboss42/trunk/version.properties Modified: container/jboss42/trunk/.classpath container/jboss42/trunk/.project container/jboss42/trunk/ant-import/build-release.xml container/jboss42/trunk/ant-import/build-thirdparty.xml container/jboss42/trunk/build.xml container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/EJBArchiveMetaDataAdapter.java container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java Log: Initial commit Copied: container/jboss42/trunk (from rev 4106, trunk/integration/jboss42) Property changes on: container/jboss42/trunk ___________________________________________________________________ Name: svn:ignore + ant.properties output* thirdparty version.properties.md5 Modified: container/jboss42/trunk/.classpath =================================================================== --- trunk/integration/jboss42/.classpath 2007-08-02 15:05:43 UTC (rev 4106) +++ container/jboss42/trunk/.classpath 2007-08-02 16:39:02 UTC (rev 4116) @@ -4,7 +4,6 @@ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-4.2.x"/> <classpathentry combineaccessrules="false" kind="src" path="/spi"/> - <classpathentry combineaccessrules="false" kind="src" path="/integration-framework"/> <classpathentry kind="lib" path="/integration-framework/thirdparty/dom4j.jar"/> <classpathentry kind="lib" path="/integration-framework/thirdparty/jaxws-api.jar"/> <classpathentry kind="lib" path="/integration-framework/thirdparty/jsr181-api.jar"/> Modified: container/jboss42/trunk/.project =================================================================== --- trunk/integration/jboss42/.project 2007-08-02 15:05:43 UTC (rev 4106) +++ container/jboss42/trunk/.project 2007-08-02 16:39:02 UTC (rev 4116) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>integration-jboss42</name> + <name>container-jboss42</name> <comment></comment> <projects> </projects> Modified: container/jboss42/trunk/ant-import/build-release.xml =================================================================== --- trunk/integration/jboss42/ant-import/build-release.xml 2007-08-02 15:05:43 UTC (rev 4106) +++ container/jboss42/trunk/ant-import/build-release.xml 2007-08-02 16:39:02 UTC (rev 4116) @@ -21,14 +21,14 @@ <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/> <mkdir dir="${jboss.repository.dir}/jbossws-jboss42/${repository.id}/lib"/> <copy todir="${jboss.repository.dir}/jbossws-jboss42/${repository.id}/lib" overwrite="true"> - <fileset dir="${int.jboss42.dir}/output/lib"> + <fileset dir="${jbws42.dir}/output/lib"> <include name="jbossws-jboss42.jar"/> <include name="jbossws-jboss42-src.zip"/> </fileset> </copy> <copy tofile="${jboss.repository.dir}/jbossws-jboss42/${repository.id}/component-info.xml" file="${jbws42.etc.dir}/component-info.xml" filtering="true" overwrite="true"> <filterset> - <filtersfile file="${build.dir}/version.properties"/> + <filtersfile file="${jbws42.dir}/version.properties"/> </filterset> </copy> Added: container/jboss42/trunk/ant-import/build-setup.xml =================================================================== --- container/jboss42/trunk/ant-import/build-setup.xml (rev 0) +++ container/jboss42/trunk/ant-import/build-setup.xml 2007-08-02 16:39:02 UTC (rev 4116) @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project> + +  +  +  + + <property name="jbws42.dir" value="${basedir}"/> + +  + <available property="ant.properties.available" file="${jbws42.dir}/ant.properties"/> + <fail message="Cannot find ant.properties. Did you copy/edit ant.properties.example?" unless="ant.properties.available"/> + + <property file="${jbws42.dir}/ant.properties"/> + <property file="${jbws42.dir}/version.properties"/> + + <property name="jboss42.lib" value="${jboss42.home}/lib"/> + <property name="jboss42.client" value="${jboss42.home}/client"/> + <property name="jboss42.server" value="${jboss42.home}/server/${jboss.server.instance}"/> + <property name="jboss42.server.lib" value="${jboss42.server}/lib"/> + <property name="jboss42.server.deploy" value="${jboss42.server}/deploy"/> + + <property name="jboss42.available.file" value="${jboss42.client}/jboss-ejb3-client.jar"/> + <available property="jboss42.available" file="${jboss42.available.file}"/> + +  + <available classname="java.lang.Enum" property="HAVE_JDK_1.5"/> + <available classname="java.io.Console" property="HAVE_JDK_1.6"/> + + <fail message="JDK1.5 or above is required" unless="HAVE_JDK_1.5"/> + +  +  +  + + <target name="prepare"> + <tstamp> + <format property="build.id" pattern="yyyyMMddHHmm"/> + </tstamp> + </target> + +</project> \ No newline at end of file Modified: container/jboss42/trunk/ant-import/build-thirdparty.xml =================================================================== --- trunk/integration/jboss42/ant-import/build-thirdparty.xml 2007-08-02 15:05:43 UTC (rev 4106) +++ container/jboss42/trunk/ant-import/build-thirdparty.xml 2007-08-02 16:39:02 UTC (rev 4116) @@ -17,28 +17,44 @@   - <target name="thirdparty" depends="thirdparty-get,thirdparty-classpath"> + <target name="thirdparty-init" depends="prepare"> + + <property name="thirdparty.dir" value="${jbws42.dir}/thirdparty"/> + <checksum file="${jbws42.dir}/version.properties" fileext=".md5" verifyproperty="checksum.ok"/> + <condition property="force.thirdparty"> + <or> + <not> + <available file="${thirdparty.dir}" type="dir"/> + </not> + <isfalse value="${checksum.ok}"/> + <isset property="force.thirdparty.get"/> + </or> + </condition> + <echo message="checksum.ok = ${checksum.ok}"/> </target> - <target name="thirdparty-init" depends="prepare"/> + <target name="thirdparty-get" depends="thirdparty-init" if="force.thirdparty" description="Gets the thirdparty libraries"> + + <mkdir dir="${thirdparty.dir}"/> + <get src="${jboss.repository}/jboss/jbossws-common/${jbossws-common}/lib/jbossws-common.jar" dest="${thirdparty.dir}/jbossws-common.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-api.jar" dest="${thirdparty.dir}/jaxws-api.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jsr181-api.jar" dest="${thirdparty.dir}/jsr181-api.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/saaj-api.jar" dest="${thirdparty.dir}/saaj-api.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxrpc/${sun-jaxrpc}/lib/jaxrpc-api.jar" dest="${thirdparty.dir}/jaxrpc-api.jar" usetimestamp="true" verbose="true"/> + <checksum file="${jbws42.dir}/version.properties" fileext=".md5"/> + </target> -  - <target name="thirdparty-get" depends="thirdparty-init" - description="Gets the thirdparty libraries"/> - <target name="thirdparty-classpath" depends="thirdparty-get">  <path id="jbws42.integration.classpath"> - <pathelement location="${framework.dir}/output/lib/jbossws-framework.jar"/> - <pathelement location="${framework.dir}/thirdparty/jbossws-common.jar"/> - <pathelement location="${framework.dir}/thirdparty/jbossws-spi.jar"/> - <pathelement location="${framework.dir}/thirdparty/jaxws-api.jar"/> - <pathelement location="${framework.dir}/thirdparty/jaxrpc-api.jar"/> - <pathelement location="${framework.dir}/thirdparty/jsr181-api.jar"/> - <pathelement location="${framework.dir}/thirdparty/saaj-api.jar"/> + <pathelement location="${thirdparty.dir}/jbossws-common.jar"/> + <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/> + <pathelement location="${thirdparty.dir}/jaxws-api.jar"/> + <pathelement location="${thirdparty.dir}/jaxrpc-api.jar"/> + <pathelement location="${thirdparty.dir}/jsr181-api.jar"/> + <pathelement location="${thirdparty.dir}/saaj-api.jar"/> <pathelement location="${jboss42.lib}/jboss-common.jar"/> <pathelement location="${jboss42.lib}/jboss-jmx.jar"/> <pathelement location="${jboss42.lib}/jboss-system.jar"/> Added: container/jboss42/trunk/ant.properties.example =================================================================== --- container/jboss42/trunk/ant.properties.example (rev 0) +++ container/jboss42/trunk/ant.properties.example 2007-08-02 16:39:02 UTC (rev 4116) @@ -0,0 +1,26 @@ +# +# A sample ant properties file +# +# $Id: ant.properties.example 3995 2007-07-26 08:52:45Z thomas.diesler(a)jboss.com $ + +# JBoss Home +#jboss42.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_2_1_GA/build/output/jboss-4.2.1.GA + +# The JBoss settings +jboss.server.instance=default + +# JBoss Repository +#jboss.repository=file:/home/tdiesler/svn/jboss.local.repository +jboss.repository=http://repository.jboss.org + +# JBossWS Release +jboss.local.repository=/home/tdiesler/svn/jboss.local.repository + +# Force thirdparty HTTP get +#force.thirdparty.get=true + +# Java Compiler options +javac.debug=yes +javac.deprecation=no +javac.fail.onerror=yes +javac.verbose=no Modified: container/jboss42/trunk/build.xml =================================================================== --- trunk/integration/jboss42/build.xml 2007-08-02 15:05:43 UTC (rev 4106) +++ container/jboss42/trunk/build.xml 2007-08-02 16:39:02 UTC (rev 4116) @@ -11,13 +11,12 @@  -<project default="main" basedir="../.." name="JBossWS-JBoss42"> +<project default="main" basedir="." name="JBossWS-JBoss42"> - <import file="${basedir}/build/ant-import/build-setup.xml"/> + <import file="${basedir}/ant-import/build-setup.xml"/> + <import file="${basedir}/ant-import/build-release.xml"/> + <import file="${basedir}/ant-import/build-thirdparty.xml"/> - <import file="${int.jboss42.dir}/ant-import/build-release.xml"/> - <import file="${int.jboss42.dir}/ant-import/build-thirdparty.xml"/> -    @@ -37,9 +36,8 @@   - <target name="init" depends="prepare, thirdparty"> + <target name="init" depends="prepare,thirdparty-get"> <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/> - <ant antfile="${framework.dir}/build.xml" target="jars" inheritall="false"/> </target>  @@ -72,7 +70,7 @@ <target name="compile-etc" depends="init"> <mkdir dir="${jbws42.output.etc.dir}"/> <copy todir="${jbws42.output.etc.dir}" filtering="yes"> - <fileset dir="${build.dir}/etc"> + <fileset dir="${jbws42.etc.dir}"> <include name="default.mf"/> </fileset> <filterset> @@ -80,7 +78,7 @@ <filter token="java.vm.vendor" value="${java.vm.vendor}"/> <filter token="build.id" value="${build.id}"/> <filter token="implementation.version" value="jbossws-${version.id}"/> - <filtersfile file="${build.dir}/version.properties"/> + <filtersfile file="${jbws42.dir}/version.properties"/> </filterset> </copy> </target> @@ -142,6 +140,7 @@ </target> <target name="clobber" depends="clean" description="Cleans up all generated files."> + <delete dir="${jbws42.dir}/thirdparty"/> </target> <target name="main" description="Executes the default target (most)." depends="most"/> Added: container/jboss42/trunk/src/main/etc/default.mf =================================================================== --- container/jboss42/trunk/src/main/etc/default.mf (rev 0) +++ container/jboss42/trunk/src/main/etc/default.mf 2007-08-02 16:39:02 UTC (rev 4116) @@ -0,0 +1,10 @@ +Manifest-Version: 1.2 +Created-By: @java.vm.version@ (@java.vm.vendor@) +Specification-Title: @specification.title@ +Specification-Version: @specification.version@ +Specification-Vendor: @specification.vendor@ +Implementation-Title: @implementation.title@ +Implementation-URL: @implementation.url@ +Implementation-Version: @implementation.version@ (build=(a)build.id@) +Implementation-Vendor: @implementation.vendor@ +Implementation-Vendor-Id: @implementation.vendor.id@ Modified: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java 2007-08-02 15:05:43 UTC (rev 4106) +++ container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java 2007-08-02 16:39:02 UTC (rev 4116) @@ -35,7 +35,7 @@ import org.jboss.wsf.spi.metadata.webservices.WebservicesFactory; import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; import org.jboss.wsf.common.DOMUtils; -import org.jboss.wsf.framework.deployment.ResourceLoaderAdapter; +import org.jboss.wsf.common.ResourceLoaderAdapter; import org.jboss.xb.binding.ObjectModelFactory; import org.jboss.xb.binding.Unmarshaller; import org.jboss.xb.binding.UnmarshallerFactory; Modified: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/EJBArchiveMetaDataAdapter.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/EJBArchiveMetaDataAdapter.java 2007-08-02 15:05:43 UTC (rev 4106) +++ container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/EJBArchiveMetaDataAdapter.java 2007-08-02 16:39:02 UTC (rev 4116) @@ -21,7 +21,7 @@ */ package org.jboss.wsf.container.jboss42; -// $Id$ +// $Id: $ import java.util.ArrayList; import java.util.Iterator; Modified: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java 2007-08-02 15:05:43 UTC (rev 4106) +++ container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java 2007-08-02 16:39:02 UTC (rev 4116) @@ -26,7 +26,7 @@ import org.jboss.deployment.DeploymentInfo; import org.jboss.metadata.ApplicationMetaData; import org.jboss.metadata.BeanMetaData; -import org.jboss.wsf.framework.deployment.URLLoaderAdapter; +import org.jboss.wsf.common.URLLoaderAdapter; import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; Modified: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java 2007-08-02 15:05:43 UTC (rev 4106) +++ container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java 2007-08-02 16:39:02 UTC (rev 4116) @@ -29,7 +29,7 @@ import org.jboss.deployment.DeploymentInfo; import org.jboss.metadata.WebMetaData; -import org.jboss.wsf.framework.deployment.URLLoaderAdapter; +import org.jboss.wsf.common.URLLoaderAdapter; import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; Modified: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java 2007-08-02 15:05:43 UTC (rev 4106) +++ container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java 2007-08-02 16:39:02 UTC (rev 4116) @@ -30,7 +30,7 @@ import org.jboss.ejb3.EJBContainer; import org.jboss.ejb3.Ejb3ModuleMBean; import org.jboss.ejb3.stateless.StatelessContainer; -import org.jboss.wsf.framework.deployment.URLLoaderAdapter; +import org.jboss.wsf.common.URLLoaderAdapter; import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; Modified: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java 2007-08-02 15:05:43 UTC (rev 4106) +++ container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java 2007-08-02 16:39:02 UTC (rev 4116) @@ -34,7 +34,7 @@ import org.jboss.deployment.DeploymentInfo; import org.jboss.metadata.WebMetaData; -import org.jboss.wsf.framework.deployment.URLLoaderAdapter; +import org.jboss.wsf.common.URLLoaderAdapter; import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; Added: container/jboss42/trunk/version.properties =================================================================== --- container/jboss42/trunk/version.properties (rev 0) +++ container/jboss42/trunk/version.properties 2007-08-02 16:39:02 UTC (rev 4116) @@ -0,0 +1,20 @@ + +# $Id: version.properties 3956 2007-07-19 18:03:54Z thomas.diesler(a)jboss.com $ + +specification.title=JBossWS +specification.vendor=JBoss (http://www.jboss.org) +specification.version=jbossws-2.0 + +version.id=2.0.1.CR1 +repository.id=2.0.1.CR1 + +implementation.title=JBoss Web Services - Integration JBoss42 +implementation.url=http://www.jboss.org/products/jbossws +implementation.vendor=JBoss Inc. +implementation.vendor.id=http://www.jboss.org + +# Thirdparty library versions +jbossws-common=2.0.1.CR1 +jbossws-spi=2.0.1.CR1 +sun-jaxrpc=1.1 +sun-jaxws=2.1.1 \ No newline at end of file

17 years, 4 months

1
0
0 / 0

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

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-08-02 12:33:25 -0400 (Thu, 02 Aug 2007) New Revision: 4115 Added: common/trunk/src/main/java/org/jboss/wsf/common/ResourceLoaderAdapter.java common/trunk/src/main/java/org/jboss/wsf/common/URLLoaderAdapter.java Log: Add loader adpaters Copied: common/trunk/src/main/java/org/jboss/wsf/common/ResourceLoaderAdapter.java (from rev 4106, trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/ResourceLoaderAdapter.java) =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/common/ResourceLoaderAdapter.java (rev 0) +++ common/trunk/src/main/java/org/jboss/wsf/common/ResourceLoaderAdapter.java 2007-08-02 16:33:25 UTC (rev 4115) @@ -0,0 +1,118 @@ +/* + * 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.common; + +// $Id: ResourceLoaderAdapter.java 3137 2007-05-18 13:41:57Z thomas.diesler(a)jboss.com $ + +import java.io.File; +import java.io.IOException; +import java.net.MalformedURLException; +import java.net.URL; + +import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; + + +/** + * The default file adapter loads resources through an associated classloader. + * If no classload is set, the the thread context classloader will be used. + * + * @author Heiko.Braun(a)jboss.org + * @since 25.01.2007 + */ +public class ResourceLoaderAdapter implements UnifiedVirtualFile +{ + private URL resourceURL; + private ClassLoader loader; + + public ResourceLoaderAdapter() + { + this(Thread.currentThread().getContextClassLoader()); + } + + public ResourceLoaderAdapter(ClassLoader loader) + { + this.loader = loader; + } + + private ResourceLoaderAdapter(ClassLoader loader, URL resourceURL) + { + this.resourceURL = resourceURL; + this.loader = loader; + } + + public UnifiedVirtualFile findChild(String resourcePath) throws IOException + { + URL resourceURL = null; + if (resourcePath != null) + { + // Try the child as URL + try + { + resourceURL = new URL(resourcePath); + } + catch (MalformedURLException ex) + { + // ignore + } + + // Try the filename as File + if (resourceURL == null) + { + try + { + File file = new File(resourcePath); + if (file.exists()) + resourceURL = file.toURL(); + } + catch (MalformedURLException e) + { + // ignore + } + } + + // Try the filename as Resource + if (resourceURL == null) + { + try + { + resourceURL = loader.getResource(resourcePath); + } + catch (Exception ex) + { + // ignore + } + } + } + + if (resourceURL == null) + throw new IOException("Cannot get URL for: " + resourcePath); + + return new ResourceLoaderAdapter(loader, resourceURL); + } + + public URL toURL() + { + if (null == this.resourceURL) + throw new IllegalStateException("UnifiedVirtualFile not initialized"); + return resourceURL; + } +} Copied: common/trunk/src/main/java/org/jboss/wsf/common/URLLoaderAdapter.java (from rev 4106, trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/URLLoaderAdapter.java) =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/common/URLLoaderAdapter.java (rev 0) +++ common/trunk/src/main/java/org/jboss/wsf/common/URLLoaderAdapter.java 2007-08-02 16:33:25 UTC (rev 4115) @@ -0,0 +1,127 @@ +/* + * 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.common; + +// $Id: URLLoaderAdapter.java 3830 2007-07-09 17:01:33Z heiko.braun(a)jboss.com $ + +import java.io.File; +import java.io.IOException; +import java.net.MalformedURLException; +import java.net.URL; +import java.net.URLClassLoader; + +import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; + + +/** + * Load resources through a URLClassLoader.<br> + * NOTE: The associated classloader doesn't do parent delegation. + * + * + * @author Heiko.Braun(a)jboss.org + * @since 25.01.2007 + */ +public class URLLoaderAdapter implements UnifiedVirtualFile +{ + private URL rootURL; + private URL resourceURL; + private transient URLClassLoader loader; + + public URLLoaderAdapter(URL rootURL) + { + this.rootURL = rootURL; + } + + private URLLoaderAdapter(URL rootURL, URLClassLoader loader, URL resourceURL) + { + this.rootURL = rootURL; + this.resourceURL = resourceURL; + this.loader = loader; + } + + public UnifiedVirtualFile findChild(String resourcePath) throws IOException + { + URL resourceURL = null; + if (resourcePath != null) + { + // Try the child as URL + try + { + resourceURL = new URL(resourcePath); + } + catch (MalformedURLException ex) + { + // ignore + } + + // Try the filename as File + if (resourceURL == null) + { + try + { + File file = new File(resourcePath); + if (file.exists()) + resourceURL = file.toURL(); + } + catch (MalformedURLException e) + { + // ignore + } + } + + // Try the filename as Resource + if (resourceURL == null) + { + try + { + resourceURL = getResourceLoader().getResource(resourcePath); + } + catch (Exception ex) + { + // ignore + } + } + } + + if (resourceURL == null) + throw new IOException("Cannot get URL for: " + resourcePath); + + return new URLLoaderAdapter(rootURL, loader, resourceURL); + } + + public URL toURL() + { + if (resourceURL != null) + return resourceURL; + else + return rootURL; + } + + private URLClassLoader getResourceLoader() + { + if (loader == null) + { + loader = new URLClassLoader(new URL[] { rootURL }); + } + return loader; + } +}

17 years, 4 months

1
0
0 / 0

JBossWS SVN: r4114 - trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-08-02 12:15:14 -0400 (Thu, 02 Aug 2007) New Revision: 4114 Removed: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTestCase.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTracker.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTrackerFactory.java Log: Tests moved to SPI module Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTestCase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTestCase.java 2007-08-02 16:14:51 UTC (rev 4113) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTestCase.java 2007-08-02 16:15:14 UTC (rev 4114) @@ -1,166 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.smoke.tools; - -import junit.framework.TestCase; -import org.jboss.wsf.spi.tools.cmd.WSConsume; - -import java.security.Permission; - -/** - * Test the command line interface to WSConsume. - * - * @author Heiko.Braun(a)jboss.com - * @version $Revision$ - */ -public class CmdConsumeTestCase extends TestCase -{ - - SecurityManager systemDefault = System.getSecurityManager(); - SecurityManager interceptor = new InterceptedSecurity(); - - class InterceptedSecurity extends SecurityManager - { - private final SecurityManager parent = systemDefault; - - public void checkPermission(Permission perm) - { - if (parent != null) - { - parent.checkPermission(perm); - } - } - - public void checkExit(int status) - { - String msg = (status == 0) ? "WSConsume did exit without errors" : "WSConsume did exit with an error"; - throw new InterceptedExit(msg, status); - } - } - - class InterceptedExit extends SecurityException - { - private int exitCode; - - public InterceptedExit(String s, int code) - { - super(s); - this.exitCode = code; - } - - - public int getExitCode() - { - return exitCode; - } - } - - private void swapSecurityManager() - { - if(System.getSecurityManager() instanceof InterceptedSecurity) - System.setSecurityManager(systemDefault); - else - System.setSecurityManager(interceptor); - } - - protected void setUp() throws Exception - { - super.setUp(); - - // enforce loading of the tracker implemenation - System.setProperty( - "org.jboss.wsf.spi.tools.ConsumerFactoryImpl", - "org.jboss.test.ws.jaxws.smoke.tools.CmdConsumeTrackerFactory" - ); - } - - /* - new LongOpt("binding", LongOpt.REQUIRED_ARGUMENT, null, 'b'), - new LongOpt("catalog", LongOpt.REQUIRED_ARGUMENT, null, 'c'), - new LongOpt("package", LongOpt.REQUIRED_ARGUMENT, null, 'p'), - new LongOpt("wsdlLocation", LongOpt.REQUIRED_ARGUMENT, null, 'w'), - new LongOpt("output", LongOpt.REQUIRED_ARGUMENT, null, 'o'), - new LongOpt("source", LongOpt.REQUIRED_ARGUMENT, null, 's'), - new LongOpt("target", LongOpt.REQUIRED_ARGUMENT, null, 't'), - new LongOpt("keep", LongOpt.NO_ARGUMENT, null, 'k'), - new LongOpt("help", LongOpt.NO_ARGUMENT, null, 'h'), - new LongOpt("quiet", LongOpt.NO_ARGUMENT, null, 'q'), - new LongOpt("verbose", LongOpt.NO_ARGUMENT, null, 'v'), - new LongOpt("load-consumer", LongOpt.NO_ARGUMENT, null, 'l'), - - */ - - public void testInvalidBindingOption() throws Exception - { - executeCmd("-b", true); - } - - public void testValidBindingOption() throws Exception - { - executeCmd("-b binding-file.xml Service.wsdl", false); - assertEquals(CmdConsumeTracker.LAST_EVENT, "setBindingFiles"); - } - - public void testMissingOptions() throws Exception - { - executeCmd("", false); // strange, shouldn't this exit(1) ? - } - - // TODO: add arbitrary combinations on a case by case basis - - /** - * Pass a number of arguments to WSConsume and specify if - * you expect this to cause an exception. - * - * @param arguments - * @param expectedException - * @throws Exception - */ - private void executeCmd(String arguments, boolean expectedException) throws Exception - { - swapSecurityManager(); - - String[] args = arguments.split("\\s"); - try - { - WSConsume.main(args); - if(expectedException) - fail("Did expect exception on args: " +args); - } - catch (InterceptedExit e) - { - boolean positivStatus = (e.getExitCode() == 0); - if( (expectedException && positivStatus) - || (!expectedException && !positivStatus) ) - { - String s = expectedException ? "Did expect an exception, but " : "Did not expect an exception, but "; - String s2 = positivStatus ? "status was positiv" : "status was negativ"; - throw new Exception(s+s2); - } - - } - finally - { - swapSecurityManager(); - } - } -} Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTracker.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTracker.java 2007-08-02 16:14:51 UTC (rev 4113) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTracker.java 2007-08-02 16:15:14 UTC (rev 4114) @@ -1,93 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.smoke.tools; - -import org.jboss.wsf.spi.tools.WSContractConsumer; - -import java.io.File; -import java.io.PrintStream; -import java.util.List; -import java.net.URL; - -/** - * @author Heiko.Braun(a)jboss.com - * @version $Revision$ - */ -public class CmdConsumeTracker extends WSContractConsumer -{ - public static String LAST_EVENT = ""; - - public void setBindingFiles(List<File> bindingFiles) - { - LAST_EVENT = "setBindingFiles"; - } - - public void setCatalog(File catalog) - { - LAST_EVENT = "setCatalog"; - } - - public void setOutputDirectory(File directory) - { - LAST_EVENT = "setOutputDirectory"; - } - - public void setSourceDirectory(File directory) - { - LAST_EVENT = "setSourceDirectory"; - } - - public void setGenerateSource(boolean generateSource) - { - LAST_EVENT = "setGenerateSource"; - } - - public void setTargetPackage(String targetPackage) - { - LAST_EVENT = "setTargetPackage"; - } - - public void setWsdlLocation(String wsdlLocation) - { - LAST_EVENT = "setWsdlLocation"; - } - - public void setMessageStream(PrintStream messageStream) - { - LAST_EVENT = "setMessageStream"; - } - - public void setAdditionalCompilerClassPath(List<String> classPath) - { - LAST_EVENT = "setAdditionalCompilerClassPath"; - } - - public void setTarget(String target) - { - LAST_EVENT = "setTarget"; - } - - public void consume(URL wsdl) - { - - } -} Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTrackerFactory.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTrackerFactory.java 2007-08-02 16:14:51 UTC (rev 4113) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTrackerFactory.java 2007-08-02 16:15:14 UTC (rev 4114) @@ -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.test.ws.jaxws.smoke.tools; - -import org.jboss.wsf.spi.tools.WSContractConsumerFactory; -import org.jboss.wsf.spi.tools.WSContractConsumer; - -/** - * @author Heiko.Braun(a)jboss.com - * @version $Revision$ - */ -public class CmdConsumeTrackerFactory implements WSContractConsumerFactory -{ - - public WSContractConsumer createConsumer() - { - return new CmdConsumeTracker(); - } -}

17 years, 4 months

1
0
0 / 0

JBossWS SVN: r4113 - trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-08-02 12:14:51 -0400 (Thu, 02 Aug 2007) New Revision: 4113 Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.java Log: Renamed testcases Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java 2007-08-02 16:13:55 UTC (rev 4112) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java 2007-08-02 16:14:51 UTC (rev 4113) @@ -77,7 +77,7 @@ public void testBindingFiles() throws Exception { List<File> files = new ArrayList<File>(); - files.add( new File("resources/jaxws/smoke/tools/wsdl/async-binding.xml") ); + files.add( new File("resources/jaxws/spi/tools/wsdl/async-binding.xml") ); consumer.setBindingFiles(files); consumer.setTargetPackage("org.jboss.test.ws.tools.testBindingFiles"); @@ -110,10 +110,10 @@ public void testCatalog() throws Exception { consumer.setTargetPackage("org.jboss.test.ws.tools.testCatalog"); - consumer.setCatalog( new File("resources/jaxws/smoke/tools/wsdl/jax-ws-catalog.xml") ); + consumer.setCatalog( new File("resources/jaxws/spi/tools/wsdl/jax-ws-catalog.xml") ); consumer.setGenerateSource(true); consumer.setOutputDirectory(outputDirectory); - consumer.consume("resources/jaxws/smoke/tools/wsdl/TestServiceCatalog.wsdl"); + consumer.consume("resources/jaxws/spi/tools/wsdl/TestServiceCatalog.wsdl"); } /** @@ -279,7 +279,7 @@ private void consumeWSDL() throws Exception { consumer.setOutputDirectory(outputDirectory); - consumer.consume("resources/jaxws/smoke/tools/wsdl/TestService.wsdl"); + consumer.consume("resources/jaxws/spi/tools/wsdl/TestService.wsdl"); } } Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.java 2007-08-02 16:13:55 UTC (rev 4112) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.java 2007-08-02 16:14:51 UTC (rev 4113) @@ -112,7 +112,7 @@ { provide(); ClassLoader loader = getArtefactClassLoader(); - Class responseWrapper = loader.loadClass("org.jboss.test.ws.jaxws.smoke.tools.jaxws.AddResponse"); + Class responseWrapper = loader.loadClass("org.jboss.test.ws.jaxws.spi.tools.jaxws.AddResponse"); XmlRootElement rootElement = (XmlRootElement) responseWrapper.getAnnotation(XmlRootElement.class); assertNotNull("@XmlRootElement missing form response wrapper", rootElement); assertEquals("Wrong namespace", rootElement.namespace(), "http://foo.bar.com/calculator");

17 years, 4 months

1
0
0 / 0

JBossWS SVN: r4112 - in spi/trunk: ant-import and 11 other directories.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-08-02 12:13:55 -0400 (Thu, 02 Aug 2007) New Revision: 4112 Added: spi/trunk/ant-import/build-testsuite.xml spi/trunk/src/test/ spi/trunk/src/test/java/ spi/trunk/src/test/java/org/ spi/trunk/src/test/java/org/jboss/ spi/trunk/src/test/java/org/jboss/test/ spi/trunk/src/test/java/org/jboss/test/wsf/ spi/trunk/src/test/java/org/jboss/test/wsf/spi/ spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/ spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/CmdConsumeTestCase.java spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/CmdConsumeTracker.java spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/CmdConsumeTrackerFactory.java spi/trunk/src/test/resources/ spi/trunk/src/test/resources/smoke/ spi/trunk/src/test/resources/smoke/tools/ Modified: spi/trunk/ant-import/build-thirdparty.xml spi/trunk/build.xml spi/trunk/version.properties Log: Initial SPI test suite. Added tools test Added: spi/trunk/ant-import/build-testsuite.xml =================================================================== --- spi/trunk/ant-import/build-testsuite.xml (rev 0) +++ spi/trunk/ant-import/build-testsuite.xml 2007-08-02 16:13:55 UTC (rev 4112) @@ -0,0 +1,156 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + +<project> + + <property environment="env"/> + +  +  +  + +  + <condition property="remote.debug.line" value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"> + <isset property="debug"/> + </condition> + <condition property="remote.debug.line" value=""> + <not> + <isset property="debug"/> + </not> + </condition> + +  +  +  + + <target name="tests-init"> + <mkdir dir="${spi.test.output.dir}"/> + <mkdir dir="${spi.test.output.dir}/log"/> + + <delete file="${spi.test.output.dir}/log/test.log"/> + + <path id="test.classpath"> + <path refid="spi.thirdparty.classpath"/> + <pathelement location="${spi.output.lib.dir}/jbossws-spi.jar"/> + </path> + + </target> + + <target name="tests-compile" depends="init, jars, tests-init"> + <macro-compile-classes srcdir="${spi.test.java.dir}"/> + </target> + +  +  +  + + <macrodef name="macro-compile-classes"> + <attribute name="srcdir"/> + <sequential> + <mkdir dir="${spi.test.output.dir}/classes" /> + + <javac destdir="${spi.test.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" + failonerror="${javac.fail.onerror}"> + <src path="@{srcdir}"/> + <classpath refid="test.classpath"/> + </javac> + </sequential> + </macrodef> + +  +  +  + +  + <target name="tests" depends="tests-compile" description="Run all unit tests and generate a report"> + <antcall target="tests-run-internal"> + <param name="include.wildcard" value="org/jboss/test/wsf/**/*TestCase.class"/> + <param name="exclude.wildcard" value="no-wildcard-exclude-see-excludesfile"/> + <param name="haltonfailure" value="true"/> + </antcall> + </target> + + <target name="test" depends="tests-compile" if="test" description="Execute SPI testsuite"> + <antcall target="tests-run-internal"> + <param name="include.wildcard" value="org/jboss/test/wsf/${test}/**/*TestCase.class"/> + <param name="exclude.wildcard" value="no-wildcard-exclude-see-excludesfile"/> + <param name="haltonfailure" value="false"/> + </antcall> + </target> + + <target name="tests-main" > + <antcall target="tests-compile"/> + </target> + +  + <target name="tests-run-internal" depends="tests-init"> + <mkdir dir="${spi.test.output.dir}/reports"/> + <junit printsummary="yes" showoutput="yes" dir="${spi.test.output.dir}" haltonfailure="${haltonfailure}"> +  + <sysproperty key="build.testlog" value="${spi.test.output.dir}/log"/> + <classpath> + <path refid="test.classpath"/> + <pathelement location="${spi.test.output.dir}/classes"/> + </classpath> + <formatter type="plain" usefile="true"/> + <formatter type="xml" usefile="true"/> + <batchtest todir="${spi.test.output.dir}/reports" fork="true"> + <fileset dir="${spi.test.output.dir}/classes" includes="${include.wildcard}" excludes="${exclude.wildcard}"/> + </batchtest> + </junit> + </target> + +  + <target name="one-test" depends="tests-init" if="test"> + <mkdir dir="${spi.test.output.dir}/reports"/> + <junit printsummary="yes" showoutput="yes" dir="${spi.test.output.dir}"> + <jvmarg line="${remote.debug.line}"/> + <jvmarg value="-Djava.security.manager"/> + <sysproperty key="build.testlog" value="${spi.test.output.dir}/log"/> + <classpath> + <path refid="test.classpath"/> + <pathelement location="${spi.test.output.dir}/classes"/> + </classpath> + <formatter type="plain" usefile="true"/> + <formatter type="xml" usefile="true"/> + <test todir="${spi.test.output.dir}/reports" name="${test}" fork="true"/> + </junit> + </target> + +  +  +  + +  + <target name="tests-report" depends="tests-init"> + <mkdir dir="${spi.test.output.dir}/reports"/> + <junitreport todir="${spi.test.output.dir}/reports"> + <fileset dir="${spi.test.output.dir}/reports"> + <include name="TEST-*.xml"/> + </fileset> + <report format="frames" todir="${spi.test.output.dir}/reports/html"/> + </junitreport> + <zip destfile="${spi.test.output.dir}/test-report-${build.id}.zip"> + <fileset dir="${spi.test.output.dir}" includes="reports/**"/> + </zip> + </target> + +  +  +  + + <target name="tests-clean" description="Delete all generated test files."> + <delete dir="${spi.test.output.dir}"/> + </target> + +</project> Property changes on: spi/trunk/ant-import/build-testsuite.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: spi/trunk/ant-import/build-thirdparty.xml =================================================================== --- spi/trunk/ant-import/build-thirdparty.xml 2007-08-02 16:05:43 UTC (rev 4111) +++ spi/trunk/ant-import/build-thirdparty.xml 2007-08-02 16:13:55 UTC (rev 4112) @@ -38,6 +38,7 @@ <target name="thirdparty-get" depends="thirdparty-init" if="force.thirdparty" description="Gets the thirdparty libraries"> <mkdir dir="${thirdparty.dir}"/> + <get src="${jboss.repository}/junit/${junit}/lib/junit.jar" dest="${thirdparty.dir}/junit.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-ant/${apache-ant}/lib/ant.jar" dest="${thirdparty.dir}/ant.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/gnu-getopt/${gnu-getopt}/lib/getopt.jar" dest="${thirdparty.dir}/getopt.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/dom4j/${dom4j}/lib/dom4j.jar" dest="${thirdparty.dir}/dom4j.jar" usetimestamp="true" verbose="true"/> @@ -77,6 +78,7 @@ <pathelement location="${thirdparty.dir}/jaxb-api.jar"/> <pathelement location="${thirdparty.dir}/jaxrpc-api.jar"/> <pathelement location="${thirdparty.dir}/servlet-api.jar"/> + <pathelement location="${thirdparty.dir}/junit.jar"/> </path> </target> Modified: spi/trunk/build.xml =================================================================== --- spi/trunk/build.xml 2007-08-02 16:05:43 UTC (rev 4111) +++ spi/trunk/build.xml 2007-08-02 16:13:55 UTC (rev 4112) @@ -16,6 +16,7 @@ <import file="${basedir}/ant-import/build-setup.xml"/> <import file="${basedir}/ant-import/build-release.xml"/> <import file="${basedir}/ant-import/build-thirdparty.xml"/> + <import file="${basedir}/ant-import/build-testsuite.xml"/>   @@ -25,7 +26,14 @@ <property name="spi.etc.dir" value="${spi.src.dir}/etc"/> <property name="spi.java.dir" value="${spi.src.dir}/java"/> <property name="spi.resources.dir" value="${spi.src.dir}/resources"/> + <property name="spi.java.dir" value="${spi.src.dir}/java"/> <property name="spi.output.dir" value="${spi.dir}/output"/> + + <property name="spi.test.dir" value="${spi.dir}/src/test"/> + <property name="spi.test.java.dir" value="${spi.test.dir}/java"/> + <property name="spi.test.resources.dir" value="${spi.test.dir}/resources"/> + <property name="spi.test.output.dir" value="${spi.output.dir}/test"/> + <property name="spi.output.apidocs.dir" value="${spi.output.dir}/apidocs"/> <property name="spi.output.etc.dir" value="${spi.output.dir}/etc"/> <property name="spi.output.classes.dir" value="${spi.output.dir}/classes"/> @@ -111,7 +119,7 @@ </zip> </target> - +    Added: spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/CmdConsumeTestCase.java =================================================================== --- spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/CmdConsumeTestCase.java (rev 0) +++ spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/CmdConsumeTestCase.java 2007-08-02 16:13:55 UTC (rev 4112) @@ -0,0 +1,167 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.wsf.spi.tools; + +import org.jboss.wsf.spi.tools.cmd.WSConsume; + +import java.security.Permission; + +import junit.framework.TestCase; + +/** + * Test the command line interface to WSConsume. + * + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +public class CmdConsumeTestCase extends TestCase +{ + + SecurityManager systemDefault = System.getSecurityManager(); + SecurityManager interceptor = new InterceptedSecurity(); + + class InterceptedSecurity extends SecurityManager + { + private final SecurityManager parent = systemDefault; + + public void checkPermission(Permission perm) + { + if (parent != null) + { + parent.checkPermission(perm); + } + } + + public void checkExit(int status) + { + String msg = (status == 0) ? "WSConsume did exit without errors" : "WSConsume did exit with an error"; + throw new InterceptedExit(msg, status); + } + } + + class InterceptedExit extends SecurityException + { + private int exitCode; + + public InterceptedExit(String s, int code) + { + super(s); + this.exitCode = code; + } + + + public int getExitCode() + { + return exitCode; + } + } + + private void swapSecurityManager() + { + if(System.getSecurityManager() instanceof InterceptedSecurity) + System.setSecurityManager(systemDefault); + else + System.setSecurityManager(interceptor); + } + + protected void setUp() throws Exception + { + super.setUp(); + + // enforce loading of the tracker implemenation + System.setProperty( + "org.jboss.wsf.spi.tools.ConsumerFactoryImpl", + "org.jboss.test.wsf.spi.tools.CmdConsumeTrackerFactory" + ); + } + + /* + new LongOpt("binding", LongOpt.REQUIRED_ARGUMENT, null, 'b'), + new LongOpt("catalog", LongOpt.REQUIRED_ARGUMENT, null, 'c'), + new LongOpt("package", LongOpt.REQUIRED_ARGUMENT, null, 'p'), + new LongOpt("wsdlLocation", LongOpt.REQUIRED_ARGUMENT, null, 'w'), + new LongOpt("output", LongOpt.REQUIRED_ARGUMENT, null, 'o'), + new LongOpt("source", LongOpt.REQUIRED_ARGUMENT, null, 's'), + new LongOpt("target", LongOpt.REQUIRED_ARGUMENT, null, 't'), + new LongOpt("keep", LongOpt.NO_ARGUMENT, null, 'k'), + new LongOpt("help", LongOpt.NO_ARGUMENT, null, 'h'), + new LongOpt("quiet", LongOpt.NO_ARGUMENT, null, 'q'), + new LongOpt("verbose", LongOpt.NO_ARGUMENT, null, 'v'), + new LongOpt("load-consumer", LongOpt.NO_ARGUMENT, null, 'l'), + + */ + + public void testInvalidBindingOption() throws Exception + { + executeCmd("-b", true); + } + + public void testValidBindingOption() throws Exception + { + executeCmd("-b binding-file.xml Service.wsdl", false); + assertEquals(CmdConsumeTracker.LAST_EVENT, "setBindingFiles"); + } + + public void testMissingOptions() throws Exception + { + executeCmd("", false); // strange, shouldn't this exit(1) ? + } + + // TODO: add arbitrary combinations on a case by case basis + + /** + * Pass a number of arguments to WSConsume and specify if + * you expect this to cause an exception. + * + * @param arguments + * @param expectedException + * @throws Exception + */ + private void executeCmd(String arguments, boolean expectedException) throws Exception + { + swapSecurityManager(); + + String[] args = arguments.split("\\s"); + try + { + WSConsume.main(args); + if(expectedException) + fail("Did expect exception on args: " +args); + } + catch (InterceptedExit e) + { + boolean positivStatus = (e.getExitCode() == 0); + if( (expectedException && positivStatus) + || (!expectedException && !positivStatus) ) + { + String s = expectedException ? "Did expect an exception, but " : "Did not expect an exception, but "; + String s2 = positivStatus ? "status was positiv" : "status was negativ"; + throw new Exception(s+s2); + } + + } + finally + { + swapSecurityManager(); + } + } +} Property changes on: spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/CmdConsumeTestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/CmdConsumeTracker.java =================================================================== --- spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/CmdConsumeTracker.java (rev 0) +++ spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/CmdConsumeTracker.java 2007-08-02 16:13:55 UTC (rev 4112) @@ -0,0 +1,93 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.wsf.spi.tools; + +import org.jboss.wsf.spi.tools.WSContractConsumer; + +import java.io.File; +import java.io.PrintStream; +import java.util.List; +import java.net.URL; + +/** + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +public class CmdConsumeTracker extends WSContractConsumer +{ + public static String LAST_EVENT = ""; + + public void setBindingFiles(List<File> bindingFiles) + { + CmdConsumeTracker.LAST_EVENT = "setBindingFiles"; + } + + public void setCatalog(File catalog) + { + CmdConsumeTracker.LAST_EVENT = "setCatalog"; + } + + public void setOutputDirectory(File directory) + { + CmdConsumeTracker.LAST_EVENT = "setOutputDirectory"; + } + + public void setSourceDirectory(File directory) + { + CmdConsumeTracker.LAST_EVENT = "setSourceDirectory"; + } + + public void setGenerateSource(boolean generateSource) + { + CmdConsumeTracker.LAST_EVENT = "setGenerateSource"; + } + + public void setTargetPackage(String targetPackage) + { + CmdConsumeTracker.LAST_EVENT = "setTargetPackage"; + } + + public void setWsdlLocation(String wsdlLocation) + { + CmdConsumeTracker.LAST_EVENT = "setWsdlLocation"; + } + + public void setMessageStream(PrintStream messageStream) + { + CmdConsumeTracker.LAST_EVENT = "setMessageStream"; + } + + public void setAdditionalCompilerClassPath(List<String> classPath) + { + CmdConsumeTracker.LAST_EVENT = "setAdditionalCompilerClassPath"; + } + + public void setTarget(String target) + { + CmdConsumeTracker.LAST_EVENT = "setTarget"; + } + + public void consume(URL wsdl) + { + + } +} Property changes on: spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/CmdConsumeTracker.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/CmdConsumeTrackerFactory.java =================================================================== --- spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/CmdConsumeTrackerFactory.java (rev 0) +++ spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/CmdConsumeTrackerFactory.java 2007-08-02 16:13:55 UTC (rev 4112) @@ -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.test.wsf.spi.tools; + +import org.jboss.wsf.spi.tools.WSContractConsumerFactory; +import org.jboss.wsf.spi.tools.WSContractConsumer; + +/** + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +public class CmdConsumeTrackerFactory implements WSContractConsumerFactory +{ + + public WSContractConsumer createConsumer() + { + return new CmdConsumeTracker(); + } +} Property changes on: spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/CmdConsumeTrackerFactory.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: spi/trunk/version.properties =================================================================== --- spi/trunk/version.properties 2007-08-02 16:05:43 UTC (rev 4111) +++ spi/trunk/version.properties 2007-08-02 16:13:55 UTC (rev 4112) @@ -28,3 +28,4 @@ sun-jaxrpc=1.1 sun-jaxws=2.1.1 sun-servlet=2.5 +junit=3.8.1

17 years, 4 months

1
0
0 / 0

JBossWS SVN: r4111 - in trunk/build/hudson/hudson-home/jobs: Distro-Native-AS-4.0 and 5 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-08-02 12:05:43 -0400 (Thu, 02 Aug 2007) New Revision: 4111 Modified: trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.0/config.xml trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.0/config.xml trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.0/config.xml trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml Log: Use jbossws-core instead of integration-native Modified: trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.0/config.xml 2007-08-02 16:01:13 UTC (rev 4110) +++ trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.0/config.xml 2007-08-02 16:05:43 UTC (rev 4111) @@ -29,7 +29,7 @@ # # build/deploy jbossws-native # -cd $JBWSDIR/integration/native +cd $JBWSDIR/jbossws-core ant $ENVIRONMENT -Djboss40.home=$JBOSS_INSTANCE-ejb3 jars ant $ENVIRONMENT -Djboss40.home=$JBOSS_INSTANCE deploy-jboss40 Modified: trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.0/config.xml 2007-08-02 16:01:13 UTC (rev 4110) +++ trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.0/config.xml 2007-08-02 16:05:43 UTC (rev 4111) @@ -32,7 +32,7 @@ # # Build distro # -cd $JBWSDIR/integration/native +cd $JBWSDIR/jbossws-core ./build.sh $ENVIRONMENT build-bin-dist # @@ -69,7 +69,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>jbossws/integration/native/output/jbossws-native-@version.id(a)/tests/output/reports/*.xml</testResults> + <testResults>jbossws/jbossws-core/output/jbossws-native-@version.id(a)/tests/output/reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> Modified: trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml 2007-08-02 16:01:13 UTC (rev 4110) +++ trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml 2007-08-02 16:05:43 UTC (rev 4111) @@ -32,7 +32,7 @@ # # Build distro # -cd $JBWSDIR/integration/native +cd $JBWSDIR/jbossws-core ./build.sh $ENVIRONMENT build-bin-dist # @@ -69,7 +69,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>jbossws/integration/native/output/jbossws-native-@version.id(a)/tests/output/reports/*.xml</testResults> + <testResults>jbossws/jbossws-core/output/jbossws-native-@version.id(a)/tests/output/reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> Modified: trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml 2007-08-02 16:01:13 UTC (rev 4110) +++ trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml 2007-08-02 16:05:43 UTC (rev 4111) @@ -32,7 +32,7 @@ # # Build distro # -cd $JBWSDIR/integration/native +cd $JBWSDIR/jbossws-core ./build.sh $ENVIRONMENT build-bin-dist # @@ -69,7 +69,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>jbossws/integration/native/output/jbossws-native-@version.id(a)/tests/output/reports/*.xml</testResults> + <testResults>jbossws/jbossws-core/output/jbossws-native-@version.id(a)/tests/output/reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> Modified: trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.0/config.xml 2007-08-02 16:01:13 UTC (rev 4110) +++ trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.0/config.xml 2007-08-02 16:05:43 UTC (rev 4111) @@ -60,7 +60,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>jbossws/integration/native/output/tests/reports/*.xml</testResults> + <testResults>jbossws/jbossws-core/output/tests/reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> Modified: trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml 2007-08-02 16:01:13 UTC (rev 4110) +++ trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml 2007-08-02 16:05:43 UTC (rev 4111) @@ -60,7 +60,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>jbossws/integration/native/output/tests/reports/*.xml</testResults> + <testResults>jbossws/jbossws-core/output/tests/reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> Modified: trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml 2007-08-02 16:01:13 UTC (rev 4110) +++ trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml 2007-08-02 16:05:43 UTC (rev 4111) @@ -60,7 +60,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>jbossws/integration/native/output/tests/reports/*.xml</testResults> + <testResults>jbossws/jbossws-core/output/tests/reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients>

17 years, 4 months

1
0
0 / 0

JBossWS SVN: r4110 - in trunk/integration: sunri/ant-import and 2 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-08-02 12:01:13 -0400 (Thu, 02 Aug 2007) New Revision: 4110 Modified: trunk/integration/sunri/ant-import/build-deploy.xml trunk/integration/sunri/ant-import/build-thirdparty.xml trunk/integration/sunri/ant-import/macros-deploy-sunri.xml trunk/integration/sunri/version.properties trunk/integration/xfire/ant-import/build-deploy.xml trunk/integration/xfire/ant-import/build-thirdparty.xml trunk/integration/xfire/ant-import/macros-deploy-xfire.xml trunk/integration/xfire/version.properties Log: Fix deploy metro,xfire Modified: trunk/integration/sunri/ant-import/build-deploy.xml =================================================================== --- trunk/integration/sunri/ant-import/build-deploy.xml 2007-08-02 15:43:38 UTC (rev 4109) +++ trunk/integration/sunri/ant-import/build-deploy.xml 2007-08-02 16:01:13 UTC (rev 4110) @@ -22,11 +22,10 @@  <target name="deploy-jboss50" depends="jars-jboss50,undeploy-jboss50" description="Deploy jbossws/sunri to jboss50"> - <ant antfile="${int.native.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> + <ant antfile="${core.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> <ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> <macro-deploy-sunri50 wsflibs="${framework.dir}/output/lib" - jbosslibs="${int.jboss50.dir}/output/lib" stacklibs="${int.sunri.dir}/output/lib" thirdpartylibs="${int.sunri.dir}/thirdparty"/> @@ -44,7 +43,7 @@  <target name="deploy-jboss42" depends="jars-jboss42,undeploy-jboss42" description="Deploy jbossws/sunri to jboss42"> - <ant antfile="${int.native.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/> + <ant antfile="${core.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/> <ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/> <macro-deploy-sunri42 wsflibs="${framework.dir}/output/lib" Modified: trunk/integration/sunri/ant-import/build-thirdparty.xml =================================================================== --- trunk/integration/sunri/ant-import/build-thirdparty.xml 2007-08-02 15:43:38 UTC (rev 4109) +++ trunk/integration/sunri/ant-import/build-thirdparty.xml 2007-08-02 16:01:13 UTC (rev 4110) @@ -45,6 +45,8 @@ <get src="${jboss.repository}/jboss/jaxr/${jboss-jaxr}/lib/juddi-service.sar" dest="${thirdparty.dir}/juddi-service.sar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-common/${jbossws-common}/lib/jbossws-common.jar" dest="${thirdparty.dir}/jbossws-common.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss50}/lib/jbossws-jboss50.jar" dest="${thirdparty.dir}/jbossws-jboss50.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss50}/lib/jbossws-jboss50-deployer.zip" dest="${thirdparty.dir}/jbossws-jboss50-deployer.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-api.jar" dest="${thirdparty.dir}/jaxb-api.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-impl.jar" dest="${thirdparty.dir}/jaxb-impl.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-xjc.jar" dest="${thirdparty.dir}/jaxb-xjc.jar" usetimestamp="true" verbose="true"/> Modified: trunk/integration/sunri/ant-import/macros-deploy-sunri.xml =================================================================== --- trunk/integration/sunri/ant-import/macros-deploy-sunri.xml 2007-08-02 15:43:38 UTC (rev 4109) +++ trunk/integration/sunri/ant-import/macros-deploy-sunri.xml 2007-08-02 16:01:13 UTC (rev 4110) @@ -19,7 +19,6 @@ <macrodef name="macro-deploy-sunri50"> <attribute name="wsflibs"/> - <attribute name="jbosslibs"/> <attribute name="stacklibs"/> <attribute name="thirdpartylibs"/> <sequential> @@ -27,13 +26,11 @@  <copy todir="${jboss50.home}/client" overwrite="true"> - <fileset dir="@{jbosslibs}"> - <include name="jbossws-jboss50.jar"/> - </fileset> <fileset dir="@{stacklibs}"> <include name="jbossws-sunri-client.jar"/> </fileset> <fileset dir="@{thirdpartylibs}"> + <include name="jbossws-jboss50.jar"/> <include name="jaxb-api.jar"/> <include name="jaxb-impl.jar"/> <include name="jaxb-xjc.jar"/> @@ -58,10 +55,8 @@  <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true"> - <fileset dir="@{jbosslibs}"> - <include name="jbossws-jboss50.jar"/> - </fileset> <fileset dir="@{thirdpartylibs}"> + <include name="jbossws-jboss50.jar"/> <include name="jaxws-api.jar"/> <include name="jsr181-api.jar"/> <include name="saaj-api.jar"/> @@ -69,7 +64,7 @@ </copy> <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> - <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="@{jbosslibs}/jbossws-jboss50-deployer.zip"/> + <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="@{thirdpartylibs}/jbossws-jboss50-deployer.zip"/> <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/> <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar" src="@{stacklibs}/jbossws-sunri50.sar"/>  Modified: trunk/integration/sunri/version.properties =================================================================== --- trunk/integration/sunri/version.properties 2007-08-02 15:43:38 UTC (rev 4109) +++ trunk/integration/sunri/version.properties 2007-08-02 16:01:13 UTC (rev 4110) @@ -4,6 +4,10 @@ sunri.implementation.title=JBoss Web Services - JBossWS/SunRI # Thirdparty library versions +jbossws-common=2.0.1.CR1 +jbossws-spi=2.0.1.CR1 +jbossws-jboss50=2.0.1.CR1 + jboss-security-spi=2.0.0.Beta sun-jaxws=2.1.1 sun-servlet=2.5 Modified: trunk/integration/xfire/ant-import/build-deploy.xml =================================================================== --- trunk/integration/xfire/ant-import/build-deploy.xml 2007-08-02 15:43:38 UTC (rev 4109) +++ trunk/integration/xfire/ant-import/build-deploy.xml 2007-08-02 16:01:13 UTC (rev 4110) @@ -22,11 +22,10 @@  <target name="deploy-jboss50" depends="jars-jboss50,undeploy-jboss50" description="Deploy jbossws/xfire to jboss50"> - <ant antfile="${int.native.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> + <ant antfile="${core.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> <ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> <macro-deploy-xfire50 wsflibs="${framework.dir}/output/lib" - jbosslibs="${int.jboss50.dir}/output/lib" stacklibs="${int.xfire.dir}/output/lib" thirdpartylibs="${int.xfire.dir}/thirdparty"/> @@ -44,7 +43,7 @@  <target name="deploy-jboss42" depends="jars-jboss42,undeploy-jboss42" description="Deploy jbossws/xfire to jboss42"> - <ant antfile="${int.native.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/> + <ant antfile="${core.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/> <ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/> <macro-deploy-xfire42 wsflibs="${framework.dir}/output/lib" Modified: trunk/integration/xfire/ant-import/build-thirdparty.xml =================================================================== --- trunk/integration/xfire/ant-import/build-thirdparty.xml 2007-08-02 15:43:38 UTC (rev 4109) +++ trunk/integration/xfire/ant-import/build-thirdparty.xml 2007-08-02 16:01:13 UTC (rev 4110) @@ -60,6 +60,8 @@ <get src="${jboss.repository}/jboss/jaxr/${jboss-jaxr}/lib/juddi-service.sar" dest="${thirdparty.dir}/juddi-service.sar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-common/${jbossws-common}/lib/jbossws-common.jar" dest="${thirdparty.dir}/jbossws-common.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss50}/lib/jbossws-jboss50.jar" dest="${thirdparty.dir}/jbossws-jboss50.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss50}/lib/jbossws-jboss50-deployer.zip" dest="${thirdparty.dir}/jbossws-jboss50-deployer.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/stax-api/${stax-api}/lib/stax-api.jar" dest="${thirdparty.dir}/stax-api.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-api.jar" dest="${thirdparty.dir}/jaxb-api.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-impl.jar" dest="${thirdparty.dir}/jaxb-impl.jar" usetimestamp="true" verbose="true"/> Modified: trunk/integration/xfire/ant-import/macros-deploy-xfire.xml =================================================================== --- trunk/integration/xfire/ant-import/macros-deploy-xfire.xml 2007-08-02 15:43:38 UTC (rev 4109) +++ trunk/integration/xfire/ant-import/macros-deploy-xfire.xml 2007-08-02 16:01:13 UTC (rev 4110) @@ -20,7 +20,6 @@  <macrodef name="macro-deploy-xfire50"> <attribute name="wsflibs"/> - <attribute name="jbosslibs"/> <attribute name="stacklibs"/> <attribute name="thirdpartylibs"/> <sequential> @@ -31,11 +30,8 @@ <fileset dir="@{wsflibs}"> <include name="jbossws-framework.jar"/> </fileset> - <fileset dir="@{jbosslibs}"> - <include name="jbossws-jboss50.jar"/> - </fileset> <fileset dir="@{thirdpartylibs}"> - <include name="jbossws-spi.jar"/> + <include name="jbossws-jboss50.jar"/> <include name="jaxb-api.jar"/> <include name="jaxb-impl.jar"/> <include name="jaxb-xjc.jar"/> @@ -52,17 +48,15 @@  <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true"> - <fileset dir="@{jbosslibs}"> - <include name="jbossws-jboss50.jar"/> - </fileset> <fileset dir="@{thirdpartylibs}"> + <include name="jbossws-jboss50.jar"/> <include name="jaxws-api.jar"/> <include name="saaj-api.jar"/> </fileset> </copy> <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> - <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="@{jbosslibs}/jbossws-jboss50-deployer.zip"/> + <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="@{thirdpartylibs}/jbossws-jboss50-deployer.zip"/> <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-xfire.sar"/> <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-xfire.sar" src="@{stacklibs}/jbossws-xfire50.sar"/>  Modified: trunk/integration/xfire/version.properties =================================================================== --- trunk/integration/xfire/version.properties 2007-08-02 15:43:38 UTC (rev 4109) +++ trunk/integration/xfire/version.properties 2007-08-02 16:01:13 UTC (rev 4110) @@ -4,6 +4,10 @@ sunri.implementation.title=JBoss Web Services - Apache CXF # Thirdparty library versions +jbossws-common=2.0.1.CR1 +jbossws-spi=2.0.1.CR1 +jbossws-jboss50=2.0.1.CR1 + apache-cxf=2.0 apache-xml-commons=1.2 ibm-wsdl4j=1.6.2

17 years, 4 months

1
0
0 / 0

JBossWS SVN: r4109 - in trunk/integration/jboss40: ant-import and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-08-02 11:43:38 -0400 (Thu, 02 Aug 2007) New Revision: 4109 Modified: trunk/integration/jboss40/ant-import/build-thirdparty.xml trunk/integration/jboss40/build.xml Log: Fix infinite build loop Modified: trunk/integration/jboss40/ant-import/build-thirdparty.xml =================================================================== --- trunk/integration/jboss40/ant-import/build-thirdparty.xml 2007-08-02 15:37:32 UTC (rev 4108) +++ trunk/integration/jboss40/ant-import/build-thirdparty.xml 2007-08-02 15:43:38 UTC (rev 4109) @@ -32,7 +32,6 @@  <path id="jbws40.integration.classpath"> - <pathelement location="${core.dir}/output/lib/jbossws-core.jar"/> <pathelement location="${framework.dir}/output/lib/jbossws-framework.jar"/> <pathelement location="${framework.dir}/thirdparty/jbossws-common.jar"/> <pathelement location="${framework.dir}/thirdparty/jbossws-spi.jar"/> Modified: trunk/integration/jboss40/build.xml =================================================================== --- trunk/integration/jboss40/build.xml 2007-08-02 15:37:32 UTC (rev 4108) +++ trunk/integration/jboss40/build.xml 2007-08-02 15:43:38 UTC (rev 4109) @@ -14,7 +14,6 @@ <project default="main" basedir="../.." name="JBossWS-JBoss40"> <import file="${basedir}/build/ant-import/build-setup.xml"/> - <import file="${int.jboss40.dir}/ant-import/build-release.xml"/> <import file="${int.jboss40.dir}/ant-import/build-thirdparty.xml"/> @@ -45,7 +44,6 @@ <target name="init" depends="prepare, thirdparty"> <fail message="Not available: ${jboss40.available.file}" unless="jboss40.available"/> - <ant antfile="${core.dir}/build.xml" target="jars" inheritall="false"/> </target>

17 years, 4 months

1
0
0 / 0

JBossWS SVN: r4108 - trunk/jbossws-core/ant-import.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-08-02 11:37:32 -0400 (Thu, 02 Aug 2007) New Revision: 4108 Modified: trunk/jbossws-core/ant-import/build-deploy.xml Log: Remove corelibs Modified: trunk/jbossws-core/ant-import/build-deploy.xml =================================================================== --- trunk/jbossws-core/ant-import/build-deploy.xml 2007-08-02 15:21:19 UTC (rev 4107) +++ trunk/jbossws-core/ant-import/build-deploy.xml 2007-08-02 15:37:32 UTC (rev 4108) @@ -42,7 +42,7 @@ <target name="deploy-jboss50-endorsed" depends="prepare" if="HAVE_JDK_1.6"> <macro-deploy-endorsed jbosshome="${jboss50.home}" - corelibs="${core.dir}/output/lib" + stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> </target> @@ -63,8 +63,7 @@ <macro-deploy-native42 wsflibs="${framework.dir}/output/lib" jbosslibs="${int.jboss42.dir}/output/lib" - corelibs="${core.dir}/output/lib" - stacklibs="${int.native.dir}/output/lib" + stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> <macro-deploy-wsf wsflibs="${framework.dir}/output/lib" @@ -81,7 +80,7 @@ <target name="deploy-jboss42-endorsed" depends="prepare" if="HAVE_JDK_1.6"> <macro-deploy-endorsed jbosshome="${jboss42.home}" - corelibs="${core.dir}/output/lib" + stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> </target> @@ -101,8 +100,7 @@ <macro-deploy-native40 wsflibs="${framework.dir}/output/lib" jbosslibs="${int.jboss40.dir}/output/lib" - corelibs="${core.dir}/output/lib" - stacklibs="${int.native.dir}/output/lib" + stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> <macro-deploy-wsf wsflibs="${framework.dir}/output/lib"

17 years, 4 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits August 2007