svn commit: r1058056 - in /ofbiz/trunk: applications/humanres/webapp/humanres/WEB-INF/ framework/widget/config/ framework/widget/src/org/ofbiz/widget/screen/ specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/ specialpurpose/oagis/webapp/oagis/WEB-INF/ ...

[jacopoc]

Author: jacopoc
Date: Wed Jan 12 10:44:35 2011
New Revision: 1058056

URL: http://svn.apache.org/viewvc?rev=1058056&view=rev
Log:
Removed unused handler from controller files; replaced handlers that were still using the old ScreenWidgetViewHandler with the current MacroScreenViewHandler; deprecated compress.HTML property with output specific properties like screen.compress; this fixes a rather important issue happening when the compress.HTML setting is set to true: non html output screens like for example tab delimited exports were messed up.

Modified:
    ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml
    ofbiz/trunk/framework/widget/config/widget.properties
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/MacroScreenViewHandler.java
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
    ofbiz/trunk/specialpurpose/oagis/webapp/oagis/WEB-INF/controller.xml
    ofbiz/trunk/specialpurpose/shark/webapp/shark/WEB-INF/controller.xml
    ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/controller.xml

Modified: ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml?rev=1058056&r1=1058055&r2=1058056&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml Wed Jan 12 10:44:35 2011
@@ -27,7 +27,6 @@ under the License.
     
     <!-- view handlers -->
     <handler name="service-multi" type="request" class="org.ofbiz.webapp.event.ServiceMultiEventHandler"/>
-    <handler name="screenxml" type="view" class="org.ofbiz.widget.screen.ScreenXmlViewHandler"/>
 
     <!-- Events to run on every request before security (chains exempt) -->
     <!--

Modified: ofbiz/trunk/framework/widget/config/widget.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/config/widget.properties?rev=1058056&r1=1058055&r2=1058056&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/config/widget.properties (original)
+++ ofbiz/trunk/framework/widget/config/widget.properties Wed Jan 12 10:44:35 2011
@@ -17,7 +17,7 @@
 # under the License.
 ###############################################################################
 
-# Enable HTML whitespace compression
+# Enable HTML whitespace compression; deprecated: use output specific "compress" setting instead; see for example screen.compress
 #compress.HTML=true
 
 # Enable screen widget boundary comments
@@ -57,6 +57,7 @@ screen.formrenderer=component://widget/t
 screen.menurenderer=component://widget/templates/htmlMenuMacroLibrary.ftl
 screen.treerenderer=component://widget/templates/htmlTreeMacroLibrary.ftl
 screen.encoder=html
+screen.compress=false
 screen.default.contenttype=UTF-8
 screen.default.encoding=none
 # text output

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/MacroScreenViewHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/MacroScreenViewHandler.java?rev=1058056&r1=1058055&r2=1058056&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/MacroScreenViewHandler.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/MacroScreenViewHandler.java Wed Jan 12 10:44:35 2011
@@ -76,7 +76,7 @@ public class MacroScreenViewHandler exte
             }
             boolean compressOutput = "compressed".equals(encoding);
             if (!compressOutput) {
-                compressOutput = "true".equals(UtilProperties.getPropertyValue("widget", "compress.HTML"));
+                compressOutput = "true".equals(UtilProperties.getPropertyValue("widget", getName() + ".compress"));
             }
             if (!compressOutput && this.servletContext != null) {
                 compressOutput = "true".equals(this.servletContext.getAttribute("compressHTML"));

Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml?rev=1058056&r1=1058055&r2=1058056&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml Wed Jan 12 10:44:35 2011
@@ -39,7 +39,7 @@ under the License.
 
     <handler name="jsp" type="view" class="org.ofbiz.webapp.view.JspViewHandler"/>
     <handler name="http" type="view" class="org.ofbiz.webapp.view.HttpViewHandler"/>
-    <handler name="screen" type="view" class="org.ofbiz.widget.screen.ScreenWidgetViewHandler"/>
+    <handler name="screen" type="view" class="org.ofbiz.widget.screen.MacroScreenViewHandler"/>
     <handler name="simplecontent" type="view" class="org.ofbiz.content.view.SimpleContentViewHandler"/>
     <handler name="screenfop" type="view" class="org.ofbiz.widget.screen.ScreenFopViewHandler"/>
 

Modified: ofbiz/trunk/specialpurpose/oagis/webapp/oagis/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/webapp/oagis/WEB-INF/controller.xml?rev=1058056&r1=1058055&r2=1058056&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/oagis/webapp/oagis/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/oagis/webapp/oagis/WEB-INF/controller.xml Wed Jan 12 10:44:35 2011
@@ -26,9 +26,6 @@
     <!-- event handlers -->
     <handler name="stream" type="request" class="org.ofbiz.webapp.event.ServiceStreamHandler"/>
 
-    <!-- view handlers -->
-    <handler name="screenxml" type="view" class="org.ofbiz.widget.screen.ScreenXmlViewHandler"/>
-
     <!-- Events to run on every request before security (chains exempt) -->
     <!--
     <preprocessor>

Modified: ofbiz/trunk/specialpurpose/shark/webapp/shark/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/webapp/shark/WEB-INF/controller.xml?rev=1058056&r1=1058055&r2=1058056&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/shark/webapp/shark/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/shark/webapp/shark/WEB-INF/controller.xml Wed Jan 12 10:44:35 2011
@@ -30,7 +30,7 @@ under the License.
     <handler name="simple" type="request" class="org.ofbiz.webapp.event.SimpleEventHandler"/>
 
     <!-- view handlers -->
-    <handler name="screen" type="view" class="org.ofbiz.widget.screen.ScreenWidgetViewHandler"/>
+    <handler name="screen" type="view" class="org.ofbiz.widget.screen.MacroScreenViewHandler"/>
 
     <handler name="jsp" type="view" class="org.ofbiz.webapp.view.JspViewHandler"/>
     <handler name="http" type="view" class="org.ofbiz.webapp.view.HttpViewHandler"/>

Modified: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/controller.xml?rev=1058056&r1=1058055&r2=1058056&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/controller.xml Wed Jan 12 10:44:35 2011
@@ -31,10 +31,7 @@
     <handler name="rome" type="request" class="org.ofbiz.webapp.event.RomeEventHandler"/>
 
     <handler name="jsp" type="view" class="org.ofbiz.webapp.view.JspViewHandler"/>
-    <handler name="http" type="view" class="org.ofbiz.webapp.view.HttpViewHandler"/>
-    <handler name="screen" type="view" class="org.ofbiz.widget.screen.ScreenWidgetViewHandler"/>
-    <handler name="simplecontent" type="view" class="org.ofbiz.content.view.SimpleContentViewHandler"/>
-    <handler name="screenfop" type="view" class="org.ofbiz.widget.screen.ScreenFopViewHandler"/>
+    <handler name="screen" type="view" class="org.ofbiz.widget.screen.MacroScreenViewHandler"/>
     <!-- These event handlers have been deprecated, if you need to send json responses then chain
          the json request from this controller after calling your event
     <handler name="jsonservice" type="request" class="org.ofbiz.webapp.event.JSONServiceEventHandler"/>