svn commit: r721029 - in /incubator/shindig/branches/0.8.1-x/java/social-api/src: main/java/org/apache/shindig/social/core/util/xstream/XStream081Configuration.java test/java/org/apache/shindig/social/opensocial/util/BeanXStreamAtomConverterTest.java

[ieb]

Author: ieb
Date: Wed Nov 26 15:17:58 2008
New Revision: 721029

URL: http://svn.apache.org/viewvc?rev=721029&view=rev
Log:
         SHINDIG-713

Patch from Adam Winer

XStream081Configuration contains:
    atom.addNamespace("xmlos:osearch",OSEARCH_NS);
which should be:
    atom.addNamespace("xmlns:osearch",OSEARCH_NS);

This breaks when you run the content through an namespace-aware XML parser.

Thanks

Modified:
    
incubator/shindig/branches/0.8.1-x/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/XStream081Configuration.java
    
incubator/shindig/branches/0.8.1-x/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXStreamAtomConverterTest.java

Modified: 
incubator/shindig/branches/0.8.1-x/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/XStream081Configuration.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/branches/0.8.1-x/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/XStream081Configuration.java?rev=721029&r1=721028&r2=721029&view=diff
==============================================================================
--- 
incubator/shindig/branches/0.8.1-x/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/XStream081Configuration.java
 (original)
+++ 
incubator/shindig/branches/0.8.1-x/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/XStream081Configuration.java
 Wed Nov 26 15:17:58 2008
@@ -95,7 +95,7 @@
     // the xstream namespace implementation does not work exactly how we need 
it to.
     NamespaceSet atom = new NamespaceSet();
     atom.addNamespace("xmlns", ATOM_NS);
-    atom.addNamespace("xmlos:osearch",OSEARCH_NS);
+    atom.addNamespace("xmlns:osearch",OSEARCH_NS);
     atom.addPrefixedElement("totalResults","osearch:totalResults");
     atom.addPrefixedElement("startIndex","osearch:startIndex");
     atom.addPrefixedElement("itemsPerPage","osearch:itemsPerPage");

Modified: 
incubator/shindig/branches/0.8.1-x/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXStreamAtomConverterTest.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/branches/0.8.1-x/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXStreamAtomConverterTest.java?rev=721029&r1=721028&r2=721029&view=diff
==============================================================================
--- 
incubator/shindig/branches/0.8.1-x/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXStreamAtomConverterTest.java
 (original)
+++ 
incubator/shindig/branches/0.8.1-x/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXStreamAtomConverterTest.java
 Wed Nov 26 15:17:58 2008
@@ -148,7 +148,7 @@
 
     XmlUtil.parse(xml);
 
-    String expectedXml = " <feed 
xmlns=\"http://ns.opensocial.org/2008/opensocial\"; 
xmlos:osearch=\"http://a9.com/-/spec/opensearch/1.1\"; > "
+    String expectedXml = " <feed 
xmlns=\"http://ns.opensocial.org/2008/opensocial\"; 
xmlns:osearch=\"http://a9.com/-/spec/opensearch/1.1\"; > "
         + " <entry><id>item1</id>"
         + "    <content type=\"application/xml\" 
><entry><key>value</key><value>1</value></entry></content>"
         + " </entry> "
@@ -169,7 +169,7 @@
     String xml = beanXmlConverter.convertToString(m);
     XmlUtil.parse(xml);
     String expectedXml = "<feed 
xmlns=\"http://ns.opensocial.org/2008/opensocial\"; "
-        + " xmlos:osearch=\"http://a9.com/-/spec/opensearch/1.1\";>"
+        + " xmlns:osearch=\"http://a9.com/-/spec/opensearch/1.1\";>"
         + "  <entry><id>key1</id><content type=\"application/xml\" >"
         + "    <value>value1</value></content>"
         + "  </entry>"
@@ -189,7 +189,7 @@
     String xml = beanXmlConverter.convertToString(empty);
     XmlUtil.parse(xml);
     String expectedXml = "<feed 
xmlns=\"http://ns.opensocial.org/2008/opensocial\"; "
-        + "xmlos:osearch=\"http://a9.com/-/spec/opensearch/1.1\"; >"
+        + "xmlns:osearch=\"http://a9.com/-/spec/opensearch/1.1\"; >"
         + "<entry><content/></entry>"
         + "<osearch:startIndex>0</osearch:startIndex>"
         + "<osearch:totalResults>1</osearch:totalResults>"
@@ -204,7 +204,7 @@
     xml = beanXmlConverter.convertToString(emptyLists);
     XmlUtil.parse(xml);
     expectedXml = "<feed xmlns=\"http://ns.opensocial.org/2008/opensocial\"; "
-        + "xmlos:osearch=\"http://a9.com/-/spec/opensearch/1.1\"; >"
+        + "xmlns:osearch=\"http://a9.com/-/spec/opensearch/1.1\"; >"
         + "<entry><content><list/><list/><list/></content></entry>"
         + "<osearch:startIndex>0</osearch:startIndex>"
         + "<osearch:totalResults>1</osearch:totalResults>"
@@ -222,7 +222,7 @@
     String xml = beanXmlConverter.convertToString(activities);
     XmlUtil.parse(xml);
     String expectedXml = "<feed 
xmlns=\"http://ns.opensocial.org/2008/opensocial\"; "
-        + "   
xmlos:osearch=\"http://a9.com/-/spec/opensearch/1.1\";><entry><content>"
+        + "   
xmlns:osearch=\"http://a9.com/-/spec/opensearch/1.1\";><entry><content>"
         + "  <activity>"
         + "    <id>activityId</id>"
         + "    <mediaItems>"