You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2004/12/02 11:33:53 UTC
svn commit: r109490 - /lenya/trunk/src/java/org/apache/lenya/cms/cocoon/acting/OneFormEditorSaveAction.java
Author: andreas
Date: Thu Dec 2 02:33:52 2004
New Revision: 109490
URL: http://svn.apache.org/viewcvs?view=rev&rev=109490
Log:
check wellformedness
Modified:
lenya/trunk/src/java/org/apache/lenya/cms/cocoon/acting/OneFormEditorSaveAction.java
Modified: lenya/trunk/src/java/org/apache/lenya/cms/cocoon/acting/OneFormEditorSaveAction.java
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/cocoon/acting/OneFormEditorSaveAction.java?view=diff&rev=109490&p1=lenya/trunk/src/java/org/apache/lenya/cms/cocoon/acting/OneFormEditorSaveAction.java&r1=109489&p2=lenya/trunk/src/java/org/apache/lenya/cms/cocoon/acting/OneFormEditorSaveAction.java&r2=109490
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/cocoon/acting/OneFormEditorSaveAction.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/cocoon/acting/OneFormEditorSaveAction.java Thu Dec 2 02:33:52 2004
@@ -38,8 +38,10 @@
import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.environment.http.HttpRequest;
import org.apache.excalibur.source.Source;
+import org.apache.lenya.xml.DocumentHelper;
import org.apache.lenya.xml.RelaxNG;
import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
/**
*
@@ -80,6 +82,16 @@
xmlSource = resolver.resolveURI(xmlUri);
saveXMLFile(encoding, content, xmlSource);
+ try {
+ DocumentHelper.readDocument(xmlSource.getInputStream());
+ }
+ catch (SAXException e) {
+ getLogger().error("Wellformedness check failed: " + e.getMessage());
+ Map hmap = new HashMap();
+ hmap.put("message", "Document is not well-formed: " + e.getMessage());
+ return hmap;
+ }
+
schemaSource = resolver.resolveURI(schemaUri);
if (!schemaSource.exists()) {
throw new IllegalArgumentException("The schema [" + schemaSource.getURI()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org