[jboss-cvs] JBossAS SVN: r81442 - in trunk: iiop/src/assembly and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Nov 21 10:56:16 EST 2008
Author: pgier
Date: 2008-11-21 10:56:16 -0500 (Fri, 21 Nov 2008)
New Revision: 81442
Removed:
trunk/jmx/src/assembly/MyMBeans.xml
trunk/jmx/src/assembly/Start.xml
trunk/jmx/src/assembly/Target.xml
Modified:
trunk/iiop/pom.xml
trunk/iiop/src/assembly/client.xml
trunk/j2se/src/assembly/jboss-jmx-compliance.xml
trunk/j2se/src/assembly/jmxcompliance-Test.xml
trunk/jbossas/remoting/pom.xml
trunk/jbossmq/pom.xml
trunk/jmx/pom.xml
trunk/jmx/src/assembly/jboss-jmx-testsuite.xml
Log:
[JBBUILD-498] Update maven assemblies to match ant output.
Modified: trunk/iiop/pom.xml
===================================================================
--- trunk/iiop/pom.xml 2008-11-21 15:51:40 UTC (rev 81441)
+++ trunk/iiop/pom.xml 2008-11-21 15:56:16 UTC (rev 81442)
@@ -14,16 +14,10 @@
<description>JBoss Application Server (iiop module)</description>
<build>
<sourceDirectory>src/main</sourceDirectory>
- <resources>
- <resource>
- <directory>src/resources</directory>
- </resource>
- </resources>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>idlj-maven-plugin</artifactId>
- <version>1.0</version>
<executions>
<execution>
<goals>
@@ -65,7 +59,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>rmic-maven-plugin</artifactId>
- <version>1.0-beta-1</version>
<executions>
<execution>
<id>rmi compile</id>
@@ -78,6 +71,7 @@
<include>javax.ejb.EJBObject</include>
<include>javax.ejb.EJBHome</include>
</includes>
+ <outputDirectory>${project.build.outputDirectory}</outputDirectory>
</configuration>
</execution>
</executions>
Modified: trunk/iiop/src/assembly/client.xml
===================================================================
--- trunk/iiop/src/assembly/client.xml 2008-11-21 15:51:40 UTC (rev 81441)
+++ trunk/iiop/src/assembly/client.xml 2008-11-21 15:56:16 UTC (rev 81442)
@@ -11,6 +11,7 @@
<includes>
<include>**/jboss/iiop/CorbaORB.class</include>
<include>**/jboss/iiop/StubClassLoader.class</include>
+ <include>**/jboss/iiop/JBossUtilDelegate.class</include>
<include>**/jboss/iiop/rmi/*</include>
<include>**/jboss/iiop/rmi/marshal/*</include>
<include>**/jboss/iiop/rmi/marshal/strategy/StubStrategy.class</include>
@@ -21,19 +22,13 @@
<include>**/jboss/proxy/ejb/IIOPHomeFactory.class</include>
<include>**/jboss/tm/**</include>
<include>**/jboss/util/Log4jLoggerFactory.class</include>
+ <include>org/omg/stub/javax/ejb/_EJBHome_Stub.class</include>
+ <include>org/omg/stub/javax/ejb/_EJBObject_Stub.class</include>
</includes>
<excludes>
<exclude>**/jboss/tm/iiop/TransactionServiceImpl*</exclude>
<exclude>**/jboss/tm/iiop/*POA*</exclude>
</excludes>
</fileSet>
- <fileSet>
- <directory>target/rmi-classes</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>org/omg/stub/javax/ejb/_EJBHome_Stub.class</include>
- <include>org/omg/stub/javax/ejb/_EJBObject_Stub.class</include>
- </includes>
- </fileSet>
</fileSets>
</assembly>
\ No newline at end of file
Modified: trunk/j2se/src/assembly/jboss-jmx-compliance.xml
===================================================================
--- trunk/j2se/src/assembly/jboss-jmx-compliance.xml 2008-11-21 15:51:40 UTC (rev 81441)
+++ trunk/j2se/src/assembly/jboss-jmx-compliance.xml 2008-11-21 15:56:16 UTC (rev 81442)
@@ -10,9 +10,11 @@
<outputDirectory>/</outputDirectory>
<includes>
<include>org/jboss/test/**</include>
- <include>org/jboss/test/jmx/compliance/loading/support/*.class</include>
- <include>org/jboss/test/jmx/compliance/server/support/AClass.*</include>
</includes>
+ <excludes>
+ <exclude>org/jboss/test/jmx/compliance/loading/support/*.class</exclude>
+ <exclude>org/jboss/test/jmx/compliance/server/support/AClass.*</exclude>
+ </excludes>
</fileSet>
</fileSets>
</assembly>
\ No newline at end of file
Modified: trunk/j2se/src/assembly/jmxcompliance-Test.xml
===================================================================
--- trunk/j2se/src/assembly/jmxcompliance-Test.xml 2008-11-21 15:51:40 UTC (rev 81441)
+++ trunk/j2se/src/assembly/jmxcompliance-Test.xml 2008-11-21 15:56:16 UTC (rev 81442)
@@ -9,9 +9,7 @@
<directory>target/test-classes</directory>
<outputDirectory>/</outputDirectory>
<includes>
- <include>org/jboss/test/**</include>
- <include>org/jboss/test/jmx/compliance/loading/support/*.class</include>
- <include>org/jboss/test/jmx/compliance/server/support/AClass.*</include>
+ <include>org/jboss/test/jmx/compliance/server/support/AClass.class</include>
</includes>
</fileSet>
</fileSets>
Modified: trunk/jbossas/remoting/pom.xml
===================================================================
--- trunk/jbossas/remoting/pom.xml 2008-11-21 15:51:40 UTC (rev 81441)
+++ trunk/jbossas/remoting/pom.xml 2008-11-21 15:56:16 UTC (rev 81442)
@@ -14,11 +14,18 @@
<description>JBoss Application Server (jbossas-remoting module)</description>
<build>
<sourceDirectory>src/main</sourceDirectory>
- <resources>
- <resource>
- <directory>src/resources</directory>
- </resource>
- </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>org/jboss/remoting/**</include>
+ <include>org/jboss/aspects/remoting/**</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
<dependencies>
<!-- Compile (global dependencies) -->
Modified: trunk/jbossmq/pom.xml
===================================================================
--- trunk/jbossmq/pom.xml 2008-11-21 15:51:40 UTC (rev 81441)
+++ trunk/jbossmq/pom.xml 2008-11-21 15:56:16 UTC (rev 81442)
@@ -14,11 +14,6 @@
<description>JBoss Application Server (jbossmq module)</description>
<build>
<sourceDirectory>src/main</sourceDirectory>
- <resources>
- <resource>
- <directory>src/resources</directory>
- </resource>
- </resources>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -30,7 +25,6 @@
<goal>javacc</goal>
</goals>
<configuration>
- <packageName>org.jboss.mq.selectors</packageName>
<isStatic>false</isStatic>
</configuration>
</execution>
@@ -38,6 +32,33 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.4</source>
+ <target>1.4</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rmic-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>rmi-compile</id>
+ <goals>
+ <goal>rmic</goal>
+ </goals>
+ <configuration>
+ <includes>
+ <include>org/jboss/mq/il/rmi/RMIServerIL.class</include>
+ <include>org/jboss/mq/il/rmi/RMIClientIL.class</include>
+ </includes>
+ <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
Modified: trunk/jmx/pom.xml
===================================================================
--- trunk/jmx/pom.xml 2008-11-21 15:51:40 UTC (rev 81441)
+++ trunk/jmx/pom.xml 2008-11-21 15:56:16 UTC (rev 81442)
@@ -22,6 +22,15 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>test/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
Deleted: trunk/jmx/src/assembly/MyMBeans.xml
===================================================================
--- trunk/jmx/src/assembly/MyMBeans.xml 2008-11-21 15:51:40 UTC (rev 81441)
+++ trunk/jmx/src/assembly/MyMBeans.xml 2008-11-21 15:56:16 UTC (rev 81442)
@@ -1,16 +0,0 @@
-<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
Deleted: trunk/jmx/src/assembly/Start.xml
===================================================================
--- trunk/jmx/src/assembly/Start.xml 2008-11-21 15:51:40 UTC (rev 81441)
+++ trunk/jmx/src/assembly/Start.xml 2008-11-21 15:56:16 UTC (rev 81442)
@@ -1,17 +0,0 @@
-<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
Deleted: trunk/jmx/src/assembly/Target.xml
===================================================================
--- trunk/jmx/src/assembly/Target.xml 2008-11-21 15:51:40 UTC (rev 81441)
+++ trunk/jmx/src/assembly/Target.xml 2008-11-21 15:56:16 UTC (rev 81442)
@@ -1,17 +0,0 @@
-<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
Modified: trunk/jmx/src/assembly/jboss-jmx-testsuite.xml
===================================================================
--- trunk/jmx/src/assembly/jboss-jmx-testsuite.xml 2008-11-21 15:51:40 UTC (rev 81441)
+++ trunk/jmx/src/assembly/jboss-jmx-testsuite.xml 2008-11-21 15:56:16 UTC (rev 81442)
@@ -1,5 +1,5 @@
<assembly>
- <id>MyMBeans</id>
+ <id>jboss-jmx-testsuite</id>
<formats>
<format>jar</format>
</formats>
More information about the jboss-cvs-commits
mailing list