[jboss-cvs] JBossAS SVN: r87831 - in trunk: tools/etc/buildmagic and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Apr 24 17:37:33 EDT 2009
Author: pgier
Date: 2009-04-24 17:37:33 -0400 (Fri, 24 Apr 2009)
New Revision: 87831
Modified:
trunk/build/build-distr.xml
trunk/build/build.xml
trunk/tools/etc/buildmagic/modules.ent
trunk/varia/build-sars.xml
trunk/varia/pom.xml
Log:
[JBBUILD-520] Remove intermediate build directory for varia.
Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml 2009-04-24 20:52:45 UTC (rev 87830)
+++ trunk/build/build-distr.xml 2009-04-24 21:37:33 UTC (rev 87831)
@@ -884,23 +884,24 @@
<target name="_module-varia-most">
<property name="_module.name" value="varia" override="true"/>
- <property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
+ <property name="_module.output" override="true" value="${project.root}/${_module.name}/target"/>
<!-- Copy the generated libraries -->
<mkdir dir="${install.all.lib}"/>
<copy todir="${install.all.lib}" filtering="no">
- <fileset dir="${_module.output}/lib">
- <include name="mail-plugin.jar"/>
- <include name="scheduler-plugin.jar"/>
- <include name="scheduler-plugin-example.jar"/>
- <include name="hsqldb.jar"/>
- <include name="hsqldb-plugin.jar"/>
- <include name="autonumber-plugin.jar"/>
- <include name="properties-plugin.jar"/>
- <include name="jboss-bindingservice.jar"/>
- <include name="jboss-monitoring.jar"/>
- <include name="jboss-srp.jar"/>
+ <fileset dir="${_module.output}">
+ <include name="jboss-as-varia-mail-plugin.jar"/>
+ <include name="jboss-as-varia-scheduler-plugin.jar"/>
+ <include name="jboss-as-varia-scheduler-plugin-example.jar"/>
+ <include name="jboss-as-varia-hsqldb.jar"/>
+ <include name="jboss-as-varia-hsqldb-plugin.jar"/>
+ <include name="jboss-as-varia-autonumber-plugin.jar"/>
+ <include name="jboss-as-varia-properties-plugin.jar"/>
+ <include name="jboss-as-varia-jboss-bindingservice.jar"/>
+ <include name="jboss-as-varia-jboss-monitoring.jar"/>
+ <include name="jboss-as-varia-jboss-srp.jar"/>
</fileset>
+ <mapper type="glob" from="jboss-as-varia-*.jar" to="*.jar"/>
</copy>
<!-- Copy to docs/examples -->
@@ -911,18 +912,19 @@
<include name="jboss-bindings.xml"/>
</fileset>
-->
- <fileset dir="${_module.output}/lib">
- <include name="derby-plugin.jar"/>
- <include name="threaddump.war"/>
+ <fileset dir="${_module.output}">
+ <include name="jboss-as-varia-derby-plugin.jar"/>
+ <include name="jboss-as-varia-threaddump.war"/>
</fileset>
+ <mapper type="glob" from="jboss-as-varia-*" to="*"/>
</copy>
<mkdir dir="${install.examples}/jmx/persistent-service.sar"/>
- <unjar src="${_module.output}/lib/persistent-service.sar" dest="${install.examples}/jmx/persistent-service.sar"/>
+ <unjar src="${_module.output}/persistent-service.sar" dest="${install.examples}/jmx/persistent-service.sar"/>
<mkdir dir="${install.examples.varia}/deployment-service"/>
<copy todir="${install.examples.varia}/deployment-service">
- <fileset dir="${_module.output}/lib">
+ <fileset dir="${_module.output}/">
<include name="deployment-service.sar"/>
</fileset>
<fileset dir="${_module.output}/resources/services/deployment">
@@ -932,7 +934,7 @@
<!-- MBean Configurator sar for setting mbean attributes when registered -->
<mkdir dir="${install.examples}/jmx/mbean-configurator.sar"/>
- <unjar src="${_module.output}/lib/mbean-configurator.sar" dest="${install.examples}/jmx/mbean-configurator.sar"/>
+ <unjar src="${_module.output}/mbean-configurator.sar" dest="${install.examples}/jmx/mbean-configurator.sar"/>
<!-- Client jars -->
<mkdir dir="${install.client}"/>
@@ -940,10 +942,11 @@
<fileset dir="${apache.scout.lib}">
<include name="scout.jar"/>
</fileset>
- <fileset dir="${_module.output}/lib">
- <include name="jbossjmx-ant.jar"/>
- <include name="jboss-srp-client.jar"/>
+ <fileset dir="${_module.output}">
+ <include name="jboss-as-varia-jbossjmx-ant.jar"/>
+ <include name="jboss-as-varia-jboss-srp-client.jar"/>
</fileset>
+ <mapper type="glob" from="jboss-as-varia-*.jar" to="*.jar"/>
</copy>
<!-- Copy thirdparty code -->
@@ -972,7 +975,7 @@
<!-- copy snmp-adaptor.sar unpacked to deploy -->
<!-- and the used joesnmp.jar library to lib -->
<mkdir dir="${install.server}/all/deploy/snmp-adaptor.sar"/>
- <unjar src="${_module.output}/lib/snmp-adaptor.sar" dest="${install.server}/all/deploy/snmp-adaptor.sar"/>
+ <unjar src="${_module.output}/snmp-adaptor.sar" dest="${install.server}/all/deploy/snmp-adaptor.sar"/>
<copy todir="${install.server}/all/lib" filtering="no">
<fileset dir="${opennms.joesnmp.lib}">
<include name="joesnmp.jar"/>
@@ -981,7 +984,7 @@
<!-- Include the JMX console war unpacked -->
<mkdir dir="${install.server}/all/deploy/jmx-console.war"/>
- <unjar src="${_module.output}/lib/jmx-console.war" dest="${install.server}/all/deploy/jmx-console.war"/>
+ <unjar src="${_module.output}/jboss-as-varia-jmx-console.war" dest="${install.server}/all/deploy/jmx-console.war"/>
<!-- Include the juddi sar unpacked -->
<mkdir dir="${install.server}/all/deploy/juddi-service.sar"/>
@@ -1006,22 +1009,24 @@
<!-- Include the HTTP invoker service unpacked -->
<mkdir dir="${install.server}/all/deploy/httpha-invoker.sar"/>
- <unjar src="${_module.output}/lib/httpha-invoker.sar" dest="${install.server}/all/deploy/httpha-invoker.sar"/>
+ <unjar src="${_module.output}/httpha-invoker.sar" dest="${install.server}/all/deploy/httpha-invoker.sar"/>
<!-- copy the ant jmx client -->
<mkdir dir="${install.client}"/>
<copy todir="${install.client}" filtering="no">
- <fileset dir="${_module.output}/lib">
- <include name="jbossjmx-ant.jar"/>
+ <fileset dir="${_module.output}">
+ <include name="jboss-as-varia-jbossjmx-ant.jar"/>
</fileset>
+ <mapper type="glob" from="jboss-as-varia-*.jar" to="*.jar"/>
</copy>
<!-- copy the netboot war tool -->
<mkdir dir="${install.examples.netboot}"/>
<copy todir="${install.examples.netboot}" filtering="no">
- <fileset dir="${_module.output}/lib">
- <include name="netboot.war"/>
+ <fileset dir="${_module.output}">
+ <include name="jboss-as-varia-netboot.war"/>
</fileset>
+ <mapper type="glob" from="jboss-as-varia-*.jar" to="*.jar"/>
</copy>
<!-- copy the bsh.deployer and its associated beanshell lib from thirdparty -->
@@ -1048,7 +1053,8 @@
</copy>
<!-- copy the jboss-monitoring JAR -->
- <copy file="${project.root}/varia/output/lib/jboss-monitoring.jar" todir="${install.server}/all/lib"/>
+ <copy file="${_module.output}/jboss-as-varia-jboss-monitoring.jar"
+ tofile="${install.server}/all/lib/jboss-monitoring.jar"/>
<!-- copy the binding-manager sample file and JAR
<copy file="${project.root}/varia/output/lib/bindingservice-plugin.jar" todir="${install.server}/all/lib"/>
@@ -1070,9 +1076,10 @@
<!-- copy the logging-monitor service to examples -->
<mkdir dir="${install.examples}/jmx/logging-monitor/lib"/>
<copy todir="${install.examples}/jmx/logging-monitor/lib" filtering="no">
- <fileset dir="${_module.output}/lib">
- <include name="logging-monitor.jar"/>
+ <fileset dir="${_module.output}/">
+ <include name="jboss-as-varia-logging-monitor.jar"/>
</fileset>
+ <mapper type="glob" from="jboss-as-varia-*.jar" to="*.jar"/>
</copy>
<copy todir="${install.examples}/jmx/logging-monitor" filtering="no">
<fileset dir="${_module.output}/resources/services/loggingmonitor"/>
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2009-04-24 20:52:45 UTC (rev 87830)
+++ trunk/build/build.xml 2009-04-24 21:37:33 UTC (rev 87831)
@@ -711,9 +711,9 @@
</copy>
<copy tofile="${install.default}/deployers/clustering-deployer-jboss-beans.xml"
- file="${project.root}/cluster/output/etc/clustering-deployer-jboss-beans-non-clustered.xml"/>
+ file="${project.root}/cluster/target/etc/clustering-deployer-jboss-beans-non-clustered.xml"/>
- <unjar src="${project.root}/varia/output/lib/http-invoker.sar"
+ <unjar src="${project.root}/varia/target/http-invoker.sar"
dest="${install.default}/deploy/http-invoker.sar"/>
<!-- Build server/minimal manually -->
Modified: trunk/tools/etc/buildmagic/modules.ent
===================================================================
--- trunk/tools/etc/buildmagic/modules.ent 2009-04-24 20:52:45 UTC (rev 87830)
+++ trunk/tools/etc/buildmagic/modules.ent 2009-04-24 21:37:33 UTC (rev 87831)
@@ -138,10 +138,10 @@
</path>
<!-- Varia -->
-<property name="jboss.varia.root" value="${project.root}/varia/output"/>
-<property name="jboss.varia.lib" value="${jboss.varia.root}/lib"/>
+<property name="jboss.varia.root" value="${project.root}/varia"/>
+<property name="jboss.varia.lib" value="${jboss.varia.root}/target"/>
<path id="jboss.varia.classpath">
- <pathelement path="${project.root}/varia/target/classes"/>
+ <pathelement path="${jboss.varia.lib}/classes"/>
</path>
<!-- Webservices -->
Modified: trunk/varia/build-sars.xml
===================================================================
--- trunk/varia/build-sars.xml 2009-04-24 20:52:45 UTC (rev 87830)
+++ trunk/varia/build-sars.xml 2009-04-24 21:37:33 UTC (rev 87831)
@@ -24,10 +24,10 @@
<target name="build-sars" description="create sar files" depends="init">
- <property name="build.lib" location="output/lib"/>
+ <property name="build.lib" location="target"/>
<property name="build.classes" location="target/classes"/>
- <property name="build.etc" location="output/etc"/>
- <property name="build.resources" location="output/resources"/>
+ <property name="build.etc" location="target/etc"/>
+ <property name="build.resources" location="target/resources"/>
<!-- deployment-service.sar -->
<jar jarfile="${build.lib}/deployment-service.sar"
@@ -126,7 +126,7 @@
<!-- build deployers -->
- <property name="build.deployers" location="output/deployers"/>
+ <property name="build.deployers" location="target/deployers"/>
<property name="source.resources" location="src/resources"/>
<mkdir dir="${build.deployers}/bsh.deployer"/>
Modified: trunk/varia/pom.xml
===================================================================
--- trunk/varia/pom.xml 2009-04-24 20:52:45 UTC (rev 87830)
+++ trunk/varia/pom.xml 2009-04-24 21:37:33 UTC (rev 87831)
@@ -1,10 +1,12 @@
<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">
+
<parent>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-parent</artifactId>
<version>6.0.0-SNAPSHOT</version>
</parent>
+
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-varia</artifactId>
@@ -12,7 +14,9 @@
<name>JBoss Application Server Varia</name>
<url>http://www.jboss.org/jbossas</url>
<description>JBoss Application Server (varia module)</description>
+
<build>
+ <finalName>${artifactId}</finalName>
<sourceDirectory>src/main</sourceDirectory>
<plugins>
<plugin>
@@ -84,31 +88,28 @@
<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">
+ <mkdir dir="target/etc"/>
+ <copy todir="target/etc" filtering="yes">
<fileset dir="src/etc">
<include name="**"/>
</fileset>
</copy>
- <mkdir dir="output/resources"/>
- <copy todir="output/resources" filtering="yes">
+ <mkdir dir="target/resources"/>
+ <copy todir="target/resources" filtering="yes">
<fileset dir="src/resources">
<include name="**"/>
<exclude name="jmx/html/images/**"/>
</fileset>
</copy>
- <copy todir="output/resources" filtering="no">
+ <copy todir="target/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"/>
+ <!--<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"/>
@@ -154,14 +155,15 @@
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"
+ <!--<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"/>
+ tofile="${output.lib}/threaddump.war"/>-->
<!-- build sars and deployers -->
<ant antfile="build-sars.xml" target="build-sars"/>
@@ -171,26 +173,6 @@
</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>
More information about the jboss-cvs-commits
mailing list