svn commit: r1557531 - in /ofbiz/branches/release13.07: ./ framework/base/lib/ framework/base/src/org/ofbiz/b
Locked
 
|
Author: adrianc
Date: Sun Jan 12 13:46:30 2014 New Revision: 1557531 URL: http://svn.apache.org/r1557531 Log: Merged revision(s) 1557427 from ofbiz/trunk: Added the ability to exclude certain classes from XML serialization/deserialization. ........ Merged revision(s) 1557440 from ofbiz/trunk: Updated XStream library to latest version. ........ Merged revision(s) 1557443 from ofbiz/trunk: Small fixup for my last commit. ........ Added: ofbiz/branches/release13.07/framework/base/lib/xpp3-1.1.4c.jar - copied unchanged from r1557440, ofbiz/trunk/framework/base/lib/xpp3-1.1.4c.jar ofbiz/branches/release13.07/framework/base/lib/xstream-1.4.6.jar - copied unchanged from r1557440, ofbiz/trunk/framework/base/lib/xstream-1.4.6.jar ofbiz/branches/release13.07/framework/base/src/org/ofbiz/base/util/test/UtilXmlTests.java - copied unchanged from r1557427, ofbiz/trunk/framework/base/src/org/ofbiz/base/util/test/UtilXmlTests.java Removed: ofbiz/branches/release13.07/framework/base/lib/xpp3_min-1.1.4c.jar ofbiz/branches/release13.07/framework/base/lib/xstream-1.3.1.jar Modified: ofbiz/branches/release13.07/ (props changed) ofbiz/branches/release13.07/.classpath ofbiz/branches/release13.07/LICENSE ofbiz/branches/release13.07/framework/base/src/org/ofbiz/base/util/UtilXml.java ofbiz/branches/release13.07/framework/base/testdef/basetests.xml Propchange: ofbiz/branches/release13.07/ ------------------------------------------------------------------------------ Merged /ofbiz/trunk:r1557427,1557440,1557443 Modified: ofbiz/branches/release13.07/.classpath URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/.classpath?rev=1557531&r1=1557530&r2=1557531&view=diff ============================================================================== --- ofbiz/branches/release13.07/.classpath (original) +++ ofbiz/branches/release13.07/.classpath Sun Jan 12 13:46:30 2014 @@ -61,8 +61,8 @@ <classpathentry kind="lib" path="framework/base/lib/xmlrpc-client-3.1.2.jar"/> <classpathentry kind="lib" path="framework/base/lib/xmlrpc-common-3.1.2.jar"/> <classpathentry kind="lib" path="framework/base/lib/xmlrpc-server-3.1.2.jar"/> - <classpathentry kind="lib" path="framework/base/lib/xstream-1.3.1.jar"/> - <classpathentry kind="lib" path="framework/base/lib/xpp3_min-1.1.4c.jar"/> + <classpathentry kind="lib" path="framework/base/lib/xstream-1.4.6.jar"/> + <classpathentry kind="lib" path="framework/base/lib/xpp3-1.1.4c.jar"/> <classpathentry kind="lib" path="framework/base/lib/commons/commons-beanutils-core-1.8.3.jar"/> <classpathentry kind="lib" path="framework/base/lib/commons/commons-cli-1.2.jar"/> <classpathentry kind="lib" path="framework/base/lib/commons/commons-codec-1.6.jar"/> Modified: ofbiz/branches/release13.07/LICENSE URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/LICENSE?rev=1557531&r1=1557530&r2=1557531&view=diff ============================================================================== --- ofbiz/branches/release13.07/LICENSE (original) +++ ofbiz/branches/release13.07/LICENSE Sun Jan 12 13:46:30 2014 @@ -449,8 +449,8 @@ framework/base/lib/httpunit-1.7.jar framework/base/lib/ical4j-1.0-rc2.jar lib/build/javacc/javacc.jar (5.0) framework/base/lib/javolution-5.4.3.jar -framework/base/lib/xpp3_min-1.1.4c.jar -framework/base/lib/xstream-1.3.1.jar +framework/base/lib/xpp3-1.1.4c.jar +framework/base/lib/xstream-1.4.6.jar framework/base/lib/owasp-esapi-full-java-1.4.jar framework/base/lib/scripting/antlr-2.7.6.jar framework/base/lib/scripting/asm-3.2.jar Modified: ofbiz/branches/release13.07/framework/base/src/org/ofbiz/base/util/UtilXml.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/framework/base/src/org/ofbiz/base/util/UtilXml.java?rev=1557531&r1=1557530&r2=1557531&view=diff ============================================================================== --- ofbiz/branches/release13.07/framework/base/src/org/ofbiz/base/util/UtilXml.java (original) +++ ofbiz/branches/release13.07/framework/base/src/org/ofbiz/base/util/UtilXml.java Sun Jan 12 13:46:30 2014 @@ -73,6 +73,11 @@ import org.xml.sax.SAXParseException; import org.xml.sax.helpers.DefaultHandler; import com.thoughtworks.xstream.XStream; +import com.thoughtworks.xstream.converters.Converter; +import com.thoughtworks.xstream.converters.MarshallingContext; +import com.thoughtworks.xstream.converters.UnmarshallingContext; +import com.thoughtworks.xstream.io.HierarchicalStreamReader; +import com.thoughtworks.xstream.io.HierarchicalStreamWriter; /** * Utilities methods to simplify dealing with JAXP & DOM XML parsing @@ -81,7 +86,13 @@ import com.thoughtworks.xstream.XStream; public class UtilXml { public static final String module = UtilXml.class.getName(); - protected static final XStream xstream = new XStream(); + private static final XStream xstream = createXStream(); + + private static XStream createXStream() { + XStream xstream = new XStream(); + xstream.registerConverter(new UnsupportedClassConverter()); + return xstream; + } // ----- DOM Level 3 Load and Save Methods -- // @@ -1116,4 +1127,26 @@ public class UtilXml { } } } + + private static class UnsupportedClassConverter implements Converter { + + @Override + public boolean canConvert(@SuppressWarnings("rawtypes") Class arg0) { + if (java.lang.ProcessBuilder.class.equals(arg0)) { + return true; + } + return false; + } + + @Override + public void marshal(Object arg0, HierarchicalStreamWriter arg1, MarshallingContext arg2) { + throw new UnsupportedOperationException(); + } + + @Override + public Object unmarshal(HierarchicalStreamReader arg0, UnmarshallingContext arg1) { + throw new UnsupportedOperationException(); + } + } + } Modified: ofbiz/branches/release13.07/framework/base/testdef/basetests.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/framework/base/testdef/basetests.xml?rev=1557531&r1=1557530&r2=1557531&view=diff ============================================================================== --- ofbiz/branches/release13.07/framework/base/testdef/basetests.xml (original) +++ ofbiz/branches/release13.07/framework/base/testdef/basetests.xml Sun Jan 12 13:46:30 2014 @@ -37,5 +37,6 @@ <!--junit-test-suite class-name="org.ofbiz.base.util.test.UtilIOTests"/--> <junit-test-suite class-name="org.ofbiz.base.test.BaseUnitTests"/> <junit-test-suite class-name="org.ofbiz.base.util.test.UtilPropertiesTests"/> + <junit-test-suite class-name="org.ofbiz.base.util.test.UtilXmlTests"/> </test-group> </test-suite> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |