OO-291: make different xstream factory methods, upgrade xstream

pom.xml

@@ -1461,7 +1461,7 @@
 		<dependency>
 			<groupId>com.thoughtworks.xstream</groupId>
 			<artifactId>xstream</artifactId>
-			<version>1.4.1</version>
+			<version>1.4.3</version>
 		</dependency>
 		<dependency>
 			<groupId>cos</groupId>

src/main/java/org/olat/core/util/xml/EnhancedXStream.java

@@ -45,28 +45,30 @@ import com.thoughtworks.xstream.mapper.MapperWrapper;
  */
 public class EnhancedXStream extends XStream  {
 	
-	public EnhancedXStream() {
+	public EnhancedXStream(boolean export) {
 		super();
 		
-		addDefaultImplementation(PersistentList.class, List.class);
-		addDefaultImplementation(PersistentBag.class, List.class);
-		addDefaultImplementation(PersistentMap.class, Map.class);
-		addDefaultImplementation(PersistentSortedMap.class, Map.class);
-		addDefaultImplementation(PersistentSet.class, Set.class);
-		addDefaultImplementation(PersistentSortedSet.class, Set.class);
-		addDefaultImplementation(ArrayList.class, List.class);
-		
-		registerConverter(new CollectionConverter(getMapper()) {
-		    public boolean canConvert(@SuppressWarnings("rawtypes") Class type) {
-		        return PersistentList.class == type || PersistentBag.class == type;
-		    }
-		});
-		
-		registerConverter(new MapConverter(getMapper()) {
-		  public boolean canConvert(@SuppressWarnings("rawtypes") Class type) {
-		    return PersistentMap.class == type;
-		  }
-		});
+		if(export) {
+			addDefaultImplementation(PersistentList.class, List.class);
+			addDefaultImplementation(PersistentBag.class, List.class);
+			addDefaultImplementation(PersistentMap.class, Map.class);
+			addDefaultImplementation(PersistentSortedMap.class, Map.class);
+			addDefaultImplementation(PersistentSet.class, Set.class);
+			addDefaultImplementation(PersistentSortedSet.class, Set.class);
+			addDefaultImplementation(ArrayList.class, List.class);
+			
+			registerConverter(new CollectionConverter(getMapper()) {
+			    public boolean canConvert(@SuppressWarnings("rawtypes") Class type) {
+			        return PersistentList.class == type || PersistentBag.class == type;
+			    }
+			});
+			
+			registerConverter(new MapConverter(getMapper()) {
+			  public boolean canConvert(@SuppressWarnings("rawtypes") Class type) {
+			    return PersistentMap.class == type;
+			  }
+			});
+		}
 	}
 	
 	@Override

src/main/java/org/olat/core/util/xml/XStreamHelper.java

@@ -224,7 +224,18 @@ public class XStreamHelper {
 	 * writing to a configured XML mapping
 	 */
 	public static XStream createXStreamInstance() {
-		EnhancedXStream xstream = new EnhancedXStream();
+		EnhancedXStream xstream = new EnhancedXStream(false);
+		return xstream;
+	}
+	
+	/**
+	 * Factory to create a fresh XStream instance. Use this when
+	 * writing, it has more aliases to convert hibernate collections
+	 * to java collections.
+	 * @return
+	 */
+	public static XStream createXStreamInstanceForDBObjects() {
+		EnhancedXStream xstream = new EnhancedXStream(true);
 		return xstream;
 	}
 

src/main/java/org/olat/portfolio/manager/EPXStreamHandler.java

@@ -67,7 +67,7 @@ public class EPXStreamHandler {
 	
 	private static final OLog log = Tracing.createLoggerFor(EPXStreamHandler.class);
 
-	private static final XStream myStream = XStreamHelper.createXStreamInstance();
+	private static final XStream myStream = XStreamHelper.createXStreamInstanceForDBObjects();
 	private static Templates filterArtefactsTemplates;
 	
 	static { // initialize supported types