diff --git a/pom.xml b/pom.xml index 40b7bbcd4..ce0374fe1 100644 --- a/pom.xml +++ b/pom.xml @@ -166,8 +166,8 @@ net.openhft.chronicle.hash.serialization.internal - net.openhft.xstreem - net.openhft.xstreem.converters + net.openhft.xstream + net.openhft.xstream.converters diff --git a/src/main/java/net/openhft/chronicle/map/ChroncileMapJsonSerializer.java b/src/main/java/net/openhft/chronicle/map/ChroncileMapJsonSerializer.java index 89830e1b8..148ed8d00 100644 --- a/src/main/java/net/openhft/chronicle/map/ChroncileMapJsonSerializer.java +++ b/src/main/java/net/openhft/chronicle/map/ChroncileMapJsonSerializer.java @@ -20,10 +20,10 @@ package net.openhft.chronicle.map; import com.thoughtworks.xstream.XStream; import com.thoughtworks.xstream.converters.Converter; import com.thoughtworks.xstream.io.json.JettisonMappedXmlDriver; -import net.openhft.xstreem.converters.ByteBufferConverter; -import net.openhft.xstreem.converters.DataValueConverter; -import net.openhft.xstreem.converters.StatelessChronicleMapConverter; -import net.openhft.xstreem.converters.VanillaChronicleMapConverter; +import net.openhft.xstream.converters.ByteBufferConverter; +import net.openhft.xstream.converters.DataValueConverter; +import net.openhft.xstream.converters.StatelessChronicleMapConverter; +import net.openhft.xstream.converters.VanillaChronicleMapConverter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java b/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java index 00f9ea9cf..75d82388a 100755 --- a/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java +++ b/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java @@ -1390,7 +1390,7 @@ public final class ChronicleMapBuilder implements Cloneable, Class xStreamClass; try { xStreamClass = - Class.forName("net.openhft.xstreem.MapHeaderSerializationXStream"); + Class.forName("net.openhft.xstream.MapHeaderSerializationXStream"); } catch (ClassNotFoundException e) { xStreamClass = null; } @@ -1412,7 +1412,7 @@ public final class ChronicleMapBuilder implements Cloneable, private static Object deserializeHeaderViaXStream(ObjectInputStream ois) { try { Class xStreamClass = - Class.forName("net.openhft.xstreem.MapHeaderSerializationXStream"); + Class.forName("net.openhft.xstream.MapHeaderSerializationXStream"); Method fromXML = xStreamClass.getMethod("fromXML", InputStream.class); return fromXML.invoke(xStreamClass.newInstance(), ois); } catch (ClassNotFoundException | NoSuchMethodException | InvocationTargetException | diff --git a/src/main/java/net/openhft/xstreem/MapHeaderSerializationXStream.java b/src/main/java/net/openhft/xstream/MapHeaderSerializationXStream.java similarity index 97% rename from src/main/java/net/openhft/xstreem/MapHeaderSerializationXStream.java rename to src/main/java/net/openhft/xstream/MapHeaderSerializationXStream.java index e874747c2..097cf18a7 100644 --- a/src/main/java/net/openhft/xstreem/MapHeaderSerializationXStream.java +++ b/src/main/java/net/openhft/xstream/MapHeaderSerializationXStream.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package net.openhft.xstreem; +package net.openhft.xstream; import com.thoughtworks.xstream.XStream; import com.thoughtworks.xstream.converters.reflection.SunLimitedUnsafeReflectionProvider; diff --git a/src/main/java/net/openhft/xstreem/converters/AbstractChronicleMapConverter.java b/src/main/java/net/openhft/xstream/converters/AbstractChronicleMapConverter.java similarity index 99% rename from src/main/java/net/openhft/xstreem/converters/AbstractChronicleMapConverter.java rename to src/main/java/net/openhft/xstream/converters/AbstractChronicleMapConverter.java index e84844863..a3641dd35 100644 --- a/src/main/java/net/openhft/xstreem/converters/AbstractChronicleMapConverter.java +++ b/src/main/java/net/openhft/xstream/converters/AbstractChronicleMapConverter.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package net.openhft.xstreem.converters; +package net.openhft.xstream.converters; import com.thoughtworks.xstream.converters.ConversionException; import com.thoughtworks.xstream.converters.Converter; diff --git a/src/main/java/net/openhft/xstreem/converters/ByteBufferConverter.java b/src/main/java/net/openhft/xstream/converters/ByteBufferConverter.java similarity index 99% rename from src/main/java/net/openhft/xstreem/converters/ByteBufferConverter.java rename to src/main/java/net/openhft/xstream/converters/ByteBufferConverter.java index e300e57f0..4f9743eb1 100644 --- a/src/main/java/net/openhft/xstreem/converters/ByteBufferConverter.java +++ b/src/main/java/net/openhft/xstream/converters/ByteBufferConverter.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package net.openhft.xstreem.converters; +package net.openhft.xstream.converters; import com.thoughtworks.xstream.converters.ConversionException; import com.thoughtworks.xstream.converters.Converter; diff --git a/src/main/java/net/openhft/xstreem/converters/DataValueConverter.java b/src/main/java/net/openhft/xstream/converters/DataValueConverter.java similarity index 99% rename from src/main/java/net/openhft/xstreem/converters/DataValueConverter.java rename to src/main/java/net/openhft/xstream/converters/DataValueConverter.java index e2fa27cd2..380e0b4a3 100644 --- a/src/main/java/net/openhft/xstreem/converters/DataValueConverter.java +++ b/src/main/java/net/openhft/xstream/converters/DataValueConverter.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package net.openhft.xstreem.converters; +package net.openhft.xstream.converters; import com.thoughtworks.xstream.converters.ConversionException; import com.thoughtworks.xstream.converters.Converter; diff --git a/src/main/java/net/openhft/xstreem/converters/StatelessChronicleMapConverter.java b/src/main/java/net/openhft/xstream/converters/StatelessChronicleMapConverter.java similarity index 98% rename from src/main/java/net/openhft/xstreem/converters/StatelessChronicleMapConverter.java rename to src/main/java/net/openhft/xstream/converters/StatelessChronicleMapConverter.java index de6c414b1..e7752d253 100644 --- a/src/main/java/net/openhft/xstreem/converters/StatelessChronicleMapConverter.java +++ b/src/main/java/net/openhft/xstream/converters/StatelessChronicleMapConverter.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package net.openhft.xstreem.converters; +package net.openhft.xstream.converters; import com.thoughtworks.xstream.converters.ConversionException; import com.thoughtworks.xstream.converters.MarshallingContext; diff --git a/src/main/java/net/openhft/xstreem/converters/VanillaChronicleMapConverter.java b/src/main/java/net/openhft/xstream/converters/VanillaChronicleMapConverter.java similarity index 97% rename from src/main/java/net/openhft/xstreem/converters/VanillaChronicleMapConverter.java rename to src/main/java/net/openhft/xstream/converters/VanillaChronicleMapConverter.java index 11842ab59..d49c20b6d 100644 --- a/src/main/java/net/openhft/xstreem/converters/VanillaChronicleMapConverter.java +++ b/src/main/java/net/openhft/xstream/converters/VanillaChronicleMapConverter.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package net.openhft.xstreem.converters; +package net.openhft.xstream.converters; import com.thoughtworks.xstream.converters.MarshallingContext; import com.thoughtworks.xstream.io.HierarchicalStreamWriter;