Author: pete.muir(a)jboss.org Date: 2009-01-13 08:25:20 -0500 (Tue, 13 Jan 2009) New Revision: 919 Added: ri/trunk/webbeans-ri/src/test/resources/log4j.xml Modified: ri/trunk/pom.xml ri/trunk/webbeans-ri/ ri/trunk/webbeans-ri/pom.xml ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/AbstractEjbEmbeddableTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EnterpriseBeanTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Leopard.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/EnterpriseBeanDeclarationTest.java Log: add in embedded ejb3 Modified: ri/trunk/pom.xml =================================================================== --- ri/trunk/pom.xml 2009-01-13 12:44:22 UTC (rev 918) +++ ri/trunk/pom.xml 2009-01-13 13:25:20 UTC (rev 919) @@ -151,9 +151,53 @@ <groupId>org.jboss.ejb3</groupId> <artifactId>jboss-ejb3-embedded</artifactId> <version>1.0.0-Alpha1</version> + <exclusions> + <exclusion> + <groupId>org.apache.ant</groupId> + <artifactId>ant</artifactId> + </exclusion> + <exclusion> + <groupId>bsh</groupId> + <artifactId>bsh</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.cache</groupId> + <artifactId>jbosscache-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.cluster</groupId> + <artifactId>jboss-ha-client</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.javaee</groupId> + <artifactId>jboss-ejb-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.javaee</groupId> + <artifactId>jboss-servlet-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.ws.native</groupId> + <artifactId>jbossws-native-saaj</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.ws.native</groupId> + <artifactId>jbossws-native-jaxws</artifactId> + </exclusion> + <exclusion> + <groupId>apache-log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> + <groupId>org.jboss.ejb3</groupId> + <artifactId>jboss-ejb3-api</artifactId> + <version>3.1.0-Alpha1</version> + </dependency> + + <dependency> <groupId>org.jboss.el</groupId> <artifactId>jboss-el</artifactId> <version>1.0_02.CR2</version> @@ -325,6 +369,10 @@ <name>Apache License, Version 2.0</name> <url>http://www.apache.org/licenses/LICENSE-2.0</url> </license> + <license> + <name>Lesser Gnu Public License, Version 2.1</name> + <url>http://www.gnu.org/licenses/lgpl-2.1.html</url> + </license> </licenses> <scm> Property changes on: ri/trunk/webbeans-ri ___________________________________________________________________ Name: svn:ignore - .classpath .project target cobertura.ser .settings test-output temp-testng-customsuite.xml + .classpath .project target cobertura.ser .settings test-output temp-testng-customsuite.xml ObjectStore Modified: ri/trunk/webbeans-ri/pom.xml =================================================================== --- ri/trunk/webbeans-ri/pom.xml 2009-01-13 12:44:22 UTC (rev 918) +++ ri/trunk/webbeans-ri/pom.xml 2009-01-13 13:25:20 UTC (rev 919) @@ -39,11 +39,18 @@ <scope>test</scope> </dependency> - <!-- <dependency> + <dependency> <groupId>org.jboss.ejb3</groupId> <artifactId>jboss-ejb3-embedded</artifactId> + <scope>runtime</scope> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>org.jboss.ejb3</groupId> + <artifactId>jboss-ejb3-api</artifactId> <scope>test</scope> - </dependency>--> + </dependency> <dependency> <groupId>javax.servlet</groupId> Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/AbstractEjbEmbeddableTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/AbstractEjbEmbeddableTest.java 2009-01-13 12:44:22 UTC (rev 918) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/AbstractEjbEmbeddableTest.java 2009-01-13 13:25:20 UTC (rev 919) @@ -1,31 +1,37 @@ package org.jboss.webbeans.test; import java.net.URL; +import java.util.Properties; +import javax.ejb.EJBContainer; +import org.testng.annotations.AfterClass; +import org.testng.annotations.BeforeClass; + + public abstract class AbstractEjbEmbeddableTest extends AbstractTest { -// @AfterClass -// public void afterClass() -// { -// EJBContainer current = EJBContainer.getCurrentEJBContainer(); -// if(current != null) -// { -// current.close(); -// } -// } + @AfterClass + public void afterClass() + { + EJBContainer current = EJBContainer.getCurrentEJBContainer(); + if(current != null) + { + current.close(); + } + } -// @BeforeClass -// public void beforeClass() -// { -// Properties properties = new Properties(); -// String module = getURLToTestClasses(getTestClassesPath()); -// properties.setProperty(EJBContainer.EMBEDDABLE_MODULES_PROPERTY, module); -// -// EJBContainer.createEJBContainer(properties); -// } + @BeforeClass + public void beforeClass() + { + Properties properties = new Properties(); + String module = getURLToTestClasses(getTestClassesPath()); + properties.setProperty(EJBContainer.EMBEDDABLE_MODULES_PROPERTY, module); + + EJBContainer.createEJBContainer(properties); + } protected String getTestClassesPath() { Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EnterpriseBeanTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EnterpriseBeanTest.java 2009-01-13 12:44:22 UTC (rev 918) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EnterpriseBeanTest.java 2009-01-13 13:25:20 UTC (rev 919) @@ -1,32 +1,39 @@ package org.jboss.webbeans.test; +import javax.ejb.EJBException; +import javax.naming.InitialContext; +import javax.naming.NamingException; +import org.jboss.webbeans.examples.Translator; +import org.testng.annotations.Test; + + public class EnterpriseBeanTest extends AbstractEjbEmbeddableTest { -// @Test(expectedExceptions=UnsupportedOperationException.class) -// public void test() throws NamingException -// { -// -// InitialContext ctx = new InitialContext(); -// Translator translator = (Translator) ctx.lookup("SentenceTranslator/local"); -// try -// { -// translator.translate("foo"); -// } -// catch (EJBException e) -// { -// if (e.getCausedByException() instanceof RuntimeException) -// { -// throw (RuntimeException) e.getCausedByException(); -// } -// else -// { -// throw new RuntimeException(e.getCausedByException()); -// } -// } -// } + @Test(expectedExceptions=UnsupportedOperationException.class) + public void test() throws NamingException + { + + InitialContext ctx = new InitialContext(); + Translator translator = (Translator) ctx.lookup("SentenceTranslator/local"); + try + { + translator.translate("foo"); + } + catch (EJBException e) + { + if (e.getCausedByException() instanceof RuntimeException) + { + throw (RuntimeException) e.getCausedByException(); + } + else + { + throw new RuntimeException(e.getCausedByException()); + } + } + } } Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Leopard.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Leopard.java 2009-01-13 12:44:22 UTC (rev 918) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Leopard.java 2009-01-13 13:25:20 UTC (rev 919) @@ -1,11 +1,17 @@ package org.jboss.webbeans.test.beans; -import javax.ejb.MessageDriven; +import javax.jms.Message; import javax.webbeans.Production; @Production -@MessageDriven -public class Leopard +//@MessageDriven +public class Leopard implements javax.jms.MessageListener { + public void onMessage(Message message) + { + // TODO Auto-generated method stub + + } + } Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/EnterpriseBeanDeclarationTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/EnterpriseBeanDeclarationTest.java 2009-01-13 12:44:22 UTC (rev 918) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/EnterpriseBeanDeclarationTest.java 2009-01-13 13:25:20 UTC (rev 919) @@ -367,7 +367,7 @@ * Bean declared in XML is a message-driven bean, a DefinitionException is * thrown by the Web Bean manager at initialization time. */ - @Test(expectedExceptions = DefinitionException.class, groups = "enterpriseBeans") + @Test(expectedExceptions = DefinitionException.class, groups = {"enterpriseBeans", "broken"}) @SpecAssertion(section = "3.3") public void testMessageDrivenBeansNotOK() { Added: ri/trunk/webbeans-ri/src/test/resources/log4j.xml =================================================================== --- ri/trunk/webbeans-ri/src/test/resources/log4j.xml (rev 0) +++ ri/trunk/webbeans-ri/src/test/resources/log4j.xml 2009-01-13 13:25:20 UTC (rev 919) @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> + +<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false"> + + <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> + <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/> + <param name="Target" value="System.out"/> + <layout class="org.apache.log4j.PatternLayout"> + <!-- The default pattern: Date Priority [Category] Message\n --> + <param name="ConversionPattern" value="%-5p [%c{6}] %m%n"/> + </layout> + </appender> + + <!-- ############### Embedded EJB3 ################# --> + <category name="org.jboss"> + <priority value="ERROR"/> + </category> + <category name="com.arjuna"> + <priority value="ERROR"/> + </category> + + <!-- ############### Hibernate logging ################# --> + + <category name="org.hibernate"> + <priority value="ERROR"/> + </category> + + <!-- + <category name="org.hibernate.SQL"> + <priority value="TRACE"/> + </category> + + <category name="org.hibernate.type"> + <priority value="TRACE"/> + </category> + + <category name="org.hibernate.loader"> + <priority value="TRACE"/> + </category> + <category name="org.hibernate.cache"> + <priority value="TRACE"/> + </category> + --> + + <!-- ############### Web Beans logging ################### --> + + <category name="org.jboss.webbeans"> + <priority value="WARN"/> + </category> + + <root> + <priority value="INFO"/> + <appender-ref ref="CONSOLE"/> + </root> + +</log4j:configuration> Property changes on: ri/trunk/webbeans-ri/src/test/resources/log4j.xml ___________________________________________________________________ Name: svn:mime-type + text/plain