[jboss-cvs] JBossAS SVN: r83577 - in trunk: build and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jan 28 14:27:30 EST 2009
Author: pgier
Date: 2009-01-28 14:27:30 -0500 (Wed, 28 Jan 2009)
New Revision: 83577
Added:
trunk/jmx/src/assembly/MyMBeans.xml
trunk/jmx/src/assembly/Start.xml
trunk/jmx/src/assembly/Target.xml
Removed:
trunk/jmx/component-info.xml
trunk/mbeans/component-info.xml
Modified:
trunk/build/build.xml
trunk/jmx/pom.xml
trunk/mbeans/pom.xml
trunk/pom.xml
Log:
[JBBUILD-506] Switch mbeans and jmx modules over to maven.
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2009-01-28 18:18:46 UTC (rev 83576)
+++ trunk/build/build.xml 2009-01-28 19:27:30 UTC (rev 83577)
@@ -98,10 +98,10 @@
<module name="hibernate-int"/>
<module name="iiop"/>
<module name="j2se" externalBuild="true"/>
- <module name="jmx"/>
+ <module name="jmx" externalBuild="true"/>
<module name="main" externalBuild="true"/>
<module name="management"/>
- <module name="mbeans"/>
+ <module name="mbeans" externalBuild="true"/>
<module name="messaging"/>
<module name="jbossas/remoting"/>
<module name="jmx-remoting"/>
Deleted: trunk/jmx/component-info.xml
===================================================================
--- trunk/jmx/component-info.xml 2009-01-28 18:18:46 UTC (rev 83576)
+++ trunk/jmx/component-info.xml 2009-01-28 19:27:30 UTC (rev 83577)
@@ -1,21 +0,0 @@
-<project name="jmx-component-info">
-
- <!-- ============================================================ -->
- <!-- JMX -->
- <!-- ============================================================ -->
-
- <component id="jmx"
- module="jmx"
- version="5.0-SNAPSHOT"
- >
- <artifact id="jboss-jmx.jar"/>
- <artifact id="jboss-jmx-core.jar"/>
- <artifact id="jboss-jmx-testsuite.jar"/>
- <artifact id="jmx-client.jar"/>
- <export>
- <include input="jboss-jmx.jar"/>
- <include input="jboss-jmx-core.jar"/>
- </export>
- </component>
-
-</project>
\ No newline at end of file
Modified: trunk/jmx/pom.xml
===================================================================
--- trunk/jmx/pom.xml 2009-01-28 18:18:46 UTC (rev 83576)
+++ trunk/jmx/pom.xml 2009-01-28 19:27:30 UTC (rev 83577)
@@ -13,6 +13,7 @@
<url>http://www.jboss.org/jbossas</url>
<description>JBoss Application Server (jmx module)</description>
<build>
+ <!-- TODO: There should be a way to run tests in build.xml -->
<sourceDirectory>src/main</sourceDirectory>
<testResources>
<testResource>
@@ -45,6 +46,64 @@
<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>
+
+ <mkdir dir="output/etc"/>
+ <copy todir="output/etc" filtering="yes">
+ <fileset dir="src/resources">
+ <include name="test/**"/>
+ </fileset>
+ </copy>
+
+ <mkdir dir="output/lib"/>
+ <copy file="target/${artifactId}-${version}.jar"
+ tofile="output/lib/jboss-jmx.jar"/>
+ <copy file="target/${artifactId}-${version}-jboss-jmx-testsuite.jar"
+ tofile="output/lib/jboss-jmx-testsuite.jar"/>
+
+ <mkdir dir="output/etc/test/implementation/loading"/>
+ <copy file="target/${artifactId}-${version}-MyMBeans.jar"
+ tofile="output/etc/test/implementation/loading/MyMBeans.jar"/>
+ <copy file="target/${artifactId}-${version}-Start.jar"
+ tofile="output/etc/test/implementation/loading/Start.jar"/>
+ <copy file="target/${artifactId}-${version}-Target.jar"
+ tofile="output/etc/test/implementation/loading/Target.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>
@@ -83,14 +142,5 @@
<artifactId>junit</artifactId>
<scope>compile</scope>
</dependency>
- <!--<dependency>
- <groupId>jboss</groupId>
- <artifactId>jbossxb</artifactId>
- <version>2.0.0.CR3</version>
- </dependency>-->
</dependencies>
- <properties>
- <paulprop>hello</paulprop>
-
- </properties>
</project>
\ No newline at end of file
Copied: trunk/jmx/src/assembly/MyMBeans.xml (from rev 81441, trunk/jmx/src/assembly/MyMBeans.xml)
===================================================================
--- trunk/jmx/src/assembly/MyMBeans.xml (rev 0)
+++ trunk/jmx/src/assembly/MyMBeans.xml 2009-01-28 19:27:30 UTC (rev 83577)
@@ -0,0 +1,16 @@
+<assembly>
+ <id>MyMBeans</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>target/classes</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>test/implementation/loading/support/Trivial*.class</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Copied: trunk/jmx/src/assembly/Start.xml (from rev 81441, trunk/jmx/src/assembly/Start.xml)
===================================================================
--- trunk/jmx/src/assembly/Start.xml (rev 0)
+++ trunk/jmx/src/assembly/Start.xml 2009-01-28 19:27:30 UTC (rev 83577)
@@ -0,0 +1,17 @@
+<assembly>
+ <id>Start</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>target/classes</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>test/implementation/loading/support/Start*.class</include>
+ <include>test/implementation/loading/support/AClass.class</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Copied: trunk/jmx/src/assembly/Target.xml (from rev 81441, trunk/jmx/src/assembly/Target.xml)
===================================================================
--- trunk/jmx/src/assembly/Target.xml (rev 0)
+++ trunk/jmx/src/assembly/Target.xml 2009-01-28 19:27:30 UTC (rev 83577)
@@ -0,0 +1,17 @@
+<assembly>
+ <id>Target</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>target/classes</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>test/implementation/loading/support/Target*.class</include>
+ <include>test/implementation/loading/support/AClass.class</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Deleted: trunk/mbeans/component-info.xml
===================================================================
--- trunk/mbeans/component-info.xml 2009-01-28 18:18:46 UTC (rev 83576)
+++ trunk/mbeans/component-info.xml 2009-01-28 19:27:30 UTC (rev 83577)
@@ -1,20 +0,0 @@
-<project name="mbeans-component-info">
-
- <!-- ============================================================ -->
- <!-- MBEANS -->
- <!-- ============================================================ -->
-
- <component id="mbeans"
- module="mbeans"
- version="5.0-SNAPSHOT"
- >
- <artifact id="jboss-mbeans.jar"/>
- <artifact id="jboss_xmbean_1_0.dtd" />
- <artifact id="jboss_xmbean_1.1.dtd"/>
- <artifact id="jboss_xmbean_1.2.dtd"/>
- <export>
- <include input="jboss-mbeans.jar"/>
- </export>
- </component>
-
-</project>
\ No newline at end of file
Modified: trunk/mbeans/pom.xml
===================================================================
--- trunk/mbeans/pom.xml 2009-01-28 18:18:46 UTC (rev 83576)
+++ trunk/mbeans/pom.xml 2009-01-28 19:27:30 UTC (rev 83577)
@@ -15,7 +15,7 @@
<build>
<sourceDirectory>src/main</sourceDirectory>
- <testSourceDirectory>src/tests</testSourceDirectory>
+ <!--<testSourceDirectory>src/tests</testSourceDirectory>-->
<resources>
<resource>
<directory>src/resources</directory>
@@ -24,13 +24,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<excludes>
@@ -38,6 +31,55 @@
</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/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-mbeans.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/pom.xml
===================================================================
--- trunk/pom.xml 2009-01-28 18:18:46 UTC (rev 83576)
+++ trunk/pom.xml 2009-01-28 19:27:30 UTC (rev 83577)
@@ -434,6 +434,8 @@
<module>bootstrap</module>
<module>main</module>
<module>j2se</module>
+ <module>mbeans</module>
+ <module>jmx</module>
</modules>
</profile>
More information about the jboss-cvs-commits
mailing list