svn commit: r1058062 - in /ofbiz/branches/release10.04: ./ applications/humanres/webapp/h
Locked
svn commit: r1058062 - in /ofbiz/branches/release10.04: ./ applications/humanres/webapp/h
 
|
Author: jacopoc
Date: Wed Jan 12 10:49:57 2011 New Revision: 1058062 URL: http://svn.apache.org/viewvc?rev=1058062&view=rev Log: Applied fix from trunk for revision: 1058056 === 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/branches/release10.04/ (props changed) ofbiz/branches/release10.04/applications/humanres/webapp/humanres/WEB-INF/controller.xml ofbiz/branches/release10.04/framework/widget/config/widget.properties ofbiz/branches/release10.04/framework/widget/src/org/ofbiz/widget/screen/MacroScreenViewHandler.java ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml ofbiz/branches/release10.04/specialpurpose/oagis/webapp/oagis/WEB-INF/controller.xml ofbiz/branches/release10.04/specialpurpose/shark/webapp/shark/WEB-INF/controller.xml ofbiz/branches/release10.04/specialpurpose/webpos/webapp/webpos/WEB-INF/controller.xml Propchange: ofbiz/branches/release10.04/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jan 12 10:49:57 2011 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt:831210-885099,885686-886087 /ofbiz/branches/multitenant20100310:921280-927264 -/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,940851,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960143,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641-980642,980935,981051,981104,981123,981288,983920,983930,985163,985298,985473,985718,985856,985902,987841,989166,990127,990339,990 539,991485,993344,993387,995384,995686,996069,996078-996079,996563,997418-997420,997423-997425,997431,997440,997526,997990,998061,998412,998557,1000621,1000725,1000998,1001099,1001131,1001185,1001574,1001849,1001962,1002963,1003434,1003450,1003829,1004139,1027756,1027960,1028053,1028625,1028627,1029600,1030016,1030385,1030390,1033928,1033953,1034138,1034179,1035080,1035084,1036426,1036669,1037507,1037559-1037560,1037567,1037883,1038228,1038990,1039256,1040044,1040091,1042009,1042034,1042038,1042132,1042188,1042222,1042317,1042348,1042396,1042411,1042950,1043861,1043996-1043998,1044047,1044084,1044912,1049031,1050602,1051111,1051450,1051812,1052195,1053285,1053289,1054565,1055057,1056072,1056305,1056803,1057519,1058028 +/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,940851,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960143,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641-980642,980935,981051,981104,981123,981288,983920,983930,985163,985298,985473,985718,985856,985902,987841,989166,990127,990339,990 539,991485,993344,993387,995384,995686,996069,996078-996079,996563,997418-997420,997423-997425,997431,997440,997526,997990,998061,998412,998557,1000621,1000725,1000998,1001099,1001131,1001185,1001574,1001849,1001962,1002963,1003434,1003450,1003829,1004139,1027756,1027960,1028053,1028625,1028627,1029600,1030016,1030385,1030390,1033928,1033953,1034138,1034179,1035080,1035084,1036426,1036669,1037507,1037559-1037560,1037567,1037883,1038228,1038990,1039256,1040044,1040091,1042009,1042034,1042038,1042132,1042188,1042222,1042317,1042348,1042396,1042411,1042950,1043861,1043996-1043998,1044047,1044084,1044912,1049031,1050602,1051111,1051450,1051812,1052195,1053285,1053289,1054565,1055057,1056072,1056305,1056803,1057519,1058028,1058056 Modified: ofbiz/branches/release10.04/applications/humanres/webapp/humanres/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/humanres/webapp/humanres/WEB-INF/controller.xml?rev=1058062&r1=1058061&r2=1058062&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/humanres/webapp/humanres/WEB-INF/controller.xml (original) +++ ofbiz/branches/release10.04/applications/humanres/webapp/humanres/WEB-INF/controller.xml Wed Jan 12 10:49:57 2011 @@ -28,7 +28,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/branches/release10.04/framework/widget/config/widget.properties URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/framework/widget/config/widget.properties?rev=1058062&r1=1058061&r2=1058062&view=diff ============================================================================== --- ofbiz/branches/release10.04/framework/widget/config/widget.properties (original) +++ ofbiz/branches/release10.04/framework/widget/config/widget.properties Wed Jan 12 10:49:57 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 @@ -56,6 +56,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/branches/release10.04/framework/widget/src/org/ofbiz/widget/screen/MacroScreenViewHandler.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/framework/widget/src/org/ofbiz/widget/screen/MacroScreenViewHandler.java?rev=1058062&r1=1058061&r2=1058062&view=diff ============================================================================== --- ofbiz/branches/release10.04/framework/widget/src/org/ofbiz/widget/screen/MacroScreenViewHandler.java (original) +++ ofbiz/branches/release10.04/framework/widget/src/org/ofbiz/widget/screen/MacroScreenViewHandler.java Wed Jan 12 10:49:57 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((String) this.servletContext.getAttribute("compressHTML")); Modified: ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml?rev=1058062&r1=1058061&r2=1058062&view=diff ============================================================================== --- ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml (original) +++ ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml Wed Jan 12 10:49:57 2011 @@ -40,7 +40,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/branches/release10.04/specialpurpose/oagis/webapp/oagis/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/specialpurpose/oagis/webapp/oagis/WEB-INF/controller.xml?rev=1058062&r1=1058061&r2=1058062&view=diff ============================================================================== --- ofbiz/branches/release10.04/specialpurpose/oagis/webapp/oagis/WEB-INF/controller.xml (original) +++ ofbiz/branches/release10.04/specialpurpose/oagis/webapp/oagis/WEB-INF/controller.xml Wed Jan 12 10:49:57 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/branches/release10.04/specialpurpose/shark/webapp/shark/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/specialpurpose/shark/webapp/shark/WEB-INF/controller.xml?rev=1058062&r1=1058061&r2=1058062&view=diff ============================================================================== --- ofbiz/branches/release10.04/specialpurpose/shark/webapp/shark/WEB-INF/controller.xml (original) +++ ofbiz/branches/release10.04/specialpurpose/shark/webapp/shark/WEB-INF/controller.xml Wed Jan 12 10:49:57 2011 @@ -31,7 +31,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/branches/release10.04/specialpurpose/webpos/webapp/webpos/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/specialpurpose/webpos/webapp/webpos/WEB-INF/controller.xml?rev=1058062&r1=1058061&r2=1058062&view=diff ============================================================================== --- ofbiz/branches/release10.04/specialpurpose/webpos/webapp/webpos/WEB-INF/controller.xml (original) +++ ofbiz/branches/release10.04/specialpurpose/webpos/webapp/webpos/WEB-INF/controller.xml Wed Jan 12 10:49:57 2011 @@ -32,10 +32,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"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |