svn commit: r773081 - in /ofbiz/branches/release09.04: ./ framework/webapp/src/org/ofbiz/webapp/event/ServiceEventHandler.java

Author: jleroux
Date: Fri May  8 20:22:57 2009
New Revision: 773081

URL: http://svn.apache.org/viewvc?rev=773081&view=rev
Log:
"Applied fix from trunk for revision: 773076"
------------------------------------------------------------------------
r773076 | jleroux | 2009-05-08 22:18:23 +0200 (ven., 08 mai 2009) | 1 line

Simplify rendering within a sole string (\n were rendered as <br> in plain text)
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release09.04/   (props changed)
    ofbiz/branches/release09.04/framework/webapp/src/org/ofbiz/webapp/event/ServiceEventHandler.java

Propchange: ofbiz/branches/release09.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May  8 20:22:57 2009
@@ -1 +1 @@
-/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772887
+/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772887,773076

Modified: ofbiz/branches/release09.04/framework/webapp/src/org/ofbiz/webapp/event/ServiceEventHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/webapp/src/org/ofbiz/webapp/event/ServiceEventHandler.java?rev=773081&r1=773080&r2=773081&view=diff
==============================================================================
--- ofbiz/branches/release09.04/framework/webapp/src/org/ofbiz/webapp/event/ServiceEventHandler.java (original)
+++ ofbiz/branches/release09.04/framework/webapp/src/org/ofbiz/webapp/event/ServiceEventHandler.java Fri May  8 20:22:57 2009
@@ -399,11 +399,10 @@
                     + requestMap.uri + "] with an event that calls service ["
                     + serviceName + "]; this is not allowed for security reasons! The data should be encrypted by making it part of the request body "
                     + "(a form field) instead of the request URL."
-                    + "\n\nMoreover it would be kind if you could create a Jira sub-task of https://issues.apache.org/jira/browse/OFBIZ-2330 "
-                    + "\n(check before if a sub-task for this error does not exist)."
-                    + "\nIf you are not sure how to create a Jira issue "
-                    + "please have a look before at http://docs.ofbiz.org/x/r."
-                    + "\n\nThank you in advance for your help.";
+                    + " Moreover it would be kind if you could create a Jira sub-task of https://issues.apache.org/jira/browse/OFBIZ-2330 "
+                    + "(check before if a sub-task for this error does not exist)."
+                    + " If you are not sure how to create a Jira issue please have a look before at http://docs.ofbiz.org/x/r."
+                    + " Thank you in advance for your help.";
                 Debug.logError("=============== " + errMsg + "; In session [" + session.getId() + "]; Note that this can be changed using the service.http.parameters.require.encrypted property in the url.properties file", module);
 
                 // the default here is true, so anything but N/n is true