Revision: 14841
http://gate.svn.sourceforge.net/gate/?rev=14841&view=rev
Author: ian_roberts
Date: 2011-12-22 12:04:20 +0000 (Thu, 22 Dec 2011)
Log Message:
-----------
Upgrading to latest XStream for Java 7 compatibility.
Modified Paths:
--------------
gate/trunk/build/deploy/maven/gate-core.pom.template
gate/trunk/src/gate/util/persistence/PersistenceManager.java
Added Paths:
-----------
gate/trunk/lib/xstream-1.4.2.jar
Removed Paths:
-------------
gate/trunk/lib/xstream-1.3.1.jar
Modified: gate/trunk/build/deploy/maven/gate-core.pom.template
===================================================================
--- gate/trunk/build/deploy/maven/gate-core.pom.template 2011-12-22
11:41:34 UTC (rev 14840)
+++ gate/trunk/build/deploy/maven/gate-core.pom.template 2011-12-22
12:04:20 UTC (rev 14841)
@@ -90,7 +90,7 @@
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
- <version>1.3.1</version>
+ <version>1.4.2</version>
<optional>true</optional>
</dependency>
<dependency>
Deleted: gate/trunk/lib/xstream-1.3.1.jar
===================================================================
(Binary files differ)
Added: gate/trunk/lib/xstream-1.4.2.jar
===================================================================
(Binary files differ)
Property changes on: gate/trunk/lib/xstream-1.4.2.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: gate/trunk/src/gate/util/persistence/PersistenceManager.java
===================================================================
--- gate/trunk/src/gate/util/persistence/PersistenceManager.java
2011-12-22 11:41:34 UTC (rev 14840)
+++ gate/trunk/src/gate/util/persistence/PersistenceManager.java
2011-12-22 12:04:20 UTC (rev 14841)
@@ -660,14 +660,14 @@
// used to serialize objects.
xstream = new XStream(
new Sun14ReflectionProvider(new FieldDictionary(new
XStream12FieldKeySorter())),
- new StaxDriver(new XStream11XmlFriendlyReplacer())) {
+ new StaxDriver(new XStream11NameCoder())) {
protected boolean useXStream11XmlFriendlyMapper() {
return true;
}
};
FileWriter fileWriter = new FileWriter(file);
writer = new PrettyPrintWriter(fileWriter,
- new XmlFriendlyReplacer("-", "_"));
+ new XmlFriendlyNameCoder("-", "_"));
}
else {
oos = new ObjectOutputStream(new FileOutputStream(file));
@@ -812,7 +812,7 @@
throw new PersistenceException("Error creating reader", xse);
}
- xstream = new XStream(new StaxDriver(new
XStream11XmlFriendlyReplacer())) {
+ xstream = new XStream(new StaxDriver(new XStream11NameCoder())) {
protected boolean useXStream11XmlFriendlyMapper() {
return true;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Write once. Port to many.
Get the SDK and tools to simplify cross-platform app development. Create
new or port existing apps to sell to consumers worldwide. Explore the
Intel AppUpSM program developer opportunity. appdeveloper.intel.com/join
http://p.sf.net/sfu/intel-appdev
_______________________________________________
GATE-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gate-cvs
