You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by jo...@apache.org on 2016/06/02 02:43:18 UTC
deltaspike git commit: DELTASPIKE-1156 Add OWB dependencies for
context control to the deployment to allow tests to run.
Repository: deltaspike
Updated Branches:
refs/heads/master a8bc5dfb0 -> 787b38521
DELTASPIKE-1156 Add OWB dependencies for context control to the deployment to allow tests to run.
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/787b3852
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/787b3852
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/787b3852
Branch: refs/heads/master
Commit: 787b385215d45fce46004554d5e03cf2662a5f8f
Parents: a8bc5df
Author: John D. Ament <jo...@apache.org>
Authored: Wed Jun 1 22:43:12 2016 -0400
Committer: John D. Ament <jo...@apache.org>
Committed: Wed Jun 1 22:43:12 2016 -0400
----------------------------------------------------------------------
.../scheduler/custom/CustomSchedulerWarFileTest.java | 1 +
.../test/scheduler/custom/ScopeNotStartedTest.java | 1 +
.../apache/deltaspike/test/util/ArchiveUtils.java | 15 +++++++++++++++
deltaspike/parent/code/pom.xml | 1 +
4 files changed, 18 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/787b3852/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/CustomSchedulerWarFileTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/CustomSchedulerWarFileTest.java b/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/CustomSchedulerWarFileTest.java
index 3868f8e..007d302 100644
--- a/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/CustomSchedulerWarFileTest.java
+++ b/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/CustomSchedulerWarFileTest.java
@@ -50,6 +50,7 @@ public class CustomSchedulerWarFileTest extends CustomSchedulerTest
return ShrinkWrap.create(WebArchive.class, archiveName + ".war")
.addAsLibraries(ArchiveUtils.getDeltaSpikeCoreAndSchedulerArchive())
+ .addAsLibraries(ArchiveUtils.getContextControlForDeployment())
.addAsLibraries(Maven.resolver().loadPomFromFile("pom.xml").resolve(
"org.quartz-scheduler:quartz")
.withTransitivity()
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/787b3852/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/ScopeNotStartedTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/ScopeNotStartedTest.java b/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/ScopeNotStartedTest.java
index ccd417b..0a0c1af 100644
--- a/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/ScopeNotStartedTest.java
+++ b/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/ScopeNotStartedTest.java
@@ -56,6 +56,7 @@ public class ScopeNotStartedTest
return ShrinkWrap.create(WebArchive.class, archiveName + ".war")
.addAsLibraries(ArchiveUtils.getDeltaSpikeCoreAndSchedulerArchive())
+ .addAsLibraries(ArchiveUtils.getContextControlForDeployment())
.addAsLibraries(Maven.resolver().loadPomFromFile("pom.xml").resolve(
"org.quartz-scheduler:quartz")
.withTransitivity()
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/787b3852/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/util/ArchiveUtils.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/util/ArchiveUtils.java b/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/util/ArchiveUtils.java
index 7ddbf73..23be912 100644
--- a/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/util/ArchiveUtils.java
+++ b/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/util/ArchiveUtils.java
@@ -18,7 +18,10 @@
*/
package org.apache.deltaspike.test.util;
+import org.apache.deltaspike.cdise.api.ContextControl;
+import org.apache.deltaspike.test.utils.CdiContainerUnderTest;
import org.apache.deltaspike.test.utils.ShrinkWrapArchiveUtil;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
/**
@@ -41,4 +44,16 @@ public class ArchiveUtils
null,
"ds-core_and_scheduler");
}
+
+ public static JavaArchive getContextControlForDeployment()
+ {
+ JavaArchive jar = ShrinkWrap.create(JavaArchive.class, "cdi-control.jar")
+ .addClass(ContextControl.class);
+
+ if (CdiContainerUnderTest.is("owb"))
+ {
+ jar.addPackage("org.apache.deltaspike.cdise.owb");
+ }
+ return jar;
+ }
}
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/787b3852/deltaspike/parent/code/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/parent/code/pom.xml b/deltaspike/parent/code/pom.xml
index 45df72b..2820cc8 100644
--- a/deltaspike/parent/code/pom.xml
+++ b/deltaspike/parent/code/pom.xml
@@ -733,6 +733,7 @@
<id>tomee7-build-managed</id>
<properties>
+ <tomee.version>7.0.0</tomee.version>
<cdicontainer.version>tomee-${tomee.version}</cdicontainer.version>
</properties>