Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix for AMQ-3468. Updated to XStream v1.4.1 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1160923 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Timothy A. Bish 2011-08-23 23:10:41 +00:00
parent 3efd4b0515
commit 8acbf4ceb5
3 changed files with 2 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activemq-core/src/main/java/org/apache/activemq/transport/stomp/JmsFrameTranslator.java
View File

@ -32,12 +32,12 @@ import org.apache.activemq.command.ActiveMQMapMessage;
import org.apache.activemq.command.ActiveMQMessage;
import org.apache.activemq.command.ActiveMQObjectMessage;
import org.apache.activemq.command.DataStructure;
import org.apache.activemq.util.JettisonMappedXmlDriver;
import org.codehaus.jettison.mapped.Configuration;
import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.io.HierarchicalStreamReader;
import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
import com.thoughtworks.xstream.io.json.JettisonMappedXmlDriver;
import com.thoughtworks.xstream.io.xml.PrettyPrintWriter;
import com.thoughtworks.xstream.io.xml.XppReader;

119
activemq-core/src/main/java/org/apache/activemq/util/JettisonMappedXmlDriver.java
View File

@ -1,119 +0,0 @@
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/*
* Copyright (c) 2007, 2008 XStream Committers.
* All rights reserved.
*
* The software in this package is published under the terms of the BSD
* style license a copy of which has been included with this distribution in
* the LICENSE.txt file.
*
* Created on 30. March 2007 by Joerg Schaible
*/
package org.apache.activemq.util;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.Reader;
import java.io.Writer;
import javax.xml.stream.XMLStreamException;
import org.codehaus.jettison.mapped.Configuration;
import org.codehaus.jettison.mapped.MappedNamespaceConvention;
import org.codehaus.jettison.mapped.MappedXMLInputFactory;
import org.codehaus.jettison.mapped.MappedXMLOutputFactory;
import com.thoughtworks.xstream.io.HierarchicalStreamDriver;
import com.thoughtworks.xstream.io.HierarchicalStreamReader;
import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
import com.thoughtworks.xstream.io.StreamException;
import com.thoughtworks.xstream.io.json.JettisonStaxWriter;
import com.thoughtworks.xstream.io.xml.QNameMap;
import com.thoughtworks.xstream.io.xml.StaxReader;
import com.thoughtworks.xstream.io.xml.StaxWriter;
/**
*
* Temporary used until XStream 1.3.2 is released
*
* Simple XStream driver wrapping Jettison's Mapped reader and writer. Serializes object from
* and to JSON.
*
* @author Dejan Bosanac
*/
public class JettisonMappedXmlDriver implements HierarchicalStreamDriver {
private final MappedXMLOutputFactory mof;
private final MappedXMLInputFactory mif;
private final MappedNamespaceConvention convention;
private boolean useSerializeAsArray = true;
public JettisonMappedXmlDriver() {
this(new Configuration(), true);
}
public JettisonMappedXmlDriver(final Configuration config, final boolean useSerializeAsArray) {
mof = new MappedXMLOutputFactory(config);
mif = new MappedXMLInputFactory(config);
convention = new MappedNamespaceConvention(config);
this.useSerializeAsArray = useSerializeAsArray;
}
public HierarchicalStreamReader createReader(final Reader reader) {
try {
return new StaxReader(new QNameMap(), mif.createXMLStreamReader(reader));
} catch (final XMLStreamException e) {
throw new StreamException(e);
}
}
public HierarchicalStreamReader createReader(final InputStream input) {
try {
return new StaxReader(new QNameMap(), mif.createXMLStreamReader(input));
} catch (final XMLStreamException e) {
throw new StreamException(e);
}
}
public HierarchicalStreamWriter createWriter(final Writer writer) {
try {
if (useSerializeAsArray) {
return new JettisonStaxWriter(new QNameMap(), mof.createXMLStreamWriter(writer), convention);
} else {
return new StaxWriter(new QNameMap(), mof.createXMLStreamWriter(writer));
}
} catch (final XMLStreamException e) {
throw new StreamException(e);
}
}
public HierarchicalStreamWriter createWriter(final OutputStream output) {
try {
if (useSerializeAsArray) {
return new JettisonStaxWriter(new QNameMap(), mof.createXMLStreamWriter(output), convention);
} else {
return new StaxWriter(new QNameMap(), mof.createXMLStreamWriter(output));
}
} catch (final XMLStreamException e) {
throw new StreamException(e);
}
}
}

2
pom.xml
View File

@ -81,7 +81,7 @@
<xalan-version>2.6.0</xalan-version>
<xmlbeans-version>2.0.0-beta1</xmlbeans-version>
<xpp3-version>1.1.4c</xpp3-version>
<xstream-version>1.3.1</xstream-version>
<xstream-version>1.4.1</xstream-version>
<xbean-version>3.7</xbean-version>
<velocity-version>1.6.2</velocity-version>
<maven-bundle-plugin-version>2.1.0</maven-bundle-plugin-version>