[gatein-commits] gatein SVN: r8320 - in portal/trunk/packaging: jboss-as7/pkg/src/main/resources/jboss/standalone/configuration/gatein and 2 other directories.

Author: mposolda Date: 2012-01-30 06:08:10 -0500 (Mon, 30 Jan 2012) New Revision: 8320 Modified: portal/trunk/packaging/jboss-as5/pkg/src/main/resources/jboss/server/default/conf/gatein/controller.xml portal/trunk/packaging/jboss-as7/pkg/src/main/resources/jboss/standalone/configuration/gatein/controller.xml portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/gatein/conf/controller.xml portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/gatein/conf/controller.xml Log: GTNPORTAL-2338 Images should not be processed by PortalRequstHandler Modified: portal/trunk/packaging/jboss-as5/pkg/src/main/resources/jboss/server/default/conf/gatein/controller.xml =================================================================== --- portal/trunk/packaging/jboss-as5/pkg/src/main/resources/jboss/server/default/conf/gatein/controller.xml 2012-01-30 10:55:43 UTC (rev 8319) +++ portal/trunk/packaging/jboss-as5/pkg/src/main/resources/jboss/server/default/conf/gatein/controller.xml 2012-01-30 11:08:10 UTC (rev 8320) @@ -67,6 +67,16 @@ </route> </route> + <!-- Static resource handler needs to be before the portal handler --> + <route path="/{gtn:path}"> + <route-param qname="gtn:handler"> + <value>staticResource</value> + </route-param> + <path-param qname="gtn:path" encoding="preserve-path"> + <pattern>.*\.(jpg|png|gif|ico|css)</pattern> + </path-param> + </route> + <route path="/"> <!-- The portal handler --> @@ -115,20 +125,10 @@ </route> - <route path="/{gtn:path}"> - <route-param qname="gtn:handler"> - <value>staticResource</value> - </route-param> - <path-param qname="gtn:path" encoding="preserve-path"> - <pattern>.*\.(jpg|png|gif|ico|css)</pattern> - </path-param> - </route> - <!-- Default handler --> <route path="/"> <route-param qname="gtn:handler"> <value>default</value> </route-param> - </route> - + </route> </controller> Modified: portal/trunk/packaging/jboss-as7/pkg/src/main/resources/jboss/standalone/configuration/gatein/controller.xml =================================================================== --- portal/trunk/packaging/jboss-as7/pkg/src/main/resources/jboss/standalone/configuration/gatein/controller.xml 2012-01-30 10:55:43 UTC (rev 8319) +++ portal/trunk/packaging/jboss-as7/pkg/src/main/resources/jboss/standalone/configuration/gatein/controller.xml 2012-01-30 11:08:10 UTC (rev 8320) @@ -67,6 +67,16 @@ </route> </route> + <!-- Static resource handler needs to be before the portal handler --> + <route path="/{gtn:path}"> + <route-param qname="gtn:handler"> + <value>staticResource</value> + </route-param> + <path-param qname="gtn:path" encoding="preserve-path"> + <pattern>.*\.(jpg|png|gif|ico|css)</pattern> + </path-param> + </route> + <route path="/"> <!-- The portal handler --> @@ -115,20 +125,10 @@ </route> - <route path="/{gtn:path}"> - <route-param qname="gtn:handler"> - <value>staticResource</value> - </route-param> - <path-param qname="gtn:path" encoding="preserve-path"> - <pattern>.*\.(jpg|png|gif|ico|css)</pattern> - </path-param> - </route> - <!-- Default handler --> <route path="/"> <route-param qname="gtn:handler"> <value>default</value> </route-param> - </route> - + </route> </controller> Modified: portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/gatein/conf/controller.xml =================================================================== --- portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/gatein/conf/controller.xml 2012-01-30 10:55:43 UTC (rev 8319) +++ portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/gatein/conf/controller.xml 2012-01-30 11:08:10 UTC (rev 8320) @@ -66,7 +66,17 @@ </path-param> </route> </route> - + + <!-- Static resource handler needs to be before the portal handler --> + <route path="/{gtn:path}"> + <route-param qname="gtn:handler"> + <value>staticResource</value> + </route-param> + <path-param qname="gtn:path" encoding="preserve-path"> + <pattern>.*\.(jpg|png|gif|ico|css)</pattern> + </path-param> + </route> + <route path="/"> <!-- The portal handler --> @@ -115,20 +125,10 @@ </route> - <route path="/{gtn:path}"> - <route-param qname="gtn:handler"> - <value>staticResource</value> - </route-param> - <path-param qname="gtn:path" encoding="preserve-path"> - <pattern>.*\.(jpg|png|gif|ico|css)</pattern> - </path-param> - </route> - <!-- Default handler --> <route path="/"> <route-param qname="gtn:handler"> <value>default</value> </route-param> - </route> - + </route> </controller> Modified: portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/gatein/conf/controller.xml =================================================================== --- portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/gatein/conf/controller.xml 2012-01-30 10:55:43 UTC (rev 8319) +++ portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/gatein/conf/controller.xml 2012-01-30 11:08:10 UTC (rev 8320) @@ -65,8 +65,18 @@ <pattern>.*</pattern> </path-param> </route> - </route> + </route> + <!-- Static resource handler needs to be before the portal handler --> + <route path="/{gtn:path}"> + <route-param qname="gtn:handler"> + <value>staticResource</value> + </route-param> + <path-param qname="gtn:path" encoding="preserve-path"> + <pattern>.*\.(jpg|png|gif|ico|css)</pattern> + </path-param> + </route> + <route path="/"> <!-- The portal handler --> @@ -115,15 +125,6 @@ </route> - <route path="/{gtn:path}"> - <route-param qname="gtn:handler"> - <value>staticResource</value> - </route-param> - <path-param qname="gtn:path" encoding="preserve-path"> - <pattern>.*\.(jpg|png|gif|ico|css)</pattern> - </path-param> - </route> - <!-- Default handler --> <route path="/"> <route-param qname="gtn:handler">