perfsonar development work

Author: psnc.jedrzejewski
Date: 2011-02-14 12:34:21 +0000 (Mon, 14 Feb 2011)
New Revision: 5804

Modified:
   
trunk/perfsonar-java-xml-ls/src/test/soapUI/src/org/perfsonar/soapUI/ls/TestUtil.java
Log:
rnc schema suppport added

Modified: 
trunk/perfsonar-java-xml-ls/src/test/soapUI/src/org/perfsonar/soapUI/ls/TestUtil.java
===================================================================
--- 
trunk/perfsonar-java-xml-ls/src/test/soapUI/src/org/perfsonar/soapUI/ls/TestUtil.java
       2011-02-02 13:52:38 UTC (rev 5803)
+++ 
trunk/perfsonar-java-xml-ls/src/test/soapUI/src/org/perfsonar/soapUI/ls/TestUtil.java
       2011-02-14 12:34:21 UTC (rev 5804)
@@ -1,6 +1,7 @@
 package org.perfsonar.soapUI.ls;
 
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStream;
@@ -8,6 +9,7 @@
 import java.net.Authenticator;
 import java.net.URL;
 
+import javax.xml.XMLConstants;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.Source;
 import javax.xml.transform.stream.StreamSource;
@@ -27,9 +29,11 @@
                return url.openStream();
        }
 
-       public static boolean validate(String xmlDocument, File schemaFile, 
Logger log)
+       public static boolean validateRNG(String xmlDocument, File 
schemaFile, Logger log)
                        throws IOException, ParserConfigurationException, 
SAXException {
-               SchemaFactory factory = 
SchemaFactory.newInstance("http://www.w3.org/2001/XMLSchema";);
+               System.setProperty(SchemaFactory.class.getName() + ":" + 
XMLConstants.RELAXNG_NS_URI,
+                               
"com.thaiopensource.relaxng.jaxp.CompactSyntaxSchemaFactory");
+               SchemaFactory factory = 
SchemaFactory.newInstance(XMLConstants.RELAXNG_NS_URI);
 
                File schemaLocation = schemaFile;
                Schema schema = factory.newSchema(schemaLocation);
@@ -42,8 +46,28 @@
                return true;
        }
 
+       public static boolean validateXSD(String xmlDocument, File 
schemaFile, Logger log)
+                       throws IOException, ParserConfigurationException, 
SAXException {
+               SchemaFactory factory = 
SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
+
+               File schemaLocation = schemaFile;
+               Schema schema = factory.newSchema(schemaLocation);
+
+               Validator validator = schema.newValidator();
+
+               Source source = new StreamSource(new 
StringReader(xmlDocument));
+
+               validator.validate(source);
+               return true;
+       }
+
        public static void main(String[] args) throws IOException, 
ParserConfigurationException,
                        SAXException {
+               rngValidationTest();
+       }
+
+       private static void xmlValidationTest() throws FileNotFoundException, 
IOException,
+                       ParserConfigurationException, SAXException {
                String f = 
"/home/kjedrzejewski/Pulpit/LS_API/LS-soapUI-base2/xsd/Query/LSQueryResponse.xsd";
                File file = new File("/home/kjedrzejewski/Pulpit/a.xml");
                FileReader reader = new FileReader(file);
@@ -56,9 +80,23 @@
                }
                String s = sb.toString();
                System.out.println(s);
-               System.out.println(validate(s, new File(f), 
Logger.getLogger(TestUtil.class)));
+               System.out.println(validateXSD(s, new File(f), 
Logger.getLogger(TestUtil.class)));
        }
 
-       private TestUtil() {
+       private static void rngValidationTest() throws FileNotFoundException, 
IOException,
+                       ParserConfigurationException, SAXException {
+               String f = "/home/kjedrzejewski/Pulpit/EchoRequest.rnc";
+               File file = new File("/home/kjedrzejewski/Pulpit/Echo.xml");
+               FileReader reader = new FileReader(file);
+               StringBuilder sb = new StringBuilder();
+               char c;
+               int i;
+               while ((i = reader.read()) != -1) {
+                       c = (char) i;
+                       sb.append(c);
+               }
+               String s = sb.toString();
+               System.out.println(s);
+               System.out.println(validateRNG(s, new File(f), 
Logger.getLogger(TestUtil.class)));
        }
 }