You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by an...@apache.org on 2010/09/16 12:54:11 UTC
svn commit: r997688 [1/3] - in /openejb/trunk/openejb3: ./
container/openejb-activemq4/
container/openejb-activemq4/src/test/java/org/apache/openejb/core/mdb/
container/openejb-core/
container/openejb-core/src/main/java/org/apache/openejb/resource/acti...
Author: andygumbrecht
Date: Thu Sep 16 10:54:11 2010
New Revision: 997688
URL: http://svn.apache.org/viewvc?rev=997688&view=rev
Log:
ActiveMQ 5.4.0 and RA try block for waitForStart (start now does this).
Quartz 1.8.4
OpenJPA 2.0.1
Fixed ActiveMQ 4 and 5 pom deps on spring libs - optional for bean configuration.
simple-cmp2/pom.xml was missing agent.
Added missing embedded.logging.properties and corrected path in pom for openejb-spring.
Fixed spring tests - It is a bad idea to include org.springframework:spring, only 'required' spring libs should be used.
OpenEjb2ConversionTest.java added normalization on loaded files as test was failing on simple CRLF - David please make sure I have not just fixed a test rather than the cause?
Added list synchronization to ScheduleTest.java - Test was occasionally failing due to this timing issues.
Added:
openejb/trunk/openejb3/container/openejb-spring/src/test/resources/embedded.logging.properties
Modified:
openejb/trunk/openejb3/container/openejb-activemq4/pom.xml
openejb/trunk/openejb3/container/openejb-activemq4/src/test/java/org/apache/openejb/core/mdb/AmqXmlTest.java
openejb/trunk/openejb3/container/openejb-core/pom.xml
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQ5Factory.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/OpenEjb2ConversionTest.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/AmqXmlTest.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/timer/ScheduleTest.java
openejb/trunk/openejb3/container/openejb-core/src/test/resources/org/apache/openejb/core/mdb/activemq.xml
openejb/trunk/openejb3/container/openejb-spring/pom.xml
openejb/trunk/openejb3/examples/pom.xml
openejb/trunk/openejb3/examples/simple-cmp2/pom.xml
openejb/trunk/openejb3/examples/simple-mdb/pom.xml
openejb/trunk/openejb3/examples/spring-integration/pom.xml
openejb/trunk/openejb3/examples/spring-integration/src/test/java/org/superbiz/spring/MoviesTest.java
openejb/trunk/openejb3/itests/openejb-itests-client/pom.xml
openejb/trunk/openejb3/pom.xml
openejb/trunk/openejb3/server/openejb-activemq/pom.xml
Modified: openejb/trunk/openejb3/container/openejb-activemq4/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-activemq4/pom.xml?rev=997688&r1=997687&r2=997688&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-activemq4/pom.xml (original)
+++ openejb/trunk/openejb3/container/openejb-activemq4/pom.xml Thu Sep 16 10:54:11 2010
@@ -22,210 +22,217 @@
<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>
- <artifactId>container</artifactId>
- <groupId>org.apache.openejb</groupId>
- <version>3.2-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>openejb-activemq4</artifactId>
- <packaging>jar</packaging>
- <name>OpenEJB :: Container :: ActiveMQ4</name>
- <properties>
- <openejb.osgi.import.pkg>
+ <parent>
+ <artifactId>container</artifactId>
+ <groupId>org.apache.openejb</groupId>
+ <version>3.2-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>openejb-activemq4</artifactId>
+ <packaging>jar</packaging>
+ <name>OpenEJB :: Container :: ActiveMQ4</name>
+ <properties>
+ <openejb.osgi.import.pkg>
org.apache.activemq.ra;resolution:=optional
- </openejb.osgi.import.pkg>
- <openejb.osgi.export/>
- </properties>
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- <filtering>true</filtering>
- </testResource>
- </testResources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy</id>
- <phase>process-resources</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-javaagent</artifactId>
- <version>${project.version}</version>
- <outputDirectory>${project.build.directory}</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkMode>pertest</forkMode>
- <argLine>-Xmx256m "-javaagent:${basedir}/target/openejb-javaagent-${project.version}.jar" -enableassertions</argLine>
- <workingDirectory>${basedir}/target</workingDirectory>
- <systemProperties>
- <property>
- <name>openejb.home</name>
- <value>${basedir}/target/test-classes</value>
- </property>
- <property>
- <name>log4j.configuration</name>
- <value>file:///${basedir}/target/classes/embedded.logging.properties</value>
- </property>
- </systemProperties>
- <excludes>
- <exclude>**/TestHandler.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>process-classes</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <tstamp>
- <format property="TSTAMP" pattern="hh:mm"/>
- </tstamp>
- <replace file="target/classes/openejb-version.properties" token="@DATE-REPLACED-BY-MAVEN@" value="${DSTAMP}"/>
- <replace file="target/classes/openejb-version.properties" token="@TIME-REPLACED-BY-MAVEN@" value="${TSTAMP}"/>
- <property name="compile_classpath" refid="maven.compile.classpath"/>
- <java classname="org.apache.openejb.util.MakeTxLookup">
- <arg value="${project.build.directory}"/>
- <classpath>
- <pathelement path="${compile_classpath}"/>
- </classpath>
- </java>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <mainClass/>
+ </openejb.osgi.import.pkg>
+ <openejb.osgi.export/>
+ </properties>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <filtering>true</filtering>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-javaagent</artifactId>
+ <version>${project.version}</version>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkMode>pertest</forkMode>
+ <argLine>-Xmx256m "-javaagent:${basedir}/target/openejb-javaagent-${project.version}.jar" -enableassertions</argLine>
+ <workingDirectory>${basedir}/target</workingDirectory>
+ <systemProperties>
+ <property>
+ <name>openejb.home</name>
+ <value>${basedir}/target/test-classes</value>
+ </property>
+ <property>
+ <name>log4j.configuration</name>
+ <value>file:///${basedir}/target/classes/embedded.logging.properties</value>
+ </property>
+ </systemProperties>
+ <excludes>
+ <exclude>**/TestHandler.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <tstamp>
+ <format property="TSTAMP" pattern="hh:mm"/>
+ </tstamp>
+ <replace file="target/classes/openejb-version.properties" token="@DATE-REPLACED-BY-MAVEN@" value="${DSTAMP}"/>
+ <replace file="target/classes/openejb-version.properties" token="@TIME-REPLACED-BY-MAVEN@" value="${TSTAMP}"/>
+ <property name="compile_classpath" refid="maven.compile.classpath"/>
+ <java classname="org.apache.openejb.util.MakeTxLookup">
+ <arg value="${project.build.directory}"/>
+ <classpath>
+ <pathelement path="${compile_classpath}"/>
+ </classpath>
+ </java>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <mainClass/>
<!--<addClasspath>true</addClasspath>-->
- </manifest>
- <manifestEntries/>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- <configuration>
- <excludes/>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
+ </manifest>
+ <manifestEntries/>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rat-maven-plugin</artifactId>
+ <configuration>
+ <excludes/>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-core</artifactId>
- <version>${project.version}</version>
- <exclusions>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-core</artifactId>
+ <version>${project.version}</version>
+ <exclusions>
<!-- Ignore ActiveMQ 5.x-->
- <exclusion>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-ra</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+ <exclusion>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-ra</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<!-- ActiveMQ -->
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-ra</artifactId>
- <version>4.1.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>4.1.1</version>
- </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-ra</artifactId>
+ <version>4.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-core</artifactId>
+ <version>4.1.1</version>
+ </dependency>
<!-- End ActiveMQ -->
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
- <version>2.5.5</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-spring</artifactId>
- <version>3.4.3</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- </dependency>
- </dependencies>
- <profiles>
- <profile>
- <id>openejb.debug</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkMode>pertest</forkMode>
- <argLine>"-javaagent:${basedir}/target/openejb-javaagent-${project.version}.jar" -Xdebug -Xnoagent -Djava.compiler=NONE
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-spring</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring</artifactId>
+ <version>2.5.6</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>3.0.4.RELEASE</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <profiles>
+ <profile>
+ <id>openejb.debug</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkMode>pertest</forkMode>
+ <argLine>"-javaagent:${basedir}/target/openejb-javaagent-${project.version}.jar" -Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005
- </argLine>
- <workingDirectory>${basedir}/target</workingDirectory>
- <systemProperties>
- <property>
- <name>openejb.home</name>
- <value>${basedir}/target/test-classes</value>
- </property>
- <property>
- <name>log4j.configuration</name>
- <value>file:///${basedir}/target/classes/embedded.logging.properties</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+ </argLine>
+ <workingDirectory>${basedir}/target</workingDirectory>
+ <systemProperties>
+ <property>
+ <name>openejb.home</name>
+ <value>${basedir}/target/test-classes</value>
+ </property>
+ <property>
+ <name>log4j.configuration</name>
+ <value>file:///${basedir}/target/classes/embedded.logging.properties</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: openejb/trunk/openejb3/container/openejb-activemq4/src/test/java/org/apache/openejb/core/mdb/AmqXmlTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-activemq4/src/test/java/org/apache/openejb/core/mdb/AmqXmlTest.java?rev=997688&r1=997687&r2=997688&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-activemq4/src/test/java/org/apache/openejb/core/mdb/AmqXmlTest.java (original)
+++ openejb/trunk/openejb3/container/openejb-activemq4/src/test/java/org/apache/openejb/core/mdb/AmqXmlTest.java Thu Sep 16 10:54:11 2010
@@ -18,6 +18,7 @@
package org.apache.openejb.core.mdb;
public class AmqXmlTest extends JmsProxyTest {
+
protected String getBrokerXmlConfig() {
// note activemq uses classpath xml loader
return "xbean:org/apache/openejb/core/mdb/activemq.xml";
Modified: openejb/trunk/openejb3/container/openejb-core/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/pom.xml?rev=997688&r1=997687&r2=997688&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/pom.xml (original)
+++ openejb/trunk/openejb3/container/openejb-core/pom.xml Thu Sep 16 10:54:11 2010
@@ -22,17 +22,17 @@
<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>
- <artifactId>container</artifactId>
- <groupId>org.apache.openejb</groupId>
- <version>3.2-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>openejb-core</artifactId>
- <packaging>jar</packaging>
- <name>OpenEJB :: Container :: Core</name>
- <properties>
- <openejb.osgi.import.pkg>
+ <parent>
+ <artifactId>container</artifactId>
+ <groupId>org.apache.openejb</groupId>
+ <version>3.2-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>openejb-core</artifactId>
+ <packaging>jar</packaging>
+ <name>OpenEJB :: Container :: Core</name>
+ <properties>
+ <openejb.osgi.import.pkg>
org.apache.activemq.ra;resolution:=optional,
org.apache.commons.dbcp.managed;resolution:=optional,
oracle.toplink.*;resolution:=optional,
@@ -54,26 +54,26 @@
javax.ejb*;version=3.1,
javax.xml.ws,
*
- </openejb.osgi.import.pkg>
- <openejb.osgi.export>
+ </openejb.osgi.import.pkg>
+ <openejb.osgi.export>
!org.apache.openejb.client,
org.apache.openejb*;version=${openejb.osgi.export.version}
- </openejb.osgi.export>
- </properties>
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- <filtering>true</filtering>
- </testResource>
- </testResources>
- <plugins>
+ </openejb.osgi.export>
+ </properties>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <filtering>true</filtering>
+ </testResource>
+ </testResources>
+ <plugins>
<!--
<plugin>
<groupId>com.envoisolutions.sxc</groupId>
@@ -93,696 +93,698 @@
</executions>
</plugin>
-->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy</id>
- <phase>process-resources</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-javaagent</artifactId>
- <version>${project.version}</version>
- <outputDirectory>${project.build.directory}</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkMode>pertest</forkMode>
- <testNGArtifactName>none:none</testNGArtifactName>
- <argLine>-Xmx256m "-javaagent:${basedir}/target/openejb-javaagent-${project.version}.jar" -enableassertions</argLine>
- <workingDirectory>${basedir}/target</workingDirectory>
- <systemProperties>
- <property>
- <name>openejb.home</name>
- <value>${basedir}/target/test-classes</value>
- </property>
- <property>
- <name>log4j.configuration</name>
- <value>file:///${basedir}/target/classes/embedded.logging.properties</value>
- </property>
- </systemProperties>
- <excludes>
- <exclude>**/TestHandler.java</exclude>
- <exclude>org/apache/openejb/cdi/**</exclude>
- </excludes>
- </configuration>
- <executions>
- <execution>
- <id>test-testng</id>
- <phase>test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <junitArtifactName>none:none</junitArtifactName>
- <excludes>
- <exclude>**</exclude>
- </excludes>
- <includes>
- <include>org/apache/openejb/cdi/**</include>
- </includes>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>process-classes</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <tstamp>
- <format property="TSTAMP" pattern="hh:mm" />
- </tstamp>
- <replace file="target/classes/openejb-version.properties" token="@DATE-REPLACED-BY-MAVEN@" value="${DSTAMP}" />
- <replace file="target/classes/openejb-version.properties" token="@TIME-REPLACED-BY-MAVEN@" value="${TSTAMP}" />
- <property name="compile_classpath" refid="maven.compile.classpath" />
- <java classname="org.apache.openejb.util.MakeTxLookup">
- <arg value="${project.build.directory}" />
- <classpath>
- <pathelement path="${compile_classpath}" />
- </classpath>
- </java>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <mainClass>org.apache.openejb.cli.Bootstrap</mainClass>
- <!--<addClasspath>true</addClasspath>-->
- </manifest>
- <manifestEntries>
- <Class-Path>openejb-loader-${project.version}.jar openejb-client-${project.version}.jar
- xbean-finder-shaded-${xbeanVersion}.jar xbean-asm-shaded-${xbeanVersion}.jar</Class-Path>
- <J2EE-DeploymentFactory-Implementation-Class>
- org.apache.openejb.config.VmDeploymentFactory</J2EE-DeploymentFactory-Implementation-Class>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>src/main/resources/META-INF/org.apache.openejb.cli/validate.examples</exclude>
- <exclude>src/main/resources/META-INF/org.apache.openejb.cli/validate.help</exclude>
- <exclude>src/main/resources/META-INF/org.apache.openejb.resource.jdbc.DataSourcePlugin/*</exclude>
- <exclude>src/main/resources/schema/ejb-jar_1_1.xsd</exclude>
- <exclude>src/main/resources/META-INF/services/org/apache/activemq/broker/openejb</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>javaee-api</artifactId>
- <version>6.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-loader</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-javaagent</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-jee</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-itests-app</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-itests-beans</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-itests-interceptor-beans</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-itests-client</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-math</artifactId>
- <version>2.1</version>
- </dependency>
- <!-- ActiveMQ -->
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-ra</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- </dependency>
- <!-- End ActiveMQ -->
- <dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.components</groupId>
- <artifactId>geronimo-connector</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.components</groupId>
- <artifactId>geronimo-transaction</artifactId>
- </dependency>
- <dependency>
- <groupId>org.objectweb.howl</groupId>
- <artifactId>howl</artifactId>
- </dependency>
- <!-- JavaMail -->
- <dependency>
- <groupId>org.apache.geronimo.javamail</groupId>
- <artifactId>geronimo-javamail_1.4_mail</artifactId>
- </dependency>
- <!-- End: JavaMail -->
- <dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-asm-shaded</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-finder-shaded</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-reflect</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-naming</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- </dependency>
- <dependency>
- <groupId>idb</groupId>
- <artifactId>idb</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>commons-dbcp-all</artifactId>
- </dependency>
- <dependency>
- <groupId>org.codehaus.swizzle</groupId>
- <artifactId>swizzle-stream</artifactId>
- </dependency>
- <!-- added temporarily till we get a fixed version of the dep report plugin -->
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <!-- webservices -->
- <dependency>
- <groupId>wsdl4j</groupId>
- <artifactId>wsdl4j</artifactId>
- </dependency>
- <dependency>
- <groupId>org.quartz-scheduler</groupId>
- <artifactId>quartz</artifactId>
- </dependency>
- <dependency>
- <groupId>xmlunit</groupId>
- <artifactId>xmlunit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
- <version>2.5.5</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-spring</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.codehaus.swizzle</groupId>
- <artifactId>swizzle-confluence</artifactId>
- <version>1.1</version>
- <type>jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-impl</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-spi</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-el_2.2_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_1.0_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_1.1_spec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-ejb-common</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_1.1_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_1.0_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-ee</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-el_2.2_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.5_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_1.0_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-validation_1.0_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject-tck</artifactId>
- <version>1</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.jsr299.tck</groupId>
- <artifactId>jsr299-tck-impl</artifactId>
- <version>1.0.2.CR1</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.enterprise</groupId>
- <artifactId>cdi-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.jws</groupId>
- <artifactId>jsr181-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.interceptor</groupId>
- <artifactId>jboss-interceptor-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.test-harness</groupId>
- <artifactId>jboss-test-harness</artifactId>
- <version>1.1.0-CR5</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <profiles>
- <profile>
- <id>openejb.debug</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkMode>pertest</forkMode>
- <argLine>"-javaagent:${basedir}/target/openejb-javaagent-${project.version}.jar" -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005</argLine>
- <workingDirectory>${basedir}/target</workingDirectory>
- <systemProperties>
- <property>
- <name>openejb.home</name>
- <value>${basedir}/target/test-classes</value>
- </property>
- <property>
- <name>log4j.configuration</name>
- <value>file:///${basedir}/target/classes/embedded.logging.properties</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>tck</id>
- <build>
- <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
- <id>copy-tck</id>
- <phase>generate-test-sources</phase>
+ <id>copy</id>
+ <phase>process-resources</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
- <groupId>org.jboss.jsr299.tck</groupId>
- <artifactId>jsr299-tck-impl</artifactId>
- <version>1.0.2.CR1</version>
- <type>xml</type>
- <classifier>suite</classifier>
- <overWrite>true</overWrite>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-javaagent</artifactId>
+ <version>${project.version}</version>
+ <outputDirectory>${project.build.directory}</outputDirectory>
</artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkMode>pertest</forkMode>
+ <testNGArtifactName>none:none</testNGArtifactName>
+ <argLine>-Xmx256m "-javaagent:${basedir}/target/openejb-javaagent-${project.version}.jar" -enableassertions</argLine>
+ <workingDirectory>${basedir}/target</workingDirectory>
+ <systemProperties>
+ <property>
+ <name>openejb.home</name>
+ <value>${basedir}/target/test-classes</value>
+ </property>
+ <property>
+ <name>log4j.configuration</name>
+ <value>file:///${basedir}/target/classes/embedded.logging.properties</value>
+ </property>
+ </systemProperties>
+ <excludes>
+ <exclude>**/TestHandler.java</exclude>
+ <exclude>org/apache/openejb/cdi/**</exclude>
+ </excludes>
+ </configuration>
+ <executions>
+ <execution>
+ <id>test-testng</id>
+ <phase>test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <junitArtifactName>none:none</junitArtifactName>
+ <excludes>
+ <exclude>**</exclude>
+ </excludes>
+ <includes>
+ <include>org/apache/openejb/cdi/**</include>
+ </includes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <tstamp>
+ <format property="TSTAMP" pattern="hh:mm" />
+ </tstamp>
+ <replace file="target/classes/openejb-version.properties" token="@DATE-REPLACED-BY-MAVEN@" value="${DSTAMP}" />
+ <replace file="target/classes/openejb-version.properties" token="@TIME-REPLACED-BY-MAVEN@" value="${TSTAMP}" />
+ <property name="compile_classpath" refid="maven.compile.classpath" />
+ <java classname="org.apache.openejb.util.MakeTxLookup">
+ <arg value="${project.build.directory}" />
+ <classpath>
+ <pathelement path="${compile_classpath}" />
+ </classpath>
+ </java>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <mainClass>org.apache.openejb.cli.Bootstrap</mainClass>
+ <!--<addClasspath>true</addClasspath>-->
+ </manifest>
+ <manifestEntries>
+ <Class-Path>openejb-loader-${project.version}.jar openejb-client-${project.version}.jar
+ xbean-finder-shaded-${xbeanVersion}.jar xbean-asm-shaded-${xbeanVersion}.jar
+ </Class-Path>
+ <J2EE-DeploymentFactory-Implementation-Class>
+ org.apache.openejb.config.VmDeploymentFactory
+ </J2EE-DeploymentFactory-Implementation-Class>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rat-maven-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>src/main/resources/META-INF/org.apache.openejb.cli/validate.examples</exclude>
+ <exclude>src/main/resources/META-INF/org.apache.openejb.cli/validate.help</exclude>
+ <exclude>src/main/resources/META-INF/org.apache.openejb.resource.jdbc.DataSourcePlugin/*</exclude>
+ <exclude>src/main/resources/schema/ejb-jar_1_1.xsd</exclude>
+ <exclude>src/main/resources/META-INF/services/org/apache/activemq/broker/openejb</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>javaee-api</artifactId>
+ <version>6.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-loader</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-javaagent</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-jee</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-itests-app</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-itests-beans</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-itests-interceptor-beans</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-itests-client</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-math</artifactId>
+ <version>2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-ra</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.components</groupId>
+ <artifactId>geronimo-connector</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.components</groupId>
+ <artifactId>geronimo-transaction</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.objectweb.howl</groupId>
+ <artifactId>howl</artifactId>
+ </dependency>
+ <!-- JavaMail -->
+ <dependency>
+ <groupId>org.apache.geronimo.javamail</groupId>
+ <artifactId>geronimo-javamail_1.4_mail</artifactId>
+ </dependency>
+ <!-- End: JavaMail -->
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-asm-shaded</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-finder-shaded</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-reflect</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-naming</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>idb</groupId>
+ <artifactId>idb</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>commons-dbcp-all</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.swizzle</groupId>
+ <artifactId>swizzle-stream</artifactId>
+ </dependency>
+ <!-- added temporarily till we get a fixed version of the dep report plugin -->
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+ <!-- webservices -->
+ <dependency>
+ <groupId>wsdl4j</groupId>
+ <artifactId>wsdl4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.quartz-scheduler</groupId>
+ <artifactId>quartz</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>xmlunit</groupId>
+ <artifactId>xmlunit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring</artifactId>
+ <version>2.5.6</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>3.0.4.RELEASE</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-spring</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.swizzle</groupId>
+ <artifactId>swizzle-confluence</artifactId>
+ <version>1.1</version>
+ <type>jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-impl</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-spi</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-el_2.2_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jcdi_1.0_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-atinject_1.0_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-interceptor_1.1_spec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-ejb-common</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-interceptor_1.1_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jcdi_1.0_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-atinject_1.0_spec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-ee</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-el_2.2_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jcdi_1.0_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-validation_1.0_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-atinject_1.0_spec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject-tck</artifactId>
+ <version>1</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jsr299.tck</groupId>
+ <artifactId>jsr299-tck-impl</artifactId>
+ <version>1.0.2.CR1</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.enterprise</groupId>
+ <artifactId>cdi-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.jws</groupId>
+ <artifactId>jsr181-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.persistence</groupId>
+ <artifactId>persistence-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.interceptor</groupId>
+ <artifactId>jboss-interceptor-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.test-harness</groupId>
+ <artifactId>jboss-test-harness</artifactId>
+ <version>1.1.0-CR5</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <profiles>
+ <profile>
+ <id>openejb.debug</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkMode>pertest</forkMode>
+ <argLine>"-javaagent:${basedir}/target/openejb-javaagent-${project.version}.jar" -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005</argLine>
+ <workingDirectory>${basedir}/target</workingDirectory>
+ <systemProperties>
+ <property>
+ <name>openejb.home</name>
+ <value>${basedir}/target/test-classes</value>
+ </property>
+ <property>
+ <name>log4j.configuration</name>
+ <value>file:///${basedir}/target/classes/embedded.logging.properties</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>tck</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-tck</id>
+ <phase>generate-test-sources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.jboss.jsr299.tck</groupId>
+ <artifactId>jsr299-tck-impl</artifactId>
+ <version>1.0.2.CR1</version>
+ <type>xml</type>
+ <classifier>suite</classifier>
+ <overWrite>true</overWrite>
+ </artifactItem>
<!-- OWB Implementation Package -->
- <artifactItem>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-impl</artifactId>
- <overWrite>true</overWrite>
- <version>1.0.0-SNAPSHOT</version>
- <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
- </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-impl</artifactId>
+ <overWrite>true</overWrite>
+ <version>1.0.0-SNAPSHOT</version>
+ <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
+ </artifactItem>
<!-- OWB JSF 1.2 Plugin Package -->
- <artifactItem>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-jsf12</artifactId>
- <overWrite>true</overWrite>
- <version>1.0.0-SNAPSHOT</version>
- <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
- </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-jsf12</artifactId>
+ <overWrite>true</overWrite>
+ <version>1.0.0-SNAPSHOT</version>
+ <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
+ </artifactItem>
<!-- OWB EL 1.0 Plugin Package -->
- <artifactItem>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-el10</artifactId>
- <overWrite>true</overWrite>
- <version>1.0.0-SNAPSHOT</version>
- <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
- </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-el10</artifactId>
+ <overWrite>true</overWrite>
+ <version>1.0.0-SNAPSHOT</version>
+ <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
+ </artifactItem>
<!-- OWB Web Plugin Package -->
- <artifactItem>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-web</artifactId>
- <overWrite>true</overWrite>
- <version>1.0.0-SNAPSHOT</version>
- <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
- </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-web</artifactId>
+ <overWrite>true</overWrite>
+ <version>1.0.0-SNAPSHOT</version>
+ <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
+ </artifactItem>
<!-- JavaEE API -->
- <artifactItem>
- <groupId>org.apache.openejb</groupId>
- <artifactId>javaee-api</artifactId>
- <overWrite>true</overWrite>
- <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
- </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>javaee-api</artifactId>
+ <overWrite>true</overWrite>
+ <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
+ </artifactItem>
<!-- OWB EE Common Package -->
- <artifactItem>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-ee-common</artifactId>
- <overWrite>true</overWrite>
- <version>1.0.0-SNAPSHOT</version>
- <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
- </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-ee-common</artifactId>
+ <overWrite>true</overWrite>
+ <version>1.0.0-SNAPSHOT</version>
+ <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
+ </artifactItem>
<!-- MyFaces API Package -->
- <artifactItem>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <overWrite>true</overWrite>
- <version>1.2.8</version>
- <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
- </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <overWrite>true</overWrite>
+ <version>1.2.8</version>
+ <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
+ </artifactItem>
<!-- MyFaces Impl Package -->
- <artifactItem>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-impl</artifactId>
- <overWrite>true</overWrite>
- <version>1.2.8</version>
- <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
- </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <overWrite>true</overWrite>
+ <version>1.2.8</version>
+ <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
+ </artifactItem>
<!-- OWB Resource Plugin Package -->
- <artifactItem>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-resource</artifactId>
- <overWrite>true</overWrite>
- <version>1.0.0-SNAPSHOT</version>
- <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
- </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-resource</artifactId>
+ <overWrite>true</overWrite>
+ <version>1.0.0-SNAPSHOT</version>
+ <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
+ </artifactItem>
<!-- Dom4j -->
- <artifactItem>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- <overWrite>true</overWrite>
- <version>1.6.1</version>
- <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
- </artifactItem>
+ <artifactItem>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <overWrite>true</overWrite>
+ <version>1.6.1</version>
+ <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
+ </artifactItem>
<!-- javassist -->
- <artifactItem>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- <overWrite>true</overWrite>
- <version>3.12.0.GA</version>
- <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
- </artifactItem>
+ <artifactItem>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <overWrite>true</overWrite>
+ <version>3.12.0.GA</version>
+ <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
+ </artifactItem>
<!-- scannotation -->
- <artifactItem>
- <groupId>net.sf.scannotation</groupId>
- <artifactId>scannotation</artifactId>
- <overWrite>true</overWrite>
- <version>1.0.2</version>
- <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
- </artifactItem>
+ <artifactItem>
+ <groupId>net.sf.scannotation</groupId>
+ <artifactId>scannotation</artifactId>
+ <overWrite>true</overWrite>
+ <version>1.0.2</version>
+ <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
+ </artifactItem>
<!-- commons-logging -->
- <artifactItem>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <overWrite>true</overWrite>
- <version>1.1.1</version>
- <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
- </artifactItem>
+ <artifactItem>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <overWrite>true</overWrite>
+ <version>1.1.1</version>
+ <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
+ </artifactItem>
<!-- commons-digester -->
- <artifactItem>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- <overWrite>true</overWrite>
- <version>1.6</version>
- <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
- </artifactItem>
+ <artifactItem>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ <overWrite>true</overWrite>
+ <version>1.6</version>
+ <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
+ </artifactItem>
<!-- commons-codec -->
- <artifactItem>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <overWrite>true</overWrite>
- <version>1.3</version>
- <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
- </artifactItem>
+ <artifactItem>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <overWrite>true</overWrite>
+ <version>1.3</version>
+ <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
+ </artifactItem>
<!-- commons-validator -->
- <artifactItem>
- <groupId>commons-validator</groupId>
- <artifactId>commons-validator</artifactId>
- <overWrite>true</overWrite>
- <version>1.3.1</version>
- <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
- </artifactItem>
+ <artifactItem>
+ <groupId>commons-validator</groupId>
+ <artifactId>commons-validator</artifactId>
+ <overWrite>true</overWrite>
+ <version>1.3.1</version>
+ <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
+ </artifactItem>
<!-- commons-collections -->
- <artifactItem>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <overWrite>true</overWrite>
- <version>2.1</version>
- <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
- </artifactItem>
+ <artifactItem>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <overWrite>true</overWrite>
+ <version>2.1</version>
+ <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
+ </artifactItem>
<!-- commons-beanutils -->
- <artifactItem>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <overWrite>true</overWrite>
- <version>1.7.0</version>
- <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
- </artifactItem>
+ <artifactItem>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <overWrite>true</overWrite>
+ <version>1.7.0</version>
+ <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
+ </artifactItem>
<!-- commons-discovery -->
- <artifactItem>
- <groupId>commons-discovery</groupId>
- <artifactId>commons-discovery</artifactId>
- <overWrite>true</overWrite>
- <version>0.4</version>
- <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
- </artifactItem>
+ <artifactItem>
+ <groupId>commons-discovery</groupId>
+ <artifactId>commons-discovery</artifactId>
+ <overWrite>true</overWrite>
+ <version>0.4</version>
+ <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
+ </artifactItem>
<!-- xml-apis -->
- <artifactItem>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <overWrite>true</overWrite>
- <version>1.0.b2</version>
- <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
- </artifactItem>
- </artifactItems>
+ <artifactItem>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <overWrite>true</overWrite>
+ <version>1.0.b2</version>
+ <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <testNGArtifactName>org.testng:testng</testNGArtifactName>
+ <suiteXmlFiles>
+ <suiteXmlFile>src/test/resources/cdi-suite.xml</suiteXmlFile>
+ </suiteXmlFiles>
+ <systemProperties>
+ <property>
+ <name>org.jboss.testharness.libraryDirectory</name>
+ <value>target/dependency/lib</value>
+ </property>
+ </systemProperties>
</configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <testNGArtifactName>org.testng:testng</testNGArtifactName>
- <suiteXmlFiles>
- <suiteXmlFile>src/test/resources/cdi-suite.xml</suiteXmlFile>
- </suiteXmlFiles>
- <systemProperties>
- <property>
- <name>org.jboss.testharness.libraryDirectory</name>
- <value>target/dependency/lib</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQ5Factory.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQ5Factory.java?rev=997688&r1=997687&r2=997688&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQ5Factory.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQ5Factory.java Thu Sep 16 10:54:11 2010
@@ -104,7 +104,12 @@ public class ActiveMQ5Factory implements
try {
//Start before returning - this is known to be safe.
broker.start();
- broker.waitUntilStarted();
+
+ try{
+ broker.waitUntilStarted();
+ }catch(Throwable t){
+ //Ignore
+ }
//Force a checkpoint to initialize pools
broker.getPersistenceAdapter().checkpoint(true);