Index: lams_build/lib/xstream/xstream.module.xml
===================================================================
diff -u -rc6b29814cfe36cd678a7cdd1d7ed0aab7d0fbec8 -ra4a61e7b65ede7f903eb08521a9455685ef9283d
--- lams_build/lib/xstream/xstream.module.xml (.../xstream.module.xml) (revision c6b29814cfe36cd678a7cdd1d7ed0aab7d0fbec8)
+++ lams_build/lib/xstream/xstream.module.xml (.../xstream.module.xml) (revision a4a61e7b65ede7f903eb08521a9455685ef9283d)
@@ -27,6 +27,11 @@
+
+
+
+
+
\ No newline at end of file
Index: lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java
===================================================================
diff -u -r1d2ff22c947ab0d5646bb02b8189ca668020bdbc -ra4a61e7b65ede7f903eb08521a9455685ef9283d
--- lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java (.../PedagogicalPlannerAction.java) (revision 1d2ff22c947ab0d5646bb02b8189ca668020bdbc)
+++ lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java (.../PedagogicalPlannerAction.java) (revision a4a61e7b65ede7f903eb08521a9455685ef9283d)
@@ -123,6 +123,7 @@
import org.springframework.web.context.support.WebApplicationContextUtils;
import com.thoughtworks.xstream.XStream;
+import com.thoughtworks.xstream.converters.reflection.SunUnsafeReflectionProvider;
/**
* Action managing Pedagogical Planner base page and non-tool activities.
@@ -1201,7 +1202,7 @@
PedagogicalPlannerSequenceNode node = getPedagogicalPlannerDAO().getByUid(nodeUid);
// exporting XML
- XStream designXml = new XStream();
+ XStream designXml = new XStream(new SunUnsafeReflectionProvider());
// do not serialize node's owner
designXml.omitField(PedagogicalPlannerSequenceNode.class, "user");
designXml.toXML(node, nodeFile);
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
===================================================================
diff -u -rc6b29814cfe36cd678a7cdd1d7ed0aab7d0fbec8 -ra4a61e7b65ede7f903eb08521a9455685ef9283d
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java (.../ExportToolContentService.java) (revision c6b29814cfe36cd678a7cdd1d7ed0aab7d0fbec8)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java (.../ExportToolContentService.java) (revision a4a61e7b65ede7f903eb08521a9455685ef9283d)
@@ -155,6 +155,7 @@
import com.thoughtworks.xstream.converters.MarshallingContext;
import com.thoughtworks.xstream.converters.UnmarshallingContext;
import com.thoughtworks.xstream.converters.reflection.ReflectionConverter;
+import com.thoughtworks.xstream.converters.reflection.SunUnsafeReflectionProvider;
import com.thoughtworks.xstream.io.HierarchicalStreamReader;
import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
@@ -641,7 +642,7 @@
}
// exporting XML
- XStream designXml = new XStream();
+ XStream designXml = new XStream(new SunUnsafeReflectionProvider());
designXml.toXML(ldDto, ldFile);
ldFile.close();
@@ -1186,7 +1187,7 @@
Writer toolFile = new OutputStreamWriter(new FileOutputStream(toolFileName), "UTF-8");
// serialize tool xml into local file.
- XStream toolXml = new XStream();
+ XStream toolXml = new XStream(new SunUnsafeReflectionProvider());
FileConverter fileConverter = null;
if (!fileHandleClassList.isEmpty()) {
fileConverter = new FileConverter(toolXml);
@@ -1565,7 +1566,7 @@
String toVersion) throws ImportToolContentException {
Object toolPOJO = null;
// change xml to Tool POJO
- XStream toolXml = new XStream();
+ XStream toolXml = new XStream(new SunUnsafeReflectionProvider());
FileConverter fileConverter = null;
if (!fileHandleClassList.isEmpty()) {
fileConverter = new FileConverter(toolXml);
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ToolContentVersionFilter.java
===================================================================
diff -u -rac48fd0f080c920174cce3d8b957ea1c63d965f4 -ra4a61e7b65ede7f903eb08521a9455685ef9283d
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ToolContentVersionFilter.java (.../ToolContentVersionFilter.java) (revision ac48fd0f080c920174cce3d8b957ea1c63d965f4)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ToolContentVersionFilter.java (.../ToolContentVersionFilter.java) (revision a4a61e7b65ede7f903eb08521a9455685ef9283d)
@@ -19,6 +19,7 @@
import org.jdom.output.XMLOutputter;
import com.thoughtworks.xstream.XStream;
+import com.thoughtworks.xstream.converters.reflection.SunUnsafeReflectionProvider;
/**
* Super class for all Import content Version Filter. The child class method must follow name conversion.
@@ -156,7 +157,7 @@
for (AddedField added : addedFieldList) {
if (StringUtils.equals(root.getName(), added.ownerClass.getName())) {
Writer eleWriter = new StringWriter();
- XStream eleX = new XStream();
+ XStream eleX = new XStream(new SunUnsafeReflectionProvider());
eleX.toXML(added.defaultValue, eleWriter);
SAXBuilder eleBuilder = new SAXBuilder();
Index: lams_common/src/java/org/lamsfoundation/lams/util/FileUtil.java
===================================================================
diff -u -rc6b29814cfe36cd678a7cdd1d7ed0aab7d0fbec8 -ra4a61e7b65ede7f903eb08521a9455685ef9283d
--- lams_common/src/java/org/lamsfoundation/lams/util/FileUtil.java (.../FileUtil.java) (revision c6b29814cfe36cd678a7cdd1d7ed0aab7d0fbec8)
+++ lams_common/src/java/org/lamsfoundation/lams/util/FileUtil.java (.../FileUtil.java) (revision a4a61e7b65ede7f903eb08521a9455685ef9283d)
@@ -50,6 +50,7 @@
import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.converters.ConversionException;
+import com.thoughtworks.xstream.converters.reflection.SunUnsafeReflectionProvider;
import com.thoughtworks.xstream.security.AnyTypePermission;
/**
@@ -740,7 +741,7 @@
public static Object getObjectFromXML(XStream xStream, String fullFilePath) throws JDOMException, IOException {
Reader file = null;
- XStream conversionXml = xStream != null ? xStream : new XStream();
+ XStream conversionXml = xStream != null ? xStream : new XStream(new SunUnsafeReflectionProvider());
// allow parsing all classes
conversionXml.addPermission(AnyTypePermission.ANY);
ConversionException finalException = null;
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java
===================================================================
diff -u -r1668e000b0959071785e5cdd21732af39bd1505f -ra4a61e7b65ede7f903eb08521a9455685ef9283d
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java (.../AuthoringAction.java) (revision 1668e000b0959071785e5cdd21732af39bd1505f)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java (.../AuthoringAction.java) (revision a4a61e7b65ede7f903eb08521a9455685ef9283d)
@@ -90,6 +90,7 @@
import org.springframework.web.context.support.WebApplicationContextUtils;
import com.thoughtworks.xstream.XStream;
+import com.thoughtworks.xstream.converters.reflection.SunUnsafeReflectionProvider;
/**
* @author Andrey Balan
@@ -1259,7 +1260,7 @@
questionsToExport.add(clonedQuestion);
}
// exporting XML
- XStream designXml = new XStream();
+ XStream designXml = new XStream(new SunUnsafeReflectionProvider());
String resultedXml = designXml.toXML(questionsToExport);
response.setContentType("application/x-download");
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAdminAction.java
===================================================================
diff -u -r629b2631320321b57015e15be850e7c6b747225f -ra4a61e7b65ede7f903eb08521a9455685ef9283d
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAdminAction.java (.../QaAdminAction.java) (revision 629b2631320321b57015e15be850e7c6b747225f)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAdminAction.java (.../QaAdminAction.java) (revision a4a61e7b65ede7f903eb08521a9455685ef9283d)
@@ -57,6 +57,7 @@
import org.xml.sax.SAXException;
import com.thoughtworks.xstream.XStream;
+import com.thoughtworks.xstream.converters.reflection.SunUnsafeReflectionProvider;
/**
* Handles the admin page for question and answer which includes the settings
@@ -301,7 +302,7 @@
}
// exporting XML
- XStream designXml = new XStream();
+ XStream designXml = new XStream(new SunUnsafeReflectionProvider());
String exportXml = designXml.toXML(exportCategories);
response.setContentType("application/x-download");
@@ -368,7 +369,7 @@
// Now perform the import
try {
String xml = new String(adminForm.getImportFile().getFileData());
- XStream conversionXml = new XStream();
+ XStream conversionXml = new XStream(new SunUnsafeReflectionProvider());
SortedSet exportCategories = (SortedSet) conversionXml.fromXML(xml);
qaService.deleteAllWizardCategories();
Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java
===================================================================
diff -u -rc6b29814cfe36cd678a7cdd1d7ed0aab7d0fbec8 -ra4a61e7b65ede7f903eb08521a9455685ef9283d
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java (.../MindmapService.java) (revision c6b29814cfe36cd678a7cdd1d7ed0aab7d0fbec8)
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java (.../MindmapService.java) (revision a4a61e7b65ede7f903eb08521a9455685ef9283d)
@@ -71,6 +71,7 @@
import org.lamsfoundation.lams.util.audit.IAuditService;
import com.thoughtworks.xstream.XStream;
+import com.thoughtworks.xstream.converters.reflection.SunUnsafeReflectionProvider;
import com.thoughtworks.xstream.security.AnyTypePermission;
/**
@@ -486,7 +487,7 @@
NodeModel currentNodeModel = getMindmapXMLFromDatabase(rootMindmapNode.getNodeId(), mindmap.getUid(),
rootNodeModel, null);
- XStream xstream = new XStream();
+ XStream xstream = new XStream(new SunUnsafeReflectionProvider());
xstream.alias("branch", NodeModel.class);
mindmapContent = xstream.toXML(currentNodeModel);
}
@@ -528,7 +529,7 @@
if (mindmapContent != null) {
MindmapUser mindmapUser = null;
- XStream xstream = new XStream();
+ XStream xstream = new XStream(new SunUnsafeReflectionProvider());
// allow parsing all classes
xstream.addPermission(AnyTypePermission.ANY);
xstream.alias("branch", NodeModel.class);
Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/AuthoringAction.java
===================================================================
diff -u -rbe07c35c372d904a65581d98660e73f3b13b69db -ra4a61e7b65ede7f903eb08521a9455685ef9283d
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/AuthoringAction.java (.../AuthoringAction.java) (revision be07c35c372d904a65581d98660e73f3b13b69db)
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/AuthoringAction.java (.../AuthoringAction.java) (revision a4a61e7b65ede7f903eb08521a9455685ef9283d)
@@ -55,6 +55,7 @@
import org.lamsfoundation.lams.web.util.SessionMap;
import com.thoughtworks.xstream.XStream;
+import com.thoughtworks.xstream.converters.reflection.SunUnsafeReflectionProvider;
/**
* @author Ruslan Kazakov
@@ -177,7 +178,7 @@
NodeModel currentNodeModel = mindmapService.getMindmapXMLFromDatabase(rootMindmapNode.getNodeId(),
mindmapId, rootNodeModel, null);
- XStream xstream = new XStream();
+ XStream xstream = new XStream(new SunUnsafeReflectionProvider());
xstream.alias("branch", NodeModel.class);
String mindmapContent = xstream.toXML(currentNodeModel);
@@ -260,7 +261,7 @@
MindmapUser mindmapUser = mindmapService.getUserByUID(mindmap.getCreateBy());
// Saving Mindmap data to XML
- XStream xstream = new XStream();
+ XStream xstream = new XStream(new SunUnsafeReflectionProvider());
xstream.alias("branch", NodeModel.class);
NodeModel rootNodeModel = (NodeModel) xstream.fromXML(mindmapContent);
NodeConceptModel nodeConceptModel = rootNodeModel.getConcept();
Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java
===================================================================
diff -u -r883c4cc054a636dc8017da1b244b89bdaf0ff974 -ra4a61e7b65ede7f903eb08521a9455685ef9283d
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java (.../LearningAction.java) (revision 883c4cc054a636dc8017da1b244b89bdaf0ff974)
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java (.../LearningAction.java) (revision a4a61e7b65ede7f903eb08521a9455685ef9283d)
@@ -71,6 +71,7 @@
import org.lamsfoundation.lams.web.util.AttributeNames;
import com.thoughtworks.xstream.XStream;
+import com.thoughtworks.xstream.converters.reflection.SunUnsafeReflectionProvider;
/**
* @author Ruslan Kazakov
@@ -309,7 +310,7 @@
MindmapSession mindmapSession = mindmapService.getSessionBySessionId(toolSessionId);
- XStream xstream = new XStream();
+ XStream xstream = new XStream(new SunUnsafeReflectionProvider());
xstream.alias("action", NotifyRequestModel.class);
NotifyRequestModel notifyRequestModel = (NotifyRequestModel) xstream.fromXML(requestAction);
int requestType = notifyRequestModel.getType();
@@ -465,7 +466,7 @@
if (data != null)
nodeResponseModel.setData(data);
- XStream xstream = new XStream();
+ XStream xstream = new XStream(new SunUnsafeReflectionProvider());
xstream.alias("response", NotifyResponseModel.class);
return xstream.toXML(nodeResponseModel);
@@ -558,7 +559,7 @@
pollResponseModel.addNotifyRequest(notifyRequestModel);
}
- XStream xstream = new XStream();
+ XStream xstream = new XStream(new SunUnsafeReflectionProvider());
xstream.alias("action", NotifyRequestModel.class);
xstream.alias("pollResponse", PollResponseModel.class);
String pollResponse = xstream.toXML(pollResponseModel);
@@ -621,7 +622,7 @@
NodeModel currentNodeModel = mindmapService.getMindmapXMLFromDatabase(rootMindmapNode.getNodeId(),
mindmapId, rootNodeModel, mindmapUser);
- XStream xstream = new XStream();
+ XStream xstream = new XStream(new SunUnsafeReflectionProvider());
xstream.alias("branch", NodeModel.class);
String mindmapContent = xstream.toXML(currentNodeModel);
@@ -675,7 +676,7 @@
public void saveMindmapXML(Mindmap mindmap, MindmapUser mindmapUser, String mindmapContent,
MindmapSession mindmapSession) {
// Saving Mindmap data to XML
- XStream xstream = new XStream();
+ XStream xstream = new XStream(new SunUnsafeReflectionProvider());
xstream.alias("branch", NodeModel.class);
NodeModel rootNodeModel = (NodeModel) xstream.fromXML(mindmapContent);
NodeConceptModel nodeConceptModel = rootNodeModel.getConcept();
Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/MonitoringAction.java
===================================================================
diff -u -rbe07c35c372d904a65581d98660e73f3b13b69db -ra4a61e7b65ede7f903eb08521a9455685ef9283d
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision be07c35c372d904a65581d98660e73f3b13b69db)
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision a4a61e7b65ede7f903eb08521a9455685ef9283d)
@@ -59,6 +59,7 @@
import org.lamsfoundation.lams.web.util.AttributeNames;
import com.thoughtworks.xstream.XStream;
+import com.thoughtworks.xstream.converters.reflection.SunUnsafeReflectionProvider;
/**
* @author Ruslan Kazakov
@@ -153,7 +154,7 @@
.getText(), rootMindmapNode.getColor(), mindmapUserName));
NodeModel currentNodeModel = mindmapService.getMindmapXMLFromDatabase(rootMindmapNode.getNodeId(),
mindmapId, rootNodeModel, null);
- XStream xstream = new XStream();
+ XStream xstream = new XStream(new SunUnsafeReflectionProvider());
xstream.alias("branch", NodeModel.class);
String mindmapContent = xstream.toXML(currentNodeModel);
@@ -298,7 +299,7 @@
if (!mindmap.isMultiUserMode()) {
// Saving Mindmap data to XML
- XStream xstream = new XStream();
+ XStream xstream = new XStream(new SunUnsafeReflectionProvider());
xstream.alias("branch", NodeModel.class);
NodeModel rootNodeModel = (NodeModel) xstream.fromXML(mindmapContent);
NodeConceptModel nodeConceptModel = rootNodeModel.getConcept();
Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/servlets/ExportServlet.java
===================================================================
diff -u -rbe07c35c372d904a65581d98660e73f3b13b69db -ra4a61e7b65ede7f903eb08521a9455685ef9283d
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/servlets/ExportServlet.java (.../ExportServlet.java) (revision be07c35c372d904a65581d98660e73f3b13b69db)
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/servlets/ExportServlet.java (.../ExportServlet.java) (revision a4a61e7b65ede7f903eb08521a9455685ef9283d)
@@ -60,6 +60,7 @@
import org.lamsfoundation.lams.web.util.AttributeNames;
import com.thoughtworks.xstream.XStream;
+import com.thoughtworks.xstream.converters.reflection.SunUnsafeReflectionProvider;
public class ExportServlet extends AbstractExportPortfolioServlet {
@@ -175,7 +176,7 @@
NodeModel currentNodeModel = mindmapService.getMindmapXMLFromDatabase(rootMindmapNode.getNodeId(),
mindmap.getUid(), rootNodeModel, mindmapUser);
- XStream xstream = new XStream();
+ XStream xstream = new XStream(new SunUnsafeReflectionProvider());
xstream.alias("branch", NodeModel.class);
String mindmapContent = xstream.toXML(currentNodeModel);