[jboss-cvs] JBossAS SVN: r81325 - in trunk: aspects/src/assembly and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Nov 19 16:58:30 EST 2008
Author: pgier
Date: 2008-11-19 16:58:30 -0500 (Wed, 19 Nov 2008)
New Revision: 81325
Added:
trunk/aspects/src/assembly/jboss-aspect-library.xml
trunk/cluster/src/assembly/jboss-ha-legacy-client.xml
Removed:
trunk/aspects/src/assembly/jboss-aspect-library-jdk50.xml
trunk/cluster/src/assembly/ha-legacy-client.xml
trunk/cluster/src/assembly/jbossha.xml
Modified:
trunk/aspects/pom.xml
trunk/aspects/src/assembly/jboss-aspect-jdk50-client.xml
trunk/cluster/pom.xml
Log:
[JBBUILD-498] Update assemblies for aspects and cluster modules.
Modified: trunk/aspects/pom.xml
===================================================================
--- trunk/aspects/pom.xml 2008-11-19 21:18:30 UTC (rev 81324)
+++ trunk/aspects/pom.xml 2008-11-19 21:58:30 UTC (rev 81325)
@@ -63,6 +63,10 @@
<artifactId>jboss-security-spi</artifactId>
</dependency>
<dependency>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-as-int</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss.cluster</groupId>
<artifactId>jboss-ha-client</artifactId>
</dependency>
Modified: trunk/aspects/src/assembly/jboss-aspect-jdk50-client.xml
===================================================================
--- trunk/aspects/src/assembly/jboss-aspect-jdk50-client.xml 2008-11-19 21:18:30 UTC (rev 81324)
+++ trunk/aspects/src/assembly/jboss-aspect-jdk50-client.xml 2008-11-19 21:58:30 UTC (rev 81325)
@@ -4,33 +4,53 @@
<format>jar</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>target/classes</directory>
- <outputDirectory>/</outputDirectory>
+ <dependencySets>
+ <dependencySet>
<includes>
- <include>org/jboss/aspects/asynch/AsynchExecutor.class</include>
- <include>org/jboss/aspects/asynch/AsynchProvider.class</include>
- <include>org/jboss/aspects/asynch/AsynchProxyInterceptor.class</include>
- <include>org/jboss/aspects/asynch/AsynchMixin.class</include>
- <include>org/jboss/aspects/asynch/Future.class</include>
- <include>org/jboss/aspects/asynch/FutureImpl.class</include>
- <include>org/jboss/aspects/asynch/FutureHolder.class</include>
- <include>org/jboss/aspects/asynch/FutureInvocationHandler.class</include>
- <include>org/jboss/aspects/asynch/RemotableFuture.class</include>
- <include>org/jboss/aspects/asynch/TimeoutException.class</include>
- <include>org/jboss/aspects/asynch/ThreadPoolExecutor*.class</include>
- <include>org/jboss/aspects/remoting/ClusterConstants.class</include>
- <include>org/jboss/aspects/remoting/ClusterChooserInterceptor.class</include>
- <include>org/jboss/aspects/remoting/FamilyWrapper.class</include>
- <include>org/jboss/aspects/remoting/InvokeRemoteInterceptor.class</include>
- <include>org/jboss/aspects/remoting/IsLocalInterceptor.class</include>
- <include>org/jboss/aspects/remoting/MergeMetaDataInterceptor.class</include>
- <include>org/jboss/aspects/remoting/PojiProxy.class</include>
- <include>org/jboss/aspects/tx/ClientTxPropagationInterceptor.class</include>
- <include>org/jboss/aspects/security/SecurityClientInterceptor.class</include>
- <include>org/jboss/aspects/security/SecurityActions*.class</include>
+ <include>org.jboss.ejb3:jboss-ejb3-async</include>
</includes>
- </fileSet>
- </fileSets>
+ <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>
+ <unpackOptions>
+ <includes>
+ <include>org/jboss/aspects/remoting/InvokeRemoteInterceptor.class</include>
+ <include>org/jboss/aspects/remoting/IsLocalInterceptor.class</include>
+ <include>org/jboss/aspects/remoting/MergeMetaDataInterceptor.class</include>
+ <include>org/jboss/aspects/remoting/PojiProxy.class</include>
+ </includes>
+ </unpackOptions>
+ </dependencySet>
+ <dependencySet>
+ <includes>
+ <include>org.jboss.aspects:jboss-transaction-aspects</include>
+ </includes>
+ <unpack>true</unpack>
+ <unpackOptions>
+ <includes>
+ <include>org/jboss/aspects/tx/ClientTxPropagationInterceptor.class</include>
+ </includes>
+ </unpackOptions>
+ </dependencySet>
+ <dependencySet>
+ <includes>
+ <include>org.jboss.cluster:jboss-ha-client</include>
+ </includes>
+ <unpack>true</unpack>
+ <unpackOptions>
+ <includes>
+ <include>org/jboss/aspects/remoting/**.class</include>
+ </includes>
+ </unpackOptions>
+ </dependencySet>
+ </dependencySets>
</assembly>
\ No newline at end of file
Deleted: trunk/aspects/src/assembly/jboss-aspect-library-jdk50.xml
===================================================================
--- trunk/aspects/src/assembly/jboss-aspect-library-jdk50.xml 2008-11-19 21:18:30 UTC (rev 81324)
+++ trunk/aspects/src/assembly/jboss-aspect-library-jdk50.xml 2008-11-19 21:58:30 UTC (rev 81325)
@@ -1,24 +0,0 @@
-<assembly>
- <id>jboss-aspect-library-jdk50</id>
- <formats>
- <format>jar</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>target/classes</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>org/jboss/aop/junit/**</include>
- <include>org/jboss/aspects/**</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>src/resources</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>org/jboss/**/*.xml</include>
- </includes>
- </fileSet>
- </fileSets>
-</assembly>
\ No newline at end of file
Copied: trunk/aspects/src/assembly/jboss-aspect-library.xml (from rev 81289, trunk/aspects/src/assembly/jboss-aspect-library-jdk50.xml)
===================================================================
--- trunk/aspects/src/assembly/jboss-aspect-library.xml (rev 0)
+++ trunk/aspects/src/assembly/jboss-aspect-library.xml 2008-11-19 21:58:30 UTC (rev 81325)
@@ -0,0 +1,71 @@
+<assembly>
+ <id>jboss-aspect-library</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>target/classes</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>org/jboss/aop/junit/**</include>
+ <include>org/jboss/aspects/**</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>src/etc</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>org/jboss/**/*.xml</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+ <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>
+ <unpackOptions>
+ <includes>
+ <include>org/jboss/aspects/currentinvocation/**.class</include>
+ </includes>
+ </unpackOptions>
+ </dependencySet>
+ <dependencySet>
+ <includes>
+ <include>org.jboss.aspects:jboss-remoting-aspects</include>
+ </includes>
+ <unpack>true</unpack>
+ <unpackOptions>
+ <includes>
+ <include>org/jboss/aspects/remoting/**.class</include>
+ </includes>
+ </unpackOptions>
+ </dependencySet>
+ <dependencySet>
+ <includes>
+ <include>org.jboss.aspects:jboss-transaction-aspects</include>
+ </includes>
+ <unpack>true</unpack>
+ <unpackOptions>
+ <includes>
+ <include>org/jboss/aspects/tx/**.class</include>
+ <include>org/jboss/aspects/txlock/**.class</include>
+ </includes>
+ </unpackOptions>
+ </dependencySet>
+ </dependencySets>
+</assembly>
\ No newline at end of file
Modified: trunk/cluster/pom.xml
===================================================================
--- trunk/cluster/pom.xml 2008-11-19 21:18:30 UTC (rev 81324)
+++ trunk/cluster/pom.xml 2008-11-19 21:58:30 UTC (rev 81325)
@@ -14,14 +14,56 @@
<description>JBoss Application Server (cluster module)</description>
<build>
<sourceDirectory>src/main</sourceDirectory>
- <resources>
- <resource>
- <directory>src/resources</directory>
- </resource>
- </resources>
<plugins>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>add-example-sources</id>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>src/examples</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <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>org/jboss/ha/framework/server/DistributedReplicantManagerImpl.class</include>
+ <include>org/jboss/ha/framework/server/DistributedStateImpl.class</include>
+ <include>org/jboss/ha/jndi/HAJNDI.class</include>
+ <include>org/jboss/ha/framework/server/HARMIServerImpl.class</include>
+ </includes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>org/jboss/mq/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
Deleted: trunk/cluster/src/assembly/ha-legacy-client.xml
===================================================================
--- trunk/cluster/src/assembly/ha-legacy-client.xml 2008-11-19 21:18:30 UTC (rev 81324)
+++ trunk/cluster/src/assembly/ha-legacy-client.xml 2008-11-19 21:58:30 UTC (rev 81325)
@@ -1,23 +0,0 @@
-<assembly>
- <id>ha-legacy-client</id>
- <formats>
- <format>jar</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>target/classes</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>org/jboss/ha/framework/interfaces/**</include>
- <include>org/jboss/ha/hasessionstate/interfaces/**</include>
- <include>org/jboss/invocation/jrmp/interfaces/**</include>
- <include>org/jboss/invocation/http/interfaces/**</include>
- <include>org/jboss/invocation/unified/interfaces/**</include>
- <include>org/jboss/invocation/InvokerProxyHA**</include>
- <include>org/jboss/ha/**/*Stub.class</include>
- <include>org/jboss/ha/framework/test/ExplicitFailoverClientInterceptor.class</include>
- </includes>
- </fileSet>
- </fileSets>
-</assembly>
\ No newline at end of file
Copied: trunk/cluster/src/assembly/jboss-ha-legacy-client.xml (from rev 81289, trunk/cluster/src/assembly/ha-legacy-client.xml)
===================================================================
--- trunk/cluster/src/assembly/jboss-ha-legacy-client.xml (rev 0)
+++ trunk/cluster/src/assembly/jboss-ha-legacy-client.xml 2008-11-19 21:58:30 UTC (rev 81325)
@@ -0,0 +1,24 @@
+<assembly>
+ <id>jboss-ha-legacy-client</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>target/classes</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>org/jboss/ha/framework/interfaces/**</include>
+ <include>org/jboss/ha/hasessionstate/interfaces/**</include>
+ <include>org/jboss/invocation/jrmp/interfaces/**</include>
+ <include>org/jboss/invocation/http/interfaces/**</include>
+ <include>org/jboss/invocation/unified/interfaces/**</include>
+ <include>org/jboss/invocation/InvokerProxyHA**</include>
+ <include>org/jboss/ha/**/*Stub.class</include>
+ <include>org/jboss/proxy/*</include>
+ <include>org/jboss/ha/framework/test/ExplicitFailoverClientInterceptor.class</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Deleted: trunk/cluster/src/assembly/jbossha.xml
===================================================================
--- trunk/cluster/src/assembly/jbossha.xml 2008-11-19 21:18:30 UTC (rev 81324)
+++ trunk/cluster/src/assembly/jbossha.xml 2008-11-19 21:58:30 UTC (rev 81325)
@@ -1,19 +0,0 @@
-<assembly>
- <id>jbossha</id>
- <formats>
- <format>jar</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>target/classes</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>**</include>
- </includes>
- <excludes>
- <exclude>org/jboss/mq/**</exclude>
- </excludes>
- </fileSet>
- </fileSets>
-</assembly>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list