[webbeans-commits] Webbeans SVN: r535 - in ri/trunk/webbeans-ri: .settings and 2 other directories.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Tue Dec 16 13:56:05 EST 2008
Author: pete.muir at jboss.org
Date: 2008-12-16 13:56:04 -0500 (Tue, 16 Dec 2008)
New Revision: 535
Modified:
ri/trunk/webbeans-ri/.settings/org.eclipse.jdt.core.prefs
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/mock/MockEjbDescriptor.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockWebBeanDiscovery.java
Log:
Remove Embedded EJB3, it won't make it in for Alpah1
Modified: ri/trunk/webbeans-ri/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- ri/trunk/webbeans-ri/.settings/org.eclipse.jdt.core.prefs 2008-12-16 18:36:27 UTC (rev 534)
+++ ri/trunk/webbeans-ri/.settings/org.eclipse.jdt.core.prefs 2008-12-16 18:56:04 UTC (rev 535)
@@ -1,4 +1,4 @@
-#Wed Dec 10 10:36:49 CET 2008
+#Tue Dec 16 18:53:08 GMT 2008
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.source=1.5
Modified: ri/trunk/webbeans-ri/pom.xml
===================================================================
--- ri/trunk/webbeans-ri/pom.xml 2008-12-16 18:36:27 UTC (rev 534)
+++ ri/trunk/webbeans-ri/pom.xml 2008-12-16 18:56:04 UTC (rev 535)
@@ -25,11 +25,11 @@
<classifier>jdk15</classifier>
</dependency>
- <dependency>
+ <!-- <dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-embedded</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 2008-12-16 18:36:27 UTC (rev 534)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/AbstractEjbEmbeddableTest.java 2008-12-16 18:56:04 UTC (rev 535)
@@ -1,37 +1,31 @@
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 2008-12-16 18:36:27 UTC (rev 534)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EnterpriseBeanTest.java 2008-12-16 18:56:04 UTC (rev 535)
@@ -1,38 +1,32 @@
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/mock/MockEjbDescriptor.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockEjbDescriptor.java 2008-12-16 18:36:27 UTC (rev 534)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockEjbDescriptor.java 2008-12-16 18:56:04 UTC (rev 535)
@@ -7,7 +7,6 @@
import javax.ejb.MessageDriven;
import javax.ejb.Remove;
-import javax.ejb.Singleton;
import javax.ejb.Stateful;
import javax.ejb.Stateless;
@@ -65,7 +64,8 @@
public boolean isSingleton()
{
- return type.isAnnotationPresent(Singleton.class);
+ return false;
+ //return type.isAnnotationPresent(Singleton.class);
}
public boolean isStateful()
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockWebBeanDiscovery.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockWebBeanDiscovery.java 2008-12-16 18:36:27 UTC (rev 534)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockWebBeanDiscovery.java 2008-12-16 18:56:04 UTC (rev 535)
@@ -8,7 +8,6 @@
import java.util.Set;
import javax.ejb.MessageDriven;
-import javax.ejb.Singleton;
import javax.ejb.Stateful;
import javax.ejb.Stateless;
@@ -71,7 +70,7 @@
Set<Class<?>> ejbs = new HashSet<Class<?>>();
for (Class<?> clazz : webBeanClasses)
{
- if (clazz.isAnnotationPresent(Stateless.class) || clazz.isAnnotationPresent(Stateful.class) || clazz.isAnnotationPresent(MessageDriven.class) || clazz.isAnnotationPresent(Singleton.class))
+ if (clazz.isAnnotationPresent(Stateless.class) || clazz.isAnnotationPresent(Stateful.class) || clazz.isAnnotationPresent(MessageDriven.class))
{
ejbs.add(clazz);
}
More information about the weld-commits
mailing list