[jboss-cvs] JBossAS SVN: r85197 - in trunk: build and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Mar 3 17:39:59 EST 2009
Author: pgier
Date: 2009-03-03 17:39:59 -0500 (Tue, 03 Mar 2009)
New Revision: 85197
Added:
trunk/varia/build-sars.xml
Modified:
trunk/build/build.xml
trunk/pom.xml
trunk/tools/etc/buildmagic/modules.ent
trunk/varia/pom.xml
trunk/varia/src/assembly/threaddump.xml
Log:
[JBBUILD-506] Switch varia to maven (2nd attempt).
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2009-03-03 21:36:19 UTC (rev 85196)
+++ trunk/build/build.xml 2009-03-03 22:39:59 UTC (rev 85197)
@@ -110,7 +110,7 @@
<module name="system-jmx" externalBuild="true"/>
<module name="testsuite"/>
<module name="tomcat"/>
- <module name="varia"/>
+ <module name="varia" externalBuild="true"/>
<module name="webservices"/>
<!-- Module groups -->
@@ -950,10 +950,10 @@
<target name="main" depends="most"
description="Executes the default target (most)."/>
- <target name="all" depends="createthirdparty, modules-all, install"
+ <target name="all" depends="createthirdparty, maven-install, modules-all, install"
description="Executes all modules and builds everything."/>
- <target name="most" depends="maven-install, createthirdparty, modules-most, install"
+ <target name="most" depends="createthirdparty, maven-install, modules-most, install"
description="Executes all modules and builds most everything."/>
<target name="release" depends="most" />
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-03-03 21:36:19 UTC (rev 85196)
+++ trunk/pom.xml 2009-03-03 22:39:59 UTC (rev 85197)
@@ -411,6 +411,7 @@
<module>jmx-remoting</module>
<module>messaging</module>
<module>cluster</module>
+ <module>varia</module>
</modules>
</profile>
Modified: trunk/tools/etc/buildmagic/modules.ent
===================================================================
--- trunk/tools/etc/buildmagic/modules.ent 2009-03-03 21:36:19 UTC (rev 85196)
+++ trunk/tools/etc/buildmagic/modules.ent 2009-03-03 22:39:59 UTC (rev 85197)
@@ -194,7 +194,7 @@
<property name="jboss.varia.root" value="${project.root}/varia/output"/>
<property name="jboss.varia.lib" value="${jboss.varia.root}/lib"/>
<path id="jboss.varia.classpath">
- <pathelement path="${jboss.varia.root}/classes"/>
+ <pathelement path="${project.root}/varia/target/classes"/>
</path>
<!-- Webservices -->
Added: trunk/varia/build-sars.xml
===================================================================
--- trunk/varia/build-sars.xml (rev 0)
+++ trunk/varia/build-sars.xml 2009-03-03 22:39:59 UTC (rev 85197)
@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE project [
+ <!ENTITY libraries SYSTEM "../thirdparty/libraries.ent">
+]>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, The Home of Professional Open Source -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+
+<!-- $Id$ -->
+
+<project default="build-sars" name="JBoss/Varia">
+
+ <target name="init">
+ <property name="project.thirdparty" location="../thirdparty"/>
+ &libraries;
+ </target>
+
+ <target name="build-sars" description="create sar files" depends="init">
+
+ <property name="build.lib" location="output/lib"/>
+ <property name="build.classes" location="target/classes"/>
+ <property name="build.etc" location="output/etc"/>
+ <property name="build.resources" location="output/resources"/>
+
+ <!-- deployment-service.sar -->
+ <jar jarfile="${build.lib}/deployment-service.sar"
+ manifest="${build.etc}/default.mf">
+ <fileset dir="${build.resources}/services/deployment">
+ <include name="META-INF/**"/>
+ </fileset>
+ <fileset dir="${build.lib}">
+ <include name="deployment-service.jar"/>
+ </fileset>
+ <fileset dir="${apache.collections.lib}">
+ <include name="commons-collections.jar"/>
+ </fileset>
+ <fileset dir="${apache.velocity.lib}">
+ <include name="velocity.jar"/>
+ </fileset>
+ </jar>
+
+ <!-- foe-deployer.sar -->
+ <jar jarfile="${build.lib}/foe-deployer-3.2.sar"
+ manifest="${build.etc}/default.mf">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/varia/deployment/Foe**"/>
+ <include name="org/jboss/varia/deployment/convertor/**"/>
+ </fileset>
+ <fileset dir="${build.resources}/deployment">
+ <include name="META-INF/**"/>
+ <include name="resources/6.1/**"/>
+ </fileset>
+ <fileset dir="${build.etc}">
+ <include name="foe-deployer-service.xml"/>
+ </fileset>
+ </jar>
+
+ <!-- persistent-service.sar -->
+ <!-- demo service for docs/examples -->
+ <jar jarfile="${build.lib}/persistent-service.sar"
+ manifest="${build.etc}/default.mf">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/jmx/examples/persistence/**"/>
+ </fileset>
+ <fileset dir="${build.resources}/jmx/examples/persistent-service"/>
+ </jar>
+
+ <!-- mbean-configurator-service.sar -->
+ <!-- demo service for docs/examples -->
+ <!-- shows how to set attributes on registered mbean from file -->
+ <jar jarfile="${build.lib}/mbean-configurator.sar"
+ manifest="${build.etc}/default.mf">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/jmx/examples/configuration/**"/>
+ </fileset>
+ <fileset dir="${build.resources}/jmx/examples/mbean-configurator-service"/>
+ </jar>
+
+ <!-- http-invoker.sar + war -->
+ <zip destfile="${build.lib}/http-invoker.sar">
+ <zipfileset dir="${build.resources}/services/invoker/http"
+ prefix="invoker.war/WEB-INF">
+ <include name="jboss-web.xml" />
+ <include name="web.xml" />
+ </zipfileset>
+ <zipfileset dir="${build.classes}" prefix="invoker.war/WEB-INF/classes">
+ <include name="org/jboss/invocation/http/**"/>
+ </zipfileset>
+ <zipfileset dir="${build.resources}/services/invoker/http"
+ prefix="META-INF">
+ <include name="jboss-service.xml" />
+ </zipfileset>
+ </zip>
+
+ <!-- httpha-invoker.sar + war -->
+ <zip destfile="${build.lib}/httpha-invoker.sar">
+ <zipfileset dir="${build.resources}/services/invoker/httpha"
+ prefix="invoker.war/WEB-INF">
+ <include name="jboss-web.xml" />
+ <include name="web.xml" />
+ </zipfileset>
+ <zipfileset dir="${build.classes}" prefix="invoker.war/WEB-INF/classes">
+ <include name="org/jboss/invocation/http/**"/>
+ </zipfileset>
+ <zipfileset dir="${build.resources}/services/invoker/httpha"
+ prefix="META-INF">
+ <include name="jboss-service.xml" />
+ </zipfileset>
+ </zip>
+
+ <!-- snmp-adaptor.sar containing snmp-adaptor.jar -->
+ <jar jarfile="${build.lib}/snmp-adaptor.sar"
+ manifest="${build.etc}/default.mf">
+ <fileset dir="${build.resources}/services/snmp/deploy"/>
+ <fileset dir="${build.lib}">
+ <include name="snmp-adaptor.jar"/>
+ </fileset>
+ </jar>
+
+ <!-- build deployers -->
+
+ <property name="build.deployers" location="output/deployers"/>
+ <property name="source.resources" location="src/resources"/>
+
+ <mkdir dir="${build.deployers}/bsh.deployer"/>
+ <mkdir dir="${build.deployers}/bsh.deployer/META-INF"/>
+
+ <jar jarfile="${build.deployers}/bsh.deployer/bsh-deployer.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/varia/deployment/BeanShell**"/>
+ <include name="org/jboss/varia/deployment/Script**"/>
+ <include name="org/jboss/varia/deployment/Test**"/>
+ <include name="org/jboss/varia/deployment/Legacy**"/>
+ </fileset>
+ </jar>
+
+ <copy todir="${build.deployers}/bsh.deployer/META-INF">
+ <fileset file="${source.resources}/beanshell/bsh-deployers-jboss-beans.xml"/>
+ </copy>
+
+ <!-- seam.deployer -->
+ <mkdir dir="${build.deployers}/seam.deployer"/>
+ <mkdir dir="${build.deployers}/seam.deployer/META-INF"/>
+
+ <copy todir="${build.deployers}/seam.deployer/META-INF">
+ <fileset dir="${source.resources}/seam">
+ <include name="*.xml"/>
+ </fileset>
+ </copy>
+
+ <copy todir="${build.deployers}/seam.deployer">
+ <fileset dir="${org.jboss.seam.integration.lib}">
+ <include name="jboss-seam-int-microcontainer.jar"/>
+ </fileset>
+ </copy>
+
+ <!-- jboss-bean.deployer -->
+ <mkdir dir="${build.lib}/kernel/jboss-bean.deployer"/>
+ <copy todir="${build.lib}/kernel/jboss-bean.deployer" filtering="no">
+ <fileset file="${build.lib}/jboss-bean-deployer.jar"/>
+ <fileset dir="${jboss.microcontainer.lib}">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="${jboss.microcontainer.lib}">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="${jboss.microcontainer.lib}">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="${build.resources}/kernel">
+ <include name="**/*.xml"/>
+ </fileset>
+ </copy>
+
+ </target>
+
+</project>
\ No newline at end of file
Property changes on: trunk/varia/build-sars.xml
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: trunk/varia/pom.xml
===================================================================
--- trunk/varia/pom.xml 2009-03-03 21:36:19 UTC (rev 85196)
+++ trunk/varia/pom.xml 2009-03-03 22:39:59 UTC (rev 85197)
@@ -14,11 +14,6 @@
<description>JBoss Application Server (varia module)</description>
<build>
<sourceDirectory>src/main</sourceDirectory>
- <resources>
- <resource>
- <directory>src/resources</directory>
- </resource>
- </resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -37,16 +32,181 @@
<descriptorSourceDirectory>src/assembly</descriptorSourceDirectory>
</configuration>
</plugin>
- </plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>create-output</id>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <tasks>
+
+ <tstamp>
+ <format property="build.number" pattern="yyyyMMddHHmm"/>
+ <format property="YEAR" pattern="yyyy"/>
+ </tstamp>
+ <property name="build.id" value="${build.number}"/>
+
+ <property file="../tools/etc/buildmagic/version.properties"/>
+
+ <filter filtersfile="../tools/etc/buildmagic/version.properties"/>
+ <filter token="version.cvstag" value="JBoss_${version.major}_${version.minor}_${version.revision}_${version.tag}"/>
+ <filter token="build.number" value="${build.number}"/>
+ <filter token="build.id" value="${build.id}"/>
+ <filter token="DSTAMP" value="${DSTAMP}"/>
+ <filter token="TSTAMP" value="${TSTAMP}"/>
+ <filter token="TODAY" value="${TODAY}"/>
+
+ <filter token="java.version" value="${java.version}"/>
+ <filter token="java.vendor" value="${java.vendor}"/>
+ <filter token="java.vm.specification.version" value="${java.vm.specification.version}"/>
+ <filter token="java.vm.version" value="${java.vm.version}"/>
+ <filter token="java.vm.vendor" value="${java.vm.vendor}"/>
+ <filter token="java.vm.name" value="${java.vm.name}"/>
+ <filter token="java.vm.info" value="${java.vm.info}"/>
+ <filter token="java.specification.version" value="${java.specification.version}"/>
+ <filter token="java.class.version" value="${java.class.version}"/>
+
+ <filter token="os.name" value="${os.name}"/>
+ <filter token="os.arch" value="${os.arch}"/>
+ <filter token="os.version" value="${os.version}"/>
+
+ <filter token="specification.title" value="${project.artifactId}"/>
+ <filter token="specification.version" value="${project.version}"/>
+ <filter token="specification.vendor" value="${project.organization.name}"/>
+ <filter token="implementation.title" value="${project.name}"/>
+ <filter token="implementation.url" value="${project.url}"/>
+ <filter token="implementation.version" value="${project.version}"/>
+ <filter token="implementation.vendor" value="${project.organization.name}"/>
+ <filter token="implementation.vendor.id" value="${project.groupId}"/>
+
+ <mkdir dir="output/etc"/>
+ <copy todir="output/etc" filtering="yes">
+ <fileset dir="src/etc">
+ <include name="**"/>
+ </fileset>
+ </copy>
+
+ <mkdir dir="output/resources"/>
+ <copy todir="output/resources" filtering="yes">
+ <fileset dir="src/resources">
+ <include name="**"/>
+ <exclude name="jmx/html/images/**"/>
+ </fileset>
+ </copy>
+ <copy todir="output/resources" filtering="no">
+ <fileset dir="src/resources">
+ <include name="jmx/html/images/**"/>
+ </fileset>
+ </copy>
+
+ <!--<copy todir="output/resources/jmx/html/images"
+ file="src/resources/jmx/html/images/logo.gif"/>-->
+
+ <!-- Copy jars -->
+ <property name="output.lib" location="${basedir}/output/lib"/>
+ <mkdir dir="${output.lib}"/>
+ <copy file="target/${artifactId}-${version}-autonumber-plugin.jar"
+ tofile="${output.lib}/autonumber-plugin.jar"/>
+ <copy file="target/${artifactId}-${version}-counter-plugin.jar"
+ tofile="${output.lib}/counter-plugin.jar"/>
+ <copy file="target/${artifactId}-${version}-deployment-service.jar"
+ tofile="${output.lib}/deployment-service.jar"/>
+ <copy file="target/${artifactId}-${version}-derby-plugin.jar"
+ tofile="${output.lib}/derby-plugin.jar"/>
+ <copy file="target/${artifactId}-${version}-hsqldb.jar"
+ tofile="${output.lib}/hsqldb.jar"/>
+ <copy file="target/${artifactId}-${version}-hsqldb-plugin.jar"
+ tofile="${output.lib}/hsqldb-plugin.jar"/>
+ <copy file="target/${artifactId}-${version}-jboss-bean-deployer.jar"
+ tofile="${output.lib}/jboss-bean-deployer.jar"/>
+ <copy file="target/${artifactId}-${version}-jboss-bindingservice.jar"
+ tofile="${output.lib}/jboss-bindingservice.jar"/>
+ <copy file="target/${artifactId}-${version}-jbossjmx-ant.jar"
+ tofile="${output.lib}/jbossjmx-ant.jar"/>
+ <copy file="target/${artifactId}-${version}-jboss-monitoring.jar"
+ tofile="${output.lib}/jboss-monitoring.jar"/>
+ <copy file="target/${artifactId}-${version}-jboss-samlsso.jar"
+ tofile="${output.lib}/jboss-samlsso.jar"/>
+ <copy file="target/${artifactId}-${version}-jboss-srp.jar"
+ tofile="${output.lib}/jboss-srp.jar"/>
+ <copy file="target/${artifactId}-${version}-jboss-srp-client.jar"
+ tofile="${output.lib}/jboss-srp-client.jar"/>
+ <copy file="target/${artifactId}-${version}-logging-monitor.jar"
+ tofile="${output.lib}/logging-monitor.jar"/>
+ <copy file="target/${artifactId}-${version}-mail-plugin.jar"
+ tofile="${output.lib}/mail-plugin.jar"/>
+ <copy file="target/${artifactId}-${version}-process-plugin.jar"
+ tofile="${output.lib}/process-plugin.jar"/>
+ <copy file="target/${artifactId}-${version}-properties-plugin.jar"
+ tofile="${output.lib}/properties-plugin.jar"/>
+ <copy file="target/${artifactId}-${version}-scheduler-plugin.jar"
+ tofile="${output.lib}/scheduler-plugin.jar"/>
+ <copy file="target/${artifactId}-${version}-scheduler-plugin-example.jar"
+ tofile="${output.lib}/scheduler-plugin-example.jar"/>
+ <copy file="target/${artifactId}-${version}-snmp-adaptor.jar"
+ tofile="${output.lib}/snmp-adaptor.jar"/>
+ <copy file="target/${artifactId}-${version}-statscollector.jar"
+ tofile="${output.lib}/statscollector.jar"/>
+ <copy file="target/${artifactId}-${version}-xmlentitymgr.jar"
+ tofile="${output.lib}/xmlentitymgr.jar"/>
+
+ <!-- copy wars -->
+ <copy file="target/${artifactId}-${version}-jmx-console.war"
+ tofile="${output.lib}/jmx-console.war"/>
+ <copy file="target/${artifactId}-${version}-netboot.war"
+ tofile="${output.lib}/netboot.war"/>
+ <copy file="target/${artifactId}-${version}-threaddump.war"
+ tofile="${output.lib}/threaddump.war"/>
+
+ <!-- build sars and deployers -->
+ <ant antfile="build-sars.xml" target="build-sars"/>
+
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>clean-output</id>
+ <goals>
+ <goal>clean</goal>
+ </goals>
+ <phase>clean</phase>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>output</directory>
+ </fileset>
+ </filesets>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
+
<dependencies>
<!-- Compile (global dependencies) -->
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-bootstrap</artifactId>
+ <groupId>org.jboss.bootstrap</groupId>
+ <artifactId>jboss-bootstrap</artifactId>
</dependency>
<dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-ejb3</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>opensaml</groupId>
<artifactId>opensaml</artifactId>
</dependency>
Modified: trunk/varia/src/assembly/threaddump.xml
===================================================================
--- trunk/varia/src/assembly/threaddump.xml 2009-03-03 21:36:19 UTC (rev 85196)
+++ trunk/varia/src/assembly/threaddump.xml 2009-03-03 22:39:59 UTC (rev 85197)
@@ -15,7 +15,7 @@
<directory>src/resources/varia/threaddump</directory>
<outputDirectory>/</outputDirectory>
<excludes>
- <exclude>WEB-INF/web.xml</exclude>
+ <exclude>web.xml</exclude>
</excludes>
</fileSet>
<fileSet>
More information about the jboss-cvs-commits
mailing list