[jboss-cvs] JBossAS SVN: r85233 - in trunk: aspects and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Mar 4 11:03:34 EST 2009
Author: pgier
Date: 2009-03-04 11:03:33 -0500 (Wed, 04 Mar 2009)
New Revision: 85233
Removed:
trunk/aspects/component-info.xml
trunk/varia/component-info.xml
Modified:
trunk/aspects/pom.xml
trunk/aspects/src/assembly/jboss-aspect-jdk50-client.xml
trunk/aspects/src/assembly/jboss-aspect-library.xml
trunk/build/build.xml
trunk/pom.xml
trunk/profileservice/pom.xml
Log:
[JBBUILD-506] Switch aspects and profileservice to maven.
Deleted: trunk/aspects/component-info.xml
===================================================================
--- trunk/aspects/component-info.xml 2009-03-04 15:42:55 UTC (rev 85232)
+++ trunk/aspects/component-info.xml 2009-03-04 16:03:33 UTC (rev 85233)
@@ -1,35 +0,0 @@
-<project name="aspects-component-info">
-
- <!-- ============================================================ -->
- <!-- Aspects -->
- <!-- ============================================================ -->
-
- <component id="aspects"
- module="jboss-aspects"
- version="5.0-SNAPSHOT"
- specTitle="JBoss AOP Aspect Library"
- specVersion="jboss-aspect-library-1.3"
- specVendor="JBoss (http://www.jboss.org)"
- implTitle="JBoss AOP Aspect Library"
- implURL="http://www.jboss.org"
- implVersion="jboss-aspect-library-1.3"
- implVendor="http://www.jboss.org"
- >
- <artifact id="jboss-aspect-library.jar" />
- <artifact id="jboss-aspect-library32.jar" />
- <artifact id="jboss-aspect-library.jar.md5" />
- <artifact id="jboss-aspect-library32.jar.md5" />
- <artifact id="jboss-aop.deployer" />
- <artifact id="jboss-aop-jdk50.deployer"/>
- <artifact id="jboss-aspect-library-jdk50-jb32.jar"/>
- <artifact id="jboss-aspect-library-jdk50.jar"/>
-
- <export>
- <include input="jboss-aspect-library.jar" />
- <include input="jboss-aspect-library32.jar" />
- <include input="jboss-aop.deployer" />
- <include input="jboss-aop-jdk50.deployer"/>
- <include input="jboss-aspect-library-jdk50.jar"/>
- </export>
- </component>
-</project>
\ No newline at end of file
Modified: trunk/aspects/pom.xml
===================================================================
--- trunk/aspects/pom.xml 2009-03-04 15:42:55 UTC (rev 85232)
+++ trunk/aspects/pom.xml 2009-03-04 16:03:33 UTC (rev 85233)
@@ -42,6 +42,129 @@
</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>
+
+ <property name="output.lib" value="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" value="output/META-INF"/>
+ <copy file="src/etc/base-aop.xml" tofile="${build.meta.inf}/base-aspects.xml"/>
+
+ <property name="jboss.aop.lib" value="../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>
+ </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>
@@ -149,4 +272,10 @@
</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>
Modified: trunk/aspects/src/assembly/jboss-aspect-jdk50-client.xml
===================================================================
--- trunk/aspects/src/assembly/jboss-aspect-jdk50-client.xml 2009-03-04 15:42:55 UTC (rev 85232)
+++ trunk/aspects/src/assembly/jboss-aspect-jdk50-client.xml 2009-03-04 16:03:33 UTC (rev 85233)
@@ -7,17 +7,6 @@
<dependencySets>
<dependencySet>
<includes>
- <include>org.jboss.ejb3:jboss-ejb3-async</include>
- </includes>
- <unpack>true</unpack>
- <unpackOptions>
- <includes>
- <include>org/jboss/aspects/asynch/**.class</include>
- </includes>
- </unpackOptions>
- </dependencySet>
- <dependencySet>
- <includes>
<include>org.jboss.aspects:jboss-remoting-aspects</include>
</includes>
<unpack>true</unpack>
Modified: trunk/aspects/src/assembly/jboss-aspect-library.xml
===================================================================
--- trunk/aspects/src/assembly/jboss-aspect-library.xml 2009-03-04 15:42:55 UTC (rev 85232)
+++ trunk/aspects/src/assembly/jboss-aspect-library.xml 2009-03-04 16:03:33 UTC (rev 85233)
@@ -24,17 +24,6 @@
<dependencySets>
<dependencySet>
<includes>
- <include>org.jboss.ejb3:jboss-ejb3-async</include>
- </includes>
- <unpack>true</unpack>
- <unpackOptions>
- <includes>
- <include>org/jboss/aspects/asynch/**.class</include>
- </includes>
- </unpackOptions>
- </dependencySet>
- <dependencySet>
- <includes>
<include>org.jboss.aspects:jboss-current-invocation-aspects</include>
</includes>
<unpack>true</unpack>
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2009-03-04 15:42:55 UTC (rev 85232)
+++ trunk/build/build.xml 2009-03-04 16:03:33 UTC (rev 85233)
@@ -87,7 +87,7 @@
<moduleconfig property="modules" selected="${groups}">
<!-- Modules -->
- <module name="aspects"/>
+ <module name="aspects" externalBuild="true"/>
<module name="cluster" externalBuild="true"/>
<module name="connector"/>
<module name="console"/>
@@ -102,7 +102,7 @@
<module name="jbossas/remoting" externalBuild="true"/>
<module name="jmx-remoting" externalBuild="true"/>
<module name="jbossas/jmx-remoting" externalBuild="true"/>
- <module name="profileservice"/>
+ <module name="profileservice" externalBuild="true"/>
<module name="security" externalBuild="true"/>
<module name="server" externalBuild="true"/>
<module name="spring-int"/>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-03-04 15:42:55 UTC (rev 85232)
+++ trunk/pom.xml 2009-03-04 16:03:33 UTC (rev 85233)
@@ -413,6 +413,8 @@
<module>cluster</module>
<module>varia</module>
<module>iiop</module>
+ <module>aspects</module>
+ <module>profileservice</module>
</modules>
</profile>
Modified: trunk/profileservice/pom.xml
===================================================================
--- trunk/profileservice/pom.xml 2009-03-04 15:42:55 UTC (rev 85232)
+++ trunk/profileservice/pom.xml 2009-03-04 16:03:33 UTC (rev 85233)
@@ -37,6 +37,55 @@
</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>
Deleted: trunk/varia/component-info.xml
===================================================================
--- trunk/varia/component-info.xml 2009-03-04 15:42:55 UTC (rev 85232)
+++ trunk/varia/component-info.xml 2009-03-04 16:03:33 UTC (rev 85233)
@@ -1,70 +0,0 @@
-<project name="varia-component-info">
- <!-- ============================================================ -->
- <!-- Varia -->
- <!-- ============================================================ -->
-
- <component id="varia"
- module="contrib/varia"
- version="5.0-SNAPSHOT"
- >
- <artifact id="jboss-varia.jar"/>
- <artifact id="bsh-deployer.jar"/>
- <artifact id="mail-plugin.jar"/>
- <artifact id="scheduler-plugin.jar"/>
- <artifact id="scheduler-plugin-example.jar"/>
- <artifact id="jboss-hsqldb.jar" filename="hsqldb.jar"/>
- <artifact id="jboss-bean-deployer.jar"/>
- <artifact id="hsqldb-plugin.jar"/>
- <artifact id="autonumber-plugin.jar"/>
- <artifact id="properties-plugin.jar"/>
- <artifact id="bindingservice-plugin.jar"/>
- <artifact id="jboss-monitoring.jar"/>
-
- <artifact id="monitoring-service.xml" outputpath="etc"/>
- <artifact id="mail-service.xml" outputpath="etc"/>
- <artifact id="schedule-manager-service.xml" outputpath="etc"/>
- <artifact id="scheduler-service.xml" outputpath="etc"/>
- <artifact id="properties-service.xml" outputpath="etc"/>
- <artifact id="web.xml" outputpath="resources/jmx"/>
- <artifact id="jmx-console-web.xml" outputpath="resources/jmx"/>
- <artifact id="snmp-adaptor.jar"/>
- <artifact id="snmp-adaptor.sar" />
- <artifact id="jmx-console.war"/>
- <artifact id="juddi-service.sar"/>
- <artifact id="httpha-invoker.sar" />
-
- <artifact id="netboot.war"/>
-
- <artifact id="jbossmq-httpil.sar"/>
-
- <artifact id="counter-plugin.jar" />
- <artifact id="deployment-service.jar"/>
- <artifact id="deployment-service.sar" />
- <artifact id="derby-plugin.jar" />
- <artifact id="process-plugin.jar" />
- <artifact id="foe-deployer-3.2.sar" />
- <artifact id="statscollector.jar" />
- <artifact id="persistent-service.sar" />
- <artifact id="mbean-configurator.sar" />
- <artifact id="http-invoker.sar" />
- <artifact id="jbossmq-httpil.war"/>
- <artifact id="loadbalancer.war"/>
- <artifact id="loadbalancer.sar"/>
- <artifact id="juddi-service.jar" />
- <artifact id="jboss-juddiaxis.jar"/>
- <artifact id="jbossjmx-ant.jar"/>
- <artifact id="logging-monitor.jar"/>
- <artifact id="kerneldir" artifacttype="dir" filename="kernel"/>
- <artifact id="varia-jboss-service.xml" outputpath="resources/juddi" filename="jboss-service.xml"/>
- <artifact id="juddi_create_db.ddl" outputpath="resources/juddi"/>
- <artifact id="juddi_data.ddl" outputpath="resources/juddi"/>
- <artifact id="juddi_drop_db.ddl" outputpath="resources/juddi"/>
- <export>
- <include input="jboss-monitoring.jar"/>
- <include input="deployment-service.jar"/>
- <include input="autonumber-plugin.jar"/>
- <include input="scheduler-plugin.jar"/>
- <include input="properties-plugin.jar"/>
- </export>
- </component>
-</project>
More information about the jboss-cvs-commits
mailing list