[jboss-cvs] JBossAS SVN: r96733 - in projects/ejb3/trunk: nointerface and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Nov 23 07:36:31 EST 2009
Author: jaikiran
Date: 2009-11-23 07:36:31 -0500 (Mon, 23 Nov 2009)
New Revision: 96733
Added:
projects/ejb3/trunk/nointerface/src/assembly/
projects/ejb3/trunk/nointerface/src/assembly/package-assembler.xml
projects/ejb3/trunk/nointerface/src/assembly/package.xml
projects/ejb3/trunk/nointerface/src/main/resources/META-INF/ejb31-nointerface-deployers-jboss-beans.xml
Removed:
projects/ejb3/trunk/nointerface/src/main/resources/META-INF/jboss-beans.xml
Modified:
projects/ejb3/trunk/build/pom.xml
projects/ejb3/trunk/nointerface/pom.xml
Log:
EJBTHREE-1953 Added support for creating packages for jboss-ejb3 components
Modified: projects/ejb3/trunk/build/pom.xml
===================================================================
--- projects/ejb3/trunk/build/pom.xml 2009-11-23 12:21:23 UTC (rev 96732)
+++ projects/ejb3/trunk/build/pom.xml 2009-11-23 12:36:31 UTC (rev 96733)
@@ -623,6 +623,33 @@
<version.org.hibernate.hibernate-entitymanager>3.5.0-Beta-2</version.org.hibernate.hibernate-entitymanager>
</properties>
</profile>
+
+ <profile>
+ <id>create-package</id>
+ <build>
+ <plugins>
+ <!-- Assembly Plugin -->
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-4</version>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/package-assembler.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
Modified: projects/ejb3/trunk/nointerface/pom.xml
===================================================================
--- projects/ejb3/trunk/nointerface/pom.xml 2009-11-23 12:21:23 UTC (rev 96732)
+++ projects/ejb3/trunk/nointerface/pom.xml 2009-11-23 12:36:31 UTC (rev 96733)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-build</artifactId>
- <version>1.0.4</version>
+ <version>1.0.8-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
@@ -281,42 +281,43 @@
</dependency>
- <!-- Support for deploying containers in test -->
- <!-- FIXME: this must be ejb3-deployers, because else we get a recursive dependency -->
- <!-- FIXME: this also implies the use of Java 6 -->
- <dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-embedded</artifactId>
- <version>1.0.0-Alpha-2</version>
- <scope>test</scope>
- <exclusions>
- <!-- comes in through org.jboss.aop:jboss-aop-asintegration-core -->
- <exclusion>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop-deployer-jdk50</artifactId>
- </exclusion>
- <!-- Embedded uses new bootstrap impls; leaking makes collisions between legacy and new -->
- <exclusion>
- <groupId>org.jboss.bootstrap</groupId>
- <artifactId>jboss-bootstrap-impl-mc</artifactId>
- </exclusion>
- <!-- core is brought in separately instead of from embedded -->
- <exclusion>
+ <!-- Support for deploying containers in test -->
+ <!-- FIXME: this must be ejb3-deployers, because else we get a recursive dependency -->
+ <!-- FIXME: this also implies the use of Java 6 -->
+ <dependency>
<groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-impl</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+ <artifactId>jboss-ejb3-embedded</artifactId>
+ <version>1.0.0-Alpha-2</version>
+ <scope>test</scope>
+ <exclusions>
+ <!-- comes in through org.jboss.aop:jboss-aop-asintegration-core -->
+ <exclusion>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop-deployer-jdk50</artifactId>
+ </exclusion>
+ <!-- Embedded uses new bootstrap impls; leaking makes collisions between legacy and new -->
+ <exclusion>
+ <groupId>org.jboss.bootstrap</groupId>
+ <artifactId>jboss-bootstrap-impl-mc</artifactId>
+ </exclusion>
+ <!-- core is brought in separately instead of from embedded -->
+ <exclusion>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-impl</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-core</artifactId>
- <version>1.1.19-SNAPSHOT</version>
+ <version>1.1.21</version>
<scope>test</scope>
</dependency>
</dependencies>
+
</project>
Added: projects/ejb3/trunk/nointerface/src/assembly/package-assembler.xml
===================================================================
--- projects/ejb3/trunk/nointerface/src/assembly/package-assembler.xml (rev 0)
+++ projects/ejb3/trunk/nointerface/src/assembly/package-assembler.xml 2009-11-23 12:36:31 UTC (rev 96733)
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<assembly xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.1.xsd"
+>
+ <id>jboss-ejb31-nointerface-package</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>src/main/resources/META-INF</directory>
+ <includes>
+ <include>ejb31-nointerface-deployers-jboss-beans.xml</include>
+ </includes>
+ <outputDirectory>.</outputDirectory>
+ </fileSet>
+
+ <fileSet>
+ <directory>src/assembly</directory>
+ <includes>
+ <include>package.xml</include>
+ </includes>
+ <outputDirectory>.</outputDirectory>
+ </fileSet>
+
+ </fileSets>
+ <dependencySets>
+ <dependencySet>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ <useProjectArtifact>true</useProjectArtifact>
+ <includes>
+ <include>org.jboss.ejb3:jboss-ejb3-nointerface:jar</include>
+ </includes>
+
+ </dependencySet>
+
+ </dependencySets>
+</assembly>
Added: projects/ejb3/trunk/nointerface/src/assembly/package.xml
===================================================================
--- projects/ejb3/trunk/nointerface/src/assembly/package.xml (rev 0)
+++ projects/ejb3/trunk/nointerface/src/assembly/package.xml 2009-11-23 12:36:31 UTC (rev 96733)
@@ -0,0 +1,36 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+ ~ JBoss, Home of Professional Open Source
+ ~ Copyright 2005, JBoss Inc., and individual contributors as indicated
+ ~ by the @authors tag. See the copyright.txt in the distribution for a
+ ~ full listing of individual contributors.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+<!--
+ JBoss EJB3.1 No-Interface package
+-->
+<package name="jboss-ejb3-nointerface" version="1.0.0-alpha-1" xmlns="http://www.jboss.org/schema">
+
+ <!-- Place the ejb3-nointerface jar in common/lib of AS -->
+ <file name="jboss-ejb3-nointerface.jar" dest-path="common/lib" type="library"/>
+
+ <!-- The xml file containing the nointerface deployers -->
+ <file name="ejb31-nointerface-deployers-jboss-beans.xml" dest-path="server/default/deployers" type="config"/>
+ <file name="ejb31-nointerface-deployers-jboss-beans.xml" dest-path="server/all/deployers" type="config"/>
+
+
+</package>
\ No newline at end of file
Added: projects/ejb3/trunk/nointerface/src/main/resources/META-INF/ejb31-nointerface-deployers-jboss-beans.xml
===================================================================
--- projects/ejb3/trunk/nointerface/src/main/resources/META-INF/ejb31-nointerface-deployers-jboss-beans.xml (rev 0)
+++ projects/ejb3/trunk/nointerface/src/main/resources/META-INF/ejb31-nointerface-deployers-jboss-beans.xml 2009-11-23 12:36:31 UTC (rev 96733)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!-- No-interface view deployer - works on JBossMetadata and creates a NoInterfaceMCBean -->
+ <bean name="Ejb3NoInterfaceViewDeployer" class="org.jboss.ejb3.nointerface.deployers.EJB3NoInterfaceDeployer"/>
+
+</deployment>
\ No newline at end of file
Deleted: projects/ejb3/trunk/nointerface/src/main/resources/META-INF/jboss-beans.xml
===================================================================
--- projects/ejb3/trunk/nointerface/src/main/resources/META-INF/jboss-beans.xml 2009-11-23 12:21:23 UTC (rev 96732)
+++ projects/ejb3/trunk/nointerface/src/main/resources/META-INF/jboss-beans.xml 2009-11-23 12:36:31 UTC (rev 96733)
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <!-- No-interface view deployer - works on JBossMetadata and creates a NoInterfaceMCBean -->
- <bean name="Ejb3NoInterfaceViewDeployer" class="org.jboss.ejb3.nointerface.deployers.EJB3NoInterfaceDeployer"/>
-
-</deployment>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list