You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by li...@apache.org on 2011/11/14 18:15:12 UTC

svn commit: r1201796 - /shindig/trunk/java/server/src/main/webapp/WEB-INF/web.xml

Author: lindner
Date: Mon Nov 14 17:15:11 2011
New Revision: 1201796

URL: http://svn.apache.org/viewvc?rev=1201796&view=rev
Log:
SHINDIG-1657 | Patch from Auke van Leeuwen | Wrap some web.xml init parameters in CDATA section

Modified:
    shindig/trunk/java/server/src/main/webapp/WEB-INF/web.xml

Modified: shindig/trunk/java/server/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.xml?rev=1201796&r1=1201795&r2=1201796&view=diff
==============================================================================
--- shindig/trunk/java/server/src/main/webapp/WEB-INF/web.xml (original)
+++ shindig/trunk/java/server/src/main/webapp/WEB-INF/web.xml Mon Nov 14 17:15:11 2011
@@ -61,11 +61,13 @@
   Make sure you escape all HTML values for the web.xml to be parsed correctly.
   -->
    <context-param>
-  	<param-name>system.properties</param-name>
+     <param-name>system.properties</param-name>
      <param-value>
+     <![CDATA[
         shindig.host=
         shindig.port=
-    	aKey=/shindig/gadgets/proxy?container=default&amp;url=    	
+        aKey=/shindig/gadgets/proxy?container=default&url=
+     ]]>
      </param-value>
   </context-param>
 
@@ -90,6 +92,7 @@
         <init-param>
             <param-name>config</param-name>
             <param-value>
+            <![CDATA[
                 # The ShiroFilter configuration is very powerful and flexible, while still remaining succinct.
                 # Please read the comprehensive example, with full comments and explanations, in the JavaDoc:
                 #
@@ -108,7 +111,7 @@
 
                 /oauth/authorize/** = authc
                 /oauth2/authorize/** = authc
-
+            ]]>
             </param-value>
         </init-param>
     </filter>