[jboss-cvs] JBossAS SVN: r87828 - in trunk: cluster and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Apr 24 15:08:59 EDT 2009
Author: pgier
Date: 2009-04-24 15:08:59 -0400 (Fri, 24 Apr 2009)
New Revision: 87828
Modified:
trunk/build/build-distr.xml
trunk/cluster/pom.xml
trunk/ejb3/pom.xml
trunk/messaging/pom.xml
trunk/tools/etc/buildmagic/modules.ent
Log:
[JBBUILD-520] Remove intermediate build directory for cluster, ejb3, messaging.
Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml 2009-04-24 18:47:30 UTC (rev 87827)
+++ trunk/build/build-distr.xml 2009-04-24 19:08:59 UTC (rev 87828)
@@ -129,7 +129,7 @@
<target name="_module-ejb3-most">
<property name="_module.name" value="ejb3" 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 todir="${install.server}/all/deploy" filtering="no">
<fileset dir="${_module.output}/resources">
@@ -141,7 +141,7 @@
</copy>
<copy todir="${install.server}/all/deployers" filtering="no">
- <fileset dir="${_module.output}/lib">
+ <fileset dir="${_module.output}">
<include name="ejb3.deployer/**"/>
</fileset>
</copy>
@@ -192,10 +192,10 @@
<!-- Copy across client jars -->
<mkdir dir="${install.client}"/>
+ <copy file="${_module.output}/jboss-as-ejb3-client.jar"
+ tofile="${install.client}/jboss-appclient.jar" filtering="no" />
+
<copy todir="${install.client}" filtering="no">
- <fileset dir="${_module.output}/lib">
- <include name="jboss-appclient.jar"/>
- </fileset>
<fileset dir="${hibernate.entitymanager.lib}">
<include name="ejb3-persistence.jar"/>
</fileset>
@@ -630,19 +630,20 @@
<target name="_module-messaging-most">
<property name="_module.name" value="messaging" 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"/>
<!--
jboss-messaging libraries, unscoped deployment, same for "all" and "default" configurations.
-->
<mkdir dir="${install.all.lib}"/>
+
+ <copy file="${_module.output}/jboss-as-messaging.jar"
+ tofile="${install.all.lib}/jboss-messaging-int.jar" filtering="no" />
+
<copy todir="${install.all.lib}" filtering="no">
<fileset dir="${jboss.messaging.lib}">
<include name="jboss-messaging.jar"/>
</fileset>
- <fileset dir="${_module.output}/lib">
- <include name="jboss-messaging-int.jar"/>
- </fileset>
</copy>
<!--
@@ -659,8 +660,8 @@
Generated client libraries, same for "all" and "default" configurations.
-->
<mkdir dir="${install.client}"/>
- <copy todir="${install.client}" filtering="no"
- file="${jboss.messaging.lib}/jboss-messaging-client.jar"/>
+ <copy file="${jboss.messaging.lib}/jboss-messaging-client.jar"
+ todir="${install.client}" filtering="no" />
<!--
Clustered Config, using HSQLDB (but not supposed to go into production mode, since clustering requires a shared DB)
@@ -802,23 +803,17 @@
<target name="_module-cluster-most">
<property name="_module.name" value="cluster" 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="jbossha.jar"/>
- </fileset>
- </copy>
+ <copy file="${_module.output}/jboss-as-cluster.jar"
+ tofile="${install.all.lib}/jbossha.jar" filtering="no" />
<!-- Copy the generated client libraries -->
<mkdir dir="${install.client}"/>
- <copy todir="${install.client}" filtering="no">
- <fileset dir="${_module.output}/lib">
- <include name="jboss-ha-legacy-client.jar"/>
- </fileset>
- </copy>
+ <copy file="${_module.output}/jboss-as-cluster-jboss-ha-legacy-client.jar"
+ tofile="${install.client}/jboss-ha-legacy-client.jar" filtering="no" />
<!-- Copy the deployers -->
<copy todir="${install.server}/all/deployers" filtering="no">
Modified: trunk/cluster/pom.xml
===================================================================
--- trunk/cluster/pom.xml 2009-04-24 18:47:30 UTC (rev 87827)
+++ trunk/cluster/pom.xml 2009-04-24 19:08:59 UTC (rev 87828)
@@ -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-cluster</artifactId>
@@ -12,7 +14,9 @@
<name>JBoss Application Server Cluster</name>
<url>http://www.jboss.org/jbossas</url>
<description>JBoss Application Server (cluster module)</description>
+
<build>
+ <finalName>${artifactId}</finalName>
<sourceDirectory>src/main</sourceDirectory>
<plugins>
<plugin>
@@ -91,20 +95,14 @@
<configuration>
<tasks>
- <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/lib"/>
- <copy file="target/${artifactId}-${version}.jar"
- tofile="output/lib/jbossha.jar"/>
- <copy file="target/${artifactId}-${version}-jboss-ha-legacy-client.jar"
- tofile="output/lib/jboss-ha-legacy-client.jar"/>
-
- <property name="build.resources.dir" location="output/resources"/>
+
+ <property name="build.resources.dir" location="target/resources"/>
<mkdir dir="${build.resources.dir}"/>
<!-- Build jgroups-channelfactory.sar -->
@@ -128,28 +126,9 @@
</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>
Modified: trunk/ejb3/pom.xml
===================================================================
--- trunk/ejb3/pom.xml 2009-04-24 18:47:30 UTC (rev 87827)
+++ trunk/ejb3/pom.xml 2009-04-24 19:08:59 UTC (rev 87828)
@@ -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-ejb3</artifactId>
@@ -14,6 +16,7 @@
<description>JBoss Application Server (ejb3 module)</description>
<build>
+ <finalName>${artifactId}</finalName>
<sourceDirectory>src/main</sourceDirectory>
<resources>
<resource>
@@ -50,52 +53,54 @@
<configuration>
<tasks>
- <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="**"/>
</fileset>
</copy>
- <property name="output.lib" location="output/lib"/>
+ <!--<property name="output.lib" location="target"/>
<mkdir dir="${output.lib}"/>
<copy file="target/${project.build.finalName}-client.jar"
tofile="${output.lib}/jboss-appclient.jar"/>
<copy file="target/${project.build.finalName}-deployer.jar"
tofile="${output.lib}/jboss-ejb3-deployer.jar"/>
<copy file="target/${project.build.finalName}-iiop.jar"
- tofile="${output.lib}/jboss-ejb3-iiop.jar"/>
+ tofile="${output.lib}/jboss-ejb3-iiop.jar"/>-->
- <unjar src="../thirdparty/jboss/jboss-ejb3-core/lib/jboss-ejb3-core.jar" dest="output/resources">
+ <unjar src="../thirdparty/jboss/jboss-ejb3-core/lib/jboss-ejb3-core.jar" dest="target/resources">
<patternset>
<include name="*.xml" />
<exclude name="META-INF/*.xml" />
<include name="META-INF/*.properties" />
</patternset>
</unjar>
- <mkdir dir="${output.lib}/ejb3.deployer"/>
- <copy todir="${output.lib}/ejb3.deployer">
- <fileset dir="${output.lib}">
- <include name="jboss-ejb3-deployer.jar"/>
- <include name="jboss-ejb3-iiop.jar"/>
+
+ <mkdir dir="target/ejb3.deployer"/>
+ <copy todir="target/ejb3.deployer">
+ <fileset dir="target">
+ <include name="jboss-as-ejb3-deployer.jar"/>
+ <include name="jboss-as-ejb3-iiop.jar"/>
</fileset>
- <fileset dir="output/resources">
+ <fileset dir="target/resources">
<include name="META-INF/ejb3-deployers-jboss-beans.xml"/>
<include name="META-INF/jpa-deployers-jboss-beans.xml"/>
</fileset>
- <fileset dir="output/resources">
+ <fileset dir="target/resources">
<include name="META-INF/persistence.properties"/>
</fileset>
</copy>
- <copy todir="${output.lib}">
- <fileset dir="output/resources">
+
+ <copy todir="target">
+ <fileset dir="target/resources">
<include name="ejb3-container-jboss-beans.xml"/>
<include name="ejb3-connectors-jboss-beans.xml"/>
<include name="ejb3-interceptors-aop.xml"/>
@@ -107,26 +112,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>
Modified: trunk/messaging/pom.xml
===================================================================
--- trunk/messaging/pom.xml 2009-04-24 18:47:30 UTC (rev 87827)
+++ trunk/messaging/pom.xml 2009-04-24 19:08:59 UTC (rev 87828)
@@ -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-messaging</artifactId>
@@ -12,7 +14,9 @@
<name>JBoss Application Server Messaging</name>
<url>http://www.jboss.org/jbossas</url>
<description>JBoss Application Server (messaging module)</description>
+
<build>
+ <finalName>${artifactId}</finalName>
<sourceDirectory>src/main</sourceDirectory>
<resources>
<resource>
@@ -33,46 +37,21 @@
<configuration>
<tasks>
- <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/lib"/>
- <copy file="target/${artifactId}-${version}.jar"
- tofile="output/lib/jboss-messaging-int.jar"/>
- <copy file="target/${artifactId}-${version}.jar"
- tofile="output/lib/jboss-messaging-int-client.jar"/>
-
</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>
Modified: trunk/tools/etc/buildmagic/modules.ent
===================================================================
--- trunk/tools/etc/buildmagic/modules.ent 2009-04-24 18:47:30 UTC (rev 87827)
+++ trunk/tools/etc/buildmagic/modules.ent 2009-04-24 19:08:59 UTC (rev 87828)
@@ -24,23 +24,16 @@
</path>
<!-- Cluster -->
-<property name="jboss.cluster.root" value="${project.root}/cluster/output"/>
-<property name="jboss.cluster.lib" value="${jboss.cluster.root}/lib"/>
-<property name="jboss.cluster.resources" value="${jboss.cluster.root}/resources"/>
+<property name="jboss.cluster.root" value="${project.root}/cluster"/>
+<property name="jboss.cluster.lib" value="${jboss.cluster.root}/target"/>
+<property name="jboss.cluster.resources" value="${jboss.cluster.root}/target/resources"/>
<path id="jboss.cluster.classpath">
- <pathelement path="${jboss.cluster.lib}/jbossha.jar"/>
- <pathelement path="${jboss.cluster.lib}/jbossha-httpsession.sar"/>
- <pathelement path="${jboss.cluster.lib}/jbossha-singleton.jar"/>
+ <pathelement path="${jboss.cluster.lib}/jboss-as-cluster.jar"/>
+ <!--<pathelement path="${jboss.cluster.lib}/jbossha-httpsession.sar"/>
+ <pathelement path="${jboss.cluster.lib}/jbossha-singleton.jar"/>-->
<pathelement path="${jboss.cluster.resources}"/>
</path>
-
-<!-- Compatibility -->
-<property name="jboss.compatibility.root" value="${project.root}/compatibility/output"/>
-<property name="jboss.compatibility.lib" value="${jboss.compatibility.root}/lib"/>
-<path id="jboss.compatibility.classpath">
-</path>
-
<!-- Iiop -->
<property name="jboss.iiop.root" value="${project.root}/iiop"/>
<property name="jboss.iiop.lib" value="${jboss.iiop.root}/target"/>
@@ -57,11 +50,11 @@
</path>
<!-- EJB3 -->
-<property name="jboss.ejb3.root" value="${project.root}/ejb3/output"/>
-<property name="jboss.ejb3.lib" value="${jboss.ejb3.root}/lib"/>
+<property name="jboss.ejb3.root" value="${project.root}/ejb3"/>
+<property name="jboss.ejb3.lib" value="${jboss.ejb3.root}/target"/>
<path id="jboss.ejb3.classpath">
- <pathelement path="${jboss.ejb3.lib}/jboss-ejb3.jar"/>
- <pathelement path="${jboss.ejb3.lib}/jboss-appclient.jar"/>
+ <pathelement path="${jboss.ejb3.lib}/jboss-as-ejb3.jar"/>
+ <pathelement path="${jboss.ejb3.lib}/jboss-as-ejb3-client.jar"/>
</path>
<!-- Embedded -->
More information about the jboss-cvs-commits
mailing list