[infinispan-commits] Infinispan SVN: r480 - in trunk/core/src/main/java/org/infinispan/marshall: exts and 1 other directories.
infinispan-commits at lists.jboss.org
infinispan-commits at lists.jboss.org
Wed Jun 17 13:27:14 EDT 2009
Author: galder.zamarreno at jboss.com
Date: 2009-06-17 13:27:14 -0400 (Wed, 17 Jun 2009)
New Revision: 480
Added:
trunk/core/src/main/java/org/infinispan/marshall/Externalizer.java
trunk/core/src/main/java/org/infinispan/marshall/MarshallUtil.java
Removed:
trunk/core/src/main/java/org/infinispan/marshall/jboss/Externalizer.java
trunk/core/src/main/java/org/infinispan/marshall/jboss/MarshallUtil.java
Modified:
trunk/core/src/main/java/org/infinispan/marshall/exts/ArrayListExternalizer.java
trunk/core/src/main/java/org/infinispan/marshall/exts/BucketExternalizer.java
trunk/core/src/main/java/org/infinispan/marshall/exts/DeltaAwareExternalizer.java
trunk/core/src/main/java/org/infinispan/marshall/exts/ExceptionResponseExternalizer.java
trunk/core/src/main/java/org/infinispan/marshall/exts/ExtendedResponseExternalizer.java
trunk/core/src/main/java/org/infinispan/marshall/exts/GlobalTransactionExternalizer.java
trunk/core/src/main/java/org/infinispan/marshall/exts/ImmortalCacheEntryExternalizer.java
trunk/core/src/main/java/org/infinispan/marshall/exts/ImmortalCacheValueExternalizer.java
trunk/core/src/main/java/org/infinispan/marshall/exts/ImmutableMapExternalizer.java
trunk/core/src/main/java/org/infinispan/marshall/exts/JGroupsAddressExternalizer.java
trunk/core/src/main/java/org/infinispan/marshall/exts/LinkedListExternalizer.java
trunk/core/src/main/java/org/infinispan/marshall/exts/MapExternalizer.java
trunk/core/src/main/java/org/infinispan/marshall/exts/MarshalledValueExternalizer.java
trunk/core/src/main/java/org/infinispan/marshall/exts/MortalCacheEntryExternalizer.java
trunk/core/src/main/java/org/infinispan/marshall/exts/MortalCacheValueExternalizer.java
trunk/core/src/main/java/org/infinispan/marshall/exts/ReplicableCommandExternalizer.java
trunk/core/src/main/java/org/infinispan/marshall/exts/SetExternalizer.java
trunk/core/src/main/java/org/infinispan/marshall/exts/SingletonListExternalizer.java
trunk/core/src/main/java/org/infinispan/marshall/exts/SuccessfulResponseExternalizer.java
trunk/core/src/main/java/org/infinispan/marshall/exts/TransactionLogExternalizer.java
trunk/core/src/main/java/org/infinispan/marshall/exts/TransientCacheEntryExternalizer.java
trunk/core/src/main/java/org/infinispan/marshall/exts/TransientCacheValueExternalizer.java
trunk/core/src/main/java/org/infinispan/marshall/exts/TransientMortalCacheEntryExternalizer.java
trunk/core/src/main/java/org/infinispan/marshall/exts/TransientMortalCacheValueExternalizer.java
trunk/core/src/main/java/org/infinispan/marshall/jboss/ConstantObjectTable.java
Log:
Refactorted Externalizer interface to marshall package since now it's not linked to org.jboss.marshalling. Also moved MarshalUtil class containing helper methods.
Copied: trunk/core/src/main/java/org/infinispan/marshall/Externalizer.java (from rev 478, trunk/core/src/main/java/org/infinispan/marshall/jboss/Externalizer.java)
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/Externalizer.java (rev 0)
+++ trunk/core/src/main/java/org/infinispan/marshall/Externalizer.java 2009-06-17 17:27:14 UTC (rev 480)
@@ -0,0 +1,66 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.infinispan.marshall;
+
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+/**
+ * Extended interface that extends capabilities of writing predefined objects
+ * with the possibility of reading them. Any new externalizer implementations
+ * should implement this interface. Implementations are free to write class
+ * information to the wire as they wish. See {@link ReplicableCommandExternalizer}
+ * for an such example.
+ *
+ * To add a new non-user Externalizer, follow these steps:
+ *
+ * 1. Create an implementation of Externalizer.
+ *
+ * 2. Add Class to Externalizer mapping to ConstantObjectTable.EXTERNALIZERS
+ *
+ * @author Galder Zamarreño
+ * @since 4.0
+ */
+public interface Externalizer {
+
+ /**
+ * Write the predefined object reference to the stream.
+ *
+ * @param output the object output to write to
+ * @param object the object reference to write
+ * @throws IOException if an I/O error occurs
+ */
+ void writeObject(ObjectOutput output, Object object) throws IOException;
+
+ /**
+ * Read an instance from the stream. The instance will have been written by the
+ * {@link #writeObject(Object)} method.
+ *
+ * @param input the object input to read from
+ * @return the object instance
+ * @throws IOException if an I/O error occurs
+ * @throws ClassNotFoundException if a class could not be found
+ */
+ Object readObject(ObjectInput input) throws IOException, ClassNotFoundException;
+
+}
Copied: trunk/core/src/main/java/org/infinispan/marshall/MarshallUtil.java (from rev 478, trunk/core/src/main/java/org/infinispan/marshall/jboss/MarshallUtil.java)
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/MarshallUtil.java (rev 0)
+++ trunk/core/src/main/java/org/infinispan/marshall/MarshallUtil.java 2009-06-17 17:27:14 UTC (rev 480)
@@ -0,0 +1,68 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.infinispan.marshall;
+
+import net.jcip.annotations.Immutable;
+
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Set;
+
+import org.infinispan.io.UnsignedNumeric;
+
+/**
+ * MarshallUtil.
+ *
+ * @author Galder Zamarreño
+ * @since 4.0
+ */
+ at Immutable
+ at SuppressWarnings("unchecked")
+public class MarshallUtil {
+
+ public static void marshallCollection(Collection c, ObjectOutput out) throws IOException {
+ UnsignedNumeric.writeUnsignedInt(out, c.size());
+ for (Object o : c) {
+ out.writeObject(o);
+ }
+ }
+
+ public static void marshallMap(Map map, ObjectOutput out) throws IOException {
+ int mapSize = map.size();
+ UnsignedNumeric.writeUnsignedInt(out, mapSize);
+ if (mapSize == 0) return;
+
+ for (Map.Entry me : (Set<Map.Entry>) map.entrySet()) {
+ out.writeObject(me.getKey());
+ out.writeObject(me.getValue());
+ }
+ }
+
+ public static void unmarshallMap(Map map, ObjectInput in) throws IOException, ClassNotFoundException {
+ int size = UnsignedNumeric.readUnsignedInt(in);
+ for (int i = 0; i < size; i++) map.put(in.readObject(), in.readObject());
+ }
+
+}
Modified: trunk/core/src/main/java/org/infinispan/marshall/exts/ArrayListExternalizer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/exts/ArrayListExternalizer.java 2009-06-17 17:24:43 UTC (rev 479)
+++ trunk/core/src/main/java/org/infinispan/marshall/exts/ArrayListExternalizer.java 2009-06-17 17:27:14 UTC (rev 480)
@@ -24,8 +24,8 @@
import net.jcip.annotations.Immutable;
import org.infinispan.io.UnsignedNumeric;
-import org.infinispan.marshall.jboss.MarshallUtil;
-import org.infinispan.marshall.jboss.Externalizer;
+import org.infinispan.marshall.Externalizer;
+import org.infinispan.marshall.MarshallUtil;
import java.io.IOException;
import java.io.ObjectInput;
Modified: trunk/core/src/main/java/org/infinispan/marshall/exts/BucketExternalizer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/exts/BucketExternalizer.java 2009-06-17 17:24:43 UTC (rev 479)
+++ trunk/core/src/main/java/org/infinispan/marshall/exts/BucketExternalizer.java 2009-06-17 17:27:14 UTC (rev 480)
@@ -31,7 +31,7 @@
import org.infinispan.io.UnsignedNumeric;
import org.infinispan.loaders.bucket.Bucket;
-import org.infinispan.marshall.jboss.Externalizer;
+import org.infinispan.marshall.Externalizer;
/**
* BucketExternalizer.
Modified: trunk/core/src/main/java/org/infinispan/marshall/exts/DeltaAwareExternalizer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/exts/DeltaAwareExternalizer.java 2009-06-17 17:24:43 UTC (rev 479)
+++ trunk/core/src/main/java/org/infinispan/marshall/exts/DeltaAwareExternalizer.java 2009-06-17 17:27:14 UTC (rev 480)
@@ -23,7 +23,7 @@
import net.jcip.annotations.Immutable;
import org.infinispan.atomic.DeltaAware;
-import org.infinispan.marshall.jboss.Externalizer;
+import org.infinispan.marshall.Externalizer;
import java.io.IOException;
import java.io.ObjectInput;
Modified: trunk/core/src/main/java/org/infinispan/marshall/exts/ExceptionResponseExternalizer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/exts/ExceptionResponseExternalizer.java 2009-06-17 17:24:43 UTC (rev 479)
+++ trunk/core/src/main/java/org/infinispan/marshall/exts/ExceptionResponseExternalizer.java 2009-06-17 17:27:14 UTC (rev 480)
@@ -2,7 +2,7 @@
import net.jcip.annotations.Immutable;
-import org.infinispan.marshall.jboss.Externalizer;
+import org.infinispan.marshall.Externalizer;
import org.infinispan.remoting.responses.ExceptionResponse;
import java.io.IOException;
Modified: trunk/core/src/main/java/org/infinispan/marshall/exts/ExtendedResponseExternalizer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/exts/ExtendedResponseExternalizer.java 2009-06-17 17:24:43 UTC (rev 479)
+++ trunk/core/src/main/java/org/infinispan/marshall/exts/ExtendedResponseExternalizer.java 2009-06-17 17:27:14 UTC (rev 480)
@@ -23,7 +23,7 @@
import net.jcip.annotations.Immutable;
-import org.infinispan.marshall.jboss.Externalizer;
+import org.infinispan.marshall.Externalizer;
import org.infinispan.remoting.responses.ExtendedResponse;
import org.infinispan.remoting.responses.Response;
Modified: trunk/core/src/main/java/org/infinispan/marshall/exts/GlobalTransactionExternalizer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/exts/GlobalTransactionExternalizer.java 2009-06-17 17:24:43 UTC (rev 479)
+++ trunk/core/src/main/java/org/infinispan/marshall/exts/GlobalTransactionExternalizer.java 2009-06-17 17:27:14 UTC (rev 480)
@@ -23,7 +23,7 @@
import net.jcip.annotations.Immutable;
-import org.infinispan.marshall.jboss.Externalizer;
+import org.infinispan.marshall.Externalizer;
import org.infinispan.remoting.transport.Address;
import org.infinispan.transaction.xa.GlobalTransaction;
Modified: trunk/core/src/main/java/org/infinispan/marshall/exts/ImmortalCacheEntryExternalizer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/exts/ImmortalCacheEntryExternalizer.java 2009-06-17 17:24:43 UTC (rev 479)
+++ trunk/core/src/main/java/org/infinispan/marshall/exts/ImmortalCacheEntryExternalizer.java 2009-06-17 17:27:14 UTC (rev 480)
@@ -29,7 +29,7 @@
import org.infinispan.container.entries.ImmortalCacheEntry;
import org.infinispan.container.entries.InternalEntryFactory;
-import org.infinispan.marshall.jboss.Externalizer;
+import org.infinispan.marshall.Externalizer;
/**
* ImmortalCacheEntryExternalizer.
Modified: trunk/core/src/main/java/org/infinispan/marshall/exts/ImmortalCacheValueExternalizer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/exts/ImmortalCacheValueExternalizer.java 2009-06-17 17:24:43 UTC (rev 479)
+++ trunk/core/src/main/java/org/infinispan/marshall/exts/ImmortalCacheValueExternalizer.java 2009-06-17 17:27:14 UTC (rev 480)
@@ -29,7 +29,7 @@
import org.infinispan.container.entries.ImmortalCacheValue;
import org.infinispan.container.entries.InternalEntryFactory;
-import org.infinispan.marshall.jboss.Externalizer;
+import org.infinispan.marshall.Externalizer;
/**
* ImmortalCacheValueExternalizer.
Modified: trunk/core/src/main/java/org/infinispan/marshall/exts/ImmutableMapExternalizer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/exts/ImmutableMapExternalizer.java 2009-06-17 17:24:43 UTC (rev 479)
+++ trunk/core/src/main/java/org/infinispan/marshall/exts/ImmutableMapExternalizer.java 2009-06-17 17:27:14 UTC (rev 480)
@@ -22,8 +22,9 @@
package org.infinispan.marshall.exts;
import net.jcip.annotations.Immutable;
-import org.infinispan.marshall.jboss.MarshallUtil;
-import org.infinispan.marshall.jboss.Externalizer;
+
+import org.infinispan.marshall.Externalizer;
+import org.infinispan.marshall.MarshallUtil;
import org.infinispan.util.Immutables;
import java.io.IOException;
Modified: trunk/core/src/main/java/org/infinispan/marshall/exts/JGroupsAddressExternalizer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/exts/JGroupsAddressExternalizer.java 2009-06-17 17:24:43 UTC (rev 479)
+++ trunk/core/src/main/java/org/infinispan/marshall/exts/JGroupsAddressExternalizer.java 2009-06-17 17:27:14 UTC (rev 480)
@@ -23,7 +23,7 @@
import net.jcip .annotations.Immutable;
-import org.infinispan.marshall.jboss.Externalizer;
+import org.infinispan.marshall.Externalizer;
import org.infinispan.remoting.transport.jgroups.JGroupsAddress;
import java.io.IOException;
import java.io.ObjectInput;
Modified: trunk/core/src/main/java/org/infinispan/marshall/exts/LinkedListExternalizer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/exts/LinkedListExternalizer.java 2009-06-17 17:24:43 UTC (rev 479)
+++ trunk/core/src/main/java/org/infinispan/marshall/exts/LinkedListExternalizer.java 2009-06-17 17:27:14 UTC (rev 480)
@@ -24,8 +24,8 @@
import net.jcip.annotations.Immutable;
import org.infinispan.io.UnsignedNumeric;
-import org.infinispan.marshall.jboss.MarshallUtil;
-import org.infinispan.marshall.jboss.Externalizer;
+import org.infinispan.marshall.Externalizer;
+import org.infinispan.marshall.MarshallUtil;
import java.io.IOException;
import java.io.ObjectInput;
Modified: trunk/core/src/main/java/org/infinispan/marshall/exts/MapExternalizer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/exts/MapExternalizer.java 2009-06-17 17:24:43 UTC (rev 479)
+++ trunk/core/src/main/java/org/infinispan/marshall/exts/MapExternalizer.java 2009-06-17 17:27:14 UTC (rev 480)
@@ -21,8 +21,8 @@
*/
package org.infinispan.marshall.exts;
-import org.infinispan.marshall.jboss.MarshallUtil;
-import org.infinispan.marshall.jboss.Externalizer;
+import org.infinispan.marshall.Externalizer;
+import org.infinispan.marshall.MarshallUtil;
import org.infinispan.util.FastCopyHashMap;
import org.jboss.marshalling.util.IdentityIntMap;
Modified: trunk/core/src/main/java/org/infinispan/marshall/exts/MarshalledValueExternalizer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/exts/MarshalledValueExternalizer.java 2009-06-17 17:24:43 UTC (rev 479)
+++ trunk/core/src/main/java/org/infinispan/marshall/exts/MarshalledValueExternalizer.java 2009-06-17 17:27:14 UTC (rev 480)
@@ -22,8 +22,8 @@
package org.infinispan.marshall.exts;
import org.infinispan.io.UnsignedNumeric;
+import org.infinispan.marshall.Externalizer;
import org.infinispan.marshall.MarshalledValue;
-import org.infinispan.marshall.jboss.Externalizer;
import java.io.IOException;
import java.io.ObjectInput;
Modified: trunk/core/src/main/java/org/infinispan/marshall/exts/MortalCacheEntryExternalizer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/exts/MortalCacheEntryExternalizer.java 2009-06-17 17:24:43 UTC (rev 479)
+++ trunk/core/src/main/java/org/infinispan/marshall/exts/MortalCacheEntryExternalizer.java 2009-06-17 17:27:14 UTC (rev 480)
@@ -30,7 +30,7 @@
import org.infinispan.container.entries.InternalEntryFactory;
import org.infinispan.container.entries.MortalCacheEntry;
import org.infinispan.io.UnsignedNumeric;
-import org.infinispan.marshall.jboss.Externalizer;
+import org.infinispan.marshall.Externalizer;
/**
* MortalCacheEntryExternalizer.
Modified: trunk/core/src/main/java/org/infinispan/marshall/exts/MortalCacheValueExternalizer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/exts/MortalCacheValueExternalizer.java 2009-06-17 17:24:43 UTC (rev 479)
+++ trunk/core/src/main/java/org/infinispan/marshall/exts/MortalCacheValueExternalizer.java 2009-06-17 17:27:14 UTC (rev 480)
@@ -28,7 +28,7 @@
import org.infinispan.container.entries.InternalEntryFactory;
import org.infinispan.container.entries.MortalCacheValue;
import org.infinispan.io.UnsignedNumeric;
-import org.infinispan.marshall.jboss.Externalizer;
+import org.infinispan.marshall.Externalizer;
/**
* MortalCacheValueExternalizer.
Modified: trunk/core/src/main/java/org/infinispan/marshall/exts/ReplicableCommandExternalizer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/exts/ReplicableCommandExternalizer.java 2009-06-17 17:24:43 UTC (rev 479)
+++ trunk/core/src/main/java/org/infinispan/marshall/exts/ReplicableCommandExternalizer.java 2009-06-17 17:27:14 UTC (rev 480)
@@ -23,7 +23,7 @@
import org.infinispan.commands.RemoteCommandFactory;
import org.infinispan.commands.ReplicableCommand;
-import org.infinispan.marshall.jboss.Externalizer;
+import org.infinispan.marshall.Externalizer;
import java.io.IOException;
import java.io.ObjectInput;
Modified: trunk/core/src/main/java/org/infinispan/marshall/exts/SetExternalizer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/exts/SetExternalizer.java 2009-06-17 17:24:43 UTC (rev 479)
+++ trunk/core/src/main/java/org/infinispan/marshall/exts/SetExternalizer.java 2009-06-17 17:27:14 UTC (rev 480)
@@ -24,8 +24,8 @@
import net.jcip.annotations.Immutable;
import org.infinispan.io.UnsignedNumeric;
-import org.infinispan.marshall.jboss.MarshallUtil;
-import org.infinispan.marshall.jboss.Externalizer;
+import org.infinispan.marshall.Externalizer;
+import org.infinispan.marshall.MarshallUtil;
import org.jboss.marshalling.util.IdentityIntMap;
import java.io.IOException;
Modified: trunk/core/src/main/java/org/infinispan/marshall/exts/SingletonListExternalizer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/exts/SingletonListExternalizer.java 2009-06-17 17:24:43 UTC (rev 479)
+++ trunk/core/src/main/java/org/infinispan/marshall/exts/SingletonListExternalizer.java 2009-06-17 17:27:14 UTC (rev 480)
@@ -23,7 +23,7 @@
import net.jcip.annotations.Immutable;
-import org.infinispan.marshall.jboss.Externalizer;
+import org.infinispan.marshall.Externalizer;
import java.io.IOException;
import java.io.ObjectInput;
Modified: trunk/core/src/main/java/org/infinispan/marshall/exts/SuccessfulResponseExternalizer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/exts/SuccessfulResponseExternalizer.java 2009-06-17 17:24:43 UTC (rev 479)
+++ trunk/core/src/main/java/org/infinispan/marshall/exts/SuccessfulResponseExternalizer.java 2009-06-17 17:27:14 UTC (rev 480)
@@ -2,7 +2,7 @@
import net.jcip.annotations.Immutable;
-import org.infinispan.marshall.jboss.Externalizer;
+import org.infinispan.marshall.Externalizer;
import org.infinispan.remoting.responses.SuccessfulResponse;
import java.io.IOException;
Modified: trunk/core/src/main/java/org/infinispan/marshall/exts/TransactionLogExternalizer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/exts/TransactionLogExternalizer.java 2009-06-17 17:24:43 UTC (rev 479)
+++ trunk/core/src/main/java/org/infinispan/marshall/exts/TransactionLogExternalizer.java 2009-06-17 17:27:14 UTC (rev 480)
@@ -24,7 +24,7 @@
import net.jcip.annotations.Immutable;
import org.infinispan.commands.write.WriteCommand;
import org.infinispan.io.UnsignedNumeric;
-import org.infinispan.marshall.jboss.Externalizer;
+import org.infinispan.marshall.Externalizer;
import org.infinispan.transaction.xa.GlobalTransaction;
import org.infinispan.transaction.TransactionLog;
Modified: trunk/core/src/main/java/org/infinispan/marshall/exts/TransientCacheEntryExternalizer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/exts/TransientCacheEntryExternalizer.java 2009-06-17 17:24:43 UTC (rev 479)
+++ trunk/core/src/main/java/org/infinispan/marshall/exts/TransientCacheEntryExternalizer.java 2009-06-17 17:27:14 UTC (rev 480)
@@ -30,7 +30,7 @@
import org.infinispan.container.entries.InternalEntryFactory;
import org.infinispan.container.entries.TransientCacheEntry;
import org.infinispan.io.UnsignedNumeric;
-import org.infinispan.marshall.jboss.Externalizer;
+import org.infinispan.marshall.Externalizer;
/**
* TransientCacheEntryExternalizer.
Modified: trunk/core/src/main/java/org/infinispan/marshall/exts/TransientCacheValueExternalizer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/exts/TransientCacheValueExternalizer.java 2009-06-17 17:24:43 UTC (rev 479)
+++ trunk/core/src/main/java/org/infinispan/marshall/exts/TransientCacheValueExternalizer.java 2009-06-17 17:27:14 UTC (rev 480)
@@ -30,7 +30,7 @@
import org.infinispan.container.entries.InternalEntryFactory;
import org.infinispan.container.entries.TransientCacheValue;
import org.infinispan.io.UnsignedNumeric;
-import org.infinispan.marshall.jboss.Externalizer;
+import org.infinispan.marshall.Externalizer;
/**
* TransientCacheValueExternalizer.
Modified: trunk/core/src/main/java/org/infinispan/marshall/exts/TransientMortalCacheEntryExternalizer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/exts/TransientMortalCacheEntryExternalizer.java 2009-06-17 17:24:43 UTC (rev 479)
+++ trunk/core/src/main/java/org/infinispan/marshall/exts/TransientMortalCacheEntryExternalizer.java 2009-06-17 17:27:14 UTC (rev 480)
@@ -30,7 +30,7 @@
import org.infinispan.container.entries.InternalEntryFactory;
import org.infinispan.container.entries.TransientMortalCacheEntry;
import org.infinispan.io.UnsignedNumeric;
-import org.infinispan.marshall.jboss.Externalizer;
+import org.infinispan.marshall.Externalizer;
/**
* TransientMortalCacheEntryExternalizer.
Modified: trunk/core/src/main/java/org/infinispan/marshall/exts/TransientMortalCacheValueExternalizer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/exts/TransientMortalCacheValueExternalizer.java 2009-06-17 17:24:43 UTC (rev 479)
+++ trunk/core/src/main/java/org/infinispan/marshall/exts/TransientMortalCacheValueExternalizer.java 2009-06-17 17:27:14 UTC (rev 480)
@@ -30,7 +30,7 @@
import org.infinispan.container.entries.InternalEntryFactory;
import org.infinispan.container.entries.TransientMortalCacheValue;
import org.infinispan.io.UnsignedNumeric;
-import org.infinispan.marshall.jboss.Externalizer;
+import org.infinispan.marshall.Externalizer;
/**
* TransientMortalCacheValueExternalizer.
Modified: trunk/core/src/main/java/org/infinispan/marshall/jboss/ConstantObjectTable.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/jboss/ConstantObjectTable.java 2009-06-17 17:24:43 UTC (rev 479)
+++ trunk/core/src/main/java/org/infinispan/marshall/jboss/ConstantObjectTable.java 2009-06-17 17:27:14 UTC (rev 480)
@@ -51,6 +51,7 @@
import org.infinispan.factories.scopes.Scope;
import org.infinispan.factories.scopes.Scopes;
import org.infinispan.loaders.bucket.Bucket;
+import org.infinispan.marshall.Externalizer;
import org.infinispan.marshall.MarshalledValue;
import org.infinispan.marshall.exts.ArrayListExternalizer;
import org.infinispan.marshall.exts.BucketExternalizer;
Deleted: trunk/core/src/main/java/org/infinispan/marshall/jboss/Externalizer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/jboss/Externalizer.java 2009-06-17 17:24:43 UTC (rev 479)
+++ trunk/core/src/main/java/org/infinispan/marshall/jboss/Externalizer.java 2009-06-17 17:27:14 UTC (rev 480)
@@ -1,66 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2009, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.infinispan.marshall.jboss;
-
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-/**
- * Extended interface that extends capabilities of writing predefined objects
- * with the possibility of reading them. Any new externalizer implementations
- * should implement this interface. Implementations are free to write class
- * information to the wire as they wish. See {@link ReplicableCommandExternalizer}
- * for an such example.
- *
- * To add a new non-user Externalizer, follow these steps:
- *
- * 1. Create an implementation of Externalizer.
- *
- * 2. Add Class to Externalizer mapping to ConstantObjectTable.EXTERNALIZERS
- *
- * @author Galder Zamarreño
- * @since 4.0
- */
-public interface Externalizer {
-
- /**
- * Write the predefined object reference to the stream.
- *
- * @param output the object output to write to
- * @param object the object reference to write
- * @throws IOException if an I/O error occurs
- */
- void writeObject(ObjectOutput output, Object object) throws IOException;
-
- /**
- * Read an instance from the stream. The instance will have been written by the
- * {@link #writeObject(Object)} method.
- *
- * @param input the object input to read from
- * @return the object instance
- * @throws IOException if an I/O error occurs
- * @throws ClassNotFoundException if a class could not be found
- */
- Object readObject(ObjectInput input) throws IOException, ClassNotFoundException;
-
-}
Deleted: trunk/core/src/main/java/org/infinispan/marshall/jboss/MarshallUtil.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/jboss/MarshallUtil.java 2009-06-17 17:24:43 UTC (rev 479)
+++ trunk/core/src/main/java/org/infinispan/marshall/jboss/MarshallUtil.java 2009-06-17 17:27:14 UTC (rev 480)
@@ -1,68 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2009, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.infinispan.marshall.jboss;
-
-import net.jcip.annotations.Immutable;
-
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.util.Collection;
-import java.util.Map;
-import java.util.Set;
-
-import org.infinispan.io.UnsignedNumeric;
-
-/**
- * MarshallUtil.
- *
- * @author Galder Zamarreño
- * @since 4.0
- */
- at Immutable
- at SuppressWarnings("unchecked")
-public class MarshallUtil {
-
- public static void marshallCollection(Collection c, ObjectOutput out) throws IOException {
- UnsignedNumeric.writeUnsignedInt(out, c.size());
- for (Object o : c) {
- out.writeObject(o);
- }
- }
-
- public static void marshallMap(Map map, ObjectOutput out) throws IOException {
- int mapSize = map.size();
- UnsignedNumeric.writeUnsignedInt(out, mapSize);
- if (mapSize == 0) return;
-
- for (Map.Entry me : (Set<Map.Entry>) map.entrySet()) {
- out.writeObject(me.getKey());
- out.writeObject(me.getValue());
- }
- }
-
- public static void unmarshallMap(Map map, ObjectInput in) throws IOException, ClassNotFoundException {
- int size = UnsignedNumeric.readUnsignedInt(in);
- for (int i = 0; i < size; i++) map.put(in.readObject(), in.readObject());
- }
-
-}
More information about the infinispan-commits
mailing list