svn commit: r600913 - in /incubator/tuscany/java/sdo/impl/src: main/java/org/apache/tuscany/sdo/helper/XMLHelperImpl.java test/java/org/apache/tuscany/sdo/test/XMLHelperTestCase.java test/java/org/apache/tuscany/sdo/test/XMLSaveOptionsTestCase.java

[kelvingoodson]

Author: kelvingoodson
Date: Tue Dec  4 04:46:06 2007
New Revision: 600913

URL: http://svn.apache.org/viewvc?rev=600913&view=rev
Log:
Fix for TUSCANY-1545

Modified:
    
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLHelperImpl.java
    
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XMLHelperTestCase.java
    
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XMLSaveOptionsTestCase.java

Modified: 
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLHelperImpl.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLHelperImpl.java?rev=600913&r1=600912&r2=600913&view=diff
==============================================================================
--- 
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLHelperImpl.java
 (original)
+++ 
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLHelperImpl.java
 Tue Dec  4 04:46:06 2007
@@ -182,7 +182,9 @@
     }
 
     public XMLDocument createDocument(DataObject dataObject, String 
rootElementURI, String rootElementName) {
-        return new XMLDocumentImpl(extendedMetaData, dataObject, 
rootElementURI, rootElementName);
+        XMLDocument xmlDocument = new XMLDocumentImpl(extendedMetaData, 
dataObject, rootElementURI, rootElementName);
+        xmlDocument.setEncoding("UTF-8");
+        return xmlDocument;
     }
 
     public HelperContext getHelperContext() {

Modified: 
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XMLHelperTestCase.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XMLHelperTestCase.java?rev=600913&r1=600912&r2=600913&view=diff
==============================================================================
--- 
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XMLHelperTestCase.java
 (original)
+++ 
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XMLHelperTestCase.java
 Tue Dec  4 04:46:06 2007
@@ -40,10 +40,13 @@
 
 import commonj.sdo.DataObject;
 import commonj.sdo.Type;
+import commonj.sdo.helper.DataFactory;
 import commonj.sdo.helper.HelperContext;
+import commonj.sdo.helper.TypeHelper;
 import commonj.sdo.helper.XMLDocument;
 import commonj.sdo.helper.XMLHelper;
 import commonj.sdo.helper.XSDHelper;
+import commonj.sdo.impl.HelperProvider;
 
 public class XMLHelperTestCase extends TestCase {
 
@@ -283,4 +286,29 @@
           fail(e.toString());
       }
   }
+  
+  public void testEncoding() throws IOException 
+  {
+      TypeHelper types = hc.getTypeHelper();
+      Type stringType = types.getType("commonj.sdo", "String");
+      DataObject customerType = hc.getDataFactory().create("commonj.sdo", 
"Type");
+      customerType.set("uri", "http://example.com/simple";);
+      customerType.set("name", "Simple");
+      DataObject multiProperty = customerType.createDataObject("property");
+      multiProperty.set("name", "name");
+      multiProperty.set("type", stringType);
+      types.define(customerType);
+      DataObject obj = hc.getDataFactory().create("http://example.com/simple";, 
+      "Simple");
+      obj.set("name", "John Smith");
+      
+      ByteArrayOutputStream baos = new ByteArrayOutputStream();
+      hc.getXMLHelper().save(obj, "http://www.example.com/company"; , 
"company", baos);
+      ByteArrayInputStream bais = new 
ByteArrayInputStream(baos.toString().getBytes());
+      XMLDocument xmlDoc = hc.getXMLHelper().load(bais);
+      if( !"UTF-8".equals(xmlDoc.getEncoding()) )
+      {
+          fail("Encoding ('" + xmlDoc.getEncoding() +"' is not correct.  UTF-8 
is the expected encoding.");
+      }
+   }
 }

Modified: 
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XMLSaveOptionsTestCase.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XMLSaveOptionsTestCase.java?rev=600913&r1=600912&r2=600913&view=diff
==============================================================================
--- 
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XMLSaveOptionsTestCase.java
 (original)
+++ 
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XMLSaveOptionsTestCase.java
 Tue Dec  4 04:46:06 2007
@@ -46,7 +46,7 @@
          XMLHelper xmlh;
          XMLStreamHelper xmlStreamHelper;
          static final String INDENT = " ", MARGIN = " ", LINE_BREAK = "\n";
-         String formatted1 =   MARGIN+  "<?xml version=\"1.0\" 
encoding=\"ASCII\"?>"  +LINE_BREAK+
+         String formatted1 =   MARGIN+  "<?xml version=\"1.0\" 
encoding=\"UTF-8\"?>"  +LINE_BREAK+
                MARGIN+  "<cs:stockQuote 
xmlns:cs=\"http://www.example.com/simpleCS\";>"  +LINE_BREAK+
                MARGIN+INDENT+  "<symbol>FBNT</symbol>"  +LINE_BREAK+
                MARGIN+INDENT+  
"<companyName>FlyByNightTechnology</companyName>"  +LINE_BREAK+



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]