[jboss-cvs] JBossAS SVN: r87684 - in trunk: jbossas-jmx-remoting and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Apr 22 15:16:28 EDT 2009
Author: pgier
Date: 2009-04-22 15:16:28 -0400 (Wed, 22 Apr 2009)
New Revision: 87684
Removed:
trunk/jbossas-remoting/src/etc/
trunk/jmx-remoting/src/etc/
Modified:
trunk/build/build-distr.xml
trunk/jbossas-jmx-remoting/pom.xml
trunk/jbossas-remoting/pom.xml
trunk/jmx-remoting/pom.xml
trunk/tools/etc/buildmagic/modules.ent
Log:
[JBBUILD-520] Remove intermediate build directory for remoting modules.
Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml 2009-04-22 18:16:18 UTC (rev 87683)
+++ trunk/build/build-distr.xml 2009-04-22 19:16:28 UTC (rev 87684)
@@ -42,15 +42,12 @@
<target name="_module-jbossas-remoting-most">
<property name="_module.name" value="jbossas-remoting" 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="jbossas-remoting.jar"/>
- </fileset>
- </copy>
+ <copy file="${_module.output}/jboss-as-jbossas-remoting.jar"
+ tofile="${install.all.lib}/jbossas-remoting.jar" filtering="no"/>
<!-- Copy the third party libraries -->
<mkdir dir="${install.all.lib}"/>
@@ -83,15 +80,12 @@
<target name="_module-jmx-remoting-most">
<property name="_module.name" value="jmx-remoting" 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="jboss-jmx-remoting.jar"/>
- </fileset>
- </copy>
+ <copy file="${_module.output}/jboss-as-jmx-remoting.jar"
+ tofile="${install.all.lib}/jboss-jmx-remoting.jar" filtering="no" />
</target>
<target name="_module-jmx-remoting-all" depends="_module-jmx-remoting-most">
@@ -105,6 +99,19 @@
</target>
+ <!-- ===================== -->
+ <!-- JBoss AS JMX Remoting -->
+ <!-- ===================== -->
+
+ <target name="_module-jbossas-jmx-remoting-most">
+ <property name="_module.name" value="jbossas-jmx-remoting" override="true"/>
+ <property name="_module.output" override="true" value="${project.root}/${_module.name}/target"/>
+
+ <unjar src="${_module.output}/jmx-remoting.sar" dest="${install.default}/deploy/jmx-remoting.sar"/>
+ <unjar src="${_module.output}/jmx-remoting.sar" dest="${install.all}/deploy/jmx-remoting.sar"/>
+
+ </target>
+
<target name="_module-jbossas-jmx-remoting-all" depends="_module-jbossas-jmx-remoting-most">
<!-- Copy the generated javadocs -->
<mkdir dir="${install.api}/${_module.name}"/>
@@ -116,15 +123,6 @@
</target>
- <target name="_module-jbossas-jmx-remoting-most">
- <property name="_module.name" value="jbossas-jmx-remoting" override="true"/>
- <property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
-
- <unjar src="${project.root}/${_module.name}/output/lib/jmx-remoting.sar" dest="${install.default}/deploy/jmx-remoting.sar"/>
- <unjar src="${project.root}/${_module.name}/output/lib/jmx-remoting.sar" dest="${install.all}/deploy/jmx-remoting.sar"/>
-
- </target>
-
<!-- ======== -->
<!-- EJB 3.0 -->
<!-- ======== -->
Modified: trunk/jbossas-jmx-remoting/pom.xml
===================================================================
--- trunk/jbossas-jmx-remoting/pom.xml 2009-04-22 18:16:18 UTC (rev 87683)
+++ trunk/jbossas-jmx-remoting/pom.xml 2009-04-22 19:16:28 UTC (rev 87684)
@@ -12,7 +12,9 @@
<name>JBoss Application Server JBossAS JMX Remoting</name>
<url>http://www.jboss.com/products/jbossas</url>
<description>JBoss Application Server (jbossas-jmx-remoting module)</description>
+
<build>
+ <finalName>${artifactId}</finalName>
<sourceDirectory>src/main</sourceDirectory>
<resources>
<resource>
@@ -33,23 +35,19 @@
<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/jbossas-jmx-remoting.jar"/>
-
<!-- jmx-remoting.sar -->
- <zip destfile="output/lib/jmx-remoting.sar">
- <zipfileset dir="output/lib">
- <include name="jbossas-jmx-remoting.jar"/>
+ <zip destfile="target/jmx-remoting.sar">
+ <zipfileset dir="target">
+ <include name="jboss-as-jbossas-jmx-remoting.jar"/>
</zipfileset>
- <zipfileset dir="output/etc"
+ <zipfileset dir="target/etc"
prefix="META-INF">
<include name="jboss-service.xml"/>
</zipfileset>
@@ -60,28 +58,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/jbossas-remoting/pom.xml
===================================================================
--- trunk/jbossas-remoting/pom.xml 2009-04-22 18:16:18 UTC (rev 87683)
+++ trunk/jbossas-remoting/pom.xml 2009-04-22 19:16:28 UTC (rev 87684)
@@ -13,6 +13,7 @@
<url>http://www.jboss.com/products/jbossas</url>
<description>JBoss Application Server (jbossas-remoting module)</description>
<build>
+ <finalName>${artifactId}</finalName>
<sourceDirectory>src/main</sourceDirectory>
<plugins>
<plugin>
@@ -25,48 +26,6 @@
</includes>
</configuration>
</plugin>
- <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>
-
- <mkdir dir="output/lib"/>
- <copy file="target/${artifactId}-${version}.jar"
- tofile="output/lib/jbossas-remoting.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>
Modified: trunk/jmx-remoting/pom.xml
===================================================================
--- trunk/jmx-remoting/pom.xml 2009-04-22 18:16:18 UTC (rev 87683)
+++ trunk/jmx-remoting/pom.xml 2009-04-22 19:16:28 UTC (rev 87684)
@@ -13,6 +13,7 @@
<url>http://www.jboss.org/jbossas</url>
<description>JBoss Application Server (jmx-remoting module)</description>
<build>
+ <finalName>${artifactId}</finalName>
<sourceDirectory>src/main</sourceDirectory>
<plugins>
<plugin>
@@ -43,50 +44,9 @@
</excludes>
</configuration>
</plugin>
- <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>
-
- <mkdir dir="output/lib"/>
- <copy file="target/${artifactId}-${version}.jar"
- tofile="output/lib/jboss-jmx-remoting.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-22 18:16:18 UTC (rev 87683)
+++ trunk/tools/etc/buildmagic/modules.ent 2009-04-22 19:16:28 UTC (rev 87684)
@@ -86,10 +86,10 @@
</path>
<!-- JMX Remoting -->
-<property name="jboss.jmx-remoting.root" value="${project.root}/jmx-remoting/output"/>
-<property name="jboss.jmx-remoting.lib" value="${jboss.jmx-remoting.root}/lib"/>
+<property name="jboss.jmx-remoting.root" value="${project.root}/jmx-remoting/"/>
+<property name="jboss.jmx-remoting.lib" value="${jboss.jmx-remoting.root}/target"/>
<path id="jboss.jmx-remoting.classpath">
- <pathelement path="${jboss.jmx-remoting.lib}/jboss-jmx-remoting.jar"/>
+ <pathelement path="${jboss.jmx-remoting.lib}/jboss-as-jmx-remoting.jar"/>
</path>
<!-- Management -->
More information about the jboss-cvs-commits
mailing list