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 2014/10/14 12:58:32 UTC
svn commit: r1631715 - in /tomee/tomee/trunk:
container/openejb-junit/src/test/java/org/apache/openejb/junit/
examples/arquillian-jpa/
Author: andygumbrecht
Date: Tue Oct 14 10:58:31 2014
New Revision: 1631715
URL: http://svn.apache.org/r1631715
Log:
TOMEE-1409 - Include openejb-junit - patch from Daniel Kasmeroglu
Modified:
tomee/tomee/trunk/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestEJBContainerRule.java
tomee/tomee/trunk/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestEJBContainerRuleWithProgramaticInjection.java
tomee/tomee/trunk/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestEJBContainerRunnerResources.java
tomee/tomee/trunk/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestWithCdiBean.java
tomee/tomee/trunk/examples/arquillian-jpa/ (props changed)
Modified: tomee/tomee/trunk/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestEJBContainerRule.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestEJBContainerRule.java?rev=1631715&r1=1631714&r2=1631715&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestEJBContainerRule.java (original)
+++ tomee/tomee/trunk/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestEJBContainerRule.java Tue Oct 14 10:58:31 2014
@@ -19,6 +19,7 @@ package org.apache.openejb.junit;
import org.apache.openejb.junit.ejbs.BasicEjbLocal;
import org.apache.openejb.junit.jee.EJBContainerRule;
import org.apache.openejb.junit.jee.config.Properties;
+import org.apache.openejb.junit.jee.config.Property;
import org.apache.openejb.junit.jee.InjectRule;
import org.apache.openejb.config.DeploymentFilterable;
import org.junit.ClassRule;
@@ -34,7 +35,8 @@ import static org.junit.Assert.assertNot
@Properties({
// FallbackPropertyInjector for ejb to test config
- @org.apache.openejb.junit.jee.config.Property(key = DeploymentFilterable.CLASSPATH_EXCLUDE, value = "jar:.*")
+ @Property(key = DeploymentFilterable.CLASSPATH_EXCLUDE, value = "jar:.*"),
+ @Property(key = DeploymentFilterable.CLASSPATH_INCLUDE, value = ".*openejb-junit.*")
})
public class TestEJBContainerRule {
@ClassRule
Modified: tomee/tomee/trunk/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestEJBContainerRuleWithProgramaticInjection.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestEJBContainerRuleWithProgramaticInjection.java?rev=1631715&r1=1631714&r2=1631715&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestEJBContainerRuleWithProgramaticInjection.java (original)
+++ tomee/tomee/trunk/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestEJBContainerRuleWithProgramaticInjection.java Tue Oct 14 10:58:31 2014
@@ -33,7 +33,8 @@ import static org.junit.Assert.assertNot
@Properties({
// FallbackPropertyInjector for ejb to test config
- @Property(key = DeploymentFilterable.CLASSPATH_EXCLUDE, value = "jar:.*")
+ @Property(key = DeploymentFilterable.CLASSPATH_EXCLUDE, value = "jar:.*"),
+ @Property(key = DeploymentFilterable.CLASSPATH_INCLUDE, value = ".*openejb-junit.*")
})
public class TestEJBContainerRuleWithProgramaticInjection {
@ClassRule
Modified: tomee/tomee/trunk/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestEJBContainerRunnerResources.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestEJBContainerRunnerResources.java?rev=1631715&r1=1631714&r2=1631715&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestEJBContainerRunnerResources.java (original)
+++ tomee/tomee/trunk/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestEJBContainerRunnerResources.java Tue Oct 14 10:58:31 2014
@@ -29,7 +29,8 @@ import org.junit.runner.RunWith;
import static org.junit.Assert.assertNotNull;
@Properties({ // just a small conf to go faster
- @Property(key = DeploymentFilterable.CLASSPATH_EXCLUDE, value = "jar:.*")
+ @Property(key = DeploymentFilterable.CLASSPATH_EXCLUDE, value = "jar:.*"),
+ @Property(key = DeploymentFilterable.CLASSPATH_INCLUDE, value = ".*openejb-junit.*")
})
@RunWith(EJBContainerRunner.class)
public class TestEJBContainerRunnerResources {
Modified: tomee/tomee/trunk/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestWithCdiBean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestWithCdiBean.java?rev=1631715&r1=1631714&r2=1631715&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestWithCdiBean.java (original)
+++ tomee/tomee/trunk/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestWithCdiBean.java Tue Oct 14 10:58:31 2014
@@ -30,7 +30,8 @@ import org.junit.runner.RunWith;
import static org.junit.Assert.assertNotNull;
@Properties({ // just a small conf to go faster
- @Property(key = DeploymentFilterable.CLASSPATH_EXCLUDE, value = "jar:.*")
+ @Property(key = DeploymentFilterable.CLASSPATH_EXCLUDE, value = "jar:.*"),
+ @Property(key = DeploymentFilterable.CLASSPATH_INCLUDE, value = ".*openejb-junit.*")
})
@RunWith(EJBContainerRunner.class)
public class TestWithCdiBean {
Propchange: tomee/tomee/trunk/examples/arquillian-jpa/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Oct 14 10:58:31 2014
@@ -1 +1,2 @@
*.iml
+target