[06/45] tapestry-5 git commit: TAP-2388: Update test and example app

2014-12-06 Thread thiagohp 
TAP-2388: Update test and example app


Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/6f4c5640
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/6f4c5640
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/6f4c5640

Branch: refs/heads/beanmodel-split
Commit: 6f4c5640ccd7e2122a46a7d0cc62cd771efa69b1
Parents: a43e17f
Author: Howard M. Lewis Ship hls...@apache.org
Authored: Fri Oct 24 16:09:12 2014 -0700
Committer: Howard M. Lewis Ship hls...@apache.org
Committed: Fri Oct 24 16:09:12 2014 -0700

--
 .../services/ComponentEventDispatcher.java  |  3 --
 .../internal/services/PageRenderDispatcher.java |  3 ++
 tapestry-core/src/test/app5/WEB-INF/web.xml | 40 +++-
 .../integration/app5/ProductionModeTests.groovy |  7 ++--
 .../integration/app5/pages/Error404.groovy  | 20 ++
 .../integration/app5/pages/Error404.tml | 18 +
 6 files changed, 67 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/6f4c5640/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentEventDispatcher.java
--
diff --git 
a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentEventDispatcher.java
 
b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentEventDispatcher.java
index 555ff39..1d0bd5d 100644
--- 
a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentEventDispatcher.java
+++ 
b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentEventDispatcher.java
@@ -49,9 +49,6 @@ public class ComponentEventDispatcher implements Dispatcher
 
 // ... in which case, this attribute is set.
 if 
(request.getAttribute(InternalConstants.REFERENCED_COMPONENT_NOT_FOUND) != 
null) {
-// This needs to be cleared out because the container may submit a 
request back into the filter
-// for the 404 page and some containers reuse the existing 
HttpServletRequest. See TAP5-2388.
-
request.setAttribute(InternalConstants.REFERENCED_COMPONENT_NOT_FOUND, null);
 return false;
 }
 

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/6f4c5640/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageRenderDispatcher.java
--
diff --git 
a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageRenderDispatcher.java
 
b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageRenderDispatcher.java
index 2e9e255..38e02e7 100644
--- 
a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageRenderDispatcher.java
+++ 
b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageRenderDispatcher.java
@@ -42,6 +42,9 @@ public class PageRenderDispatcher implements Dispatcher
 
 if 
(request.getAttribute(InternalConstants.REFERENCED_COMPONENT_NOT_FOUND) != null)
 {
+// This needs to be cleared out because the container may submit a 
request back into the filter
+// for the 404 page and some containers reuse the existing 
HttpServletRequest. See TAP5-2388.
+
request.setAttribute(InternalConstants.REFERENCED_COMPONENT_NOT_FOUND, null);
 return false;
 }
 

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/6f4c5640/tapestry-core/src/test/app5/WEB-INF/web.xml
--
diff --git a/tapestry-core/src/test/app5/WEB-INF/web.xml 
b/tapestry-core/src/test/app5/WEB-INF/web.xml
index a1bcd9f..c8c61c3 100644
--- a/tapestry-core/src/test/app5/WEB-INF/web.xml
+++ b/tapestry-core/src/test/app5/WEB-INF/web.xml
@@ -1,19 +1,25 @@
 ?xml version=1.0 encoding=UTF-8?
