deltaspike-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rafab...@apache.org
Subject git commit: DELTASPIKE-725 - Fix for AS7 tests
Date Mon, 13 Oct 2014 16:59:49 GMT
Repository: deltaspike
Updated Branches:
  refs/heads/master 1c31a7140 -> 4bc8ed17a


DELTASPIKE-725 - Fix for AS7 tests


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

Branch: refs/heads/master
Commit: 4bc8ed17a13e03eae4b715b65b92d8f37b79b6fc
Parents: 1c31a71
Author: Rafael Benevides <rafabene@gmail.com>
Authored: Mon Oct 13 13:59:35 2014 -0300
Committer: Rafael Benevides <rafabene@gmail.com>
Committed: Mon Oct 13 13:59:35 2014 -0300

----------------------------------------------------------------------
 .../injection/uc003/InjectionDroneTest.java     |  3 +-
 .../resources/default/WEB-INF/faces-config.xml  | 30 ++++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/4bc8ed17/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/injection/uc003/InjectionDroneTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/injection/uc003/InjectionDroneTest.java
b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/injection/uc003/InjectionDroneTest.java
index 20d83f1..8b4be2d 100644
--- a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/injection/uc003/InjectionDroneTest.java
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/injection/uc003/InjectionDroneTest.java
@@ -60,9 +60,10 @@ public class InjectionDroneTest
                 .addPackage(MyBean.class.getPackage())
                 .addAsLibraries(ArchiveUtils.getDeltaSpikeCoreAndJsfArchive())
                 .addAsLibraries(ArchiveUtils.getDeltaSpikeSecurityArchive())
-                .addAsManifestResource("META-INF/test.taglib.xml", "test.taglib.xml")
                 .addAsWebResource("injection/testValidatorConverterTag.xhtml", "/testValidatorConverter.xhtml")
+                .addAsWebInfResource("META-INF/test.taglib.xml", "classes/META-INF/test.taglib.xml")
                 .addAsWebInfResource("default/WEB-INF/web.xml", "web.xml")
+                .addAsWebInfResource("default/WEB-INF/faces-config.xml", "faces-config.xml")
                 .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml");
     }
 

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/4bc8ed17/deltaspike/modules/jsf/impl/src/test/resources/default/WEB-INF/faces-config.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/test/resources/default/WEB-INF/faces-config.xml
b/deltaspike/modules/jsf/impl/src/test/resources/default/WEB-INF/faces-config.xml
new file mode 100644
index 0000000..d7054de
--- /dev/null
+++ b/deltaspike/modules/jsf/impl/src/test/resources/default/WEB-INF/faces-config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    JBoss, Home of Professional Open Source
+    Copyright 2014, Red Hat, Inc. and/or its affiliates, and individual
+    contributors by the @authors tag. See the copyright.txt in the
+    distribution for a full listing of individual contributors.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<!-- This file is not required if you don't need any extra configuration. -->
+<faces-config version="2.0" xmlns="http://java.sun.com/xml/ns/javaee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="
+        http://java.sun.com/xml/ns/javaee
+        http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd">
+
+    <!-- This descriptor activates the JSF 2.0 Servlet -->
+
+    <!-- Write your navigation rules here. You are encouraged to use CDI 
+        for creating @Named managed beans. -->
+
+</faces-config>


Mime
View raw message