You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by ma...@apache.org on 2010/07/29 07:58:23 UTC

svn commit: r980318 - in /incubator/oodt/trunk: CHANGES.txt curator/src/main/java/org/apache/oodt/cas/curation/servlet/UpdateDatasetMetaDataServlet.java curator/src/main/java/org/apache/oodt/cas/curation/util/HTMLEncode.java

Author: mattmann
Date: Thu Jul 29 05:58:22 2010
New Revision: 980318

URL: http://svn.apache.org/viewvc?rev=980318&view=rev
Log:
- fix for OODT-18 Convert curator to use Apache commons rather than jTidy

Removed:
    incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/util/HTMLEncode.java
Modified:
    incubator/oodt/trunk/CHANGES.txt
    incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/servlet/UpdateDatasetMetaDataServlet.java

Modified: incubator/oodt/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/CHANGES.txt?rev=980318&r1=980317&r2=980318&view=diff
==============================================================================
--- incubator/oodt/trunk/CHANGES.txt (original)
+++ incubator/oodt/trunk/CHANGES.txt Thu Jul 29 05:58:22 2010
@@ -5,6 +5,8 @@ Apache OODT Change Log
 Release 0.1-incubating - Current Development
 --------------------------------------------
 
+* OODT-18 Convert curator to use Apache commons rather than jTidy (mattmann)
+
 * OODT-16 - Remove JPL look+feel and web references, as well as dependency on private JPL M2 
   repository; add relocation tags and disclaimer of Apache Incubation status (kelly)
 

Modified: incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/servlet/UpdateDatasetMetaDataServlet.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/servlet/UpdateDatasetMetaDataServlet.java?rev=980318&r1=980317&r2=980318&view=diff
==============================================================================
--- incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/servlet/UpdateDatasetMetaDataServlet.java (original)
+++ incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/servlet/UpdateDatasetMetaDataServlet.java Thu Jul 29 05:58:22 2010
@@ -25,7 +25,6 @@ import java.util.Enumeration;
 import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-
 import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
@@ -33,10 +32,12 @@ import javax.servlet.http.HttpServletReq
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
+//COMMONS imports
+import org.apache.commons.lang.StringEscapeUtils;
+
 // OODT imports
 import org.apache.oodt.cas.curation.policymgr.CurationPolicyManager;
 import org.apache.oodt.cas.curation.util.CurationXmlStructFactory;
-import org.apache.oodt.cas.curation.util.HTMLEncode;
 import org.apache.oodt.cas.filemgr.structs.ProductType;
 import org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient;
 import org.apache.oodt.cas.metadata.util.PathUtils;
@@ -128,7 +129,7 @@ public class UpdateDatasetMetaDataServle
 
         if (keyName.equals("PubMedID")) {
           cpt.getTypeMetadata().replaceMetadata(keyName,
-              HTMLEncode.encode(formValues[0]));
+              StringEscapeUtils.escapeHtml(formValues[0]));
         } else
           cpt.getTypeMetadata().replaceMetadata(keyName, formValues[0]);
       }