[jboss-cvs] JBossAS SVN: r87820 - in trunk: connector and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Apr 24 12:54:28 EDT 2009
Author: pgier
Date: 2009-04-24 12:54:28 -0400 (Fri, 24 Apr 2009)
New Revision: 87820
Modified:
trunk/build/build-distr.xml
trunk/build/build.xml
trunk/connector/pom.xml
trunk/iiop/pom.xml
trunk/profileservice/pom.xml
trunk/tools/etc/buildmagic/modules.ent
Log:
[JBBUILD-520] Remove intermediate build directory for connector, profileservice, iiop.
Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml 2009-04-24 16:12:35 UTC (rev 87819)
+++ trunk/build/build-distr.xml 2009-04-24 16:54:28 UTC (rev 87820)
@@ -526,28 +526,20 @@
<target name="_module-connector-most">
<property name="_module.name" value="connector" 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"/>
<mkdir dir="${install.server}/all/deployers"/>
<copy todir="${install.server}/all/deployers" filtering="no">
- <fileset dir="${_module.output}/lib">
+ <fileset dir="${_module.output}">
<include name="jboss-jca.deployer/**"/>
</fileset>
</copy>
- <!--
- <copy todir="${install.server}/all/deployers" filtering="no">
- <fileset dir="${_module.output}/resources/deployers">
- <include name="jca-deployers-jboss-beans.xml"/>
- </fileset>
- </copy>
- -->
-
<!-- Copy the generated deployment libraries -->
<mkdir dir="${install.server}/all/deploy"/>
<copy todir="${install.server}/all/deploy" filtering="no">
- <fileset dir="${_module.output}/lib">
+ <fileset dir="${_module.output}/">
<include name="jboss-local-jdbc.rar"/>
<include name="jboss-xa-jdbc.rar"/>
<include name="mail-ra.rar"/>
@@ -557,24 +549,23 @@
<include name="jca-jboss-beans.xml"/>
</fileset>
</copy>
+
<copy todir="${install.all.deploy}" filtering="no">
- <fileset dir="${_module.output}/lib">
+ <fileset dir="${_module.output}">
<include name="jms-ra.rar"/>
</fileset>
</copy>
<mkdir dir="${install.server}/all/lib"/>
- <copy todir="${install.server}/all/lib" filtering="no">
- <fileset dir="${_module.output}/lib">
- <include name="jboss-common-jdbc-wrapper.jar"/>
- <include name="jboss-jca.jar"/>
- </fileset>
- </copy>
-
+ <copy file="${_module.output}/jboss-as-connector-jboss-common-jdbc-wrapper.jar"
+ tofile="${install.server}/all/lib/jboss-common-jdbc-wrapper.jar" filtering="no"/>
+ <copy file="${_module.output}/jboss-as-connector-jboss-jca.jar"
+ tofile="${install.server}/all/lib/jboss-jca.jar" filtering="no"/>
+
<!-- Copy the dtds -->
<mkdir dir="${install.dtd}"/>
<copy todir="${install.dtd}" filtering="no">
- <fileset dir="${project.root}/${_module.name}/output/resources/dtd"/>
+ <fileset dir="${_module.output}/resources/dtd"/>
</copy>
<!-- Copy example db configs -->
@@ -605,11 +596,8 @@
<!-- Copy the generated client libraries -->
<mkdir dir="${install.client}"/>
- <copy todir="${install.client}" filtering="no">
- <fileset dir="${_module.output}/lib">
- <include name="jbosscx-client.jar"/>
- </fileset>
- </copy>
+ <copy file="${_module.output}/jboss-as-connector-jbosscx-client.jar"
+ tofile="${install.server}/all/lib/jbosscx-client.jar" filtering="no"/>
<!-- QUARTZ jar -->
<copy todir="${install.all.lib}" filtering="no">
@@ -1233,21 +1221,15 @@
<target name="_module-iiop-most">
<property name="_module.name" value="iiop" 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 jboss-iiop.jar -->
- <copy todir="${install.all.lib}" filtering="no">
- <fileset dir="${_module.output}/lib">
- <include name="jboss-iiop.jar"/>
- </fileset>
- </copy>
+ <copy file="${_module.output}/jboss-as-iiop.jar"
+ tofile="${install.all.lib}/jboss-iiop.jar" filtering="no" />
<!-- Copy the jboss-iiop-client.jar -->
- <copy todir="${install.client}" filtering="no">
- <fileset dir="${_module.output}/lib">
- <include name="jboss-iiop-client.jar"/>
- </fileset>
- </copy>
+ <copy file="${_module.output}/jboss-as-iiop-client.jar"
+ tofile="${install.all.lib}/jboss-iiop-client.jar" filtering="no" />
<!-- Copy thirdparty code -->
<copy todir="${install.all.lib}" filtering="no">
@@ -1726,16 +1708,20 @@
</copy>
</target>
- <!-- ProfileService extensions -->
+ <!-- ================= -->
+ <!-- ProfileService -->
+ <!-- ================= -->
+
<target name="_module-profileservice-most">
+
<property name="_module.name" value="profileservice" 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"/>
<mkdir dir="${install.all.lib}"/>
<!-- The profileservice module output -->
<copy todir="${install.all.lib}" filtering="no">
- <fileset dir="${_module.output}/lib" includes="*.jar"/>
+ <fileset dir="${_module.output}/" includes="jboss-as-profileservice.jar"/>
</copy>
<!-- Copy the profileservice hdscanner bean to deploy -->
<copy todir="${install.server}/all/deploy/"
@@ -1743,6 +1729,7 @@
<!-- Copy the profileservice beans to an optional file -->
<copy todir="${install.server}/all/deploy/"
file="${_module.output}/resources/profileservice-jboss-beans.xml" />
+
</target>
<!-- ============ -->
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2009-04-24 16:12:35 UTC (rev 87819)
+++ trunk/build/build.xml 2009-04-24 16:54:28 UTC (rev 87820)
@@ -736,7 +736,7 @@
<copy todir="${install.minimal.conf}" overwrite="true">
<fileset dir="${project.root}/server/target/etc/conf/minimal" />
</copy>
- <copy file="${project.root}/profileservice/output/resources/hdscanner-jboss-beans.xml"
+ <copy file="${project.root}/profileservice/target/resources/hdscanner-jboss-beans.xml"
todir="${install.minimal.deploy}" overwrite="true"/>
<copy todir="${install.minimal.lib}">
<fileset dir="${install.common.lib}">
@@ -788,7 +788,7 @@
<fileset dir="${project.root}/server/target/etc/conf/web">
<include name="jmx-invoker-service.xml"/>
</fileset>
- <fileset dir="${project.root}/profileservice/output/resources/">
+ <fileset dir="${project.root}/profileservice/target/resources/">
<include name="hdscanner-jboss-beans.xml"/>
</fileset>
</copy>
Modified: trunk/connector/pom.xml
===================================================================
--- trunk/connector/pom.xml 2009-04-24 16:12:35 UTC (rev 87819)
+++ trunk/connector/pom.xml 2009-04-24 16:54:28 UTC (rev 87820)
@@ -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-connector</artifactId>
@@ -12,9 +14,10 @@
<name>JBoss Application Server Connector</name>
<url>http://www.jboss.org/jbossas</url>
<description>JBoss Application Server (connector module)</description>
+
<build>
- <sourceDirectory>src/main</sourceDirectory>
<finalName>${artifactId}</finalName>
+ <sourceDirectory>src/main</sourceDirectory>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -71,54 +74,34 @@
<filter token="/" value="${file.separator}"/>
- <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"/>
- <mkdir dir="${output.lib}"/>
- <copy file="target/${project.build.finalName}-jboss-common-jdbc-wrapper.jar"
- tofile="${output.lib}/jboss-common-jdbc-wrapper.jar"/>
- <copy file="target/${project.build.finalName}-jbosscx-client.jar"
- tofile="${output.lib}/jbosscx-client.jar"/>
- <copy file="target/${project.build.finalName}-jboss-jca.jar"
- tofile="${output.lib}/jboss-jca.jar"/>
- <copy file="target/${project.build.finalName}-jboss-jca-deployer.jar"
- tofile="${output.lib}/jboss-jca-deployer.jar"/>
- <copy file="target/${project.build.finalName}-jboss-local-jdbc.jar"
- tofile="${output.lib}/jboss-local-jdbc.jar"/>
- <copy file="target/${project.build.finalName}-jboss-xa-jdbc.jar"
- tofile="${output.lib}/jboss-xa-jdbc.jar"/>
- <copy file="target/${project.build.finalName}-jms-ra.jar"
- tofile="${output.lib}/jms-ra.jar"/>
- <copy file="target/${project.build.finalName}-mail-ra.jar"
- tofile="${output.lib}/mail-ra.jar"/>
- <copy file="target/${project.build.finalName}-quartz-ra.jar"
- tofile="${output.lib}/quartz-ra.jar"/>
-
+
<copy file="target/${project.build.finalName}-jboss-local-jdbc-rar.jar"
- tofile="${output.lib}/jboss-local-jdbc.rar"/>
+ tofile="target/jboss-local-jdbc.rar"/>
<copy file="target/${project.build.finalName}-jboss-xa-jdbc-rar.jar"
- tofile="${output.lib}/jboss-xa-jdbc.rar"/>
+ tofile="target/jboss-xa-jdbc.rar"/>
<copy file="target/${project.build.finalName}-jms-ra-rar.jar"
- tofile="${output.lib}/jms-ra.rar"/>
+ tofile="target/jms-ra.rar"/>
<copy file="target/${project.build.finalName}-mail-ra-rar.jar"
- tofile="${output.lib}/mail-ra.rar"/>
+ tofile="target/mail-ra.rar"/>
<copy file="target/${project.build.finalName}-quartz-ra-rar.jar"
- tofile="${output.lib}/quartz-ra.rar"/>
+ tofile="target/quartz-ra.rar"/>
- <copy file="${output.lib}/jboss-jca-deployer.jar" todir="${output.lib}/jboss-jca.deployer/"/>
- <copy file="output/resources/deployers/jca-deployers-jboss-beans.xml" todir="${output.lib}/jboss-jca.deployer/META-INF"/>
+ <copy file="target/${project.build.finalName}-jboss-jca-deployer.jar"
+ tofile="target/jboss-jca.deployer/jboss-jca-deployer.jar"/>
+ <copy file="target/resources/deployers/jca-deployers-jboss-beans.xml" todir="${output.lib}/jboss-jca.deployer/META-INF"/>
</tasks>
@@ -126,28 +109,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/iiop/pom.xml
===================================================================
--- trunk/iiop/pom.xml 2009-04-24 16:12:35 UTC (rev 87819)
+++ trunk/iiop/pom.xml 2009-04-24 16:54:28 UTC (rev 87820)
@@ -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-iiop</artifactId>
@@ -12,7 +14,9 @@
<name>JBoss Application Server IIOP</name>
<url>http://www.jboss.org/jbossas</url>
<description>JBoss Application Server (iiop module)</description>
+
<build>
+ <finalName>${artifactId}</finalName>
<sourceDirectory>src/main</sourceDirectory>
<plugins>
<plugin>
@@ -105,46 +109,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-iiop.jar"/>
- <copy file="target/${artifactId}-${version}-client.jar"
- tofile="output/lib/jboss-iiop-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/profileservice/pom.xml
===================================================================
--- trunk/profileservice/pom.xml 2009-04-24 16:12:35 UTC (rev 87819)
+++ trunk/profileservice/pom.xml 2009-04-24 16:54:28 UTC (rev 87820)
@@ -13,79 +13,38 @@
<url>http://www.jboss.org/jbossas</url>
<description>JBoss Application Server (profileservice module)</description>
<build>
+ <finalName>${artifactId}</finalName>
<sourceDirectory>src/main</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>src/main</directory>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
+ </resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
- <id>copy-properties</id>
+ <id>copy-resources</id>
<goals>
- <goal>run</goal>
+ <goal>copy-resources</goal>
</goals>
- <phase>process-classes</phase>
+ <phase>generate-resources</phase>
<configuration>
- <tasks>
- <copy todir="${project.build.outputDirectory}">
- <fileset dir="${project.build.sourceDirectory}">
- <include name="**/*.properties"/>
- </fileset>
- </copy>
- </tasks>
+ <resources>
+ <resource>
+ <directory>src/resources</directory>
+ </resource>
+ </resources>
+ <outputDirectory>${project.build.directory}/resources</outputDirectory>
</configuration>
</execution>
</executions>
</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/resources"/>
- <copy todir="output/resources" filtering="yes">
- <fileset dir="src/resources">
- <include name="**"/>
- </fileset>
- </copy>
-
- <mkdir dir="output/lib"/>
- <copy file="target/${artifactId}-${version}.jar"
- tofile="output/lib/jboss-profileservice.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/tools/etc/buildmagic/modules.ent
===================================================================
--- trunk/tools/etc/buildmagic/modules.ent 2009-04-24 16:12:35 UTC (rev 87819)
+++ trunk/tools/etc/buildmagic/modules.ent 2009-04-24 16:54:28 UTC (rev 87820)
@@ -42,10 +42,10 @@
</path>
<!-- Iiop -->
-<property name="jboss.iiop.root" value="${project.root}/iiop/output"/>
-<property name="jboss.iiop.lib" value="${jboss.iiop.root}/lib"/>
+<property name="jboss.iiop.root" value="${project.root}/iiop"/>
+<property name="jboss.iiop.lib" value="${jboss.iiop.root}/target"/>
<path id="jboss.iiop.classpath">
- <pathelement path="${jboss.iiop.lib}/jboss-iiop.jar"/>
+ <pathelement path="${jboss.iiop.lib}/jboss-as-iiop.jar"/>
</path>
<!-- Deployment -->
@@ -75,14 +75,14 @@
</path>
<!-- JCA -->
-<property name="jboss.jca.root" value="${project.root}/connector/output"/>
-<property name="jboss.jca.lib" value="${jboss.jca.root}/lib"/>
+<property name="jboss.jca.root" value="${project.root}/connector"/>
+<property name="jboss.jca.lib" value="${jboss.jca.root}/target"/>
<path id="jboss.jca.classpath">
- <pathelement path="${jboss.jca.lib}/jboss-jca.jar"/>
- <pathelement path="${jboss.jca.lib}/jboss-jca-deployer.jar"/>
- <pathelement path="${jboss.jca.lib}/jboss-local-jdbc.jar"/>
- <pathelement path="${jboss.jca.lib}/jboss-ha-local-jdbc.jar"/>
- <pathelement path="${jboss.jca.lib}/jboss-common-jdbc-wrapper.jar"/>
+ <pathelement path="${jboss.jca.lib}/jboss-as-connector-jboss-jca.jar"/>
+ <pathelement path="${jboss.jca.lib}/jboss-as-connector-jboss-jca-deployer.jar"/>
+ <pathelement path="${jboss.jca.lib}/jboss-as-connector-jboss-local-jdbc.jar"/>
+ <pathelement path="${jboss.jca.lib}/jboss-as-connector-jboss-ha-local-jdbc.jar"/>
+ <pathelement path="${jboss.jca.lib}/jboss-as-connector-jboss-common-jdbc-wrapper.jar"/>
</path>
<!-- JMX Remoting -->
@@ -102,10 +102,10 @@
</path>
<!-- ProfileService -->
-<property name="jboss.profileservice.root" value="${project.root}/profileservice/output"/>
-<property name="jboss.profileservice.lib" value="${jboss.profileservice.root}/lib"/>
+<property name="jboss.profileservice.root" value="${project.root}/profileservice"/>
+<property name="jboss.profileservice.lib" value="${jboss.profileservice.root}/target"/>
<path id="jboss.profileservice.classpath">
- <pathelement path="${jboss.profileservice.lib}/jboss-profileservice.jar"/>
+ <pathelement path="${jboss.profileservice.lib}/jboss-as-profileservice.jar"/>
</path>
<!-- Security Integration -->
More information about the jboss-cvs-commits
mailing list