[jboss-cvs] JBossAS SVN: r69740 - in trunk: iiop and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Feb 8 17:20:43 EST 2008
Author: pgier
Date: 2008-02-08 17:20:43 -0500 (Fri, 08 Feb 2008)
New Revision: 69740
Added:
trunk/iiop/src/assembly/
trunk/iiop/src/assembly/client.xml
trunk/server/src/assembly/client.xml
Removed:
trunk/server/src/assembly/jboss-client.xml
Modified:
trunk/
trunk/iiop/pom.xml
trunk/pom.xml
trunk/server/pom.xml
Log:
[JBBUILD-451] Adding rmi compilation, and client assemblies with stubs.
Property changes on: trunk
___________________________________________________________________
Name: svn:ignore
- .git
.metadata
target
+ .git
.metadata
target
bin
Modified: trunk/iiop/pom.xml
===================================================================
--- trunk/iiop/pom.xml 2008-02-08 21:59:31 UTC (rev 69739)
+++ trunk/iiop/pom.xml 2008-02-08 22:20:43 UTC (rev 69740)
@@ -62,6 +62,41 @@
</excludes>
</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>
+ <iiop>true</iiop>
+ <includes>
+ <include>javax.ejb.EJBObject</include>
+ <include>javax.ejb.EJBHome</include>
+ </includes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <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>
Added: trunk/iiop/src/assembly/client.xml
===================================================================
--- trunk/iiop/src/assembly/client.xml (rev 0)
+++ trunk/iiop/src/assembly/client.xml 2008-02-08 22:20:43 UTC (rev 69740)
@@ -0,0 +1,39 @@
+<assembly>
+ <id>client</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>target/classes</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>**/jboss/iiop/CorbaORB.class</include>
+ <include>**/jboss/iiop/StubClassLoader.class</include>
+ <include>**/jboss/iiop/rmi/*</include>
+ <include>**/jboss/iiop/rmi/marshal/*</include>
+ <include>**/jboss/iiop/rmi/marshal/strategy/StubStrategy.class</include>
+ <include>**/jboss/iiop/rmi/marshal/strategy/StubStrategy$ExceptionReader.class</include>
+ <include>**/jboss/proxy/compiler/**</include>
+ <include>**/jboss/proxy/ejb/DynamicIIOPStub.class</include>
+ <include>**/jboss/proxy/ejb/*ImplIIOP*.class</include>
+ <include>**/jboss/proxy/ejb/IIOPHomeFactory.class</include>
+ <include>**/jboss/tm/**</include>
+ <include>**/jboss/util/Log4jLoggerFactory.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
Property changes on: trunk/iiop/src/assembly/client.xml
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2008-02-08 21:59:31 UTC (rev 69739)
+++ trunk/pom.xml 2008-02-08 22:20:43 UTC (rev 69740)
@@ -92,6 +92,11 @@
<artifactId>javacc-maven-plugin</artifactId>
<version>2.3</version>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rmic-maven-plugin</artifactId>
+ <version>1.0-alpha-1-SNAPSHOT</version>
+ </plugin>
</plugins>
</pluginManagement>
@@ -132,6 +137,24 @@
</plugins>
</build>
+ <pluginRepositories>
+ <!--
+ - Note: the codehaus snapshot repository should only be used until the
+ - rmic-maven-plugin is released.
+ -->
+ <pluginRepository>
+ <id>codehaus.org</id>
+ <name>CodeHaus Plugin Snapshots</name>
+ <url>http://snapshots.repository.codehaus.org</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+
<dependencyManagement>
<dependencies>
<dependency>
Modified: trunk/server/pom.xml
===================================================================
--- trunk/server/pom.xml 2008-02-08 21:59:31 UTC (rev 69739)
+++ trunk/server/pom.xml 2008-02-08 22:20:43 UTC (rev 69740)
@@ -81,8 +81,37 @@
</executions>
<configuration>
<descriptorSourceDirectory>src/assembly</descriptorSourceDirectory>
+ <archive>
+ <manifest>
+ <addDefaultImplementationEntries/>
+ <addDefaultSpecificationEntries/>
+ </manifest>
+ </archive>
</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/tm/usertx/server/UserTransactionSessionFactoryImpl.class</include>
+ <include>org/jboss/tm/usertx/server/UserTransactionSessionImpl.class</include>
+ <!--
+ <include>org/jboss/jmx/adaptor/rmi/RMIAdaptorImpl.class</include>
+ <include>org/jboss/jmx/connector/notification/RMIClientNotificationListener.class</include>
+ -->
+ <include>org/jboss/invocation/jrmp/server/JRMPInvoker.class</include>
+ </includes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
<dependencies>
Copied: trunk/server/src/assembly/client.xml (from rev 69734, trunk/server/src/assembly/jboss-client.xml)
===================================================================
--- trunk/server/src/assembly/client.xml (rev 0)
+++ trunk/server/src/assembly/client.xml 2008-02-08 22:20:43 UTC (rev 69740)
@@ -0,0 +1,51 @@
+<assembly>
+ <id>client</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>target/classes</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>org/jboss/client/**</include>
+ <include>org/jboss/corba/**</include>
+ <include>org/jboss/ejb/CacheKey.class</include>
+ <include>org/jboss/ejb/ListCacheKey.class</include>
+ <include>org/jboss/ejb/plugins/cmp/jdbc/Mapper.class</include>
+ <include>org/jboss/ejb/plugins/keygenerator/KeyGenerator.class</include>
+ <include>org/jboss/ejb/plugins/keygenerator/KeyGeneratorFactory.class</include>
+ <include>org/jboss/ejb/plugins/lock/ApplicationDeadlockException.class</include>
+ <include>org/jboss/invocation/*</include>
+ <include>org/jboss/invocation/http/interfaces/*</include>
+ <include>org/jboss/invocation/jrmp/interfaces/*</include>
+ <include>org/jboss/invocation/jrmp/server/*Stub.class</include>
+ <include>org/jboss/invocation/pooled/interfaces/*.class</include>
+ <include>org/jboss/invocation/unified/interfaces/*.class</include>
+ <include>org/jboss/invocation/unified/marshall/*.class</include>
+ <include>org/jboss/metadata/serviceref/VirtualFileAdaptor.class</include>
+ <include>org/jboss/monitor/client/*.class</include>
+ <include>org/jboss/naming/LinkRefPair.class</include>
+ <include>org/jboss/naming/LinkRefPairObjectFactory.class</include>
+ <include>org/jboss/naming/*NamingContextFactory*.class</include>
+ <include>org/jboss/naming/client/**</include>
+ <include>org/jboss/naming/interceptors/*</include>
+ <include>org/jboss/proxy/**</include>
+ <include>org/jboss/tm/JBossTransactionRolledbackException.class</include>
+ <include>org/jboss/tm/JBossTransactionRolledbackLocalException.class</include>
+ <include>org/jboss/tm/usertx/client/*.class</include>
+ <include>org/jboss/tm/usertx/interfaces/*.class</include>
+ <include>org/jboss/tm/usertx/server/*Stub.class</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>target/rmi-classes</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>org/jboss/invocation/jrmp/server/*Stub.class</include>
+ <include>org/jboss/tm/usertx/server/*Stub.class</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Deleted: trunk/server/src/assembly/jboss-client.xml
===================================================================
--- trunk/server/src/assembly/jboss-client.xml 2008-02-08 21:59:31 UTC (rev 69739)
+++ trunk/server/src/assembly/jboss-client.xml 2008-02-08 22:20:43 UTC (rev 69740)
@@ -1,43 +0,0 @@
-<assembly>
- <id>jboss-client</id>
- <formats>
- <format>jar</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>target/classes</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>org/jboss/client/**</include>
- <include>org/jboss/corba/**</include>
- <include>org/jboss/ejb/CacheKey.class</include>
- <include>org/jboss/ejb/ListCacheKey.class</include>
- <include>org/jboss/ejb/plugins/cmp/jdbc/Mapper.class</include>
- <include>org/jboss/ejb/plugins/keygenerator/KeyGenerator.class</include>
- <include>org/jboss/ejb/plugins/keygenerator/KeyGeneratorFactory.class</include>
- <include>org/jboss/ejb/plugins/lock/ApplicationDeadlockException.class</include>
- <include>org/jboss/invocation/*</include>
- <include>org/jboss/invocation/http/interfaces/*</include>
- <include>org/jboss/invocation/jrmp/interfaces/*</include>
- <include>org/jboss/invocation/jrmp/server/*Stub.class</include>
- <include>org/jboss/invocation/pooled/interfaces/*.class</include>
- <include>org/jboss/invocation/unified/interfaces/*.class</include>
- <include>org/jboss/invocation/unified/marshall/*.class</include>
- <include>org/jboss/metadata/serviceref/VirtualFileAdaptor.class</include>
- <include>org/jboss/monitor/client/*.class</include>
- <include>org/jboss/naming/LinkRefPair.class</include>
- <include>org/jboss/naming/LinkRefPairObjectFactory.class</include>
- <include>org/jboss/naming/*NamingContextFactory*.class</include>
- <include>org/jboss/naming/client/**</include>
- <include>org/jboss/naming/interceptors/*</include>
- <include>org/jboss/proxy/**</include>
- <include>org/jboss/tm/JBossTransactionRolledbackException.class</include>
- <include>org/jboss/tm/JBossTransactionRolledbackLocalException.class</include>
- <include>org/jboss/tm/usertx/client/*.class</include>
- <include>org/jboss/tm/usertx/interfaces/*.class</include>
- <include>org/jboss/tm/usertx/server/*Stub.class</include>
- </includes>
- </fileSet>
- </fileSets>
-</assembly>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list