svn commit: r1395630 - in /archiva/trunk/archiva-modules/archiva-web: archiva-web-common/src/main/java/org/apache/archiva/web/docs/RestDocsServlet.java archiva-webapp-js/src/main/webapp/js/archiva/docs.js

[olamy]

Author: olamy
Date: Mon Oct  8 15:50:49 2012
New Revision: 1395630

URL: http://svn.apache.org/viewvc?rev=1395630&view=rev
Log:
escape xml content

Modified:
    
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/docs/RestDocsServlet.java
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/docs.js

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/docs/RestDocsServlet.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/docs/RestDocsServlet.java?rev=1395630&r1=1395629&r2=1395630&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/docs/RestDocsServlet.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/docs/RestDocsServlet.java
 Mon Oct  8 15:50:49 2012
@@ -19,6 +19,7 @@ package org.apache.archiva.web.docs;
  */
 
 import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang.StringUtils;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
@@ -56,7 +57,8 @@ public class RestDocsServlet
 
         if ( StringUtils.endsWith( path, ".xsd" ) )
         {
-            IOUtils.copy( is, resp.getOutputStream() );
+            StringEscapeUtils.escapeXml( resp.getWriter(), IOUtils.toString( 
is ) );
+            //IOUtils.copy( is, resp.getOutputStream() );
             return;
         }
 

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/docs.js
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/docs.js?rev=1395630&r1=1395629&r2=1395630&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/docs.js
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/docs.js
 Mon Oct  8 15:50:49 2012
@@ -25,49 +25,40 @@ define("archiva.docs",["jquery","i18n","
   }
 
   goToArchivaRestDoc=function(target){
-    var mainContent = $("#main-content");
-    mainContent.find("#rest_docs_content" ).html(mediumSpinnerImg());
-    $.ajax({
-      url:"rest-docs/rest-docs-archiva-rest-api/"+target,
-      type:"get",
-      dataType: "html",
-      success: function(data){
-        mainContent.html($("#rest_docs").tmpl());
-        mainContent.find("#rest_docs_content" ).html(data);
-        prettyPrint();
-      }
-    });
+    goToRestDoc(target,"rest-docs/rest-docs-archiva-rest-api");
   }
 
   goToArchivaRestUiDoc=function(target){
-    var mainContent = $("#main-content");
-    mainContent.find("#rest_docs_content" ).html(mediumSpinnerImg());
-    $.ajax({
-      url:"rest-docs/rest-docs-archiva-ui/"+target,
-      type:"get",
-      dataType: "html",
-      success: function(data){
-        mainContent.html($("#rest_docs").tmpl());
-        mainContent.find("#rest_docs_content" ).html(data);
-        prettyPrint();
-      }
-    });
+
+    goToRestDoc(target,"rest-docs/rest-docs-archiva-ui");
   }
 
   goToRedbackRestDoc=function(target){
+
+    goToRestDoc(target,"rest-docs/rest-docs-redback-rest-api");
+  }
+
+  goToRestDoc=function(target,rootPath){
     var mainContent = $("#main-content");
     mainContent.find("#rest_docs_content" ).html(mediumSpinnerImg());
     $.ajax({
-      url:"rest-docs/rest-docs-redback-rest-api/"+target,
+      url:rootPath+"/"+target,
       type:"get",
       dataType: "html",
       success: function(data){
         mainContent.html($("#rest_docs").tmpl());
-        mainContent.find("#rest_docs_content" ).html(data);
+        if(target.endsWith(".xsd")){
+          mainContent.find("#rest_docs_content" ).html("<code 
id='xsd_content'></code>");
+          mainContent.find("#xsd_content" ).html(data);
+        } else {
+          mainContent.find("#rest_docs_content" ).html(data);
+        }
+
         prettyPrint();
       }
     });
   }
+
   displayRedbackRestDocs=function(){
     
window.sammyArchivaApplication.setLocation("#rest-docs-redback-rest-api/index.html");
   }