Author: thomas.diesler(a)jboss.com Date: 2008-04-25 06:38:00 -0400 (Fri, 25 Apr 2008) New Revision: 6684 Removed: container/jboss50/branches/jbossws-jboss501/THIS-IS-3.0 container/jboss50/branches/jbossws-jboss501/ant-import/ container/jboss50/branches/jbossws-jboss501/ant.properties.example container/jboss50/branches/jbossws-jboss501/build-as.xml container/jboss50/branches/jbossws-jboss501/build.xml container/jboss50/branches/jbossws-jboss501/src/assembly/ container/jboss50/branches/jbossws-jboss501/version.properties container/jboss50/branches/jbossws-jboss501/version.properties.md5 Modified: container/jboss50/branches/jbossws-jboss501/pom.xml container/jboss50/branches/jbossws-jboss501/src/main/scripts/assembly-resources.xml Log: Switch build to maven Deleted: container/jboss50/branches/jbossws-jboss501/THIS-IS-3.0 =================================================================== Deleted: container/jboss50/branches/jbossws-jboss501/ant.properties.example =================================================================== --- container/jboss50/branches/jbossws-jboss501/ant.properties.example 2008-04-25 09:58:15 UTC (rev 6683) +++ container/jboss50/branches/jbossws-jboss501/ant.properties.example 2008-04-25 10:38:00 UTC (rev 6684) @@ -1,26 +0,0 @@ -# -# A sample ant properties file -# -# $Id: ant.properties.example 3995 2007-07-26 08:52:45Z thomas.diesler(a)jboss.com $ - -# JBoss Home -jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.CR1 - -# 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/jboss50/branches/jbossws-jboss501/build-as.xml =================================================================== --- container/jboss50/branches/jbossws-jboss501/build-as.xml 2008-04-25 09:58:15 UTC (rev 6683) +++ container/jboss50/branches/jbossws-jboss501/build-as.xml 2008-04-25 10:38:00 UTC (rev 6684) @@ -1,212 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- ====================================================================== --> -<!-- --> -<!-- JBoss, the OpenSource J2EE webOS --> -<!-- --> -<!-- Distributable under LGPL license. --> -<!-- See terms of license at http://www.gnu.org. --> -<!-- --> -<!-- ====================================================================== --> - -<!-- $Id$ --> - -<project default="main" name="JBoss/Webservices"> - - <!-- ================================================================== --> - <!-- Setup --> - <!-- ================================================================== --> - - <!-- ================================================================== --> - <!-- Configuration --> - <!-- ================================================================== --> - - <!-- - | Configure the build system. - | - | This target is invoked by the Buildmagic initialization logic and - | should contain module specific configuration elements. - --> - - <target name="configure" unless="configure.disable"> - - <!-- =================== --> - <!-- Basic Configuration --> - <!-- =================== --> - - <!-- Module name(s) & version --> - <property name="module.name" value="webservices"/> - <property name="module.Name" value="JBossWS Container Integration"/> - <property name="module.version" value="DEV"/> - - <!-- ========= --> - <!-- Libraries --> - <!-- ========= --> - - <!-- The combined library classpath --> - <!--path id="library.classpath"> - <path refid="apache.xerces.classpath"/> - <path refid="dom4j.dom4j.classpath"/> - <path refid="jboss.aop.classpath"/> - <path refid="jboss.common.core.classpath"/> - <path refid="jboss.common.logging.spi.classpath"/> - <path refid="jboss.jboss.ejb3.core.classpath" /> - <path refid="jboss.jboss.ejb3.ext.api.classpath" /> - <path refid="jboss.jboss.ejb3.interceptors.classpath" /> - <path refid="jboss.jboss.javaee.classpath"/> - <path refid="jboss.jboss.security.spi.classpath"/> - <path refid="jboss.jboss.vfs.classpath"/> - <path refid="jboss.jbosssx.classpath"/> - <path refid="jboss.jbossws.classpath"/> - <path refid="jboss.jbossws.common.classpath"/> - <path refid="jboss.jbossws.framework.classpath"/> - <path refid="jboss.jbossws.spi.classpath"/> - <path refid="jboss.jbossxb.classpath"/> - <path refid="jboss.metadata.classpath"/> - <path refid="jboss.jboss.deployers.classpath"/> - <path refid="jboss.microcontainer.classpath"/> - <path refid="sun.jaxb.classpath"/> - <path refid="sun.servlet.classpath"/> - </path--> - - - <!-- The combined dependant module classpath --> - <!--path id="dependentmodule.classpath"> - <path refid="jboss.aspects.classpath"/> - <path refid="jboss.j2se.classpath"/> - <path refid="jboss.jmx.classpath"/> - <path refid="jboss.server.classpath"/> - <path refid="jboss.system.classpath"/> - <path refid="jboss.systemjmx.classpath"/> - <path refid="jboss.tomcat.classpath"/> - </path--> - - <!-- ===== --> - <!-- Tasks --> - <!-- ===== --> - - <property name="jar.prefix" value="jbossws-jboss50"/> - <property name="javac.target" value="1.5"/> - <property name="javac.source" value="1.5"/> - - <call target="_default:task-init"/> - - </target> - - <!-- ================================================================== --> - <!-- Compile --> - <!-- ================================================================== --> - - <!-- - | Compile everything. - | - | This target should depend on other compile-* targets for each - | different type of compile that needs to be performed, short of - | documentation compiles. - --> - - <target name="compile" - description="Compile all source files." - depends="_default:compile-classes, - _default:compile-resources, - _default:compile-etc"/> - - <!-- ================================================================== --> - <!-- Archives --> - <!-- ================================================================== --> - - <!-- - | Build all jar files. - --> - <target name="module-jars" depends="compile"> - - <!-- Concat jbossws-beans.xml --> - <concat destfile="${build.resources}/jbossws-beans.xml"> - <header trimleading="yes"> - &lt;deployment xmlns="urn:jboss:bean-deployer:2.0"&gt; - </header> - <fileset file="${jboss.jbossws.resources}/jbossws-native-config.xml"/> - <footer trimleading="yes"> - &lt;/deployment&gt; - </footer> - </concat> - - <!-- Build jbossws-jboss50.jar --> - <jar jarfile="${build.lib}/jbossws-jboss50.jar" manifest="${build.etc}/default.mf"> - <fileset dir="${build.classes}" /> - <metainf dir="${build.resources}/jbossws-jboss50.jar/META-INF"/> - </jar> - - <!-- Build jbossws-native50.deployer --> - <zip zipfile="${build.lib}/jbossws-jboss50-deployer.zip"> - <fileset dir="${build.lib}"> - <include name="jbossws-jboss50.jar"/> - </fileset> - <fileset dir="${jboss.jbossws.common.lib}"> - <include name="jbossws-common.jar"/> - </fileset> - <fileset dir="${jboss.jbossws.framework.lib}"> - <include name="jbossws-framework.jar"/> - </fileset> - <fileset dir="${build.resources}/jbossws-jboss50.deployer"> - <include name="META-INF/jbossws-deployer-beans.xml"/> - </fileset> - </zip> - - <!-- Build jbossws.sar --> - <jar jarfile="${build.lib}/jbossws.sar"> - <fileset dir="${jboss.jbossws.lib}"> - <include name="jbossws-core.jar"/> - </fileset> - <fileset dir="${wscommons.policy.lib}"> - <include name="policy.jar"/> - </fileset> - <fileset dir="${ibm.wsdl4j.lib}"> - <include name="wsdl4j.jar"/> - </fileset> - <fileset dir="${apache.xmlsec.lib}"> - <include name="xmlsec.jar"/> - </fileset> - <fileset dir="${jboss.jaxbintros.lib}"> - <include name="jboss-jaxb-intros.jar"/> - </fileset> - <metainf dir="${jboss.jbossws.resources}"> - <include name="standard-*-config.xml"/> - </metainf> - <metainf dir="${build.resources}"> - <include name="jbossws-beans.xml"/> - </metainf> - </jar> - - <!-- jbossws-jboss50-container.jar --> - <jar jarfile="${build.lib}/jbossws-jboss50-container.jar"> - <metainf dir="${build.resources}/jbossws-jboss50-container.jar/META-INF"> - <include name="jbossws-container-beans.xml"/> - </metainf> - </jar> - - - </target> - - <!-- ================================================================== --> - <!-- Deployment --> - <!-- ================================================================== --> - - <!-- - | Build all jar files. - --> - <target name="deploy" depends="main,module-jars"> - - - <!-- Build jbossws-native50.deployer --> - <unzip dest="../build/output/jboss-${specification.version}/server/default/deployers/jbossws.deployer" - src="${build.lib}/jbossws-jboss50-deployer.zip"> - </unzip> - - <copy todir="../build/output/jboss-${specification.version}/server/default/deploy"> - <fileset dir="${build.lib}"> - <include name="jbossws-jboss50-container.jar"/> - </fileset> - </copy> - </target> -</project> Deleted: container/jboss50/branches/jbossws-jboss501/build.xml =================================================================== --- container/jboss50/branches/jbossws-jboss501/build.xml 2008-04-25 09:58:15 UTC (rev 6683) +++ container/jboss50/branches/jbossws-jboss501/build.xml 2008-04-25 10:38:00 UTC (rev 6684) @@ -1,170 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- ====================================================================== --> -<!-- --> -<!-- JBoss, the OpenSource J2EE webOS --> -<!-- --> -<!-- Distributable under LGPL license. --> -<!-- See terms of license at http://www.gnu.org. --> -<!-- --> -<!-- ====================================================================== --> - -<!-- $Id$ --> - -<project default="main" basedir="." name="JBossWS-JBoss50"> - - <import file="${basedir}/ant-import/build-setup.xml"/> - <import file="${basedir}/ant-import/build-release.xml"/> - <import file="${basedir}/ant-import/build-thirdparty.xml"/> - - <!-- ================================================================== --> - <!-- Setup --> - <!-- ================================================================== --> - - <property name="jbws50.dir" value="${int.jboss50.dir}"/> - <property name="jbws50.src.dir" value="${jbws50.dir}/src/main"/> - <property name="jbws50.etc.dir" value="${jbws50.src.dir}/etc"/> - <property name="jbws50.java.dir" value="${jbws50.src.dir}/java"/> - <property name="jbws50.resources.dir" value="${jbws50.src.dir}/resources"/> - <property name="jbws50.output.dir" value="${jbws50.dir}/output"/> - <property name="jbws50.output.apidocs.dir" value="${jbws50.output.dir}/apidocs"/> - <property name="jbws50.output.classes.dir" value="${jbws50.output.dir}/classes"/> - <property name="jbws50.output.etc.dir" value="${jbws50.output.dir}/etc"/> - <property name="jbws50.output.lib.dir" value="${jbws50.output.dir}/lib"/> - - <!-- ================================================================== --> - <!-- Initialization --> - <!-- ================================================================== --> - - <target name="init" depends="prepare,thirdparty-get"> - <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> - </target> - - <!-- ================================================================== --> - <!-- Compile --> - <!-- ================================================================== --> - - <!-- - | Compile everything. - | - | This target should depend on other compile-* targets for each - | different type of compile that needs to be performed, short of - | documentation compiles. - --> - - <target name="compile" depends="init,compile-classes,compile-etc" description="Compile all source files."/> - - <!-- Compile integration java sources --> - <target name="compile-classes" depends="init"> - <mkdir dir="${jbws50.output.classes.dir}"/> - <javac srcdir="${jbws50.java.dir}" sourcepath="" destdir="${jbws50.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" - deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> - <include name="org/jboss/ws/integration/**"/> - <include name="org/jboss/wsf/container/jboss50/**"/> - <exclude name="org/jboss/wsf/container/jboss50/jms/**"/> - <classpath refid="jbws50.integration.classpath"/> - </javac> - </target> - - <!-- Compile etc files (manifests and such) --> - <target name="compile-etc" depends="init"> - <mkdir dir="${jbws50.output.etc.dir}"/> - <copy todir="${jbws50.output.etc.dir}" filtering="yes" overwrite="true"> - <fileset dir="${jbws50.etc.dir}"> - <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="${jbws50.dir}/version.properties"/> - </filterset> - </copy> - </target> - - <!-- ================================================================== --> - <!-- Archives --> - <!-- ================================================================== --> - - <!-- - | Build all jar files. - --> - <target name="jars" depends="compile,module-jars" description="Builds all jar files."> - </target> - - <!-- - | Build all jar files. - --> - <target name="module-jars" depends="init"> - - <!-- Build jbossws-jboss50.jar --> - <mkdir dir="${jbws50.output.lib.dir}"/> - <jar jarfile="${jbws50.output.lib.dir}/jbossws-jboss50.jar" manifest="${jbws50.output.etc.dir}/default.mf"> - <fileset dir="${jbws50.output.classes.dir}"> - <include name="org/jboss/ws/integration/**"/> - <include name="org/jboss/wsf/container/jboss50/**"/> - </fileset> - <metainf dir="${jbws50.resources.dir}/jbossws-jboss50.jar/META-INF"/> - </jar> - - <!-- Build jbossws-jboss50-resources.zip --> - <zip zipfile="${jbws50.output.lib.dir}/jbossws-jboss50-resources.zip" > - <fileset dir="${jbws50.resources.dir}"/> - </zip> - - <zip zipfile="${jbws50.output.lib.dir}/jbossws-jboss50-deployer-resources.zip"> - <fileset dir="${jbws50.resources.dir}/jbossws-jboss50.deployer/META-INF"> - <include name="jbossws-deployer-beans.xml"/> - </fileset> - </zip> - <!-- Build jbossws-jboss50-src.zip --> - <zip zipfile="${jbws50.output.lib.dir}/jbossws-jboss50-src.zip" > - <fileset dir="${jbws50.java.dir}"/> - </zip> - - <!-- jbossws-jboss50-container.jar --> - <jar jarfile="${jbws50.output.lib.dir}/jbossws-jboss50-container.jar"> - <metainf dir="${jbws50.resources.dir}/jbossws-jboss50-container.jar/META-INF"> - <include name="jbossws-container-beans.xml"/> - </metainf> - </jar> - - </target> - - <!-- Generate the JavaDoc --> - <target name="javadoc" depends="init" description="Generate the Javadoc"> - - <mkdir dir="${jbws50.output.apidocs.dir}"/> - <javadoc destdir="${jbws50.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API"> - <classpath> - <path refid="jbws50.integration.classpath"/> - </classpath> - <packageset dir="${jbws50.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> - - <!-- ================================================================== --> - <!-- Miscellaneous --> - <!-- ================================================================== --> - - <target name="clean" depends="prepare" description="Cleans up most generated files."> - <delete dir="${jbws50.output.dir}"/> - </target> - - <target name="clobber" depends="clean" description="Cleans up all generated files."> - <delete dir="${jbws50.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/jboss50/branches/jbossws-jboss501/pom.xml =================================================================== --- container/jboss50/branches/jbossws-jboss501/pom.xml 2008-04-25 09:58:15 UTC (rev 6683) +++ container/jboss50/branches/jbossws-jboss501/pom.xml 2008-04-25 10:38:00 UTC (rev 6684) @@ -10,9 +10,9 @@ <!-- Parent --> <parent> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-as-component-matrix</artifactId> - <version>5.0.0-SNAPSHOT</version> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-parent</artifactId> + <version>1.0-SNAPSHOT</version> </parent> <!-- Properties --> @@ -22,9 +22,29 @@ <jbossws.spi.version>3.0.0-SNAPSHOT</jbossws.spi.version> </properties> + <!-- DependencyManagement --> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-component-matrix</artifactId> + <version>${jboss.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + </dependencies> + </dependencyManagement> + <!-- Dependencies --> <dependencies> + <!-- FIXME: Remove this dependency --> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-framework</artifactId> + <version>3.0.2-SNAPSHOT</version> + </dependency> + <!-- jbossws dependencies --> <dependency> <groupId>org.jboss.ws</groupId> @@ -39,6 +59,13 @@ <!-- provided apis --> + <!-- jboss dependencies --> + <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-server</artifactId> + <version>${jboss.version}</version> + </dependency> + <!-- jboss thirdparty dependencies --> <dependency> <groupId>org.jboss</groupId> @@ -56,6 +83,14 @@ <groupId>org.jboss.ejb3</groupId> <artifactId>jboss-ejb3-core</artifactId> </dependency> + <dependency> + <groupId>org.jboss.ejb3</groupId> + <artifactId>jboss-ejb3-ext-api</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.security</groupId> + <artifactId>jboss-security-spi</artifactId> + </dependency> </dependencies> <!-- Plugins --> Modified: container/jboss50/branches/jbossws-jboss501/src/main/scripts/assembly-resources.xml =================================================================== --- container/jboss50/branches/jbossws-jboss501/src/main/scripts/assembly-resources.xml 2008-04-25 09:58:15 UTC (rev 6683) +++ container/jboss50/branches/jbossws-jboss501/src/main/scripts/assembly-resources.xml 2008-04-25 10:38:00 UTC (rev 6684) @@ -9,10 +9,6 @@ <fileSet> <directory>src/main/resources</directory> <outputDirectory>/</outputDirectory> - <includes> - <include>jbossws-jboss42.sar/**</include> - <include>jbossws-jboss42-config.xml</include> - </includes> </fileSet> </fileSets> </assembly> \ No newline at end of file Deleted: container/jboss50/branches/jbossws-jboss501/version.properties =================================================================== --- container/jboss50/branches/jbossws-jboss501/version.properties 2008-04-25 09:58:15 UTC (rev 6683) +++ container/jboss50/branches/jbossws-jboss501/version.properties 2008-04-25 10:38:00 UTC (rev 6684) @@ -1,44 +0,0 @@ - -# $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-3.0 - -version.id=5.0.1.DEV -repository.id=5.0.1.DEV - -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 - -# Dependend integration projects -jbossws=snapshot -jbossws-spi=3.0.0-SNAPSHOT -jbossws-common=snapshot -jbossws-framework=3.0.2-SNAPSHOT - -# JBossAS-5.0 -jboss-jbossxb-jboss50=2.0.0.CR5 -jboss-remoting-jboss50=2.4.0.Beta2 - -# Thirdparty library versions -apache-xerces=2.9.0 -dom4j=1.6.1 - -jboss-common-core=2.2.3.GA -jboss-common-logging-log4j=2.0.2.GA -jboss-common-logging-spi=2.0.2.GA -jboss-javaee=5.0.0.Beta3 -jboss-jaxbintros=1.0.0.beta2 - -jboss-microcontainer=2.0.0.Beta11 -jboss-reflect=2.0.0.Beta12 -jboss-mdr=2.0.0.Beta12 - -jboss-security=4.0.5.GA -jboss-vfs=2.0.0.Beta2 -jbossas-core-libs=4.2.0.GA - -sun-servlet=2.4 Deleted: container/jboss50/branches/jbossws-jboss501/version.properties.md5 =================================================================== --- container/jboss50/branches/jbossws-jboss501/version.properties.md5 2008-04-25 09:58:15 UTC (rev 6683) +++ container/jboss50/branches/jbossws-jboss501/version.properties.md5 2008-04-25 10:38:00 UTC (rev 6684) @@ -1 +0,0 @@ -fbfda5f69d542401d6ca5854decba9cb