Author: struberg
Date: Sat Mar 24 13:41:59 2012
New Revision: 1304790
URL: http://svn.apache.org/viewvc?rev=1304790&view=rev
Log:
OWB-656 remove webbeans-openejb.
I also had to disable a few TCK tests of the standalone suite
as they did also test EJB functionality. All those tests
are getting executed as part of OpenEJB, TomEE and Geronimo
anyway.
Modified:
openwebbeans/trunk/distribution/pom.xml
openwebbeans/trunk/webbeans-porting/pom.xml
openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/StandaloneContainersImpl.java
openwebbeans/trunk/webbeans-tck/pom.xml
openwebbeans/trunk/webbeans-tck/standalone-suite.xml
Modified: openwebbeans/trunk/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/distribution/pom.xml?rev=1304790&r1=1304789&r2=1304790&view=diff
==============================================================================
--- openwebbeans/trunk/distribution/pom.xml (original)
+++ openwebbeans/trunk/distribution/pom.xml Sat Mar 24 13:41:59 2012
@@ -132,11 +132,6 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>openwebbeans-openejb</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>openwebbeans-ee</artifactId>
<version>${project.version}</version>
</dependency>
Modified: openwebbeans/trunk/webbeans-porting/pom.xml
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-porting/pom.xml?rev=1304790&r1=1304789&r2=1304790&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-porting/pom.xml (original)
+++ openwebbeans/trunk/webbeans-porting/pom.xml Sat Mar 24 13:41:59 2012
@@ -139,11 +139,6 @@
<artifactId>jasper-el</artifactId>
<version>6.0.20</version>
</dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-openejb</artifactId>
- </dependency>
-
</dependencies>
Modified:
openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/StandaloneContainersImpl.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/StandaloneContainersImpl.java?rev=1304790&r1=1304789&r2=1304790&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/StandaloneContainersImpl.java
(original)
+++
openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/StandaloneContainersImpl.java
Sat Mar 24 13:41:59 2012
@@ -46,7 +46,6 @@ import org.apache.openejb.jee.SingletonB
import org.apache.openejb.jee.StatefulBean;
import org.apache.openejb.jee.StatelessBean;
import org.apache.webbeans.config.WebBeansContext;
-import org.apache.webbeans.ejb.EjbPlugin;
import org.apache.webbeans.lifecycle.StandaloneLifeCycle;
import org.apache.webbeans.logger.WebBeansLogger;
import org.apache.webbeans.test.tck.mock.TCKMetaDataDiscoveryImpl;
@@ -114,16 +113,6 @@ public class StandaloneContainersImpl im
public void beforeStartApplication(Object object)
{
super.beforeStartApplication(object);
- try
- {
-
WebBeansContext.getInstance().getPluginLoader().startUp();
- EjbPlugin plugin = (EjbPlugin)
WebBeansContext.getInstance().getPluginLoader().getEjbPlugin();
- plugin.setUseInTest(true);
- }
- catch (Exception e)
- {
- // Not worry
- }
}
};
@@ -169,16 +158,6 @@ public class StandaloneContainersImpl im
{
this.lifeCycle.stopApplication(null);
this.lifeCycle = null;
-
- try
- {
- EjbPlugin plugin = (EjbPlugin)
WebBeansContext.getInstance().getPluginLoader().getEjbPlugin();
- plugin.setUseInTest(false);
- }
- catch (Exception e)
- {
- // Not worry
- }
}
finally
{
@@ -240,13 +219,6 @@ public class StandaloneContainersImpl im
Properties properties = new Properties(System.getProperties());
properties.setProperty(Context.INITIAL_CONTEXT_FACTORY,
InitContextFactory.class.getName());
new InitialContext(properties);
-
- EjbPlugin plugin = (EjbPlugin)
WebBeansContext.getInstance().getPluginLoader().getEjbPlugin();
- if (plugin != null)
- {
- plugin.setUseInTest(true);
- }
-
}
catch (Exception e)
{
Modified: openwebbeans/trunk/webbeans-tck/pom.xml
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-tck/pom.xml?rev=1304790&r1=1304789&r2=1304790&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-tck/pom.xml (original)
+++ openwebbeans/trunk/webbeans-tck/pom.xml Sat Mar 24 13:41:59 2012
@@ -91,12 +91,6 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-openejb</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-spi</artifactId>
</dependency>
Modified: openwebbeans/trunk/webbeans-tck/standalone-suite.xml
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-tck/standalone-suite.xml?rev=1304790&r1=1304789&r2=1304790&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-tck/standalone-suite.xml (original)
+++ openwebbeans/trunk/webbeans-tck/standalone-suite.xml Sat Mar 24 13:41:59
2012
@@ -41,39 +41,79 @@
<classes>
- <!-- Not necessary test some EJBs in standalone mode!!! -->
- <class
-
name="org.jboss.jsr299.tck.tests.implementation.enterprise.definition.EnterpriseBeanDefinitionTest">
+ <!--
+ It's not necessary to perform EJB tests in standalone mode!
+ Those tests will be executed as part of the integration in
OpenEJB.
+ -->
+ <class
name="org.jboss.jsr299.tck.tests.implementation.enterprise.definition.EnterpriseBeanDefinitionTest">
<methods>
<exclude
name="testConstructorAnnotatedInjectCalled"></exclude>
</methods>
</class>
<!-- Not necessary test some EJBs in standalone mode!!! -->
- <class
-
name="org.jboss.jsr299.tck.tests.implementation.enterprise.broken.singletonWithRequestScope.SingletonWithRequestScopeTest">
+ <class
name="org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.extendejb.SpecializingBeanExtendsEnterpriseBeanTest">
<methods>
- <exclude
name="testSingletonWithRequestScopeFails"></exclude>
+ <exclude name=".*"></exclude>
+ </methods>
+ </class>
+ <class
name="org.jboss.jsr299.tck.tests.implementation.enterprise.broken.statelessWithApplicationScope.StatelessWithApplicationScopeTest">
+ <methods>
+ <exclude name=".*"></exclude>
+ </methods>
+ </class>
+ <class
name="org.jboss.jsr299.tck.tests.implementation.enterprise.broken.statelessWithRequestScope.StatelessWithRequestScopeTest">
+ <methods>
+ <exclude name=".*"></exclude>
</methods>
</class>
<!-- Not necessary test some EJBs in standalone mode!!! -->
- <class
-
name="org.jboss.jsr299.tck.tests.implementation.enterprise.broken.singletonWithSessionScope.SingletonWithSessionScopeTest">
+ <class
name="org.jboss.jsr299.tck.tests.event.broken.observer.notBusinessMethod.EJBObserverMethodNotBusinessMethodTest">
<methods>
- <exclude
name="testSingletonWithSessionScopeFails"></exclude>
+ <exclude name=".*"></exclude>
</methods>
</class>
<!-- Not necessary test some EJBs in standalone mode!!! -->
- <class
-
name="org.jboss.jsr299.tck.tests.implementation.enterprise.broken.singletonWithConversationScope.SingletonWithConversationScopeTest">
+ <class
name="org.jboss.jsr299.tck.tests.implementation.enterprise.newBean.NewEnterpriseBeanTest">
+ <methods>
+ <exclude name=".*"></exclude>
+ </methods>
+ </class>
+ <class
name="org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.directlyExtendsSimpleBean.DirectlyExtendsSimpleBeanTest">
+ <methods>
+ <exclude name=".*"></exclude>
+ </methods>
+ </class>
+ <class
name="org.jboss.jsr299.tck.tests.implementation.producer.method.broken.enterprise.nonbusiness.ProducerMethodNotBusinessMethodTest">
+ <methods>
+ <exclude
name="testProducerMethodOnSessionBeanMustBeBusinessMethod"></exclude>
+ </methods>
+ </class>
+ <class
name="org.jboss.jsr299.tck.tests.implementation.enterprise.broken.singletonWithRequestScope.SingletonWithRequestScopeTest">
+ <methods>
+ <exclude
name="testSingletonWithRequestScopeFails"></exclude>
+ </methods>
+ </class>
+ <class
name="org.jboss.jsr299.tck.tests.implementation.enterprise.broken.singletonWithSessionScope.SingletonWithSessionScopeTest">
+ <methods>
+ <exclude
name="testSingletonWithSessionScopeFails"></exclude>
+ </methods>
+ </class>
+ <class
name="org.jboss.jsr299.tck.tests.implementation.enterprise.broken.singletonWithConversationScope.SingletonWithConversationScopeTest">
<methods>
<exclude
name="testSingletonWithConversationScopeFails"></exclude>
</methods>
</class>
+ <class
name="org.jboss.jsr299.tck.tests.context.passivating.PassivatingContextTest">
+ <!-- sadly this test also loads EJBs :( -->
+ <methods>
+ <exclude name=".*"></exclude>
+ </methods>
+ </class>
+
<!-- ERROR IN CDI-TCK-137 -->
- <class
-
name="org.jboss.jsr299.tck.tests.decorators.invocation.DecoratorInvocationTest">
+ <class
name="org.jboss.jsr299.tck.tests.decorators.invocation.DecoratorInvocationTest">
<methods>
<exclude name="testChainedDecoratorInvocation"></exclude>
</methods>
@@ -81,24 +121,21 @@
<!-- ERROR IN CDITCK-138 -->
- <class
-
name="org.jboss.jsr299.tck.tests.lookup.injectionpoint.InjectionPointTest">
+ <class
name="org.jboss.jsr299.tck.tests.lookup.injectionpoint.InjectionPointTest">
<methods>
<exclude name="testIsDelegate"></exclude>
</methods>
</class>
<!-- ERROR IN CDITCK-183 -->
- <class
-
name="org.jboss.jsr299.tck.tests.context.DestroyedInstanceReturnedByGetTest">
+ <class
name="org.jboss.jsr299.tck.tests.context.DestroyedInstanceReturnedByGetTest">
<methods>
<exclude
name="testDestroyedInstanceMustNotBeReturnedByGet"></exclude>
</methods>
</class>
<!-- see CDI-140 -->
- <class
-
name="org.jboss.jsr299.tck.tests.context.passivating.broken.passivatingProducerMethodWithNonPassivatingParameter.PassivatingProducerMethodWithNonPassivatingParameterTest">
+ <class
name="org.jboss.jsr299.tck.tests.context.passivating.broken.passivatingProducerMethodWithNonPassivatingParameter.PassivatingProducerMethodWithNonPassivatingParameterTest">
<methods>
<exclude
name="testSimpleDependentWebBeanWithNonSerializableImplementationInjectedIntoProducerMethodParameterWithPassivatingScopeFails"></exclude>
</methods>
