[jboss-cvs] JBossAS SVN: r99428 - in projects/ejb3: components and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jan 14 15:45:20 EST 2010
Author: ALRubinger
Date: 2010-01-14 15:45:19 -0500 (Thu, 14 Jan 2010)
New Revision: 99428
Added:
projects/ejb3/components/
projects/ejb3/components/async/
projects/ejb3/components/async/build/
projects/ejb3/components/async/build/pom.xml
projects/ejb3/components/async/impl/
projects/ejb3/components/async/spi/
Removed:
projects/ejb3/trunk/async-impl/
projects/ejb3/trunk/async-spi/
projects/ejb3/trunk/async/
Modified:
projects/ejb3/components/async/impl/pom.xml
projects/ejb3/components/async/pom.xml
projects/ejb3/components/async/spi/pom.xml
projects/ejb3/trunk/pom.xml
Log:
[EJBTHREE-1721] Extract "async-spi" and "async-impl" into an org.jboss.ejb3.async true component under projects/ejb3/components
Copied: projects/ejb3/components/async (from rev 99426, projects/ejb3/trunk/async)
Property changes on: projects/ejb3/components/async/build
___________________________________________________________________
Name: svn:ignore
+ target
eclipse-target
target-eclipse
.settings
.classpath
.project
Added: projects/ejb3/components/async/build/pom.xml
===================================================================
--- projects/ejb3/components/async/build/pom.xml (rev 0)
+++ projects/ejb3/components/async/build/pom.xml 2010-01-14 20:45:19 UTC (rev 99428)
@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="UTF-8"?>
+ <!--
+ vi:ts=2:sw=2:expandtab:
+-->
+<project 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/maven-v4_0_0.xsd">
+
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-parent</artifactId>
+ <version>4</version>
+ </parent>
+
+ <!-- Model Version -->
+ <modelVersion>4.0.0</modelVersion>
+
+ <!-- Artifact Configuration -->
+ <groupId>org.jboss.ejb3.async</groupId>
+ <artifactId>async-build</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <name>JBoss EJB 3.1+ @Asynchronous Build</name>
+ <description>Centralized Build Configuration for EJB 3.1+ @Asynchronous Support</description>
+ <packaging>pom</packaging>
+
+ <!-- Properties -->
+ <properties>
+
+ <!-- Versioning -->
+ <version.junit_junit>4.6</version.junit_junit>
+
+ </properties>
+
+ <!-- SCM -->
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/ejb3/components/asynchronous</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/ejb3/components/asynchronous</developerConnection>
+ <url>http://anonsvn.jboss.org/repos/jbossas/projects/ejb3/components/asynchronous</url>
+ </scm>
+
+ <!-- Issues -->
+ <issueManagement>
+ <system>jira</system>
+ <url>http://jira.jboss.com/jira/browse/EJBTHREE</url>
+ </issueManagement>
+
+ <!-- Build -->
+ <build>
+
+ <plugins>
+
+ <!-- Compiler / JDK6 required for EJB 3.1 -->
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ <showDeprecation>false</showDeprecation>
+ <showWarnings>true</showWarnings>
+ <optimize>true</optimize>
+ <compilerVersion>1.6</compilerVersion>
+ <fork>true</fork>
+ <argLine>-Xmx512M</argLine>
+ <executable>${JAVA_HOME}/bin/javac</executable>
+ </configuration>
+ </plugin>
+
+ <!-- Surefire -->
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <trimStackTrace>false</trimStackTrace>
+ <printSummary>true</printSummary>
+ <includes>
+ <include>**/*TestCase.java</include>
+ <include>**/*TestSuite.java</include>
+ </includes>
+ <forkMode>always</forkMode>
+ <reportFormat>xml</reportFormat>
+ </configuration>
+ </plugin>
+
+ <!-- Maven Release Plugin Configuration -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <tagBase>https://svn.jboss.org/repos/jbossas/projects/ejb3/tags</tagBase>
+ </configuration>
+ </plugin>
+
+ <!-- Enforce Maven Environment -->
+ <plugin>
+ <artifactId>maven-enforcer-plugin
+ </artifactId>
+ <executions>
+ <execution>
+ <id>enforce-maven-environment</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <rules>
+ <requireJavaVersion>
+ <version>1.6.0</version> <!-- Must be JDK6 -->
+ </requireJavaVersion>
+ <requireProperty>
+ <property>env.JAVA_HOME</property>
+ <message>"JAVA_HOME needs to be set to compile"</message>
+ </requireProperty>
+ </rules>
+ </configuration>
+ </plugin>
+ </plugins>
+
+ </build>
+
+ <!-- Dependency Management -->
+ <dependencyManagement>
+ <dependencies>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${version.junit_junit}</version>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+ </dependencyManagement>
+
+ <!-- Reporting -->
+ <reporting>
+ <plugins>
+
+ <!-- Cobertura (Code Coverage) -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ <configuration>
+ <formats>
+ <format>html</format>
+ <format>xml</format>
+ </formats>
+ </configuration>
+ </plugin>
+
+ <!-- FindBugs -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <configuration>
+ <xmlOutput>true</xmlOutput>
+ <findbugsXmlOutputDirectory>target/site</findbugsXmlOutputDirectory>
+ </configuration>
+ </plugin>
+
+ <!-- JavaDoc / APIViz -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.5</version>
+ <configuration>
+ <doclet>org.jboss.apiviz.APIviz</doclet>
+ <docletArtifact>
+ <groupId>org.jboss.apiviz</groupId>
+ <artifactId>apiviz</artifactId>
+ <version>1.3.0.GA</version>
+ </docletArtifact>
+ <useStandardDocletOptions>true</useStandardDocletOptions>
+ <charset>UTF-8</charset>
+ <encoding>UTF-8</encoding>
+ <docencoding>UTF-8</docencoding>
+ <breakiterator>true</breakiterator>
+ <version>true</version>
+ <author>true</author>
+ <keywords>true</keywords>
+ <additionalparam>
+ -sourceclasspath ${project.build.outputDirectory}
+ </additionalparam>
+ </configuration>
+ </plugin>
+
+
+ </plugins>
+ </reporting>
+
+</project>
+
Copied: projects/ejb3/components/async/impl (from rev 99425, projects/ejb3/trunk/async-impl)
Modified: projects/ejb3/components/async/impl/pom.xml
===================================================================
--- projects/ejb3/trunk/async-impl/pom.xml 2010-01-14 19:50:19 UTC (rev 99425)
+++ projects/ejb3/components/async/impl/pom.xml 2010-01-14 20:45:19 UTC (rev 99428)
@@ -7,9 +7,9 @@
<!-- Define Parent -->
<parent>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-build</artifactId>
- <version>1.0.9-SNAPSHOT</version>
+ <groupId>org.jboss.ejb3.async</groupId>
+ <artifactId>async-build</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
@@ -17,71 +17,23 @@
<modelVersion>4.0.0</modelVersion>
<!-- Artifact Information -->
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-async-impl</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <artifactId>async-impl</artifactId>
<packaging>jar</packaging>
- <name>JBoss EJB 3.1 Asynchronous Implementation (Internals)</name>
- <description>Implementation Support for EJB 3.1 @Asynchronous</description>
+ <name>JBoss EJB 3.1+ @Asynchronous Implementation (Internals)</name>
+ <description>Implementation Support for EJB 3.1+ @Asynchronous</description>
<!-- Build Configuration -->
<build>
-
- <!-- We depend upon JDK6, as we bring in the EJB 3.1 API here -->
-
- <plugins>
-
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- <executable>${JDK6_HOME}/bin/javac</executable>
- </configuration>
- </plugin>
-
- <plugin>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <id>enforce-jdk6</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireProperty>
- <property>env.JDK6_HOME</property>
- <message>JDK6_HOME is not set</message>
- </requireProperty>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkMode>once</forkMode>
- <jvm>${JDK6_HOME}/bin/java</jvm>
- <!--
- Useful in debugging blocking/deadlock/etc
- <redirectTestOutputToFile>false</redirectTestOutputToFile>
- -->
- </configuration>
- </plugin>
-
- </plugins>
-
</build>
<properties>
<!-- Versioning -->
+ <version.org.jboss.aop_jboss-aop>2.1.1.GA</version.org.jboss.aop_jboss-aop>
+ <version.org.jboss.aspects_jboss.aspects.common>1.0.0.Beta1</version.org.jboss.aspects_jboss.aspects.common>
+ <version.org.jboss.aspects_jboss.remoting.aspects>1.0.2</version.org.jboss.aspects_jboss.remoting.aspects>
<version.org.jboss.javaee_jboss.ejb.api_3.1>1.0-alpha-1</version.org.jboss.javaee_jboss.ejb.api_3.1>
- <version.org.jboss.ejb3_jboss.ejb3.async.spi>2.0.0-SNAPSHOT</version.org.jboss.ejb3_jboss.ejb3.async.spi>
<version.org.jboss.ejb3_jboss.ejb3.interceptors>1.0.0</version.org.jboss.ejb3_jboss.ejb3.interceptors>
<version.org.jboss.security_jboss.security>2.0.2.SP6</version.org.jboss.security_jboss.security>
<version.org.jboss.javaee_jboss.jacc.api>1.1.0.GA</version.org.jboss.javaee_jboss.jacc.api>
@@ -94,11 +46,11 @@
Dependencies: org.jboss.ejb3
-->
- <!-- org.jboss.ejb3:jboss-ejb3-async-spi -->
+ <!-- org.jboss.ejb3.async:async-spi -->
<dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-async-spi</artifactId>
- <version>${version.org.jboss.ejb3_jboss.ejb3.async.spi}</version>
+ <groupId>org.jboss.ejb3.async</groupId>
+ <artifactId>async-spi</artifactId>
+ <version>${version}</version>
</dependency>
<!-- org.jboss.javaee:jboss-ejb-api_3.1 -->
@@ -130,18 +82,21 @@
<dependency>
<groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop</artifactId>
+ <version>${version.org.jboss.aop_jboss-aop}</version>
</dependency>
<!-- org.jboss.aspects:jboss-remoting-aspects -->
<dependency>
<groupId>org.jboss.aspects</groupId>
<artifactId>jboss-remoting-aspects</artifactId>
+ <version>${version.org.jboss.aspects_jboss.remoting.aspects}</version>
</dependency>
<!-- org.jboss.aspects:jboss-aspects-common -->
<dependency>
<groupId>org.jboss.aspects</groupId>
<artifactId>jboss-aspects-common</artifactId>
+ <version>${version.org.jboss.aspects_jboss.aspects.common}</version>
<scope>test</scope>
</dependency>
Modified: projects/ejb3/components/async/pom.xml
===================================================================
--- projects/ejb3/trunk/async/pom.xml 2010-01-14 20:06:00 UTC (rev 99426)
+++ projects/ejb3/components/async/pom.xml 2010-01-14 20:45:19 UTC (rev 99428)
@@ -20,7 +20,7 @@
<artifactId>async-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>EJB 3.1+ @Asychronous Aggregator</name>
+ <name>JBoss EJB 3.1+ @Asychronous Aggregator</name>
<url>http://www.jboss.org</url>
<description>Support of EJB @Asynchronous as detailed by EJB 3.1 Specification 4.5</description>
Copied: projects/ejb3/components/async/spi (from rev 99425, projects/ejb3/trunk/async-spi)
Modified: projects/ejb3/components/async/spi/pom.xml
===================================================================
--- projects/ejb3/trunk/async-spi/pom.xml 2010-01-14 19:50:19 UTC (rev 99425)
+++ projects/ejb3/components/async/spi/pom.xml 2010-01-14 20:45:19 UTC (rev 99428)
@@ -7,9 +7,9 @@
<!-- Define Parent -->
<parent>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-build</artifactId>
- <version>1.0.0</version>
+ <groupId>org.jboss.ejb3.async</groupId>
+ <artifactId>async-build</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
@@ -17,12 +17,10 @@
<modelVersion>4.0.0</modelVersion>
<!-- Artifact Information -->
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-async-spi</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <artifactId>async-spi</artifactId>
<packaging>jar</packaging>
- <name>JBoss EJB 3.1 Asynchronous SPI</name>
- <description>Service Provider Interface for JBoss EJB 3.1 @Asynchronous</description>
+ <name>JBoss EJB 3.1+ @Asynchronous SPI</name>
+ <description>Service Provider Interface for JBoss EJB 3.1+ @Asynchronous</description>
<!-- Build Configuration -->
<build>
Modified: projects/ejb3/trunk/pom.xml
===================================================================
--- projects/ejb3/trunk/pom.xml 2010-01-14 20:31:30 UTC (rev 99427)
+++ projects/ejb3/trunk/pom.xml 2010-01-14 20:45:19 UTC (rev 99428)
@@ -35,8 +35,6 @@
<!-- Aggregate Modules -->
<modules>
<module>aop-deployers</module>
- <module>async-impl</module>
- <module>async-spi</module>
<module>as-int</module>
<module>build</module>
<module>common</module>
More information about the jboss-cvs-commits
mailing list