You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2015/01/26 09:22:51 UTC
tomee git commit: myfaces upgrade + ensuring jsp are well served when
conflicting with jaxrs
Repository: tomee
Updated Branches:
refs/heads/develop 3373c194f -> 0cfd86ee7
myfaces upgrade + ensuring jsp are well served when conflicting with jaxrs
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/0cfd86ee
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/0cfd86ee
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/0cfd86ee
Branch: refs/heads/develop
Commit: 0cfd86ee776c05bd72a55c272e9738e22ada6c4a
Parents: 3373c19
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Mon Jan 26 09:22:32 2015 +0100
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Mon Jan 26 09:22:32 2015 +0100
----------------------------------------------------------------------
.../tests/jaxrs/staticresources/AvoidConflictTest.java | 8 +++++++-
pom.xml | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/0cfd86ee/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/staticresources/AvoidConflictTest.java
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/staticresources/AvoidConflictTest.java b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/staticresources/AvoidConflictTest.java
index 8504469..3977d98 100644
--- a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/staticresources/AvoidConflictTest.java
+++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/staticresources/AvoidConflictTest.java
@@ -38,7 +38,8 @@ public class AvoidConflictTest {
public static Archive<?> war() {
return ShrinkWrap.create(WebArchive.class, "app.war")
.addClasses(TheResource.class, SimpleServlet.class, PreviousFilter.class)
- .addAsWebResource(new StringAsset("static"), "index.html");
+ .addAsWebResource(new StringAsset("static"), "index.html")
+ .addAsWebResource(new StringAsset("JSP <%= 5 %>"), "sample.jsp");
}
@ArquillianResource
@@ -60,6 +61,11 @@ public class AvoidConflictTest {
}
@Test
+ public void jsp() throws IOException {
+ assertEquals("JSP 5", IO.slurp(new URL(url + "sample.jsp")).trim());
+ }
+
+ @Test
public void filterOrder() throws IOException {
assertEquals("I'm the first", IO.slurp(new URL(url.toExternalForm() + "gotFilter")));
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/0cfd86ee/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ced4d10..9adbced 100644
--- a/pom.xml
+++ b/pom.xml
@@ -170,7 +170,7 @@
<geronimo.connector.version>3.1.1</geronimo.connector.version>
<geronimo-osgi.version>1.1</geronimo-osgi.version>
<geronimo-javamail_1.4_spec.version>1.7.1</geronimo-javamail_1.4_spec.version>
- <myfaces.version>2.2.6</myfaces.version>
+ <myfaces.version>2.2.7</myfaces.version>
<mojarra.version>2.1.28</mojarra.version>
<slf4j.version>1.7.7</slf4j.version>
<log4j.version>1.2.17</log4j.version>