[jboss-cvs] JBossAS SVN: r80675 - in trunk: ejb3/src/assembly and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Nov 7 12:21:38 EST 2008
Author: pgier
Date: 2008-11-07 12:21:38 -0500 (Fri, 07 Nov 2008)
New Revision: 80675
Added:
trunk/ejb3/src/assembly/client.xml
trunk/ejb3/src/assembly/deployer.xml
trunk/ejb3/src/assembly/iiop.xml
trunk/main/src/assembly/client.xml
Removed:
trunk/ejb3/src/assembly/hibernate-client.xml
trunk/ejb3/src/assembly/jboss-ejb3-client.xml
trunk/ejb3/src/assembly/jboss-ejb3.xml
trunk/main/src/assembly/jboss-main-client.xml
Modified:
trunk/ejb3/pom.xml
Log:
[JBBUILD-498] Some updates to the maven assemblies.
Modified: trunk/ejb3/pom.xml
===================================================================
--- trunk/ejb3/pom.xml 2008-11-07 17:21:31 UTC (rev 80674)
+++ trunk/ejb3/pom.xml 2008-11-07 17:21:38 UTC (rev 80675)
@@ -12,6 +12,7 @@
<name>JBoss Application Server EJB3</name>
<url>http://www.jboss.com/products/jbossas</url>
<description>JBoss Application Server (ejb3 module)</description>
+
<build>
<sourceDirectory>src/main</sourceDirectory>
<resources>
@@ -19,7 +20,26 @@
<directory>src/resources</directory>
</resource>
</resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>assembly</id>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ <configuration>
+ <descriptorSourceDirectory>src/assembly</descriptorSourceDirectory>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
+
<dependencies>
<dependency>
<groupId>apache-xerces</groupId>
Added: trunk/ejb3/src/assembly/client.xml
===================================================================
--- trunk/ejb3/src/assembly/client.xml (rev 0)
+++ trunk/ejb3/src/assembly/client.xml 2008-11-07 17:21:38 UTC (rev 80675)
@@ -0,0 +1,18 @@
+<!-- This file should be equivalent to jboss-appclient.jar -->
+<assembly>
+ <id>client</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>target/classes</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>org/jboss/ejb3/client/**</include>
+ <include>org/jboss/ejb3/clientmodule/**</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Property changes on: trunk/ejb3/src/assembly/client.xml
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Added: trunk/ejb3/src/assembly/deployer.xml
===================================================================
--- trunk/ejb3/src/assembly/deployer.xml (rev 0)
+++ trunk/ejb3/src/assembly/deployer.xml 2008-11-07 17:21:38 UTC (rev 80675)
@@ -0,0 +1,18 @@
+<assembly>
+ <id>deployer</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>target/classes</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>org/jboss/as/**</include>
+ <include>org/jboss/ejb3/deployers/**</include>
+ <include>org/jboss/ejb3/clientmodule/*</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Property changes on: trunk/ejb3/src/assembly/deployer.xml
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Deleted: trunk/ejb3/src/assembly/hibernate-client.xml
===================================================================
--- trunk/ejb3/src/assembly/hibernate-client.xml 2008-11-07 17:21:31 UTC (rev 80674)
+++ trunk/ejb3/src/assembly/hibernate-client.xml 2008-11-07 17:21:38 UTC (rev 80675)
@@ -1,32 +0,0 @@
-<assembly>
- <id>hibernate-client</id>
- <formats>
- <format>jar</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
- <dependencySet>
- <unpack>true</unpack>
- <includes>
- <include>hibernate:hibernate3</include>
- </includes>
- <unpackOptions>
- <includes>
- <include>org/hibernate/AssertionFailure.class</include>
- <include>org/hibernate/**/*Exception.class</include>
- <include>org/hibernate/collection/**</include>
- <include>org/hibernate/exception/Nestable*.class</include>
- <include>org/hibernate/exception/ExceptionUtils.class</include>
- <include>org/hibernate/engine/SessionImplementor.class</include>
- <include>org/hibernate/loader/CollectionAliases.class</include>
- <include>org/hibernate/persister/collection/**</include>
- <include>org/hibernate/pretty/MessageHelper.class</include>
- <include>org/hibernate/type/Type.class</include>
- <include>org/hibernate/EntityMode.class</include>
- <include>org/hibernate/util/**</include>
- <include>org/hibernate/proxy/**</include>
- </includes>
- </unpackOptions>
- </dependencySet>
- </dependencySets>
-</assembly>
\ No newline at end of file
Added: trunk/ejb3/src/assembly/iiop.xml
===================================================================
--- trunk/ejb3/src/assembly/iiop.xml (rev 0)
+++ trunk/ejb3/src/assembly/iiop.xml 2008-11-07 17:21:38 UTC (rev 80675)
@@ -0,0 +1,16 @@
+<assembly>
+ <id>iiop</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>target/classes</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>org/jboss/ejb3/iiop/**</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Property changes on: trunk/ejb3/src/assembly/iiop.xml
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Deleted: trunk/ejb3/src/assembly/jboss-ejb3-client.xml
===================================================================
--- trunk/ejb3/src/assembly/jboss-ejb3-client.xml 2008-11-07 17:21:31 UTC (rev 80674)
+++ trunk/ejb3/src/assembly/jboss-ejb3-client.xml 2008-11-07 17:21:38 UTC (rev 80675)
@@ -1,52 +0,0 @@
-<assembly>
- <id>client</id>
- <formats>
- <format>jar</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>target/classes</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>org/jboss/ejb3/EJB3Util.class</include>
- <include>org/jboss/ejb3/JndiUtil.class</include>
- <include>org/jboss/ejb3/Ejb3Registry.class</include>
- <include>org/jboss/ejb3/InitialContextFactory.class</include>
- <include>org/jboss/ejb3/asynchronous/*</include>
- <include>org/jboss/ejb3/interceptor/ClientInterceptorUtil.class</include>
- <include>org/jboss/ejb3/mdb/ConsumerManager.class</include>
- <include>org/jboss/ejb3/mdb/Producer*.class</include>
- <include>org/jboss/ejb3/remoting/ClusteredIsLocalInterceptor.*</include>
- <include>org/jboss/ejb3/remoting/IsLocalInterceptor.*</include>
- <include>org/jboss/ejb3/remoting/IsLocalProxyFactoryInterceptor.*</include>
- <include>org/jboss/ejb3/stateful/ForwardId.class</include>
- <include>org/jboss/ejb3/stateful/StatefulRemoteInvocation.class</include>
- <include>org/jboss/ejb3/ProxyUtils.class</include>
- <include>org/jboss/ejb3/**/*Proxy.class</include>
- <include>org/jboss/ejb3/**/*HandleImpl.class</include>
- <include>org/jboss/ejb3/*Container.class</include>
- <include>org/jboss/ejb3/session/SessionContainer.class</include>
- <include>org/jboss/ejb3/**/*ProxyFactory.class</include>
- <include>org/jboss/ejb3/proxy/**/*.class</include>
- <include>org/jboss/ejb3/*ServiceServer*.class</include>
- <include>org/jboss/ejb3/*KernelAbstraction*.class</include>
- <include>org/jboss/ejb3/statistics/*.class</include>
- <include>org/jboss/ejb3/javaee/*.class</include>
-
- <!-- EJBTHREE-485: include java assist proxy stuff -->
- <include>org/jboss/ejb3/stateless/Javassist*.class</include>
-
- <!-- EJBTHREE-667: include object factory -->
- <include>org/jboss/ejb3/naming/client/**/*.class</include>
- <include>org/jboss/ejb3/naming/BrainlessContext.class</include>
-
- <!-- EJBTHREE-718: client container -->
- <include>org/jboss/ejb3/client/**/*.class</include>
- <include>org/jboss/ejb3/metamodel/**/*.class</include>
- <include>org/jboss/injection/**/*.class</include>
- <include>org/jboss/ejb3/ThreadLocalENCFactory.class</include>
- </includes>
- </fileSet>
- </fileSets>
-</assembly>
\ No newline at end of file
Deleted: trunk/ejb3/src/assembly/jboss-ejb3.xml
===================================================================
--- trunk/ejb3/src/assembly/jboss-ejb3.xml 2008-11-07 17:21:31 UTC (rev 80674)
+++ trunk/ejb3/src/assembly/jboss-ejb3.xml 2008-11-07 17:21:38 UTC (rev 80675)
@@ -1,23 +0,0 @@
-<assembly>
- <id>jboss-ejb3</id>
- <formats>
- <format>jar</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>target/classes</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>org/jboss/**</include>
- <!-- fix cyclic dependency with webservice module -->
- <include>javax/jws/*.class</include>
- <include>javax/xml/ws/*.class</include>
- </includes>
- <excludes>
- <exclude>org/jboss/ejb3/test/**</exclude>
- <exclude>org/jboss/annotation/**</exclude>
- </excludes>
- </fileSet>
- </fileSets>
-</assembly>
\ No newline at end of file
Copied: trunk/main/src/assembly/client.xml (from rev 80668, trunk/main/src/assembly/jboss-main-client.xml)
===================================================================
--- trunk/main/src/assembly/client.xml (rev 0)
+++ trunk/main/src/assembly/client.xml 2008-11-07 17:21:38 UTC (rev 80675)
@@ -0,0 +1,19 @@
+<assembly>
+ <id>client</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>target/classes</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>org/jboss/system/server/ServerLoader*.class</include>
+ <include>org/jboss/system/server/Server.class</include>
+ <include>org/jboss/system/server/ServerConfig.class</include>
+ <include>**/*MBean.class</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Deleted: trunk/main/src/assembly/jboss-main-client.xml
===================================================================
--- trunk/main/src/assembly/jboss-main-client.xml 2008-11-07 17:21:31 UTC (rev 80674)
+++ trunk/main/src/assembly/jboss-main-client.xml 2008-11-07 17:21:38 UTC (rev 80675)
@@ -1,19 +0,0 @@
-<assembly>
- <id>${project.artifactId}-client</id>
- <formats>
- <format>jar</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>target/classes</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>org/jboss/system/server/ServerLoader*.class</include>
- <include>org/jboss/system/server/Server.class</include>
- <include>org/jboss/system/server/ServerConfig.class</include>
- <include>**/*MBean.class</include>
- </includes>
- </fileSet>
- </fileSets>
-</assembly>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list