-!DOCTYPE web-app
-PUBLIC -//Sun Microsystems, Inc.//DTD Web Application 2.3//EN
-http://java.sun.com/dtd/web-app_2_3.dtd;
-web-app
-  display-nameIntegration Test App 5 -- Skinning/display-name
-  context-param
-param-nametapestry.app-package/param-name
-param-valueorg.apache.tapestry5.integration.app5/param-value
-  /context-param
-  filter
-filter-nameapp/filter-name
-filter-classorg.apache.tapestry5.TapestryFilter/filter-class
-  /filter
-  filter-mapping
-filter-nameapp/filter-name
-url-pattern/*/url-pattern
-  /filter-mapping
+web-app xmlns=http://java.sun.com/xml/ns/j2ee; 
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation=http://java.sun.com/xml/ns/j2ee 
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd;
+ version=2.4
+display-nameIntegration Test App 5 -- Skinning/display-name
+context-param
+

git commit: TAP-2388: Update test and example app

2014-10-24 Thread hlship 
Repository: tapestry-5
Updated Branches:
  refs/heads/master a43e17ff9 - 6f4c5640c


TAP-2388: Update test and example app


Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/6f4c5640
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/6f4c5640
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/6f4c5640

Branch: refs/heads/master
Commit: 6f4c5640ccd7e2122a46a7d0cc62cd771efa69b1
Parents: a43e17f
Author: Howard M. Lewis Ship hls...@apache.org
Authored: Fri Oct 24 16:09:12 2014 -0700
Committer: Howard M. Lewis Ship hls...@apache.org
Committed: Fri Oct 24 16:09:12 2014 -0700

--
 .../services/ComponentEventDispatcher.java  |  3 --
 .../internal/services/PageRenderDispatcher.java |  3 ++
 tapestry-core/src/test/app5/WEB-INF/web.xml | 40 +++-
 .../integration/app5/ProductionModeTests.groovy |  7 ++--
 .../integration/app5/pages/Error404.groovy  | 20 ++
 .../integration/app5/pages/Error404.tml | 18 +
 6 files changed, 67 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/6f4c5640/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentEventDispatcher.java
--
diff --git 
a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentEventDispatcher.java
 
b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentEventDispatcher.java
index 555ff39..1d0bd5d 100644
--- 
a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentEventDispatcher.java
+++ 
b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentEventDispatcher.java
@@ -49,9 +49,6 @@ public class ComponentEventDispatcher implements Dispatcher
 
 // ... in which case, this attribute is set.
 if 
(request.getAttribute(InternalConstants.REFERENCED_COMPONENT_NOT_FOUND) != 
null) {
-// This needs to be cleared out because the container may submit a 
request back into the filter
-// for the 404 page and some containers reuse the existing 
HttpServletRequest. See TAP5-2388.
-
request.setAttribute(InternalConstants.REFERENCED_COMPONENT_NOT_FOUND, null);
 return false;
 }
 

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/6f4c5640/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageRenderDispatcher.java
--
diff --git 
a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageRenderDispatcher.java
 
b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageRenderDispatcher.java
index 2e9e255..38e02e7 100644
--- 
a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageRenderDispatcher.java
+++ 
b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageRenderDispatcher.java
@@ -42,6 +42,9 @@ public class PageRenderDispatcher implements Dispatcher
 
 if 
(request.getAttribute(InternalConstants.REFERENCED_COMPONENT_NOT_FOUND) != null)
 {
+// This needs to be cleared out because the container may submit a 
request back into the filter
+// for the 404 page and some containers reuse the existing 
HttpServletRequest. See TAP5-2388.
+
request.setAttribute(InternalConstants.REFERENCED_COMPONENT_NOT_FOUND, null);
 return false;
 }
 

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/6f4c5640/tapestry-core/src/test/app5/WEB-INF/web.xml
--
diff --git a/tapestry-core/src/test/app5/WEB-INF/web.xml 
b/tapestry-core/src/test/app5/WEB-INF/web.xml
index a1bcd9f..c8c61c3 100644
--- a/tapestry-core/src/test/app5/WEB-INF/web.xml
+++ b/tapestry-core/src/test/app5/WEB-INF/web.xml
@@ -1,19 +1,25 @@
 ?xml version=1.0 encoding=UTF-8?
-!DOCTYPE web-app
-PUBLIC -//Sun Microsystems, Inc.//DTD Web Application 2.3//EN
-http://java.sun.com/dtd/web-app_2_3.dtd;
-web-app
-  display-nameIntegration Test App 5 -- Skinning/display-name
-  context-param
-param-nametapestry.app-package/param-name
-param-valueorg.apache.tapestry5.integration.app5/param-value
-  /context-param
-  filter
-filter-nameapp/filter-name
-filter-classorg.apache.tapestry5.TapestryFilter/filter-class
-  /filter
-  filter-mapping
-filter-nameapp/filter-name
-url-pattern/*/url-pattern
-  /filter-mapping
+web-app xmlns=http://java.sun.com/xml/ns/j2ee; 
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation=http://java.sun.com/xml/ns/j2ee 
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd;
+ version=2.4
+