perfsonar development work

Author: roman
Date: 2006-09-01 04:12:20 -0400 (Fri, 01 Sep 2006)
New Revision: 1589

Modified:
   trunk/perfsonar/src/org/perfsonar/client/testHarness/SOAPClient.java
   trunk/perfsonar/src/org/perfsonar/client/testHarness/SOAPClientMulti.java
Log:
replace jdom classes with Xerces classes to serialize DOM document

Modified: trunk/perfsonar/src/org/perfsonar/client/testHarness/SOAPClient.java
===================================================================
--- trunk/perfsonar/src/org/perfsonar/client/testHarness/SOAPClient.java      
  2006-08-31 14:24:12 UTC (rev 1588)
+++ trunk/perfsonar/src/org/perfsonar/client/testHarness/SOAPClient.java      
  2006-09-01 08:12:20 UTC (rev 1589)
@@ -20,9 +20,8 @@
 import org.apache.axis.client.Service;
 import org.apache.axis.message.SOAPBodyElement;
 
-import org.jdom.input.DOMBuilder;
-import org.jdom.output.XMLOutputter;
-import org.jdom.output.Format;
+import org.apache.xml.serialize.OutputFormat;
+import org.apache.xml.serialize.XMLSerializer;
 
 import org.w3c.dom.Document;
 
@@ -50,14 +49,16 @@
             String outputFile = null;
 
             if (args.length == 3) {
+
                 endPoint = args[0];
                 inputFile = args[1];
                 outputFile = args[2];
+
             } else {
-                endPoint = 
"http://mu.dante.org.uk:8090/axis/services/MeasurementArchiveService";;
-                inputFile = 
"/root/Download/dev/sonar/perfsonar/schema/example-instances/sonar/MetadataKey-Req.xml";
-                //inputFile = 
"/root/Download/dev/sonar/perfsonar/schema/example-instances/sonar/DataSetup-Req.xml";
-                outputFile = 
"/root/Download/dev/sonar/perfsonar/conf/response.xml";
+
+               System.out.println("Error: Wrong number of parameters!!!");
+                return;
+
             }
 
             System.out.println("End point: " + endPoint);
@@ -71,14 +72,13 @@
             call.setOperationName(new 
QName("http://soapinterop.org/","submit";));
 
 
-            // read the request into a org.w3c.DOM.Document- this is read 
-            // from c:\work\xmlFile2.xml
-            Document request;
+            // read the request into a org.w3c.DOM.Document 
+
+            Document request = null;
             DocumentBuilderFactory factory = 
DocumentBuilderFactory.newInstance();
             factory.setNamespaceAware(true);
 
             DocumentBuilder builder = factory.newDocumentBuilder();
-
             request = builder.parse(new File(inputFile));
 
 
@@ -118,22 +118,17 @@
                 File response = new File(outputFile);
                 FileWriter outWriter = new FileWriter(response);
 
-                DOMBuilder factory1 = new DOMBuilder();
-                org.jdom.Document domResult = factory1.build(result);
-                XMLOutputter outputter = new XMLOutputter();
+                OutputFormat format = new OutputFormat( result );
+                format.setIndent(4);
+                format.setIndenting(true);
+                format.setLineSeparator("\n");
                 
+                XMLSerializer serial = new XMLSerializer(outWriter, format );
+                serial.asDOMSerializer();
+                serial.serialize( result.getDocumentElement() );
                 
-                Format format = Format.getCompactFormat();
-                format.setIndent("   ");
-                format.setLineSeparator("\r\n");
-                outputter.setFormat(format);
-                
-                // pretty printing
-                //outputter.setIndent("   "); 
-                //outputter.setNewlines(true);
+                outWriter.close();
                
-                outputter.output(domResult,outWriter);
-               
 
             } catch (ClassCastException e) {
                 e.printStackTrace();

Modified: 
trunk/perfsonar/src/org/perfsonar/client/testHarness/SOAPClientMulti.java
===================================================================
--- trunk/perfsonar/src/org/perfsonar/client/testHarness/SOAPClientMulti.java 
  2006-08-31 14:24:12 UTC (rev 1588)
+++ trunk/perfsonar/src/org/perfsonar/client/testHarness/SOAPClientMulti.java 
  2006-09-01 08:12:20 UTC (rev 1589)
@@ -20,9 +20,8 @@
 import org.apache.axis.client.Service;
 import org.apache.axis.message.SOAPBodyElement;
 
-import org.jdom.input.DOMBuilder;
-import org.jdom.output.XMLOutputter;
-import org.jdom.output.Format;
+import org.apache.xml.serialize.OutputFormat;
+import org.apache.xml.serialize.XMLSerializer;
 
 import org.w3c.dom.Document;
 
@@ -177,23 +176,18 @@
                 // output it to a file
                 File response = new File(this.outputFile);
                 FileWriter outWriter = new FileWriter(response);
+                
+                OutputFormat format = new OutputFormat( result );
+                format.setIndent(4);
+                format.setIndenting(true);
+                format.setLineSeparator("\n");
 
-                DOMBuilder factory1 = new DOMBuilder();
-                org.jdom.Document domResult = factory1.build(result);
-                XMLOutputter outputter = new XMLOutputter();
+                XMLSerializer serial = new XMLSerializer(outWriter, format );
+                serial.asDOMSerializer();
+                serial.serialize( result.getDocumentElement() );
                 
-                // pretty printing
-                //outputter.setIndent("   "); 
-                //outputter.setNewlines(true);
+                outWriter.close();
 
-                Format format = Format.getCompactFormat();
-                format.setIndent("   ");
-                format.setLineSeparator("\r\n");
-                outputter.setFormat(format);
-               
-                outputter.output(domResult,outWriter);
-               
-
             } catch (ClassCastException e) {
                 println("SOAPClient.makeRequest: We didn't get a Vector of 
SOAPBodyElements!");
                 e.printStackTrace();