[jboss-cvs] JBossAS SVN: r87595 - in trunk: build and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Apr 20 17:03:59 EDT 2009
Author: pgier
Date: 2009-04-20 17:03:59 -0400 (Mon, 20 Apr 2009)
New Revision: 87595
Modified:
trunk/build/build-distr.xml
trunk/build/pom.xml
trunk/pom.xml
trunk/security/pom.xml
trunk/system-jmx/pom.xml
trunk/system/pom.xml
trunk/testsuite/build.xml
trunk/tools/etc/buildmagic/modules.ent
Log:
[JBBUILD-520] Remove intermediate build directory for system, system-jmx, and security.
Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml 2009-04-20 19:57:26 UTC (rev 87594)
+++ trunk/build/build-distr.xml 2009-04-20 21:03:59 UTC (rev 87595)
@@ -365,24 +365,18 @@
<target name="_module-system-most">
<property name="_module.name" value="system" 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 -->
+ <!-- Copy the generated server jar -->
<mkdir dir="${install.lib}"/>
- <copy todir="${install.lib}" filtering="no">
- <fileset dir="${_module.output}/lib">
- <include name="jboss-system.jar"/>
- </fileset>
- </copy>
+ <copy file="${_module.output}/jboss-as-system.jar"
+ tofile="${install.lib}/jboss-system.jar" filtering="no"/>
- <!-- Copy the generated client -->
+ <!-- Copy the generated client jar -->
<mkdir dir="${install.client}"/>
- <copy todir="${install.client}" filtering="no">
- <fileset dir="${_module.output}/lib">
- <include name="*-client.jar"/>
- </fileset>
- </copy>
-
+ <copy file="${_module.output}/jboss-as-system-client.jar"
+ tofile="${install.client}/jboss-system-client.jar" filtering="no"/>
+
<!-- Copy the DTDs -->
<mkdir dir="${install.dtd}"/>
<copy todir="${install.dtd}" filtering="no">
@@ -400,21 +394,23 @@
</fileset>
</copy>
</target>
+
<target name="_module-system-jmx-most">
<property name="_module.name" value="system-jmx" 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.lib}" filtering="no">
- <fileset dir="${_module.output}/lib">
- <include name="jboss-system-jmx.jar"/>
- </fileset>
- </copy>
- <copy todir="${install.client}" filtering="no">
- <fileset dir="${_module.output}/lib">
- <include name="jboss-system-jmx-client.jar"/>
- </fileset>
- </copy>
+ <!-- Copy the generated server jar -->
+ <mkdir dir="${install.lib}"/>
+ <copy file="${_module.output}/jboss-as-system-jmx.jar"
+ tofile="${install.lib}/jboss-system-jmx.jar" filtering="no"/>
+
+ <!-- Copy the generated client jar -->
+ <mkdir dir="${install.client}"/>
+ <copy file="${_module.output}/jboss-as-system-jmx-client.jar"
+ tofile="${install.client}/jboss-system-jmx-client.jar" filtering="no"/>
+
</target>
+
<target name="_module-system-jmx-all" depends="_module-system-jmx-most">
</target>
@@ -771,25 +767,23 @@
<target name="_module-security-most">
<property name="_module.name" value="security" 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="jbosssx-server.jar"/>
- </fileset>
- </copy>
+ <copy file="${_module.output}/jboss-as-security.jar"
+ tofile="${install.all.lib}/jbosssx-server.jar" filtering="no"/>
<!-- Copy client library to client dir -->
<copy todir="${install.client}" filtering="no">
<fileset dir="${jboss.jbosssx.client.lib}">
<include name="jbosssx-client.jar"/>
</fileset>
- <fileset dir="${_module.output}/lib">
- <include name="jbosssx-as-client.jar"/>
- </fileset>
</copy>
+
+ <copy file="${_module.output}/jboss-as-security-client.jar"
+ tofile="${install.client}/jbosssx-as-client.jar" filtering="no"/>
+
<!-- Copy the security configuration files -->
<mkdir dir="${install.all.deploy}/security"/>
Modified: trunk/build/pom.xml
===================================================================
--- trunk/build/pom.xml 2009-04-20 19:57:26 UTC (rev 87594)
+++ trunk/build/pom.xml 2009-04-20 21:03:59 UTC (rev 87595)
@@ -15,6 +15,8 @@
<!-- This pom is a place holder for what will later be a place for the jboss distribution files to be generated. -->
<dependencies>
+
+ <!-- Dependencies on the AS modules -->
<dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-aspects</artifactId>
@@ -93,8 +95,15 @@
<dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-tomcat</artifactId>
- </dependency>
+ </dependency>
+ <!-- Dependencies on thirdparty jars -->
+
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-ant-tasks</artifactId>
+ </dependency>
+
</dependencies>
<profiles>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-04-20 19:57:26 UTC (rev 87594)
+++ trunk/pom.xml 2009-04-20 21:03:59 UTC (rev 87595)
@@ -27,6 +27,11 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.3</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.5</source>
Modified: trunk/security/pom.xml
===================================================================
--- trunk/security/pom.xml 2009-04-20 19:57:26 UTC (rev 87594)
+++ trunk/security/pom.xml 2009-04-20 21:03:59 UTC (rev 87595)
@@ -13,12 +13,18 @@
<url>http://www.jboss.org/jbossas</url>
<description>JBoss Application Server (security module)</description>
<build>
+ <finalName>${artifactId}</finalName>
<sourceDirectory>src/main</sourceDirectory>
+ <!-- TODO: This resource config is not being copied for some reason.
<resources>
<resource>
- <directory>src/resources</directory>
+ <directory>src/etc</directory>
+ <targetPath>target/etc</targetPath>
+ <includes>
+ <include>**/*.xml</include>
+ </includes>
</resource>
- </resources>
+ </resources>-->
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -27,19 +33,21 @@
<execution>
<id>assembly</id>
<goals>
- <goal>attached</goal>
+ <goal>single</goal>
</goals>
<phase>package</phase>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/client.xml</descriptor>
+ </descriptors>
+ <archive>
+ <manifestEntries>
+ <Main-Class>org.jboss.security.integration.password.PasswordTool</Main-Class>
+ </manifestEntries>
+ </archive>
+ </configuration>
</execution>
</executions>
- <configuration>
- <descriptorSourceDirectory>src/assembly</descriptorSourceDirectory>
- <archive>
- <manifestEntries>
- <Main-Class>org.jboss.security.integration.password.PasswordTool</Main-Class>
- </manifestEntries>
- </archive>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -54,44 +62,18 @@
<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/jbosssx-server.jar"/>
- <copy file="target/${artifactId}-${version}-client.jar"
- tofile="output/lib/jbosssx-as-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>
Modified: trunk/system/pom.xml
===================================================================
--- trunk/system/pom.xml 2009-04-20 19:57:26 UTC (rev 87594)
+++ trunk/system/pom.xml 2009-04-20 21:03:59 UTC (rev 87595)
@@ -14,6 +14,7 @@
<description>JBoss Application Server (system module)</description>
<build>
+ <finalName>${artifactId}</finalName>
<sourceDirectory>src/main</sourceDirectory>
<resources>
<resource>
@@ -40,86 +41,6 @@
<descriptorSourceDirectory>src/assembly</descriptorSourceDirectory>
</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>
-
- <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.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}"/>
-
- <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-system.jar"/>
- <copy file="target/${artifactId}-${version}-client.jar"
- tofile="output/lib/jboss-system-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>
Modified: trunk/system-jmx/pom.xml
===================================================================
--- trunk/system-jmx/pom.xml 2009-04-20 19:57:26 UTC (rev 87594)
+++ trunk/system-jmx/pom.xml 2009-04-20 21:03:59 UTC (rev 87595)
@@ -13,6 +13,7 @@
<url>http://www.jboss.org/jbossas</url>
<description>JBoss Application Server (system-jmx module)</description>
<build>
+ <finalName>${artifactId}</finalName>
<sourceDirectory>src/main</sourceDirectory>
<plugins>
<plugin>
@@ -31,88 +32,6 @@
<descriptorSourceDirectory>src/assembly</descriptorSourceDirectory>
</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>
-
- <!--<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.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}"/>-->
-
- <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-system-jmx.jar"/>
- <copy file="target/${artifactId}-${version}-client.jar"
- tofile="output/lib/jboss-system-jmx-client.jar"/>
- <copy file="target/${artifactId}-${version}-testsuite-support.jar"
- tofile="output/lib/testsuite-support.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/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml 2009-04-20 19:57:26 UTC (rev 87594)
+++ trunk/testsuite/build.xml 2009-04-20 21:03:59 UTC (rev 87595)
@@ -230,11 +230,8 @@
<path refid="org.jboss.javaee.classpath"/>
<path refid="jboss.jboss.vfs.classpath"/>
<path refid="jboss.jca.classpath"/>
- <path refid="jboss.jmx.classpath"/>
<path refid="jboss.jmx-remoting.classpath"/>
<path refid="jboss.management.classpath"/>
- <path refid="jboss.mbeans.classpath"/>
- <path refid="jboss.mq.classpath"/>
<path refid="jboss.jnpserver.classpath"/>
<path refid="jboss.profileservice.classpath"/>
<path refid="jboss.jboss.security.spi.classpath"/>
@@ -313,7 +310,6 @@
<pathelement path="${project.tools}/lib/ant.jar"/>
<pathelement path="${project.tools}/lib/ant-junit.jar"/>
<path refid="jboss.ejb3.classpath"/>
- <path refid="jboss.jmx.classpath"/>
<path refid="jboss.jmx-remoting.classpath"/>
<path refid="jboss.test.classpath"/>
<path refid="jboss.tomcat.classpath"/>
@@ -336,7 +332,6 @@
<pathelement path="${project.tools}/lib/ant.jar"/>
<pathelement path="${project.tools}/lib/ant-junit.jar"/>
<path refid="jboss.ejb3.classpath"/>
- <path refid="jboss.jmx.classpath"/>
<path refid="jboss.jmx-remoting.classpath"/>
<path refid="jboss.test.classpath"/>
<path refid="thirdparty.classpath"/>
Modified: trunk/tools/etc/buildmagic/modules.ent
===================================================================
--- trunk/tools/etc/buildmagic/modules.ent 2009-04-20 19:57:26 UTC (rev 87594)
+++ trunk/tools/etc/buildmagic/modules.ent 2009-04-20 21:03:59 UTC (rev 87595)
@@ -1,19 +1,12 @@
<!-- $Id$ -->
<!-- Main -->
-<property name="jboss.main.root" value="${project.root}/main/output"/>
-<property name="jboss.main.lib" value="${jboss.main.root}/lib"/>
+<property name="jboss.main.root" value="${project.root}/main"/>
+<property name="jboss.main.lib" value="${jboss.main.root}/target"/>
<path id="jboss.main.classpath">
- <pathelement path="${jboss.main.lib}/jboss-main.jar"/>
+ <pathelement path="${jboss.main.lib}/jboss-as-main.jar"/>
</path>
-<!-- Bootstrap -->
-<property name="jboss.bootstrap.root" value="${project.root}/bootstrap/output"/>
-<property name="jboss.bootstrap.lib" value="${jboss.bootstrap.root}/lib"/>
-<path id="jboss.bootstrap.classpath">
- <pathelement path="${jboss.bootstrap.lib}/jboss-bootstrap.jar"/>
-</path>
-
<!-- Aspects -->
<property name="jboss.aspects.root" value="${project.root}/aspects/output"/>
<property name="jboss.aspects.lib" value="${jboss.aspects.root}/lib"/>
@@ -55,16 +48,6 @@
<pathelement path="${jboss.iiop.lib}/jboss-iiop.jar"/>
</path>
-<!-- J2SE -->
-<property name="jboss.j2se.root" value="${project.root}/j2se/output"/>
-<property name="jboss.j2se.lib" value="${jboss.j2se.root}/lib"/>
-<path id="jboss.j2se.classpath">
- <pathelement path="${jboss.j2se.lib}/jboss-j2se.jar"/>
-</path>
-<path id="jboss.jmxcompliance.classpath">
- <pathelement path="${jboss.j2se.lib}/jboss-jmx-compliance.jar"/>
-</path>
-
<!-- Deployment -->
<property name="jboss.deployment.root" value="${project.root}/deployment/output"/>
<property name="jboss.deployment.lib" value="${jboss.deployment.root}/lib"/>
@@ -102,13 +85,6 @@
<pathelement path="${jboss.jca.lib}/jboss-common-jdbc-wrapper.jar"/>
</path>
-<!-- JMX -->
-<property name="jboss.jmx.root" value="${project.root}/jmx/output"/>
-<property name="jboss.jmx.lib" value="${jboss.jmx.root}/lib"/>
-<path id="jboss.jmx.classpath">
- <pathelement path="${jboss.jmx.lib}/jboss-jmx.jar"/>
-</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"/>
@@ -125,20 +101,6 @@
<pathelement path="${jboss.management.lib}/jboss-management.jar"/>
</path>
-<!-- MBeans -->
-<property name="jboss.mbeans.root" value="${project.root}/mbeans/output"/>
-<property name="jboss.mbeans.lib" value="${jboss.mbeans.root}/lib"/>
-<path id="jboss.mbeans.classpath">
- <pathelement path="${jboss.mbeans.lib}/jboss-mbeans.jar"/>
-</path>
-
-<!-- jbossmq -->
-<property name="jboss.mq.root" value="${project.root}/jbossmq/output"/>
-<property name="jboss.mq.lib" value="${jboss.mq.root}/lib"/>
-<path id="jboss.mq.classpath">
- <pathelement path="${jboss.mq.lib}/jbossmq.jar"/>
-</path>
-
<!-- ProfileService -->
<property name="jboss.profileservice.root" value="${project.root}/profileservice/output"/>
<property name="jboss.profileservice.lib" value="${jboss.profileservice.root}/lib"/>
@@ -169,27 +131,19 @@
</path>
<!-- System -->
-<property name="jboss.system.root" value="${project.root}/system/output"/>
-<property name="jboss.system.lib" value="${jboss.system.root}/lib"/>
+<property name="jboss.system.root" value="${project.root}/system"/>
+<property name="jboss.system.lib" value="${jboss.system.root}/target"/>
<path id="jboss.system.classpath">
- <pathelement path="${jboss.system.lib}/jboss-system.jar"/>
- <pathelement path="${jboss.system.lib}/jboss-profileservice-spi.jar"/>
+ <pathelement path="${jboss.system.lib}/jboss-as-system.jar"/>
</path>
<!-- System JMX -->
-<property name="jboss.systemjmx.root" value="${project.root}/system-jmx/output"/>
-<property name="jboss.systemjmx.lib" value="${jboss.systemjmx.root}/lib"/>
+<property name="jboss.systemjmx.root" value="${project.root}/system-jmx"/>
+<property name="jboss.systemjmx.lib" value="${jboss.systemjmx.root}/target"/>
<path id="jboss.systemjmx.classpath">
- <pathelement path="${jboss.systemjmx.lib}/jboss-system-jmx.jar"/>
+ <pathelement path="${jboss.systemjmx.lib}/jboss-as-system-jmx.jar"/>
</path>
-<!-- Test -->
-<property name="jboss.test.root" value="${project.root}/test/output"/>
-<property name="jboss.test.lib" value="${jboss.test.root}/lib"/>
-<path id="jboss.test.classpath">
- <pathelement path="${jboss.test.lib}/jboss-test.jar"/>
-</path>
-
<!-- Varia -->
<property name="jboss.varia.root" value="${project.root}/varia/output"/>
<property name="jboss.varia.lib" value="${jboss.varia.root}/lib"/>
More information about the jboss-cvs-commits
mailing list