[jboss-cvs] JBossAS SVN: r81452 - in trunk: jmx-remoting and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Nov 21 14:56:17 EST 2008
Author: pgier
Date: 2008-11-21 14:56:16 -0500 (Fri, 21 Nov 2008)
New Revision: 81452
Added:
trunk/server/src/assembly/jmx-adaptor-plugin.xml
Modified:
trunk/jmx-remoting/pom.xml
trunk/main/pom.xml
trunk/management/build.xml
trunk/management/pom.xml
trunk/mbeans/pom.xml
trunk/pom.xml
trunk/profileservice/pom.xml
trunk/server/pom.xml
trunk/server/src/assembly/jboss.xml
trunk/server/src/assembly/verifier.xml
Log:
[JBBUILD-498] Update maven assemblies to match ant output.
Modified: trunk/jmx-remoting/pom.xml
===================================================================
--- trunk/jmx-remoting/pom.xml 2008-11-21 18:12:04 UTC (rev 81451)
+++ trunk/jmx-remoting/pom.xml 2008-11-21 19:56:16 UTC (rev 81452)
@@ -14,11 +14,36 @@
<description>JBoss Application Server (jmx-remoting module)</description>
<build>
<sourceDirectory>src/main</sourceDirectory>
- <resources>
- <resource>
- <directory>src/resources</directory>
- </resource>
- </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rmic-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>rmi-compile</id>
+ <goals>
+ <goal>rmic</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+ <includes>
+ <include>**/RMIServerImpl.class</include>
+ <include>**/RMIConnectionImpl.class</include>
+ </includes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>test/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
<dependencies>
<!-- Compile (global dependencies) -->
Modified: trunk/main/pom.xml
===================================================================
--- trunk/main/pom.xml 2008-11-21 18:12:04 UTC (rev 81451)
+++ trunk/main/pom.xml 2008-11-21 19:56:16 UTC (rev 81452)
@@ -20,16 +20,32 @@
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
- <id>assembly</id>
+ <id>assemble-jars</id>
<goals>
<goal>attached</goal>
</goals>
<phase>package</phase>
+ <configuration>
+ <descriptorSourceDirectory>src/assembly</descriptorSourceDirectory>
+ </configuration>
</execution>
+ <execution>
+ <id>assemble-run-jar</id>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <descriptor>src/assembly/run.xml</descriptor>
+ <archive>
+ <manifestEntries>
+ <Main-Class>org.jboss.Main</Main-Class>
+ <Class-Path>../client/getopt.jar</Class-Path>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </execution>
</executions>
- <configuration>
- <descriptorSourceDirectory>src/assembly</descriptorSourceDirectory>
- </configuration>
</plugin>
</plugins>
</build>
Modified: trunk/management/build.xml
===================================================================
--- trunk/management/build.xml 2008-11-21 18:12:04 UTC (rev 81451)
+++ trunk/management/build.xml 2008-11-21 19:56:16 UTC (rev 81452)
@@ -231,7 +231,7 @@
sourcebase="${build.classes}"
verify="${rmic.verify}"
debug="${rmic.debug}"
- stubVersion="${rmic.stubVersion}"
+ stubversion="${rmic.stubVersion}"
>
<classpath refid="javac.classpath"/>
<include name="${rmic.includes}"/>
Modified: trunk/management/pom.xml
===================================================================
--- trunk/management/pom.xml 2008-11-21 18:12:04 UTC (rev 81451)
+++ trunk/management/pom.xml 2008-11-21 19:56:16 UTC (rev 81452)
@@ -12,6 +12,7 @@
<name>JBoss Application Server Management</name>
<url>http://www.jboss.org/jbossas</url>
<description>JBoss Application Server (management module)</description>
+
<build>
<sourceDirectory>src/main</sourceDirectory>
<resources>
@@ -21,6 +22,25 @@
</resources>
<plugins>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rmic-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>rmi-compile</id>
+ <goals>
+ <goal>rmic</goal>
+ </goals>
+ <configuration>
+ <keep>true</keep>
+ <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+ <includes>
+ <include>org/jboss/management/mejb/RMIClientNotificationListener.class</include>
+ </includes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
@@ -47,6 +67,7 @@
</plugin>
</plugins>
</build>
+
<dependencies>
<!-- Compile (global dependencies) -->
<dependency>
Modified: trunk/mbeans/pom.xml
===================================================================
--- trunk/mbeans/pom.xml 2008-11-21 18:12:04 UTC (rev 81451)
+++ trunk/mbeans/pom.xml 2008-11-21 19:56:16 UTC (rev 81452)
@@ -12,6 +12,7 @@
<name>JBoss Application Server MBeans</name>
<url>http://www.jboss.org/jbossas</url>
<description>JBoss Application Server (mbeans module)</description>
+
<build>
<sourceDirectory>src/main</sourceDirectory>
<testSourceDirectory>src/tests</testSourceDirectory>
@@ -26,12 +27,20 @@
<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>
+ <exclude>mbean-info-db-service.xml</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
</plugins>
</build>
+
<dependencies>
<!-- Compile (global dependencies) -->
<dependency>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2008-11-21 18:12:04 UTC (rev 81451)
+++ trunk/pom.xml 2008-11-21 19:56:16 UTC (rev 81452)
@@ -89,6 +89,11 @@
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.2</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.3</version>
+ </plugin>
</plugins>
</pluginManagement>
Modified: trunk/profileservice/pom.xml
===================================================================
--- trunk/profileservice/pom.xml 2008-11-21 18:12:04 UTC (rev 81451)
+++ trunk/profileservice/pom.xml 2008-11-21 19:56:16 UTC (rev 81452)
@@ -14,14 +14,30 @@
<description>JBoss Application Server (profileservice module)</description>
<build>
<sourceDirectory>src/main</sourceDirectory>
- <resources>
- <resource>
- <directory>src/resources</directory>
- <includes>
- <include>dtd/**</include>
- </includes>
- </resource>
- </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-properties</id>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <phase>process-classes</phase>
+ <configuration>
+ <tasks>
+ <copy todir="${project.build.outputDirectory}">
+ <fileset dir="${project.build.sourceDirectory}">
+ <include name="**/*.properties"/>
+ </fileset>
+ </copy>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
<dependencies>
<!-- Compile (global dependencies) -->
Modified: trunk/server/pom.xml
===================================================================
--- trunk/server/pom.xml 2008-11-21 18:12:04 UTC (rev 81451)
+++ trunk/server/pom.xml 2008-11-21 19:56:16 UTC (rev 81452)
@@ -12,13 +12,9 @@
<name>JBoss Application Server Server</name>
<url>http://www.jboss.org/jbossas</url>
<description>JBoss Application Server (server module)</description>
+
<build>
<sourceDirectory>src/main</sourceDirectory>
- <resources>
- <resource>
- <directory>src/resources</directory>
- </resource>
- </resources>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -69,6 +65,7 @@
<goal>rmic</goal>
</goals>
<configuration>
+ <outputDirectory>${project.build.outputDirectory}</outputDirectory>
<includes>
<include>org/jboss/tm/usertx/server/UserTransactionSessionFactoryImpl.class</include>
<include>org/jboss/tm/usertx/server/UserTransactionSessionImpl.class</include>
@@ -87,25 +84,80 @@
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
- <id>assembly</id>
+ <id>assemble-jars</id>
<goals>
<goal>attached</goal>
</goals>
<phase>package</phase>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/client.xml</descriptor>
+ <descriptor>src/assembly/jboss.xml</descriptor>
+ <descriptor>src/assembly/jboss-minimal.xml</descriptor>
+ <descriptor>src/assembly/jmx-adaptor-plugin.xml</descriptor>
+ <descriptor>src/assembly/jmx-invoker-adaptor-client.xml</descriptor>
+ </descriptors>
+ </configuration>
</execution>
+ <execution>
+ <id>assemble-shutdown-jar</id>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/shutdown.xml</descriptor>
+ </descriptors>
+ <archive>
+ <manifestEntries>
+ <Main-Class>org.jboss.Shutdown</Main-Class>
+ <Class-Path>../client/jbossall-client.jar ../client/log4j.jar ../lib/jboss-jmx.jar</Class-Path>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </execution>
+ <execution>
+ <id>assemble-testsuite-support-jar</id>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/testsuite-support.xml</descriptor>
+ </descriptors>
+ <archive>
+ <manifestEntries>
+ <Main-Class>org.jboss.jmx.service.Deployer</Main-Class>
+ <Class-Path>./ jnp-client.jar jboss-jmx.jar ../conf/ ../lib/jboss-jmx.jar</Class-Path>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </execution>
+ <execution>
+ <id>assemble-verifier-jar</id>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/verifier.xml</descriptor>
+ </descriptors>
+ <archive>
+ <manifestEntries>
+ <Main-Class>org.jboss.verifier.Main</Main-Class>
+ <Class-Path>../lib/ext/jpl-util-0_5b.jar ../client/jboss-j2ee.jar ../lib/jaxp.jar ../lib/crimson.jar ../external/metadata.jar</Class-Path>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </execution>
</executions>
- <configuration>
- <descriptorSourceDirectory>src/assembly</descriptorSourceDirectory>
- <archive>
- <manifest>
- <addDefaultImplementationEntries/>
- <addDefaultSpecificationEntries/>
- </manifest>
- </archive>
- </configuration>
</plugin>
</plugins>
</build>
+
<dependencies>
<!-- Compile (global dependencies) -->
<dependency>
Modified: trunk/server/src/assembly/jboss.xml
===================================================================
--- trunk/server/src/assembly/jboss.xml 2008-11-21 18:12:04 UTC (rev 81451)
+++ trunk/server/src/assembly/jboss.xml 2008-11-21 19:56:16 UTC (rev 81452)
@@ -10,15 +10,12 @@
<outputDirectory>/</outputDirectory>
<includes>
<include>org/jboss/**</include>
-
- <!-- Exclude command line utilities -->
- <include>org/jboss/*</include>
-
- <!-- Exclude JMX Connector stuff we will use the connector SAR for that -->
- <include>org/jboss/jmx/**</include>
-
</includes>
<excludes>
+ <!-- Exclude command line utilities -->
+ <exclude>org/jboss/*</exclude>
+ <!-- Exclude JMX Connector stuff we will use the connector SAR for that -->
+ <exclude>org/jboss/jmx/**</exclude>
<!-- Exclude key factory stuff -->
<exclude>org/jboss/ejb/plugins/keygenerator/uuid/**</exclude>
<exclude>org/jboss/ejb/plugins/keygenerator/hilo/**</exclude>
Added: trunk/server/src/assembly/jmx-adaptor-plugin.xml
===================================================================
--- trunk/server/src/assembly/jmx-adaptor-plugin.xml (rev 0)
+++ trunk/server/src/assembly/jmx-adaptor-plugin.xml 2008-11-21 19:56:16 UTC (rev 81452)
@@ -0,0 +1,16 @@
+<assembly>
+ <id>jmx-adaptor-plugin</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>target/classes</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>org/jboss/jmx/**</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Property changes on: trunk/server/src/assembly/jmx-adaptor-plugin.xml
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: trunk/server/src/assembly/verifier.xml
===================================================================
--- trunk/server/src/assembly/verifier.xml 2008-11-21 18:12:04 UTC (rev 81451)
+++ trunk/server/src/assembly/verifier.xml 2008-11-21 19:56:16 UTC (rev 81452)
@@ -13,13 +13,8 @@
</includes>
</fileSet>
<fileSet>
- <directory>src/resources</directory>
+ <directory>src/resources/org/jboss/verifier</directory>
<outputDirectory>/</outputDirectory>
- <includes>
- <include>org/jboss/jmx/**</include>
- </includes>
- <excludes>
- </excludes>
</fileSet>
</fileSets>
</assembly>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list