Author: thomas.diesler(a)jboss.com Date: 2008-04-18 07:18:17 -0400 (Fri, 18 Apr 2008) New Revision: 6498 Added: container/jboss42/branches/jbossws-jboss422/.classpath container/jboss42/branches/jbossws-jboss422/.project container/jboss42/branches/jbossws-jboss422/pom.xml container/jboss42/branches/jbossws-jboss422/profiles-example.xml container/jboss42/branches/jbossws-jboss422/src/main/ant/ container/jboss42/branches/jbossws-jboss422/src/main/assembly/ Removed: container/jboss42/branches/jbossws-jboss422/ant-import/ container/jboss42/branches/jbossws-jboss422/ant.properties container/jboss42/branches/jbossws-jboss422/ant.properties.example container/jboss42/branches/jbossws-jboss422/build.xml container/jboss42/branches/jbossws-jboss422/version.properties container/jboss42/branches/jbossws-jboss422/version.properties.md5 Modified: container/jboss42/branches/jbossws-jboss422/ container/jboss42/branches/jbossws-jboss422/src/main/ant/build-install.xml Log: Use maven build Property changes on: container/jboss42/branches/jbossws-jboss422 ___________________________________________________________________ Name: svn:ignore + .settings target Added: container/jboss42/branches/jbossws-jboss422/.classpath =================================================================== --- container/jboss42/branches/jbossws-jboss422/.classpath (rev 0) +++ container/jboss42/branches/jbossws-jboss422/.classpath 2008-04-18 11:18:17 UTC (rev 6498) @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" output="target/classes" path="src/main/java"/> + <classpathentry excluding="**" kind="src" output="src/main/etc" path="src/main/etc"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> + <classpathentry kind="output" path="target/classes"/> +</classpath> Added: container/jboss42/branches/jbossws-jboss422/.project =================================================================== --- container/jboss42/branches/jbossws-jboss422/.project (rev 0) +++ container/jboss42/branches/jbossws-jboss422/.project 2008-04-18 11:18:17 UTC (rev 6498) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>jbossws-jboss42</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.maven.ide.eclipse.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.maven.ide.eclipse.maven2Nature</nature> + </natures> +</projectDescription> Deleted: container/jboss42/branches/jbossws-jboss422/ant.properties =================================================================== --- container/jboss42/branches/jbossws-jboss422/ant.properties 2008-04-18 10:00:28 UTC (rev 6497) +++ container/jboss42/branches/jbossws-jboss422/ant.properties 2008-04-18 11:18:17 UTC (rev 6498) @@ -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 -jboss42.home=/home/hbraun/dev/prj/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA/ - -# The JBoss settings -jboss.server.instance=default - -# JBoss Repository -jboss.repository=file:/home/hbraun/dev/prj/jboss.local.repository -#jboss.repository=http://repository.jboss.org - -# JBossWS Release -jboss.local.repository=/home/hbraun/dev/prj/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/jboss42/branches/jbossws-jboss422/ant.properties.example =================================================================== --- container/jboss42/branches/jbossws-jboss422/ant.properties.example 2008-04-18 10:00:28 UTC (rev 6497) +++ container/jboss42/branches/jbossws-jboss422/ant.properties.example 2008-04-18 11:18:17 UTC (rev 6498) @@ -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 -#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 Deleted: container/jboss42/branches/jbossws-jboss422/build.xml =================================================================== --- container/jboss42/branches/jbossws-jboss422/build.xml 2008-04-18 10:00:28 UTC (rev 6497) +++ container/jboss42/branches/jbossws-jboss422/build.xml 2008-04-18 11:18:17 UTC (rev 6498) @@ -1,158 +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-JBoss42"> - - <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="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"/> - <property name="jbws42.output.dir" value="${jbws42.dir}/output"/> - <property name="jbws42.output.apidocs.dir" value="${jbws42.output.dir}/apidocs"/> - <property name="jbws42.output.classes.dir" value="${jbws42.output.dir}/classes"/> - <property name="jbws42.output.etc.dir" value="${jbws42.output.dir}/etc"/> - <property name="jbws42.output.lib.dir" value="${jbws42.output.dir}/lib"/> - - <!-- ================================================================== --> - <!-- Initialization --> - <!-- ================================================================== --> - - <target name="init" depends="prepare,thirdparty-get"> - <fail message="Not available: ${jboss42.available.file}" unless="jboss42.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="${jbws42.output.classes.dir}"/> - <javac srcdir="${jbws42.java.dir}" sourcepath="" destdir="${jbws42.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/jboss42/**"/> - <exclude name="org/jboss/wsf/container/jboss42/jms/**"/> - <classpath refid="jbws42.integration.classpath"/> - </javac> - </target> - - <!-- Compile etc files (manifests and such) --> - <target name="compile-etc" depends="init"> - <mkdir dir="${jbws42.output.etc.dir}"/> - <copy todir="${jbws42.output.etc.dir}" filtering="yes" overwrite="true"> - <fileset dir="${jbws42.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="${jbws42.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-jboss42.jar --> - <mkdir dir="${jbws42.output.lib.dir}"/> - <jar jarfile="${jbws42.output.lib.dir}/jbossws-jboss42.jar" manifest="${jbws42.output.etc.dir}/default.mf"> - <fileset dir="${jbws42.output.classes.dir}"> - <include name="org/jboss/ws/integration/**"/> - <include name="org/jboss/wsf/container/jboss42/**"/> - </fileset> - <metainf dir="${jbws42.resources.dir}/jbossws-jboss42.jar/META-INF"/> - </jar> - - <!-- Build jbossws-jboss42-resources.zip --> - <zip zipfile="${jbws42.output.lib.dir}/jbossws-jboss42-resources.zip" > - <fileset dir="${jbws42.resources.dir}"/> - </zip> - - <!-- Build jbossws-jboss42-src.zip --> - <zip zipfile="${jbws42.output.lib.dir}/jbossws-jboss42-src.zip" > - <fileset dir="${jbws42.java.dir}"/> - </zip> - - </target> - - <!-- Generate the JavaDoc --> - <target name="javadoc" depends="init" description="Generate the Javadoc"> - - <mkdir dir="${jbws42.output.apidocs.dir}"/> - <javadoc destdir="${jbws42.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API"> - <classpath> - <path refid="jbws42.integration.classpath"/> - </classpath> - <packageset dir="${jbws42.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="${jbws42.output.dir}"/> - </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"/> - - <target name="most" description="Builds almost everything." depends="jars"/> - - <target name="all" description="Create a distribution zip file" depends="main"> - </target> - -</project> Added: container/jboss42/branches/jbossws-jboss422/pom.xml =================================================================== --- container/jboss42/branches/jbossws-jboss422/pom.xml (rev 0) +++ container/jboss42/branches/jbossws-jboss422/pom.xml 2008-04-18 11:18:17 UTC (rev 6498) @@ -0,0 +1,203 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <name>JBoss Web Services - Container JBoss-4.2.2</name> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss42</artifactId> + + <version>4.2.2-SNAPSHOT</version> + + <organization> + <name>JBoss, a division of Red Hat</name> + <url>http://www.jboss.org</url> + </organization> + <url>http://maven.apache.org</url> + + <!-- Parent --> + <parent> + <groupId>org.jboss</groupId> + <artifactId>jboss-parent</artifactId> + <version>3</version> + </parent> + + <!-- Properties --> + <properties> + <jboss.version>4.2.2.GA</jboss.version> + </properties> + + <!-- Dependencies --> + <dependencies> + <dependency> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + <version>1.6.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.ejb</groupId> + <artifactId>ejb-api</artifactId> + <version>3.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.jws</groupId> + <artifactId>jsr181-api</artifactId> + <version>1.0-MR1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + <version>1.0.1B</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.xml</groupId> + <artifactId>jaxrpc-api</artifactId> + <version>1.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.xml.soap</groupId> + <artifactId>saaj-api</artifactId> + <version>1.3</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.xml.ws</groupId> + <artifactId>jaxws-api</artifactId> + <version>2.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>jboss.aop</groupId> + <artifactId>jboss-aop-jdk50</artifactId> + <version>1.5.6.GA</version> + </dependency> + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-system</artifactId> + <version>${jboss.version}</version> + </dependency> + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss</artifactId> + <version>${jboss.version}</version> + </dependency> + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-annotations-ejb3</artifactId> + <version>${jboss.version}</version> + </dependency> + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-ejb3</artifactId> + <version>${jboss.version}</version> + </dependency> + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-ejb3x</artifactId> + <version>${jboss.version}</version> + </dependency> + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-jmx</artifactId> + <version>${jboss.version}</version> + </dependency> + <dependency> + <groupId>jboss</groupId> + <artifactId>jbosssx</artifactId> + <version>${jboss.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.microcontainer</groupId> + <artifactId>jboss-kernel</artifactId> + <version>2.0.0.Beta4</version> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-common</artifactId> + <version>3.0.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-spi</artifactId> + <version>3.0.0-SNAPSHOT</version> + </dependency> + </dependencies> + + <!-- Plugins --> + <build> + <resources> + <resource> + <targetPath>../etc</targetPath> + <directory>src/main/etc</directory> + <filtering>true</filtering> + </resource> + </resources> + <plugins> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <phase>install</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <property name="version.id" value="${project.version}"/> + <property name="jboss.local.repository" value="${jboss.local.repository}"/> + <ant antfile="src/main/ant/build-install.xml" target="install"/> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptors> + <descriptor>src/main/assembly/src.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + <showDeprecation>false</showDeprecation> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifest> + <addDefaultImplementationEntries>true</addDefaultImplementationEntries> + </manifest> + </archive> + </configuration> + </plugin> + </plugins> + </build> + +</project> Property changes on: container/jboss42/branches/jbossws-jboss422/pom.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: container/jboss42/branches/jbossws-jboss422/profiles-example.xml =================================================================== --- container/jboss42/branches/jbossws-jboss422/profiles-example.xml (rev 0) +++ container/jboss42/branches/jbossws-jboss422/profiles-example.xml 2008-04-18 11:18:17 UTC (rev 6498) @@ -0,0 +1,18 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <!-- This profile can also be defined in ~/.m2/settings.xml --> + <profiles> + <profile> + <id>user-profile</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <properties> + <!-- The location of the legacy jboss repository --> + <jboss.local.repository>/home/tdiesler/svn/jboss.local.repository</jboss.local.repository> + </properties> + </profile> + </profiles> + +</project> \ No newline at end of file Property changes on: container/jboss42/branches/jbossws-jboss422/profiles-example.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: container/jboss42/branches/jbossws-jboss422/src/main/ant (from rev 6444, container/jboss42/tags/jbossws-jboss42-4.2.1.SP1/ant) Modified: container/jboss42/branches/jbossws-jboss422/src/main/ant/build-install.xml =================================================================== --- container/jboss42/tags/jbossws-jboss42-4.2.1.SP1/ant/build-install.xml 2008-04-16 08:19:10 UTC (rev 6444) +++ container/jboss42/branches/jbossws-jboss422/src/main/ant/build-install.xml 2008-04-18 11:18:17 UTC (rev 6498) @@ -32,12 +32,18 @@ <echo message="jboss.local.repository=${jboss.local.repository}"/> </target> + <target name="check-properties" depends="init"> + <available property="jboss.local.repository.available" type="dir" file="${jboss.local.repository}"/> + <fail message="Cannot find directory ${jboss.local.repository}. Did you copy profiles-example.xml?" unless="jboss.local.repository.available"/> + </target> + + <!-- ================================================================== --> <!-- Installation --> <!-- ================================================================== --> <!-- Install to jboss.local.repository --> - <target name="install" depends="init" description="Install to jboss.local.repository"> + <target name="install" depends="check-properties" description="Install to jboss.local.repository"> <!-- Check if the target jar is available --> <available property="jbossws.jboss42.jar.available" file="${project.target.dir}/jbossws-jboss42-${version.id}.jar"/> Copied: container/jboss42/branches/jbossws-jboss422/src/main/assembly (from rev 6444, container/jboss42/tags/jbossws-jboss42-4.2.1.SP1/src/main/assembly) Deleted: container/jboss42/branches/jbossws-jboss422/version.properties =================================================================== --- container/jboss42/branches/jbossws-jboss422/version.properties 2008-04-18 10:00:28 UTC (rev 6497) +++ container/jboss42/branches/jbossws-jboss422/version.properties 2008-04-18 11:18:17 UTC (rev 6498) @@ -1,23 +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-2.0 - -version.id=4.2.2.DEV -repository.id=4.2.2.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 - -# Thirdparty library versions -jbossws-common=snapshot -jbossws-spi=3.0.0-SNAPSHOT -jbossws-framework=3.0.2-SNAPSHOT - -dom4j=1.6.1 -sun-jaxrpc=1.1 -sun-jaxws=2.1.1 Deleted: container/jboss42/branches/jbossws-jboss422/version.properties.md5 =================================================================== --- container/jboss42/branches/jbossws-jboss422/version.properties.md5 2008-04-18 10:00:28 UTC (rev 6497) +++ container/jboss42/branches/jbossws-jboss422/version.properties.md5 2008-04-18 11:18:17 UTC (rev 6498) @@ -1 +0,0 @@ -40488c1d4fa5f22883fe3f24050d4137