You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by gp...@apache.org on 2013/01/04 14:49:17 UTC
[1/2] git commit: DELTASPIKE-307 updated test-config
DELTASPIKE-307 updated test-config
Project: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/commit/6783a3df
Tree: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/tree/6783a3df
Diff: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/diff/6783a3df
Branch: refs/heads/master
Commit: 6783a3df77991d0de3cf16eeee0ec784fad895d6
Parents: a834777
Author: gpetracek <gp...@apache.org>
Authored: Fri Jan 4 14:42:59 2013 +0100
Committer: gpetracek <gp...@apache.org>
Committed: Fri Jan 4 14:42:59 2013 +0100
----------------------------------------------------------------------
deltaspike/modules/jsf/impl/pom.xml | 6 ++++
.../test/jsf/impl/message/JsfMessageTest.java | 1 +
.../impl/scope/mapped/MappedJsfContextTest.java | 1 +
.../jsf/impl/scope/view/ViewScopedContextTest.java | 1 +
.../test/jsf/impl/util/ArchiveUtils.java | 24 +++++++-------
5 files changed, 21 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/6783a3df/deltaspike/modules/jsf/impl/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/pom.xml b/deltaspike/modules/jsf/impl/pom.xml
index d07aa67..e0d0866 100644
--- a/deltaspike/modules/jsf/impl/pom.xml
+++ b/deltaspike/modules/jsf/impl/pom.xml
@@ -51,6 +51,12 @@
<dependency>
<groupId>org.apache.deltaspike.modules</groupId>
+ <artifactId>deltaspike-security-module-impl</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.deltaspike.modules</groupId>
<artifactId>deltaspike-jsf-module-api</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/6783a3df/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/message/JsfMessageTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/message/JsfMessageTest.java b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/message/JsfMessageTest.java
index 9429e7e..2a2e25b 100644
--- a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/message/JsfMessageTest.java
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/message/JsfMessageTest.java
@@ -65,6 +65,7 @@ public class JsfMessageTest
.addAsResource("jsfMessageTest/UserMessage_en.properties")
.addAsResource("jsfMessageTest/UserMessage_de.properties")
.addAsLibraries(ArchiveUtils.getDeltaSpikeCoreAndJsfArchive())
+ .addAsLibraries(ArchiveUtils.getDeltaSpikeSecurityArchive())
.addAsWebInfResource("default/WEB-INF/web.xml", "web.xml")
.addAsWebResource("jsfMessageTest/page.xhtml", "page.xhtml")
.addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml");
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/6783a3df/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/scope/mapped/MappedJsfContextTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/scope/mapped/MappedJsfContextTest.java b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/scope/mapped/MappedJsfContextTest.java
index 7da680f..169b16e 100644
--- a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/scope/mapped/MappedJsfContextTest.java
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/scope/mapped/MappedJsfContextTest.java
@@ -63,6 +63,7 @@ public class MappedJsfContextTest
.create(WebArchive.class, "mappedJsfContetxtTest.war")
.addPackage(JsfApplicationScopedBackingBean.class.getPackage())
.addAsLibraries(ArchiveUtils.getDeltaSpikeCoreAndJsfArchive())
+ .addAsLibraries(ArchiveUtils.getDeltaSpikeSecurityArchive())
.addAsWebInfResource("default/WEB-INF/web.xml", "web.xml")
.addAsWebResource("mappedJsfContextTest/page.xhtml", "page.xhtml")
.addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml");
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/6783a3df/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/scope/view/ViewScopedContextTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/scope/view/ViewScopedContextTest.java b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/scope/view/ViewScopedContextTest.java
index 6a39830..3a3276d 100644
--- a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/scope/view/ViewScopedContextTest.java
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/scope/view/ViewScopedContextTest.java
@@ -65,6 +65,7 @@ public class ViewScopedContextTest
.create(WebArchive.class, "viewScopedContextTest.war")
.addPackage(ViewScopedBackingBean.class.getPackage())
.addAsLibraries(ArchiveUtils.getDeltaSpikeCoreAndJsfArchive())
+ .addAsLibraries(ArchiveUtils.getDeltaSpikeSecurityArchive())
.addAsWebInfResource("default/WEB-INF/web.xml", "web.xml")
.addAsWebResource("viewScopedContextTest/page.xhtml", "page.xhtml")
.addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml");
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/6783a3df/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/util/ArchiveUtils.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/util/ArchiveUtils.java b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/util/ArchiveUtils.java
index 017add0..2232ff8 100644
--- a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/util/ArchiveUtils.java
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/util/ArchiveUtils.java
@@ -18,17 +18,15 @@
*/
package org.apache.deltaspike.test.jsf.impl.util;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
import org.apache.deltaspike.test.category.WebProfileCategory;
import org.apache.deltaspike.test.utils.ShrinkWrapArchiveUtil;
import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.asset.Asset;
-import org.jboss.shrinkwrap.api.asset.StringAsset;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
/**
* This class contains helpers for building frequently used archives
*/
@@ -66,13 +64,15 @@ public class ArchiveUtils
return archives.toArray(new JavaArchive[archives.size()]);
}
- public static Asset getBeansXml()
+ public static JavaArchive[] getDeltaSpikeSecurityArchive()
{
- Asset beansXml = new StringAsset(
- "<beans>" +
- "</beans>"
- );
+ String[] excludedFiles;
+
+ excludedFiles = new String[]{"META-INF.apache-deltaspike.properties"};
+
- return beansXml;
+ return ShrinkWrapArchiveUtil.getArchives(null,
+ "META-INF/beans.xml",
+ new String[]{"org.apache.deltaspike.security"}, excludedFiles);
}
}