deltaspike-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From johndam...@apache.org
Subject deltaspike git commit: DELTASPIKE-1213 Use the same beans.xml in the JAR and WAR for OWB.
Date Tue, 01 Nov 2016 23:17:54 GMT
Repository: deltaspike
Updated Branches:
  refs/heads/master b5fd1a233 -> e26426638


DELTASPIKE-1213 Use the same beans.xml in the JAR and WAR for OWB.


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/e2642663
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/e2642663
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/e2642663

Branch: refs/heads/master
Commit: e26426638eeb9b4901f04af1fd1bdf9581d22200
Parents: b5fd1a2
Author: John D. Ament <johndament@apache.org>
Authored: Tue Nov 1 19:17:44 2016 -0400
Committer: John D. Ament <johndament@apache.org>
Committed: Tue Nov 1 19:17:44 2016 -0400

----------------------------------------------------------------------
 .../java/org/apache/deltaspike/test/core/impl/lock/LockedTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/e2642663/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/lock/LockedTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/lock/LockedTest.java
b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/lock/LockedTest.java
index a869438..4b76520 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/lock/LockedTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/lock/LockedTest.java
@@ -58,7 +58,7 @@ public class LockedTest {
         return ShrinkWrap.create(WebArchive.class, "LockedTest.war")
                 .addAsLibraries(ArchiveUtils.getDeltaSpikeCoreArchive())
                 .addAsLibraries(testJar)
-                .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml");
+                .addAsWebInfResource(new StringAsset(beans.exportAsString()), "beans.xml");
     }
 
     @Inject


Mime
View raw message