[infinispan-commits] Infinispan SVN: r520 - in trunk: cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc and 12 other directories.
infinispan-commits at lists.jboss.org
infinispan-commits at lists.jboss.org
Wed Jul 8 04:30:46 EDT 2009
Author: galder.zamarreno at jboss.com
Date: 2009-07-08 04:30:45 -0400 (Wed, 08 Jul 2009)
New Revision: 520
Modified:
trunk/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/BdbjeCacheStoreIntegrationVamTest.java
trunk/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/JdbcBinaryCacheStoreVamTest.java
trunk/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStoreVamTest.java
trunk/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStoreVamTest2.java
trunk/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/stringbased/JdbcStringBasedCacheStoreVamTest.java
trunk/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/stringbased/JdbcStringBasedCacheStoreVamTest2.java
trunk/cachestore/jdbm/src/test/java/org/infinispan/loaders/jdbm/JdbmCacheStoreVamTest.java
trunk/cachestore/s3/src/test/java/org/infinispan/loaders/s3/S3CacheStoreIntegrationVamTest.java
trunk/core/src/main/java/org/infinispan/factories/AbstractComponentRegistry.java
trunk/core/src/main/java/org/infinispan/factories/annotations/Inject.java
trunk/core/src/main/java/org/infinispan/factories/annotations/NonVolatile.java
trunk/core/src/main/java/org/infinispan/marshall/VersionAwareMarshaller.java
trunk/core/src/main/java/org/infinispan/marshall/jboss/ConstantObjectTable.java
trunk/core/src/main/java/org/infinispan/marshall/jboss/JBossMarshaller.java
trunk/core/src/test/java/org/infinispan/loaders/dummy/DummyInMemoryCacheStore.java
trunk/core/src/test/java/org/infinispan/loaders/file/FileCacheStoreVamTest.java
trunk/core/src/test/java/org/infinispan/marshall/MarshalledValueTest.java
trunk/core/src/test/java/org/infinispan/marshall/MarshallersTest.java
trunk/core/src/test/java/org/infinispan/marshall/jboss/JBossMarshallerTest.java
Log:
[ISPN-124] (VAM move @Inject code into @Start) Move JBossMarshaller initialisation to a @Start method rather than @Inject. Also removed the need for ObjectOutput and ObjectInput adapters since Marshaller/Unmarshaller are already this type. Finally, added some further documentation to @Inject and @NonVolatile annotations and rewiring process.
Modified: trunk/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/BdbjeCacheStoreIntegrationVamTest.java
===================================================================
--- trunk/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/BdbjeCacheStoreIntegrationVamTest.java 2009-07-06 09:30:27 UTC (rev 519)
+++ trunk/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/BdbjeCacheStoreIntegrationVamTest.java 2009-07-08 08:30:45 UTC (rev 520)
@@ -37,7 +37,8 @@
@Override
protected Marshaller getMarshaller() {
VersionAwareMarshaller marshaller = new VersionAwareMarshaller();
- marshaller.init(Thread.currentThread().getContextClassLoader(), new RemoteCommandFactory());
+ marshaller.inject(Thread.currentThread().getContextClassLoader(), new RemoteCommandFactory());
+ marshaller.start();
return marshaller;
}
Modified: trunk/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/JdbcBinaryCacheStoreVamTest.java
===================================================================
--- trunk/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/JdbcBinaryCacheStoreVamTest.java 2009-07-06 09:30:27 UTC (rev 519)
+++ trunk/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/JdbcBinaryCacheStoreVamTest.java 2009-07-08 08:30:45 UTC (rev 520)
@@ -37,7 +37,8 @@
@Override
protected Marshaller getMarshaller() {
VersionAwareMarshaller marshaller = new VersionAwareMarshaller();
- marshaller.init(Thread.currentThread().getContextClassLoader(), new RemoteCommandFactory());
+ marshaller.inject(Thread.currentThread().getContextClassLoader(), new RemoteCommandFactory());
+ marshaller.start();
return marshaller;
}
}
Modified: trunk/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStoreVamTest.java
===================================================================
--- trunk/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStoreVamTest.java 2009-07-06 09:30:27 UTC (rev 519)
+++ trunk/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStoreVamTest.java 2009-07-08 08:30:45 UTC (rev 520)
@@ -37,7 +37,8 @@
@Override
protected Marshaller getMarshaller() {
VersionAwareMarshaller marshaller = new VersionAwareMarshaller();
- marshaller.init(Thread.currentThread().getContextClassLoader(), new RemoteCommandFactory());
+ marshaller.inject(Thread.currentThread().getContextClassLoader(), new RemoteCommandFactory());
+ marshaller.start();
return marshaller;
}
}
Modified: trunk/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStoreVamTest2.java
===================================================================
--- trunk/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStoreVamTest2.java 2009-07-06 09:30:27 UTC (rev 519)
+++ trunk/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStoreVamTest2.java 2009-07-08 08:30:45 UTC (rev 520)
@@ -37,7 +37,8 @@
@Override
protected Marshaller getMarshaller() {
VersionAwareMarshaller marshaller = new VersionAwareMarshaller();
- marshaller.init(Thread.currentThread().getContextClassLoader(), new RemoteCommandFactory());
+ marshaller.inject(Thread.currentThread().getContextClassLoader(), new RemoteCommandFactory());
+ marshaller.start();
return marshaller;
}
}
Modified: trunk/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/stringbased/JdbcStringBasedCacheStoreVamTest.java
===================================================================
--- trunk/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/stringbased/JdbcStringBasedCacheStoreVamTest.java 2009-07-06 09:30:27 UTC (rev 519)
+++ trunk/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/stringbased/JdbcStringBasedCacheStoreVamTest.java 2009-07-08 08:30:45 UTC (rev 520)
@@ -37,7 +37,8 @@
@Override
protected Marshaller getMarshaller() {
VersionAwareMarshaller marshaller = new VersionAwareMarshaller();
- marshaller.init(Thread.currentThread().getContextClassLoader(), new RemoteCommandFactory());
+ marshaller.inject(Thread.currentThread().getContextClassLoader(), new RemoteCommandFactory());
+ marshaller.start();
return marshaller;
}
}
Modified: trunk/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/stringbased/JdbcStringBasedCacheStoreVamTest2.java
===================================================================
--- trunk/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/stringbased/JdbcStringBasedCacheStoreVamTest2.java 2009-07-06 09:30:27 UTC (rev 519)
+++ trunk/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/stringbased/JdbcStringBasedCacheStoreVamTest2.java 2009-07-08 08:30:45 UTC (rev 520)
@@ -37,7 +37,8 @@
@Override
protected Marshaller getMarshaller() {
VersionAwareMarshaller marshaller = new VersionAwareMarshaller();
- marshaller.init(Thread.currentThread().getContextClassLoader(), new RemoteCommandFactory());
+ marshaller.inject(Thread.currentThread().getContextClassLoader(), new RemoteCommandFactory());
+ marshaller.start();
return marshaller;
}
}
Modified: trunk/cachestore/jdbm/src/test/java/org/infinispan/loaders/jdbm/JdbmCacheStoreVamTest.java
===================================================================
--- trunk/cachestore/jdbm/src/test/java/org/infinispan/loaders/jdbm/JdbmCacheStoreVamTest.java 2009-07-06 09:30:27 UTC (rev 519)
+++ trunk/cachestore/jdbm/src/test/java/org/infinispan/loaders/jdbm/JdbmCacheStoreVamTest.java 2009-07-08 08:30:45 UTC (rev 520)
@@ -37,7 +37,8 @@
@Override
protected Marshaller getMarshaller() {
VersionAwareMarshaller marshaller = new VersionAwareMarshaller();
- marshaller.init(Thread.currentThread().getContextClassLoader(), new RemoteCommandFactory());
+ marshaller.inject(Thread.currentThread().getContextClassLoader(), new RemoteCommandFactory());
+ marshaller.start();
return marshaller;
}
}
Modified: trunk/cachestore/s3/src/test/java/org/infinispan/loaders/s3/S3CacheStoreIntegrationVamTest.java
===================================================================
--- trunk/cachestore/s3/src/test/java/org/infinispan/loaders/s3/S3CacheStoreIntegrationVamTest.java 2009-07-06 09:30:27 UTC (rev 519)
+++ trunk/cachestore/s3/src/test/java/org/infinispan/loaders/s3/S3CacheStoreIntegrationVamTest.java 2009-07-08 08:30:45 UTC (rev 520)
@@ -37,7 +37,8 @@
@Override
protected Marshaller getMarshaller() {
VersionAwareMarshaller marshaller = new VersionAwareMarshaller();
- marshaller.init(Thread.currentThread().getContextClassLoader(), new RemoteCommandFactory());
+ marshaller.inject(Thread.currentThread().getContextClassLoader(), new RemoteCommandFactory());
+ marshaller.start();
return marshaller;
}
}
Modified: trunk/core/src/main/java/org/infinispan/factories/AbstractComponentRegistry.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/factories/AbstractComponentRegistry.java 2009-07-06 09:30:27 UTC (rev 519)
+++ trunk/core/src/main/java/org/infinispan/factories/AbstractComponentRegistry.java 2009-07-08 08:30:45 UTC (rev 520)
@@ -486,6 +486,16 @@
/**
* Rewires components. Can only be called if the current state is WIRED or STARTED.
+ *
+ * Here's an example where rewiring is needed:
+ *
+ * The reason why rewiring needs to happen is to capture any such config changes. For example (this is a JBC example):
+ * 1. Config uses a FileCacheLoader.
+ * 2. Cache.create() - this will create a CacheLoaderInterceptor with a reference to the FileCacheLoader.
+ * 3. Add a JDBC CacheLoader to the config
+ * 4. Call cache.start(). The cache loader manager should recognise this change, create a chaining cache loader.
+ * This is a volatile component. Now the CLI is non-volatile since it doesn't need to be rebuilt. But it does
+ * need to be rewired, since the cache loader now is a ChainingCacheLoader, not a FileCacheLoader.
*/
public void rewire() {
// need to re-inject everything again.
Modified: trunk/core/src/main/java/org/infinispan/factories/annotations/Inject.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/factories/annotations/Inject.java 2009-07-06 09:30:27 UTC (rev 519)
+++ trunk/core/src/main/java/org/infinispan/factories/annotations/Inject.java 2009-07-08 08:30:45 UTC (rev 520)
@@ -63,6 +63,10 @@
* <pre>
* MyClass myClass = componentFactory.construct(MyClass.class); // instance will have dependencies injected.
* </pre>
+ *
+ * Methods annotated with this Inject annotation should *only* set class fields. They should do nothing else.
+ * If you need to do some work to prepare the component for use, do it in a {@link @Start} method since this is only
+ * called once when a component starts.
*
* @author Manik Surtani
* @since 4.0
Modified: trunk/core/src/main/java/org/infinispan/factories/annotations/NonVolatile.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/factories/annotations/NonVolatile.java 2009-07-06 09:30:27 UTC (rev 519)
+++ trunk/core/src/main/java/org/infinispan/factories/annotations/NonVolatile.java 2009-07-08 08:30:45 UTC (rev 520)
@@ -33,6 +33,10 @@
* org.infinispan.util.concurrent.locks.LockManager}, though, should <b>never</b> be marked as <tt>@NonVolatile</tt>
* since based on the configuration, different lock manager implementations may be selected. LockManager is, hence,
* <b>not</b> resilient to changes in the configuration.
+ *
+ * To sum up: A component is marked as NonVolatile when the component is not dependent on configuration changes that may
+ * happen between create() and start(). This is legacy since from JBoss Cache because in Infinispan there's only start but
+ * no create.
*
* @author Manik Surtani (<a href="mailto:manik at jboss.org">manik at jboss.org</a>)
* @since 4.0
Modified: trunk/core/src/main/java/org/infinispan/marshall/VersionAwareMarshaller.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/VersionAwareMarshaller.java 2009-07-06 09:30:27 UTC (rev 519)
+++ trunk/core/src/main/java/org/infinispan/marshall/VersionAwareMarshaller.java 2009-07-08 08:30:45 UTC (rev 520)
@@ -23,6 +23,7 @@
import org.infinispan.commands.RemoteCommandFactory;
import org.infinispan.factories.annotations.Inject;
+import org.infinispan.factories.annotations.Start;
import org.infinispan.factories.annotations.Stop;
import org.infinispan.io.ByteBuffer;
import org.infinispan.io.ExposedByteArrayOutputStream;
@@ -54,16 +55,24 @@
private static final int CUSTOM_MARSHALLER = 999;
private final JBossMarshaller defaultMarshaller;
+ private ClassLoader loader;
+ private RemoteCommandFactory remoteCommandFactory;
public VersionAwareMarshaller() {
defaultMarshaller = new JBossMarshaller();
}
@Inject
- public void init(ClassLoader loader, RemoteCommandFactory remoteCommandFactory) {
- defaultMarshaller.init(loader, remoteCommandFactory, this);
+ public void inject(ClassLoader loader, RemoteCommandFactory remoteCommandFactory) {
+ this.loader = loader;
+ this.remoteCommandFactory = remoteCommandFactory;
}
+ @Start
+ public void start() {
+ defaultMarshaller.start(loader, remoteCommandFactory, this);
+ }
+
@Stop
public void stop() {
defaultMarshaller.stop();
Modified: trunk/core/src/main/java/org/infinispan/marshall/jboss/ConstantObjectTable.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/jboss/ConstantObjectTable.java 2009-07-06 09:30:27 UTC (rev 519)
+++ trunk/core/src/main/java/org/infinispan/marshall/jboss/ConstantObjectTable.java 2009-07-08 08:30:45 UTC (rev 520)
@@ -253,184 +253,13 @@
}
public Object readObject(Unmarshaller unmarshaller) throws IOException, ClassNotFoundException {
- return externalizer.readObject(new ObjectInputAdapter(unmarshaller));
+ return externalizer.readObject(unmarshaller);
}
public void writeObject(Marshaller marshaller, Object object) throws IOException {
marshaller.write(id);
- externalizer.writeObject(new ObjectOutputAdapter(marshaller), object);
+ externalizer.writeObject(marshaller, object);
}
}
-
- static class ObjectInputAdapter implements ObjectInput {
- final ObjectInput input;
-
- ObjectInputAdapter(ObjectInput input) {
- this.input = input;
- }
-
- public int available() throws IOException {
- return input.available();
- }
-
- public void close() throws IOException {
- input.close();
- }
-
- public int read() throws IOException {
- return input.read();
- }
-
- public int read(byte[] b) throws IOException {
- return input.read(b);
- }
-
- public int read(byte[] b, int off, int len) throws IOException {
- return input.read(b, off, len);
- }
-
- public Object readObject() throws ClassNotFoundException, IOException {
- return input.readObject();
- }
-
- public long skip(long n) throws IOException {
- return input.skip(n);
- }
-
- public boolean readBoolean() throws IOException {
- return input.readBoolean();
- }
-
- public byte readByte() throws IOException {
- return input.readByte();
- }
-
- public char readChar() throws IOException {
- return input.readChar();
- }
-
- public double readDouble() throws IOException {
- return input.readDouble();
- }
-
- public float readFloat() throws IOException {
- return input.readFloat();
- }
-
- public void readFully(byte[] b) throws IOException {
- input.readFully(b);
- }
-
- public void readFully(byte[] b, int off, int len) throws IOException {
- input.readFully(b, off, len);
- }
-
- public int readInt() throws IOException {
- return input.readInt();
- }
-
- public String readLine() throws IOException {
- return input.readLine();
- }
-
- public long readLong() throws IOException {
- return input.readLong();
- }
-
- public short readShort() throws IOException {
- return input.readShort();
- }
-
- public String readUTF() throws IOException {
- return input.readUTF();
- }
-
- public int readUnsignedByte() throws IOException {
- return input.readUnsignedByte();
- }
-
- public int readUnsignedShort() throws IOException {
- return input.readUnsignedShort();
- }
-
- public int skipBytes(int n) throws IOException {
- return input.skipBytes(n);
- }
- }
- static class ObjectOutputAdapter implements ObjectOutput {
- final ObjectOutput output;
-
- ObjectOutputAdapter(ObjectOutput output) {
- this.output = output;
- }
-
- public void close() throws IOException {
- output.close();
- }
-
- public void flush() throws IOException {
- output.flush();
- }
-
- public void write(int b) throws IOException {
- output.write((int)b);
- }
-
- public void write(byte[] b) throws IOException {
- output.write(b);
- }
-
- public void write(byte[] b, int off, int len) throws IOException {
- output.write(b, off, len);
- }
-
- public void writeObject(Object obj) throws IOException {
- output.writeObject(obj);
- }
-
- public void writeBoolean(boolean v) throws IOException {
- output.writeBoolean(v);
- }
-
- public void writeByte(int v) throws IOException {
- output.writeByte(v);
- }
-
- public void writeBytes(String s) throws IOException {
- output.writeBytes(s);
- }
-
- public void writeChar(int v) throws IOException {
- output.writeChar(v);
- }
-
- public void writeChars(String s) throws IOException {
- output.writeChars(s);
- }
-
- public void writeDouble(double v) throws IOException {
- output.writeDouble(v);
- }
-
- public void writeFloat(float v) throws IOException {
- output.writeFloat(v);
- }
-
- public void writeInt(int v) throws IOException {
- output.writeInt(v);
- }
-
- public void writeLong(long v) throws IOException {
- output.writeLong(v);
- }
-
- public void writeShort(int v) throws IOException {
- output.writeShort(v);
- }
-
- public void writeUTF(String str) throws IOException {
- output.writeUTF(str);
- }
- }
}
Modified: trunk/core/src/main/java/org/infinispan/marshall/jboss/JBossMarshaller.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/jboss/JBossMarshaller.java 2009-07-06 09:30:27 UTC (rev 519)
+++ trunk/core/src/main/java/org/infinispan/marshall/jboss/JBossMarshaller.java 2009-07-08 08:30:45 UTC (rev 520)
@@ -23,7 +23,6 @@
import org.infinispan.CacheException;
import org.infinispan.commands.RemoteCommandFactory;
-import org.infinispan.factories.annotations.Stop;
import org.infinispan.io.ByteBuffer;
import org.infinispan.io.ExposedByteArrayOutputStream;
import org.infinispan.marshall.AbstractMarshaller;
@@ -92,7 +91,7 @@
}
};
- public void init(ClassLoader defaultCl, RemoteCommandFactory cmdFactory, org.infinispan.marshall.Marshaller ispnMarshaller) {
+ public void start(ClassLoader defaultCl, RemoteCommandFactory cmdFactory, org.infinispan.marshall.Marshaller ispnMarshaller) {
log.debug("Using JBoss Marshalling based marshaller.");
this.defaultCl = defaultCl;
try {
@@ -111,11 +110,10 @@
configuration.setClassResolver(new ContextClassResolver());
}
- @Stop
public void stop() {
// Do not leak classloader when cache is stopped.
defaultCl = null;
- objectTable.stop();
+ if (objectTable != null) objectTable.stop();
}
public byte[] objectToByteBuffer(Object obj) throws IOException {
Modified: trunk/core/src/test/java/org/infinispan/loaders/dummy/DummyInMemoryCacheStore.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/loaders/dummy/DummyInMemoryCacheStore.java 2009-07-06 09:30:27 UTC (rev 519)
+++ trunk/core/src/test/java/org/infinispan/loaders/dummy/DummyInMemoryCacheStore.java 2009-07-08 08:30:45 UTC (rev 520)
@@ -30,7 +30,10 @@
private Cache cache;
public void store(InternalCacheEntry ed) {
- if (ed != null) store.put(ed.getKey(), ed);
+ if (ed != null) {
+ log.trace("Store {0} in dummy map store@{1}", ed, Integer.toHexString(System.identityHashCode(store)));
+ store.put(ed.getKey(), ed);
+ }
}
@SuppressWarnings("unchecked")
@@ -40,6 +43,7 @@
store.clear();
for (int i = 0; i < numEntries; i++) {
InternalCacheEntry e = (InternalCacheEntry) marshaller.objectFromObjectStream(ois);
+ log.trace("Store {0} from stream in dummy store@{1}", e, Integer.toHexString(System.identityHashCode(store)));
store.put(e.getKey(), e);
}
} catch (Exception e) {
Modified: trunk/core/src/test/java/org/infinispan/loaders/file/FileCacheStoreVamTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/loaders/file/FileCacheStoreVamTest.java 2009-07-06 09:30:27 UTC (rev 519)
+++ trunk/core/src/test/java/org/infinispan/loaders/file/FileCacheStoreVamTest.java 2009-07-08 08:30:45 UTC (rev 520)
@@ -37,7 +37,8 @@
@Override
protected Marshaller getMarshaller() {
VersionAwareMarshaller marshaller = new VersionAwareMarshaller();
- marshaller.init(Thread.currentThread().getContextClassLoader(), new RemoteCommandFactory());
+ marshaller.inject(Thread.currentThread().getContextClassLoader(), new RemoteCommandFactory());
+ marshaller.start();
return marshaller;
}
}
Modified: trunk/core/src/test/java/org/infinispan/marshall/MarshalledValueTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/marshall/MarshalledValueTest.java 2009-07-06 09:30:27 UTC (rev 519)
+++ trunk/core/src/test/java/org/infinispan/marshall/MarshalledValueTest.java 2009-07-08 08:30:45 UTC (rev 520)
@@ -79,7 +79,8 @@
chain.addInterceptorAfter(mvli, MarshalledValueInterceptor.class);
marshaller = new VersionAwareMarshaller();
- marshaller.init(Thread.currentThread().getContextClassLoader(), null);
+ marshaller.inject(Thread.currentThread().getContextClassLoader(), null);
+ marshaller.start();
}
@AfterMethod
@@ -316,7 +317,8 @@
VersionAwareMarshaller marshaller = new VersionAwareMarshaller();
- marshaller.init(Thread.currentThread().getContextClassLoader(), null);
+ marshaller.inject(Thread.currentThread().getContextClassLoader(), null);
+ marshaller.start();
// start the test
ByteArrayOutputStream bout = new ByteArrayOutputStream();
Modified: trunk/core/src/test/java/org/infinispan/marshall/MarshallersTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/marshall/MarshallersTest.java 2009-07-06 09:30:27 UTC (rev 519)
+++ trunk/core/src/test/java/org/infinispan/marshall/MarshallersTest.java 2009-07-08 08:30:45 UTC (rev 520)
@@ -83,7 +83,7 @@
@BeforeTest
public void setUp() {
home.init(Thread.currentThread().getContextClassLoader(), new RemoteCommandFactory());
- jboss.init(Thread.currentThread().getContextClassLoader(), new RemoteCommandFactory(), jboss);
+ jboss.start(Thread.currentThread().getContextClassLoader(), new RemoteCommandFactory(), jboss);
}
@AfterTest
Modified: trunk/core/src/test/java/org/infinispan/marshall/jboss/JBossMarshallerTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/marshall/jboss/JBossMarshallerTest.java 2009-07-06 09:30:27 UTC (rev 519)
+++ trunk/core/src/test/java/org/infinispan/marshall/jboss/JBossMarshallerTest.java 2009-07-08 08:30:45 UTC (rev 520)
@@ -89,7 +89,8 @@
@BeforeTest
public void setUp() {
- marshaller.init(Thread.currentThread().getContextClassLoader(), new RemoteCommandFactory());
+ marshaller.inject(Thread.currentThread().getContextClassLoader(), new RemoteCommandFactory());
+ marshaller.start();
}
@AfterTest
More information about the infinispan-commits
mailing list