[jbossws-commits] JBossWS SVN: r6401 - in framework/trunk: framework and 4 other directories.

Author: thomas.diesler(a)jboss.com Date: 2008-04-13 15:49:08 -0400 (Sun, 13 Apr 2008) New Revision: 6401 Added: framework/trunk/framework/ framework/trunk/framework/pom.xml framework/trunk/framework/src/ framework/trunk/framework/src/main/ framework/trunk/framework/src/main/assembly/ framework/trunk/framework/src/main/assembly/src.xml framework/trunk/hudson/build-hudson.xml Removed: framework/trunk/ant-import/ framework/trunk/framework/src/main/ framework/trunk/src/ Modified: framework/trunk/ framework/trunk/.classpath framework/trunk/build.xml framework/trunk/pom.xml Log: Use framework modules Property changes on: framework/trunk ___________________________________________________________________ Name: svn:ignore - ant.properties target + ant.properties Modified: framework/trunk/.classpath =================================================================== --- framework/trunk/.classpath 2008-04-13 17:52:18 UTC (rev 6400) +++ framework/trunk/.classpath 2008-04-13 19:49:08 UTC (rev 6401) @@ -5,13 +5,13 @@ <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3.8.1"/> <classpathentry kind="var" path="M2_REPO/javax/xml/soap/saaj-api/1.3/saaj-api-1.3.jar"/> <classpathentry kind="var" path="M2_REPO/javax/xml/jaxrpc-api/1.1/jaxrpc-api-1.1.jar"/> - <classpathentry combineaccessrules="false" exported="true" kind="src" path="/common"/> - <classpathentry combineaccessrules="false" exported="true" kind="src" path="/spi"/> <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.0.CR7/jbossxb-2.0.0.CR7.jar"/> <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar"/> <classpathentry kind="var" path="M2_REPO/javax/xml/ws/jaxws-api/2.1/jaxws-api-2.1.jar"/> <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/> <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar"/> <classpathentry kind="var" path="M2_REPO/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar"/> - <classpathentry kind="output" path="target/eclipse"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/ws/jbossws-spi/3.0.0-SNAPSHOT/jbossws-spi-3.0.0-SNAPSHOT.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/ws/jbossws-common/3.0.0-SNAPSHOT/jbossws-common-3.0.0-SNAPSHOT.jar"/> + <classpathentry kind="output" path="framework/target/eclipse"/> </classpath> Modified: framework/trunk/build.xml =================================================================== --- framework/trunk/build.xml 2008-04-13 17:52:18 UTC (rev 6400) +++ framework/trunk/build.xml 2008-04-13 19:49:08 UTC (rev 6401) @@ -13,16 +13,16 @@ <project name="JBossWS-Framework" default="main" basedir="."> - <import file="${basedir}/ant-import/build-hudson.xml"/> - <!-- ================================================================== --> <!-- Setup --> <!-- ================================================================== --> - <property name="framework.dir" value="${basedir}"/> + <property name="framework.dir" value="${basedir}/framework"/> <property name="framework.etc.dir" value="${framework.dir}/src/main/etc"/> <property name="framework.target.dir" value="${framework.dir}/target"/> + <import file="${basedir}/hudson/build-hudson.xml"/> + <!-- ================================================================== --> <!-- Initialization --> <!-- ================================================================== --> @@ -33,9 +33,9 @@ <available property="ant.properties.available" file="${basedir}/ant.properties"/> <fail message="Cannot find ant.properties. Did you copy/edit ant.properties.example?" unless="ant.properties.available"/> - <property file="${framework.dir}/ant.properties"/> + <property file="${basedir}/ant.properties"/> - <xmlproperty file="${framework.dir}/pom.xml"/> + <xmlproperty file="${basedir}/pom.xml"/> <property name="version.id" value="${project.version}"/> <property name="repository.id" value="${project.version}"/> @@ -59,13 +59,12 @@ <fail message="Cannot find jbossws-framework-${version.id}-sources.jar. Did you run 'mvn source:jar'?" unless="jbossws.framework.sources.jar.available"/> <!-- jboss/jbossws-framework --> - <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/> - <mkdir dir="${jboss.repository.dir}/jbossws-framework/${repository.id}/lib"/> - <copy file="${framework.target.dir}/jbossws-framework-${version.id}.jar" tofile="${jboss.repository.dir}/jbossws-framework/${repository.id}/lib/jbossws-framework.jar" - overwrite="true"/> - <copy file="${framework.target.dir}/jbossws-framework-${version.id}-sources.jar" - tofile="${jboss.repository.dir}/jbossws-framework/${repository.id}/lib/jbossws-framework-src.jar" overwrite="true"/> - <copy file="${framework.target.dir}/etc/component-info.xml" tofile="${jboss.repository.dir}/jbossws-framework/${repository.id}/component-info.xml" overwrite="true"/> + <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss/jbossws-framework/${repository.id}"/> + <mkdir dir="${jboss.repository.dir}/lib"/> + <copy file="${framework.target.dir}/jbossws-framework-${version.id}.jar" tofile="${jboss.repository.dir}//lib/jbossws-framework.jar" overwrite="true"/> + <copy file="${framework.target.dir}/jbossws-framework-${version.id}-sources.jar" tofile="${jboss.repository.dir}/lib/jbossws-framework-src.jar" overwrite="true"/> + <copy file="${framework.target.dir}/jbossws-framework-${version.id}-scripts.zip" tofile="${jboss.repository.dir}/lib/jbossws-framework-scripts.zip" overwrite="true"/> + <copy file="${framework.target.dir}/etc/component-info.xml" tofile="${jboss.repository.dir}/component-info.xml" overwrite="true"/> </target> <!-- ================================================================== --> Property changes on: framework/trunk/framework ___________________________________________________________________ Name: svn:ignore + target Added: framework/trunk/framework/pom.xml =================================================================== --- framework/trunk/framework/pom.xml (rev 0) +++ framework/trunk/framework/pom.xml 2008-04-13 19:49:08 UTC (rev 6401) @@ -0,0 +1,93 @@ +<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 - Framework</name> + <artifactId>jbossws-framework</artifactId> + <packaging>jar</packaging> + + <parent> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-framework-parent</artifactId> + <version>3.0.2-SNAPSHOT</version> + </parent> + + <!-- Properties --> + <properties> + <jbossws-common>3.0.0-SNAPSHOT</jbossws-common> + <jbossws-spi>3.0.0-SNAPSHOT</jbossws-spi> + </properties> + + <!-- Dependencies --> + <dependencies> + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>jsr250-api</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>javax.xml</groupId> + <artifactId>jaxrpc-api</artifactId> + <version>1.1</version> + </dependency> + <dependency> + <groupId>javax.xml.soap</groupId> + <artifactId>saaj-api</artifactId> + <version>1.3</version> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-common</artifactId> + <version>${jbossws-common}</version> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-spi</artifactId> + <version>${jbossws-spi}</version> + </dependency> + <dependency> + <groupId>wsdl4j</groupId> + <artifactId>wsdl4j</artifactId> + <version>1.6.1</version> + </dependency> + </dependencies> + + <!-- Plugins --> + <build> + <resources> + <resource> + <targetPath>../etc</targetPath> + <directory>src/main/etc</directory> + <filtering>true</filtering> + </resource> + </resources> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <descriptors> + <descriptor>src/main/assembly/src.xml</descriptor> + </descriptors> + </configuration> + </plugin> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifest> + <addDefaultImplementationEntries>true</addDefaultImplementationEntries> + </manifest> + </archive> + </configuration> + </plugin> + </plugins> + </build> + +</project> Property changes on: framework/trunk/framework/pom.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: framework/trunk/framework/src (from rev 6380, framework/trunk/src) Copied: framework/trunk/framework/src/main (from rev 6400, framework/trunk/src/main) Added: framework/trunk/framework/src/main/assembly/src.xml =================================================================== --- framework/trunk/framework/src/main/assembly/src.xml (rev 0) +++ framework/trunk/framework/src/main/assembly/src.xml 2008-04-13 19:49:08 UTC (rev 6401) @@ -0,0 +1,18 @@ +<assembly 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/xsd/assembly-1.1.0-SNAPSHOT.xsd"> + <id>scripts</id> + <formats> + <format>zip</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <fileSets> + <fileSet> + <directory>src/main/etc</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>*.bat</include> + <include>*.sh</include> + </includes> + </fileSet> + </fileSets> +</assembly> \ No newline at end of file Property changes on: framework/trunk/framework/src/main/assembly/src.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: framework/trunk/hudson/build-hudson.xml =================================================================== --- framework/trunk/hudson/build-hudson.xml (rev 0) +++ framework/trunk/hudson/build-hudson.xml 2008-04-13 19:49:08 UTC (rev 6401) @@ -0,0 +1,170 @@ +<?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> + + <target name="init-hudson" depends="init"> + + <property name="hudson.tomcat" value="${hudson.root}/jbossws-hudson-${version.id}/apache-tomcat"/> + <property name="hudson.home" value="${hudson.root}/jbossws-hudson-${version.id}/hudson-home"/> + <echo/> + <echo message="hudson.root = ${hudson.root}"/> + <echo message="hudson.home = ${hudson.home}"/> + <echo/> + + <available file="${hudson.root}" property="hudson.root.available"/> + <available file="${hudson.tomcat}" property="hudson.tomcat.available"/> + <fail message="Hudson root not available" unless="hudson.root.available"/> + + <property name="hudson.username.${hudson.username}" value="true"/> + <fail message="Cannot use default hudson username: ${hudson.username}" if="hudson.username.changeme"/> + <property name="hudson.password.${hudson.password}" value="true"/> + <fail message="Cannot use default hudson password: ${hudson.password}" if="hudson.password.changeme"/> + + <property name="thirdparty.dir" value="${framework.target.dir}/thirdparty"/> + <mkdir dir="${thirdparty.dir}"/> + + </target> + + <!-- + Setup the Hudson Tomcat instance + --> + <target name="hudson-tomcat-setup" depends="init-hudson" unless="hudson.tomcat.available"> + + <get src="${jboss.repository}/apache-tomcat/${apache-tomcat}/lib/apache-tomcat.zip" dest="${thirdparty.dir}/apache-tomcat.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-hudson/${sun-hudson}/lib/hudson.war" dest="${thirdparty.dir}/hudson.war" usetimestamp="true" verbose="true"/> + + <mkdir dir="${hudson.root}"/> + <unzip src="${thirdparty.dir}/apache-tomcat.zip" dest="${hudson.root}"/> + <move file="${hudson.root}/apache-tomcat-${apache-tomcat}" tofile="${hudson.tomcat}"/> + <chmod perm="+x"> + <fileset dir="${hudson.tomcat}/bin"> + <include name="*.sh"/> + </fileset> + </chmod> + + <!-- Configure Tomcat --> + <copy todir="${hudson.tomcat}/webapps" file="${thirdparty.dir}/hudson.war"/> + <copy todir="${hudson.tomcat}" overwrite="true"> + <fileset dir="${framework.dir}/hudson/apache-tomcat"> + <include name="**/*.xml"/> + </fileset> + <filterset> + <filtersfile file="${framework.dir}/ant.properties"/> + <filter token="hudson.home" value="${hudson.home}"/> + </filterset> + </copy> + </target> + + <!-- + Update the Hudson version + --> + <target name="hudson-update" depends="init-hudson"> + + <get src="${jboss.repository}/sun-hudson/${sun-hudson}/lib/hudson.war" dest="${thirdparty.dir}/hudson.war" usetimestamp="false" verbose="true"/> + + <delete dir="${hudson.tomcat}/webapps/hudson"/> + <copy todir="${hudson.tomcat}/webapps" file="${thirdparty.dir}/hudson.war"/> + </target> + + <!-- + Setup the Hudson QA environment + --> + <target name="hudson-setup" depends="init-hudson,hudson-tomcat-setup" + description="Setup the Hudson QA environment"> + + <!-- get the svn url --> + <exec dir="${framework.dir}" executable="svn" failonerror="true" output="${framework.target.dir}/svn-info.xml"> + <arg line="info"/> + <arg line="--xml"/> + </exec> + <xmlproperty file="${framework.target.dir}/svn-info.xml"/> + <property name="hudson.framework.url" value="${info.entry.url}"/> + + <!-- Configure Hudson --> + <copy todir="${hudson.home}" overwrite="true"> + <fileset dir="${framework.dir}/hudson/hudson-home"> + <include name="jobs/*/config.xml"/> + <include name="users/*/config.xml"/> + <include name="*.xml"/> + </fileset> + <filterset> + <filter token="hudson.framework.url" value="${hudson.framework.url}"/> + <filter token="hudson.home" value="${hudson.home}"/> + <filter token="version.id" value="${version.id}"/> + <filtersfile file="${framework.dir}/ant.properties"/> + </filterset> + </copy> + <chmod perm="g+w"> + <fileset dir="${hudson.home}"> + <include name="jobs/*/config.xml"/> + <include name="users/*/config.xml"/> + <include name="*.xml"/> + </fileset> + </chmod> + + <echo/> + <echo message="*************************************"/> + <echo message="* Hudson setup successfully *"/> + <echo message="* ant hudson-start *"/> + <echo message="*************************************"/> + <echo/> + + </target> + + <target name="hudson-stop" depends="init-hudson" description="Stops the Hudson QA environment"> + + <exec executable="${hudson.tomcat}/bin/catalina.sh" failonerror="true"> + <arg line="stop"/> + </exec> + + <echo/> + <echo message="*************************************"/> + <echo message="* Hudson stopped successfully *"/> + <echo message="* ant hudson-start *"/> + <echo message="*************************************"/> + <echo/> + + </target> + + <target name="hudson-start" depends="init-hudson" description="Start the Hudson QA environment"> + + <property environment="env"/> + <fail message="unset JBOSS_REPOSITORY=${env.JBOSS_REPOSITORY}" if="env.JBOSS_REPOSITORY"/> + + <!-- When working with group-access files and directories, it is common to use 'umask 2' + <exec executable="umask"> + <arg value="2"/> + </exec> + --> + + <exec executable="${hudson.tomcat}/bin/catalina.sh" failonerror="true" output="${framework.target.dir}/hudson.log"> + <env key="CATALINA_OPTS" value="-Xmx512m -Djava.awt.headless=true"/> + <arg line="start"/> + </exec> + <chmod perm="g+w"> + <fileset dir="${hudson.tomcat}"> + <include name="logs/**"/> + </fileset> + </chmod> + + <echo/> + <echo message="*************************************"/> + <echo message="* Hudson started successfully *"/> + <echo message="* http://localhost:${hudson.http.port}/hudson *"/> + <echo message="*************************************"/> + <echo/> + + </target> + +</project> Property changes on: framework/trunk/hudson/build-hudson.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: framework/trunk/pom.xml =================================================================== --- framework/trunk/pom.xml 2008-04-13 17:52:18 UTC (rev 6400) +++ framework/trunk/pom.xml 2008-04-13 19:49:08 UTC (rev 6401) @@ -1,52 +1,20 @@ <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 - Framework Parent</name> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-framework</artifactId> - <packaging>jar</packaging> + <artifactId>jbossws-framework-parent</artifactId> + <packaging>pom</packaging> + <version>3.0.2-SNAPSHOT</version> - <name>JBoss Web Services - Framework</name> + <organization> <name>JBoss, a division of Red Hat</name> <url>http://www.jboss.org</url> </organization> <url>http://maven.apache.org</url> - <!-- Properties --> - <properties> - <jbossws-common>3.0.0-SNAPSHOT</jbossws-common> - <jbossws-spi>3.0.0-SNAPSHOT</jbossws-spi> - </properties> - - <!-- Dependencies --> - <dependencies> - <dependency> - <groupId>javax.annotation</groupId> - <artifactId>jsr250-api</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>javax.xml</groupId> - <artifactId>jaxrpc-api</artifactId> - <version>1.1</version> - </dependency> - <dependency> - <groupId>javax.xml.soap</groupId> - <artifactId>saaj-api</artifactId> - <version>1.3</version> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-common</artifactId> - <version>${jbossws-common}</version> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-spi</artifactId> - <version>${jbossws-spi}</version> - </dependency> - </dependencies> - <!-- Parent --> <parent> <groupId>org.jboss</groupId> @@ -54,36 +22,9 @@ <version>3</version> </parent> - <!-- Plugins --> - <build> - <resources> - <resource> - <targetPath>../etc</targetPath> - <directory>src/main/etc</directory> - <filtering>true</filtering> - </resource> - </resources> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </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> + <!-- Modules --> + <modules> + <module>framework</module> + </modules> </project>