Author: lindner
Date: Thu Jan 5 16:50:24 2012
New Revision: 1227692
URL: http://svn.apache.org/viewvc?rev=1227692&view=rev
Log:
Upgrade xstream from 1.3.1 to 1.4.2
Modified:
shindig/trunk/UPGRADING
shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/ImplicitCollectionFieldMapping.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/StackDriver.java
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/XStream081Configuration.java
shindig/trunk/pom.xml
Modified: shindig/trunk/UPGRADING
URL:
http://svn.apache.org/viewvc/shindig/trunk/UPGRADING?rev=1227692&r1=1227691&r2=1227692&view=diff
==============================================================================
--- shindig/trunk/UPGRADING (original)
+++ shindig/trunk/UPGRADING Thu Jan 5 16:50:24 2012
@@ -10,15 +10,15 @@ details.
== Java Dependency Changes ==
+* closure-compiler (new) r1592
+* commons-codec 1.5 -> 1.6
+* commons-lang to commons-lang3 3.1
+* ehcache 2.3.2 -> 2.5.0
* guava r09->10.0.1
* guice 2.0->3.0
-* nekohtml 1.9.14->1.9.15
* htmlunit 2.8->2.9
-* closure-compiler r1459
-* commons-lang to commons-lang3 3.1
-* ehcache 2.3.2 -> 2.5.0
-* closure-compiler (new) r1592
-* commons-codec 1.5 -> 1.6
+* nekohtml 1.9.14->1.9.15
+* xstream 1.3.1->1.4.2
FROM 1.0.x TO 2.0.x
===================
Modified:
shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/ImplicitCollectionFieldMapping.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/ImplicitCollectionFieldMapping.java?rev=1227692&r1=1227691&r2=1227692&view=diff
==============================================================================
---
shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/ImplicitCollectionFieldMapping.java
(original)
+++
shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/ImplicitCollectionFieldMapping.java
Thu Jan 5 16:50:24 2012
@@ -23,7 +23,7 @@ import com.thoughtworks.xstream.mapper.M
* <p>
* ItemFieldMapping defines a mapping of a class within a class to an element
* name. Where classes are tested, the must implement or extend the specified
- * classes, unlike the standard behaviour of XStream they dont need to be the
+ * classes, unlike the standard behaviour of XStream they don't need to be the
* classes in question.
* </p>
* <p>
@@ -113,11 +113,11 @@ public class ImplicitCollectionFieldMapp
* Does this ItemFieldMapping match the supplied classes.
*
* @param definedIn
- * the class that the target test class is defiend in, this is a
real
+ * the class that the target test class is defined in, this is a
real
* class
* @param itemType
* the target class, the real class
- * @return true if the defiendIn class implements the defiendIn class of this
+ * @return true if the definedIn class implements the definedIn class of this
* ItemFieldMapping and the itemType class implements the itemType
* class of this ItemFieldMapping.
*/
@@ -152,4 +152,8 @@ public class ImplicitCollectionFieldMapp
return itemType;
}
+ @Override
+ public String getKeyFieldName() {
+ return null;
+ }
}
Modified:
shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/StackDriver.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/StackDriver.java?rev=1227692&r1=1227691&r2=1227692&view=diff
==============================================================================
---
shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/StackDriver.java
(original)
+++
shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/StackDriver.java
Thu Jan 5 16:50:24 2012
@@ -21,10 +21,12 @@ import com.thoughtworks.xstream.io.Hiera
import com.thoughtworks.xstream.io.HierarchicalStreamReader;
import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
+import java.io.File;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.Reader;
import java.io.Writer;
+import java.net.URL;
import java.util.Map;
/**
@@ -88,7 +90,7 @@ public class StackDriver implements Hier
/**
* Create a {@link HierarchicalStreamWriter} that tracks the path to the
- * current element based on a {@link Writer}.
+ * current element based on a {@link java.io.Writer}.
*
* @param writer
* the underlying writer that will perform the writes.
@@ -114,4 +116,13 @@ public class StackDriver implements Hier
return new StackWriterWrapper(parentWriter, writerStack, namespaces);
}
+ @Override
+ public HierarchicalStreamReader createReader(URL url) {
+ return parent.createReader(url);
+ }
+
+ @Override
+ public HierarchicalStreamReader createReader(File file) {
+ return parent.createReader(file);
+ }
}
Modified:
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/XStream081Configuration.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/XStream081Configuration.java?rev=1227692&r1=1227691&r2=1227692&view=diff
==============================================================================
---
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/XStream081Configuration.java
(original)
+++
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/XStream081Configuration.java
Thu Jan 5 16:50:24 2012
@@ -23,6 +23,10 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+import com.thoughtworks.xstream.converters.Converter;
+import com.thoughtworks.xstream.converters.ConverterLookup;
+import
com.thoughtworks.xstream.converters.reflection.PureJavaReflectionProvider;
+import com.thoughtworks.xstream.core.DefaultConverterLookup;
import org.apache.shindig.protocol.DataCollection;
import org.apache.shindig.protocol.RestfulCollection;
import org.apache.shindig.protocol.conversion.xstream.ClassFieldMapping;
@@ -339,9 +343,9 @@ public class XStream081Configuration imp
getOmitMap(c),
elementClassMap.get(c));
- AttributeMapper amapper = new AttributeMapper(fmapper);
+ AttributeMapper amapper = new AttributeMapper(fmapper, new
DefaultConverterLookup(), rp);
- XStream xstream = new XStream(rp, amapper, driver);
+ XStream xstream = new XStream(rp, driver, getClass().getClassLoader(),
amapper);
xstream.registerConverter(new MapConverter(fmapper));
xstream.registerConverter(new RestfullCollectionConverter(fmapper));
Modified: shindig/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/shindig/trunk/pom.xml?rev=1227692&r1=1227691&r2=1227692&view=diff
==============================================================================
--- shindig/trunk/pom.xml (original)
+++ shindig/trunk/pom.xml Thu Jan 5 16:50:24 2012
@@ -1682,7 +1682,7 @@
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
- <version>1.3.1</version>
+ <version>1.4.2</version>
</dependency>
<dependency>
<groupId>xpp3</groupId>
