svnno****@sourc*****
svnno****@sourc*****
2009年 3月 5日 (木) 23:47:50 JST
Revision: 2820
http://svn.sourceforge.jp/view?root=jiemamy&view=rev&rev=2820
Author: daisuke_m
Date: 2009-03-05 23:47:50 +0900 (Thu, 05 Mar 2009)
Log Message:
-----------
プラグインexportして、きちんとfeatureとしてinstallしてみると、モデルのXML Schemaバリデーションに失敗する…。ひとまずバリデーションをコメントアウト。
Modified Paths:
--------------
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/serializer/JiemamyDomSerializer.java
-------------- next part --------------
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/serializer/JiemamyDomSerializer.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/serializer/JiemamyDomSerializer.java 2009-03-05 14:46:40 UTC (rev 2819)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/serializer/JiemamyDomSerializer.java 2009-03-05 14:47:50 UTC (rev 2820)
@@ -23,11 +23,9 @@
import java.io.InputStream;
import java.io.OutputStream;
-import javax.xml.XMLConstants;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.Source;
import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerConfigurationException;
import javax.xml.transform.TransformerException;
@@ -35,11 +33,7 @@
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
-import javax.xml.validation.Schema;
-import javax.xml.validation.SchemaFactory;
-import javax.xml.validation.Validator;
-import org.apache.commons.lang.SystemUtils;
import org.apache.commons.lang.Validate;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -149,24 +143,22 @@
DocumentBuilder documentBuilder = DOCUMENT_BUILDER_FACTORY.newDocumentBuilder();
Document document = documentBuilder.parse(in);
- if (SystemUtils.OS_NAME.toLowerCase().equals("linux") == false) {
- // XML SchemaのDOMを作る
- DocumentBuilderFactory factory0 = DocumentBuilderFactory.newInstance();
- DocumentBuilder builder0 = factory0.newDocumentBuilder();
- Document coreXsd = builder0.parse(JiemamySerializer.class.getResourceAsStream("/jiemamy-core.xsd"));
- Document viewXsd = builder0.parse(JiemamySerializer.class.getResourceAsStream("/jiemamy-view.xsd"));
-
- // XML Schemaオブジェクトを作る
- SchemaFactory schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
- Schema schema = schemaFactory.newSchema(new Source[] {
- new DOMSource(coreXsd),
- new DOMSource(viewXsd)
- });
-
- // 妥当性検証
- Validator validator = schema.newValidator();
- validator.validate(new DOMSource(document));
- }
+// // XML SchemaのDOMを作る
+// DocumentBuilderFactory factory0 = DocumentBuilderFactory.newInstance();
+// DocumentBuilder builder0 = factory0.newDocumentBuilder();
+// Document coreXsd = builder0.parse(JiemamySerializer.class.getResourceAsStream("/jiemamy-core.xsd"));
+// Document viewXsd = builder0.parse(JiemamySerializer.class.getResourceAsStream("/jiemamy-view.xsd"));
+//
+// // XML Schemaオブジェクトを作る
+// SchemaFactory schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
+// Schema schema = schemaFactory.newSchema(new Source[] {
+// new DOMSource(coreXsd),
+// new DOMSource(viewXsd)
+// });
+//
+// // 妥当性検証
+// Validator validator = schema.newValidator();
+// validator.validate(new DOMSource(document));
return document;
}