Modified: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/OpenEjb2ConversionTest.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/OpenEjb2ConversionTest.java?rev=997688&r1=997687&r2=997688&view=diff ============================================================================== --- openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/OpenEjb2ConversionTest.java (original) +++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/OpenEjb2ConversionTest.java Thu Sep 16 10:54:11 2010 @@ -30,8 +30,12 @@ import javax.xml.bind.JAXBException; import javax.xml.bind.Marshaller; import java.io.BufferedInputStream; import java.io.ByteArrayOutputStream; +import java.io.FileReader; import java.io.IOException; import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.StringReader; +import org.custommonkey.xmlunit.XMLUnit; /** * @version $Rev$ $Date$ @@ -46,8 +50,8 @@ public class OpenEjb2ConversionTest exte // compare the results to the expected results EjbModule ejbModule = appModule.getEjbModules().get(0); - assertJaxb(prefix + "geronimo-openejb.xml", ejbModule.getAltDDs().get("geronimo-openejb.xml"), GeronimoEjbJarType.class); assertJaxb(prefix + "openejb-jar-expected.xml", ejbModule.getOpenejbJar(), OpenejbJar.class); + assertJaxb(prefix + "geronimo-openejb.xml", ejbModule.getAltDDs().get("geronimo-openejb.xml"), GeronimoEjbJarType.class); } public void testItests22() throws Exception { @@ -97,29 +101,34 @@ public class OpenEjb2ConversionTest exte assertJaxb(prefix + "orm.xml", appModule.getCmpMappings(), EntityMappings.class); } - private void assertJaxb(String expectedFile, Object object, Class<?> type) throws IOException, JAXBException, SAXException { - assertSame(type, object.getClass()); - String expected = read(expectedFile); - - String actual = toString(object, type); - -// System.out.println("expected = " + expected); -// System.out.println("actual = " + actual); + private void assertJaxb(String expectedFile, Object object, Class<?> type) throws IOException, JAXBException, SAXException { - Diff myDiff = new Diff(expected.trim(), actual.trim()); - assertTrue("Files are similar " + myDiff, myDiff.similar()); - } + assertSame(type, object.getClass()); - private String read(String name) throws IOException { - InputStream in = getClass().getClassLoader().getResource(name).openStream(); - StringBuffer sb = new StringBuffer(); - in = new BufferedInputStream(in); - int i = in.read(); - while (i != -1) { - sb.append((char) i); - i = in.read(); + final String actual = toString(object, type); + final boolean nw = XMLUnit.getNormalizeWhitespace(); + final boolean n = XMLUnit.getNormalize(); + InputStreamReader isr = null; + + try { + + XMLUnit.setNormalizeWhitespace(true); + XMLUnit.setNormalize(true); + + isr = new InputStreamReader(getClass().getClassLoader().getResource(expectedFile).openStream()); + final org.w3c.dom.Document actualDoc = XMLUnit.buildDocument(XMLUnit.newTestParser(), new StringReader(actual)); + final org.w3c.dom.Document expectedDoc = XMLUnit.buildDocument(XMLUnit.newControlParser(), isr); + + Diff myDiff = new Diff(expectedDoc, actualDoc); + assertTrue("Files are similar " + myDiff, myDiff.similar()); + } finally { + XMLUnit.setNormalizeWhitespace(nw); + XMLUnit.setNormalize(n); + + if(null != isr){ + isr.close(); + } } - return sb.toString().trim(); } private AppModule deploy(String prefix) throws OpenEJBException { @@ -144,7 +153,6 @@ public class OpenEjb2ConversionTest exte return appModule; } - private String toString(Object object, Class<?> type) throws JAXBException { JAXBContext jaxbContext = JAXBContextFactory.newInstance(type); @@ -157,6 +165,4 @@ public class OpenEjb2ConversionTest exte String actual = new String(baos.toByteArray()); return actual.trim(); } - - }
Modified: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/AmqXmlTest.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/AmqXmlTest.java?rev=997688&r1=997687&r2=997688&view=diff ============================================================================== --- openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/AmqXmlTest.java (original) +++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/AmqXmlTest.java Thu Sep 16 10:54:11 2010 @@ -18,6 +18,13 @@ package org.apache.openejb.core.mdb; public class AmqXmlTest extends JmsProxyTest { + + @Override + protected void setUp() throws Exception { + super.setUp(); + } + + @Override 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/src/test/java/org/apache/openejb/timer/ScheduleTest.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/timer/ScheduleTest.java?rev=997688&r1=997687&r2=997688&view=diff ============================================================================== --- openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/timer/ScheduleTest.java (original) +++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/timer/ScheduleTest.java Thu Sep 16 10:54:11 2010 @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.openejb.timer; import java.util.ArrayList; @@ -54,7 +53,6 @@ import org.junit.Assert; public class ScheduleTest extends TestCase { private static final List<Call> result = new ArrayList<Call>(); - private static final CountDownLatch countDownLatch = new CountDownLatch(3); public void testSchedule() throws Exception { @@ -110,23 +108,31 @@ public class ScheduleTest extends TestCa int beforeAroundInvocationCount = 0; int afterAroundInvocationCount = 0; int timeoutInvocationCount = 0; - for (Call call : result) { - switch (call) { - case BEAN_BEFORE_AROUNDTIMEOUT: - beforeAroundInvocationCount++; - break; - case BEAN_AFTER_AROUNDTIMEOUT: - afterAroundInvocationCount++; - break; - case TIMEOUT: - timeoutInvocationCount++; - break; + int size = 0; + + synchronized (result) { + + size = result.size(); + + for (Call call : result) { + switch (call) { + case BEAN_BEFORE_AROUNDTIMEOUT: + beforeAroundInvocationCount++; + break; + case BEAN_AFTER_AROUNDTIMEOUT: + afterAroundInvocationCount++; + break; + case TIMEOUT: + timeoutInvocationCount++; + break; + } } } + assertEquals(3, beforeAroundInvocationCount); assertEquals(3, afterAroundInvocationCount); assertEquals(3, timeoutInvocationCount); - assertEquals(9, result.size()); + assertEquals(9, size); } public static interface BeanInterface { @@ -137,52 +143,62 @@ public class ScheduleTest extends TestCa public static class BaseBean implements BeanInterface { public void simpleMethod() { - } @AroundTimeout public Object beanTimeoutAround(InvocationContext context) throws Exception { - assertNotNull(context.getTimer()); - result.add(Call.BEAN_BEFORE_AROUNDTIMEOUT); - Object ret = context.proceed(); - result.add(Call.BEAN_AFTER_AROUNDTIMEOUT); - countDownLatch.countDown(); - return ret; + synchronized (result) { + assertNotNull(context.getTimer()); + result.add(Call.BEAN_BEFORE_AROUNDTIMEOUT); + + Object ret = null; + try { + ret = context.proceed(); + } catch (Throwable t) { + throw new Exception(t); + } finally { + result.add(Call.BEAN_AFTER_AROUNDTIMEOUT); + countDownLatch.countDown(); + } + + return ret; + } } } @Stateless @Local(BeanInterface.class) - public static class SubBeanA extends BaseBean implements TimedObject{ - + public static class SubBeanA extends BaseBean implements TimedObject { public void subBeanA(javax.ejb.Timer timer) { - assertEquals("SubBeanAInfo", timer.getInfo()); - result.add(Call.TIMEOUT); + synchronized (result) { + assertEquals("SubBeanAInfo", timer.getInfo()); + result.add(Call.TIMEOUT); + } } @Override public void ejbTimeout(javax.ejb.Timer arg0) { Assert.fail("This method should not be invoked, we might confuse the auto-created timers and timeout timer"); } - } @Stateful @Local(BeanInterface.class) - public static class SubBeanM extends BaseBean implements TimedObject{ + public static class SubBeanM extends BaseBean implements TimedObject { @Schedule(second = "2", minute = "*", hour = "*", info = "SubBeanBInfo") public void subBeanA(javax.ejb.Timer timer) { - assertEquals("SubBeanAInfo", timer.getInfo()); - result.add(Call.TIMEOUT); + synchronized (result) { + assertEquals("SubBeanAInfo", timer.getInfo()); + result.add(Call.TIMEOUT); + } } @Override public void ejbTimeout(javax.ejb.Timer arg0) { fail("This method should not be invoked, we might confuse the auto-created timers and timeout timer"); } - } @Stateless @@ -191,8 +207,10 @@ public class ScheduleTest extends TestCa @Schedule(second = "2", minute = "*", hour = "*", info = "SubBeanBInfo") public void subBeanB(javax.ejb.Timer timer) { - assertEquals("SubBeanBInfo", timer.getInfo()); - result.add(Call.TIMEOUT); + synchronized (result) { + assertEquals("SubBeanBInfo", timer.getInfo()); + result.add(Call.TIMEOUT); + } } @Timeout @@ -207,8 +225,10 @@ public class ScheduleTest extends TestCa @Schedule(info = "badValue") public void subBeanC(javax.ejb.Timer timer) { - assertEquals("SubBeanCInfo", timer.getInfo()); - result.add(Call.TIMEOUT); + synchronized (result) { + assertEquals("SubBeanCInfo", timer.getInfo()); + result.add(Call.TIMEOUT); + } } @Timeout @@ -218,6 +238,7 @@ public class ScheduleTest extends TestCa } public static enum Call { + BEAN_TIMEOUT, BEAN_BEFORE_AROUNDTIMEOUT, BEAN_AFTER_AROUNDTIMEOUT, BAD_VALUE, TIMEOUT } } Modified: openejb/trunk/openejb3/container/openejb-core/src/test/resources/org/apache/openejb/core/mdb/activemq.xml URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/resources/org/apache/openejb/core/mdb/activemq.xml?rev=997688&r1=997687&r2=997688&view=diff ============================================================================== --- openejb/trunk/openejb3/container/openejb-core/src/test/resources/org/apache/openejb/core/mdb/activemq.xml (original) +++ openejb/trunk/openejb3/container/openejb-core/src/test/resources/org/apache/openejb/core/mdb/activemq.xml Thu Sep 16 10:54:11 2010 @@ -18,18 +18,35 @@ --> <beans - xmlns="http://www.springframework.org/schema/beans"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd";> - <bean name="broker" class="org.apache.activemq.xbean.XBeanBrokerService"> - <property name="persistent" value="false"/> - <property name="brokerName" value="localhost"/> - <property name="transportConnectors"> - <list> - <bean name="openwire" class="org.apache.activemq.broker.TransportConnector"> - <property name="uri" value="tcp://localhost:61616"/> - </bean> - </list> - </property> + xmlns="http://www.springframework.org/schema/beans"; + xmlns:amq="http://activemq.apache.org/schema/core"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core-5.4.0.xsd";> + + + <!-- Allows us to use system properties as variables in this configuration file --> + <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/> + + <bean id="store" class="org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter"> + <property name="checkpointInterval" value="60000"/> + <property name="directory" value="data/activemq"/> </bean> + + <broker xmlns="http://activemq.apache.org/schema/core"; + useJmx="false" + brokerName="openejb" + dataDirectory="data/activemq" + useShutdownHook="true" + persistent="true" + start="false" + persistenceAdapter="#store"> + + <!-- The transport connectors ActiveMQ will listen to --> + <transportConnectors> + <transportConnector uri="tcp://localhost:61616?daemon=true&keepAlive=true&wireFormat.maxInactivityDuration=0"/> + </transportConnectors> + + </broker> + </beans> \ No newline at end of file Modified: openejb/trunk/openejb3/container/openejb-spring/pom.xml URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-spring/pom.xml?rev=997688&r1=997687&r2=997688&view=diff ============================================================================== --- openejb/trunk/openejb3/container/openejb-spring/pom.xml (original) +++ openejb/trunk/openejb3/container/openejb-spring/pom.xml Thu Sep 16 10:54:11 2010 @@ -21,134 +21,144 @@ <!-- $Rev: 685052 $ $Date: 2008-08-11 23:31:13 -0700 (Mon, 11 Aug 2008) $ --> <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-spring</artifactId> - <packaging>jar</packaging> - <name>OpenEJB :: Container :: Spring</name> - <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>"-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> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>org.apache.openejb</groupId> - <artifactId>openejb-core</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-client</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring</artifactId> - <version>2.5.5</version> - </dependency> - </dependencies> - <profiles> - <profile> - <id>openejb.debug</id> - <build> + <parent> + <artifactId>container</artifactId> + <groupId>org.apache.openejb</groupId> + <version>3.2-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>openejb-spring</artifactId> + <packaging>jar</packaging> + <name>OpenEJB :: Container :: Spring</name> + <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-surefire-plugin</artifactId> - <configuration> - <forkMode>pertest</forkMode> - <argLine>"-javaagent:${basedir}/target/openejb-javaagent-${project.sversion}.jar" -enableassertions - -agentlib:jdwp=transport=dt_socket,server=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> + <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>"-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/test-classes/embedded.logging.properties</value> + </property> + </systemProperties> + <excludes> + <exclude>**/TestHandler.java</exclude> + </excludes> + </configuration> + </plugin> </plugins> - </build> - </profile> - </profiles> + </build> + <dependencies> + <dependency> + <groupId>org.apache.openejb</groupId> + <artifactId>openejb-core</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-client</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + <version>3.0.4.RELEASE</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + <version>3.0.4.RELEASE</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-orm</artifactId> + <version>3.0.4.RELEASE</version> + </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.sversion}.jar" -enableassertions -agentlib:jdwp=transport=dt_socket,server=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> </project> Added: openejb/trunk/openejb3/container/openejb-spring/src/test/resources/embedded.logging.properties URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-spring/src/test/resources/embedded.logging.properties?rev=997688&view=auto ============================================================================== --- openejb/trunk/openejb3/container/openejb-spring/src/test/resources/embedded.logging.properties (added) +++ openejb/trunk/openejb3/container/openejb-spring/src/test/resources/embedded.logging.properties Thu Sep 16 10:54:11 2010 @@ -0,0 +1,65 @@ +# =~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# =~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~ +# Configuration file for logging in OpenEJB +# +# OpenEJB uses Apache Log4j to provide logging services +# to the container system. +# +# This file configures log4j using the properties file +# format declared by the class PropertyConfigurator +# +# For a complete reference on log4j property +# configuration, visit: +# +# http://jakarta.apache.org/log4j/docs/api/org/apache/log4j/PropertyConfigurator.html +# +# This file is designated as the log4j configuration file +# when the system property, log4j.configuration, is set +# as follows: +# +# java -Dlog4j.configuration=file:conf/logging.conf +# +# Any other file could be set as the log4j configuration +# file using that file name instead. For example, to +# set the logging configuration using logging.xml, set +# the log4j.configuration system property as follows: +# +# java -Dlog4j.configuration=file:conf/logging.xml +# +# For more information on specifying log4j configuration +# files, visit: +# +# http://jakarta.apache.org/log4j/docs/manual.html +# +# =~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~ + +log4j.rootLogger = fatal,C +log4j.category.OpenEJB = warn +log4j.category.OpenEJB.options = info +log4j.category.OpenEJB.server = info +log4j.category.OpenEJB.startup = info +log4j.category.OpenEJB.startup.service = warn +log4j.category.OpenEJB.startup.config = info +log4j.category.OpenEJB.hsql = info +log4j.category.CORBA-Adapter = info +log4j.category.Transaction = warn +log4j.category.org.apache.activemq = error +log4j.category.org.apache.geronimo = error +log4j.category.openjpa = warn + +log4j.appender.C = org.apache.log4j.ConsoleAppender +log4j.appender.C.layout = org.apache.log4j.SimpleLayout Modified: openejb/trunk/openejb3/examples/pom.xml URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/pom.xml?rev=997688&r1=997687&r2=997688&view=diff ============================================================================== --- openejb/trunk/openejb3/examples/pom.xml (original) +++ openejb/trunk/openejb3/examples/pom.xml Thu Sep 16 10:54:11 2010 @@ -21,83 +21,83 @@ <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>openejb</artifactId> - <groupId>org.apache.openejb</groupId> - <version>3.2-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>examples</artifactId> - <packaging>pom</packaging> - <name>OpenEJB :: Examples</name> - <modules> - <module>applicationexception</module> - <module>simple-stateful</module> - <module>simple-stateless</module> - <module>simple-stateless-with-descriptor</module> - <module>simple-singleton</module> - <module>simple-mdb</module> - <module>simple-mdb-with-descriptor</module> - <module>simple-cmp2</module> - <module>simple-webservice</module> - <module>component-interfaces</module> - <module>injection-of-ejbs</module> - <module>injection-of-env-entry</module> - <module>injection-of-datasource</module> - <module>injection-of-entitymanager</module> - <module>injection-of-connectionfactory</module> - <module>testing-transactions</module> - <module>testing-security</module> - <module>testing-security-2</module> - <module>testcase-injection</module> - <module>alternate-descriptors</module> - <module>ear-testing</module> - <module>interceptors</module> - <module>custom-injection</module> - <module>helloworld-weblogic</module> - <module>jpa-hibernate</module> - <module>jpa-eclipselink</module> - <module>spring-integration</module> - <module>telephone-stateful</module> - <module>quartz-app</module> - <module>webservice-attachments</module> - <module>webapps</module> - <module>webservice-security</module> - <module>webservice-ws-security</module> - <module>webservice-inheritance</module> - <module>transaction-rollback</module> - <module>troubleshooting</module> - </modules> + <parent> + <artifactId>openejb</artifactId> + <groupId>org.apache.openejb</groupId> + <version>3.2-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>examples</artifactId> + <packaging>pom</packaging> + <name>OpenEJB :: Examples</name> + <modules> + <module>applicationexception</module> + <module>simple-stateful</module> + <module>simple-stateless</module> + <module>simple-stateless-with-descriptor</module> + <module>simple-singleton</module> + <module>simple-mdb</module> + <module>simple-mdb-with-descriptor</module> + <module>simple-cmp2</module> + <module>simple-webservice</module> + <module>component-interfaces</module> + <module>injection-of-ejbs</module> + <module>injection-of-env-entry</module> + <module>injection-of-datasource</module> + <module>injection-of-entitymanager</module> + <module>injection-of-connectionfactory</module> + <module>testing-transactions</module> + <module>testing-security</module> + <module>testing-security-2</module> + <module>testcase-injection</module> + <module>alternate-descriptors</module> + <module>ear-testing</module> + <module>interceptors</module> + <module>custom-injection</module> + <module>helloworld-weblogic</module> + <module>jpa-hibernate</module> + <module>jpa-eclipselink</module> + <module>spring-integration</module> + <module>telephone-stateful</module> + <module>quartz-app</module> + <module>webservice-attachments</module> + <module>webapps</module> + <module>webservice-security</module> + <module>webservice-ws-security</module> + <module>webservice-inheritance</module> + <module>transaction-rollback</module> + <module>troubleshooting</module> + </modules> - <profiles> - <profile> - <id>release</id> - <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <inherited>false</inherited> - <configuration> - <descriptors> - <descriptor>src.xml</descriptor> - </descriptors> - <tarLongFileMode>gnu</tarLongFileMode> - <finalName>openejb-examples-${project.version}</finalName> - </configuration> - <executions> - <execution> - <id>make-assembly</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> + <profiles> + <profile> + <id>release</id> + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <inherited>false</inherited> + <configuration> + <descriptors> + <descriptor>src.xml</descriptor> + </descriptors> + <tarLongFileMode>gnu</tarLongFileMode> + <finalName>openejb-examples-${project.version}</finalName> + </configuration> + <executions> + <execution> + <id>make-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> Modified: openejb/trunk/openejb3/examples/simple-cmp2/pom.xml URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/simple-cmp2/pom.xml?rev=997688&r1=997687&r2=997688&view=diff ============================================================================== --- openejb/trunk/openejb3/examples/simple-cmp2/pom.xml (original) +++ openejb/trunk/openejb3/examples/simple-cmp2/pom.xml Thu Sep 16 10:54:11 2010 @@ -20,65 +20,101 @@ <!-- $Rev: 636494 $ $Date: 2008-03-12 21:24:02 +0100 (Wed, 12 Mar 2008) $ --> <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";> - <modelVersion>4.0.0</modelVersion> - <groupId>org.superbiz</groupId> - <artifactId>simple-cmp2</artifactId> - <packaging>jar</packaging> - <version>1.1-SNAPSHOT</version> - <name>OpenEJB :: Examples :: Simple CMP2 Entity</name> - <properties> + <modelVersion>4.0.0</modelVersion> + <groupId>org.superbiz</groupId> + <artifactId>simple-cmp2</artifactId> + <packaging>jar</packaging> + <version>1.1-SNAPSHOT</version> + <name>OpenEJB :: Examples :: Simple CMP2 Entity</name> + <properties> <!-- - http://docs.codehaus.org/display/MAVENUSER/POM+Element+for+Source+File+Encoding --> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - </properties> - <build> - <defaultGoal>install</defaultGoal> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> - </plugin> - </plugins> - </build> - <repositories> - <repository> - <id>apache-m2-snapshot</id> - <name>Apache Snapshot Repository</name> - <url>http://repository.apache.org/snapshots</url> - </repository> - </repositories> - <dependencies> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> + <build> + <defaultGoal>install</defaultGoal> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.0.2</version> + <configuration> + <source>1.6</source> + <target>1.6</target> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.6</version> + <configuration> + <forkMode>pertest</forkMode> + <argLine>-javaagent:${basedir}/target/openejb-javaagent-3.1.2.jar</argLine> + <workingDirectory>${basedir}/target</workingDirectory> + </configuration> + </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>3.1.2</version> + <outputDirectory>${project.build.directory}</outputDirectory> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + + + </plugins> + </build> + <repositories> + <repository> + <id>apache-m2-snapshot</id> + <name>Apache Snapshot Repository</name> + <url>http://repository.apache.org/snapshots</url> + </repository> + </repositories> + <dependencies> <!-- spec apis such as javax.persistence --> - <dependency> - <groupId>org.apache.openejb</groupId> - <artifactId>javaee-api</artifactId> - <version>6.0-SNAPSHOT</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.4</version> - <scope>test</scope> - </dependency> + <dependency> + <groupId>org.apache.openejb</groupId> + <artifactId>javaee-api</artifactId> + <version>6.0-SNAPSHOT</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.4</version> + <scope>test</scope> + </dependency> <!-- openejb container for running tests --> - <dependency> - <groupId>org.apache.openejb</groupId> - <artifactId>openejb-core</artifactId> - <version>3.2-SNAPSHOT</version> - <scope>test</scope> - </dependency> + <dependency> + <groupId>org.apache.openejb</groupId> + <artifactId>openejb-core</artifactId> + <version>3.2-SNAPSHOT</version> + <scope>test</scope> + </dependency> - </dependencies> + </dependencies> <!-- @@ -86,15 +122,15 @@ It is not required and may be deleted. For more information see: http://maven.apache.org/plugins/maven-deploy-plugin/ --> - <distributionManagement> - <repository> - <id>localhost</id> - <url>file://${basedir}/target/repo/</url> - </repository> - <snapshotRepository> - <id>localhost</id> - <url>file://${basedir}/target/snapshot-repo/</url> - </snapshotRepository> - </distributionManagement> + <distributionManagement> + <repository> + <id>localhost</id> + <url>file://${basedir}/target/repo/</url> + </repository> + <snapshotRepository> + <id>localhost</id> + <url>file://${basedir}/target/snapshot-repo/</url> + </snapshotRepository> + </distributionManagement> </project> Modified: openejb/trunk/openejb3/examples/simple-mdb/pom.xml URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/simple-mdb/pom.xml?rev=997688&r1=997687&r2=997688&view=diff ============================================================================== --- openejb/trunk/openejb3/examples/simple-mdb/pom.xml (original) +++ openejb/trunk/openejb3/examples/simple-mdb/pom.xml Thu Sep 16 10:54:11 2010 @@ -20,80 +20,80 @@ <!-- $Rev: 638272 $ $Date: 2008-03-18 01:59:59 -0700 (Tue, 18 Mar 2008) $ --> <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";> - <modelVersion>4.0.0</modelVersion> - <groupId>org.superbiz</groupId> - <artifactId>simple-mdb</artifactId> - <packaging>jar</packaging> - <version>1.1-SNAPSHOT</version> - <name>OpenEJB :: Examples :: Simple MDB Example</name> - <properties> + <modelVersion>4.0.0</modelVersion> + <groupId>org.superbiz</groupId> + <artifactId>simple-mdb</artifactId> + <packaging>jar</packaging> + <version>1.1-SNAPSHOT</version> + <name>OpenEJB :: Examples :: Simple MDB Example</name> + <properties> <!-- - http://docs.codehaus.org/display/MAVENUSER/POM+Element+for+Source+File+Encoding --> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - </properties> - <build> - <defaultGoal>install</defaultGoal> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> - </plugin> - </plugins> - </build> - <repositories> - <repository> - <id>apache-m2-snapshot</id> - <name>Apache Snapshot Repository</name> - <url>http://repository.apache.org/snapshots</url> - </repository> - </repositories> - <dependencies> - <dependency> - <groupId>org.apache.openejb</groupId> - <artifactId>javaee-api</artifactId> - <version>6.0-SNAPSHOT</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.1</version> - <scope>test</scope> - </dependency> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> + <build> + <defaultGoal>install</defaultGoal> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.0.2</version> + <configuration> + <source>1.6</source> + <target>1.6</target> + </configuration> + </plugin> + </plugins> + </build> + <repositories> + <repository> + <id>apache-m2-snapshot</id> + <name>Apache Snapshot Repository</name> + <url>http://repository.apache.org/snapshots</url> + </repository> + </repositories> + <dependencies> + <dependency> + <groupId>org.apache.openejb</groupId> + <artifactId>javaee-api</artifactId> + <version>6.0-SNAPSHOT</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.8.1</version> + <scope>test</scope> + </dependency> <!-- The <scope>test</scope> guarantees that non of your runtime code is dependent on any OpenEJB classes. --> - <dependency> - <groupId>org.apache.openejb</groupId> - <artifactId>openejb-core</artifactId> - <version>3.2-SNAPSHOT</version> - <scope>test</scope> - </dependency> + <dependency> + <groupId>org.apache.openejb</groupId> + <artifactId>openejb-core</artifactId> + <version>3.2-SNAPSHOT</version> + <scope>test</scope> + </dependency> - </dependencies> + </dependencies> <!-- This section allows you to configure where to publish libraries for sharing. It is not required and may be deleted. For more information see: http://maven.apache.org/plugins/maven-deploy-plugin/ --> - <distributionManagement> - <repository> - <id>localhost</id> - <url>file://${basedir}/target/repo/</url> - </repository> - <snapshotRepository> - <id>localhost</id> - <url>file://${basedir}/target/snapshot-repo/</url> - </snapshotRepository> - </distributionManagement> + <distributionManagement> + <repository> + <id>localhost</id> + <url>file://${basedir}/target/repo/</url> + </repository> + <snapshotRepository> + <id>localhost</id> + <url>file://${basedir}/target/snapshot-repo/</url> + </snapshotRepository> + </distributionManagement> </project> Modified: openejb/trunk/openejb3/examples/spring-integration/pom.xml URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/spring-integration/pom.xml?rev=997688&r1=997687&r2=997688&view=diff ============================================================================== --- openejb/trunk/openejb3/examples/spring-integration/pom.xml (original) +++ openejb/trunk/openejb3/examples/spring-integration/pom.xml Thu Sep 16 10:54:11 2010 @@ -20,115 +20,139 @@ <!-- $Rev$ $Date$ --> <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";> - <modelVersion>4.0.0</modelVersion> - <groupId>org.superbiz</groupId> - <artifactId>spring-integration</artifactId> - <packaging>jar</packaging> - <version>1.1-SNAPSHOT</version> - <name>OpenEJB :: Examples :: Spring Integration</name> - <properties> + <modelVersion>4.0.0</modelVersion> + <groupId>org.superbiz</groupId> + <artifactId>spring-integration</artifactId> + <packaging>jar</packaging> + <version>1.1-SNAPSHOT</version> + <name>OpenEJB :: Examples :: Spring Integration</name> + <properties> <!-- - http://docs.codehaus.org/display/MAVENUSER/POM+Element+for+Source+File+Encoding --> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - </properties> - <build> - <defaultGoal>install</defaultGoal> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> - </plugin> - </plugins> - </build> - <repositories> - <repository> - <id>apache-m2-snapshot</id> - <name>Apache Snapshot Repository</name> - <url>http://repository.apache.org/snapshots</url> - </repository> - </repositories> - <dependencies> - <dependency> - <groupId>org.apache.openejb</groupId> - <artifactId>javaee-api</artifactId> - <version>6.0-SNAPSHOT</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.1</version> - <scope>test</scope> - </dependency> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> + <build> + <defaultGoal>install</defaultGoal> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.3.2</version> + <configuration> + <source>1.6</source> + <target>1.6</target> + </configuration> + </plugin> + </plugins> + </build> + <repositories> + <repository> + <id>apache-m2-snapshot</id> + <name>Apache Snapshot Repository</name> + <url>http://repository.apache.org/snapshots</url> + </repository> + </repositories> + <dependencies> + <dependency> + <groupId>org.apache.openejb</groupId> + <artifactId>javaee-api</artifactId> + <version>6.0-SNAPSHOT</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.8.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.16</version> + <scope>test</scope> + </dependency> <!-- START SNIPPET: required --> - <dependency> - <groupId>org.apache.openejb</groupId> - <artifactId>openejb-core</artifactId> - <version>3.2-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.openejb</groupId> - <artifactId>openejb-spring</artifactId> - <version>3.2-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring</artifactId> - <version>2.5.5</version> - </dependency> + <dependency> + <groupId>org.apache.openejb</groupId> + <artifactId>openejb-core</artifactId> + <version>3.2-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.openejb</groupId> + <artifactId>openejb-spring</artifactId> + <version>3.2-SNAPSHOT</version> + <exclusions> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + <version>3.0.4.RELEASE</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + <version>3.0.4.RELEASE</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-orm</artifactId> + <version>3.0.4.RELEASE</version> + </dependency> + <!-- END SNIPPET: required --> <!-- START SNIPPET: optional --> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate</artifactId> - <version>3.2.5.ga</version> - <exclusions> - <exclusion> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - </exclusion> - </exclusions> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-entitymanager</artifactId> - <version>3.2.1.ga</version> - <exclusions> - <exclusion> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - </exclusion> - </exclusions> - <scope>test</scope> - </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate</artifactId> + <version>3.2.5.ga</version> + <exclusions> + <exclusion> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + </exclusion> + </exclusions> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-entitymanager</artifactId> + <version>3.2.1.ga</version> + <exclusions> + <exclusion> + <groupId>javax.persistence</groupId> + <artifactId>persistence-api</artifactId> + </exclusion> + </exclusions> + <scope>test</scope> + </dependency> <!-- END SNIPPET: optional --> - </dependencies> + </dependencies> <!-- This section allows you to configure where to publish libraries for sharing. It is not required and may be deleted. For more information see: http://maven.apache.org/plugins/maven-deploy-plugin/ --> - <distributionManagement> - <repository> - <id>localhost</id> - <url>file://${basedir}/target/repo/</url> - </repository> - <snapshotRepository> - <id>localhost</id> - <url>file://${basedir}/target/snapshot-repo/</url> - </snapshotRepository> - </distributionManagement> + <distributionManagement> + <repository> + <id>localhost</id> + <url>file://${basedir}/target/repo/</url> + </repository> + <snapshotRepository> + <id>localhost</id> + <url>file://${basedir}/target/snapshot-repo/</url> + </snapshotRepository> + </distributionManagement> </project> Modified: openejb/trunk/openejb3/examples/spring-integration/src/test/java/org/superbiz/spring/MoviesTest.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/spring-integration/src/test/java/org/superbiz/spring/MoviesTest.java?rev=997688&r1=997687&r2=997688&view=diff ============================================================================== --- openejb/trunk/openejb3/examples/spring-integration/src/test/java/org/superbiz/spring/MoviesTest.java (original) +++ openejb/trunk/openejb3/examples/spring-integration/src/test/java/org/superbiz/spring/MoviesTest.java Thu Sep 16 10:54:11 2010 @@ -18,14 +18,16 @@ package org.superbiz.spring; import junit.framework.TestCase; import org.springframework.context.support.ClassPathXmlApplicationContext; - -import java.util.Map; import java.util.List; //START SNIPPET: code public class MoviesTest extends TestCase { public void test() throws Exception { + + //Uncomment for debug logging + //org.apache.log4j.BasicConfigurator.configure(); + ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("movies.xml"); // Can I lookup the Cineplex EJB via the Spring ApplicationContext Modified: openejb/trunk/openejb3/itests/openejb-itests-client/pom.xml URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-client/pom.xml?rev=997688&r1=997687&r2=997688&view=diff ============================================================================== --- openejb/trunk/openejb3/itests/openejb-itests-client/pom.xml (original) +++ openejb/trunk/openejb3/itests/openejb-itests-client/pom.xml Thu Sep 16 10:54:11 2010 @@ -100,7 +100,7 @@ </dependency> <dependency> <groupId>org.apache.activemq</groupId> - <artifactId>activemq-core</artifactId> + <artifactId>activemq-ra</artifactId> </dependency> <dependency> <groupId>junit</groupId>
