[jboss-cvs] JBossAS SVN: r87732 - in trunk: aspects/src/assembly and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Apr 23 12:11:02 EDT 2009
Author: pgier
Date: 2009-04-23 12:11:01 -0400 (Thu, 23 Apr 2009)
New Revision: 87732
Added:
trunk/aspects/src/assembly/jboss-aop-jboss5-deployer.xml
Modified:
trunk/aspects/pom.xml
trunk/build/build-distr.xml
trunk/tools/etc/buildmagic/modules.ent
Log:
[JBBUILD-520] Remove intermediate build directory for aspect module.
Modified: trunk/aspects/pom.xml
===================================================================
--- trunk/aspects/pom.xml 2009-04-23 15:23:32 UTC (rev 87731)
+++ trunk/aspects/pom.xml 2009-04-23 16:11:01 UTC (rev 87732)
@@ -13,6 +13,7 @@
<url>http://www.jboss.org/jbossas</url>
<description>JBoss Application Server (aspects module)</description>
<build>
+ <finalName>${artifactId}</finalName>
<sourceDirectory>src/main</sourceDirectory>
<plugins>
<plugin>
@@ -25,148 +26,19 @@
<goal>single</goal>
</goals>
<phase>package</phase>
- </execution>
- </executions>
- <configuration>
- <descriptorSourceDirectory>src/assembly</descriptorSourceDirectory>
- <archive>
- <manifest>
- <addDefaultImplementationEntries/>
- <addDefaultSpecificationEntries/>
- </manifest>
- </archive>
- </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.vendor" value="${java.vm.vendor}"/>
- <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}"/>
-
- <filter token="specification.title" value="${project.artifactId}"/>
- <filter token="specification.version" value="${project.version}"/>
- <filter token="specification.vendor" value="${project.organization.name}"/>
- <filter token="implementation.title" value="${project.name}"/>
- <filter token="implementation.url" value="${project.url}"/>
- <filter token="implementation.version" value="${project.version}"/>
- <filter token="implementation.vendor" value="${project.organization.name}"/>
- <filter token="implementation.vendor.id" value="${project.groupId}"/>
-
- <filter token="aspects.version" value="${aspects.version}"/>
- <filter token="aop.version" value="${aop.version}"/>
- <filter token="aspects.title" value="${aspects.title}"/>
-
- <mkdir dir="output/etc"/>
- <copy todir="output/etc" filtering="yes">
- <fileset dir="src/etc">
- <include name="**"/>
- </fileset>
- </copy>
-
- <mkdir dir="output/resources"/>
- <copy todir="output/resources" filtering="yes">
- <fileset dir="src/resources">
- <include name="**"/>
- </fileset>
- </copy>
-
- <mkdir dir="output/classes"/>
- <copy todir="output/classes" filtering="no">
- <fileset dir="target/classes">
- <include name="**"/>
- </fileset>
- </copy>
-
- <property name="output.lib" location="output/lib"/>
- <mkdir dir="${output.lib}"/>
- <copy file="target/${artifactId}-${version}-jboss-aop-embedded.jar"
- tofile="${output.lib}/jboss-aop-embedded.jar"/>
- <copy file="target/${artifactId}-${version}-jboss-aop-jboss5.jar"
- tofile="${output.lib}/jboss-aop-jboss5.jar"/>
- <copy file="target/${artifactId}-${version}-jboss-aspect-jdk50-client.jar"
- tofile="${output.lib}/jboss-aspect-jdk50-client.jar"/>
- <copy file="target/${artifactId}-${version}-jboss-aspect-library.jar"
- tofile="${output.lib}/jboss-aspect-library.jar"/>
-
- <property name="build.meta.inf" location="output/META-INF"/>
- <copy file="src/etc/base-aop.xml" tofile="${build.meta.inf}/base-aspects.xml"/>
-
- <property name="jboss.aop.lib" location="../thirdparty/jboss/aop/lib"/>
- <jar destfile="${output.lib}/jboss-aop-jboss5.deployer" manifest="output/etc/default.mf"
- update="${jar.update}" index="${jar.index}">
- <fileset file="${output.lib}/jboss-aspect-library.jar"/>
- <fileset file="${jboss.aop.lib}/jboss-aop-aspects.jar"/>
- <fileset file="${jboss.aop.lib}/pluggable-instrumentor.jar"/>
- <fileset file="${jboss.aop.lib}/jrockit-pluggable-instrumentor.jar"/>
- <fileset file="${build.meta.inf}/base-aspects.xml"/>
- <fileset dir="output/etc">
- <include name="META-INF/*.xml"/>
- </fileset>
- </jar>
- <delete dir="${build.meta.inf}"/>
-
- </tasks>
+ <descriptors>
+ <descriptor>src/assembly/jboss-aop-embedded.xml</descriptor>
+ <descriptor>src/assembly/jboss-aop-jboss5.xml</descriptor>
+ <descriptor>src/assembly/jboss-aspect-jdk50-client.xml</descriptor>
+ <descriptor>src/assembly/jboss-aspect-library.xml</descriptor>
+ <!-- Note: jboss-aop-jboss5-deployer must be built after jboss-aspect-library -->
+ <descriptor>src/assembly/jboss-aop-jboss5-deployer.xml</descriptor>
+ </descriptors>
</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>
@@ -272,12 +144,17 @@
<groupId>org.jboss</groupId>
<artifactId>jboss-vfs</artifactId>
</dependency>
+
+ <!-- Required by the jboss-aop-jboss5-deployer jar. -->
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>pluggable-instrumentor</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jrockit-pluggable-instrumentor</artifactId>
+ </dependency>
+
</dependencies>
- <properties>
- <aspects.version>jboss-aspect-library-1.3</aspects.version>
- <aop.version>jboss-aop_1.3</aop.version>
- <aspects.title>JBoss AOP Aspect Library</aspects.title>
- </properties>
-
</project>
Added: trunk/aspects/src/assembly/jboss-aop-jboss5-deployer.xml
===================================================================
--- trunk/aspects/src/assembly/jboss-aop-jboss5-deployer.xml (rev 0)
+++ trunk/aspects/src/assembly/jboss-aop-jboss5-deployer.xml 2009-04-23 16:11:01 UTC (rev 87732)
@@ -0,0 +1,37 @@
+<assembly>
+ <id>jboss-aop-jboss5-deployer</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>target/</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>jboss-as-aspects-jboss-aspect-library.jar</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+ <files>
+ <file>
+ <source>src/etc/base-aop.xml</source>
+ <outputDirectory>/</outputDirectory>
+ <destName>base-aspects.xml</destName>
+ </file>
+ <file>
+ <source>src/etc/META-INF/jboss-aspect-library-jboss-beans.xml</source>
+ <outputDirectory>/META-INF</outputDirectory>
+ </file>
+ </files>
+ <dependencySets>
+ <dependencySet>
+ <includes>
+ <include>org.jboss.aop:jboss-aop-aspects</include>
+ <include>org.jboss.aop:pluggable-instrumentor</include>
+ <include>org.jboss.aop:jrockit-pluggable-instrumentor</include>
+ </includes>
+ <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ </dependencySet>
+ </dependencySets>
+</assembly>
\ No newline at end of file
Property changes on: trunk/aspects/src/assembly/jboss-aop-jboss5-deployer.xml
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml 2009-04-23 15:23:32 UTC (rev 87731)
+++ trunk/build/build-distr.xml 2009-04-23 16:11:01 UTC (rev 87732)
@@ -234,18 +234,18 @@
<target name="_module-aspects-most">
<property name="_module.name" value="aspects" 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"/>
<property name="aop.deployer" value="jboss-aop-jboss5.deployer"/>
<!-- Copy the generated libraries -->
- <unjar src="${_module.output}/lib/${aop.deployer}" dest="${install.server}/all/deployers/${aop.deployer}"/>
+ <unjar src="${_module.output}/jboss-as-aspects-jboss-aop-jboss5-deployer.jar" dest="${install.server}/all/deployers/${aop.deployer}"/>
<mkdir dir="${install.lib}"/>
- <copy todir="${install.lib}" filtering="no">
+ <!--<copy todir="${install.lib}" filtering="no">
<fileset dir="${jboss.aop.lib}">
<include name="jboss-asi.jar"/>
</fileset>
- </copy>
+ </copy>-->
<copy todir="${install.lib}" filtering="no">
<fileset dir="${jboss.aop.lib}">
@@ -256,24 +256,19 @@
</fileset>
</copy>
- <copy todir="${install.lib}" filtering="no">
- <fileset dir="${_module.output}/lib">
- <include name="jboss-aop-jboss5.jar"/>
- </fileset>
- </copy>
+ <copy file="${_module.output}/jboss-as-aspects-jboss-aop-jboss5.jar"
+ tofile="${install.lib}/jboss-aop-jboss5.jar" filtering="no" />
<!-- Copy across client jars -->
<mkdir dir="${install.client}"/>
- <copy todir="${install.client}" filtering="no">
- <fileset dir="${_module.output}/lib">
- <include name="jboss-aspect-jdk50-client.jar"/>
- </fileset>
- </copy>
+ <copy file="${_module.output}/jboss-as-aspects-jboss-aspect-jdk50-client.jar"
+ tofile="${install.client}/jboss-aspect-jdk50-client.jar" filtering="no" />
+
<!-- Copy the third party libraries -->
<copy todir="${install.all.lib}" filtering="no">
<fileset dir="${org.jboss.aspects.lib}" includes="*.jar"
excludes="*-sources.jar, *-javadoc.jar"/>
- </copy>
+ </copy>
</target>
<target name="_module-aspects-all" depends="_module-aspects-most">
Modified: trunk/tools/etc/buildmagic/modules.ent
===================================================================
--- trunk/tools/etc/buildmagic/modules.ent 2009-04-23 15:23:32 UTC (rev 87731)
+++ trunk/tools/etc/buildmagic/modules.ent 2009-04-23 16:11:01 UTC (rev 87732)
@@ -8,10 +8,10 @@
</path>
<!-- Aspects -->
-<property name="jboss.aspects.root" value="${project.root}/aspects/output"/>
-<property name="jboss.aspects.lib" value="${jboss.aspects.root}/lib"/>
+<property name="jboss.aspects.root" value="${project.root}/aspects/"/>
+<property name="jboss.aspects.lib" value="${jboss.aspects.root}/target"/>
<path id="jboss.aspects.classpath">
- <pathelement path="${jboss.aspects.lib}/jboss-aspect-library.jar"/>
+ <pathelement path="${jboss.aspects.lib}/jboss-as-aspects-jboss-aspect-library.jar"/>
</path>
<!-- tomcat -->
More information about the jboss-cvs-commits
mailing list