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:59:32 UTC
svn commit: r1631716 -
/tomee/tomee/branches/tomee-1.7.x/container/openejb-junit/src/test/java/org/apache/openejb/junit/
Author: andygumbrecht
Date: Tue Oct 14 10:59:32 2014
New Revision: 1631716
URL: http://svn.apache.org/r1631716
Log:
TOMEE-1409 - Include openejb-junit - patch from Daniel Kasmeroglu
Modified:
tomee/tomee/branches/tomee-1.7.x/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestEJBContainerRule.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestEJBContainerRuleWithProgramaticInjection.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestEJBContainerRunnerResources.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestWithCdiBean.java
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestEJBContainerRule.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestEJBContainerRule.java?rev=1631716&r1=1631715&r2=1631716&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestEJBContainerRule.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestEJBContainerRule.java Tue Oct 14 10:59:32 2014
@@ -34,7 +34,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/branches/tomee-1.7.x/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestEJBContainerRuleWithProgramaticInjection.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestEJBContainerRuleWithProgramaticInjection.java?rev=1631716&r1=1631715&r2=1631716&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestEJBContainerRuleWithProgramaticInjection.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestEJBContainerRuleWithProgramaticInjection.java Tue Oct 14 10:59:32 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/branches/tomee-1.7.x/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestEJBContainerRunnerResources.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestEJBContainerRunnerResources.java?rev=1631716&r1=1631715&r2=1631716&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestEJBContainerRunnerResources.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestEJBContainerRunnerResources.java Tue Oct 14 10:59:32 2014
@@ -29,7 +29,8 @@ import javax.naming.Context;
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/branches/tomee-1.7.x/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestWithCdiBean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestWithCdiBean.java?rev=1631716&r1=1631715&r2=1631716&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestWithCdiBean.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestWithCdiBean.java Tue Oct 14 10:59:32 2014
@@ -30,7 +30,8 @@ import javax.inject.Inject;
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 {