JBoss Cache SVN: r6960 - in core/branches/flat/src: main/java/org/jboss/starobrno and 12 other directories.
by jbosscache-commits＠lists.jboss.org
Author: mircea.markus
Date: 2008-10-15 15:41:25 -0400 (Wed, 15 Oct 2008)
New Revision: 6960
Added:
core/branches/flat/src/main/java/org/jboss/cache/interceptors/InvalidationInterceptor_Legacy.java
core/branches/flat/src/main/java/org/jboss/starobrno/commands/write/InvalidateCommand.java
core/branches/flat/src/main/java/org/jboss/starobrno/interceptors/InvalidationInterceptor.java
Removed:
core/branches/flat/src/main/java/org/jboss/cache/interceptors/InvalidationInterceptor.java
Modified:
core/branches/flat/src/main/java/org/jboss/starobrno/Cache.java
core/branches/flat/src/main/java/org/jboss/starobrno/CacheDelegate.java
core/branches/flat/src/main/java/org/jboss/starobrno/commands/AbstractVisitor.java
core/branches/flat/src/main/java/org/jboss/starobrno/commands/CommandsFactory.java
core/branches/flat/src/main/java/org/jboss/starobrno/commands/CommandsFactoryImpl.java
core/branches/flat/src/main/java/org/jboss/starobrno/commands/Visitor.java
core/branches/flat/src/main/java/org/jboss/starobrno/container/DataContainer.java
core/branches/flat/src/main/java/org/jboss/starobrno/container/UnsortedDataContainer.java
core/branches/flat/src/main/java/org/jboss/starobrno/factories/InterceptorChainFactory.java
core/branches/flat/src/main/java/org/jboss/starobrno/manager/CacheManager.java
core/branches/flat/src/main/java/org/jboss/starobrno/marshall/CacheMarshallerStarobrno.java
core/branches/flat/src/main/java/org/jboss/starobrno/marshall/CommandAwareRpcDispatcher.java
core/branches/flat/src/main/java/org/jboss/starobrno/notifications/Notifier.java
core/branches/flat/src/main/java/org/jboss/starobrno/notifications/NotifierImpl.java
core/branches/flat/src/main/java/org/jboss/starobrno/remoting/RPCManagerImpl.java
core/branches/flat/src/test/java/org/jboss/starobrno/BasicTest.java
core/branches/flat/src/test/java/org/jboss/starobrno/util/TestingUtil.java
core/branches/flat/src/test/resources/log4j.xml
Log:
progress on cache replication
Deleted: core/branches/flat/src/main/java/org/jboss/cache/interceptors/InvalidationInterceptor.java
===================================================================
--- core/branches/flat/src/main/java/org/jboss/cache/interceptors/InvalidationInterceptor.java 2008-10-15 18:13:06 UTC (rev 6959)
+++ core/branches/flat/src/main/java/org/jboss/cache/interceptors/InvalidationInterceptor.java 2008-10-15 19:41:25 UTC (rev 6960)
@@ -1,392 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2000 - 2008, 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.jboss.cache.interceptors;
-
-import org.jboss.cache.Fqn;
-import org.jboss.cache.InvocationContext;
-import org.jboss.cache.commands.AbstractVisitor;
-import org.jboss.cache.commands.CommandsFactory;
-import org.jboss.cache.commands.VisitableCommand;
-import org.jboss.cache.commands.WriteCommand;
-import org.jboss.cache.commands.tx.CommitCommand;
-import org.jboss.cache.commands.tx.PrepareCommand;
-import org.jboss.cache.commands.tx.RollbackCommand;
-import org.jboss.cache.commands.write.ClearDataCommand;
-import org.jboss.cache.commands.write.MoveCommand;
-import org.jboss.cache.commands.write.PutDataMapCommand;
-import org.jboss.cache.commands.write.PutForExternalReadCommand;
-import org.jboss.cache.commands.write.PutKeyValueCommand;
-import org.jboss.cache.commands.write.RemoveKeyCommand;
-import org.jboss.cache.commands.write.RemoveNodeCommand;
-import org.jboss.cache.jmx.annotations.ManagedAttribute;
-import org.jboss.cache.jmx.annotations.ManagedOperation;
-import org.jboss.cache.transaction.GlobalTransaction;
-import org.jboss.cache.transaction.TransactionContext;
-import org.jboss.cache.transaction.TransactionTable;
-import org.jboss.starobrno.config.Option;
-import org.jboss.starobrno.factories.annotations.Inject;
-import org.jboss.starobrno.factories.annotations.Start;
-
-import javax.transaction.SystemException;
-import javax.transaction.Transaction;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-
-/**
- * This interceptor acts as a replacement to the replication interceptor when
- * the CacheImpl is configured with ClusteredSyncMode as INVALIDATE.
- * <p/>
- * The idea is that rather than replicating changes to all caches in a cluster
- * when CRUD (Create, Remove, Update, Delete) methods are called, simply call
- * evict(Fqn) on the remote caches for each changed node. This allows the
- * remote node to look up the value in a shared cache loader which would have
- * been updated with the changes.
- *
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
- */
-public class InvalidationInterceptor extends BaseRpcInterceptor
-{
- private long invalidations = 0;
- protected Map<GlobalTransaction, List<WriteCommand>> txMods;
- protected boolean optimistic;
- private CommandsFactory commandsFactory;
- private boolean statsEnabled;
-
- @Inject
- public void injectDependencies(CommandsFactory commandsFactory)
- {
- this.commandsFactory = commandsFactory;
- }
-
- @Start
- private void initTxMap()
- {
- optimistic = false;
- if (optimistic) txMods = new ConcurrentHashMap<GlobalTransaction, List<WriteCommand>>();
- this.setStatisticsEnabled(configuration.getExposeManagementStatistics());
- }
-
- @Override
- public Object visitPutDataMapCommand(InvocationContext ctx, PutDataMapCommand command) throws Throwable
- {
- return handleWriteMethod(ctx, command.getFqn(), null, command);
- }
-
- @Override
- public Object visitPutForExternalReadCommand(InvocationContext ctx, PutForExternalReadCommand command) throws Throwable
- {
- // these are always local more, as far as invalidation is concerned
- if (ctx.getTransaction() != null) ctx.getTransactionContext().addLocalModification(command);
- return invokeNextInterceptor(ctx, command);
- }
-
- @Override
- public Object visitPutKeyValueCommand(InvocationContext ctx, PutKeyValueCommand command) throws Throwable
- {
- return handleWriteMethod(ctx, command.getFqn(), null, command);
- }
-
- @Override
- public Object visitRemoveNodeCommand(InvocationContext ctx, RemoveNodeCommand command) throws Throwable
- {
- return handleWriteMethod(ctx, command.getFqn(), null, command);
- }
-
- @Override
- public Object visitRemoveKeyCommand(InvocationContext ctx, RemoveKeyCommand command) throws Throwable
- {
- return handleWriteMethod(ctx, command.getFqn(), null, command);
- }
-
- @Override
- public Object visitMoveCommand(InvocationContext ctx, MoveCommand command) throws Throwable
- {
- return handleWriteMethod(ctx, command.getTo(), command.getFqn(), command);
- }
-
- @Override
- public Object visitClearDataCommand(InvocationContext ctx, ClearDataCommand command) throws Throwable
- {
- return handleWriteMethod(ctx, command.getFqn(), null, command);
- }
-
- @Override
- public Object visitPrepareCommand(InvocationContext ctx, PrepareCommand command) throws Throwable
- {
- Object retval = invokeNextInterceptor(ctx, command);
- Transaction tx = ctx.getTransaction();
- if (tx != null)
- {
- if (trace) log.trace("Entering InvalidationInterceptor's prepare phase");
- // fetch the modifications before the transaction is committed (and thus removed from the txTable)
- GlobalTransaction gtx = ctx.getGlobalTransaction();
- TransactionContext transactionContext = ctx.getTransactionContext();
- if (transactionContext == null)
- throw new IllegalStateException("cannot find transaction transactionContext for " + gtx);
-
- if (transactionContext.hasModifications())
- {
- List<WriteCommand> mods;
- if (transactionContext.hasLocalModifications())
- {
- mods = new ArrayList<WriteCommand>(command.getModifications());
- mods.removeAll(transactionContext.getLocalModifications());
- }
- else
- {
- mods = command.getModifications();
- }
- broadcastInvalidate(mods, tx, ctx);
- }
- else
- {
- if (trace) log.trace("Nothing to invalidate - no modifications in the transaction.");
- }
- }
- return retval;
- }
-
- @Override
- public Object visitCommitCommand(InvocationContext ctx, CommitCommand command) throws Throwable
- {
- Object retval = invokeNextInterceptor(ctx, command);
- Transaction tx = ctx.getTransaction();
- if (tx != null && optimistic)
- {
- GlobalTransaction gtx = ctx.getGlobalTransaction();
- List<WriteCommand> modifications = txMods.remove(gtx);
- broadcastInvalidate(modifications, tx, ctx);
- if (trace) log.trace("Committing. Broadcasting invalidations.");
- }
- return retval;
- }
-
- @Override
- public Object visitRollbackCommand(InvocationContext ctx, RollbackCommand command) throws Throwable
- {
- Object retval = invokeNextInterceptor(ctx, command);
- Transaction tx = ctx.getTransaction();
- if (tx != null && optimistic)
- {
- GlobalTransaction gtx = ctx.getGlobalTransaction();
- txMods.remove(gtx);
- log.debug("Caught a rollback. Clearing modification in txMods");
- }
- return retval;
- }
-
- /**
- * @param from is only present for move operations, else pass it in as null
- * @param command
- */
- private Object handleWriteMethod(InvocationContext ctx, Fqn targetFqn, Fqn from, VisitableCommand command)
- throws Throwable
- {
- Object retval = invokeNextInterceptor(ctx, command);
- Transaction tx = ctx.getTransaction();
- Option optionOverride = ctx.getOptionOverrides();
- if (log.isDebugEnabled()) log.debug("Is a CRUD method");
- Set<Fqn> fqns = new HashSet<Fqn>();
- if (from != null)
- {
- fqns.add(from);
- }
- fqns.add(targetFqn);
- if (!fqns.isEmpty())
- {
- // could be potentially TRANSACTIONAL. Ignore if it is, until we see a prepare().
- if (tx == null || !TransactionTable.isValid(tx))
- {
- // the no-tx case:
- //replicate an evict call.
- for (Fqn fqn : fqns) invalidateAcrossCluster(fqn, null, isSynchronous(optionOverride), ctx);
- }
- else
- {
- if (isLocalModeForced(ctx)) ctx.getTransactionContext().addLocalModification((WriteCommand) command);
- }
- }
- return retval;
- }
-
- private void broadcastInvalidate(List<WriteCommand> modifications, Transaction tx, InvocationContext ctx) throws Throwable
- {
- if (ctx.getTransaction() != null && !isLocalModeForced(ctx))
- {
- if (modifications == null || modifications.isEmpty()) return;
- InvalidationFilterVisitor filterVisitor = new InvalidationFilterVisitor(modifications.size());
- filterVisitor.visitCollection(null, modifications);
-
- if (filterVisitor.containsPutForExternalRead)
- {
- log.debug("Modification list contains a putForExternalRead operation. Not invalidating.");
- }
- else
- {
- try
- {
- for (Fqn fqn : filterVisitor.result) invalidateAcrossCluster(fqn, null, defaultSynchronous, ctx);
- }
- catch (Throwable t)
- {
- log.warn("Unable to broadcast evicts as a part of the prepare phase. Rolling back.", t);
- try
- {
- tx.setRollbackOnly();
- }
- catch (SystemException se)
- {
- throw new RuntimeException("setting tx rollback failed ", se);
- }
- if (t instanceof RuntimeException)
- throw (RuntimeException) t;
- else
- throw new RuntimeException("Unable to broadcast invalidation messages", t);
- }
- }
- }
- }
-
- public static class InvalidationFilterVisitor extends AbstractVisitor
- {
- Set<Fqn> result;
- public boolean containsPutForExternalRead;
-
- public InvalidationFilterVisitor(int maxSetSize)
- {
- result = new HashSet<Fqn>(maxSetSize);
- }
-
- @Override
- public Object visitPutKeyValueCommand(InvocationContext ctx, PutKeyValueCommand command) throws Throwable
- {
- result.add(command.getFqn());
- return null;
- }
-
- @Override
- public Object visitPutForExternalReadCommand(InvocationContext ctx, PutForExternalReadCommand command) throws Throwable
- {
- containsPutForExternalRead = true;
- return null;
- }
-
- @Override
- public Object visitPutDataMapCommand(InvocationContext ctx, PutDataMapCommand command) throws Throwable
- {
- result.add(command.getFqn());
- return null;
- }
-
- @Override
- public Object visitRemoveNodeCommand(InvocationContext ctx, RemoveNodeCommand command) throws Throwable
- {
- result.add(command.getFqn());
- return null;
- }
-
- @Override
- public Object visitClearDataCommand(InvocationContext ctx, ClearDataCommand command) throws Throwable
- {
- result.add(command.getFqn());
- return null;
- }
-
- @Override
- public Object visitRemoveKeyCommand(InvocationContext ctx, RemoveKeyCommand command) throws Throwable
- {
- result.add(command.getFqn());
- return null;
- }
-
- @Override
- public Object visitMoveCommand(InvocationContext ctx, MoveCommand command) throws Throwable
- {
- result.add(command.getFqn());
- // now if this is a "move" operation, then we also have another Fqn -
- Object le = command.getFqn().getLastElement();
- Fqn parent = command.getTo();
- result.add(Fqn.fromRelativeElements(parent, le));
- return null;
- }
- }
-
-
- protected void invalidateAcrossCluster(Fqn fqn, Object workspace, boolean synchronous, InvocationContext ctx) throws Throwable
- {
- /*
- if (!isLocalModeForced(ctx))
- {
- // increment invalidations counter if statistics maintained
- incrementInvalidations();
- InvalidateCommand command = commandsFactory.buildInvalidateCommand(fqn);
- DataVersion dataVersion = getNodeVersion(workspace, fqn);
- if (dataVersion != null) ((VersionedInvalidateCommand) command).setDataVersion(dataVersion);
- if (log.isDebugEnabled()) log.debug("Cache [" + rpcManager.getLocalAddress() + "] replicating " + command);
- // voila, invalidated!
- replicateCall(ctx, command, synchronous, ctx.getOptionOverrides());
- }
- */
- }
-
- private void incrementInvalidations()
- {
- if (getStatisticsEnabled()) invalidations++;
- }
-
- @ManagedOperation
- public void resetStatistics()
- {
- invalidations = 0;
- }
-
- @ManagedOperation
- public Map<String, Object> dumpStatistics()
- {
- Map<String, Object> retval = new HashMap<String, Object>();
- retval.put("Invalidations", invalidations);
- return retval;
- }
-
- @ManagedAttribute
- public boolean getStatisticsEnabled()
- {
- return this.statsEnabled;
- }
-
- @ManagedAttribute
- public void setStatisticsEnabled(boolean enabled)
- {
- this.statsEnabled = enabled;
- }
-
- @ManagedAttribute(description = "number of invalidations")
- public long getInvalidations()
- {
- return invalidations;
- }
-}
Copied: core/branches/flat/src/main/java/org/jboss/cache/interceptors/InvalidationInterceptor_Legacy.java (from rev 6936, core/branches/flat/src/main/java/org/jboss/cache/interceptors/InvalidationInterceptor.java)
===================================================================
--- core/branches/flat/src/main/java/org/jboss/cache/interceptors/InvalidationInterceptor_Legacy.java (rev 0)
+++ core/branches/flat/src/main/java/org/jboss/cache/interceptors/InvalidationInterceptor_Legacy.java 2008-10-15 19:41:25 UTC (rev 6960)
@@ -0,0 +1,392 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2000 - 2008, 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.jboss.cache.interceptors;
+
+import org.jboss.cache.Fqn;
+import org.jboss.cache.InvocationContext;
+import org.jboss.cache.commands.AbstractVisitor;
+import org.jboss.cache.commands.CommandsFactory;
+import org.jboss.cache.commands.VisitableCommand;
+import org.jboss.cache.commands.WriteCommand;
+import org.jboss.cache.commands.tx.CommitCommand;
+import org.jboss.cache.commands.tx.PrepareCommand;
+import org.jboss.cache.commands.tx.RollbackCommand;
+import org.jboss.cache.commands.write.ClearDataCommand;
+import org.jboss.cache.commands.write.MoveCommand;
+import org.jboss.cache.commands.write.PutDataMapCommand;
+import org.jboss.cache.commands.write.PutForExternalReadCommand;
+import org.jboss.cache.commands.write.PutKeyValueCommand;
+import org.jboss.cache.commands.write.RemoveKeyCommand;
+import org.jboss.cache.commands.write.RemoveNodeCommand;
+import org.jboss.cache.jmx.annotations.ManagedAttribute;
+import org.jboss.cache.jmx.annotations.ManagedOperation;
+import org.jboss.cache.transaction.GlobalTransaction;
+import org.jboss.cache.transaction.TransactionContext;
+import org.jboss.cache.transaction.TransactionTable;
+import org.jboss.starobrno.config.Option;
+import org.jboss.starobrno.factories.annotations.Inject;
+import org.jboss.starobrno.factories.annotations.Start;
+
+import javax.transaction.SystemException;
+import javax.transaction.Transaction;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * This interceptor acts as a replacement to the replication interceptor when
+ * the CacheImpl is configured with ClusteredSyncMode as INVALIDATE.
+ * <p/>
+ * The idea is that rather than replicating changes to all caches in a cluster
+ * when CRUD (Create, Remove, Update, Delete) methods are called, simply call
+ * evict(Fqn) on the remote caches for each changed node. This allows the
+ * remote node to look up the value in a shared cache loader which would have
+ * been updated with the changes.
+ *
+ * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ */
+public class InvalidationInterceptor_Legacy extends BaseRpcInterceptor
+{
+ private long invalidations = 0;
+ protected Map<GlobalTransaction, List<WriteCommand>> txMods;
+ protected boolean optimistic;
+ private CommandsFactory commandsFactory;
+ private boolean statsEnabled;
+
+ @Inject
+ public void injectDependencies(CommandsFactory commandsFactory)
+ {
+ this.commandsFactory = commandsFactory;
+ }
+
+ @Start
+ private void initTxMap()
+ {
+ optimistic = false;
+ if (optimistic) txMods = new ConcurrentHashMap<GlobalTransaction, List<WriteCommand>>();
+ this.setStatisticsEnabled(configuration.getExposeManagementStatistics());
+ }
+
+ @Override
+ public Object visitPutDataMapCommand(InvocationContext ctx, PutDataMapCommand command) throws Throwable
+ {
+ return handleWriteMethod(ctx, command.getFqn(), null, command);
+ }
+
+ @Override
+ public Object visitPutForExternalReadCommand(InvocationContext ctx, PutForExternalReadCommand command) throws Throwable
+ {
+ // these are always local more, as far as invalidation is concerned
+ if (ctx.getTransaction() != null) ctx.getTransactionContext().addLocalModification(command);
+ return invokeNextInterceptor(ctx, command);
+ }
+
+ @Override
+ public Object visitPutKeyValueCommand(InvocationContext ctx, PutKeyValueCommand command) throws Throwable
+ {
+ return handleWriteMethod(ctx, command.getFqn(), null, command);
+ }
+
+ @Override
+ public Object visitRemoveNodeCommand(InvocationContext ctx, RemoveNodeCommand command) throws Throwable
+ {
+ return handleWriteMethod(ctx, command.getFqn(), null, command);
+ }
+
+ @Override
+ public Object visitRemoveKeyCommand(InvocationContext ctx, RemoveKeyCommand command) throws Throwable
+ {
+ return handleWriteMethod(ctx, command.getFqn(), null, command);
+ }
+
+ @Override
+ public Object visitMoveCommand(InvocationContext ctx, MoveCommand command) throws Throwable
+ {
+ return handleWriteMethod(ctx, command.getTo(), command.getFqn(), command);
+ }
+
+ @Override
+ public Object visitClearDataCommand(InvocationContext ctx, ClearDataCommand command) throws Throwable
+ {
+ return handleWriteMethod(ctx, command.getFqn(), null, command);
+ }
+
+ @Override
+ public Object visitPrepareCommand(InvocationContext ctx, PrepareCommand command) throws Throwable
+ {
+ Object retval = invokeNextInterceptor(ctx, command);
+ Transaction tx = ctx.getTransaction();
+ if (tx != null)
+ {
+ if (trace) log.trace("Entering InvalidationInterceptor_Legacy's prepare phase");
+ // fetch the modifications before the transaction is committed (and thus removed from the txTable)
+ GlobalTransaction gtx = ctx.getGlobalTransaction();
+ TransactionContext transactionContext = ctx.getTransactionContext();
+ if (transactionContext == null)
+ throw new IllegalStateException("cannot find transaction transactionContext for " + gtx);
+
+ if (transactionContext.hasModifications())
+ {
+ List<WriteCommand> mods;
+ if (transactionContext.hasLocalModifications())
+ {
+ mods = new ArrayList<WriteCommand>(command.getModifications());
+ mods.removeAll(transactionContext.getLocalModifications());
+ }
+ else
+ {
+ mods = command.getModifications();
+ }
+ broadcastInvalidate(mods, tx, ctx);
+ }
+ else
+ {
+ if (trace) log.trace("Nothing to invalidate - no modifications in the transaction.");
+ }
+ }
+ return retval;
+ }
+
+ @Override
+ public Object visitCommitCommand(InvocationContext ctx, CommitCommand command) throws Throwable
+ {
+ Object retval = invokeNextInterceptor(ctx, command);
+ Transaction tx = ctx.getTransaction();
+ if (tx != null && optimistic)
+ {
+ GlobalTransaction gtx = ctx.getGlobalTransaction();
+ List<WriteCommand> modifications = txMods.remove(gtx);
+ broadcastInvalidate(modifications, tx, ctx);
+ if (trace) log.trace("Committing. Broadcasting invalidations.");
+ }
+ return retval;
+ }
+
+ @Override
+ public Object visitRollbackCommand(InvocationContext ctx, RollbackCommand command) throws Throwable
+ {
+ Object retval = invokeNextInterceptor(ctx, command);
+ Transaction tx = ctx.getTransaction();
+ if (tx != null && optimistic)
+ {
+ GlobalTransaction gtx = ctx.getGlobalTransaction();
+ txMods.remove(gtx);
+ log.debug("Caught a rollback. Clearing modification in txMods");
+ }
+ return retval;
+ }
+
+ /**
+ * @param from is only present for move operations, else pass it in as null
+ * @param command
+ */
+ private Object handleWriteMethod(InvocationContext ctx, Fqn targetFqn, Fqn from, VisitableCommand command)
+ throws Throwable
+ {
+ Object retval = invokeNextInterceptor(ctx, command);
+ Transaction tx = ctx.getTransaction();
+ Option optionOverride = ctx.getOptionOverrides();
+ if (log.isDebugEnabled()) log.debug("Is a CRUD method");
+ Set<Fqn> fqns = new HashSet<Fqn>();
+ if (from != null)
+ {
+ fqns.add(from);
+ }
+ fqns.add(targetFqn);
+ if (!fqns.isEmpty())
+ {
+ // could be potentially TRANSACTIONAL. Ignore if it is, until we see a prepare().
+ if (tx == null || !TransactionTable.isValid(tx))
+ {
+ // the no-tx case:
+ //replicate an evict call.
+ for (Fqn fqn : fqns) invalidateAcrossCluster(fqn, null, isSynchronous(optionOverride), ctx);
+ }
+ else
+ {
+ if (isLocalModeForced(ctx)) ctx.getTransactionContext().addLocalModification((WriteCommand) command);
+ }
+ }
+ return retval;
+ }
+
+ private void broadcastInvalidate(List<WriteCommand> modifications, Transaction tx, InvocationContext ctx) throws Throwable
+ {
+ if (ctx.getTransaction() != null && !isLocalModeForced(ctx))
+ {
+ if (modifications == null || modifications.isEmpty()) return;
+ InvalidationFilterVisitor filterVisitor = new InvalidationFilterVisitor(modifications.size());
+ filterVisitor.visitCollection(null, modifications);
+
+ if (filterVisitor.containsPutForExternalRead)
+ {
+ log.debug("Modification list contains a putForExternalRead operation. Not invalidating.");
+ }
+ else
+ {
+ try
+ {
+ for (Fqn fqn : filterVisitor.result) invalidateAcrossCluster(fqn, null, defaultSynchronous, ctx);
+ }
+ catch (Throwable t)
+ {
+ log.warn("Unable to broadcast evicts as a part of the prepare phase. Rolling back.", t);
+ try
+ {
+ tx.setRollbackOnly();
+ }
+ catch (SystemException se)
+ {
+ throw new RuntimeException("setting tx rollback failed ", se);
+ }
+ if (t instanceof RuntimeException)
+ throw (RuntimeException) t;
+ else
+ throw new RuntimeException("Unable to broadcast invalidation messages", t);
+ }
+ }
+ }
+ }
+
+ public static class InvalidationFilterVisitor extends AbstractVisitor
+ {
+ Set<Fqn> result;
+ public boolean containsPutForExternalRead;
+
+ public InvalidationFilterVisitor(int maxSetSize)
+ {
+ result = new HashSet<Fqn>(maxSetSize);
+ }
+
+ @Override
+ public Object visitPutKeyValueCommand(InvocationContext ctx, PutKeyValueCommand command) throws Throwable
+ {
+ result.add(command.getFqn());
+ return null;
+ }
+
+ @Override
+ public Object visitPutForExternalReadCommand(InvocationContext ctx, PutForExternalReadCommand command) throws Throwable
+ {
+ containsPutForExternalRead = true;
+ return null;
+ }
+
+ @Override
+ public Object visitPutDataMapCommand(InvocationContext ctx, PutDataMapCommand command) throws Throwable
+ {
+ result.add(command.getFqn());
+ return null;
+ }
+
+ @Override
+ public Object visitRemoveNodeCommand(InvocationContext ctx, RemoveNodeCommand command) throws Throwable
+ {
+ result.add(command.getFqn());
+ return null;
+ }
+
+ @Override
+ public Object visitClearDataCommand(InvocationContext ctx, ClearDataCommand command) throws Throwable
+ {
+ result.add(command.getFqn());
+ return null;
+ }
+
+ @Override
+ public Object visitRemoveKeyCommand(InvocationContext ctx, RemoveKeyCommand command) throws Throwable
+ {
+ result.add(command.getFqn());
+ return null;
+ }
+
+ @Override
+ public Object visitMoveCommand(InvocationContext ctx, MoveCommand command) throws Throwable
+ {
+ result.add(command.getFqn());
+ // now if this is a "move" operation, then we also have another Fqn -
+ Object le = command.getFqn().getLastElement();
+ Fqn parent = command.getTo();
+ result.add(Fqn.fromRelativeElements(parent, le));
+ return null;
+ }
+ }
+
+
+ protected void invalidateAcrossCluster(Fqn fqn, Object workspace, boolean synchronous, InvocationContext ctx) throws Throwable
+ {
+ /*
+ if (!isLocalModeForced(ctx))
+ {
+ // increment invalidations counter if statistics maintained
+ incrementInvalidations();
+ InvalidateCommand command = commandsFactory.buildInvalidateCommand(fqn);
+ DataVersion dataVersion = getNodeVersion(workspace, fqn);
+ if (dataVersion != null) ((VersionedInvalidateCommand) command).setDataVersion(dataVersion);
+ if (log.isDebugEnabled()) log.debug("Cache [" + rpcManager.getLocalAddress() + "] replicating " + command);
+ // voila, invalidated!
+ replicateCall(ctx, command, synchronous, ctx.getOptionOverrides());
+ }
+ */
+ }
+
+ private void incrementInvalidations()
+ {
+ if (getStatisticsEnabled()) invalidations++;
+ }
+
+ @ManagedOperation
+ public void resetStatistics()
+ {
+ invalidations = 0;
+ }
+
+ @ManagedOperation
+ public Map<String, Object> dumpStatistics()
+ {
+ Map<String, Object> retval = new HashMap<String, Object>();
+ retval.put("Invalidations", invalidations);
+ return retval;
+ }
+
+ @ManagedAttribute
+ public boolean getStatisticsEnabled()
+ {
+ return this.statsEnabled;
+ }
+
+ @ManagedAttribute
+ public void setStatisticsEnabled(boolean enabled)
+ {
+ this.statsEnabled = enabled;
+ }
+
+ @ManagedAttribute(description = "number of invalidations")
+ public long getInvalidations()
+ {
+ return invalidations;
+ }
+}
Property changes on: core/branches/flat/src/main/java/org/jboss/cache/interceptors/InvalidationInterceptor_Legacy.java
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: core/branches/flat/src/main/java/org/jboss/starobrno/Cache.java
===================================================================
--- core/branches/flat/src/main/java/org/jboss/starobrno/Cache.java 2008-10-15 18:13:06 UTC (rev 6959)
+++ core/branches/flat/src/main/java/org/jboss/starobrno/Cache.java 2008-10-15 19:41:25 UTC (rev 6960)
@@ -25,8 +25,10 @@
import org.jboss.starobrno.config.Configuration;
import org.jboss.starobrno.context.InvocationContext;
import org.jboss.starobrno.lifecycle.Lifecycle;
+import org.jgroups.Address;
import java.util.Set;
+import java.util.List;
import java.util.concurrent.ConcurrentMap;
/**
@@ -53,4 +55,6 @@
public void startBatch();
public void endBatch(boolean successful);
+
+ List<Address> getMembers();
}
Modified: core/branches/flat/src/main/java/org/jboss/starobrno/CacheDelegate.java
===================================================================
--- core/branches/flat/src/main/java/org/jboss/starobrno/CacheDelegate.java 2008-10-15 18:13:06 UTC (rev 6959)
+++ core/branches/flat/src/main/java/org/jboss/starobrno/CacheDelegate.java 2008-10-15 19:41:25 UTC (rev 6960)
@@ -49,6 +49,7 @@
import org.jboss.starobrno.notifications.Notifier;
import org.jboss.starobrno.transaction.GlobalTransaction;
import org.jboss.starobrno.transaction.TransactionTable;
+import org.jgroups.Address;
import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
@@ -71,6 +72,7 @@
protected BatchContainer batchContainer;
protected ComponentRegistry componentRegistry;
protected TransactionManager transactionManager;
+ protected RPCManager rpcManager;
@Inject
@@ -81,7 +83,8 @@
Notifier notifier,
ComponentRegistry componentRegistry,
TransactionManager transactionManager,
- BatchContainer batchContainer)
+ BatchContainer batchContainer,
+ RPCManager rpcManager)
{
this.invocationContextContainer = invocationContextContainer;
this.commandsFactory = commandsFactory;
@@ -91,6 +94,7 @@
this.componentRegistry = componentRegistry;
this.transactionManager = transactionManager;
this.batchContainer = batchContainer;
+ this.rpcManager = rpcManager;
}
public V putIfAbsent(K key, V value)
@@ -293,7 +297,7 @@
public RPCManager getRPCManager()
{
- return null; //TODO: Autogenerated. Implement me properly
+ return rpcManager;
}
public StateTransferManager getStateTransferManager()
@@ -349,4 +353,9 @@
throw new ConfigurationException("Invocation batching not enabled in current configuration! Please use the <invocationBatching /> element.");
batchContainer.endBatch(successful);
}
+
+ public List<Address> getMembers()
+ {
+ return rpcManager.getMembers();
+ }
}
Modified: core/branches/flat/src/main/java/org/jboss/starobrno/commands/AbstractVisitor.java
===================================================================
--- core/branches/flat/src/main/java/org/jboss/starobrno/commands/AbstractVisitor.java 2008-10-15 18:13:06 UTC (rev 6959)
+++ core/branches/flat/src/main/java/org/jboss/starobrno/commands/AbstractVisitor.java 2008-10-15 19:41:25 UTC (rev 6960)
@@ -27,12 +27,7 @@
import org.jboss.starobrno.commands.tx.CommitCommand;
import org.jboss.starobrno.commands.tx.PrepareCommand;
import org.jboss.starobrno.commands.tx.RollbackCommand;
-import org.jboss.starobrno.commands.write.ClearCommand;
-import org.jboss.starobrno.commands.write.EvictCommand;
-import org.jboss.starobrno.commands.write.PutKeyValueCommand;
-import org.jboss.starobrno.commands.write.PutMapCommand;
-import org.jboss.starobrno.commands.write.RemoveCommand;
-import org.jboss.starobrno.commands.write.ReplaceCommand;
+import org.jboss.starobrno.commands.write.*;
import org.jboss.starobrno.context.InvocationContext;
import java.util.Collection;
@@ -112,6 +107,10 @@
return handleDefault(ctx, command);
}
+ public Object visitInvalidateCommand(InvocationContext ctx, InvalidateCommand invalidateCommand) throws Throwable
+ {
+ return handleDefault(ctx, invalidateCommand);
+ }
/**
* A default handler for all commands visited. This is called for any visit method called, unless a visit command is
Modified: core/branches/flat/src/main/java/org/jboss/starobrno/commands/CommandsFactory.java
===================================================================
--- core/branches/flat/src/main/java/org/jboss/starobrno/commands/CommandsFactory.java 2008-10-15 18:13:06 UTC (rev 6959)
+++ core/branches/flat/src/main/java/org/jboss/starobrno/commands/CommandsFactory.java 2008-10-15 19:41:25 UTC (rev 6960)
@@ -26,12 +26,7 @@
import org.jboss.starobrno.commands.tx.CommitCommand;
import org.jboss.starobrno.commands.tx.PrepareCommand;
import org.jboss.starobrno.commands.tx.RollbackCommand;
-import org.jboss.starobrno.commands.write.ClearCommand;
-import org.jboss.starobrno.commands.write.EvictCommand;
-import org.jboss.starobrno.commands.write.PutKeyValueCommand;
-import org.jboss.starobrno.commands.write.PutMapCommand;
-import org.jboss.starobrno.commands.write.RemoveCommand;
-import org.jboss.starobrno.commands.write.ReplaceCommand;
+import org.jboss.starobrno.commands.write.*;
import org.jboss.starobrno.commands.remote.ReplicateCommand;
import org.jboss.starobrno.transaction.GlobalTransaction;
import org.jgroups.Address;
@@ -71,4 +66,6 @@
ReplicateCommand buildReplicateCommand(List<ReplicableCommand> toReplicate);
ReplicateCommand buildReplicateCommand(ReplicableCommand call);
+
+ InvalidateCommand buildInvalidateCommand(Object fqn);
}
Modified: core/branches/flat/src/main/java/org/jboss/starobrno/commands/CommandsFactoryImpl.java
===================================================================
--- core/branches/flat/src/main/java/org/jboss/starobrno/commands/CommandsFactoryImpl.java 2008-10-15 18:13:06 UTC (rev 6959)
+++ core/branches/flat/src/main/java/org/jboss/starobrno/commands/CommandsFactoryImpl.java 2008-10-15 19:41:25 UTC (rev 6960)
@@ -22,17 +22,13 @@
package org.jboss.starobrno.commands;
import org.jboss.starobrno.CacheException;
+import org.jboss.starobrno.interceptors.InterceptorChain;
import org.jboss.starobrno.commands.read.GetKeyValueCommand;
import org.jboss.starobrno.commands.read.SizeCommand;
import org.jboss.starobrno.commands.tx.CommitCommand;
import org.jboss.starobrno.commands.tx.PrepareCommand;
import org.jboss.starobrno.commands.tx.RollbackCommand;
-import org.jboss.starobrno.commands.write.ClearCommand;
-import org.jboss.starobrno.commands.write.EvictCommand;
-import org.jboss.starobrno.commands.write.PutKeyValueCommand;
-import org.jboss.starobrno.commands.write.PutMapCommand;
-import org.jboss.starobrno.commands.write.RemoveCommand;
-import org.jboss.starobrno.commands.write.ReplaceCommand;
+import org.jboss.starobrno.commands.write.*;
import org.jboss.starobrno.commands.remote.ReplicateCommand;
import org.jboss.starobrno.container.DataContainer;
import org.jboss.starobrno.factories.annotations.Inject;
@@ -50,12 +46,14 @@
{
private DataContainer dataContainer;
private Notifier notifier;
+ private InterceptorChain interceptorChain;
@Inject
- private void setupDependencies(DataContainer container, Notifier notifier)
+ private void setupDependencies(DataContainer container, Notifier notifier, InterceptorChain interceptorChain)
{
this.dataContainer = container;
this.notifier = notifier;
+ this.interceptorChain = interceptorChain;
}
public PutKeyValueCommand buildPutKeyValueCommand(Object key, Object value)
@@ -185,11 +183,24 @@
command = c;
break;
}
+ case ReplicateCommand.MULTIPLE_METHOD_ID:
+ case org.jboss.cache.commands.remote.ReplicateCommand.SINGLE_METHOD_ID:
+ {
+ ReplicateCommand c = new ReplicateCommand();
+ c.initialize(interceptorChain);
+ command = c;
+ break;
+ }
+
default:
throw new CacheException("Unknown command id " + id + "!");
}
-
command.setParameters(id, parameters);
return command;
}
+
+ public InvalidateCommand buildInvalidateCommand(Object fqn)
+ {
+ throw new UnsupportedOperationException("Not implemented");//todo please implement!
+ }
}
Modified: core/branches/flat/src/main/java/org/jboss/starobrno/commands/Visitor.java
===================================================================
--- core/branches/flat/src/main/java/org/jboss/starobrno/commands/Visitor.java 2008-10-15 18:13:06 UTC (rev 6959)
+++ core/branches/flat/src/main/java/org/jboss/starobrno/commands/Visitor.java 2008-10-15 19:41:25 UTC (rev 6960)
@@ -27,12 +27,7 @@
import org.jboss.starobrno.commands.tx.CommitCommand;
import org.jboss.starobrno.commands.tx.PrepareCommand;
import org.jboss.starobrno.commands.tx.RollbackCommand;
-import org.jboss.starobrno.commands.write.ClearCommand;
-import org.jboss.starobrno.commands.write.EvictCommand;
-import org.jboss.starobrno.commands.write.PutKeyValueCommand;
-import org.jboss.starobrno.commands.write.PutMapCommand;
-import org.jboss.starobrno.commands.write.RemoveCommand;
-import org.jboss.starobrno.commands.write.ReplaceCommand;
+import org.jboss.starobrno.commands.write.*;
import org.jboss.starobrno.context.InvocationContext;
public interface Visitor
@@ -67,4 +62,5 @@
Object visitCommitCommand(InvocationContext ctx, CommitCommand command) throws Throwable;
+ Object visitInvalidateCommand(InvocationContext ctx, InvalidateCommand invalidateCommand) throws Throwable;
}
\ No newline at end of file
Copied: core/branches/flat/src/main/java/org/jboss/starobrno/commands/write/InvalidateCommand.java (from rev 6936, core/branches/flat/src/main/java/org/jboss/cache/commands/write/InvalidateCommand.java)
===================================================================
--- core/branches/flat/src/main/java/org/jboss/starobrno/commands/write/InvalidateCommand.java (rev 0)
+++ core/branches/flat/src/main/java/org/jboss/starobrno/commands/write/InvalidateCommand.java 2008-10-15 19:41:25 UTC (rev 6960)
@@ -0,0 +1,159 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2000 - 2008, 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.jboss.starobrno.commands.write;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.jboss.starobrno.commands.read.AbstractDataCommand;
+import org.jboss.starobrno.commands.Visitor;
+import org.jboss.starobrno.CacheSPI;
+import org.jboss.starobrno.context.InvocationContext;
+import org.jboss.starobrno.container.DataContainer;
+import org.jboss.starobrno.notifications.Notifier;
+import org.jboss.cache.NodeSPI;
+import org.jboss.cache.Fqn;
+
+
+/**
+ * Removes a node's content from memory - never removes the node.
+ * It also clenups data for resident nodes - which are not being touched by eviction.
+ *
+ * @author Mircea.Markus(a)jboss.com
+ * @since 2.2
+ */
+public class InvalidateCommand extends AbstractDataCommand
+{
+ public static final int METHOD_ID = 47;
+ private static final Log log = LogFactory.getLog(InvalidateCommand.class);
+ private static final boolean trace = log.isTraceEnabled();
+
+ /* dependencies*/
+ protected CacheSPI spi;
+ protected Notifier notifier;
+ protected DataContainer dataContainer;
+
+ public InvalidateCommand(Object key)
+ {
+ this.key = key;
+ }
+
+ public InvalidateCommand()
+ {
+ }
+
+ public void initialize(CacheSPI cacheSpi, DataContainer dataContainer, Notifier notifier)
+ {
+ this.spi = cacheSpi;
+ this.dataContainer = dataContainer;
+ this.notifier = notifier;
+ }
+
+ /**
+ * Performs an invalidation on a specified node
+ *
+ * @param ctx invocation context
+ * @return null
+ */
+ public Object perform(InvocationContext ctx)
+ {
+ Object value = enforceNodeLoading();
+ if (trace) log.trace("Invalidating key:" + key);
+ if (value == null)
+ {
+ return null;
+ }
+ evictNode(key, ctx);
+// dataContainer.
+ return null;
+ }
+
+ boolean evictNode(Object key, InvocationContext ctx)
+ {
+ notifier.notifyNodeInvalidated(key, true, ctx);
+ try
+ {
+ return dataContainer.evict(key);
+ }
+ finally
+ {
+ notifier.notifyNodeInvalidated(key, false, ctx);
+ }
+ }
+
+
+ /**
+ * //TODO: 2.2.0: rather than using CacheSPI this should use peek(). The other interceptors should obtain locks and load nodes if necessary for this InvalidateCommand.
+ * //Even better - this can be handles in the interceptors before call interceptor
+ */
+ protected Object enforceNodeLoading()
+ {
+ return spi.get(key);
+ }
+
+
+ /**
+ * mark the node to be removed (and all children) as invalid so anyone holding a direct reference to it will
+ * be aware that it is no longer valid.
+ */
+ protected void invalidateNode(NodeSPI node)
+ {
+ node.setValid(false, true);
+ // root nodes can never be invalid
+// if (fqn.isRoot()) node.setValid(true, false); // non-recursive.
+ }
+
+
+ public Object acceptVisitor(InvocationContext ctx, Visitor visitor) throws Throwable
+ {
+ return visitor.visitInvalidateCommand(ctx, this);
+ }
+
+ public byte getCommandId()
+ {
+ return METHOD_ID;
+ }
+
+ @Override
+ public String toString()
+ {
+ return "InvalidateCommand{" +
+ "key=" + key +
+ '}';
+ }
+
+ @Override
+ public Object[] getParameters()
+ {
+ return new Object[]{key};
+ }
+
+ @Override
+ public void setParameters(int commandId, Object[] args)
+ {
+ key = args[0];
+ }
+
+ void setFqn(Fqn newFqn)
+ {
+ this.key = newFqn;
+ }
+}
\ No newline at end of file
Property changes on: core/branches/flat/src/main/java/org/jboss/starobrno/commands/write/InvalidateCommand.java
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: core/branches/flat/src/main/java/org/jboss/starobrno/container/DataContainer.java
===================================================================
--- core/branches/flat/src/main/java/org/jboss/starobrno/container/DataContainer.java 2008-10-15 18:13:06 UTC (rev 6959)
+++ core/branches/flat/src/main/java/org/jboss/starobrno/container/DataContainer.java 2008-10-15 19:41:25 UTC (rev 6960)
@@ -44,4 +44,6 @@
void clear();
Set<K> keySet();
+
+ boolean evict(Object key);
}
Modified: core/branches/flat/src/main/java/org/jboss/starobrno/container/UnsortedDataContainer.java
===================================================================
--- core/branches/flat/src/main/java/org/jboss/starobrno/container/UnsortedDataContainer.java 2008-10-15 18:13:06 UTC (rev 6959)
+++ core/branches/flat/src/main/java/org/jboss/starobrno/container/UnsortedDataContainer.java 2008-10-15 19:41:25 UTC (rev 6960)
@@ -69,4 +69,9 @@
{
return data.keySet();
}
+
+ public boolean evict(Object key)
+ {
+ throw new UnsupportedOperationException("Not implemented");//todo please implement!
+ }
}
Modified: core/branches/flat/src/main/java/org/jboss/starobrno/factories/InterceptorChainFactory.java
===================================================================
--- core/branches/flat/src/main/java/org/jboss/starobrno/factories/InterceptorChainFactory.java 2008-10-15 18:13:06 UTC (rev 6959)
+++ core/branches/flat/src/main/java/org/jboss/starobrno/factories/InterceptorChainFactory.java 2008-10-15 19:41:25 UTC (rev 6960)
@@ -26,15 +26,7 @@
import org.jboss.starobrno.config.ConfigurationException;
import org.jboss.starobrno.config.CustomInterceptorConfig;
import org.jboss.starobrno.factories.annotations.DefaultFactoryFor;
-import org.jboss.starobrno.interceptors.BatchingInterceptor;
-import org.jboss.starobrno.interceptors.CacheMgmtInterceptor;
-import org.jboss.starobrno.interceptors.CallInterceptor;
-import org.jboss.starobrno.interceptors.InterceptorChain;
-import org.jboss.starobrno.interceptors.InvocationContextInterceptor;
-import org.jboss.starobrno.interceptors.LockingInterceptor;
-import org.jboss.starobrno.interceptors.MarshalledValueInterceptor;
-import org.jboss.starobrno.interceptors.NotificationInterceptor;
-import org.jboss.starobrno.interceptors.TxInterceptor;
+import org.jboss.starobrno.interceptors.*;
import org.jboss.starobrno.interceptors.base.CommandInterceptor;
import java.util.List;
@@ -111,20 +103,20 @@
interceptorChain.appendIntereceptor(createInterceptor(NotificationInterceptor.class));
- // TODO: Uncomment once the Repl and Inval interceptors has been moved to Starobrno
-// switch (configuration.getCacheMode())
-// {
-// case REPL_SYNC:
-// case REPL_ASYNC:
-// interceptorChain.appendIntereceptor(createInterceptor(ReplicationInterceptor.class));
-// break;
-// case INVALIDATION_SYNC:
-// case INVALIDATION_ASYNC:
-// interceptorChain.appendIntereceptor(createInterceptor(InvalidationInterceptor.class));
-// break;
-// case LOCAL:
-// //Nothing...
-// }
+// TODO: Uncomment once the Repl and Inval interceptors has been moved to Starobrno
+ switch (configuration.getCacheMode())
+ {
+ case REPL_SYNC:
+ case REPL_ASYNC:
+ interceptorChain.appendIntereceptor(createInterceptor(ReplicationInterceptor.class));
+ break;
+ case INVALIDATION_SYNC:
+ case INVALIDATION_ASYNC:
+ interceptorChain.appendIntereceptor(createInterceptor(InvalidationInterceptor.class));
+ break;
+ case LOCAL:
+ //Nothing...
+ }
// TODO: Uncomment once the CacheLoader has been moved to Starobrno
// if (configuration.isUsingCacheLoaders())
Copied: core/branches/flat/src/main/java/org/jboss/starobrno/interceptors/InvalidationInterceptor.java (from rev 6936, core/branches/flat/src/main/java/org/jboss/cache/interceptors/InvalidationInterceptor.java)
===================================================================
--- core/branches/flat/src/main/java/org/jboss/starobrno/interceptors/InvalidationInterceptor.java (rev 0)
+++ core/branches/flat/src/main/java/org/jboss/starobrno/interceptors/InvalidationInterceptor.java 2008-10-15 19:41:25 UTC (rev 6960)
@@ -0,0 +1,273 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2000 - 2008, 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.jboss.starobrno.interceptors;
+
+import org.jboss.starobrno.commands.AbstractVisitor;
+import org.jboss.starobrno.commands.CommandsFactory;
+import org.jboss.starobrno.commands.DataCommand;
+import org.jboss.starobrno.commands.VisitableCommand;
+import org.jboss.starobrno.commands.tx.PrepareCommand;
+import org.jboss.starobrno.commands.write.ClearCommand;
+import org.jboss.starobrno.commands.write.InvalidateCommand;
+import org.jboss.starobrno.commands.write.PutKeyValueCommand;
+import org.jboss.starobrno.commands.write.RemoveCommand;
+import org.jboss.starobrno.config.Option;
+import org.jboss.starobrno.context.InvocationContext;
+import org.jboss.starobrno.context.TransactionContext;
+import org.jboss.starobrno.factories.annotations.Inject;
+import org.jboss.starobrno.factories.annotations.Start;
+import org.jboss.starobrno.interceptors.base.BaseRpcInterceptor;
+import org.jboss.starobrno.jmx.annotations.ManagedAttribute;
+import org.jboss.starobrno.jmx.annotations.ManagedOperation;
+import org.jboss.starobrno.transaction.GlobalTransaction;
+import org.jboss.starobrno.transaction.TransactionTable;
+
+import javax.transaction.SystemException;
+import javax.transaction.Transaction;
+import java.util.*;
+
+
+/**
+ * This interceptor acts as a replacement to the replication interceptor when
+ * the CacheImpl is configured with ClusteredSyncMode as INVALIDATE.
+ * <p/>
+ * The idea is that rather than replicating changes to all caches in a cluster
+ * when CRUD (Create, Remove, Update, Delete) methods are called, simply call
+ * evict(Fqn) on the remote caches for each changed node. This allows the
+ * remote node to look up the value in a shared cache loader which would have
+ * been updated with the changes.
+ *
+ * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ */
+public class InvalidationInterceptor extends BaseRpcInterceptor
+{
+ private long invalidations = 0;
+ protected Map<GlobalTransaction, List<VisitableCommand>> txMods;
+ private CommandsFactory commandsFactory;
+ private boolean statsEnabled;
+
+ @Inject
+ public void injectDependencies(CommandsFactory commandsFactory)
+ {
+ this.commandsFactory = commandsFactory;
+ }
+
+ @Start
+ private void initTxMap()
+ {
+ this.setStatisticsEnabled(configuration.getExposeManagementStatistics());
+ }
+
+ @Override
+ public Object visitPutKeyValueCommand(InvocationContext ctx, PutKeyValueCommand command) throws Throwable
+ {
+ return handleWriteMethod(ctx, command, command);
+ }
+
+ @Override
+ public Object visitRemoveCommand(InvocationContext ctx, RemoveCommand command) throws Throwable
+ {
+ return handleWriteMethod(ctx, command.getKey(), command);
+ }
+
+ @Override
+ public Object visitClearCommand(InvocationContext ctx, ClearCommand command) throws Throwable
+ {
+// return handleWriteMethod(ctx, command.getKey(), command);
+ //todo handle this - should perfor a remote invalidation aswell!!!
+ return null;
+ }
+
+ @Override
+ public Object visitPrepareCommand(InvocationContext ctx, PrepareCommand command) throws Throwable
+ {
+ Object retval = invokeNextInterceptor(ctx, command);
+ Transaction tx = ctx.getTransaction();
+ if (tx != null)
+ {
+ if (trace) log.trace("Entering InvalidationInterceptor_Legacy's prepare phase");
+ // fetch the modifications before the transaction is committed (and thus removed from the txTable)
+ GlobalTransaction gtx = ctx.getGlobalTransaction();
+ TransactionContext transactionContext = ctx.getTransactionContext();
+ if (transactionContext == null)
+ throw new IllegalStateException("cannot find transaction transactionContext for " + gtx);
+
+ if (transactionContext.hasModifications())
+ {
+ List<DataCommand> mods;
+ if (transactionContext.hasLocalModifications())
+ {
+ mods = new ArrayList<DataCommand>(command.getModifications());
+ mods.removeAll(transactionContext.getLocalModifications());
+ }
+ else
+ {
+ mods = command.getModifications();
+ }
+ broadcastInvalidate(mods, tx, ctx);
+ }
+ else
+ {
+ if (trace) log.trace("Nothing to invalidate - no modifications in the transaction.");
+ }
+ }
+ return retval;
+ }
+
+ private Object handleWriteMethod(InvocationContext ctx, Object key, VisitableCommand command)
+ throws Throwable
+ {
+ Object retval = invokeNextInterceptor(ctx, command);
+ Transaction tx = ctx.getTransaction();
+ Option optionOverride = ctx.getOptionOverrides();
+ if (log.isDebugEnabled()) log.debug("Is a CRUD method");
+ if (key != null)
+ {
+ // could be potentially TRANSACTIONAL. Ignore if it is, until we see a prepare().
+ if (tx == null || !TransactionTable.isValid(tx))
+ {
+ // the no-tx case:
+ //replicate an evict call.
+ invalidateAcrossCluster(key, null, isSynchronous(optionOverride), ctx);
+ }
+ else
+ {
+ if (isLocalModeForced(ctx)) ctx.getTransactionContext().addLocalModification(command);
+ }
+ }
+ return retval;
+ }
+
+ private void broadcastInvalidate(List<DataCommand> modifications, Transaction tx, InvocationContext ctx) throws Throwable
+ {
+ if (ctx.getTransaction() != null && !isLocalModeForced(ctx))
+ {
+ if (modifications == null || modifications.isEmpty()) return;
+ InvalidationFilterVisitor filterVisitor = new InvalidationFilterVisitor(modifications.size());
+ filterVisitor.visitCollection(null, modifications);
+
+ if (filterVisitor.containsPutForExternalRead)
+ {
+ log.debug("Modification list contains a putForExternalRead operation. Not invalidating.");
+ }
+ else
+ {
+ try
+ {
+ for (Object key : filterVisitor.result) invalidateAcrossCluster(key, null, defaultSynchronous, ctx);
+ }
+ catch (Throwable t)
+ {
+ log.warn("Unable to broadcast evicts as a part of the prepare phase. Rolling back.", t);
+ try
+ {
+ tx.setRollbackOnly();
+ }
+ catch (SystemException se)
+ {
+ throw new RuntimeException("setting tx rollback failed ", se);
+ }
+ if (t instanceof RuntimeException)
+ throw (RuntimeException) t;
+ else
+ throw new RuntimeException("Unable to broadcast invalidation messages", t);
+ }
+ }
+ }
+ }
+
+ public static class InvalidationFilterVisitor extends AbstractVisitor
+ {
+ Set<Object> result;
+ public boolean containsPutForExternalRead;
+
+ public InvalidationFilterVisitor(int maxSetSize)
+ {
+ result = new HashSet<Object>(maxSetSize);
+ }
+
+ @Override
+ public Object visitPutKeyValueCommand(InvocationContext ctx, PutKeyValueCommand command) throws Throwable
+ {
+ result.add(command.getKey());
+ return null;
+ }
+
+ @Override
+ public Object visitRemoveCommand(InvocationContext ctx, RemoveCommand command) throws Throwable
+ {
+ result.add(command.getKey());
+ return null;
+ }
+ }
+
+
+ protected void invalidateAcrossCluster(Object fqn, Object workspace, boolean synchronous, InvocationContext ctx) throws Throwable
+ {
+ if (!isLocalModeForced(ctx))
+ {
+ // increment invalidations counter if statistics maintained
+ incrementInvalidations();
+ InvalidateCommand command = commandsFactory.buildInvalidateCommand(fqn);
+ if (log.isDebugEnabled()) log.debug("Cache [" + rpcManager.getLocalAddress() + "] replicating " + command);
+ // voila, invalidated!
+ replicateCall(ctx, command, synchronous, ctx.getOptionOverrides());
+ }
+ }
+
+ private void incrementInvalidations()
+ {
+ if (getStatisticsEnabled()) invalidations++;
+ }
+
+ @ManagedOperation
+ public void resetStatistics()
+ {
+ invalidations = 0;
+ }
+
+ @ManagedOperation
+ public Map<String, Object> dumpStatistics()
+ {
+ Map<String, Object> retval = new HashMap<String, Object>();
+ retval.put("Invalidations", invalidations);
+ return retval;
+ }
+
+ @ManagedAttribute
+ public boolean getStatisticsEnabled()
+ {
+ return this.statsEnabled;
+ }
+
+ @ManagedAttribute
+ public void setStatisticsEnabled(boolean enabled)
+ {
+ this.statsEnabled = enabled;
+ }
+
+ @ManagedAttribute(description = "number of invalidations")
+ public long getInvalidations()
+ {
+ return invalidations;
+ }
+}
\ No newline at end of file
Property changes on: core/branches/flat/src/main/java/org/jboss/starobrno/interceptors/InvalidationInterceptor.java
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:mergeinfo
+
Name: svn:eol-style
+ native
Modified: core/branches/flat/src/main/java/org/jboss/starobrno/manager/CacheManager.java
===================================================================
--- core/branches/flat/src/main/java/org/jboss/starobrno/manager/CacheManager.java 2008-10-15 18:13:06 UTC (rev 6959)
+++ core/branches/flat/src/main/java/org/jboss/starobrno/manager/CacheManager.java 2008-10-15 19:41:25 UTC (rev 6960)
@@ -42,7 +42,15 @@
public CacheManager(Configuration c)
{
- this.c = c;
+ try
+ {
+ //if a config is shared between multiple managers, then each registers it's
+ // own chnnel in runtime
+ this.c = c.clone();
+ } catch (CloneNotSupportedException e)
+ {
+ throw new RuntimeException(e);
+ }
}
public void start()
Modified: core/branches/flat/src/main/java/org/jboss/starobrno/marshall/CacheMarshallerStarobrno.java
===================================================================
--- core/branches/flat/src/main/java/org/jboss/starobrno/marshall/CacheMarshallerStarobrno.java 2008-10-15 18:13:06 UTC (rev 6959)
+++ core/branches/flat/src/main/java/org/jboss/starobrno/marshall/CacheMarshallerStarobrno.java 2008-10-15 19:41:25 UTC (rev 6960)
@@ -25,6 +25,7 @@
import org.apache.commons.logging.LogFactory;
import org.jboss.starobrno.CacheException;
import org.jboss.starobrno.io.ByteBuffer;
+import org.jboss.starobrno.io.ExposedByteArrayOutputStream;
import org.jboss.starobrno.commands.CommandsFactory;
import org.jboss.starobrno.commands.ReplicableCommand;
import org.jboss.starobrno.config.Configuration;
@@ -33,14 +34,13 @@
import org.jboss.starobrno.util.FastCopyHashMap;
import org.jboss.starobrno.util.Immutables;
import org.jboss.util.NotImplementedException;
+import org.jboss.util.stream.MarshalledValueInputStream;
+import org.jboss.cache.marshall.Marshaller;
import org.jgroups.Address;
import org.jgroups.stack.IpAddress;
import org.jgroups.util.Buffer;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.InputStream;
+import java.io.*;
import java.lang.reflect.Array;
import java.util.*;
@@ -138,7 +138,144 @@
marshallArray(o, out, refMap);
} else
{
- marshallObject(o, out, refMap);
+ if (o == null)
+ {
+ out.writeByte(MAGICNUMBER_NULL);
+ }
+ else if (useRefs && refMap.containsKey(o))// see if this object has been marshalled before.
+ {
+ out.writeByte(MAGICNUMBER_REF);
+ writeReference(out, refMap.get(o));
+ }
+ else if (o instanceof ReplicableCommand)
+ {
+ ReplicableCommand command = (ReplicableCommand) o;
+
+ if (command.getCommandId() > -1)
+ {
+ out.writeByte(MAGICNUMBER_METHODCALL);
+ marshallCommand(command, out, refMap);
+ }
+ else
+ {
+ throw new IllegalArgumentException("MethodCall does not have a valid method id. Was this method call created with MethodCallFactory?");
+ }
+ }
+ else if (o instanceof org.jgroups.blocks.MethodCall)
+ {
+ throw new IllegalArgumentException("Usage of a legacy MethodCall object!!");
+ }
+ else if (o instanceof MarshalledValue)
+ {
+ out.writeByte(MAGICNUMBER_MARSHALLEDVALUE);
+ ((MarshalledValue) o).writeExternal(out);
+ }
+ else if (o instanceof GlobalTransaction)
+ {
+ out.writeByte(MAGICNUMBER_GTX);
+ if (useRefs) writeReference(out, createReference(o, refMap));
+ marshallGlobalTransaction((GlobalTransaction) o, out, refMap);
+ }
+ else if (o instanceof IpAddress)
+ {
+ out.writeByte(MAGICNUMBER_IPADDRESS);
+ marshallIpAddress((IpAddress) o, out);
+ }
+ else if (o.getClass().equals(ArrayList.class))
+ {
+ out.writeByte(MAGICNUMBER_ARRAY_LIST);
+ marshallCollection((Collection) o, out, refMap);
+ }
+ else if (o.getClass().equals(LinkedList.class))
+ {
+ out.writeByte(MAGICNUMBER_LINKED_LIST);
+ marshallCollection((Collection) o, out, refMap);
+ }
+ else if (o.getClass().equals(HashMap.class))
+ {
+ out.writeByte(MAGICNUMBER_HASH_MAP);
+ marshallMap((Map) o, out, refMap);
+ }
+ else if (o.getClass().equals(TreeMap.class))
+ {
+ out.writeByte(MAGICNUMBER_TREE_MAP);
+ marshallMap((Map) o, out, refMap);
+ }
+ else if (o.getClass().equals(FastCopyHashMap.class))
+ {
+ out.writeByte(MAGICNUMBER_FASTCOPY_HASHMAP);
+ marshallMap((Map) o, out, refMap);
+ }
+ else if (o instanceof Map && Immutables.isImmutable(o))
+ {
+ out.writeByte(MAGICNUMBER_IMMUTABLE_MAPCOPY);
+ marshallMap((Map) o, out, refMap);
+ }
+ else if (o.getClass().equals(HashSet.class))
+ {
+ out.writeByte(MAGICNUMBER_HASH_SET);
+ marshallCollection((Collection) o, out, refMap);
+ }
+ else if (o.getClass().equals(TreeSet.class))
+ {
+ out.writeByte(MAGICNUMBER_TREE_SET);
+ marshallCollection((Collection) o, out, refMap);
+ }
+ else if (o instanceof Boolean)
+ {
+ out.writeByte(MAGICNUMBER_BOOLEAN);
+ out.writeBoolean(((Boolean) o).booleanValue());
+ }
+ else if (o instanceof Integer)
+ {
+ out.writeByte(MAGICNUMBER_INTEGER);
+ out.writeInt(((Integer) o).intValue());
+ }
+ else if (o instanceof Long)
+ {
+ out.writeByte(MAGICNUMBER_LONG);
+ out.writeLong(((Long) o).longValue());
+ }
+ else if (o instanceof Short)
+ {
+ out.writeByte(MAGICNUMBER_SHORT);
+ out.writeShort(((Short) o).shortValue());
+ }
+ else if (o instanceof String)
+ {
+ out.writeByte(MAGICNUMBER_STRING);
+ if (useRefs) writeReference(out, createReference(o, refMap));
+ marshallString((String) o, out);
+ }
+ else if (o instanceof NodeDataMarker)
+ {
+ out.writeByte(MAGICNUMBER_NODEDATA_MARKER);
+ ((Externalizable) o).writeExternal(out);
+ }
+ else if (o instanceof NodeDataExceptionMarker)
+ {
+ out.writeByte(MAGICNUMBER_NODEDATA_EXCEPTION_MARKER);
+ ((Externalizable) o).writeExternal(out);
+ }
+ else if (o instanceof NodeData)
+ {
+ out.writeByte(MAGICNUMBER_NODEDATA);
+ ((Externalizable) o).writeExternal(out);
+ }
+ else if (o instanceof Serializable)
+ {
+ if (trace)
+ {
+ log.trace("Warning: using object serialization for " + o.getClass());
+ }
+ out.writeByte(MAGICNUMBER_SERIALIZABLE);
+ if (useRefs) writeReference(out, createReference(o, refMap));
+ out.writeObject(o);
+ }
+ else
+ {
+ throw new Exception("Don't know how to marshall object of type " + o.getClass());
+ }
}
}
@@ -162,6 +299,12 @@
}
}
+ private int createReference(Object o, Map<Object, Integer> refMap)
+ {
+ int reference = refMap.size();
+ refMap.put(o, reference);
+ return reference;
+ }
private void marshallGlobalTransaction(GlobalTransaction globalTransaction, ObjectOutputStream out, Map<Object, Integer> refMap) throws Exception
{
@@ -787,12 +930,20 @@
public ByteBuffer objectToBuffer(Object o) throws Exception
{
- throw new RuntimeException("Needs to be overridden!");
+ ExposedByteArrayOutputStream baos = new ExposedByteArrayOutputStream(128);
+ ObjectOutputStream out = new ObjectOutputStream(baos);
+
+ //now marshall the contents of the object
+ objectToObjectStream(o, out);
+ out.close();
+ // and return bytes.
+ return new ByteBuffer(baos.getRawBuffer(), 0, baos.size());
}
public Object objectFromByteBuffer(byte[] buf, int offset, int length) throws Exception
{
- throw new RuntimeException("Needs to be overridden!");
+ ObjectInputStream in = new MarshalledValueInputStream(new ByteArrayInputStream(buf, offset, length));
+ return objectFromObjectStream(in);
}
public Object objectFromByteBuffer(byte[] bytes) throws Exception
Modified: core/branches/flat/src/main/java/org/jboss/starobrno/marshall/CommandAwareRpcDispatcher.java
===================================================================
--- core/branches/flat/src/main/java/org/jboss/starobrno/marshall/CommandAwareRpcDispatcher.java 2008-10-15 18:13:06 UTC (rev 6959)
+++ core/branches/flat/src/main/java/org/jboss/starobrno/marshall/CommandAwareRpcDispatcher.java 2008-10-15 19:41:25 UTC (rev 6960)
@@ -130,12 +130,6 @@
protected boolean isValid(Message req)
{
- if (server_obj == null)
- {
- log.error("no method handler is registered. Discarding request.");
- return false;
- }
-
if (req == null || req.getLength() == 0)
{
log.error("message or message buffer is null");
@@ -160,8 +154,8 @@
}
if (trace)
- log.trace(new StringBuilder("dests=").append(dests).append(", command=").append(command).
- append(", mode=").append(mode).append(", timeout=").append(timeout));
+ log.trace(new StringBuilder("dests=").append(dests).append(", command=").append(command).append(", mode=").
+ append(mode).append(", timeout=").append(timeout));
ReplicationTask replicationTask = new ReplicationTask(command, oob, dests, mode, timeout, false, filter);
Future<RspList> response = replicationProcessor.submit(replicationTask);
@@ -292,7 +286,6 @@
// a null response is 99% likely to be due to a marshalling problem - we throw a NSE, this needs to be changed when
// JGroups supports http://jira.jboss.com/jira/browse/JGRP-193
// the serialization problem could be on the remote end and this is why we cannot catch this above, when marshalling.
-
if (retval == null)
throw new NotSerializableException("RpcDispatcher returned a null. This is most often caused by args for " + command.getClass().getSimpleName() + " not being serializable.");
return retval;
Modified: core/branches/flat/src/main/java/org/jboss/starobrno/notifications/Notifier.java
===================================================================
--- core/branches/flat/src/main/java/org/jboss/starobrno/notifications/Notifier.java 2008-10-15 18:13:06 UTC (rev 6959)
+++ core/branches/flat/src/main/java/org/jboss/starobrno/notifications/Notifier.java 2008-10-15 19:41:25 UTC (rev 6960)
@@ -120,15 +120,11 @@
/**
* Adds a cache listener to the list of cache listeners registered.
- *
- * @param listener
*/
void addCacheListener(Object listener);
/**
* Removes a cache listener from the list of cache listeners registered.
- *
- * @param listener
*/
void removeCacheListener(Object listener);
@@ -136,4 +132,6 @@
* @return Retrieves an (unmodifiable) set of cache listeners registered.
*/
Set<Object> getCacheListeners();
+
+ void notifyNodeInvalidated(Object key, boolean pre, InvocationContext ctx);
}
\ No newline at end of file
Modified: core/branches/flat/src/main/java/org/jboss/starobrno/notifications/NotifierImpl.java
===================================================================
--- core/branches/flat/src/main/java/org/jboss/starobrno/notifications/NotifierImpl.java 2008-10-15 18:13:06 UTC (rev 6959)
+++ core/branches/flat/src/main/java/org/jboss/starobrno/notifications/NotifierImpl.java 2008-10-15 19:41:25 UTC (rev 6960)
@@ -639,4 +639,9 @@
if (list == null) throw new CacheException("Unknown listener annotation: " + annotation);
return list;
}
+
+ public void notifyNodeInvalidated(Object key, boolean pre, InvocationContext ctx)
+ {
+ throw new UnsupportedOperationException("Not implemented");//todo please implement!
+ }
}
Modified: core/branches/flat/src/main/java/org/jboss/starobrno/remoting/RPCManagerImpl.java
===================================================================
--- core/branches/flat/src/main/java/org/jboss/starobrno/remoting/RPCManagerImpl.java 2008-10-15 18:13:06 UTC (rev 6959)
+++ core/branches/flat/src/main/java/org/jboss/starobrno/remoting/RPCManagerImpl.java 2008-10-15 19:41:25 UTC (rev 6960)
@@ -115,13 +115,12 @@
public void setupDependencies(ChannelMessageListener messageListener, Configuration configuration, Notifier notifier,
ExtendedMarshaller extendedMarshaller, TransactionTable txTable,
TransactionManager txManager, InvocationContextContainer container, InterceptorChain interceptorChain,
- ComponentRegistry componentRegistry, LockManager lockManager)
+ ComponentRegistry componentRegistry, LockManager lockManager, CacheSPI spi)
{
this.messageListener = messageListener;
this.configuration = configuration;
this.notifier = notifier;
- // TODO: Inject cacheSPI when we are ready
-// this.spi = spi;
+ this.spi = spi;
this.extendedMarshaller = extendedMarshaller;
this.txManager = txManager;
this.txTable = txTable;
@@ -392,7 +391,6 @@
throw new TimeoutException("State retrieval timed out waiting for flush unblock.");
}
useOutOfBandMessage = false;
- // todo fix me!!
RspList rsps = rpcDispatcher.invokeRemoteCommands(recipients, command, modeToUse, timeout, useOutOfBandMessage, responseFilter);
if (mode == GroupRequest.GET_NONE) return Collections.emptyList();// async case
if (trace)
Modified: core/branches/flat/src/test/java/org/jboss/starobrno/BasicTest.java
===================================================================
--- core/branches/flat/src/test/java/org/jboss/starobrno/BasicTest.java 2008-10-15 18:13:06 UTC (rev 6959)
+++ core/branches/flat/src/test/java/org/jboss/starobrno/BasicTest.java 2008-10-15 19:41:25 UTC (rev 6960)
@@ -23,7 +23,10 @@
import org.jboss.starobrno.config.Configuration;
import org.jboss.starobrno.manager.CacheManager;
+import org.jboss.starobrno.util.TestingUtil;
import org.testng.annotations.Test;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
@Test(groups = "functional")
public class BasicTest
@@ -62,6 +65,7 @@
}
}
+ public static final Log log = LogFactory.getLog(BasicTest.class);
public void testBasicReplication()
{
Configuration configuration = new Configuration();
@@ -75,10 +79,14 @@
firstManager.start();
secondManager.start();
- Cache firstCache = firstManager.createCache("test");
- Cache secondCache = firstManager.createCache("test");
+ CacheSPI firstCache = (CacheSPI) firstManager.createCache("test");
+ CacheSPI secondCache = (CacheSPI) secondManager.createCache("test");
+ TestingUtil.blockUntilViewReceived(secondCache, 2, 3000);
+
+
firstCache.put("key","value");
+
assert secondCache.get("key").equals("value");
assert firstCache.get("key").equals("value");
secondCache.put("key", "value2");
Modified: core/branches/flat/src/test/java/org/jboss/starobrno/util/TestingUtil.java
===================================================================
--- core/branches/flat/src/test/java/org/jboss/starobrno/util/TestingUtil.java 2008-10-15 18:13:06 UTC (rev 6959)
+++ core/branches/flat/src/test/java/org/jboss/starobrno/util/TestingUtil.java 2008-10-15 19:41:25 UTC (rev 6960)
@@ -324,7 +324,7 @@
public static boolean isCacheViewComplete(Cache c, int memberCount, boolean barfIfTooManyMembers)
{
CacheSPI cache = (CacheSPI) c;
- List members = cache.getRPCManager().getMembers();
+ List members = cache.getMembers();
if (members == null || memberCount > members.size())
{
return false;
Modified: core/branches/flat/src/test/resources/log4j.xml
===================================================================
--- core/branches/flat/src/test/resources/log4j.xml 2008-10-15 18:13:06 UTC (rev 6959)
+++ core/branches/flat/src/test/resources/log4j.xml 2008-10-15 19:41:25 UTC (rev 6960)
@@ -49,6 +49,10 @@
<priority value="TRACE"/>
</category>
+ <category name="org.jboss.starobrno.factories.ComponentRegistry">
+ <priority value="WARN"/>
+ </category>
+
<category name="org.jboss.cache.factories">
<priority value="TRACE"/>
</category>
16 years, 2 months
- 1
- 0
JBoss Cache SVN: r6959 - in core/trunk/src: main/java/org/jboss/cache/annotations and 62 other directories.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2008-10-15 14:13:06 -0400 (Wed, 15 Oct 2008)
New Revision: 6959
Modified:
core/trunk/src/main/java/org/jboss/cache/AbstractNodeFactory.java
core/trunk/src/main/java/org/jboss/cache/Cache.java
core/trunk/src/main/java/org/jboss/cache/CacheException.java
core/trunk/src/main/java/org/jboss/cache/CacheFactory.java
core/trunk/src/main/java/org/jboss/cache/CacheSPI.java
core/trunk/src/main/java/org/jboss/cache/DefaultCacheFactory.java
core/trunk/src/main/java/org/jboss/cache/FqnComparator.java
core/trunk/src/main/java/org/jboss/cache/InternalNode.java
core/trunk/src/main/java/org/jboss/cache/InvocationContext.java
core/trunk/src/main/java/org/jboss/cache/LegacyRegionManagerImpl.java
core/trunk/src/main/java/org/jboss/cache/Node.java
core/trunk/src/main/java/org/jboss/cache/NodeFactory.java
core/trunk/src/main/java/org/jboss/cache/NodeNotValidException.java
core/trunk/src/main/java/org/jboss/cache/NodeSPI.java
core/trunk/src/main/java/org/jboss/cache/PessimisticNodeFactory.java
core/trunk/src/main/java/org/jboss/cache/PessimisticUnversionedNode.java
core/trunk/src/main/java/org/jboss/cache/RPCManagerImpl.java
core/trunk/src/main/java/org/jboss/cache/Region.java
core/trunk/src/main/java/org/jboss/cache/RegionEmptyException.java
core/trunk/src/main/java/org/jboss/cache/RegionImpl.java
core/trunk/src/main/java/org/jboss/cache/RegionManager.java
core/trunk/src/main/java/org/jboss/cache/RegionManagerImpl.java
core/trunk/src/main/java/org/jboss/cache/RegionRegistry.java
core/trunk/src/main/java/org/jboss/cache/StringFqn.java
core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java
core/trunk/src/main/java/org/jboss/cache/VersionedNode.java
core/trunk/src/main/java/org/jboss/cache/annotations/Compat.java
core/trunk/src/main/java/org/jboss/cache/annotations/Experimental.java
core/trunk/src/main/java/org/jboss/cache/batch/BatchContainer.java
core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyGroup.java
core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyLocator.java
core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.java
core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyNotInitException.java
core/trunk/src/main/java/org/jboss/cache/buddyreplication/NextMemberBuddyLocator.java
core/trunk/src/main/java/org/jboss/cache/commands/DataCommand.java
core/trunk/src/main/java/org/jboss/cache/commands/OptimisticCommandsFactoryImpl.java
core/trunk/src/main/java/org/jboss/cache/commands/PessimisticCommandsFactoryImpl.java
core/trunk/src/main/java/org/jboss/cache/commands/VersionedDataCommand.java
core/trunk/src/main/java/org/jboss/cache/commands/VisitableCommand.java
core/trunk/src/main/java/org/jboss/cache/commands/WriteCommand.java
core/trunk/src/main/java/org/jboss/cache/commands/legacy/ReversibleCommand.java
core/trunk/src/main/java/org/jboss/cache/commands/legacy/read/LegacyGravitateDataCommand.java
core/trunk/src/main/java/org/jboss/cache/commands/legacy/write/CreateNodeCommand.java
core/trunk/src/main/java/org/jboss/cache/commands/legacy/write/LegacyEvictCommand.java
core/trunk/src/main/java/org/jboss/cache/commands/legacy/write/PessClearDataCommand.java
core/trunk/src/main/java/org/jboss/cache/commands/legacy/write/PessMoveCommand.java
core/trunk/src/main/java/org/jboss/cache/commands/legacy/write/PessPutDataMapCommand.java
core/trunk/src/main/java/org/jboss/cache/commands/legacy/write/PessPutForExternalReadCommand.java
core/trunk/src/main/java/org/jboss/cache/commands/legacy/write/PessPutKeyValueCommand.java
core/trunk/src/main/java/org/jboss/cache/commands/legacy/write/PessRemoveKeyCommand.java
core/trunk/src/main/java/org/jboss/cache/commands/legacy/write/PessRemoveNodeCommand.java
core/trunk/src/main/java/org/jboss/cache/commands/read/AbstractDataCommand.java
core/trunk/src/main/java/org/jboss/cache/commands/tx/AbstractTransactionCommand.java
core/trunk/src/main/java/org/jboss/cache/commands/write/AbstractVersionedDataCommand.java
core/trunk/src/main/java/org/jboss/cache/commands/write/PutForExternalReadCommand.java
core/trunk/src/main/java/org/jboss/cache/config/CacheLoaderConfig.java
core/trunk/src/main/java/org/jboss/cache/config/CloneableConfigurationComponent.java
core/trunk/src/main/java/org/jboss/cache/config/Configuration.java
core/trunk/src/main/java/org/jboss/cache/config/ConfigurationException.java
core/trunk/src/main/java/org/jboss/cache/config/Dynamic.java
core/trunk/src/main/java/org/jboss/cache/config/EvictionAlgorithmConfig.java
core/trunk/src/main/java/org/jboss/cache/config/EvictionPolicyConfig.java
core/trunk/src/main/java/org/jboss/cache/config/Option.java
core/trunk/src/main/java/org/jboss/cache/config/PluggableConfigurationComponent.java
core/trunk/src/main/java/org/jboss/cache/config/UnsupportedEvictionImplException.java
core/trunk/src/main/java/org/jboss/cache/config/parsing/XmlConfigHelper.java
core/trunk/src/main/java/org/jboss/cache/config/parsing/XmlConfigurationParser2x.java
core/trunk/src/main/java/org/jboss/cache/eviction/DefaultEvictionActionPolicy.java
core/trunk/src/main/java/org/jboss/cache/eviction/EvictionActionPolicy.java
core/trunk/src/main/java/org/jboss/cache/eviction/EvictionAlgorithmConfigBase.java
core/trunk/src/main/java/org/jboss/cache/eviction/EvictionPolicyConfigBase.java
core/trunk/src/main/java/org/jboss/cache/eviction/ModernizableConfig.java
core/trunk/src/main/java/org/jboss/cache/eviction/ModernizablePolicy.java
core/trunk/src/main/java/org/jboss/cache/eviction/RemoveOnEvictActionPolicy.java
core/trunk/src/main/java/org/jboss/cache/factories/BootstrapFactory.java
core/trunk/src/main/java/org/jboss/cache/factories/BuddyManagerFactory.java
core/trunk/src/main/java/org/jboss/cache/factories/CacheConfigsXmlParser.java
core/trunk/src/main/java/org/jboss/cache/factories/CommandsMetaFactory.java
core/trunk/src/main/java/org/jboss/cache/factories/ComponentFactory.java
core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegistry.java
core/trunk/src/main/java/org/jboss/cache/factories/ContextMetaFactory.java
core/trunk/src/main/java/org/jboss/cache/factories/EmptyConstructorFactory.java
core/trunk/src/main/java/org/jboss/cache/factories/InterceptorChainFactory.java
core/trunk/src/main/java/org/jboss/cache/factories/LockManagerFactory.java
core/trunk/src/main/java/org/jboss/cache/factories/NodeMetaFactory.java
core/trunk/src/main/java/org/jboss/cache/factories/RegionManagerFactory.java
core/trunk/src/main/java/org/jboss/cache/factories/ReplicationQueueFactory.java
core/trunk/src/main/java/org/jboss/cache/factories/RuntimeConfigAwareFactory.java
core/trunk/src/main/java/org/jboss/cache/factories/StateTransferManagerFactory.java
core/trunk/src/main/java/org/jboss/cache/factories/TransactionManagerFactory.java
core/trunk/src/main/java/org/jboss/cache/factories/annotations/DefaultFactoryFor.java
core/trunk/src/main/java/org/jboss/cache/factories/annotations/Destroy.java
core/trunk/src/main/java/org/jboss/cache/factories/annotations/NonVolatile.java
core/trunk/src/main/java/org/jboss/cache/factories/annotations/Start.java
core/trunk/src/main/java/org/jboss/cache/factories/annotations/Stop.java
core/trunk/src/main/java/org/jboss/cache/factories/context/ContextFactory.java
core/trunk/src/main/java/org/jboss/cache/factories/context/MVCCContextFactory.java
core/trunk/src/main/java/org/jboss/cache/factories/context/OptimisticContextFactory.java
core/trunk/src/main/java/org/jboss/cache/factories/context/PessimisticContextFactory.java
core/trunk/src/main/java/org/jboss/cache/interceptors/BaseRpcInterceptor.java
core/trunk/src/main/java/org/jboss/cache/interceptors/BaseTransactionalContextInterceptor.java
core/trunk/src/main/java/org/jboss/cache/interceptors/BatchingInterceptor.java
core/trunk/src/main/java/org/jboss/cache/interceptors/BuddyRegionAwareEvictionInterceptor.java
core/trunk/src/main/java/org/jboss/cache/interceptors/DataGravitatorInterceptor.java
core/trunk/src/main/java/org/jboss/cache/interceptors/InvalidationInterceptor.java
core/trunk/src/main/java/org/jboss/cache/interceptors/InvocationContextInterceptor.java
core/trunk/src/main/java/org/jboss/cache/interceptors/LegacyDataGravitatorInterceptor.java
core/trunk/src/main/java/org/jboss/cache/interceptors/LegacyPassivationInterceptor.java
core/trunk/src/main/java/org/jboss/cache/interceptors/MVCCLockingInterceptor.java
core/trunk/src/main/java/org/jboss/cache/interceptors/MarshalledValueInterceptor.java
core/trunk/src/main/java/org/jboss/cache/interceptors/NotificationInterceptor.java
core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticCreateIfNotExistsInterceptor.java
core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticInterceptor.java
core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticLockingInterceptor.java
core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticNodeInterceptor.java
core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticReplicationInterceptor.java
core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticTxInterceptor.java
core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticValidatorInterceptor.java
core/trunk/src/main/java/org/jboss/cache/interceptors/TxInterceptor.java
core/trunk/src/main/java/org/jboss/cache/invocation/AbstractInvocationDelegate.java
core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDelegate.java
core/trunk/src/main/java/org/jboss/cache/invocation/InvocationContextContainer.java
core/trunk/src/main/java/org/jboss/cache/invocation/LegacyInvocationContext.java
core/trunk/src/main/java/org/jboss/cache/invocation/MVCCInvocationContext.java
core/trunk/src/main/java/org/jboss/cache/invocation/NodeInvocationDelegate.java
core/trunk/src/main/java/org/jboss/cache/loader/AbstractCacheLoader.java
core/trunk/src/main/java/org/jboss/cache/loader/AdjListJDBCCacheLoaderConfig.java
core/trunk/src/main/java/org/jboss/cache/loader/CacheLoader.java
core/trunk/src/main/java/org/jboss/cache/loader/CacheLoaderManager.java
core/trunk/src/main/java/org/jboss/cache/loader/ChainingCacheLoader.java
core/trunk/src/main/java/org/jboss/cache/loader/ClusteredCacheLoader.java
core/trunk/src/main/java/org/jboss/cache/loader/FileCacheLoader.java
core/trunk/src/main/java/org/jboss/cache/loader/ReadOnlyDelegatingCacheLoader.java
core/trunk/src/main/java/org/jboss/cache/loader/tcp/TcpCacheOperations.java
core/trunk/src/main/java/org/jboss/cache/lock/AbstractLockManager.java
core/trunk/src/main/java/org/jboss/cache/lock/FqnLockManager.java
core/trunk/src/main/java/org/jboss/cache/lock/LockManager.java
core/trunk/src/main/java/org/jboss/cache/lock/LockType.java
core/trunk/src/main/java/org/jboss/cache/lock/MVCCLockManager.java
core/trunk/src/main/java/org/jboss/cache/lock/PessimisticNodeBasedLockManager.java
core/trunk/src/main/java/org/jboss/cache/lock/StripedLock.java
core/trunk/src/main/java/org/jboss/cache/marshall/AbstractMarshaller.java
core/trunk/src/main/java/org/jboss/cache/marshall/CacheMarshaller200.java
core/trunk/src/main/java/org/jboss/cache/marshall/CacheMarshaller300.java
core/trunk/src/main/java/org/jboss/cache/marshall/CommandAwareRpcDispatcher.java
core/trunk/src/main/java/org/jboss/cache/marshall/InactiveRegionAwareRpcDispatcher.java
core/trunk/src/main/java/org/jboss/cache/marshall/InactiveRegionException.java
core/trunk/src/main/java/org/jboss/cache/marshall/MarshalledValue.java
core/trunk/src/main/java/org/jboss/cache/marshall/MarshalledValueHelper.java
core/trunk/src/main/java/org/jboss/cache/marshall/MarshalledValueMap.java
core/trunk/src/main/java/org/jboss/cache/marshall/Marshaller.java
core/trunk/src/main/java/org/jboss/cache/marshall/MethodCall.java
core/trunk/src/main/java/org/jboss/cache/marshall/RegionalizedMethodCall.java
core/trunk/src/main/java/org/jboss/cache/marshall/RegionalizedReturnValue.java
core/trunk/src/main/java/org/jboss/cache/marshall/UnmarshalledReferences.java
core/trunk/src/main/java/org/jboss/cache/marshall/VersionAwareMarshaller.java
core/trunk/src/main/java/org/jboss/cache/mvcc/MVCCNodeFactory.java
core/trunk/src/main/java/org/jboss/cache/mvcc/MVCCNodeHelper.java
core/trunk/src/main/java/org/jboss/cache/mvcc/NodeReference.java
core/trunk/src/main/java/org/jboss/cache/mvcc/NullMarkerNode.java
core/trunk/src/main/java/org/jboss/cache/mvcc/ReadCommittedNode.java
core/trunk/src/main/java/org/jboss/cache/mvcc/RepeatableReadNode.java
core/trunk/src/main/java/org/jboss/cache/notifications/IncorrectCacheListenerException.java
core/trunk/src/main/java/org/jboss/cache/notifications/NotifierImpl.java
core/trunk/src/main/java/org/jboss/cache/notifications/annotation/BuddyGroupChanged.java
core/trunk/src/main/java/org/jboss/cache/notifications/annotation/CacheBlocked.java
core/trunk/src/main/java/org/jboss/cache/notifications/annotation/CacheListener.java
core/trunk/src/main/java/org/jboss/cache/notifications/annotation/CacheStarted.java
core/trunk/src/main/java/org/jboss/cache/notifications/annotation/CacheStopped.java
core/trunk/src/main/java/org/jboss/cache/notifications/annotation/CacheUnblocked.java
core/trunk/src/main/java/org/jboss/cache/notifications/annotation/NodeActivated.java
core/trunk/src/main/java/org/jboss/cache/notifications/annotation/NodeCreated.java
core/trunk/src/main/java/org/jboss/cache/notifications/annotation/NodeEvicted.java
core/trunk/src/main/java/org/jboss/cache/notifications/annotation/NodeInvalidated.java
core/trunk/src/main/java/org/jboss/cache/notifications/annotation/NodeLoaded.java
core/trunk/src/main/java/org/jboss/cache/notifications/annotation/NodeModified.java
core/trunk/src/main/java/org/jboss/cache/notifications/annotation/NodeMoved.java
core/trunk/src/main/java/org/jboss/cache/notifications/annotation/NodePassivated.java
core/trunk/src/main/java/org/jboss/cache/notifications/annotation/NodeRemoved.java
core/trunk/src/main/java/org/jboss/cache/notifications/annotation/NodeVisited.java
core/trunk/src/main/java/org/jboss/cache/notifications/annotation/TransactionCompleted.java
core/trunk/src/main/java/org/jboss/cache/notifications/annotation/TransactionRegistered.java
core/trunk/src/main/java/org/jboss/cache/notifications/annotation/ViewChanged.java
core/trunk/src/main/java/org/jboss/cache/notifications/event/BuddyGroupChangedEvent.java
core/trunk/src/main/java/org/jboss/cache/notifications/event/CacheBlockedEvent.java
core/trunk/src/main/java/org/jboss/cache/notifications/event/CacheStartedEvent.java
core/trunk/src/main/java/org/jboss/cache/notifications/event/CacheStoppedEvent.java
core/trunk/src/main/java/org/jboss/cache/notifications/event/CacheUnblockedEvent.java
core/trunk/src/main/java/org/jboss/cache/notifications/event/Event.java
core/trunk/src/main/java/org/jboss/cache/notifications/event/EventImpl.java
core/trunk/src/main/java/org/jboss/cache/notifications/event/NodeActivatedEvent.java
core/trunk/src/main/java/org/jboss/cache/notifications/event/NodeCreatedEvent.java
core/trunk/src/main/java/org/jboss/cache/notifications/event/NodeEvent.java
core/trunk/src/main/java/org/jboss/cache/notifications/event/NodeEvictedEvent.java
core/trunk/src/main/java/org/jboss/cache/notifications/event/NodeInvalidatedEvent.java
core/trunk/src/main/java/org/jboss/cache/notifications/event/NodeLoadedEvent.java
core/trunk/src/main/java/org/jboss/cache/notifications/event/NodeModifiedEvent.java
core/trunk/src/main/java/org/jboss/cache/notifications/event/NodeMovedEvent.java
core/trunk/src/main/java/org/jboss/cache/notifications/event/NodePassivatedEvent.java
core/trunk/src/main/java/org/jboss/cache/notifications/event/NodeRemovedEvent.java
core/trunk/src/main/java/org/jboss/cache/notifications/event/NodeVisitedEvent.java
core/trunk/src/main/java/org/jboss/cache/notifications/event/TransactionCompletedEvent.java
core/trunk/src/main/java/org/jboss/cache/notifications/event/TransactionRegisteredEvent.java
core/trunk/src/main/java/org/jboss/cache/notifications/event/TransactionalEvent.java
core/trunk/src/main/java/org/jboss/cache/notifications/event/ViewChangedEvent.java
core/trunk/src/main/java/org/jboss/cache/optimistic/DataVersion.java
core/trunk/src/main/java/org/jboss/cache/optimistic/DataVersioningException.java
core/trunk/src/main/java/org/jboss/cache/optimistic/DefaultDataVersion.java
core/trunk/src/main/java/org/jboss/cache/optimistic/OptimisticNodeFactory.java
core/trunk/src/main/java/org/jboss/cache/optimistic/TransactionWorkspace.java
core/trunk/src/main/java/org/jboss/cache/optimistic/TransactionWorkspaceImpl.java
core/trunk/src/main/java/org/jboss/cache/optimistic/WorkspaceNode.java
core/trunk/src/main/java/org/jboss/cache/optimistic/WorkspaceNodeImpl.java
core/trunk/src/main/java/org/jboss/cache/remoting/jgroups/ChannelMessageListener.java
core/trunk/src/main/java/org/jboss/cache/statetransfer/LegacyStateTransferManager.java
core/trunk/src/main/java/org/jboss/cache/statetransfer/StateTransferManager.java
core/trunk/src/main/java/org/jboss/cache/transaction/GlobalTransaction.java
core/trunk/src/main/java/org/jboss/cache/transaction/MVCCTransactionContext.java
core/trunk/src/main/java/org/jboss/cache/transaction/OptimisticTransactionContext.java
core/trunk/src/main/java/org/jboss/cache/transaction/TransactionContext.java
core/trunk/src/main/java/org/jboss/cache/util/BeanUtils.java
core/trunk/src/main/java/org/jboss/cache/util/BitEncodedIntegerSet.java
core/trunk/src/main/java/org/jboss/cache/util/CachePrinter.java
core/trunk/src/main/java/org/jboss/cache/util/ImmutableListCopy.java
core/trunk/src/main/java/org/jboss/cache/util/concurrent/ConcurrentHashSet.java
core/trunk/src/main/java/org/jboss/cache/util/concurrent/ReclosableLatch.java
core/trunk/src/main/java/org/jboss/cache/util/concurrent/SelfInitializingConcurrentHashMap.java
core/trunk/src/main/java/org/jboss/cache/util/concurrent/WithinThreadExecutor.java
core/trunk/src/main/java/org/jboss/cache/util/concurrent/locks/LockContainer.java
core/trunk/src/main/java/org/jboss/cache/util/concurrent/locks/OwnableReentrantLock.java
core/trunk/src/main/java/org/jboss/cache/util/concurrent/locks/OwnableReentrantLockContainer.java
core/trunk/src/main/java/org/jboss/cache/util/concurrent/locks/ReentrantLockContainer.java
core/trunk/src/main/java/org/jboss/cache/util/reflect/ReflectionUtil.java
core/trunk/src/test/java/org/jboss/cache/CacheFactoryTest.java
core/trunk/src/test/java/org/jboss/cache/api/CacheAPITest.java
core/trunk/src/test/java/org/jboss/cache/api/NodeAPITest.java
core/trunk/src/test/java/org/jboss/cache/api/NodeMoveAPITest.java
core/trunk/src/test/java/org/jboss/cache/api/SyncReplTest.java
core/trunk/src/test/java/org/jboss/cache/api/SyncReplTxTest.java
core/trunk/src/test/java/org/jboss/cache/api/mvcc/LockAssert.java
core/trunk/src/test/java/org/jboss/cache/api/mvcc/LockTestBase.java
core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/InvalidatedOptNodeValidityTest.java
core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/InvalidatedPessNodeValidityTest.java
core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/LocalOptNodeValidityTest.java
core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/LocalPessNodeValidityTest.java
core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/NodeValidityTestBase.java
core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/ReplicatedOptNodeValidityTest.java
core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/ReplicatedPessNodeValidityTest.java
core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyAssignmentStateTransferTest.java
core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyFqnTransformerTest.java
core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyGroupAssignmentTest.java
core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyManagerTest.java
core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyPoolBroadcastTest.java
core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationConfigTest.java
core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationContentTest.java
core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationFailoverTest.java
core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationTestsBase.java
core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationWithCacheLoaderTest.java
core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationWithOptimisticLockingTest.java
core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationWithPassivationTest.java
core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationWithTransactionsTest.java
core/trunk/src/test/java/org/jboss/cache/buddyreplication/DisabledStateTransferTest.java
core/trunk/src/test/java/org/jboss/cache/buddyreplication/EmptyRegionTest.java
core/trunk/src/test/java/org/jboss/cache/buddyreplication/EvictionOfBuddyBackupsTest.java
core/trunk/src/test/java/org/jboss/cache/buddyreplication/GravitationCleanupTest.java
core/trunk/src/test/java/org/jboss/cache/buddyreplication/NextMemberBuddyLocatorTest.java
core/trunk/src/test/java/org/jboss/cache/config/ConfigurationTest.java
core/trunk/src/test/java/org/jboss/cache/config/parsing/CacheConfigsTest.java
core/trunk/src/test/java/org/jboss/cache/demo/JBossCacheGUI.java
core/trunk/src/test/java/org/jboss/cache/eviction/minttl/FIFOMinTTLTest.java
core/trunk/src/test/java/org/jboss/cache/eviction/minttl/LFUMinTTLTest.java
core/trunk/src/test/java/org/jboss/cache/eviction/minttl/LRUMinTTLTest.java
core/trunk/src/test/java/org/jboss/cache/eviction/minttl/MRUMinTTLTest.java
core/trunk/src/test/java/org/jboss/cache/eviction/minttl/MinTTLTestBase.java
core/trunk/src/test/java/org/jboss/cache/factories/ComponentRegistryFunctionalTest.java
core/trunk/src/test/java/org/jboss/cache/factories/ComponentRegistryUnitTest.java
core/trunk/src/test/java/org/jboss/cache/factories/CustomInterceptorChainTest.java
core/trunk/src/test/java/org/jboss/cache/factories/InterceptorChainTestBase.java
core/trunk/src/test/java/org/jboss/cache/factories/LateConfigurationTest.java
core/trunk/src/test/java/org/jboss/cache/interceptors/LegacyInterceptorTest.java
core/trunk/src/test/java/org/jboss/cache/interceptors/MarshalledValueInterceptorTest.java
core/trunk/src/test/java/org/jboss/cache/invalidation/InvalidationInterceptorTest.java
core/trunk/src/test/java/org/jboss/cache/invalidation/TombstoneEvictionTest.java
core/trunk/src/test/java/org/jboss/cache/invalidation/VersionInconsistencyTest.java
core/trunk/src/test/java/org/jboss/cache/invocationcontext/TransactionTest.java
core/trunk/src/test/java/org/jboss/cache/jmx/deprecated/CacheJmxWrapperTest.java
core/trunk/src/test/java/org/jboss/cache/jmx/deprecated/CacheJmxWrapperTestBase.java
core/trunk/src/test/java/org/jboss/cache/jmx/deprecated/OptimisticNotificationTest.java
core/trunk/src/test/java/org/jboss/cache/loader/AbstractCacheLoaderTestBase.java
core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderManagerTest.java
core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderMethodCallCounterTest.java
core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderPurgingTest.java
core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderWithReplicationTest.java
core/trunk/src/test/java/org/jboss/cache/loader/ChainingCacheLoaderBasicTest.java
core/trunk/src/test/java/org/jboss/cache/loader/ChainingCacheLoaderFullTest.java
core/trunk/src/test/java/org/jboss/cache/loader/ClusteredCacheLoaderTest.java
core/trunk/src/test/java/org/jboss/cache/loader/ConcurrentPutRemoveEvictTest.java
core/trunk/src/test/java/org/jboss/cache/loader/DummyCountingCacheLoader.java
core/trunk/src/test/java/org/jboss/cache/loader/DummyInMemoryCacheLoader.java
core/trunk/src/test/java/org/jboss/cache/loader/DummySharedInMemoryCacheLoader.java
core/trunk/src/test/java/org/jboss/cache/loader/SharedCacheLoaderTest.java
core/trunk/src/test/java/org/jboss/cache/loader/UnnecessaryLoadingTest.java
core/trunk/src/test/java/org/jboss/cache/lock/MVCCLockManagerRecordingTest.java
core/trunk/src/test/java/org/jboss/cache/lock/NodeBasedLockManagerRecordingTest.java
core/trunk/src/test/java/org/jboss/cache/lock/PessimisticLockTest.java
core/trunk/src/test/java/org/jboss/cache/marshall/AbstractVersionAwareMarshallerTest.java
core/trunk/src/test/java/org/jboss/cache/marshall/AsyncReplMarshalledValuesTest.java
core/trunk/src/test/java/org/jboss/cache/marshall/CustomCollectionTest.java
core/trunk/src/test/java/org/jboss/cache/marshall/InvalidRegionForStateTransferTest.java
core/trunk/src/test/java/org/jboss/cache/marshall/MarshalledValueTest.java
core/trunk/src/test/java/org/jboss/cache/marshall/MethodIdPreservationTest.java
core/trunk/src/test/java/org/jboss/cache/marshall/ReturnValueMarshallingMarshalledValuesTest.java
core/trunk/src/test/java/org/jboss/cache/marshall/ReturnValueMarshallingTest.java
core/trunk/src/test/java/org/jboss/cache/marshall/SyncReplMarshalledValuesTest.java
core/trunk/src/test/java/org/jboss/cache/marshall/VersionAwareMarshallerTest.java
core/trunk/src/test/java/org/jboss/cache/mvcc/MVCCFullStackTest.java
core/trunk/src/test/java/org/jboss/cache/notifications/BuddyGroupChangeNotificationTest.java
core/trunk/src/test/java/org/jboss/cache/notifications/ConcurrentNotificationTest.java
core/trunk/src/test/java/org/jboss/cache/notifications/NodeMapDiffTest.java
core/trunk/src/test/java/org/jboss/cache/notifications/NotificationThreadTest.java
core/trunk/src/test/java/org/jboss/cache/notifications/NotifierAnnotationsTest.java
core/trunk/src/test/java/org/jboss/cache/notifications/RemoteCacheListenerOptimisticTest.java
core/trunk/src/test/java/org/jboss/cache/optimistic/ChildMapLazyLoadingTest.java
core/trunk/src/test/java/org/jboss/cache/optimistic/ConcurrentTransactionTest.java
core/trunk/src/test/java/org/jboss/cache/optimistic/DataVersionPersistenceTest.java
core/trunk/src/test/java/org/jboss/cache/optimistic/DataVersionTransferTest.java
core/trunk/src/test/java/org/jboss/cache/optimistic/HasChildTest.java
core/trunk/src/test/java/org/jboss/cache/optimistic/LockParentVersionTest.java
core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticLockInterceptorTest.java
core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticVersioningTest.java
core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticWithCacheLoaderTest.java
core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticWithPassivationTest.java
core/trunk/src/test/java/org/jboss/cache/optimistic/ParentVersionTest.java
core/trunk/src/test/java/org/jboss/cache/optimistic/ThreadedCacheAccessTest.java
core/trunk/src/test/java/org/jboss/cache/optimistic/ValidationFailureTest.java
core/trunk/src/test/java/org/jboss/cache/optimistic/VersioningOnReadTest.java
core/trunk/src/test/java/org/jboss/cache/options/CacheModeLocalSimpleTest.java
core/trunk/src/test/java/org/jboss/cache/options/ExplicitVersionsReplTest.java
core/trunk/src/test/java/org/jboss/cache/options/ExplicitVersionsTest.java
core/trunk/src/test/java/org/jboss/cache/options/ForceCacheModeTest.java
core/trunk/src/test/java/org/jboss/cache/options/ForceWriteLockTest.java
core/trunk/src/test/java/org/jboss/cache/options/PessimisticFailSilentlyTest.java
core/trunk/src/test/java/org/jboss/cache/options/PessimisticSuppressLockingTest.java
core/trunk/src/test/java/org/jboss/cache/options/cachemodelocal/CacheModeLocalTestBase.java
core/trunk/src/test/java/org/jboss/cache/profiling/ConstructionTest.java
core/trunk/src/test/java/org/jboss/cache/profiling/MockAsyncReplTest.java
core/trunk/src/test/java/org/jboss/cache/profiling/ProfileSlaveTest.java
core/trunk/src/test/java/org/jboss/cache/profiling/ProfileTest.java
core/trunk/src/test/java/org/jboss/cache/replicated/ExceptionTest.java
core/trunk/src/test/java/org/jboss/cache/replicated/SyncReplTest.java
core/trunk/src/test/java/org/jboss/cache/transaction/InvocationContextCleanupTest.java
core/trunk/src/test/java/org/jboss/cache/transaction/NotifyingTransactionManager.java
core/trunk/src/test/java/org/jboss/cache/transaction/PrepareCommitContentionTest.java
core/trunk/src/test/java/org/jboss/cache/transaction/SimultaneousRollbackAndPutTest.java
core/trunk/src/test/java/org/jboss/cache/transaction/SuspendTxTest.java
core/trunk/src/test/java/org/jboss/cache/transaction/isolationlevels/IsolationLevelTestBase.java
core/trunk/src/test/java/org/jboss/cache/transaction/isolationlevels/NoneTest.java
core/trunk/src/test/java/org/jboss/cache/transaction/isolationlevels/ReadCommittedTest.java
core/trunk/src/test/java/org/jboss/cache/transaction/isolationlevels/ReadUncommittedTest.java
core/trunk/src/test/java/org/jboss/cache/transaction/isolationlevels/RepeatableReadTest.java
core/trunk/src/test/java/org/jboss/cache/transaction/isolationlevels/SerializableTest.java
core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/AbortionTest.java
core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/StatusUnknownTest.java
core/trunk/src/test/java/org/jboss/cache/util/BitEncodedIntegerSetTest.java
core/trunk/src/test/java/org/jboss/cache/util/internals/EvictionWatcher.java
Log:
Removed email address from javadocs
Modified: core/trunk/src/main/java/org/jboss/cache/AbstractNodeFactory.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/AbstractNodeFactory.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/AbstractNodeFactory.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -37,7 +37,7 @@
/**
* Generates new nodes based on the {@link CacheSPI} configuration.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
*/
public abstract class AbstractNodeFactory<K, V> implements NodeFactory<K, V>
{
Modified: core/trunk/src/main/java/org/jboss/cache/Cache.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/Cache.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/Cache.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -87,7 +87,7 @@
* For more information, please read the JBoss Cache user guide and tutorial, available on <a href="http://labs.jboss.com/portal/jbosscache/docs/index.html" target="_BLANK">the JBoss Cache documentation site</a>,
* and look through the examples <a href="http://labs.jboss.com/portal/jbosscache/download/index.html" target="_BLANK">shipped with the JBoss Cache distribution</a>.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
* @see Node
* @see CacheFactory
* @since 2.0.0
Modified: core/trunk/src/main/java/org/jboss/cache/CacheException.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/CacheException.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/CacheException.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -28,7 +28,7 @@
* have more specific uses.
*
* @author <a href="mailto:bela@jboss.org">Bela Ban</a>
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
*/
public class CacheException extends RuntimeException
{
Modified: core/trunk/src/main/java/org/jboss/cache/CacheFactory.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/CacheFactory.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/CacheFactory.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -45,7 +45,7 @@
* </ul>
* In addition, methods provide anadditional option to create and return a cache without starting it.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
* @see org.jboss.cache.Cache
* @see org.jboss.cache.DefaultCacheFactory
* @since 2.0.0
Modified: core/trunk/src/main/java/org/jboss/cache/CacheSPI.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/CacheSPI.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/CacheSPI.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -50,7 +50,7 @@
* types of {@link Node} are replaced with {@link NodeSPI}.
* <p/>
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
* @see NodeSPI
* @see Cache
* @see org.jboss.cache.loader.CacheLoader
Modified: core/trunk/src/main/java/org/jboss/cache/DefaultCacheFactory.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/DefaultCacheFactory.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/DefaultCacheFactory.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -40,7 +40,7 @@
* {@link org.jboss.cache.factories.ComponentRegistry}.
* <p/>
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
* @see org.jboss.cache.factories.ComponentFactory
*/
public class DefaultCacheFactory<K, V> extends ComponentFactory implements CacheFactory<K, V>
Modified: core/trunk/src/main/java/org/jboss/cache/FqnComparator.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/FqnComparator.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/FqnComparator.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -35,7 +35,7 @@
* xxx/ccc
* </pre>
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @author Steve Woodcock (<a href="mailto:stevew@jofti.com">stevew(a)jofti.com</a>)
*/
@Immutable
Modified: core/trunk/src/main/java/org/jboss/cache/InternalNode.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/InternalNode.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/InternalNode.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -38,7 +38,7 @@
* delegate to calls on an InternalNode, for example, {@link NodeSPI#putDirect(Object, Object)} delegating to {@link #put(Object, Object)}.
* <p/>
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
*/
public interface InternalNode<K, V>
Modified: core/trunk/src/main/java/org/jboss/cache/InvocationContext.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/InvocationContext.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/InvocationContext.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -45,7 +45,7 @@
* Note that prior to 3.0.0, InvocationContext was a concrete class and not an abstract one.
* <p/>
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @see org.jboss.cache.transaction.TransactionContext
*/
@SuppressWarnings("deprecation")
Modified: core/trunk/src/main/java/org/jboss/cache/LegacyRegionManagerImpl.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/LegacyRegionManagerImpl.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/LegacyRegionManagerImpl.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -31,7 +31,7 @@
/**
* For optimistic and pessimistically locked caches
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.0.0
* @deprecated will be removed along with optimistic and pessimistic locking.
*/
Modified: core/trunk/src/main/java/org/jboss/cache/Node.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/Node.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/Node.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -44,7 +44,7 @@
* but some are read-only or return copies of the underlying the data.
* <p/>
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
* @see Cache
* @since 2.0.0
*/
Modified: core/trunk/src/main/java/org/jboss/cache/NodeFactory.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/NodeFactory.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/NodeFactory.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -31,7 +31,7 @@
* An interface for a factory that creates nodes. This used to be a concrete class prior to 3.0.0. Made into an
* interface to simplify logic of different locking schemes and node types.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
*/
public interface NodeFactory<K, V>
Modified: core/trunk/src/main/java/org/jboss/cache/NodeNotValidException.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/NodeNotValidException.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/NodeNotValidException.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -25,7 +25,7 @@
* Thrown whenever operations are attempted on a node that is no longer valid. See {@link org.jboss.cache.Node#isValid()}
* for details.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.1.0
*/
public class NodeNotValidException extends CacheException
Modified: core/trunk/src/main/java/org/jboss/cache/NodeSPI.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/NodeSPI.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/NodeSPI.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -56,7 +56,7 @@
* In addition to being unmodifiable, they are also defensively copied from the underlying data map to ensure view consistency.
* <p/>
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
* @see Node
* @see org.jboss.cache.CacheSPI
* @since 2.0.0
Modified: core/trunk/src/main/java/org/jboss/cache/PessimisticNodeFactory.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/PessimisticNodeFactory.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/PessimisticNodeFactory.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -29,7 +29,7 @@
/**
* Node factory specific to pessimistic locking.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
* @deprecated will be removed along with optimistic and pessimistic locking.
*/
Modified: core/trunk/src/main/java/org/jboss/cache/PessimisticUnversionedNode.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/PessimisticUnversionedNode.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/PessimisticUnversionedNode.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -40,7 +40,7 @@
/**
* UnversionedNode specific to pessimistic locking, with legacy code.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
* @deprecated will be removed along with optimistic and pessimistic locking.
*/
Modified: core/trunk/src/main/java/org/jboss/cache/RPCManagerImpl.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/RPCManagerImpl.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/RPCManagerImpl.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -78,7 +78,7 @@
/**
* Manager that handles all RPC calls between JBoss Cache instances
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
*/
@MBean(objectName = "RPCManager")
public class RPCManagerImpl implements RPCManager
Modified: core/trunk/src/main/java/org/jboss/cache/Region.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/Region.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/Region.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -43,7 +43,7 @@
* Note that a single region can be both an eviction and marshalling region at the same time.
* <p/>
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
* @see RegionManager
* @since 2.0.0
*/
Modified: core/trunk/src/main/java/org/jboss/cache/RegionEmptyException.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/RegionEmptyException.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/RegionEmptyException.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -24,7 +24,7 @@
/**
* Exception to represent a region being empty when state was expected in that region.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 2.2.0
*/
public class RegionEmptyException extends CacheException
Modified: core/trunk/src/main/java/org/jboss/cache/RegionImpl.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/RegionImpl.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/RegionImpl.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -42,7 +42,7 @@
/**
* Default implementation of a {@link Region}
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
*/
public class RegionImpl implements Region
{
Modified: core/trunk/src/main/java/org/jboss/cache/RegionManager.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/RegionManager.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/RegionManager.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -33,7 +33,7 @@
* <p/>
* Prior to 3.0.0, this was a concrete class. An interface was introduced in 3.0.0 for enhanced flexibility.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
*/
public interface RegionManager
Modified: core/trunk/src/main/java/org/jboss/cache/RegionManagerImpl.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/RegionManagerImpl.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/RegionManagerImpl.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -49,7 +49,7 @@
/**
* The default region manager, used with MVCC locking.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 3.0.0
*/
@ThreadSafe
Modified: core/trunk/src/main/java/org/jboss/cache/RegionRegistry.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/RegionRegistry.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/RegionRegistry.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -28,7 +28,7 @@
/**
* An extension of the ConcurrentHashMap that acts as a container for regions.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
*/
@NonVolatile
Modified: core/trunk/src/main/java/org/jboss/cache/StringFqn.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/StringFqn.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/StringFqn.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -35,7 +35,7 @@
* Expect indeterminate behaviour until proper String escaping is in place.
* <p/>
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 2.2.0
*/
// TODO: 3.0.0: Implement proper String escaping.
Modified: core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -42,7 +42,7 @@
* Basic data node class. Throws {@link UnsupportedOperationException} for version-specific methods like {@link #getVersion()} and
* {@link #setVersion(org.jboss.cache.optimistic.DataVersion)}, defined in {@link org.jboss.cache.NodeSPI}.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 2.0.0
*/
public class UnversionedNode<K, V> extends AbstractNode<K, V> implements InternalNode<K, V>
Modified: core/trunk/src/main/java/org/jboss/cache/VersionedNode.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/VersionedNode.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/VersionedNode.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -36,7 +36,7 @@
* <p/>
* Typically used when the cache mode configured is {@link org.jboss.cache.config.Configuration.NodeLockingScheme#OPTIMISTIC}
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
* @since 2.0.0
* @deprecated will be removed along with optimistic and pessimistic locking.
*/
Modified: core/trunk/src/main/java/org/jboss/cache/annotations/Compat.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/annotations/Compat.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/annotations/Compat.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -31,7 +31,7 @@
* new code. Similar to deprecated, but provides additional meaning to developers on why certain classes exist.
* <p/>
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
*/
@Retention(RetentionPolicy.SOURCE)
Modified: core/trunk/src/main/java/org/jboss/cache/annotations/Experimental.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/annotations/Experimental.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/annotations/Experimental.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -32,7 +32,7 @@
* future releases.
* <p/>
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 2.2.0
*/
@Retention(RetentionPolicy.SOURCE)
Modified: core/trunk/src/main/java/org/jboss/cache/batch/BatchContainer.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/batch/BatchContainer.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/batch/BatchContainer.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -31,7 +31,7 @@
* A container for holding thread locals for batching, to be used with the {@link org.jboss.cache.Cache#startBatch()} and
* {@link org.jboss.cache.Cache#endBatch(boolean)} calls.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
*/
public class BatchContainer
Modified: core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyGroup.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyGroup.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyGroup.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -34,7 +34,7 @@
/**
* Value object that represents a buddy group
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
*/
@ThreadSafe
public class BuddyGroup implements Serializable
Modified: core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyLocator.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyLocator.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyLocator.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -34,7 +34,7 @@
* Implementations of this class must declare a public no-arguments constructor.
* </p>
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
* @since 1.4.0
*/
public interface BuddyLocator
Modified: core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -86,7 +86,7 @@
/**
* Class that manages buddy replication groups.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
*/
public class BuddyManager
{
Modified: core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyNotInitException.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyNotInitException.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyNotInitException.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -26,7 +26,7 @@
/**
* Exception to depict that a buddy has not been initialised to participate in any comms
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 1.4.1
*/
public class BuddyNotInitException extends CacheException
Modified: core/trunk/src/main/java/org/jboss/cache/buddyreplication/NextMemberBuddyLocator.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/buddyreplication/NextMemberBuddyLocator.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/buddyreplication/NextMemberBuddyLocator.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -48,7 +48,7 @@
* set to true.</li>
* </ul>
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
*/
@ThreadSafe
public class NextMemberBuddyLocator implements BuddyLocator
Modified: core/trunk/src/main/java/org/jboss/cache/commands/DataCommand.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/commands/DataCommand.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/commands/DataCommand.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -1,24 +1,24 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2000 - 2008, 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.
- */
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2000 - 2008, 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.jboss.cache.commands;
import org.jboss.cache.Fqn;
@@ -27,7 +27,7 @@
* Commands of this type manipulate data in the cache.
*
* @author Mircea.Markus(a)jboss.com
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 2.2.0
*/
public interface DataCommand extends VisitableCommand
Modified: core/trunk/src/main/java/org/jboss/cache/commands/OptimisticCommandsFactoryImpl.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/commands/OptimisticCommandsFactoryImpl.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/commands/OptimisticCommandsFactoryImpl.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -33,7 +33,7 @@
/**
* Extends the default commands factory impl for optimistic locking.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
* @deprecated will be removed with opt locking
*/
Modified: core/trunk/src/main/java/org/jboss/cache/commands/PessimisticCommandsFactoryImpl.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/commands/PessimisticCommandsFactoryImpl.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/commands/PessimisticCommandsFactoryImpl.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -47,7 +47,7 @@
* This specific implementation of {@link CommandsFactory} specifically creates
* pessimistic commands where appropriate, with the ability to roll back.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @see org.jboss.cache.commands.legacy.ReversibleCommand
* @since 3.0
* @deprecated will be removed with possimistic locking
Modified: core/trunk/src/main/java/org/jboss/cache/commands/VersionedDataCommand.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/commands/VersionedDataCommand.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/commands/VersionedDataCommand.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -1,24 +1,24 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2000 - 2008, 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.
- */
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2000 - 2008, 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.jboss.cache.commands;
import org.jboss.cache.optimistic.DataVersion;
@@ -28,7 +28,7 @@
* is currently used by optimistic locking, and in future will be used by MVCC as well.
*
* @author Mircea.Markus(a)jboss.com
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 2.2.0
*/
public interface VersionedDataCommand extends WriteCommand
Modified: core/trunk/src/main/java/org/jboss/cache/commands/VisitableCommand.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/commands/VisitableCommand.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/commands/VisitableCommand.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -26,7 +26,7 @@
/**
* A type of command that can accept {@link org.jboss.cache.commands.Visitor}s, such as {@link org.jboss.cache.interceptors.base.CommandInterceptor}s.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 2.2.0
*/
public interface VisitableCommand extends ReplicableCommand
Modified: core/trunk/src/main/java/org/jboss/cache/commands/WriteCommand.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/commands/WriteCommand.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/commands/WriteCommand.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -1,24 +1,24 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2000 - 2008, 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.
- */
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2000 - 2008, 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.jboss.cache.commands;
import org.jboss.cache.transaction.GlobalTransaction;
@@ -27,7 +27,7 @@
* A write command that has a reference to a {@link org.jboss.cache.transaction.GlobalTransaction}.
*
* @author Mircea.Markus(a)jboss.com
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 2.2.0
*/
public interface WriteCommand extends DataCommand
Modified: core/trunk/src/main/java/org/jboss/cache/commands/legacy/ReversibleCommand.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/commands/legacy/ReversibleCommand.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/commands/legacy/ReversibleCommand.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -26,7 +26,7 @@
/**
* A write command that can be reversed by calling a rollback.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
* @deprecated will be removed along with optimistic and pessimistic locking.
*/
Modified: core/trunk/src/main/java/org/jboss/cache/commands/legacy/read/LegacyGravitateDataCommand.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/commands/legacy/read/LegacyGravitateDataCommand.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/commands/legacy/read/LegacyGravitateDataCommand.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -32,7 +32,7 @@
/**
* Legacy version that uses old data container peeks
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
* @deprecated will be removed along with optimistic and pessimistic locking.
*/
Modified: core/trunk/src/main/java/org/jboss/cache/commands/legacy/write/CreateNodeCommand.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/commands/legacy/write/CreateNodeCommand.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/commands/legacy/write/CreateNodeCommand.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -36,7 +36,7 @@
/**
* Command that creates a node. Primarily to be used as an undo command for removing nodes.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 2.2.0
* @deprecated will be removed when pessimistic locking is removed.
*/
Modified: core/trunk/src/main/java/org/jboss/cache/commands/legacy/write/LegacyEvictCommand.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/commands/legacy/write/LegacyEvictCommand.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/commands/legacy/write/LegacyEvictCommand.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -31,7 +31,7 @@
/**
* Evict command for legacy locking schemes like OL and PL.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
* @deprecated will be removed along with optimistic and pessimistic locking.
*/
Modified: core/trunk/src/main/java/org/jboss/cache/commands/legacy/write/PessClearDataCommand.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/commands/legacy/write/PessClearDataCommand.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/commands/legacy/write/PessClearDataCommand.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -34,7 +34,7 @@
* A version of {@link org.jboss.cache.commands.write.ClearDataCommand} which can be rolled back, for use with
* pessimistic locking where changes are made directly on the data structures and may need to be reversed.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
* @deprecated will be removed along with optimistic and pessimistic locking.
*/
Modified: core/trunk/src/main/java/org/jboss/cache/commands/legacy/write/PessMoveCommand.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/commands/legacy/write/PessMoveCommand.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/commands/legacy/write/PessMoveCommand.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -32,7 +32,7 @@
* A version of {@link org.jboss.cache.commands.write.MoveCommand} which can be rolled back, for use with
* pessimistic locking where changes are made directly on the data structures and may need to be reversed.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
* @deprecated will be removed along with optimistic and pessimistic locking.
*/
Modified: core/trunk/src/main/java/org/jboss/cache/commands/legacy/write/PessPutDataMapCommand.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/commands/legacy/write/PessPutDataMapCommand.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/commands/legacy/write/PessPutDataMapCommand.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -35,7 +35,7 @@
* A version of {@link org.jboss.cache.commands.write.PutDataMapCommand} which can be rolled back, for use with
* pessimistic locking where changes are made directly on the data structures and may need to be reversed.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
* @deprecated will be removed along with optimistic and pessimistic locking.
*/
Modified: core/trunk/src/main/java/org/jboss/cache/commands/legacy/write/PessPutForExternalReadCommand.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/commands/legacy/write/PessPutForExternalReadCommand.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/commands/legacy/write/PessPutForExternalReadCommand.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -33,7 +33,7 @@
* A version of {@link org.jboss.cache.commands.write.PutForExternalReadCommand} which can be rolled back, for use with
* pessimistic locking where changes are made directly on the data structures and may need to be reversed.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
* @deprecated will be removed along with optimistic and pessimistic locking.
*/
Modified: core/trunk/src/main/java/org/jboss/cache/commands/legacy/write/PessPutKeyValueCommand.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/commands/legacy/write/PessPutKeyValueCommand.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/commands/legacy/write/PessPutKeyValueCommand.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -33,7 +33,7 @@
* A version of {@link org.jboss.cache.commands.write.PutKeyValueCommand} which can be rolled back, for use with
* pessimistic locking where changes are made directly on the data structures and may need to be reversed.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
* @deprecated will be removed along with optimistic and pessimistic locking.
*/
Modified: core/trunk/src/main/java/org/jboss/cache/commands/legacy/write/PessRemoveKeyCommand.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/commands/legacy/write/PessRemoveKeyCommand.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/commands/legacy/write/PessRemoveKeyCommand.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -32,7 +32,7 @@
* A version of {@link org.jboss.cache.commands.write.RemoveKeyCommand} which can be rolled back, for use with
* pessimistic locking where changes are made directly on the data structures and may need to be reversed.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
* @deprecated will be removed along with optimistic and pessimistic locking.
*/
Modified: core/trunk/src/main/java/org/jboss/cache/commands/legacy/write/PessRemoveNodeCommand.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/commands/legacy/write/PessRemoveNodeCommand.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/commands/legacy/write/PessRemoveNodeCommand.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -35,7 +35,7 @@
* A version of {@link org.jboss.cache.commands.write.RemoveNodeCommand} which can be rolled back, for use with
* pessimistic locking where changes are made directly on the data structures and may need to be reversed.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
* @deprecated will be removed along with optimistic and pessimistic locking.
*/
Modified: core/trunk/src/main/java/org/jboss/cache/commands/read/AbstractDataCommand.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/commands/read/AbstractDataCommand.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/commands/read/AbstractDataCommand.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -28,7 +28,7 @@
/**
* An abstract class providing basic functionality of all {@link DataCommand}s.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 2.2.0
*/
public abstract class AbstractDataCommand implements DataCommand
Modified: core/trunk/src/main/java/org/jboss/cache/commands/tx/AbstractTransactionCommand.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/commands/tx/AbstractTransactionCommand.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/commands/tx/AbstractTransactionCommand.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -28,7 +28,7 @@
/**
* Base class for transaction boundary commands that deal with global transactions
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 2.2.0
*/
public abstract class AbstractTransactionCommand implements VisitableCommand
Modified: core/trunk/src/main/java/org/jboss/cache/commands/write/AbstractVersionedDataCommand.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/commands/write/AbstractVersionedDataCommand.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/commands/write/AbstractVersionedDataCommand.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -35,7 +35,7 @@
/**
* Base version of {@link org.jboss.cache.commands.DataCommand} which handles common behaviour
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 2.2.0
*/
public abstract class AbstractVersionedDataCommand extends AbstractDataCommand implements VersionedDataCommand
Modified: core/trunk/src/main/java/org/jboss/cache/commands/write/PutForExternalReadCommand.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/commands/write/PutForExternalReadCommand.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/commands/write/PutForExternalReadCommand.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -29,7 +29,7 @@
/**
* Represents the {@link org.jboss.cache.Cache#putForExternalRead(org.jboss.cache.Fqn, Object, Object)} method call.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 2.2.0
*/
public class PutForExternalReadCommand extends PutKeyValueCommand
Modified: core/trunk/src/main/java/org/jboss/cache/config/CacheLoaderConfig.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/config/CacheLoaderConfig.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/config/CacheLoaderConfig.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -33,7 +33,7 @@
* Holds the configuration of the cache loader chain. ALL cache loaders should be defined using this class, adding
* individual cache loaders to the chain by calling {@link CacheLoaderConfig#addIndividualCacheLoaderConfig}
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
* @author Brian Stansberry
* @author <a href="mailto:galder.zamarreno@jboss.com">Galder Zamarreno</a>
*/
@@ -179,7 +179,7 @@
/**
* Configuration object that holds the confguration of an individual cache loader.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
* @author <a href="mailto:galder.zamarreno@jboss.com">Galder Zamarreno</a>
*/
public static class IndividualCacheLoaderConfig extends PluggableConfigurationComponent
Modified: core/trunk/src/main/java/org/jboss/cache/config/CloneableConfigurationComponent.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/config/CloneableConfigurationComponent.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/config/CloneableConfigurationComponent.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -26,7 +26,7 @@
/**
* Interface for all configurable components
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
*/
public interface CloneableConfigurationComponent extends Serializable, Cloneable
Modified: core/trunk/src/main/java/org/jboss/cache/config/Configuration.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/config/Configuration.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/config/Configuration.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -38,7 +38,7 @@
/**
* Encapsulates the configuration of a Cache.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
*/
@NonVolatile
public class Configuration extends ConfigurationComponent
Modified: core/trunk/src/main/java/org/jboss/cache/config/ConfigurationException.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/config/ConfigurationException.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/config/ConfigurationException.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -30,7 +30,7 @@
* An exception that represents an error in the configuration. This could be a parsing error or a logical error involving clashing
* configuration options or missing mandatory configuration elements.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
* @see org.jboss.cache.config.Configuration
* @see org.jboss.cache.CacheFactory
*/
Modified: core/trunk/src/main/java/org/jboss/cache/config/Dynamic.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/config/Dynamic.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/config/Dynamic.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -30,7 +30,7 @@
/**
* Annotation that marks fields in {@link Configuration} as being modifiable even after the cache has started.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.0.0
*/
Modified: core/trunk/src/main/java/org/jboss/cache/config/EvictionAlgorithmConfig.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/config/EvictionAlgorithmConfig.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/config/EvictionAlgorithmConfig.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -28,7 +28,7 @@
* more specific eviction policies may subclass {@link org.jboss.cache.eviction.EvictionAlgorithmConfigBase} or re-implement
* this interface to provide access to more config variables.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
*/
public interface EvictionAlgorithmConfig extends CloneableConfigurationComponent
Modified: core/trunk/src/main/java/org/jboss/cache/config/EvictionPolicyConfig.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/config/EvictionPolicyConfig.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/config/EvictionPolicyConfig.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -31,7 +31,7 @@
* more specific eviction policies may subclass or re-implement this interface
* to provide access to more config variables.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
* @deprecated see {@link org.jboss.cache.config.EvictionAlgorithmConfig}
*/
@Deprecated
Modified: core/trunk/src/main/java/org/jboss/cache/config/Option.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/config/Option.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/config/Option.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -26,7 +26,7 @@
/**
* Used to override characteristics of specific calls to the cache. The javadocs of each of the setters below detail functionality and behaviour.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
* @since 1.3.0
*/
public class Option implements Cloneable
Modified: core/trunk/src/main/java/org/jboss/cache/config/PluggableConfigurationComponent.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/config/PluggableConfigurationComponent.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/config/PluggableConfigurationComponent.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -30,7 +30,7 @@
/**
* A configuration component where the implementation class can be specified, and comes with its own set of properties.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 2.2.0
*/
public abstract class PluggableConfigurationComponent extends ConfigurationComponent
Modified: core/trunk/src/main/java/org/jboss/cache/config/UnsupportedEvictionImplException.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/config/UnsupportedEvictionImplException.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/config/UnsupportedEvictionImplException.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -24,7 +24,7 @@
/**
* Thrown if an eviction configuration that cannot be translated to the new 3.x eviction interfaces is used.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
*/
public class UnsupportedEvictionImplException extends ConfigurationException
Modified: core/trunk/src/main/java/org/jboss/cache/config/parsing/XmlConfigHelper.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/config/parsing/XmlConfigHelper.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/config/parsing/XmlConfigHelper.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -56,7 +56,7 @@
/**
* A simple XML utility class for reading configuration elements
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
*/
public class XmlConfigHelper
{
Modified: core/trunk/src/main/java/org/jboss/cache/config/parsing/XmlConfigurationParser2x.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/config/parsing/XmlConfigurationParser2x.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/config/parsing/XmlConfigurationParser2x.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -59,7 +59,7 @@
* JBoss MBean, this role is performed by the JBoss Microcontainer. This class is only used internally in unit tests
* or within {@link org.jboss.cache.CacheFactory} implementations for standalone JBoss Cache usage.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
* @author <a href="mailto:galder.zamarreno@jboss.com">Galder Zamarreno</a>
* @since 2.00.
* @deprecated
Modified: core/trunk/src/main/java/org/jboss/cache/eviction/DefaultEvictionActionPolicy.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/eviction/DefaultEvictionActionPolicy.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/eviction/DefaultEvictionActionPolicy.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -29,7 +29,7 @@
/**
* Default eviction action policy that calls {@link org.jboss.cache.Cache#evict(org.jboss.cache.Fqn)} to evict a node.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
*/
public class DefaultEvictionActionPolicy implements EvictionActionPolicy
Modified: core/trunk/src/main/java/org/jboss/cache/eviction/EvictionActionPolicy.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/eviction/EvictionActionPolicy.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/eviction/EvictionActionPolicy.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -27,7 +27,7 @@
/**
* Performs an eviction on a given Fqn.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
*/
public interface EvictionActionPolicy
Modified: core/trunk/src/main/java/org/jboss/cache/eviction/EvictionAlgorithmConfigBase.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/eviction/EvictionAlgorithmConfigBase.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/eviction/EvictionAlgorithmConfigBase.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -32,7 +32,7 @@
/**
* A base class used for configuring eviction algorithms.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
*/
public abstract class EvictionAlgorithmConfigBase extends ConfigurationComponent implements EvictionAlgorithmConfig
Modified: core/trunk/src/main/java/org/jboss/cache/eviction/EvictionPolicyConfigBase.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/eviction/EvictionPolicyConfigBase.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/eviction/EvictionPolicyConfigBase.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -30,7 +30,7 @@
* Base implementation of {@link EvictionPolicyConfig}. Adds properties
* for the most commonly used config elements.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @deprecated See {@link org.jboss.cache.eviction.EvictionAlgorithmConfigBase}.
*/
@Deprecated
Modified: core/trunk/src/main/java/org/jboss/cache/eviction/ModernizableConfig.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/eviction/ModernizableConfig.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/eviction/ModernizableConfig.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -27,7 +27,7 @@
* Attached to deprecated eviction configuration elements that know how to map to modern counterparts. This interface
* is itself deprecated and is only used to bridge deprecated configurations.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
* @deprecated
*/
Modified: core/trunk/src/main/java/org/jboss/cache/eviction/ModernizablePolicy.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/eviction/ModernizablePolicy.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/eviction/ModernizablePolicy.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -25,7 +25,7 @@
* Attached to deprecated eviction policies that know how to map to modern counterparts. This interface
* is itself deprecated and is only used to bridge deprecated configurations.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
* @deprecated
*/
Modified: core/trunk/src/main/java/org/jboss/cache/eviction/RemoveOnEvictActionPolicy.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/eviction/RemoveOnEvictActionPolicy.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/eviction/RemoveOnEvictActionPolicy.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -29,7 +29,7 @@
/**
* An eviction action policy that calls {@link org.jboss.cache.Cache#removeNode(org.jboss.cache.Fqn)} to evict a node.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
*/
public class RemoveOnEvictActionPolicy implements EvictionActionPolicy
Modified: core/trunk/src/main/java/org/jboss/cache/factories/BootstrapFactory.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/factories/BootstrapFactory.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/factories/BootstrapFactory.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -30,7 +30,7 @@
/**
* Factory for setting up bootstrap components
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 2.2.0
*/
@DefaultFactoryFor(classes = {CacheSPI.class, Configuration.class, ComponentRegistry.class})
Modified: core/trunk/src/main/java/org/jboss/cache/factories/BuddyManagerFactory.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/factories/BuddyManagerFactory.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/factories/BuddyManagerFactory.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -28,7 +28,7 @@
/**
* Buddy manager factory
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 2.1.0
*/
@DefaultFactoryFor(classes = {BuddyManager.class})
Modified: core/trunk/src/main/java/org/jboss/cache/factories/CacheConfigsXmlParser.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/factories/CacheConfigsXmlParser.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/factories/CacheConfigsXmlParser.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -24,7 +24,7 @@
import org.jboss.cache.annotations.Compat;
/**
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
* @deprecated here for compatibility reasons. Use the class with the same name in the <tt>org.jboss.cache.config.parsing</tt> package.
*/
Modified: core/trunk/src/main/java/org/jboss/cache/factories/CommandsMetaFactory.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/factories/CommandsMetaFactory.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/factories/CommandsMetaFactory.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -31,7 +31,7 @@
/**
* COnstructs commands factory
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
*/
@DefaultFactoryFor(classes = CommandsFactory.class)
Modified: core/trunk/src/main/java/org/jboss/cache/factories/ComponentFactory.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/factories/ComponentFactory.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/factories/ComponentFactory.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -35,7 +35,7 @@
* components, which it then delegates to, when actually performing the construction.
* <p/>
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @see Inject
* @see ComponentRegistry
* @since 2.1.0
Modified: core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegistry.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegistry.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegistry.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -74,7 +74,7 @@
* <p/>
* Cache configuration can only be changed and will only be reinjected if the cache is not in the {@link org.jboss.cache.CacheStatus#STARTED} state.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 2.1.0
*/
@NonVolatile
Modified: core/trunk/src/main/java/org/jboss/cache/factories/ContextMetaFactory.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/factories/ContextMetaFactory.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/factories/ContextMetaFactory.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -31,7 +31,7 @@
/**
* Responsible for creating the appropriate {@link org.jboss.cache.factories.context.ContextFactory} based on configuration used.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
*/
@DefaultFactoryFor(classes = ContextFactory.class)
Modified: core/trunk/src/main/java/org/jboss/cache/factories/EmptyConstructorFactory.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/factories/EmptyConstructorFactory.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/factories/EmptyConstructorFactory.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -41,7 +41,7 @@
/**
* Simple factory that just uses reflection and an empty constructor of the component type.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 2.1.0
*/
@DefaultFactoryFor(classes = {Notifier.class, MVCCNodeHelper.class, RegionRegistry.class,
Modified: core/trunk/src/main/java/org/jboss/cache/factories/InterceptorChainFactory.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/factories/InterceptorChainFactory.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/factories/InterceptorChainFactory.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -34,7 +34,7 @@
/**
* Factory class that builds an interceptor chain based on cache configuration.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
*/
@DefaultFactoryFor(classes = InterceptorChain.class)
public class InterceptorChainFactory extends ComponentFactory
Modified: core/trunk/src/main/java/org/jboss/cache/factories/LockManagerFactory.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/factories/LockManagerFactory.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/factories/LockManagerFactory.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -30,7 +30,7 @@
/**
* Creates lock managers
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 2.2.0
*/
@DefaultFactoryFor(classes = LockManager.class)
Modified: core/trunk/src/main/java/org/jboss/cache/factories/NodeMetaFactory.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/factories/NodeMetaFactory.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/factories/NodeMetaFactory.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -31,7 +31,7 @@
/**
* Creates node factories.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
*/
@DefaultFactoryFor(classes = NodeFactory.class)
Modified: core/trunk/src/main/java/org/jboss/cache/factories/RegionManagerFactory.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/factories/RegionManagerFactory.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/factories/RegionManagerFactory.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -29,7 +29,7 @@
/**
* Creates region managers
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
*/
@DefaultFactoryFor(classes = RegionManager.class)
Modified: core/trunk/src/main/java/org/jboss/cache/factories/ReplicationQueueFactory.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/factories/ReplicationQueueFactory.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/factories/ReplicationQueueFactory.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -28,7 +28,7 @@
/**
* RPCManager factory
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 2.1.0
*/
@DefaultFactoryFor(classes = ReplicationQueue.class)
Modified: core/trunk/src/main/java/org/jboss/cache/factories/RuntimeConfigAwareFactory.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/factories/RuntimeConfigAwareFactory.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/factories/RuntimeConfigAwareFactory.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -32,7 +32,7 @@
/**
* An extension of the EmptyConstructorFactory that places a component in the {@link RuntimeConfig} after creating it.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 2.1.0
*/
@DefaultFactoryFor(classes = RPCManager.class)
Modified: core/trunk/src/main/java/org/jboss/cache/factories/StateTransferManagerFactory.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/factories/StateTransferManagerFactory.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/factories/StateTransferManagerFactory.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -29,7 +29,7 @@
/**
* Constructs {@link org.jboss.cache.statetransfer.StateTransferManager} instances.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
*/
@DefaultFactoryFor(classes = StateTransferManager.class)
Modified: core/trunk/src/main/java/org/jboss/cache/factories/TransactionManagerFactory.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/factories/TransactionManagerFactory.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/factories/TransactionManagerFactory.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -31,7 +31,7 @@
/**
* Uses a number of mechanisms to retrieve a transaction manager.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 2.1.0
*/
@DefaultFactoryFor(classes = {TransactionManager.class})
Modified: core/trunk/src/main/java/org/jboss/cache/factories/annotations/DefaultFactoryFor.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/factories/annotations/DefaultFactoryFor.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/factories/annotations/DefaultFactoryFor.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -30,7 +30,7 @@
* An annotation that is used internally, for defining a DEFAULT factory to be used when constructing components. This
* annotation allows you to define which components can be constructed by the annotated factory.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 2.1.0
*/
@Target(TYPE)
Modified: core/trunk/src/main/java/org/jboss/cache/factories/annotations/Destroy.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/factories/annotations/Destroy.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/factories/annotations/Destroy.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -31,7 +31,7 @@
* when the cache is destroyed.
* <p/>
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 2.1.0
*/
@Target(METHOD)
Modified: core/trunk/src/main/java/org/jboss/cache/factories/annotations/NonVolatile.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/factories/annotations/NonVolatile.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/factories/annotations/NonVolatile.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -33,7 +33,7 @@
* <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.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 2.2.0
*/
// ensure this annotation is available at runtime.
Modified: core/trunk/src/main/java/org/jboss/cache/factories/annotations/Start.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/factories/annotations/Start.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/factories/annotations/Start.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -31,7 +31,7 @@
* when the cache starts.
* <p/>
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 2.1.0
*/
@Target(METHOD)
Modified: core/trunk/src/main/java/org/jboss/cache/factories/annotations/Stop.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/factories/annotations/Stop.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/factories/annotations/Stop.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -31,7 +31,7 @@
* when the cache stops.
* <p/>
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 2.1.0
*/
@Target(METHOD)
Modified: core/trunk/src/main/java/org/jboss/cache/factories/context/ContextFactory.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/factories/context/ContextFactory.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/factories/context/ContextFactory.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -32,7 +32,7 @@
* This is the factory responsible for creating {@link org.jboss.cache.InvocationContext}s and {@link org.jboss.cache.transaction.TransactionContext}s
* for requests, based on the configuration used.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
*/
public interface ContextFactory
Modified: core/trunk/src/main/java/org/jboss/cache/factories/context/MVCCContextFactory.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/factories/context/MVCCContextFactory.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/factories/context/MVCCContextFactory.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -33,7 +33,7 @@
/**
* Constructs contexts for MVCC locking
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
*/
public class MVCCContextFactory implements ContextFactory
Modified: core/trunk/src/main/java/org/jboss/cache/factories/context/OptimisticContextFactory.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/factories/context/OptimisticContextFactory.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/factories/context/OptimisticContextFactory.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -31,7 +31,7 @@
/**
* Constructs contexts for optimistic locking
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
* @deprecated will be removed when optimistic locking is removed.
*/
Modified: core/trunk/src/main/java/org/jboss/cache/factories/context/PessimisticContextFactory.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/factories/context/PessimisticContextFactory.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/factories/context/PessimisticContextFactory.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -35,7 +35,7 @@
/**
* Constructs contexts for pessimistic locking
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
* @deprecated will be removed when pessimistic locking is removed.
*/
Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/BaseRpcInterceptor.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/interceptors/BaseRpcInterceptor.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/BaseRpcInterceptor.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -45,7 +45,7 @@
* Acts as a base for all RPC calls - subclassed by
* {@link ReplicationInterceptor} and {@link OptimisticReplicationInterceptor}.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
*/
public abstract class BaseRpcInterceptor extends CommandInterceptor
{
Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/BaseTransactionalContextInterceptor.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/interceptors/BaseTransactionalContextInterceptor.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/BaseTransactionalContextInterceptor.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -37,7 +37,7 @@
/**
* Class providing some base functionality around manipulating transactions and global transactions withing invocation contexts.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
*/
public abstract class BaseTransactionalContextInterceptor extends CommandInterceptor
{
Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/BatchingInterceptor.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/interceptors/BatchingInterceptor.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/BatchingInterceptor.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -33,7 +33,7 @@
/**
* Interceptor that captures batched calls and attaches contexts.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
*/
public class BatchingInterceptor extends CommandInterceptor
Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/BuddyRegionAwareEvictionInterceptor.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/interceptors/BuddyRegionAwareEvictionInterceptor.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/BuddyRegionAwareEvictionInterceptor.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -29,7 +29,7 @@
/**
* A subclass of EvictionInterceptor that is aware of and able to deal with buddy regions.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 2.2.0
*/
public class BuddyRegionAwareEvictionInterceptor extends EvictionInterceptor
Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/DataGravitatorInterceptor.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/interceptors/DataGravitatorInterceptor.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/DataGravitatorInterceptor.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -30,7 +30,7 @@
/**
* MVCC specific version of the LegacyDataGravitatorInterceptor
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
*/
public class DataGravitatorInterceptor extends LegacyDataGravitatorInterceptor
Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/InvalidationInterceptor.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/interceptors/InvalidationInterceptor.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/InvalidationInterceptor.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -75,7 +75,7 @@
* remote node to look up the value in a shared cache loader which would have
* been updated with the changes.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
*/
public class InvalidationInterceptor extends BaseRpcInterceptor
{
Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/InvocationContextInterceptor.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/interceptors/InvocationContextInterceptor.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/InvocationContextInterceptor.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -46,7 +46,7 @@
/**
* Always place this interceptor at the start of the interceptor chain to ensure invocation contexts and set up and cleaned up correctly.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
*/
public class InvocationContextInterceptor extends BaseTransactionalContextInterceptor
{
Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/LegacyDataGravitatorInterceptor.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/interceptors/LegacyDataGravitatorInterceptor.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/LegacyDataGravitatorInterceptor.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -73,7 +73,7 @@
* of the tx that caused the gravitation event.
* <p/>
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
* @deprecated will be removed with optimistic and pessimistic locking.
*/
@Deprecated
Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/LegacyPassivationInterceptor.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/interceptors/LegacyPassivationInterceptor.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/LegacyPassivationInterceptor.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -32,7 +32,7 @@
/**
* Passivation interceptor for optimistic and pessimistic locking
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
* @deprecated will be removed along with optimistic and pessimistic locking.
*/
Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/MVCCLockingInterceptor.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/interceptors/MVCCLockingInterceptor.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/MVCCLockingInterceptor.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -60,7 +60,7 @@
/**
* Interceptor to implement <a href="http://wiki.jboss.org/wiki/JBossCacheMVCC">MVCC</a> functionality.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @see <a href="http://wiki.jboss.org/wiki/JBossCacheMVCC">MVCC designs</a>
* @since 3.0
*/
Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/MarshalledValueInterceptor.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/interceptors/MarshalledValueInterceptor.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/MarshalledValueInterceptor.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -53,7 +53,7 @@
* <p/>
* The {@link org.jboss.cache.marshall.MarshalledValue} wrapper handles lazy deserialization from byte array representations.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @see org.jboss.cache.marshall.MarshalledValue
* @since 2.1.0
*/
Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/NotificationInterceptor.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/interceptors/NotificationInterceptor.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/NotificationInterceptor.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -31,7 +31,7 @@
/**
* The interceptor in charge of firing off notifications to cache listeners
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.0.0
*/
public class NotificationInterceptor extends BaseTransactionalContextInterceptor
Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticCreateIfNotExistsInterceptor.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticCreateIfNotExistsInterceptor.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticCreateIfNotExistsInterceptor.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -50,7 +50,7 @@
* in the underlying structure, they are added and the corresponding {@link org.jboss.cache.optimistic.WorkspaceNode#isCreated()}
* would return <tt>true</tt> to denote that this node has been freshly created in the underlying structure.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
* @author <a href="mailto:stevew@jofti.com">Steve Woodcock (stevew(a)jofti.com)</a>
* @deprecated will be removed along with optimistic and pessimistic locking.
*/
Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticInterceptor.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticInterceptor.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticInterceptor.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -44,7 +44,7 @@
/**
* Abstract interceptor for optimistic locking
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
* @deprecated will be removed along with optimistic and pessimistic locking.
*/
@Deprecated
Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticLockingInterceptor.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticLockingInterceptor.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticLockingInterceptor.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -41,7 +41,7 @@
* Locks nodes during transaction boundaries. Only affects prepare/commit/rollback method calls; other method calls
* are simply passed up the interceptor stack.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
* @author <a href="mailto:stevew@jofti.com">Steve Woodcock (stevew(a)jofti.com)</a>
* @deprecated will be removed along with optimistic and pessimistic locking.
*/
Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticNodeInterceptor.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticNodeInterceptor.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticNodeInterceptor.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -42,7 +42,6 @@
import org.jboss.cache.commands.write.PutKeyValueCommand;
import org.jboss.cache.commands.write.RemoveKeyCommand;
import org.jboss.cache.commands.write.RemoveNodeCommand;
-import org.jboss.cache.config.Option;
import org.jboss.cache.factories.annotations.Inject;
import org.jboss.cache.factories.annotations.Start;
import org.jboss.cache.notifications.Notifier;
@@ -62,7 +61,7 @@
* Operations on nodes are done on the copies that exist in the workspace rather than passed down
* to the {@link org.jboss.cache.interceptors.CallInterceptor}. These operations happen in this interceptor.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
* @author <a href="mailto:stevew@jofti.com">Steve Woodcock (stevew(a)jofti.com)</a>
* @deprecated will be removed along with optimistic and pessimistic locking.
*/
Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticReplicationInterceptor.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticReplicationInterceptor.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticReplicationInterceptor.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -63,7 +63,7 @@
* everything is done in a transaction and the transaction context is available via {@link org.jboss.cache.InvocationContext#getTransaction()}
* and {@link org.jboss.cache.InvocationContext#getGlobalTransaction()}.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
* @author <a href="mailto:stevew@jofti.com">Steve Woodcock (stevew(a)jofti.com)</a>
* @deprecated will be removed along with optimistic and pessimistic locking.
*/
Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticTxInterceptor.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticTxInterceptor.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticTxInterceptor.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -43,7 +43,7 @@
/**
* A new interceptor to simplify functionality in the {@link org.jboss.cache.interceptors.TxInterceptor}.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 2.2.0
* @deprecated will be removed along with optimistic and pessimistic locking.
*/
Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticValidatorInterceptor.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticValidatorInterceptor.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticValidatorInterceptor.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -58,7 +58,7 @@
* <p/>
* On rollback clears the nodes in the workspace and leaves the underlying data structure untouched.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @author Steve Woodcock (<a href="mailto:stevew@jofti.com">stevew(a)jofti.com</a>)
* @deprecated will be removed along with optimistic and pessimistic locking.
*/
Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/TxInterceptor.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/interceptors/TxInterceptor.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/TxInterceptor.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -72,7 +72,7 @@
* This interceptor is also responsible for registering for synchronisation on
* transaction completion.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
* @author <a href="mailto:stevew@jofti.com">Steve Woodcock (stevew(a)jofti.com)</a>
*/
public class TxInterceptor extends BaseTransactionalContextInterceptor
Modified: core/trunk/src/main/java/org/jboss/cache/invocation/AbstractInvocationDelegate.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/invocation/AbstractInvocationDelegate.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/invocation/AbstractInvocationDelegate.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -32,7 +32,7 @@
* interceptor chain rather than any bytecode manipulation.
* <p/>
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @see org.jboss.cache.interceptors.base.CommandInterceptor
* @see InvocationContext
* @since 2.1.0
Modified: core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDelegate.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDelegate.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDelegate.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -83,7 +83,7 @@
* The delegate that users (and ChainedInterceptor authors) interact with when they create a cache by using a cache factory.
* This wrapper delegates calls down the interceptor chain.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 2.1.0
*/
@NonVolatile
Modified: core/trunk/src/main/java/org/jboss/cache/invocation/InvocationContextContainer.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/invocation/InvocationContextContainer.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/invocation/InvocationContextContainer.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -29,7 +29,7 @@
/**
* Container and factory for thread locals
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 2.1.0
*/
@NonVolatile
Modified: core/trunk/src/main/java/org/jboss/cache/invocation/LegacyInvocationContext.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/invocation/LegacyInvocationContext.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/invocation/LegacyInvocationContext.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -32,7 +32,7 @@
/**
* This is to provide backward compatibility with legacy locking schemes.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
* @deprecated will be removed along with optimistic and pessimistic locking.
*/
Modified: core/trunk/src/main/java/org/jboss/cache/invocation/MVCCInvocationContext.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/invocation/MVCCInvocationContext.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/invocation/MVCCInvocationContext.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -34,7 +34,7 @@
/**
* An invocation context that is specific to MVCC locking
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
*/
public class MVCCInvocationContext extends InvocationContext
Modified: core/trunk/src/main/java/org/jboss/cache/invocation/NodeInvocationDelegate.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/invocation/NodeInvocationDelegate.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/invocation/NodeInvocationDelegate.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -46,7 +46,7 @@
* The delegate that users (and interceptor authors) interact with when they obtain a node from the cache or another node.
* This wrapper delegates calls down the interceptor chain.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 2.1.0
*/
public class NodeInvocationDelegate<K, V> extends AbstractInvocationDelegate implements NodeSPI<K, V>
Modified: core/trunk/src/main/java/org/jboss/cache/loader/AbstractCacheLoader.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/loader/AbstractCacheLoader.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/loader/AbstractCacheLoader.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -54,7 +54,7 @@
* Also useful to note is the implementation of {@link #put(java.util.List)}, used during the prepare phase of a transaction.
* <p/>
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
* @author <a href="mailto:galder.zamarreno@jboss.com">Galder Zamarreno</a>
* @since 2.0.0
*/
Modified: core/trunk/src/main/java/org/jboss/cache/loader/AdjListJDBCCacheLoaderConfig.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/loader/AdjListJDBCCacheLoaderConfig.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/loader/AdjListJDBCCacheLoaderConfig.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -29,7 +29,7 @@
/**
* AdjListJDBCCacheLoaderConfig
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
* @author <a href="mailto:galder.zamarreno@jboss.com">Galder Zamarreno</a>
*/
@SuppressWarnings("deprecation")
Modified: core/trunk/src/main/java/org/jboss/cache/loader/CacheLoader.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/loader/CacheLoader.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/loader/CacheLoader.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -55,7 +55,7 @@
* the same {@link Fqn}, are possible.
* <p/>
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
* @see CacheSPI
* @see org.jboss.cache.config.CacheLoaderConfig.IndividualCacheLoaderConfig
* @see org.jboss.cache.loader.AbstractCacheLoader
Modified: core/trunk/src/main/java/org/jboss/cache/loader/CacheLoaderManager.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/loader/CacheLoaderManager.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/loader/CacheLoaderManager.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -76,7 +76,7 @@
* ]]>
* </code>
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
* @author <a href="mailto:galder.zamarreno@jboss.com">Galder Zamarreno</a>
*/
public class CacheLoaderManager
Modified: core/trunk/src/main/java/org/jboss/cache/loader/ChainingCacheLoader.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/loader/ChainingCacheLoader.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/loader/ChainingCacheLoader.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -45,7 +45,7 @@
* <p/>
* WRITE operations are propagated to ALL registered cacheloaders that specified set ignoreModifications to false.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
*/
public class ChainingCacheLoader extends AbstractCacheLoader
{
Modified: core/trunk/src/main/java/org/jboss/cache/loader/ClusteredCacheLoader.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/loader/ClusteredCacheLoader.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/loader/ClusteredCacheLoader.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -60,7 +60,7 @@
* specifies in milliseconds how long to wait for results before returning a
* null.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
*/
@ThreadSafe
public class ClusteredCacheLoader extends AbstractCacheLoader
Modified: core/trunk/src/main/java/org/jboss/cache/loader/FileCacheLoader.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/loader/FileCacheLoader.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/loader/FileCacheLoader.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -66,7 +66,7 @@
*
* @author Bela Ban
* @author <a href="mailto:galder.zamarreno@jboss.com">Galder Zamarreno</a>
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @version $Id$
*/
@ThreadSafe
Modified: core/trunk/src/main/java/org/jboss/cache/loader/ReadOnlyDelegatingCacheLoader.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/loader/ReadOnlyDelegatingCacheLoader.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/loader/ReadOnlyDelegatingCacheLoader.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -33,7 +33,7 @@
/**
* Provides ignoreModifications features to all cache loaders.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.1.0
*/
public class ReadOnlyDelegatingCacheLoader extends AbstractDelegatingCacheLoader
Modified: core/trunk/src/main/java/org/jboss/cache/loader/tcp/TcpCacheOperations.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/loader/tcp/TcpCacheOperations.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/loader/tcp/TcpCacheOperations.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -24,7 +24,7 @@
/**
* Statics that used to exist in the DelegatingCacheLoader class.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.0.0
*/
public interface TcpCacheOperations
Modified: core/trunk/src/main/java/org/jboss/cache/lock/AbstractLockManager.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/lock/AbstractLockManager.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/lock/AbstractLockManager.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -29,7 +29,7 @@
/**
* Common lock manager functionality
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
*/
public abstract class AbstractLockManager implements LockManager
Modified: core/trunk/src/main/java/org/jboss/cache/lock/FqnLockManager.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/lock/FqnLockManager.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/lock/FqnLockManager.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -29,7 +29,7 @@
/**
* An abstract lock manager that deals with Fqns rather than nodes.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
*/
public abstract class FqnLockManager extends AbstractLockManager
Modified: core/trunk/src/main/java/org/jboss/cache/lock/LockManager.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/lock/LockManager.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/lock/LockManager.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -30,7 +30,7 @@
/**
* An interface to deal with all aspects of acquiring and releasing locks for nodes in the cache.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 2.2.0
*/
public interface LockManager
Modified: core/trunk/src/main/java/org/jboss/cache/lock/LockType.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/lock/LockType.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/lock/LockType.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -24,7 +24,7 @@
/**
* An enumeration to define different types of locks.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 2.2.0
*/
public enum LockType
Modified: core/trunk/src/main/java/org/jboss/cache/lock/MVCCLockManager.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/lock/MVCCLockManager.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/lock/MVCCLockManager.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -63,7 +63,7 @@
* is determined.
* <p/>
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @see org.jboss.cache.util.concurrent.locks.OwnableReentrantLock
* @since 3.0
*/
Modified: core/trunk/src/main/java/org/jboss/cache/lock/PessimisticNodeBasedLockManager.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/lock/PessimisticNodeBasedLockManager.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/lock/PessimisticNodeBasedLockManager.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -37,7 +37,7 @@
/**
* Contains specific methods for the PessimisticLockInterceptor.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @deprecated will be removed with pessimistic locking
*/
@Deprecated
Modified: core/trunk/src/main/java/org/jboss/cache/lock/StripedLock.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/lock/StripedLock.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/lock/StripedLock.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -38,7 +38,7 @@
* use, since the Fqn is not referenced in this class. Rather, the hash code is used.
* <p/>
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.0.0
*/
@ThreadSafe
Modified: core/trunk/src/main/java/org/jboss/cache/marshall/AbstractMarshaller.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/marshall/AbstractMarshaller.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/marshall/AbstractMarshaller.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -63,7 +63,7 @@
/**
* Abstract AbstractMarshaller for JBoss Cache.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
*/
public abstract class AbstractMarshaller implements Marshaller
{
Modified: core/trunk/src/main/java/org/jboss/cache/marshall/CacheMarshaller200.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/marshall/CacheMarshaller200.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/marshall/CacheMarshaller200.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -56,7 +56,7 @@
/**
* An enhanced marshaller for RPC calls between CacheImpl instances.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
*/
public class CacheMarshaller200 extends AbstractMarshaller
{
Modified: core/trunk/src/main/java/org/jboss/cache/marshall/CacheMarshaller300.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/marshall/CacheMarshaller300.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/marshall/CacheMarshaller300.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -30,7 +30,7 @@
/**
* Adds special treatment of arrays over and above the superclass.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
*/
public class CacheMarshaller300 extends CacheMarshaller210
Modified: core/trunk/src/main/java/org/jboss/cache/marshall/CommandAwareRpcDispatcher.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/marshall/CommandAwareRpcDispatcher.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/marshall/CommandAwareRpcDispatcher.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -57,7 +57,7 @@
/**
* A JGroups RPC dispatcher that knows how to deal with {@link org.jboss.cache.commands.ReplicableCommand}s.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 2.2.0
*/
public class CommandAwareRpcDispatcher extends RpcDispatcher
Modified: core/trunk/src/main/java/org/jboss/cache/marshall/InactiveRegionAwareRpcDispatcher.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/marshall/InactiveRegionAwareRpcDispatcher.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/marshall/InactiveRegionAwareRpcDispatcher.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -34,7 +34,7 @@
/**
* Extends {@link org.jgroups.blocks.RpcDispatcher} and adds the possibility that the marshaller may throw {@link org.jboss.cache.marshall.InactiveRegionException}s.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.0.0
*/
public class InactiveRegionAwareRpcDispatcher extends CommandAwareRpcDispatcher
Modified: core/trunk/src/main/java/org/jboss/cache/marshall/InactiveRegionException.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/marshall/InactiveRegionException.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/marshall/InactiveRegionException.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -26,7 +26,7 @@
/**
* Thrown by a {@link org.jboss.cache.marshall.AbstractMarshaller} instance when attempting to perform an operation on an inactive region.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.0.0
*/
public class InactiveRegionException extends CacheException
Modified: core/trunk/src/main/java/org/jboss/cache/marshall/MarshalledValue.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/marshall/MarshalledValue.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/marshall/MarshalledValue.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -43,7 +43,7 @@
* wrapping/unwrapping of cached data.
* <p/>
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @see org.jboss.cache.interceptors.MarshalledValueInterceptor
* @since 2.1.0
*/
Modified: core/trunk/src/main/java/org/jboss/cache/marshall/MarshalledValueHelper.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/marshall/MarshalledValueHelper.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/marshall/MarshalledValueHelper.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -29,7 +29,7 @@
/**
* Common functionality used by the {@link org.jboss.cache.interceptors.MarshalledValueInterceptor} and the {@link MarshalledValueMap}.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @see MarshalledValue
* @see org.jboss.cache.interceptors.MarshalledValueInterceptor
* @see org.jboss.cache.marshall.MarshalledValueMap
Modified: core/trunk/src/main/java/org/jboss/cache/marshall/MarshalledValueMap.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/marshall/MarshalledValueMap.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/marshall/MarshalledValueMap.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -41,7 +41,7 @@
* Also note that this is an immutable Map.
* <p/>
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @see MarshalledValue
* @since 2.1.0
*/
Modified: core/trunk/src/main/java/org/jboss/cache/marshall/Marshaller.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/marshall/Marshaller.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/marshall/Marshaller.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -50,7 +50,7 @@
* The interface is also used by the {@link org.jboss.cache.loader.CacheLoader} framework to efficiently serialize data to be persisted, as well as
* the {@link org.jboss.cache.statetransfer.StateTransferManager} when serializing the cache for transferring state en-masse.
*
- * @author <a href="mailto://manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto://manik AT jboss DOT org">Manik Surtani</a>
* @since 2.0.0
*/
public interface Marshaller extends RpcDispatcher.Marshaller2
Modified: core/trunk/src/main/java/org/jboss/cache/marshall/MethodCall.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/marshall/MethodCall.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/marshall/MethodCall.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -39,7 +39,7 @@
* <p/>
* Thanks to Elias Ross/genman for this info.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
* @deprecated - in favour of {@link org.jboss.cache.commands.ReplicableCommand} instances. Will be removed in 3.X.
*/
@Deprecated
Modified: core/trunk/src/main/java/org/jboss/cache/marshall/RegionalizedMethodCall.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/marshall/RegionalizedMethodCall.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/marshall/RegionalizedMethodCall.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -32,7 +32,7 @@
* the method call is known, and can be used to marshall a result to return to the remote caller.
* <p/>
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 2.1.1
*/
public class RegionalizedMethodCall
Modified: core/trunk/src/main/java/org/jboss/cache/marshall/RegionalizedReturnValue.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/marshall/RegionalizedReturnValue.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/marshall/RegionalizedReturnValue.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -27,7 +27,7 @@
* A return value that holds region information, so that the marshaller knows which region to use (and hence which
* class loader to use) when marshalling this return value.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 2.1.1
*/
class RegionalizedReturnValue
Modified: core/trunk/src/main/java/org/jboss/cache/marshall/UnmarshalledReferences.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/marshall/UnmarshalledReferences.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/marshall/UnmarshalledReferences.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -1,24 +1,24 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2000 - 2008, 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.
- */
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2000 - 2008, 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.jboss.cache.marshall;
import org.jboss.cache.CacheException;
@@ -28,7 +28,7 @@
/**
* An efficient array-based list of referenced objects, using the reference id as a subscript for the array.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
*/
public class UnmarshalledReferences
{
Modified: core/trunk/src/main/java/org/jboss/cache/marshall/VersionAwareMarshaller.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/marshall/VersionAwareMarshaller.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/marshall/VersionAwareMarshaller.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -46,7 +46,7 @@
* is able to pick the appropriate marshaller to delegate to based on the versioning information when
* unmarshalling objects.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
* @author <a href="mailto:galder.zamarreno@jboss.com">Galder Zamarreno</a>
*/
public class VersionAwareMarshaller extends AbstractMarshaller
Modified: core/trunk/src/main/java/org/jboss/cache/mvcc/MVCCNodeFactory.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/mvcc/MVCCNodeFactory.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/mvcc/MVCCNodeFactory.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -37,7 +37,7 @@
/**
* Creates nodes specific to MVCC logic.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
*/
public class MVCCNodeFactory<K, V> extends AbstractNodeFactory<K, V>
Modified: core/trunk/src/main/java/org/jboss/cache/mvcc/MVCCNodeHelper.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/mvcc/MVCCNodeHelper.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/mvcc/MVCCNodeHelper.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -49,7 +49,7 @@
* Utility functions to manipulate wrapping {@link org.jboss.cache.InternalNode}s as {@link org.jboss.cache.mvcc.ReadCommittedNode}
* or {@link org.jboss.cache.mvcc.RepeatableReadNode}s. Would also entail locking, if necessary.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
*/
@NonVolatile
Modified: core/trunk/src/main/java/org/jboss/cache/mvcc/NodeReference.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/mvcc/NodeReference.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/mvcc/NodeReference.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -45,7 +45,7 @@
* when using {@link org.jboss.cache.config.Configuration.NodeLockingScheme#MVCC} and {@link org.jboss.cache.lock.IsolationLevel#READ_COMMITTED}.
* <p/>
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @see org.jboss.cache.mvcc.ReadCommittedNode
* @since 3.0
*/
Modified: core/trunk/src/main/java/org/jboss/cache/mvcc/NullMarkerNode.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/mvcc/NullMarkerNode.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/mvcc/NullMarkerNode.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -27,7 +27,7 @@
* A marker node to represent a null node for repeatable read, so that a read that returns a null can continue to return
* null.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
*/
public class NullMarkerNode extends RepeatableReadNode
Modified: core/trunk/src/main/java/org/jboss/cache/mvcc/ReadCommittedNode.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/mvcc/ReadCommittedNode.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/mvcc/ReadCommittedNode.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -35,7 +35,7 @@
/**
* A node delegate that encapsulates read committed semantics when writes are initiated, committed or rolled back.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
*/
public class ReadCommittedNode extends NodeInvocationDelegate
Modified: core/trunk/src/main/java/org/jboss/cache/mvcc/RepeatableReadNode.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/mvcc/RepeatableReadNode.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/mvcc/RepeatableReadNode.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -34,7 +34,7 @@
/**
* A node delegate that encapsulates repeatable read semantics when writes are initiated, committed or rolled back.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
*/
public class RepeatableReadNode extends ReadCommittedNode
Modified: core/trunk/src/main/java/org/jboss/cache/notifications/IncorrectCacheListenerException.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/notifications/IncorrectCacheListenerException.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/notifications/IncorrectCacheListenerException.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -26,7 +26,7 @@
/**
* Thrown when an incorrectly annotated class is added as a cache listener using the {@link org.jboss.cache.Cache#addCacheListener(Object)} API.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.0.0
*/
public class IncorrectCacheListenerException extends CacheException
Modified: core/trunk/src/main/java/org/jboss/cache/notifications/NotifierImpl.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/notifications/NotifierImpl.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/notifications/NotifierImpl.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -63,7 +63,7 @@
/**
* Helper class that handles all notifications to registered listeners.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
*/
@NonVolatile
public class NotifierImpl implements Notifier
Modified: core/trunk/src/main/java/org/jboss/cache/notifications/annotation/BuddyGroupChanged.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/notifications/annotation/BuddyGroupChanged.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/notifications/annotation/BuddyGroupChanged.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -37,7 +37,7 @@
* enabled, this call back would never occur.
* <p/>
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @see CacheListener
* @see org.jboss.cache.notifications.event.CacheBlockedEvent
* @since 2.1.0
Modified: core/trunk/src/main/java/org/jboss/cache/notifications/annotation/CacheBlocked.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/notifications/annotation/CacheBlocked.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/notifications/annotation/CacheBlocked.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -33,7 +33,7 @@
* otherwise an {@link org.jboss.cache.notifications.IncorrectCacheListenerException} will be thrown when registering
* your cache listener.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @see CacheListener
* @see org.jboss.cache.notifications.event.CacheBlockedEvent
* @since 2.0.0
Modified: core/trunk/src/main/java/org/jboss/cache/notifications/annotation/CacheListener.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/notifications/annotation/CacheListener.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/notifications/annotation/CacheListener.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -293,7 +293,7 @@
* }
* </pre>
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @author Jason T. Greene
* @see CacheStarted
* @see CacheStopped
Modified: core/trunk/src/main/java/org/jboss/cache/notifications/annotation/CacheStarted.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/notifications/annotation/CacheStarted.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/notifications/annotation/CacheStarted.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -33,7 +33,7 @@
* parameter, a {@link org.jboss.cache.notifications.event.CacheStartedEvent} otherwise a {@link org.jboss.cache.notifications.IncorrectCacheListenerException}
* will be thrown when registering your listener.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @see CacheListener
* @since 2.0.0
*/
Modified: core/trunk/src/main/java/org/jboss/cache/notifications/annotation/CacheStopped.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/notifications/annotation/CacheStopped.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/notifications/annotation/CacheStopped.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -33,7 +33,7 @@
* parameter, a {@link org.jboss.cache.notifications.event.CacheStoppedEvent} otherwise a {@link org.jboss.cache.notifications.IncorrectCacheListenerException}
* will be thrown when registering your listener.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @see CacheListener
* @since 2.0.0
*/
Modified: core/trunk/src/main/java/org/jboss/cache/notifications/annotation/CacheUnblocked.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/notifications/annotation/CacheUnblocked.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/notifications/annotation/CacheUnblocked.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -33,7 +33,7 @@
* otherwise an {@link org.jboss.cache.notifications.IncorrectCacheListenerException} will be thrown when registering
* your cache listener.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @see CacheListener
* @since 2.0.0
*/
Modified: core/trunk/src/main/java/org/jboss/cache/notifications/annotation/NodeActivated.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/notifications/annotation/NodeActivated.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/notifications/annotation/NodeActivated.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -33,7 +33,7 @@
* otherwise an {@link org.jboss.cache.notifications.IncorrectCacheListenerException} will be thrown when registering
* your cache listener.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @see CacheListener
* @see org.jboss.cache.notifications.annotation.NodePassivated
* @since 2.0.0
Modified: core/trunk/src/main/java/org/jboss/cache/notifications/annotation/NodeCreated.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/notifications/annotation/NodeCreated.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/notifications/annotation/NodeCreated.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -33,7 +33,7 @@
* otherwise an {@link org.jboss.cache.notifications.IncorrectCacheListenerException} will be thrown when registering
* your cache listener.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @see CacheListener
* @since 2.0.0
*/
Modified: core/trunk/src/main/java/org/jboss/cache/notifications/annotation/NodeEvicted.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/notifications/annotation/NodeEvicted.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/notifications/annotation/NodeEvicted.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -33,7 +33,7 @@
* otherwise an {@link org.jboss.cache.notifications.IncorrectCacheListenerException} will be thrown when registering
* your cache listener.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @see CacheListener
* @see org.jboss.cache.notifications.annotation.NodeLoaded
* @since 2.0.0
Modified: core/trunk/src/main/java/org/jboss/cache/notifications/annotation/NodeInvalidated.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/notifications/annotation/NodeInvalidated.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/notifications/annotation/NodeInvalidated.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -33,7 +33,7 @@
* otherwise an {@link org.jboss.cache.notifications.IncorrectCacheListenerException} will be thrown when registering
* your cache listener.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @see org.jboss.cache.notifications.annotation.CacheListener
* @since 3.0
*/
Modified: core/trunk/src/main/java/org/jboss/cache/notifications/annotation/NodeLoaded.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/notifications/annotation/NodeLoaded.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/notifications/annotation/NodeLoaded.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -33,7 +33,7 @@
* otherwise an {@link org.jboss.cache.notifications.IncorrectCacheListenerException} will be thrown when registering
* your cache listener.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @see CacheListener
* @since 2.0.0
*/
Modified: core/trunk/src/main/java/org/jboss/cache/notifications/annotation/NodeModified.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/notifications/annotation/NodeModified.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/notifications/annotation/NodeModified.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -34,7 +34,7 @@
* your cache listener.
* <p/>
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @see CacheListener
* @since 2.0.0
*/
Modified: core/trunk/src/main/java/org/jboss/cache/notifications/annotation/NodeMoved.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/notifications/annotation/NodeMoved.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/notifications/annotation/NodeMoved.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -34,7 +34,7 @@
* parameter, a {@link org.jboss.cache.notifications.event.NodeMovedEvent} otherwise a {@link org.jboss.cache.notifications.IncorrectCacheListenerException}
* will be thrown when registering your listener.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @see CacheListener
* @since 2.0.0
*/
Modified: core/trunk/src/main/java/org/jboss/cache/notifications/annotation/NodePassivated.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/notifications/annotation/NodePassivated.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/notifications/annotation/NodePassivated.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -33,7 +33,7 @@
* parameter, a {@link org.jboss.cache.notifications.event.NodePassivatedEvent} otherwise a {@link org.jboss.cache.notifications.IncorrectCacheListenerException}
* will be thrown when registering your listener.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @see CacheListener
* @since 2.0.0
*/
Modified: core/trunk/src/main/java/org/jboss/cache/notifications/annotation/NodeRemoved.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/notifications/annotation/NodeRemoved.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/notifications/annotation/NodeRemoved.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -33,7 +33,7 @@
* parameter, a {@link org.jboss.cache.notifications.event.TransactionRegisteredEvent} otherwise a {@link org.jboss.cache.notifications.IncorrectCacheListenerException}
* will be thrown when registering your listener.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @see CacheListener
* @since 2.0.0
*/
Modified: core/trunk/src/main/java/org/jboss/cache/notifications/annotation/NodeVisited.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/notifications/annotation/NodeVisited.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/notifications/annotation/NodeVisited.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -33,7 +33,7 @@
* parameter, a {@link org.jboss.cache.notifications.event.NodeVisitedEvent} otherwise a {@link org.jboss.cache.notifications.IncorrectCacheListenerException}
* will be thrown when registering your listener.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @see CacheListener
* @since 2.0.0
*/
Modified: core/trunk/src/main/java/org/jboss/cache/notifications/annotation/TransactionCompleted.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/notifications/annotation/TransactionCompleted.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/notifications/annotation/TransactionCompleted.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -37,7 +37,7 @@
* Note that methods marked with this annotation will only be fired <i>after the fact</i>, i.e., your method will never be
* called with {@link org.jboss.cache.notifications.event.Event#isPre()} being set to <tt>true</tt>.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @see CacheListener
* @since 2.0.0
*/
Modified: core/trunk/src/main/java/org/jboss/cache/notifications/annotation/TransactionRegistered.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/notifications/annotation/TransactionRegistered.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/notifications/annotation/TransactionRegistered.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -37,7 +37,7 @@
* Note that methods marked with this annotation will only be fired <i>after the fact</i>, i.e., your method will never be
* called with {@link org.jboss.cache.notifications.event.Event#isPre()} being set to <tt>true</tt>.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @see CacheListener
* @since 2.0.0
*/
Modified: core/trunk/src/main/java/org/jboss/cache/notifications/annotation/ViewChanged.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/notifications/annotation/ViewChanged.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/notifications/annotation/ViewChanged.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -34,7 +34,7 @@
* a {@link org.jboss.cache.notifications.event.ViewChangedEvent} otherwise a {@link org.jboss.cache.notifications.IncorrectCacheListenerException}
* will be thrown when registering your listener.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @see CacheListener
* @since 2.0.0
*/
Modified: core/trunk/src/main/java/org/jboss/cache/notifications/event/BuddyGroupChangedEvent.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/notifications/event/BuddyGroupChangedEvent.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/notifications/event/BuddyGroupChangedEvent.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -26,7 +26,7 @@
/**
* This event is passed in to any method annotated with {@link org.jboss.cache.notifications.annotation.BuddyGroupChanged}.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.1.0
*/
public interface BuddyGroupChangedEvent extends Event
Modified: core/trunk/src/main/java/org/jboss/cache/notifications/event/CacheBlockedEvent.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/notifications/event/CacheBlockedEvent.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/notifications/event/CacheBlockedEvent.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -24,7 +24,7 @@
/**
* This event is passed in to any method annotated with {@link org.jboss.cache.notifications.annotation.CacheBlocked}.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.0.0
*/
public interface CacheBlockedEvent extends Event
Modified: core/trunk/src/main/java/org/jboss/cache/notifications/event/CacheStartedEvent.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/notifications/event/CacheStartedEvent.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/notifications/event/CacheStartedEvent.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -24,7 +24,7 @@
/**
* This event is passed in to any method annotated with {@link org.jboss.cache.notifications.annotation.CacheStarted}.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.0.0
*/
public interface CacheStartedEvent extends Event
Modified: core/trunk/src/main/java/org/jboss/cache/notifications/event/CacheStoppedEvent.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/notifications/event/CacheStoppedEvent.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/notifications/event/CacheStoppedEvent.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -24,7 +24,7 @@
/**
* This event is passed in to any method annotated with {@link org.jboss.cache.notifications.annotation.CacheStopped}.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.0.0
*/
public interface CacheStoppedEvent extends Event
Modified: core/trunk/src/main/java/org/jboss/cache/notifications/event/CacheUnblockedEvent.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/notifications/event/CacheUnblockedEvent.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/notifications/event/CacheUnblockedEvent.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -24,7 +24,7 @@
/**
* This event is passed in to any method annotated with {@link org.jboss.cache.notifications.annotation.CacheUnblocked}.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.0.0
*/
public interface CacheUnblockedEvent extends Event
Modified: core/trunk/src/main/java/org/jboss/cache/notifications/event/Event.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/notifications/event/Event.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/notifications/event/Event.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -26,7 +26,7 @@
/**
* An interface that defines common characteristics of events
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.0.0
*/
public interface Event
Modified: core/trunk/src/main/java/org/jboss/cache/notifications/event/EventImpl.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/notifications/event/EventImpl.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/notifications/event/EventImpl.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -32,7 +32,7 @@
/**
* Basic implementation of an event that covers all event types.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.0.0
*/
public class EventImpl implements CacheBlockedEvent, CacheUnblockedEvent, CacheStartedEvent, CacheStoppedEvent,
Modified: core/trunk/src/main/java/org/jboss/cache/notifications/event/NodeActivatedEvent.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/notifications/event/NodeActivatedEvent.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/notifications/event/NodeActivatedEvent.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -26,7 +26,7 @@
/**
* This event is passed in to any method annotated with {@link org.jboss.cache.notifications.annotation.NodeActivated}.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.0.0
*/
public interface NodeActivatedEvent extends NodeEvent
Modified: core/trunk/src/main/java/org/jboss/cache/notifications/event/NodeCreatedEvent.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/notifications/event/NodeCreatedEvent.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/notifications/event/NodeCreatedEvent.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -24,7 +24,7 @@
/**
* This event is passed in to any method annotated with {@link org.jboss.cache.notifications.annotation.NodeCreated}.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.0.0
*/
public interface NodeCreatedEvent extends NodeEvent
Modified: core/trunk/src/main/java/org/jboss/cache/notifications/event/NodeEvent.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/notifications/event/NodeEvent.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/notifications/event/NodeEvent.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -26,7 +26,7 @@
/**
* Transactional events that additionally expose an Fqn as such events pertain to a specific node.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.0.0
*/
public interface NodeEvent extends TransactionalEvent
Modified: core/trunk/src/main/java/org/jboss/cache/notifications/event/NodeEvictedEvent.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/notifications/event/NodeEvictedEvent.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/notifications/event/NodeEvictedEvent.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -24,7 +24,7 @@
/**
* This event is passed in to any method annotated with {@link org.jboss.cache.notifications.annotation.NodeEvicted}.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.0.0
*/
public interface NodeEvictedEvent extends NodeEvent
Modified: core/trunk/src/main/java/org/jboss/cache/notifications/event/NodeInvalidatedEvent.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/notifications/event/NodeInvalidatedEvent.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/notifications/event/NodeInvalidatedEvent.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -24,7 +24,7 @@
/**
* Notifies a listener of an invalidation event
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
*/
public interface NodeInvalidatedEvent extends NodeEvent
Modified: core/trunk/src/main/java/org/jboss/cache/notifications/event/NodeLoadedEvent.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/notifications/event/NodeLoadedEvent.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/notifications/event/NodeLoadedEvent.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -26,7 +26,7 @@
/**
* This event is passed in to any method annotated with {@link org.jboss.cache.notifications.annotation.NodeLoaded}.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.0.0
*/
public interface NodeLoadedEvent extends NodeEvent
Modified: core/trunk/src/main/java/org/jboss/cache/notifications/event/NodeModifiedEvent.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/notifications/event/NodeModifiedEvent.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/notifications/event/NodeModifiedEvent.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -26,7 +26,7 @@
/**
* This event is passed in to any method annotated with {@link org.jboss.cache.notifications.annotation.NodeModified}
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.0.0
*/
public interface NodeModifiedEvent extends NodeEvent
Modified: core/trunk/src/main/java/org/jboss/cache/notifications/event/NodeMovedEvent.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/notifications/event/NodeMovedEvent.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/notifications/event/NodeMovedEvent.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -26,7 +26,7 @@
/**
* This event is passed in to any method annotated with {@link org.jboss.cache.notifications.annotation.NodeMoved}.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.0.0
*/
public interface NodeMovedEvent extends NodeEvent
Modified: core/trunk/src/main/java/org/jboss/cache/notifications/event/NodePassivatedEvent.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/notifications/event/NodePassivatedEvent.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/notifications/event/NodePassivatedEvent.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -26,7 +26,7 @@
/**
* This event is passed in to any method annotated with {@link org.jboss.cache.notifications.annotation.NodePassivated}.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.0.0
*/
public interface NodePassivatedEvent extends NodeEvent
Modified: core/trunk/src/main/java/org/jboss/cache/notifications/event/NodeRemovedEvent.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/notifications/event/NodeRemovedEvent.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/notifications/event/NodeRemovedEvent.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -26,7 +26,7 @@
/**
* This event is passed in to any method annotated with {@link org.jboss.cache.notifications.annotation.NodeRemoved}.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.0.0
*/
public interface NodeRemovedEvent extends NodeEvent
Modified: core/trunk/src/main/java/org/jboss/cache/notifications/event/NodeVisitedEvent.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/notifications/event/NodeVisitedEvent.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/notifications/event/NodeVisitedEvent.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -24,7 +24,7 @@
/**
* This event is passed in to any method annotated with {@link org.jboss.cache.notifications.annotation.NodeVisited}.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.0.0
*/
public interface NodeVisitedEvent extends NodeEvent
Modified: core/trunk/src/main/java/org/jboss/cache/notifications/event/TransactionCompletedEvent.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/notifications/event/TransactionCompletedEvent.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/notifications/event/TransactionCompletedEvent.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -27,7 +27,7 @@
* Note that this event is only delivered <i>after the fact</i>, i.e., you will never see an instance of this event
* with {@link #isPre()} being set to <tt>true</tt>.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.0.0
*/
public interface TransactionCompletedEvent extends TransactionalEvent
Modified: core/trunk/src/main/java/org/jboss/cache/notifications/event/TransactionRegisteredEvent.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/notifications/event/TransactionRegisteredEvent.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/notifications/event/TransactionRegisteredEvent.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -27,7 +27,7 @@
* Note that this event is only delivered <i>after the fact</i>, i.e., you will never see an instance of this event
* with {@link #isPre()} being set to <tt>true</tt>.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.0.0
*/
public interface TransactionRegisteredEvent extends TransactionalEvent
Modified: core/trunk/src/main/java/org/jboss/cache/notifications/event/TransactionalEvent.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/notifications/event/TransactionalEvent.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/notifications/event/TransactionalEvent.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -27,7 +27,7 @@
* An event type that includes a transaction context - if one exists - as well as a boolean as to whether the call
* originated locally or remotely.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.0.0
*/
public interface TransactionalEvent extends Event
Modified: core/trunk/src/main/java/org/jboss/cache/notifications/event/ViewChangedEvent.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/notifications/event/ViewChangedEvent.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/notifications/event/ViewChangedEvent.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -26,7 +26,7 @@
/**
* This event is passed in to any method annotated with {@link org.jboss.cache.notifications.annotation.ViewChanged}.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.0.0
*/
public interface ViewChangedEvent extends Event
Modified: core/trunk/src/main/java/org/jboss/cache/optimistic/DataVersion.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/optimistic/DataVersion.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/optimistic/DataVersion.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -32,7 +32,7 @@
* of a good marshalling/unmarshalling mechanism for the sake of efficiency, as these objects are
* frequently serialized to be replicated across the wire.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
* @deprecated this is to support a deprecated locking scheme (Optimistic Locking). Will be removed when Optimistic Locking support is removed.
*/
@Deprecated
Modified: core/trunk/src/main/java/org/jboss/cache/optimistic/DataVersioningException.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/optimistic/DataVersioningException.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/optimistic/DataVersioningException.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -26,7 +26,7 @@
/**
* Denotes exceptions to do with data versioning in optimistic locking
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 1.4.1
*/
public class DataVersioningException extends CacheException
Modified: core/trunk/src/main/java/org/jboss/cache/optimistic/DefaultDataVersion.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/optimistic/DefaultDataVersion.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/optimistic/DefaultDataVersion.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -32,7 +32,7 @@
* of this class explicitly, via the {@link org.jboss.cache.config.Option#setDataVersion(DataVersion)} API, as it WILL
* break things.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
* @deprecated this is to support a deprecated locking scheme (Optimistic Locking). Will be removed when Optimistic Locking support is removed.
*/
@Immutable
Modified: core/trunk/src/main/java/org/jboss/cache/optimistic/OptimisticNodeFactory.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/optimistic/OptimisticNodeFactory.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/optimistic/OptimisticNodeFactory.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -34,7 +34,7 @@
/**
* Node factory specific to optimistic locking.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
* @deprecated will be removed along with optimistic and pessimistic locking.
*/
Modified: core/trunk/src/main/java/org/jboss/cache/optimistic/TransactionWorkspace.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/optimistic/TransactionWorkspace.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/optimistic/TransactionWorkspace.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -34,7 +34,7 @@
* an instance of TransactionWorkspace for each
* transaction running.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @author Steve Woodcock (<a href="mailto:stevew@jofti.com">stevew(a)jofti.com</a>)
* @deprecated will be removed along with optimistic and pessimistic locking.
*/
Modified: core/trunk/src/main/java/org/jboss/cache/optimistic/TransactionWorkspaceImpl.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/optimistic/TransactionWorkspaceImpl.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/optimistic/TransactionWorkspaceImpl.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -32,7 +32,7 @@
* Contains a mapping of Fqn to {@link WorkspaceNode}s.
* Each entry corresponds to a series of changed nodes within the transaction.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @author Steve Woodcock (<a href="mailto:stevew@jofti.com">stevew(a)jofti.com</a>)
* @deprecated will be removed along with optimistic and pessimistic locking.
*/
Modified: core/trunk/src/main/java/org/jboss/cache/optimistic/WorkspaceNode.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/optimistic/WorkspaceNode.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/optimistic/WorkspaceNode.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -36,7 +36,7 @@
* <p/>
* Typically used when the cache mode configured is {@link org.jboss.cache.config.Configuration.NodeLockingScheme#OPTIMISTIC}
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @author Steve Woodcock (<a href="mailto:stevew@jofti.com">stevew(a)jofti.com</a>)
* @since 1.3.0
* @deprecated will be removed along with optimistic and pessimistic locking.
Modified: core/trunk/src/main/java/org/jboss/cache/optimistic/WorkspaceNodeImpl.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/optimistic/WorkspaceNodeImpl.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/optimistic/WorkspaceNodeImpl.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -45,7 +45,7 @@
/**
* Wraps an ordinary {@link Node} and adds versioning and other meta data to it.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @author Steve Woodcock (<a href="mailto:stevew@jofti.com">stevew(a)jofti.com</a>)
* @deprecated will be removed along with optimistic and pessimistic locking.
*/
Modified: core/trunk/src/main/java/org/jboss/cache/remoting/jgroups/ChannelMessageListener.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/remoting/jgroups/ChannelMessageListener.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/remoting/jgroups/ChannelMessageListener.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -44,7 +44,7 @@
/**
* JGroups MessageListener
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 2.1.0
*/
@NonVolatile
Modified: core/trunk/src/main/java/org/jboss/cache/statetransfer/LegacyStateTransferManager.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/statetransfer/LegacyStateTransferManager.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/statetransfer/LegacyStateTransferManager.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -38,7 +38,7 @@
/**
* This is to support legacy locking schemes such as Pessimistic and Optimistic locking.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
*/
@Deprecated
Modified: core/trunk/src/main/java/org/jboss/cache/statetransfer/StateTransferManager.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/statetransfer/StateTransferManager.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/statetransfer/StateTransferManager.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -33,7 +33,7 @@
* in state transfer implementations.
* <p/>
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
*/
public interface StateTransferManager
Modified: core/trunk/src/main/java/org/jboss/cache/transaction/GlobalTransaction.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/transaction/GlobalTransaction.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/transaction/GlobalTransaction.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -36,7 +36,7 @@
* messages have to have a unique identifier to associate the changes with<br>
*
* @author <a href="mailto:bela@jboss.org">Bela Ban</a> Apr 12, 2003
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
* @version $Revision$
*/
public class GlobalTransaction implements Externalizable
Modified: core/trunk/src/main/java/org/jboss/cache/transaction/MVCCTransactionContext.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/transaction/MVCCTransactionContext.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/transaction/MVCCTransactionContext.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -33,7 +33,7 @@
/**
* A transaction context specially geared to dealing with MVCC.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
*/
public class MVCCTransactionContext extends AbstractTransactionContext
Modified: core/trunk/src/main/java/org/jboss/cache/transaction/OptimisticTransactionContext.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/transaction/OptimisticTransactionContext.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/transaction/OptimisticTransactionContext.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -32,7 +32,7 @@
* Subclasses the {@link PessimisticTransactionContext} class to add a {@link TransactionWorkspace}. Used with optimistic locking
* where each call is assigned a trasnaction and a transaction workspace.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
* @author <a href="mailto:stevew@jofti.com">Steve Woodcock (stevew(a)jofti.com)</a>
* @deprecated will be removed along with optimistic and pessimistic locking.
*/
Modified: core/trunk/src/main/java/org/jboss/cache/transaction/TransactionContext.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/transaction/TransactionContext.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/transaction/TransactionContext.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -35,7 +35,7 @@
* This was a concrete class called TransactionEntry prior to 3.0.
* <p/>
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @see org.jboss.cache.InvocationContext
*/
public interface TransactionContext
Modified: core/trunk/src/main/java/org/jboss/cache/util/BeanUtils.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/util/BeanUtils.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/util/BeanUtils.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -27,7 +27,7 @@
/**
* Simple JavaBean manipulation helper methods
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 2.1.0
*/
public class BeanUtils
Modified: core/trunk/src/main/java/org/jboss/cache/util/BitEncodedIntegerSet.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/util/BitEncodedIntegerSet.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/util/BitEncodedIntegerSet.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -32,7 +32,7 @@
* integers. The upshot is a guaranteed limit on how much memory is consumed, as well as very efficient operations on the set.
* <p/>
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 2.1.0
*/
@NotThreadSafe
Modified: core/trunk/src/main/java/org/jboss/cache/util/CachePrinter.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/util/CachePrinter.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/util/CachePrinter.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -31,7 +31,7 @@
/**
* Helper that prints the contents of a {@link org.jboss.cache.Cache} to a string.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.0.0
*/
public class CachePrinter
Modified: core/trunk/src/main/java/org/jboss/cache/util/ImmutableListCopy.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/util/ImmutableListCopy.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/util/ImmutableListCopy.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -46,7 +46,7 @@
* Also used whenever a read-only reference List is needed (such as in Fqns).
* <p/>
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
*/
@Immutable
Modified: core/trunk/src/main/java/org/jboss/cache/util/concurrent/ConcurrentHashSet.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/util/concurrent/ConcurrentHashSet.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/util/concurrent/ConcurrentHashSet.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -32,7 +32,7 @@
* <p/>
* Note that values are stored as keys in the underlying Map, with a static dummy object as value.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.0.0
*/
public class ConcurrentHashSet<E> extends AbstractSet<E>
Modified: core/trunk/src/main/java/org/jboss/cache/util/concurrent/ReclosableLatch.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/util/concurrent/ReclosableLatch.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/util/concurrent/ReclosableLatch.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -30,7 +30,7 @@
* This implementation allows you to create a latch with a default state (open or closed), and repeatedly open or close
* the latch.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
*/
public class ReclosableLatch extends AbstractQueuedSynchronizer
Modified: core/trunk/src/main/java/org/jboss/cache/util/concurrent/SelfInitializingConcurrentHashMap.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/util/concurrent/SelfInitializingConcurrentHashMap.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/util/concurrent/SelfInitializingConcurrentHashMap.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -32,7 +32,7 @@
* Primarily used to hold child maps for nodes. Underlying CHM is null initially, and once threads start
* writing to this map, the CHM is initialized.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
*/
public class SelfInitializingConcurrentHashMap<K, V> implements ConcurrentMap<K, V>
Modified: core/trunk/src/main/java/org/jboss/cache/util/concurrent/WithinThreadExecutor.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/util/concurrent/WithinThreadExecutor.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/util/concurrent/WithinThreadExecutor.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -36,7 +36,7 @@
/**
* An executor that works within the current thread.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @see <a href="http://jcip.net/">Java Concurrency In Practice</a>
* @since 3.0
*/
Modified: core/trunk/src/main/java/org/jboss/cache/util/concurrent/locks/LockContainer.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/util/concurrent/locks/LockContainer.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/util/concurrent/locks/LockContainer.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -28,7 +28,7 @@
/**
* A container for locks. Used with lock striping.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
*/
@ThreadSafe
Modified: core/trunk/src/main/java/org/jboss/cache/util/concurrent/locks/OwnableReentrantLock.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/util/concurrent/locks/OwnableReentrantLock.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/util/concurrent/locks/OwnableReentrantLock.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -41,7 +41,7 @@
* For the sake of performance, this lock only supports nonfair queueing.
* <p/>
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
*/
@ThreadSafe
Modified: core/trunk/src/main/java/org/jboss/cache/util/concurrent/locks/OwnableReentrantLockContainer.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/util/concurrent/locks/OwnableReentrantLockContainer.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/util/concurrent/locks/OwnableReentrantLockContainer.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -29,7 +29,7 @@
/**
* A LockContainer that holds {@link org.jboss.cache.util.concurrent.locks.OwnableReentrantLock}s.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @see org.jboss.cache.util.concurrent.locks.ReentrantLockContainer
* @see org.jboss.cache.util.concurrent.locks.OwnableReentrantLock
* @since 3.0
Modified: core/trunk/src/main/java/org/jboss/cache/util/concurrent/locks/ReentrantLockContainer.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/util/concurrent/locks/ReentrantLockContainer.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/util/concurrent/locks/ReentrantLockContainer.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -29,7 +29,7 @@
/**
* A LockContainer that holds ReentrantLocks
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @see org.jboss.cache.util.concurrent.locks.OwnableReentrantLockContainer
* @since 3.0
*/
Modified: core/trunk/src/main/java/org/jboss/cache/util/reflect/ReflectionUtil.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/util/reflect/ReflectionUtil.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/main/java/org/jboss/cache/util/reflect/ReflectionUtil.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -36,7 +36,7 @@
/**
* Basic reflection utilities to enhance what the JDK provides.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 2.1.0
*/
public class ReflectionUtil
Modified: core/trunk/src/test/java/org/jboss/cache/CacheFactoryTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/CacheFactoryTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/CacheFactoryTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -19,7 +19,7 @@
import java.io.InputStream;
/**
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
*/
@Test(groups = {"functional"}, sequential = true)
public class CacheFactoryTest
Modified: core/trunk/src/test/java/org/jboss/cache/api/CacheAPITest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/api/CacheAPITest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/api/CacheAPITest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -6,6 +6,7 @@
import org.jboss.cache.Fqn;
import org.jboss.cache.NodeSPI;
import org.jboss.cache.Region;
+import org.jboss.cache.UnitTestCacheFactory;
import org.jboss.cache.config.Configuration;
import org.jboss.cache.config.Configuration.NodeLockingScheme;
import org.jboss.cache.config.ConfigurationException;
@@ -25,12 +26,11 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.jboss.cache.UnitTestCacheFactory;
/**
* Tests the {@link org.jboss.cache.Cache} public API at a high level
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
*/
@Test(groups = {"functional", "pessimistic"}, sequential = true)
Modified: core/trunk/src/test/java/org/jboss/cache/api/NodeAPITest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/api/NodeAPITest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/api/NodeAPITest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -3,6 +3,7 @@
import org.jboss.cache.CacheSPI;
import org.jboss.cache.Fqn;
import org.jboss.cache.Node;
+import org.jboss.cache.UnitTestCacheFactory;
import org.jboss.cache.config.Configuration;
import org.jboss.cache.config.Configuration.NodeLockingScheme;
import static org.jboss.cache.config.Configuration.NodeLockingScheme.OPTIMISTIC;
@@ -13,6 +14,7 @@
import org.jboss.cache.interceptors.base.CommandInterceptor;
import org.jboss.cache.optimistic.TransactionWorkspace;
import org.jboss.cache.transaction.OptimisticTransactionContext;
+import org.jboss.cache.util.TestingUtil;
import static org.testng.AssertJUnit.*;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
@@ -23,13 +25,11 @@
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import org.jboss.cache.UnitTestCacheFactory;
-import org.jboss.cache.util.TestingUtil;
/**
* Tests {@link org.jboss.cache.Node}-centric operations
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.0.0
*/
@Test(groups = {"functional", "pessimistic"})
Modified: core/trunk/src/test/java/org/jboss/cache/api/NodeMoveAPITest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/api/NodeMoveAPITest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/api/NodeMoveAPITest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -6,6 +6,7 @@
import org.jboss.cache.Fqn;
import org.jboss.cache.Node;
import org.jboss.cache.NodeNotExistsException;
+import org.jboss.cache.UnitTestCacheFactory;
import org.jboss.cache.config.CacheLoaderConfig;
import org.jboss.cache.config.Configuration;
import org.jboss.cache.config.Configuration.NodeLockingScheme;
@@ -23,12 +24,11 @@
import java.util.Map;
import java.util.Random;
import java.util.concurrent.CountDownLatch;
-import org.jboss.cache.UnitTestCacheFactory;
/**
* Excercises and tests the new move() api
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.0.0
*/
@Test(groups = {"functional", "pessimistic"})
Modified: core/trunk/src/test/java/org/jboss/cache/api/SyncReplTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/api/SyncReplTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/api/SyncReplTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -12,6 +12,7 @@
import org.jboss.cache.Fqn;
import org.jboss.cache.InvocationContext;
import org.jboss.cache.Node;
+import org.jboss.cache.UnitTestCacheFactory;
import org.jboss.cache.config.Configuration;
import org.jboss.cache.config.Configuration.CacheMode;
import org.jboss.cache.config.Configuration.NodeLockingScheme;
@@ -20,14 +21,13 @@
import static org.testng.AssertJUnit.*;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
import java.util.HashMap;
import java.util.Map;
-import org.jboss.cache.UnitTestCacheFactory;
-import org.testng.annotations.Test;
/**
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
*/
@Test(groups = {"functional", "jgroups", "pessimistic"}, sequential = true)
public class SyncReplTest
Modified: core/trunk/src/test/java/org/jboss/cache/api/SyncReplTxTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/api/SyncReplTxTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/api/SyncReplTxTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -12,6 +12,7 @@
import org.jboss.cache.Fqn;
import org.jboss.cache.InvocationContext;
import org.jboss.cache.Node;
+import org.jboss.cache.UnitTestCacheFactory;
import org.jboss.cache.config.Configuration;
import org.jboss.cache.config.Configuration.CacheMode;
import org.jboss.cache.config.Configuration.NodeLockingScheme;
@@ -32,10 +33,9 @@
import javax.transaction.TransactionManager;
import java.util.ArrayList;
import java.util.List;
-import org.jboss.cache.UnitTestCacheFactory;
/**
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
*/
@Test(groups = {"functional", "jgroups", "transaction", "pessimistic"}, sequential = true)
public class SyncReplTxTest
Modified: core/trunk/src/test/java/org/jboss/cache/api/mvcc/LockAssert.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/api/mvcc/LockAssert.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/api/mvcc/LockAssert.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -9,7 +9,7 @@
/**
* Helper class to assert lock status in MVCC
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
*/
public class LockAssert
Modified: core/trunk/src/test/java/org/jboss/cache/api/mvcc/LockTestBase.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/api/mvcc/LockTestBase.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/api/mvcc/LockTestBase.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -2,6 +2,7 @@
import org.jboss.cache.Cache;
import org.jboss.cache.Fqn;
+import org.jboss.cache.UnitTestCacheFactory;
import org.jboss.cache.config.Configuration.CacheMode;
import org.jboss.cache.config.Configuration.NodeLockingScheme;
import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
@@ -18,10 +19,9 @@
import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
import java.util.Collections;
-import org.jboss.cache.UnitTestCacheFactory;
/**
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
*/
@Test(groups = {"functional", "mvcc"})
Modified: core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/InvalidatedOptNodeValidityTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/InvalidatedOptNodeValidityTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/InvalidatedOptNodeValidityTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -9,7 +9,7 @@
import org.testng.annotations.Test;
/**
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.1.0
*/
@Test(groups = {"functional", "optimistic"})
Modified: core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/InvalidatedPessNodeValidityTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/InvalidatedPessNodeValidityTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/InvalidatedPessNodeValidityTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -1,6 +1,5 @@
package org.jboss.cache.api.nodevalidity;
-import java.util.Properties;
import org.jboss.cache.Cache;
import org.jboss.cache.CacheFactory;
import org.jboss.cache.CacheSPI;
@@ -13,8 +12,10 @@
import org.testng.annotations.AfterMethod;
import org.testng.annotations.Test;
+import java.util.Properties;
+
/**
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.1.0
*/
@Test(groups = {"functional", "pessimistic"})
Modified: core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/LocalOptNodeValidityTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/LocalOptNodeValidityTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/LocalOptNodeValidityTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -4,7 +4,7 @@
import org.testng.annotations.Test;
/**
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.1.0
*/
@Test(groups = {"functional", "optimistic"})
Modified: core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/LocalPessNodeValidityTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/LocalPessNodeValidityTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/LocalPessNodeValidityTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -9,7 +9,7 @@
import org.testng.annotations.Test;
/**
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.1.0
*/
@Test(groups = {"functional", "pessimistic"})
Modified: core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/NodeValidityTestBase.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/NodeValidityTestBase.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/NodeValidityTestBase.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -20,7 +20,7 @@
/**
* exercises the isValid() api call on node.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.1.0
*/
@Test(groups = {"functional"})
Modified: core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/ReplicatedOptNodeValidityTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/ReplicatedOptNodeValidityTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/ReplicatedOptNodeValidityTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -4,7 +4,7 @@
import org.testng.annotations.Test;
/**
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.1.0
*/
@Test(groups = {"functional", "optimistic"})
Modified: core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/ReplicatedPessNodeValidityTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/ReplicatedPessNodeValidityTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/ReplicatedPessNodeValidityTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -7,7 +7,7 @@
import org.testng.annotations.Test;
/**
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.1.0
*/
@Test(groups = {"functional", "pessimistic"})
Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyAssignmentStateTransferTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyAssignmentStateTransferTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyAssignmentStateTransferTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -23,7 +23,7 @@
/**
* Tests how groups are formed and disbanded
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
*/
@Test(groups = {"functional", "jgroups"})
public class BuddyAssignmentStateTransferTest extends BuddyReplicationTestsBase
Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyFqnTransformerTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyFqnTransformerTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyFqnTransformerTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -4,7 +4,7 @@
import org.testng.annotations.Test;
/**
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 2.2.0
*/
@Test(groups = "unit")
Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyGroupAssignmentTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyGroupAssignmentTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyGroupAssignmentTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -6,20 +6,21 @@
*/
package org.jboss.cache.buddyreplication;
-import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jboss.cache.Cache;
import org.jboss.cache.CacheSPI;
import org.jboss.cache.Fqn;
+import org.jboss.cache.util.CachePrinter;
import org.jboss.cache.util.TestingUtil;
-import org.jboss.cache.util.CachePrinter;
import org.testng.annotations.Test;
+import java.util.List;
+
/**
* Tests how groups are formed and disbanded
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
*/
@Test(groups = {"functional", "jgroups"})
public class BuddyGroupAssignmentTest extends BuddyReplicationTestsBase
Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyManagerTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyManagerTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyManagerTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -25,7 +25,7 @@
/**
* Tests the BuddyManager class
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
*/
@Test(groups = "functional")
public class BuddyManagerTest
Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyPoolBroadcastTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyPoolBroadcastTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyPoolBroadcastTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -22,7 +22,7 @@
/**
* Tests basic group membership semantics
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
*/
@Test(groups = "functional")
public class BuddyPoolBroadcastTest extends BuddyReplicationTestsBase
Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationConfigTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationConfigTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationConfigTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -25,7 +25,7 @@
/**
* Tests basic configuration options by passing stuff into the CacheImpl.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
*/
@Test(groups = {"functional", "jgroups"}, sequential = true)
public class BuddyReplicationConfigTest
Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationContentTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationContentTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationContentTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -10,12 +10,12 @@
import org.apache.commons.logging.LogFactory;
import org.jboss.cache.CacheSPI;
import org.jboss.cache.Fqn;
-import org.jboss.cache.util.TestingUtil;
import org.jboss.cache.notifications.annotation.CacheBlocked;
import org.jboss.cache.notifications.annotation.CacheListener;
import org.jboss.cache.notifications.annotation.CacheUnblocked;
import org.jboss.cache.notifications.event.Event;
import org.jboss.cache.util.CachePrinter;
+import org.jboss.cache.util.TestingUtil;
import static org.testng.AssertJUnit.*;
import org.testng.annotations.Test;
@@ -25,7 +25,7 @@
/**
* Teststhe transfer of content under *normal* operation
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
*/
@Test(groups = {"functional"})
public class BuddyReplicationContentTest extends BuddyReplicationTestsBase
Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationFailoverTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationFailoverTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationFailoverTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -6,7 +6,6 @@
*/
package org.jboss.cache.buddyreplication;
-import java.util.List;
import org.jboss.cache.CacheSPI;
import org.jboss.cache.Fqn;
import org.jboss.cache.util.TestingUtil;
@@ -15,10 +14,12 @@
import static org.testng.AssertJUnit.*;
import org.testng.annotations.Test;
+import java.util.List;
+
/**
* Tests behaviour when data owners fail - essentially this tests data gravitation
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
*/
@Test(groups = "functional")
public class BuddyReplicationFailoverTest extends BuddyReplicationTestsBase
Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationTestsBase.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationTestsBase.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationTestsBase.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -9,6 +9,7 @@
import org.jboss.cache.Cache;
import org.jboss.cache.CacheSPI;
import org.jboss.cache.Fqn;
+import org.jboss.cache.UnitTestCacheFactory;
import org.jboss.cache.config.BuddyReplicationConfig;
import org.jboss.cache.config.CacheLoaderConfig;
import org.jboss.cache.config.CacheLoaderConfig.IndividualCacheLoaderConfig;
@@ -28,12 +29,11 @@
import javax.transaction.TransactionManager;
import java.util.ArrayList;
import java.util.List;
-import org.jboss.cache.UnitTestCacheFactory;
/**
* Base class for BR tests
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
*/
@Test(groups = {"functional", "jgroups"})
public abstract class BuddyReplicationTestsBase
Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationWithCacheLoaderTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationWithCacheLoaderTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationWithCacheLoaderTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -9,6 +9,7 @@
import org.jboss.cache.Cache;
import org.jboss.cache.CacheSPI;
import org.jboss.cache.Fqn;
+import org.jboss.cache.UnitTestCacheFactory;
import org.jboss.cache.config.Configuration;
import org.jboss.cache.config.EvictionConfig;
import org.jboss.cache.config.EvictionRegionConfig;
@@ -24,12 +25,11 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import org.jboss.cache.UnitTestCacheFactory;
/**
* Tests use of the data gravitator alongside other cache loaders as well as data gravitator options such as removeOnFind.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
*/
@Test(groups = "functional")
public class BuddyReplicationWithCacheLoaderTest extends BuddyReplicationTestsBase
Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationWithOptimisticLockingTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationWithOptimisticLockingTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationWithOptimisticLockingTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -9,7 +9,7 @@
import org.testng.annotations.Test;
/**
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
*/
@Test(groups = {"functional", "jgroups", "optimistic"})
public class BuddyReplicationWithOptimisticLockingTest extends BuddyReplicationFailoverTest
Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationWithPassivationTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationWithPassivationTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationWithPassivationTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -9,7 +9,7 @@
import org.testng.annotations.Test;
/**
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
*/
@Test(groups = "functional")
public class BuddyReplicationWithPassivationTest extends BuddyReplicationWithCacheLoaderTest
Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationWithTransactionsTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationWithTransactionsTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationWithTransactionsTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -6,7 +6,7 @@
*/
package org.jboss.cache.buddyreplication;
-import java.util.List;
+import org.jboss.cache.CacheSPI;
import org.jboss.cache.Fqn;
import org.jboss.cache.util.TestingUtil;
import static org.jboss.cache.util.TestingUtil.dumpCacheContents;
@@ -14,10 +14,10 @@
import org.testng.annotations.Test;
import javax.transaction.TransactionManager;
-import org.jboss.cache.CacheSPI;
+import java.util.List;
/**
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
*/
@Test(groups = {"functional", "jgroups"})
public class BuddyReplicationWithTransactionsTest extends BuddyReplicationTestsBase
Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/DisabledStateTransferTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/buddyreplication/DisabledStateTransferTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/DisabledStateTransferTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -1,16 +1,17 @@
package org.jboss.cache.buddyreplication;
-import java.util.List;
import org.jboss.cache.CacheSPI;
import org.jboss.cache.Fqn;
+import org.jboss.cache.util.CachePrinter;
import org.jboss.cache.util.TestingUtil;
-import org.jboss.cache.util.CachePrinter;
import org.testng.annotations.Test;
+import java.util.List;
+
/**
* This is to test JBCACHE-1229
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 2.1.0
*/
@Test(groups = "functional")
Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/EmptyRegionTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/buddyreplication/EmptyRegionTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/EmptyRegionTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -3,23 +3,23 @@
import org.jboss.cache.CacheSPI;
import org.jboss.cache.Fqn;
import org.jboss.cache.Region;
+import org.jboss.cache.UnitTestCacheFactory;
import org.jboss.cache.notifications.annotation.BuddyGroupChanged;
import org.jboss.cache.notifications.annotation.CacheListener;
import org.jboss.cache.notifications.event.Event;
import org.jboss.cache.util.CachePrinter;
import org.jboss.cache.util.TestingUtil;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import org.jboss.cache.UnitTestCacheFactory;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
/**
* To test http://jira.jboss.org/jira/browse/JBCACHE-1349
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
*/
@Test(groups = "functional", sequential = true)
public class EmptyRegionTest extends BuddyReplicationTestsBase
Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/EvictionOfBuddyBackupsTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/buddyreplication/EvictionOfBuddyBackupsTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/EvictionOfBuddyBackupsTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -2,20 +2,19 @@
import org.jboss.cache.CacheSPI;
import org.jboss.cache.Fqn;
+import org.jboss.cache.UnitTestCacheFactory;
import org.jboss.cache.config.EvictionConfig;
import org.jboss.cache.config.EvictionRegionConfig;
import org.jboss.cache.eviction.LRUAlgorithmConfig;
import org.jboss.cache.eviction.NullEvictionAlgorithmConfig;
import org.jboss.cache.util.TestingUtil;
-import org.testng.annotations.Test;
-
-import org.jboss.cache.UnitTestCacheFactory;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
/**
* Tests the eviction of buddy backup regions
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 2.2.0
*/
@Test(groups = "functional", sequential = true)
Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/GravitationCleanupTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/buddyreplication/GravitationCleanupTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/GravitationCleanupTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -1,14 +1,15 @@
package org.jboss.cache.buddyreplication;
-import java.util.List;
import org.jboss.cache.CacheSPI;
import org.jboss.cache.Fqn;
import org.jboss.cache.util.CachePrinter;
import org.jboss.cache.util.TestingUtil;
import org.testng.annotations.Test;
+import java.util.List;
+
/**
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 2.1.0
*/
@Test(groups = "functional", sequential = true)
Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/NextMemberBuddyLocatorTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/buddyreplication/NextMemberBuddyLocatorTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/NextMemberBuddyLocatorTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -6,7 +6,12 @@
*/
package org.jboss.cache.buddyreplication;
+import org.jgroups.Address;
+import org.jgroups.stack.IpAddress;
import static org.testng.AssertJUnit.assertEquals;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
import java.net.Inet6Address;
import java.net.InetAddress;
@@ -17,16 +22,10 @@
import java.util.List;
import java.util.Map;
-import org.jgroups.Address;
-import org.jgroups.stack.IpAddress;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
/**
* Tests the NextMemberBuddyLocator
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
*/
@Test(groups = "functional", sequential = true)
public class NextMemberBuddyLocatorTest
Modified: core/trunk/src/test/java/org/jboss/cache/config/ConfigurationTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/config/ConfigurationTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/config/ConfigurationTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -7,17 +7,16 @@
package org.jboss.cache.config;
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertNull;
-
import org.jboss.cache.config.Configuration.CacheMode;
-import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
import org.jboss.cache.config.parsing.XmlConfigurationParser;
+import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
import org.jboss.cache.lock.IsolationLevel;
import org.jboss.cache.transaction.TransactionSetup;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertNull;
import org.testng.annotations.Test;
/**
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
*/
@Test(groups = {"functional", "jgroups", "transaction"})
public class ConfigurationTest
Modified: core/trunk/src/test/java/org/jboss/cache/config/parsing/CacheConfigsTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/config/parsing/CacheConfigsTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/config/parsing/CacheConfigsTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -11,7 +11,7 @@
/**
* Tests the {@link org.jboss.cache.config.parsing.CacheConfigsXmlParser}.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
*/
@Test(groups = "unit")
Modified: core/trunk/src/test/java/org/jboss/cache/demo/JBossCacheGUI.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/demo/JBossCacheGUI.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/demo/JBossCacheGUI.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -65,7 +65,7 @@
/**
* JBossCache GUI for the demo
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
* @author <a href="mailto:galder.zamarreno@jboss.com">Galder Zamarreno</a>
*/
@CacheListener
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/minttl/FIFOMinTTLTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/minttl/FIFOMinTTLTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/minttl/FIFOMinTTLTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -8,7 +8,7 @@
import org.testng.annotations.Test;
/**
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.1.0
*/
@Test(groups = {"functional"})
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/minttl/LFUMinTTLTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/minttl/LFUMinTTLTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/minttl/LFUMinTTLTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -5,7 +5,7 @@
import org.testng.annotations.Test;
/**
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.1.0
*/
@Test(groups = {"functional"})
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/minttl/LRUMinTTLTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/minttl/LRUMinTTLTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/minttl/LRUMinTTLTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -5,7 +5,7 @@
import org.testng.annotations.Test;
/**
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.1.0
*/
@Test(groups = {"functional"})
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/minttl/MRUMinTTLTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/minttl/MRUMinTTLTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/minttl/MRUMinTTLTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -8,7 +8,7 @@
import org.testng.annotations.Test;
/**
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.1.0
*/
@Test(groups = {"functional"})
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/minttl/MinTTLTestBase.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/minttl/MinTTLTestBase.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/minttl/MinTTLTestBase.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -2,10 +2,12 @@
import org.jboss.cache.Cache;
import org.jboss.cache.Fqn;
+import org.jboss.cache.UnitTestCacheFactory;
import org.jboss.cache.config.EvictionConfig;
import org.jboss.cache.config.EvictionRegionConfig;
import org.jboss.cache.eviction.EvictionAlgorithmConfigBase;
import org.jboss.cache.eviction.EvictionTestsBase;
+import org.jboss.cache.util.TestingUtil;
import org.jboss.cache.util.internals.EvictionController;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
@@ -13,13 +15,11 @@
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import org.jboss.cache.UnitTestCacheFactory;
-import org.jboss.cache.util.TestingUtil;
/**
* This test exercises the minimum time to live for any element in the cache
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.1.0
*/
@Test(groups = {"functional"}, sequential = true)
Modified: core/trunk/src/test/java/org/jboss/cache/factories/ComponentRegistryFunctionalTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/factories/ComponentRegistryFunctionalTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/factories/ComponentRegistryFunctionalTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -3,7 +3,7 @@
import org.testng.annotations.Test;
/**
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 2.1.0
*/
@Test(groups = {"functional"})
Modified: core/trunk/src/test/java/org/jboss/cache/factories/ComponentRegistryUnitTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/factories/ComponentRegistryUnitTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/factories/ComponentRegistryUnitTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -6,7 +6,7 @@
import org.testng.annotations.Test;
/**
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 2.1.0
*/
@Test(groups = "functional")
Modified: core/trunk/src/test/java/org/jboss/cache/factories/CustomInterceptorChainTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/factories/CustomInterceptorChainTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/factories/CustomInterceptorChainTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -1,8 +1,10 @@
package org.jboss.cache.factories;
import org.jboss.cache.CacheSPI;
+import org.jboss.cache.UnitTestCacheFactory;
import org.jboss.cache.config.Configuration;
import org.jboss.cache.interceptors.base.CommandInterceptor;
+import org.jboss.cache.util.TestingUtil;
import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.fail;
import org.testng.annotations.AfterMethod;
@@ -10,11 +12,9 @@
import org.testng.annotations.Test;
import java.util.List;
-import org.jboss.cache.UnitTestCacheFactory;
-import org.jboss.cache.util.TestingUtil;
/**
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
*/
@Test(groups = {"functional"}, sequential = true)
public class CustomInterceptorChainTest extends InterceptorChainTestBase
Modified: core/trunk/src/test/java/org/jboss/cache/factories/InterceptorChainTestBase.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/factories/InterceptorChainTestBase.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/factories/InterceptorChainTestBase.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -6,7 +6,7 @@
import java.util.List;
/**
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
*/
public abstract class InterceptorChainTestBase
{
Modified: core/trunk/src/test/java/org/jboss/cache/factories/LateConfigurationTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/factories/LateConfigurationTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/factories/LateConfigurationTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -1,8 +1,8 @@
package org.jboss.cache.factories;
import org.jboss.cache.CacheSPI;
+import org.jboss.cache.Fqn;
import org.jboss.cache.UnitTestCacheFactory;
-import org.jboss.cache.Fqn;
import org.jboss.cache.config.BuddyReplicationConfig;
import org.jboss.cache.config.CacheLoaderConfig;
import org.jboss.cache.config.Configuration;
@@ -21,7 +21,7 @@
import java.io.ObjectOutputStream;
/**
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 2.1.0
*/
@Test(groups = "functional", sequential = true)
Modified: core/trunk/src/test/java/org/jboss/cache/interceptors/LegacyInterceptorTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/interceptors/LegacyInterceptorTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/interceptors/LegacyInterceptorTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -4,22 +4,21 @@
import org.jboss.cache.CacheSPI;
import org.jboss.cache.Fqn;
import org.jboss.cache.InvocationContext;
+import org.jboss.cache.UnitTestCacheFactory;
import org.jboss.cache.commands.write.PutKeyValueCommand;
import org.jboss.cache.util.TestingUtil;
+import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
import org.testng.annotations.Test;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
-import org.jboss.cache.UnitTestCacheFactory;
-import org.testng.annotations.AfterMethod;
/**
* This is to test that "old-style" interceptors from 2.0.x and 2.1.x will work with the new interceptor structure.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 2.2.0
*/
@Test(groups = "functional", sequential = true)
Modified: core/trunk/src/test/java/org/jboss/cache/interceptors/MarshalledValueInterceptorTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/interceptors/MarshalledValueInterceptorTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/interceptors/MarshalledValueInterceptorTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -1,6 +1,7 @@
package org.jboss.cache.interceptors;
import org.jboss.cache.CacheSPI;
+import org.jboss.cache.UnitTestCacheFactory;
import org.jboss.cache.config.Configuration;
import org.jboss.cache.marshall.MarshalledValueHelper;
import org.jboss.cache.util.CachePrinter;
@@ -12,10 +13,9 @@
import java.util.Date;
import java.util.List;
import java.util.Map;
-import org.jboss.cache.UnitTestCacheFactory;
/**
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 2.1.0
*/
@Test(groups = "functional", sequential = true)
Modified: core/trunk/src/test/java/org/jboss/cache/invalidation/InvalidationInterceptorTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/invalidation/InvalidationInterceptorTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/invalidation/InvalidationInterceptorTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -12,6 +12,7 @@
import org.jboss.cache.Fqn;
import org.jboss.cache.Node;
import org.jboss.cache.NodeSPI;
+import org.jboss.cache.UnitTestCacheFactory;
import org.jboss.cache.config.CacheLoaderConfig;
import org.jboss.cache.config.Configuration;
import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
@@ -29,12 +30,11 @@
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.jboss.cache.UnitTestCacheFactory;
/**
* Tests the async interceptor
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
*/
@Test(groups = {"functional", "jgroups"}, sequential = true)
public class InvalidationInterceptorTest
Modified: core/trunk/src/test/java/org/jboss/cache/invalidation/TombstoneEvictionTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/invalidation/TombstoneEvictionTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/invalidation/TombstoneEvictionTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -4,6 +4,7 @@
import org.apache.commons.logging.LogFactory;
import org.jboss.cache.CacheSPI;
import org.jboss.cache.Fqn;
+import org.jboss.cache.UnitTestCacheFactory;
import org.jboss.cache.config.Configuration;
import org.jboss.cache.config.EvictionConfig;
import org.jboss.cache.config.EvictionRegionConfig;
@@ -16,12 +17,11 @@
import java.util.ArrayList;
import java.util.List;
-import org.jboss.cache.UnitTestCacheFactory;
/**
* Make sure tombstones are evicted
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.1.0
*/
@Test(groups = {"functional", "optimistic"}, sequential = true)
Modified: core/trunk/src/test/java/org/jboss/cache/invalidation/VersionInconsistencyTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/invalidation/VersionInconsistencyTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/invalidation/VersionInconsistencyTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -4,6 +4,7 @@
import org.jboss.cache.CacheSPI;
import org.jboss.cache.Fqn;
import org.jboss.cache.NodeSPI;
+import org.jboss.cache.UnitTestCacheFactory;
import org.jboss.cache.config.Configuration;
import org.jboss.cache.optimistic.DefaultDataVersion;
import org.jboss.cache.transaction.DummyTransactionManagerLookup;
@@ -14,12 +15,11 @@
import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
-import org.jboss.cache.UnitTestCacheFactory;
/**
* This test simulates the problem described in JBCACHE-1155
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.1.0
*/
@Test(groups = {"functional", "optimistic"}, sequential = true)
Modified: core/trunk/src/test/java/org/jboss/cache/invocationcontext/TransactionTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/invocationcontext/TransactionTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/invocationcontext/TransactionTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -1,11 +1,12 @@
package org.jboss.cache.invocationcontext;
import org.jboss.cache.CacheSPI;
-import org.jboss.cache.UnitTestCacheFactory;
import org.jboss.cache.Fqn;
+import org.jboss.cache.UnitTestCacheFactory;
import org.jboss.cache.config.Configuration.CacheMode;
import org.jboss.cache.transaction.TransactionContext;
import org.jboss.cache.transaction.TransactionTable;
+import org.jboss.cache.util.TestingUtil;
import static org.testng.AssertJUnit.*;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
@@ -14,13 +15,11 @@
import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
import java.util.Map;
-import org.jboss.cache.UnitTestCacheFactory;
-import org.jboss.cache.util.TestingUtil;
/**
* A test to ensure the transactional context is properly set up in the IC
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
*/
@Test(groups = {"functional", "transaction"}, sequential = true)
public class TransactionTest
Modified: core/trunk/src/test/java/org/jboss/cache/jmx/deprecated/CacheJmxWrapperTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/jmx/deprecated/CacheJmxWrapperTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/jmx/deprecated/CacheJmxWrapperTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -4,11 +4,12 @@
import org.jboss.cache.CacheException;
import org.jboss.cache.CacheStatus;
import org.jboss.cache.Fqn;
+import org.jboss.cache.UnitTestCacheFactory;
+import org.jboss.cache.config.Configuration;
+import org.jboss.cache.config.Configuration.CacheMode;
import org.jboss.cache.jmx.CacheJmxWrapper;
+import org.jboss.cache.jmx.CacheJmxWrapperMBean;
import org.jboss.cache.jmx.JmxRegistrationManager;
-import org.jboss.cache.jmx.CacheJmxWrapperMBean;
-import org.jboss.cache.config.Configuration;
-import org.jboss.cache.config.Configuration.CacheMode;
import org.jboss.cache.notifications.annotation.CacheListener;
import org.jboss.cache.notifications.annotation.CacheStarted;
import org.jboss.cache.notifications.annotation.CacheStopped;
@@ -24,12 +25,11 @@
import javax.management.ObjectName;
import javax.transaction.TransactionManager;
import java.util.List;
-import org.jboss.cache.UnitTestCacheFactory;
/**
* Tests the JMX wrapper class around the cache.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @author Brian Stansberry
*/
@Test(groups = "functional", sequential = true)
Modified: core/trunk/src/test/java/org/jboss/cache/jmx/deprecated/CacheJmxWrapperTestBase.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/jmx/deprecated/CacheJmxWrapperTestBase.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/jmx/deprecated/CacheJmxWrapperTestBase.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -2,10 +2,11 @@
import org.jboss.cache.Cache;
import org.jboss.cache.CacheFactory;
+import org.jboss.cache.UnitTestCacheFactory;
+import org.jboss.cache.config.Configuration;
+import org.jboss.cache.jmx.CacheJmxWrapper;
import org.jboss.cache.jmx.CacheJmxWrapperMBean;
import org.jboss.cache.jmx.JmxRegistrationManager;
-import org.jboss.cache.jmx.CacheJmxWrapper;
-import org.jboss.cache.config.Configuration;
import static org.testng.AssertJUnit.assertFalse;
import static org.testng.AssertJUnit.assertTrue;
import org.testng.annotations.AfterMethod;
@@ -17,12 +18,11 @@
import javax.management.MBeanServerInvocationHandler;
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
-import org.jboss.cache.UnitTestCacheFactory;
/**
* Tests the JMX wrapper class around the cache.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @author Brian Stansberry
*/
@Test(groups = "functional")
Modified: core/trunk/src/test/java/org/jboss/cache/jmx/deprecated/OptimisticNotificationTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/jmx/deprecated/OptimisticNotificationTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/jmx/deprecated/OptimisticNotificationTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -8,7 +8,7 @@
/**
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
*/
public class OptimisticNotificationTest extends NotificationTest
{
Modified: core/trunk/src/test/java/org/jboss/cache/loader/AbstractCacheLoaderTestBase.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/loader/AbstractCacheLoaderTestBase.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/loader/AbstractCacheLoaderTestBase.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -15,7 +15,7 @@
/**
* Very basic test case that provides methods to create a cache loader config.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
*/
@Test(groups = "functional")
Modified: core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderManagerTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderManagerTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderManagerTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -21,7 +21,7 @@
/**
* Tests the construction of a cache laoder based on an XML element passed in.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
* @author <a href="mailto:galder.zamarreno@jboss.com">Galder Zamarreno</a>
*/
@Test(groups = "functional", sequential = true)
Modified: core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderMethodCallCounterTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderMethodCallCounterTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderMethodCallCounterTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -18,7 +18,7 @@
/**
* A simple non-failing unit test to measure how many times each method on a cache loader is called.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
*/
@Test(groups = "functional", sequential = true)
public class CacheLoaderMethodCallCounterTest extends AbstractCacheLoaderTestBase
Modified: core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderPurgingTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderPurgingTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderPurgingTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -8,7 +8,6 @@
import org.jboss.cache.CacheException;
import org.jboss.cache.CacheSPI;
-import org.jboss.cache.UnitTestCacheFactory;
import org.jboss.cache.Fqn;
import org.jboss.cache.UnitTestCacheFactory;
import org.jboss.cache.config.CacheLoaderConfig;
@@ -21,7 +20,7 @@
import org.testng.annotations.Test;
/**
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
*/
@Test(groups = {"functional"}, sequential = true)
public class CacheLoaderPurgingTest extends AbstractCacheLoaderTestBase
Modified: core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderWithReplicationTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderWithReplicationTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderWithReplicationTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -9,6 +9,7 @@
import org.jboss.cache.Cache;
import org.jboss.cache.CacheSPI;
import org.jboss.cache.Fqn;
+import org.jboss.cache.UnitTestCacheFactory;
import org.jboss.cache.commands.tx.CommitCommand;
import org.jboss.cache.commands.tx.PrepareCommand;
import org.jboss.cache.config.Configuration;
@@ -23,12 +24,11 @@
import org.testng.annotations.Test;
import javax.transaction.TransactionManager;
-import org.jboss.cache.UnitTestCacheFactory;
/**
* Tests using cache loaders with replicating data
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
*/
@Test(groups = "functional", sequential = true)
public class CacheLoaderWithReplicationTest extends AbstractCacheLoaderTestBase
Modified: core/trunk/src/test/java/org/jboss/cache/loader/ChainingCacheLoaderBasicTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/loader/ChainingCacheLoaderBasicTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/loader/ChainingCacheLoaderBasicTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -17,7 +17,7 @@
/**
* Tests basic functionality of a chaining cache loader with 2 different loaders
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
*/
@Test(groups = {"functional"})
public class ChainingCacheLoaderBasicTest extends CacheLoaderTestsBase
Modified: core/trunk/src/test/java/org/jboss/cache/loader/ChainingCacheLoaderFullTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/loader/ChainingCacheLoaderFullTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/loader/ChainingCacheLoaderFullTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -8,22 +8,22 @@
import org.jboss.cache.CacheSPI;
import org.jboss.cache.Fqn;
+import org.jboss.cache.UnitTestCacheFactory;
import org.jboss.cache.config.CacheLoaderConfig;
import org.jboss.cache.config.Configuration;
import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
import org.jboss.cache.transaction.DummyTransactionManagerLookup;
+import org.jboss.cache.util.TestingUtil;
import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.assertNull;
import org.testng.annotations.Test;
import javax.transaction.TransactionManager;
-import org.jboss.cache.UnitTestCacheFactory;
-import org.jboss.cache.util.TestingUtil;
/**
* Tests ignoreModifications and tests contents of individual loaders
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
*/
@Test(groups = {"functional"}, sequential = true)
public class ChainingCacheLoaderFullTest
Modified: core/trunk/src/test/java/org/jboss/cache/loader/ClusteredCacheLoaderTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/loader/ClusteredCacheLoaderTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/loader/ClusteredCacheLoaderTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -11,6 +11,7 @@
import org.jboss.cache.CacheSPI;
import org.jboss.cache.Fqn;
import org.jboss.cache.Region;
+import org.jboss.cache.UnitTestCacheFactory;
import org.jboss.cache.config.Configuration;
import org.jboss.cache.config.Configuration.NodeLockingScheme;
import org.jboss.cache.lock.TimeoutException;
@@ -27,12 +28,11 @@
import java.util.Set;
import java.util.concurrent.CopyOnWriteArraySet;
import java.util.concurrent.CountDownLatch;
-import org.jboss.cache.UnitTestCacheFactory;
/**
* Tests ClusteredCacheLoader
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
*/
@Test(groups = {"functional"}, sequential = true)
public class ClusteredCacheLoaderTest extends AbstractCacheLoaderTestBase
Modified: core/trunk/src/test/java/org/jboss/cache/loader/ConcurrentPutRemoveEvictTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/loader/ConcurrentPutRemoveEvictTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/loader/ConcurrentPutRemoveEvictTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -1,8 +1,8 @@
package org.jboss.cache.loader;
import org.jboss.cache.Cache;
+import org.jboss.cache.Fqn;
import org.jboss.cache.UnitTestCacheFactory;
-import org.jboss.cache.Fqn;
import org.jboss.cache.config.CacheLoaderConfig;
import org.jboss.cache.config.Configuration;
import org.jboss.cache.util.TestingUtil;
@@ -18,7 +18,7 @@
/**
* To test JBCACHE-1355
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 2.2.0
*/
@Test(groups = "functional", enabled = false)
Modified: core/trunk/src/test/java/org/jboss/cache/loader/DummyCountingCacheLoader.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/loader/DummyCountingCacheLoader.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/loader/DummyCountingCacheLoader.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -20,7 +20,7 @@
* Dummy cache loader that captures the number of times each method is called. Stores statistics statically, mimicking
* a shared cache loader.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
*/
public class DummyCountingCacheLoader extends AbstractCacheLoader
{
Modified: core/trunk/src/test/java/org/jboss/cache/loader/DummyInMemoryCacheLoader.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/loader/DummyInMemoryCacheLoader.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/loader/DummyInMemoryCacheLoader.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -23,7 +23,7 @@
/**
* Dummy cache loader that stores data in memory
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
*/
@ThreadSafe
public class DummyInMemoryCacheLoader extends AbstractCacheLoader
Modified: core/trunk/src/test/java/org/jboss/cache/loader/DummySharedInMemoryCacheLoader.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/loader/DummySharedInMemoryCacheLoader.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/loader/DummySharedInMemoryCacheLoader.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -13,7 +13,7 @@
* Since 2.1.0, this dummy cache loader will take an optional parameter, "bin", which contains the name of the "bin" to use
* in the static field to store the content. This allows for tests to mimic multiple shared cache loaders in the same cache.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.0.0
*/
public class DummySharedInMemoryCacheLoader extends DummyInMemoryCacheLoader
Modified: core/trunk/src/test/java/org/jboss/cache/loader/SharedCacheLoaderTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/loader/SharedCacheLoaderTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/loader/SharedCacheLoaderTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -7,22 +7,22 @@
package org.jboss.cache.loader;
import org.jboss.cache.CacheSPI;
+import org.jboss.cache.UnitTestCacheFactory;
+import org.jboss.cache.config.Configuration;
import org.jboss.cache.interceptors.CacheStoreInterceptor;
import org.jboss.cache.interceptors.base.CommandInterceptor;
+import org.jboss.cache.util.TestingUtil;
import static org.testng.AssertJUnit.assertEquals;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import java.util.Iterator;
-import org.jboss.cache.UnitTestCacheFactory;
-import org.jboss.cache.config.Configuration;
-import org.jboss.cache.util.TestingUtil;
/**
* See http://www.jboss.com/index.html?module=bb&op=viewtopic&p=3919374#3919374
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
*/
@Test(groups = "functional", sequential = true)
public class SharedCacheLoaderTest extends AbstractCacheLoaderTestBase
Modified: core/trunk/src/test/java/org/jboss/cache/loader/UnnecessaryLoadingTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/loader/UnnecessaryLoadingTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/loader/UnnecessaryLoadingTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -5,8 +5,10 @@
import org.jboss.cache.Fqn;
import org.jboss.cache.Node;
import org.jboss.cache.NodeSPI;
+import org.jboss.cache.UnitTestCacheFactory;
import org.jboss.cache.config.CacheLoaderConfig;
import org.jboss.cache.config.Configuration.NodeLockingScheme;
+import org.jboss.cache.util.TestingUtil;
import static org.testng.AssertJUnit.*;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
@@ -16,11 +18,9 @@
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
-import org.jboss.cache.UnitTestCacheFactory;
-import org.jboss.cache.util.TestingUtil;
/**
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.0.0
*/
@Test(groups = {"functional"}, sequential = true)
Modified: core/trunk/src/test/java/org/jboss/cache/lock/MVCCLockManagerRecordingTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/lock/MVCCLockManagerRecordingTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/lock/MVCCLockManagerRecordingTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -15,7 +15,7 @@
import java.util.List;
/**
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
*/
@Test(groups = {"unit", "mvcc"})
Modified: core/trunk/src/test/java/org/jboss/cache/lock/NodeBasedLockManagerRecordingTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/lock/NodeBasedLockManagerRecordingTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/lock/NodeBasedLockManagerRecordingTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -10,7 +10,7 @@
import org.testng.annotations.Test;
/**
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
*/
@Test(groups = "unit")
Modified: core/trunk/src/test/java/org/jboss/cache/lock/PessimisticLockTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/lock/PessimisticLockTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/lock/PessimisticLockTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -4,6 +4,7 @@
import org.jboss.cache.CacheSPI;
import org.jboss.cache.Fqn;
import org.jboss.cache.NodeSPI;
+import org.jboss.cache.UnitTestCacheFactory;
import org.jboss.cache.config.Configuration;
import static org.jboss.cache.lock.LockType.READ;
import static org.jboss.cache.lock.LockType.WRITE;
@@ -16,12 +17,11 @@
import org.testng.annotations.Test;
import javax.transaction.TransactionManager;
-import org.jboss.cache.UnitTestCacheFactory;
/**
* basic locking test
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.0.0
*/
@Test(groups = "functional", sequential = true)
Modified: core/trunk/src/test/java/org/jboss/cache/marshall/AbstractVersionAwareMarshallerTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/marshall/AbstractVersionAwareMarshallerTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/marshall/AbstractVersionAwareMarshallerTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -7,7 +7,7 @@
import org.jboss.cache.factories.ComponentRegistry;
/**
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 2.1.0
*/
public abstract class AbstractVersionAwareMarshallerTest
Modified: core/trunk/src/test/java/org/jboss/cache/marshall/AsyncReplMarshalledValuesTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/marshall/AsyncReplMarshalledValuesTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/marshall/AsyncReplMarshalledValuesTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -3,7 +3,7 @@
import org.testng.annotations.Test;
/**
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 2.1.0
*/
@Test(groups = {"functional", "jgroups"})
Modified: core/trunk/src/test/java/org/jboss/cache/marshall/CustomCollectionTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/marshall/CustomCollectionTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/marshall/CustomCollectionTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -3,9 +3,11 @@
import org.jboss.cache.Cache;
import org.jboss.cache.Fqn;
import org.jboss.cache.Region;
+import org.jboss.cache.UnitTestCacheFactory;
import org.jboss.cache.config.Configuration;
import org.jboss.cache.lock.IsolationLevel;
import static org.jboss.cache.marshall.CustomCollectionTest.MarshallingMode.*;
+import org.jboss.cache.util.TestingUtil;
import static org.testng.AssertJUnit.*;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
@@ -15,14 +17,12 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.jboss.cache.UnitTestCacheFactory;
-import org.jboss.cache.util.TestingUtil;
/**
* Unit test to cover replication and marshalling of custom collections
*
* @author <a href="mailto:galder.zamarreno@jboss.com">Galder Zamarreno</a>
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
*/
@Test(groups = {"functional"}, sequential = true)
public class CustomCollectionTest extends RegionBasedMarshallingTestBase implements Serializable
Modified: core/trunk/src/test/java/org/jboss/cache/marshall/InvalidRegionForStateTransferTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/marshall/InvalidRegionForStateTransferTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/marshall/InvalidRegionForStateTransferTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -22,7 +22,7 @@
* thread pool size to 1.
* <p/>
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 2.1.0
*/
@Test(groups = "functional", sequential = true)
Modified: core/trunk/src/test/java/org/jboss/cache/marshall/MarshalledValueTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/marshall/MarshalledValueTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/marshall/MarshalledValueTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -4,6 +4,7 @@
import org.jboss.cache.CacheSPI;
import org.jboss.cache.InvocationContext;
import org.jboss.cache.NodeSPI;
+import org.jboss.cache.UnitTestCacheFactory;
import org.jboss.cache.commands.write.PutDataMapCommand;
import org.jboss.cache.commands.write.PutKeyValueCommand;
import org.jboss.cache.config.CacheLoaderConfig;
@@ -31,12 +32,11 @@
import java.io.ObjectOutput;
import java.io.ObjectOutputStream;
import java.util.Map;
-import org.jboss.cache.UnitTestCacheFactory;
/**
* Tests implicit marshalled values
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 2.1.0
*/
@Test(groups = "functional", sequential = true)
Modified: core/trunk/src/test/java/org/jboss/cache/marshall/MethodIdPreservationTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/marshall/MethodIdPreservationTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/marshall/MethodIdPreservationTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -7,6 +7,7 @@
import org.jboss.cache.commands.tx.PrepareCommand;
import org.jboss.cache.commands.write.PutDataMapCommand;
import static org.testng.AssertJUnit.assertEquals;
+import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
@@ -16,10 +17,9 @@
import java.io.ObjectOutputStream;
import java.util.ArrayList;
import java.util.List;
-import org.testng.annotations.AfterMethod;
/**
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.0.0
*/
@Test(groups = {"functional"}, sequential = true)
Modified: core/trunk/src/test/java/org/jboss/cache/marshall/ReturnValueMarshallingMarshalledValuesTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/marshall/ReturnValueMarshallingMarshalledValuesTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/marshall/ReturnValueMarshallingMarshalledValuesTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -3,7 +3,7 @@
import org.testng.annotations.Test;
/**
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 2.1.0
*/
@Test(groups = {"functional", "jgroups"})
Modified: core/trunk/src/test/java/org/jboss/cache/marshall/ReturnValueMarshallingTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/marshall/ReturnValueMarshallingTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/marshall/ReturnValueMarshallingTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -3,6 +3,7 @@
import org.jboss.cache.CacheSPI;
import org.jboss.cache.Fqn;
import org.jboss.cache.Region;
+import org.jboss.cache.UnitTestCacheFactory;
import org.jboss.cache.buddyreplication.GravitateResult;
import org.jboss.cache.commands.CommandsFactory;
import org.jboss.cache.commands.CommandsFactoryImpl;
@@ -19,12 +20,11 @@
import org.testng.annotations.Test;
import java.util.List;
-import org.jboss.cache.UnitTestCacheFactory;
/**
* Tests the marshalling of retvals
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.0.0
*/
@Test(groups = {"functional", "jgroups"}, sequential = true)
Modified: core/trunk/src/test/java/org/jboss/cache/marshall/SyncReplMarshalledValuesTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/marshall/SyncReplMarshalledValuesTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/marshall/SyncReplMarshalledValuesTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -3,7 +3,7 @@
import org.testng.annotations.Test;
/**
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 2.1.0
*/
@Test(groups = {"functional", "jgroups"})
Modified: core/trunk/src/test/java/org/jboss/cache/marshall/VersionAwareMarshallerTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/marshall/VersionAwareMarshallerTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/marshall/VersionAwareMarshallerTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -22,7 +22,7 @@
/**
* Tests the enhanced treecache marshaller
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
*/
@Test(groups = {"functional"})
public class VersionAwareMarshallerTest extends AbstractVersionAwareMarshallerTest
Modified: core/trunk/src/test/java/org/jboss/cache/mvcc/MVCCFullStackTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/mvcc/MVCCFullStackTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/mvcc/MVCCFullStackTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -12,7 +12,7 @@
import org.testng.annotations.Test;
/**
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
*/
@Test(groups = "functional", sequential = true)
Modified: core/trunk/src/test/java/org/jboss/cache/notifications/BuddyGroupChangeNotificationTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/notifications/BuddyGroupChangeNotificationTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/notifications/BuddyGroupChangeNotificationTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -2,6 +2,7 @@
import org.jboss.cache.Cache;
import org.jboss.cache.CacheFactory;
+import org.jboss.cache.UnitTestCacheFactory;
import org.jboss.cache.buddyreplication.BuddyGroup;
import org.jboss.cache.buddyreplication.BuddyReplicationTestsBase;
import org.jboss.cache.config.BuddyReplicationConfig;
@@ -17,10 +18,9 @@
import org.testng.annotations.Test;
import java.util.concurrent.CountDownLatch;
-import org.jboss.cache.UnitTestCacheFactory;
/**
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 2.1.0
*/
@Test(groups = "functional", sequential = true)
Modified: core/trunk/src/test/java/org/jboss/cache/notifications/ConcurrentNotificationTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/notifications/ConcurrentNotificationTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/notifications/ConcurrentNotificationTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -5,12 +5,14 @@
import org.jboss.cache.Cache;
import org.jboss.cache.CacheFactory;
import org.jboss.cache.Fqn;
+import org.jboss.cache.UnitTestCacheFactory;
import org.jboss.cache.notifications.annotation.CacheListener;
import org.jboss.cache.notifications.annotation.NodeCreated;
import org.jboss.cache.notifications.annotation.NodeModified;
import org.jboss.cache.notifications.annotation.NodeRemoved;
import org.jboss.cache.notifications.annotation.NodeVisited;
import org.jboss.cache.notifications.event.Event;
+import org.jboss.cache.util.TestingUtil;
import static org.testng.AssertJUnit.assertEquals;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
@@ -20,11 +22,9 @@
import java.util.List;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicInteger;
-import org.jboss.cache.UnitTestCacheFactory;
-import org.jboss.cache.util.TestingUtil;
/**
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.0.0
*/
@Test(groups = {"functional"}, sequential = true)
Modified: core/trunk/src/test/java/org/jboss/cache/notifications/NodeMapDiffTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/notifications/NodeMapDiffTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/notifications/NodeMapDiffTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -1,18 +1,17 @@
package org.jboss.cache.notifications;
+import org.jboss.cache.util.Util;
import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.fail;
+import org.testng.annotations.Test;
import java.util.HashMap;
import java.util.Map;
-import org.jboss.cache.util.Util;
-import org.testng.annotations.Test;
-
/**
* Tests the diffs between maps.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.0.0
*/
@Test(groups = {"functional"})
Modified: core/trunk/src/test/java/org/jboss/cache/notifications/NotificationThreadTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/notifications/NotificationThreadTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/notifications/NotificationThreadTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -3,6 +3,7 @@
import org.jboss.cache.Cache;
import org.jboss.cache.CacheFactory;
import org.jboss.cache.Fqn;
+import org.jboss.cache.UnitTestCacheFactory;
import org.jboss.cache.config.Configuration;
import org.jboss.cache.loader.AbstractCacheLoaderTestBase;
import org.jboss.cache.loader.DummyInMemoryCacheLoader;
@@ -19,12 +20,11 @@
import javax.transaction.TransactionManager;
import java.util.LinkedList;
import java.util.List;
-import org.jboss.cache.UnitTestCacheFactory;
/**
* Tests the threading model used when calling notifications
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.0.0
*/
@Test(groups = "functional", sequential = true)
Modified: core/trunk/src/test/java/org/jboss/cache/notifications/NotifierAnnotationsTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/notifications/NotifierAnnotationsTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/notifications/NotifierAnnotationsTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -19,7 +19,7 @@
/**
* Tests both correct and incorrect annotations for listeners
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.0.0
*/
@Test(groups = {"functional"}, sequential = true)
Modified: core/trunk/src/test/java/org/jboss/cache/notifications/RemoteCacheListenerOptimisticTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/notifications/RemoteCacheListenerOptimisticTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/notifications/RemoteCacheListenerOptimisticTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -5,7 +5,7 @@
/**
* optimistic counterpart of {@link org.jboss.cache.notifications.RemoteCacheListenerTest}
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.0.0
*/
@Test(groups = {"functional", "optimistic"})
Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/ChildMapLazyLoadingTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/optimistic/ChildMapLazyLoadingTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/optimistic/ChildMapLazyLoadingTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -3,10 +3,12 @@
import org.jboss.cache.CacheSPI;
import org.jboss.cache.Fqn;
import org.jboss.cache.Node;
+import org.jboss.cache.UnitTestCacheFactory;
import org.jboss.cache.config.Configuration;
import org.jboss.cache.transaction.DummyTransactionManagerLookup;
import org.jboss.cache.transaction.GlobalTransaction;
import org.jboss.cache.transaction.OptimisticTransactionContext;
+import org.jboss.cache.util.TestingUtil;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
@@ -14,13 +16,11 @@
import javax.transaction.Transaction;
import java.util.HashMap;
import java.util.Map;
-import org.jboss.cache.UnitTestCacheFactory;
-import org.jboss.cache.util.TestingUtil;
/**
* Tests that children maps in workspace nodes are only loaded lazily, when a move() or getChildrenNames()
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.1.0
*/
@Test(groups = {"functional", "optimistic"}, sequential = true)
Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/ConcurrentTransactionTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/optimistic/ConcurrentTransactionTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/optimistic/ConcurrentTransactionTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -29,7 +29,7 @@
import java.util.concurrent.CountDownLatch;
/**
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
*/
@Test(groups = {"functional", "optimistic"}, sequential = true)
public class ConcurrentTransactionTest extends AbstractOptimisticTestCase
Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/DataVersionPersistenceTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/optimistic/DataVersionPersistenceTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/optimistic/DataVersionPersistenceTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -4,23 +4,23 @@
import org.jboss.cache.CacheSPI;
import org.jboss.cache.Fqn;
import org.jboss.cache.NodeSPI;
+import org.jboss.cache.UnitTestCacheFactory;
import org.jboss.cache.config.CacheLoaderConfig;
import org.jboss.cache.config.Configuration;
import org.jboss.cache.loader.CacheLoader;
import org.jboss.cache.loader.DummySharedInMemoryCacheLoader;
import org.jboss.cache.transaction.DummyTransactionManagerLookup;
+import org.jboss.cache.util.TestingUtil;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import java.io.IOException;
-import org.jboss.cache.UnitTestCacheFactory;
-import org.jboss.cache.util.TestingUtil;
/**
* Tests whether data versions are transferred along with state
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.1.0
*/
@Test(groups = {"functional", "optimistic"}, sequential = true)
Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/DataVersionTransferTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/optimistic/DataVersionTransferTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/optimistic/DataVersionTransferTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -3,6 +3,7 @@
import org.jboss.cache.Cache;
import org.jboss.cache.Fqn;
import org.jboss.cache.NodeSPI;
+import org.jboss.cache.UnitTestCacheFactory;
import org.jboss.cache.config.Configuration;
import org.jboss.cache.transaction.DummyTransactionManagerLookup;
import org.jboss.cache.util.TestingUtil;
@@ -12,12 +13,11 @@
import java.util.ArrayList;
import java.util.List;
-import org.jboss.cache.UnitTestCacheFactory;
/**
* Tests whether data versions are transferred along with state
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.1.0
*/
@Test(groups = {"functional", "optimistic"}, sequential = true)
Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/HasChildTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/optimistic/HasChildTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/optimistic/HasChildTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -14,7 +14,7 @@
/**
* Tests the hasChild() API
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.0.0
*/
@Test(groups = {"functional", "optimistic"}, sequential = true)
Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/LockParentVersionTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/optimistic/LockParentVersionTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/optimistic/LockParentVersionTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -3,7 +3,7 @@
import org.testng.annotations.Test;
/**
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.0.0
*/
@Test(groups = {"functional", "optimistic"})
Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticLockInterceptorTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticLockInterceptorTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticLockInterceptorTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -25,7 +25,7 @@
/**
* // Test for JBCACHE-1228
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
*/
@Test(groups = {"functional", "optimistic"}, sequential = true)
public class OptimisticLockInterceptorTest extends AbstractOptimisticTestCase
Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticVersioningTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticVersioningTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticVersioningTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -26,7 +26,7 @@
/**
* Unit test that covers versioning of data and workspace nodes when using optimistic locking.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
*/
@SuppressWarnings("unchecked")
@Test(groups = {"functional", "optimistic"}, sequential = true)
Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticWithCacheLoaderTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticWithCacheLoaderTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticWithCacheLoaderTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -18,7 +18,7 @@
/**
* Tests optimistic locking with cache loaders
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
*/
@Test(groups = {"functional", "transaction", "optimistic"}, sequential = true)
public class OptimisticWithCacheLoaderTest extends AbstractOptimisticTestCase
Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticWithPassivationTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticWithPassivationTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticWithPassivationTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -18,7 +18,7 @@
/**
* Tests optimistic locking with pasivation
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
*/
@Test(groups = {"functional", "optimistic"}, sequential = true)
public class OptimisticWithPassivationTest extends AbstractOptimisticTestCase
Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/ParentVersionTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/optimistic/ParentVersionTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/optimistic/ParentVersionTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -13,7 +13,7 @@
import javax.transaction.TransactionManager;
/**
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.0.0
*/
@Test(groups = {"functional", "optimistic"}, sequential = true)
Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/ThreadedCacheAccessTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/optimistic/ThreadedCacheAccessTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/optimistic/ThreadedCacheAccessTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -17,7 +17,7 @@
/**
* Tests multiple thread access on opt locked cache
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
*/
@Test(groups = {"functional", "optimistic"}, sequential = true)
public class ThreadedCacheAccessTest extends AbstractOptimisticTestCase
Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/ValidationFailureTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/optimistic/ValidationFailureTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/optimistic/ValidationFailureTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -17,7 +17,7 @@
/**
* Tests a failure in validating a concurrently updated node
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
*/
@Test(groups = {"functional", "optimistic"}, sequential = true)
public class ValidationFailureTest extends AbstractOptimisticTestCase
Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/VersioningOnReadTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/optimistic/VersioningOnReadTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/optimistic/VersioningOnReadTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -12,7 +12,7 @@
import javax.transaction.TransactionManager;
/**
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
*/
@Test(groups = {"functional", "optimistic"}, sequential = true)
public class VersioningOnReadTest extends AbstractOptimisticTestCase
Modified: core/trunk/src/test/java/org/jboss/cache/options/CacheModeLocalSimpleTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/options/CacheModeLocalSimpleTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/options/CacheModeLocalSimpleTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -8,6 +8,7 @@
import org.jboss.cache.CacheSPI;
import org.jboss.cache.Fqn;
+import org.jboss.cache.UnitTestCacheFactory;
import org.jboss.cache.config.Configuration;
import org.jboss.cache.config.Option;
import org.jboss.cache.util.TestingUtil;
@@ -18,10 +19,9 @@
import org.testng.annotations.Test;
import javax.transaction.TransactionManager;
-import org.jboss.cache.UnitTestCacheFactory;
/**
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
*/
@Test(groups = {"functional"}, sequential = true)
public class CacheModeLocalSimpleTest
Modified: core/trunk/src/test/java/org/jboss/cache/options/ExplicitVersionsReplTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/options/ExplicitVersionsReplTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/options/ExplicitVersionsReplTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -3,6 +3,7 @@
import org.jboss.cache.CacheSPI;
import org.jboss.cache.Fqn;
import org.jboss.cache.NodeSPI;
+import org.jboss.cache.UnitTestCacheFactory;
import org.jboss.cache.config.Configuration;
import org.jboss.cache.optimistic.DataVersion;
import org.jboss.cache.optimistic.DefaultDataVersion;
@@ -14,12 +15,11 @@
import javax.transaction.RollbackException;
import javax.transaction.TransactionManager;
-import org.jboss.cache.UnitTestCacheFactory;
/**
* Tests the passing in of explicit {@see DataVersion} instances when using optimistic locking + replication.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
*/
@Test(groups = {"functional", "optimistic"}, sequential = true)
public class ExplicitVersionsReplTest
Modified: core/trunk/src/test/java/org/jboss/cache/options/ExplicitVersionsTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/options/ExplicitVersionsTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/options/ExplicitVersionsTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -11,22 +11,22 @@
import org.jboss.cache.Fqn;
import org.jboss.cache.Node;
import org.jboss.cache.NodeSPI;
+import org.jboss.cache.UnitTestCacheFactory;
import org.jboss.cache.config.Configuration;
import org.jboss.cache.optimistic.DataVersion;
import org.jboss.cache.optimistic.DefaultDataVersion;
+import org.jboss.cache.util.TestingUtil;
import static org.testng.AssertJUnit.*;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import javax.transaction.TransactionManager;
-import org.jboss.cache.UnitTestCacheFactory;
-import org.jboss.cache.util.TestingUtil;
/**
* Tests the passing in of explicit {@see DataVersion} instances when using optimistic locking.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
*/
@Test(groups = {"functional", "optimistic"}, sequential = true)
public class ExplicitVersionsTest
Modified: core/trunk/src/test/java/org/jboss/cache/options/ForceCacheModeTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/options/ForceCacheModeTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/options/ForceCacheModeTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -11,6 +11,7 @@
import org.jboss.cache.CacheException;
import org.jboss.cache.CacheSPI;
import org.jboss.cache.Fqn;
+import org.jboss.cache.UnitTestCacheFactory;
import org.jboss.cache.config.Configuration;
import org.jboss.cache.config.Configuration.CacheMode;
import org.jboss.cache.config.Configuration.NodeLockingScheme;
@@ -28,13 +29,12 @@
import javax.transaction.TransactionManager;
import java.util.concurrent.CountDownLatch;
-import org.jboss.cache.UnitTestCacheFactory;
/**
* Tests functionality of {@link Option#setForceAsynchronous(boolean)} and
* {@link Option#setForceSynchronous(boolean)}.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
*/
@Test(groups = {"functional"}, sequential = true, enabled = false)
public class ForceCacheModeTest
Modified: core/trunk/src/test/java/org/jboss/cache/options/ForceWriteLockTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/options/ForceWriteLockTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/options/ForceWriteLockTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -4,6 +4,7 @@
import org.jboss.cache.CacheSPI;
import org.jboss.cache.Fqn;
import org.jboss.cache.NodeSPI;
+import org.jboss.cache.UnitTestCacheFactory;
import org.jboss.cache.config.Configuration;
import org.jboss.cache.config.Configuration.NodeLockingScheme;
import org.jboss.cache.lock.LockManager;
@@ -16,12 +17,11 @@
import org.testng.annotations.Test;
import javax.transaction.TransactionManager;
-import org.jboss.cache.UnitTestCacheFactory;
/**
* Tests forcing a write lock to be obtained on a node
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.0.0
*/
@Test(groups = {"functional", "pessimistic"}, sequential = true)
Modified: core/trunk/src/test/java/org/jboss/cache/options/PessimisticFailSilentlyTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/options/PessimisticFailSilentlyTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/options/PessimisticFailSilentlyTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -8,9 +8,10 @@
import org.jboss.cache.CacheFactory;
import org.jboss.cache.CacheSPI;
+import org.jboss.cache.Fqn;
import org.jboss.cache.UnitTestCacheFactory;
-import org.jboss.cache.Fqn;
import org.jboss.cache.config.Configuration;
+import org.jboss.cache.util.TestingUtil;
import static org.testng.AssertJUnit.assertEquals;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
@@ -20,12 +21,11 @@
import javax.transaction.TransactionManager;
import java.util.HashMap;
import java.util.Map;
-import org.jboss.cache.util.TestingUtil;
/**
* Tests passing in the failSilently option in various scenarios.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
*/
@Test(groups = {"functional"}, sequential = true)
public class PessimisticFailSilentlyTest
Modified: core/trunk/src/test/java/org/jboss/cache/options/PessimisticSuppressLockingTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/options/PessimisticSuppressLockingTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/options/PessimisticSuppressLockingTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -8,10 +8,11 @@
import org.jboss.cache.CacheFactory;
import org.jboss.cache.CacheSPI;
+import org.jboss.cache.Fqn;
import org.jboss.cache.UnitTestCacheFactory;
-import org.jboss.cache.Fqn;
import org.jboss.cache.config.Configuration;
import org.jboss.cache.transaction.DummyTransactionManagerLookup;
+import org.jboss.cache.util.TestingUtil;
import static org.testng.AssertJUnit.*;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
@@ -20,12 +21,11 @@
import javax.transaction.TransactionManager;
import java.util.HashMap;
import java.util.Map;
-import org.jboss.cache.util.TestingUtil;
/**
* Tests the suppression of locking nodes
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
*/
@Test(groups = {"functional"}, sequential = true)
public class PessimisticSuppressLockingTest
Modified: core/trunk/src/test/java/org/jboss/cache/options/cachemodelocal/CacheModeLocalTestBase.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/options/cachemodelocal/CacheModeLocalTestBase.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/options/cachemodelocal/CacheModeLocalTestBase.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -11,6 +11,7 @@
import org.jboss.cache.Fqn;
import org.jboss.cache.Node;
import org.jboss.cache.NodeSPI;
+import org.jboss.cache.UnitTestCacheFactory;
import org.jboss.cache.config.Configuration;
import org.jboss.cache.util.TestingUtil;
import static org.testng.AssertJUnit.*;
@@ -21,14 +22,13 @@
import javax.transaction.TransactionManager;
import java.util.HashMap;
import java.util.Map;
-import org.jboss.cache.UnitTestCacheFactory;
/**
* Tests the cache mode local override in various scenarios. To be subclassed to test REPL_SYNC, REPL_ASYNC, INVALIDATION_SYNC, INVALIDATION_ASYNC for Opt and Pess locking.
* <p/>
* Option.setCacheModeLocal() only applies to put() and remove() methods.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
*/
@Test(groups = {"functional"})
public abstract class CacheModeLocalTestBase
Modified: core/trunk/src/test/java/org/jboss/cache/profiling/ConstructionTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/profiling/ConstructionTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/profiling/ConstructionTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -7,7 +7,7 @@
/**
* Profile LOCAL mode operation
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 2.2.0
*/
@Test(groups = "profiling")
Modified: core/trunk/src/test/java/org/jboss/cache/profiling/MockAsyncReplTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/profiling/MockAsyncReplTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/profiling/MockAsyncReplTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -19,7 +19,7 @@
/**
* // TODO: MANIK: Document this
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
*/
public class MockAsyncReplTest extends ProfileTest
Modified: core/trunk/src/test/java/org/jboss/cache/profiling/ProfileSlaveTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/profiling/ProfileSlaveTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/profiling/ProfileSlaveTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -10,7 +10,7 @@
* Slave to go with ProfileTest. Should be done in a different VM. Can be profiled as well to profile receiving
* messages.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 2.1.0
*/
@Test(groups = "profiling")
Modified: core/trunk/src/test/java/org/jboss/cache/profiling/ProfileTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/profiling/ProfileTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/profiling/ProfileTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -29,7 +29,7 @@
* 3. Profile away!
* <p/>
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 2.1.0
*/
@Test(groups = "profiling")
Modified: core/trunk/src/test/java/org/jboss/cache/replicated/ExceptionTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/replicated/ExceptionTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/replicated/ExceptionTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -2,6 +2,7 @@
import org.jboss.cache.Cache;
import org.jboss.cache.Fqn;
+import org.jboss.cache.UnitTestCacheFactory;
import org.jboss.cache.config.Configuration;
import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
import org.jboss.cache.lock.TimeoutException;
@@ -13,12 +14,11 @@
import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
-import org.jboss.cache.UnitTestCacheFactory;
/**
* Tests the type of exceptions thrown for Lock Acquisition Timeouts versus Sync Repl Timeouts
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.1.0
*/
@Test(groups = {"functional"}, sequential = true)
Modified: core/trunk/src/test/java/org/jboss/cache/replicated/SyncReplTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/replicated/SyncReplTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/replicated/SyncReplTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -22,7 +22,7 @@
import org.testng.annotations.Test;
/**
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
*/
@Test(groups = {"functional", "jgroups"})
public class SyncReplTest
Modified: core/trunk/src/test/java/org/jboss/cache/transaction/InvocationContextCleanupTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/transaction/InvocationContextCleanupTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/transaction/InvocationContextCleanupTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -7,6 +7,7 @@
package org.jboss.cache.transaction;
import org.jboss.cache.CacheSPI;
+import org.jboss.cache.UnitTestCacheFactory;
import org.jboss.cache.config.Configuration;
import org.jboss.cache.interceptors.OrderedSynchronizationHandler;
import org.jboss.cache.util.CachePrinter;
@@ -20,12 +21,11 @@
import javax.transaction.SystemException;
import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
-import org.jboss.cache.UnitTestCacheFactory;
/**
* Tests cleaning of invocation contexts on completion of txs
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
*/
@Test(groups = {"functional", "transaction"}, sequential = true)
public class InvocationContextCleanupTest
Modified: core/trunk/src/test/java/org/jboss/cache/transaction/NotifyingTransactionManager.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/transaction/NotifyingTransactionManager.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/transaction/NotifyingTransactionManager.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -19,7 +19,7 @@
/**
* A dummy transaction manager that notifies registered listeners of the various phases of a 2PC so exceptions, etc. can be injected.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
*/
public class NotifyingTransactionManager extends DummyTransactionManager implements TransactionManagerLookup
{
Modified: core/trunk/src/test/java/org/jboss/cache/transaction/PrepareCommitContentionTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/transaction/PrepareCommitContentionTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/transaction/PrepareCommitContentionTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -3,6 +3,7 @@
import org.jboss.cache.CacheSPI;
import org.jboss.cache.Fqn;
import org.jboss.cache.RPCManager;
+import org.jboss.cache.UnitTestCacheFactory;
import org.jboss.cache.commands.ReplicableCommand;
import org.jboss.cache.commands.remote.ReplicateCommand;
import org.jboss.cache.commands.tx.CommitCommand;
@@ -22,7 +23,6 @@
import java.util.List;
import java.util.Map;
import java.util.Vector;
-import org.jboss.cache.UnitTestCacheFactory;
/**
* This is to test the scenario described in http://jira.jboss.org/jira/browse/JBCACHE-1270
@@ -35,7 +35,7 @@
* vi) GTX2 prepare blocks due to locks from GTX1.
* vii) GTX1 commit is blocked in UNICAST because another thread from Node A is executing.
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 2.1.0
*/
@Test(groups = "functional", sequential = true)
Modified: core/trunk/src/test/java/org/jboss/cache/transaction/SimultaneousRollbackAndPutTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/transaction/SimultaneousRollbackAndPutTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/transaction/SimultaneousRollbackAndPutTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -5,11 +5,13 @@
import org.jboss.cache.Cache;
import org.jboss.cache.CacheException;
import org.jboss.cache.Fqn;
+import org.jboss.cache.UnitTestCacheFactory;
import org.jboss.cache.invocation.CacheInvocationDelegate;
import org.jboss.cache.util.CachePrinter;
import org.jboss.cache.util.TestingUtil;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import javax.transaction.RollbackException;
@@ -17,13 +19,11 @@
import javax.transaction.TransactionManager;
import java.util.ArrayList;
import java.util.List;
-import org.jboss.cache.UnitTestCacheFactory;
-import org.testng.annotations.BeforeMethod;
/**
* To test JBCACHE-923
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
*/
@Test(groups = {"functional", "transaction"}, enabled = true, sequential = true)
// Known issue - disabled because of JBCACHE-923
Modified: core/trunk/src/test/java/org/jboss/cache/transaction/SuspendTxTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/transaction/SuspendTxTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/transaction/SuspendTxTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -3,6 +3,8 @@
import org.jboss.cache.CacheFactory;
import org.jboss.cache.CacheSPI;
import org.jboss.cache.Fqn;
+import org.jboss.cache.UnitTestCacheFactory;
+import org.jboss.cache.util.TestingUtil;
import static org.testng.AssertJUnit.assertEquals;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
@@ -10,14 +12,12 @@
import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
-import org.jboss.cache.UnitTestCacheFactory;
-import org.jboss.cache.util.TestingUtil;
/**
* Based on a contribution by Owen Taylor
*
* @author otaylor(a)redhat.com
- * @author Manik Surtani (manik(a)jboss.org)
+ * @author Manik Surtani (manik AT jboss DOT org)
*/
@Test(groups = {"functional", "transaction"}, sequential = true)
public class SuspendTxTest
Modified: core/trunk/src/test/java/org/jboss/cache/transaction/isolationlevels/IsolationLevelTestBase.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/transaction/isolationlevels/IsolationLevelTestBase.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/transaction/isolationlevels/IsolationLevelTestBase.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -3,10 +3,12 @@
import org.jboss.cache.Cache;
import org.jboss.cache.CacheFactory;
import org.jboss.cache.Fqn;
+import org.jboss.cache.UnitTestCacheFactory;
import org.jboss.cache.config.Configuration;
import org.jboss.cache.lock.IsolationLevel;
import static org.jboss.cache.lock.IsolationLevel.*;
import org.jboss.cache.transaction.TransactionSetup;
+import org.jboss.cache.util.TestingUtil;
import static org.testng.AssertJUnit.*;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
@@ -16,13 +18,11 @@
import javax.transaction.TransactionManager;
import java.util.Collection;
import java.util.HashSet;
-import org.jboss.cache.UnitTestCacheFactory;
-import org.jboss.cache.util.TestingUtil;
/**
* Base class for testing isolation levels.
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.0.0
*/
@Test(groups = {"functional", "transaction"}, sequential = true)
Modified: core/trunk/src/test/java/org/jboss/cache/transaction/isolationlevels/NoneTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/transaction/isolationlevels/NoneTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/transaction/isolationlevels/NoneTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -4,7 +4,7 @@
import org.testng.annotations.Test;
/**
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.0.0
*/
@Test(groups = {"functional", "transaction"})
Modified: core/trunk/src/test/java/org/jboss/cache/transaction/isolationlevels/ReadCommittedTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/transaction/isolationlevels/ReadCommittedTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/transaction/isolationlevels/ReadCommittedTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -3,7 +3,7 @@
import org.jboss.cache.lock.IsolationLevel;
/**
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.0.0
*/
public class ReadCommittedTest extends IsolationLevelTestBase
Modified: core/trunk/src/test/java/org/jboss/cache/transaction/isolationlevels/ReadUncommittedTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/transaction/isolationlevels/ReadUncommittedTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/transaction/isolationlevels/ReadUncommittedTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -3,7 +3,7 @@
import org.jboss.cache.lock.IsolationLevel;
/**
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.0.0
*/
public class ReadUncommittedTest extends IsolationLevelTestBase
Modified: core/trunk/src/test/java/org/jboss/cache/transaction/isolationlevels/RepeatableReadTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/transaction/isolationlevels/RepeatableReadTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/transaction/isolationlevels/RepeatableReadTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -3,7 +3,7 @@
import org.jboss.cache.lock.IsolationLevel;
/**
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.0.0
*/
public class RepeatableReadTest extends IsolationLevelTestBase
Modified: core/trunk/src/test/java/org/jboss/cache/transaction/isolationlevels/SerializableTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/transaction/isolationlevels/SerializableTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/transaction/isolationlevels/SerializableTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -4,7 +4,7 @@
import org.testng.annotations.Test;
/**
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
* @since 2.0.0
*/
@Test(groups = "functional")
Modified: core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/AbortionTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/AbortionTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/AbortionTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -6,13 +6,14 @@
*/
package org.jboss.cache.transaction.pessimistic;
-import java.io.File;
import org.jboss.cache.CacheSPI;
+import org.jboss.cache.UnitTestCacheFactory;
import org.jboss.cache.config.Configuration;
+import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
import org.jboss.cache.interceptors.OrderedSynchronizationHandler;
-import org.jboss.cache.transaction.NotifyingTransactionManager.Notification;
-import org.jboss.cache.transaction.NotifyingTransactionManager;
import org.jboss.cache.transaction.DummyTransactionManager;
+import org.jboss.cache.transaction.NotifyingTransactionManager;
+import org.jboss.cache.transaction.NotifyingTransactionManager.Notification;
import org.jboss.cache.transaction.TransactionContext;
import org.jboss.cache.util.TestingUtil;
import org.jgroups.JChannel;
@@ -26,13 +27,9 @@
import javax.transaction.SystemException;
import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
-import org.jboss.cache.UnitTestCacheFactory;
-import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
-import org.jgroups.conf.ConfiguratorFactory;
-import org.jgroups.conf.XmlConfigurator;
/**
- * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
*/
@Test(groups = {"functional"}, sequential = true)
public class AbortionTest
Modified: core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/StatusUnknownTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/StatusUnknownTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/StatusUnknownTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -3,8 +3,13 @@
import org.jboss.cache.Cache;
import org.jboss.cache.CacheSPI;
import org.jboss.cache.Fqn;
-import org.jboss.cache.transaction.*;
+import org.jboss.cache.UnitTestCacheFactory;
import org.jboss.cache.config.Configuration;
+import org.jboss.cache.transaction.DummyBaseTransactionManager;
+import org.jboss.cache.transaction.DummyTransaction;
+import org.jboss.cache.transaction.DummyTransactionManager;
+import org.jboss.cache.transaction.TransactionManagerLookup;
+import org.jboss.cache.util.TestingUtil;
import static org.testng.AssertJUnit.*;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
@@ -19,13 +24,11 @@
import javax.transaction.TransactionManager;
import java.util.LinkedList;
import java.util.List;
-import org.jboss.cache.UnitTestCacheFactory;
-import org.jboss.cache.util.TestingUtil;
/**
* This test checks how the cache behaves when a JTA STATUS_UNKNOWN is passed in to the cache during afterCompletion().
*
- * @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
+ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
*/
@Test(groups = "functional", sequential = true)
public class StatusUnknownTest
Modified: core/trunk/src/test/java/org/jboss/cache/util/BitEncodedIntegerSetTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/util/BitEncodedIntegerSetTest.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/util/BitEncodedIntegerSetTest.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -5,7 +5,7 @@
import java.util.HashSet;
/**
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 2.1.0
*/
@Test(groups = "functional")
Modified: core/trunk/src/test/java/org/jboss/cache/util/internals/EvictionWatcher.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/util/internals/EvictionWatcher.java 2008-10-15 18:11:20 UTC (rev 6958)
+++ core/trunk/src/test/java/org/jboss/cache/util/internals/EvictionWatcher.java 2008-10-15 18:13:06 UTC (rev 6959)
@@ -15,7 +15,7 @@
/**
* Watches and waits for eviction events
*
- * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>)
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @since 3.0
*/
@CacheListener
16 years, 2 months
- 1
- 0
JBoss Cache SVN: r6958 - in core/trunk/src/main/docbook: tutorial/en and 2 other directories.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2008-10-15 14:11:20 -0400 (Wed, 15 Oct 2008)
New Revision: 6958
Modified:
core/trunk/src/main/docbook/faq/en/master.xml
core/trunk/src/main/docbook/tutorial/en/master.xml
core/trunk/src/main/docbook/userguide/en/master.xml
core/trunk/src/main/docbook/userguide/en/modules/basic_api.xml
core/trunk/src/main/docbook/userguide/en/modules/compatibility.xml
core/trunk/src/main/docbook/userguide/en/modules/configuration.xml
core/trunk/src/main/docbook/userguide/en/modules/deployment.xml
core/trunk/src/main/docbook/userguide/en/modules/introduction.xml
core/trunk/src/main/docbook/userguide/en/modules/preface.xml
Log:
More documentation changes
Modified: core/trunk/src/main/docbook/faq/en/master.xml
===================================================================
--- core/trunk/src/main/docbook/faq/en/master.xml 2008-10-15 15:44:27 UTC (rev 6957)
+++ core/trunk/src/main/docbook/faq/en/master.xml 2008-10-15 18:11:20 UTC (rev 6958)
@@ -12,40 +12,38 @@
<author>
<firstname>Manik</firstname>
<surname>Surtani</surname>
- <email>manik(a)jboss.org</email>
+ <email>manik AT jboss DOT org</email>
</author>
<author>
<firstname>Ben</firstname>
<surname>Wang</surname>
- <email>ben.wang(a)jboss.com</email>
+ <email>ben DOT wang AT jboss DOT com</email>
</author>
<author>
<firstname>Bela</firstname>
<surname>Ban</surname>
- <email>bela(a)jboss.com</email>
+ <email>bela AT jboss DOT com</email>
</author>
<author>
<firstname>Scott</firstname>
<surname>Marlow</surname>
- <email>smarlow(a)novell.com</email>
+ <email>smarlow AT novell DOT com</email>
</author>
<author>
<firstname>Galder</firstname>
<surname>Zamarreño</surname>
- <email>galder.zamarreno(a)jboss.com</email>
+ <email>galder DOT zamarreno AT jboss DOT com</email>
</author>
<abstract>
<para>This is a compilation of the most frequently asked
questions about JBoss Cache. Please report any bugs,
inconsistencies, or omissions you find in this FAQ on the
- <ulink url="http://jboss.org/index.html?module=bb&op=main&c=29">JBoss Cache User Forum
- </ulink>
- .
+ <ulink url="http://www.jboss.org/jbosscache">JBoss Cache User Forum</ulink>.
</para>
<para>
This FAQ is divided into specific sections, all pertaining to the core JBoss Cache library. POJO Cache has a
@@ -60,7 +58,7 @@
<year>2006</year>
<year>2007</year>
<year>2008</year>
- <holder>JBoss, a division of Red Hat Inc.</holder>
+ <holder>JBoss, a division of Red Hat Inc., and all authors as named.</holder>
</copyright>
</bookinfo>
@@ -97,9 +95,8 @@
of objects in the cache providing transparent coherence by using JBoss AOP. Note that the POJO edition
of JBoss Cache
(often referred to as POJO Cache) comes with a separate set of documentation (user guide, FAQ, etc.)
- available on the
- <ulink url="http://labs.jboss.com/portal/jbosscache/docs/index.html">JBoss Cache documentation site
- </ulink>.
+ available on the JBoss Cache
+ <ulink url="http://www.jboss.org/jbosscache/">documentation website</ulink>.
</para>
<para>
@@ -266,10 +263,7 @@
<answer>
<para>Please report any bugs or problems to
- <ulink
- url="http://jboss.org/index.html?module=bb&op=main&c=29">JBoss Cache
- User Forum
- </ulink>.
+ <ulink url="http://www.jboss.org/jbosscache">JBoss Cache User Forum</ulink>.
</para>
</answer>
</qandaentry>
Modified: core/trunk/src/main/docbook/tutorial/en/master.xml
===================================================================
--- core/trunk/src/main/docbook/tutorial/en/master.xml 2008-10-15 15:44:27 UTC (rev 6957)
+++ core/trunk/src/main/docbook/tutorial/en/master.xml 2008-10-15 18:11:20 UTC (rev 6958)
@@ -9,16 +9,22 @@
<author>
<firstname>Manik</firstname>
<surname>Surtani</surname>
- <email>manik(a)jboss.org</email>
+ <email>manik AT jboss DOT org</email>
</author>
+ <author>
+ <firstname>Galder</firstname>
+ <surname>Zamarreño</surname>
+ <email>galder DOT zamarreno AT jboss DOT com</email>
+ </author>
+
<!-- copyright info -->
<copyright>
<year>2005</year>
<year>2006</year>
<year>2007</year>
<year>2008</year>
- <holder>JBoss, a division of Red Hat Inc.</holder>
+ <holder>JBoss, a division of Red Hat Inc., and all authors as named.</holder>
</copyright>
</articleinfo>
@@ -33,10 +39,7 @@
</para>
<para>
For details of configuration, usage and APIs, please refer to the
- <ulink
- url="http://labs.jboss.org/jbosscache/docs/index.html">user manuals
- </ulink>
- .
+ <ulink url="http://labs.jboss.org/jbosscache/docs/index.html">user manuals</ulink>.
</para>
</section>
@@ -62,10 +65,7 @@
<title>Configuration</title>
<para>First download the JBoss Cache 3.x distribution from
- <ulink
- url="http://labs.jboss.org/jbosscache/download/index.html">the download page
- </ulink>
- . You will need the ALL distribution (
+ <ulink url="http://labs.jboss.org/jbosscache/download/index.html">the download page</ulink>. You will need the ALL distribution (
<literal>jbosscache-core-3.X.Y.GA-all.zip</literal>).
Unzip it, and you will get a directory containing the distribution, such as
<literal>jbosscache-core-3.X.Y</literal>
Modified: core/trunk/src/main/docbook/userguide/en/master.xml
===================================================================
--- core/trunk/src/main/docbook/userguide/en/master.xml 2008-10-15 15:44:27 UTC (rev 6957)
+++ core/trunk/src/main/docbook/userguide/en/master.xml 2008-10-15 18:11:20 UTC (rev 6958)
@@ -29,46 +29,27 @@
<author>
<firstname>Manik</firstname>
<surname>Surtani</surname>
- <email>manik(a)jboss.org</email>
+ <email>manik AT jboss DOT org</email>
</author>
<author>
- <firstname>Bela</firstname>
- <surname>Ban</surname>
- <email>bela(a)jboss.com</email>
- </author>
-
- <author>
- <firstname>Ben</firstname>
- <surname>Wang</surname>
- <email>ben.wang(a)jboss.com</email>
- </author>
-
- <author>
<firstname>Brian</firstname>
<surname>Stansberry</surname>
- <email>brian.stansberry(a)jboss.com</email>
+ <email>brian DOT stansberry AT jboss DOT com</email>
</author>
<author>
<firstname>Galder</firstname>
<surname>Zamarreño</surname>
- <email>galder.zamarreno(a)jboss.com</email>
+ <email>galder DOT zamarreno AT jboss DOT com</email>
</author>
<author>
- <firstname>Daniel</firstname>
- <surname>Huang</surname>
- <email>dhuang(a)jboss.org</email>
- </author>
-
- <author>
<firstname>Mircea</firstname>
<surname>Markus</surname>
- <email>mircea.markus(a)jboss.com</email>
+ <email>mircea DOT markus AT jboss DOT com</email>
</author>
-
<!-- copyright info -->
<copyright>
<year>2004</year>
@@ -76,7 +57,7 @@
<year>2006</year>
<year>2007</year>
<year>2008</year>
- <holder>JBoss, a division of Red Hat Inc.</holder>
+ <holder>JBoss, a division of Red Hat Inc., and all authors as named.</holder>
</copyright>
</bookinfo>
@@ -91,8 +72,7 @@
<partintro>
<para>
This section covers what developers would need to quickly start using JBoss Cache in their projects. It
- covers an
- overview of the concepts and API, configuration and deployment information.
+ covers an overview of the concepts and API, configuration and deployment information.
</para>
</partintro>
&introduction;
@@ -107,9 +87,9 @@
<title>JBoss Cache Architecture</title>
<partintro>
<para>
- This section digs deeper into the JBoss Cache architecture, and is meant for developers wishing to extend or
- enhance JBoss Cache, write plugins or are just looking for detailed knowledge of how things work under the
- hood.
+ This section digs deeper into the JBoss Cache architecture, and is meant for developers wishing to use the more
+ advanced cache features,extend or enhance the cache, write plugins, or are just looking for detailed knowledge
+ of how things work under the hood.
</para>
</partintro>
&architecture;
Modified: core/trunk/src/main/docbook/userguide/en/modules/basic_api.xml
===================================================================
--- core/trunk/src/main/docbook/userguide/en/modules/basic_api.xml 2008-10-15 15:44:27 UTC (rev 6957)
+++ core/trunk/src/main/docbook/userguide/en/modules/basic_api.xml 2008-10-15 18:11:20 UTC (rev 6958)
@@ -3,24 +3,12 @@
<section>
<title>API Classes</title>
<para>
- The
- <literal>Cache</literal>
- interface is the primary mechanism for interacting with JBoss Cache. It is
- constructed and optionally started using the
- <literal>CacheFactory</literal>
- . The
- <literal>CacheFactory</literal>
- allows you to create a
- <literal>Cache</literal>
- either from a
- <literal>Configuration</literal>
- object
- or an XML file. Once you have a reference to a
- <literal>Cache</literal>
- , you can use it to look up
- <literal>Node</literal>
- objects in the tree structure, and store data in the tree.
-
+ The <literal>Cache</literal> interface is the primary mechanism for interacting with JBoss Cache. It is
+ constructed and optionally started using the <literal>CacheFactory</literal>. The <literal>CacheFactory</literal>
+ allows you to create a <literal>Cache</literal> either from a <literal>Configuration</literal> object or an XML
+ file. The cache organizes data into a tree structure, made up of nodes. Once you have a reference to a
+ <literal>Cache</literal>, you can use it to look up <literal>Node</literal> objects in the tree structure,
+ and store data in the tree.
<mediaobject>
<imageobject>
<imagedata fileref="PublicAPI.png" format="PNG"/>
@@ -38,55 +26,32 @@
<section id="api.create_start">
<title>Instantiating and Starting the Cache</title>
<para>
- An instance of the
- <literal>Cache</literal>
- interface can only be created
- via a
- <literal>CacheFactory</literal>. (This is unlike JBoss Cache 1.x,
- where an instance of the old
- <literal>TreeCache</literal>
- class could
- be directly instantiated.)
+ An instance of the <literal>Cache</literal> interface can only be created via a <literal>CacheFactory</literal>.
+ This is unlike JBoss Cache 1.x, where an instance of the old <literal>TreeCache</literal> class could be directly
+ instantiated.
</para>
<para>
- <literal>CacheFactory</literal>
- provides a number of overloaded methods
- for creating a
- <literal>Cache</literal>
- , but they all do the same thing:
+ The <literal>CacheFactory</literal> provides a number of overloaded methods for creating a <literal>Cache</literal>,
+ but they all fundamentally do the same thing:
<itemizedlist>
- <listitem>Gain access to a
- <literal>Configuration</literal>
- , either
- by having one passed in as a method parameter, or by parsing XML
- content and constructing one. The XML content can come from a
- provided input stream or from a classpath or filesystem location.
- See the
- <link linkend="configuration">chapter on Configuration</link>
- for
- more on obtaining a
- <literal>Configuration</literal>
- .
+ <listitem>
+ Gain access to a <literal>Configuration</literal>, either by having one passed in as a method
+ parameter or by parsing XML content and constructing one. The XML content can come from a provided input
+ stream, from a classpath or filesystem location. See the <link linkend="configuration">chapter on Configuration</link>
+ for more on obtaining a <literal>Configuration</literal>.
</listitem>
- <listitem>Instantiate the
- <literal>Cache</literal>
- and provide
- it with a reference to the
- <literal>Configuration</literal>
- .
+ <listitem>
+ Instantiate the <literal>Cache</literal> and provide it with a reference to the <literal>Configuration</literal>.
</listitem>
- <listitem>Optionally invoke the cache's
- <literal>create()</literal>
- and
- <literal>start()</literal>
- methods.
+ <listitem>
+ Optionally invoke the cache's <literal>create()</literal> and <literal>start()</literal> methods.
</listitem>
</itemizedlist>
</para>
<para>
- An example of the simplest mechanism for creating and starting
- a cache, using the default configuration values:
+ Here is an example of the simplest mechanism for creating and starting a cache, using the default
+ configuration values:
</para>
<programlisting role="JAVA"><![CDATA[
@@ -94,10 +59,9 @@
Cache cache = factory.createCache();
]]></programlisting>
- <para>Here we tell the
- <literal>CacheFactory</literal>
- to find and
- parse a configuration file on the classpath:
+ <para>
+ In this example, we tell the <literal>CacheFactory</literal> to find and parse a configuration file on
+ the classpath:
</para>
<programlisting role="JAVA"><![CDATA[
@@ -105,14 +69,13 @@
Cache cache = factory.createCache("cache-configuration.xml");
]]></programlisting>
- <para>Here we configure the cache from a file, but want to programatically
- change a configuration element. So, we tell the factory not to start
- the cache, and instead do it ourselves:
+ <para>In this example, we configure the cache from a file, but want to programatically
+ change a configuration element. So, we tell the factory not to start the cache, and instead do it ourselves:
</para>
<programlisting role="JAVA"><![CDATA[
CacheFactory factory = new DefaultCacheFactory();
- Cache cache = factory.createCache("cache-configuration.xml", false);
+ Cache cache = factory.createCache("/opt/configurations/cache-configuration.xml", false);
Configuration config = cache.getConfiguration();
config.setClusterName(this.getClusterName());
@@ -126,13 +89,9 @@
<section>
<title>Caching and Retrieving Data</title>
- <para>Next, let's use the
- <literal>Cache</literal>
- API to access
- a
- <literal>Node</literal>
- in the cache and then do some
- simple reads and writes to that node.
+ <para>
+ Next, lets use the <literal>Cache</literal> API to access a <literal>Node</literal> in the cache and then
+ do some simple reads and writes to that node.
</para>
<programlisting role="JAVA"><![CDATA[
// Let's get a hold of the root node.
@@ -172,12 +131,8 @@
]]></programlisting>
<para>
- The
- <literal>Cache</literal>
- interface also exposes put/get/remove
- operations that take an
- <link linkend="basic_api.fqn">Fqn</link>
- as an argument:
+ The <literal>Cache</literal> interface also exposes put/get/remove operations that take an
+ <link linkend="basic_api.fqn">Fqn</link> as an argument, for convenience:
</para>
<programlisting role="JAVA"><![CDATA[
@@ -200,46 +155,30 @@
</section>
<section id="basic_api.fqn">
- <title>The
- <literal>Fqn</literal>
- Class
+ <title>
+ The <literal>Fqn</literal> Class
</title>
<para>
- The previous section used the
- <literal>Fqn</literal>
- class in its
- examples; now let's learn a bit more about that class.
+ The previous section used the <literal>Fqn</literal> class in its examples; now let's learn a bit more about
+ that class.
</para>
<para>
- A Fully Qualified Name (Fqn) encapsulates a list of names which represent
- a path to a particular location in the cache's tree structure. The
- elements in the list are typically
- <literal>String</literal>
- s but can be
- any
- <literal>Object</literal>
- or a mix of different types.
+ A Fully Qualified Name (Fqn) encapsulates a list of names which represent a path to a particular location in
+ the cache's tree structure. The elements in the list are typically <literal>String</literal>s but can be
+ any <literal>Object</literal> or a mix of different types.
</para>
<para>
- This path can be absolute (i.e., relative to the root node), or relative
- to any node in the cache. Reading the documentation on each API call that
- makes use of
- <literal>Fqn</literal>
- will tell you whether the API expects
- a relative or absolute
- <literal>Fqn</literal>
- .
+ This path can be absolute (i.e., relative to the root node), or relative to any node in the cache. Reading the
+ documentation on each API call that makes use of <literal>Fqn</literal> will tell you whether the API expects
+ a relative or absolute <literal>Fqn</literal>.
</para>
<para>
- The
- <literal>Fqn</literal>
- class provides are variety of constructors;
- see the javadoc for all the possibilities. The following illustrates the
- most commonly used approaches to creating an Fqn:
+ The <literal>Fqn</literal> class provides are variety of factory methods; see the javadoc for all the
+ possibilities. The following illustrates the most commonly used approaches to creating an Fqn:
</para>
<programlisting role="JAVA"><![CDATA[
@@ -267,7 +206,7 @@
It is good practice to stop and destroy your cache when you are done
using it, particularly if it is a clustered cache and has thus
used a JGroups channel. Stopping and destroying a cache ensures
- resources like the JGroups channel are properly cleaned up.
+ resources like network sockets and maintenance threads are properly cleaned up.
</para>
<programlisting role="JAVA"><![CDATA[
@@ -296,20 +235,13 @@
<section>
<title>Cache Modes</title>
<para>
- Although technically not part of the API, the
- <emphasis>mode</emphasis>
- in which the cache is configured to operate affects the cluster-wide
- behavior of any
- <literal>put</literal>
- or
- <literal>remove</literal>
+ Although technically not part of the API, the <emphasis>mode</emphasis> in which the cache is configured to
+ operate affects the cluster-wide behavior of any <literal>put</literal> or <literal>remove</literal>
operation, so we'll briefly mention the various modes here.
</para>
<para>
- JBoss Cache modes are denoted by the
- <literal>org.jboss.cache.config.Configuration.CacheMode</literal>
- enumeration.
- They consist of:
+ JBoss Cache modes are denoted by the <literal>org.jboss.cache.config.Configuration.CacheMode</literal>
+ enumeration. They consist of:
<itemizedlist>
<listitem>
<emphasis>LOCAL</emphasis>
@@ -343,13 +275,10 @@
</listitem>
</itemizedlist>
</para>
- <para>See the
- <link linkend="clustering">chapter on Clustering</link>
- for
- more details on how the cache's mode affects behavior. See the
- <link linkend="configuration">chapter on Configuration</link>
- for info
- on how to configure things like the cache's mode.
+ <para>
+ See the <link linkend="clustering">chapter on Clustering</link> for more details on how cache mode
+ affects behavior. See the <link linkend="configuration">chapter on Configuration</link> for info on how to
+ configure things like cache mode.
</para>
</section>
@@ -366,13 +295,11 @@
]]></programlisting>
<para>
Similar methods exist for removing or querying registered listeners. See the javadocs on the
- <literal>Cache</literal>
- interface for more details.
+ <literal>Cache</literal> interface for more details.
</para>
<para>
Basically any public class can be used as a listener, provided it is annotated with the
- <literal>@CacheListener</literal>
- annotation. In addition, the class needs to have one or
+ <literal>@CacheListener</literal> annotation. In addition, the class needs to have one or
more methods annotated with one of the method-level annotations (in the
<literal>org.jboss.cache.notifications.annotation</literal>
package). Methods annotated as such need to be public, have a void return type, and accept a single parameter
@@ -572,9 +499,7 @@
</para>
<para>
Refer to the javadocs on the annotations as well as the
- <literal>Event</literal>
- subtypes
- for details of what is passed in to your method, and when.
+ <literal>Event</literal> subtypes for details of what is passed in to your method, and when.
</para>
<para>
Example:
Modified: core/trunk/src/main/docbook/userguide/en/modules/compatibility.xml
===================================================================
--- core/trunk/src/main/docbook/userguide/en/modules/compatibility.xml 2008-10-15 15:44:27 UTC (rev 6957)
+++ core/trunk/src/main/docbook/userguide/en/modules/compatibility.xml 2008-10-15 18:11:20 UTC (rev 6958)
@@ -29,7 +29,7 @@
<section>
<title>Compatibility Matrix</title>
<para>
- A <ulink url="http://labs.jboss.com/portal/jbosscache/compatibility/index.html">compatibility matrix</ulink> is maintained on the JBoss Cache website, which contains information on
+ A <ulink url="http://www.jboss.org/jbosscache/compatibility/index.html">compatibility matrix</ulink> is maintained on the JBoss Cache website, which contains information on
different versions of JBoss Cache, JGroups and JBoss AS.
</para>
</section>
Modified: core/trunk/src/main/docbook/userguide/en/modules/configuration.xml
===================================================================
--- core/trunk/src/main/docbook/userguide/en/modules/configuration.xml 2008-10-15 15:44:27 UTC (rev 6957)
+++ core/trunk/src/main/docbook/userguide/en/modules/configuration.xml 2008-10-15 18:11:20 UTC (rev 6958)
@@ -7,26 +7,16 @@
<para>
The
<literal>org.jboss.cache.config.Configuration</literal>
- class
- (along with its
- <link linkend="configuration.elements">component parts</link>
- )
- is a Java Bean that encapsulates the configuration of the
- <literal>Cache</literal>
- and all of its architectural elements
- (cache loaders, evictions policies, etc.)
+ class (along with its <link linkend="configuration.elements">component parts</link>)
+ is a Java Bean that encapsulates the configuration of the <literal>Cache</literal>
+ and all of its architectural elements (cache loaders, evictions policies, etc.)
</para>
<para>
- The
- <literal>Configuration</literal>
- exposes numerous properties which
- are summarized in the
- <link linkend="configuration_reference">configuration reference</link>
- section of this book and many of which are discussed in later
- chapters. Any time you see a configuration option
- discussed in this book, you can assume that the
- <literal>Configuration</literal>
+ The <literal>Configuration</literal> exposes numerous properties which
+ are summarized in the <link linkend="configuration_reference">configuration reference</link>
+ section of this book and many of which are discussed in later chapters. Any time you see a configuration option
+ discussed in this book, you can assume that the <literal>Configuration</literal>
class or one of its component parts exposes a simple property setter/getter for that configuration option.
</para>
@@ -38,19 +28,11 @@
</title>
<para>
- As discussed in the
- <link linkend="api.create_start">User API section</link>
- ,
- before a
- <literal>Cache</literal>
- can be created, the
- <literal>CacheFactory</literal>
- must be provided with a
- <literal>Configuration</literal>
- object or with a file name or
- input stream to use to parse a
- <literal>Configuration</literal>
- from XML. The following sections describe how to accomplish this.
+ As discussed in the <link linkend="api.create_start">User API section</link>,
+ before a <literal>Cache</literal> can be created, the <literal>CacheFactory</literal>
+ must be provided with a <literal>Configuration</literal> object or with a file name or
+ input stream to use to parse a <literal>Configuration</literal> from XML. The following sections describe
+ how to accomplish this.
</para>
<section>
@@ -84,6 +66,7 @@
<link linkend="configuration_reference">a handy look-up table</link>
explaining the various options.
</para>
+ </section>
<section id="configuration.validation">
<title>Validating Configuration Files</title>
<para>
@@ -100,21 +83,6 @@
</para>
</section>
- <para>
- Here's how you tell the
- <literal>CacheFactory</literal>
- to create
- and start a cache by finding and parsing a configuration file on the
- classpath:
- </para>
-
- <programlisting role="JAVA"><![CDATA[
- CacheFactory factory = new DefaultCacheFactory();
- Cache cache = factory.createCache("cache-configuration.xml");
- ]]></programlisting>
-
- </section>
-
<section>
<title>Programmatic Configuration</title>
<para>
@@ -325,42 +293,42 @@
will be thrown if you attempt to change a
setting that is not dynamic.
</para>
- </section>
- <section id="configuration.options">
- <title>Overriding the Configuration Via the Option API</title>
- <para>
- The Option API allows you to override certain behaviours of the cache on a per invocation basis.
- This involves creating an instance of
- <literal>org.jboss.cache.config.Option</literal>
- , setting the options
- you wish to override on the
- <literal>Option</literal>
- object and passing it in the
- <literal>InvocationContext</literal>
- before invoking your method on the cache.
- </para>
- <para>
- E.g., to override the default node versioning used with optimistic locking:
- </para>
- <programlisting role="JAVA"><![CDATA[
- DataVersion v = new MyCustomDataVersion();
- cache.getInvocationContext().getOptionOverrides().setDataVersion(v);
- Node ch = cache.getRoot().addChild(Fqn.fromString("/a/b/c"));
-]]></programlisting>
+ <section id="configuration.options">
+ <title>Overriding the Configuration via the Option API</title>
+ <para>
+ The Option API allows you to override certain behaviours of the cache on a per invocation basis.
+ This involves creating an instance of
+ <literal>org.jboss.cache.config.Option</literal>
+ , setting the options
+ you wish to override on the
+ <literal>Option</literal>
+ object and passing it in the
+ <literal>InvocationContext</literal>
+ before invoking your method on the cache.
+ </para>
+ <para>
+ E.g., to override the default node versioning used with optimistic locking:
+ </para>
+ <programlisting role="JAVA"><![CDATA[
+ DataVersion v = new MyCustomDataVersion();
+ cache.getInvocationContext().getOptionOverrides().setDataVersion(v);
+ Node ch = cache.getRoot().addChild(Fqn.fromString("/a/b/c"));
+ ]]></programlisting>
- <para>
- E.g., to suppress replication of a put call in a REPL_SYNC cache:
- </para>
- <programlisting role="JAVA"><![CDATA[
- Node node = cache.getChild(Fqn.fromString("/a/b/c"));
- cache.getInvocationContext().getOptionOverrides().setLocalOnly(true);
- node.put("localCounter", new Integer(2));
- ]]></programlisting>
- <para>
- See the javadocs on the
- <literal>Option</literal>
- class for details on the options available.
- </para>
+ <para>
+ E.g., to suppress replication of a put call in a REPL_SYNC cache:
+ </para>
+ <programlisting role="JAVA"><![CDATA[
+ Node node = cache.getChild(Fqn.fromString("/a/b/c"));
+ cache.getInvocationContext().getOptionOverrides().setLocalOnly(true);
+ node.put("localCounter", new Integer(2));
+ ]]></programlisting>
+ <para>
+ See the javadocs on the
+ <literal>Option</literal>
+ class for details on the options available.
+ </para>
+ </section>
</section>
</chapter>
Modified: core/trunk/src/main/docbook/userguide/en/modules/deployment.xml
===================================================================
--- core/trunk/src/main/docbook/userguide/en/modules/deployment.xml 2008-10-15 15:44:27 UTC (rev 6957)
+++ core/trunk/src/main/docbook/userguide/en/modules/deployment.xml 2008-10-15 18:11:20 UTC (rev 6958)
@@ -25,127 +25,23 @@
</para>
<para>
+ After creation, you could share your cache instance among different application components either by using an
+ IOC container such as Spring, JBoss Microcontainer, Picocontainer, etc., or by binding it to JNDI, or simply
+ holding a static reference to the cache.
+ </para>
+
+ <para>
If, after deploying your cache you wish to expose a management interface
to it in JMX, see the
<link linkend="jmx.registration.programatic">section on Programatic Registration in JMX</link>
.
</para>
</section>
-
- <section id="deployment.microkernel">
- <title>JMX-Based Deployment in JBoss AS (JBoss AS 5.x and 4.x)</title>
- <para>If JBoss Cache is run in JBoss AS then the cache can be deployed as an
- MBean simply by copying a standard cache configuration file to the server's
- <literal>deploy</literal>
- directory. The standard format of JBoss Cache's
- standard XML configuration file (as shown in the
- <link linkend="sample_xml_file">Configuration Reference</link>
- ) is the same
- as a JBoss AS MBean deployment descriptor, so the AS's SAR Deployer has
- no trouble handling it. Also, you don't have to place the configuration
- file directly in
- <literal>deploy</literal>
- ; you can package it along
- with other services or JEE components in a SAR or EAR.
- </para>
-
- <para>
- In AS 5, if you're using a server config based on the standard
- <literal>all</literal>
- config, then that's all you need to do; all required
- jars will be on the classpath. Otherwise, you will need to ensure
- <literal>jbosscache.jar</literal>
- and
- <literal>jgroups-all.jar</literal>
- are on the classpath. You may need to add other jars if you're using
- things like
- <literal>JdbmCacheLoader</literal>
- . The simplest way to do
- this is to copy the jars from the JBoss Cache distribution's
- <literal>lib</literal>
- directory to the server config's
- <literal>lib</literal>
- directory. You could also package the jars with the configuration file
- in Service Archive (.sar) file or an EAR.
- </para>
-
- <para>
- It is possible to deploy a JBoss Cache 2.0 instance in JBoss AS 4.x
- (at least in 4.2.0.GA; other AS releases are completely untested).
- However, the significant API changes between the JBoss Cache 2.x and 1.x releases
- mean none of the standard AS 4.x clustering services (e.g.
- http session replication) that rely on JBoss Cache will work with
- JBoss Cache 2.x. Also, be aware that usage of JBoss Cache 2.x in AS 4.x is not
- something the JBoss Cache developers are making any significant effort to test,
- so be sure to test your application well (which of course you're doing anyway.)
- </para>
-
- <para>
- Note in the
- <link linkend="sample_xml_file">example</link>
- the value of the
- <literal>mbean</literal>
- element's
- <literal>code</literal>
- attribute:
- <literal>org.jboss.cache.jmx.CacheJmxWrapper</literal>
- . This is the
- class JBoss Cache uses to handle JMX integration; the
- <literal>Cache</literal>
- itself does not expose an MBean
- interface. See the
- <link linkend="jmx.mbeans">JBoss Cache MBeans section</link>
- for more on the
- <literal>CacheJmxWrapper</literal>
- .
- </para>
-
- <para>
- Once your cache is deployed, in order to use it with an in-VM client
- such as a servlet, a JMX proxy can be used to get a reference to
- the cache:
- </para>
-
- <programlisting role="JAVA"><![CDATA[
- MBeanServer server = MBeanServerLocator.locateJBoss();
- ObjectName on = new ObjectName("jboss.cache:service=Cache");
- CacheJmxWrapperMBean cacheWrapper =
- (CacheJmxWrapperMBean) MBeanServerInvocationHandler.newProxyInstance(server, on,
- CacheJmxWrapperMBean.class, false);
- Cache cache = cacheWrapper.getCache();
- Node root = cache.getRoot(); // etc etc
- ]]></programlisting>
-
- <para>The MBeanServerLocator class is a helper to find the (only) JBoss
- MBean server inside the current JVM. The
- <literal>javax.management.MBeanServerInvocationHandler</literal>
- class'
- <literal>newProxyInstance</literal>
- method creates a
- dynamic proxy implementing the given interface and uses JMX to
- dynamically dispatch methods invoked against the generated interface
- to the MBean. The name used to look up the MBean is the same as defined
- in the cache's configuration file.
- </para>
-
- <para>
- Once the proxy to the
- <literal>CacheJmxWrapper</literal>
- is obtained,
- the
- <literal>getCache()</literal>
- will return a reference to the
- <literal>Cache</literal>
- itself.
- </para>
-
- </section>
-
<section id="deployment.microcontainer">
<title>Via JBoss Microcontainer (JBoss AS 5.x)</title>
<para>
- Beginning with AS 5, JBoss AS also supports deployment of POJO services via
+ Beginning with AS 5, JBoss AS supports deployment of POJO services via
deployment of a file whose name ends with
<literal>-beans.xml</literal>
.
@@ -155,7 +51,7 @@
<literal>Cache</literal>
is a POJO service, and all the components in a
<literal>Configuration</literal>
- are also POJOS, so deploying a cache in this way is a natural step.
+ are also POJOs, so deploying a cache in this way is a natural step.
</para>
<para>
Deployment of the cache is done using the JBoss Microcontainer that forms the
@@ -175,11 +71,10 @@
configured.
</para>
<para>
- The rules for how to deploy the file, how to package it, how to
- ensure the required jars are on the classpath, etc. are the same
- as for a
- <link linkend="deployment.microkernel">JMX-based deployment</link>
- .
+ You need to ensure that the <literal>jbosscache-core.jar</literal> and <literal>jgroups.jar</literal> libraries
+ are in your server's <literal>lib</literal> directory. This is usually the case when you use JBoss AS in its
+ <literal>all</literal> configuration. Note that you will have to bring in any additional jars you require, such
+ as <literal>jdbm.jar</literal> based on your cache configuration.
</para>
<para>
Following is an example
@@ -187,7 +82,7 @@
file. If you
look in the
<literal>server/all/deploy</literal>
- directory of an AS 5
+ directory of a JBoss AS 5
installation, you can find several more examples.
</para>
@@ -215,74 +110,26 @@
<property name="clusterName">Example-EntityCache</property>
- <!--
- Node locking level : SERIALIZABLE
- REPEATABLE_READ (default)
- READ_COMMITTED
- READ_UNCOMMITTED
- NONE
- -->
<property name="isolationLevel">REPEATABLE_READ</property>
- <!-- Valid modes are LOCAL
- REPL_ASYNC
- REPL_SYNC
- -->
<property name="cacheMode">REPL_SYNC</property>
- <!-- The max amount of time (in milliseconds) we wait until the
- initial state (ie. the contents of the cache) are retrieved from
- existing members in a clustered environment
- -->
<property name="initialStateRetrievalTimeout">15000</property>
- <!-- Number of milliseconds to wait until all responses for a
- synchronous call have been received.
- -->
<property name="syncReplTimeout">20000</property>
- <!-- Max number of milliseconds to wait for a lock acquisition -->
<property name="lockAcquisitionTimeout">15000</property>
<property name="exposeManagementStatistics">true</property>
- <!-- Must be true if any entity deployment uses a scoped classloader -->
<property name="useRegionBasedMarshalling">true</property>
- <!-- Must match the value of "useRegionBasedMarshalling" -->
<property name="inactiveOnStartup">true</property>
- <!-- Specific eviction policy configurations. This is LRU -->
- <property name="evictionConfig">
- <bean name="ExampleEvictionConfig"
- class="org.jboss.cache.config.EvictionConfig">
- <property name="defaultEvictionPolicyClass">
- org.jboss.cache.eviction.LRUPolicy
- </property>
- <property name="wakeupIntervalSeconds">5</property>
- <property name="evictionRegionConfigs">
- <list>
- <bean name="ExampleDefaultEvictionRegionConfig"
- class="org.jboss.cache.config.EvictionRegionConfig">
- <property name="regionName">/_default_</property>
- <property name="evictionPolicyConfig">
- <bean name="ExampleDefaultLRUConfig"
- class="org.jboss.cache.eviction.LRUConfiguration">
- <property name="maxNodes">5000</property>
- <property name="timeToLiveSeconds">1000</property>
- </bean>
- </property>
- </bean>
- </list>
- </property>
- </bean>
- </property>
-
</bean>
<!-- Factory to build the Cache. -->
<bean name="DefaultCacheFactory" class="org.jboss.cache.DefaultCacheFactory">
- <constructor factoryClass="org.jboss.cache.DefaultCacheFactory"
- factoryMethod="getInstance"/>
+ <constructor factoryClass="org.jboss.cache.DefaultCacheFactory" />
</bean>
<!-- The cache itself -->
@@ -300,13 +147,10 @@
]]></programlisting>
<para>
- See the JBoss Microcontainer documentation
- <footnote>
- <para>http://labs.jboss.com/jbossmc/docs</para>
- </footnote>
+ See <ulink url="http://www.jboss.org/jbossmc/docs">the JBoss Microcontainer documentation</ulink>
for details on the above syntax. Basically, each
<literal>bean</literal>
- element represents an object; most going to create a
+ element represents an object and is used to create a
<literal>Configuration</literal>
and its
<link linkend="configuration.elements">constituent parts</link>
@@ -330,21 +174,9 @@
</section>
<section>
- <title>Binding to JNDI in JBoss AS</title>
+ <title>Automatic binding to JNDI in JBoss AS</title>
<para>
- With the 1.x JBoss Cache releases, a proxy to the cache could be bound
- into JBoss AS's JNDI tree using the AS's
- <literal>JRMPProxyFactory</literal>
- service. With JBoss Cache 2.x, this no longer works. An alternative
- way of doing a similar thing with a POJO (i.e. non-JMX-based) service
- like a
- <literal>Cache</literal>
- is under development by the JBoss AS
- team
- <footnote>
- <para>http://jira.jboss.com/jira/browse/JBAS-4456</para>
- </footnote>
- . That feature is not available as of the time of this writing,
+ This feature is not available as of the time of this writing,
although it will be completed before AS 5.0.0.GA is released.
We will add a wiki page describing how to use it once it becomes available.
</para>
@@ -392,29 +224,11 @@
javadoc for more details.
</para>
<para>
- It is important to note a significant architectural difference between JBoss Cache 1.x and 2.x. In 1.x,
- the old
- <literal>TreeCache</literal>
- class was itself an MBean, and essentially exposed the cache's entire
- API via JMX. In 2.x, JMX has been returned to it's fundamental role as a management layer. The
- <literal>Cache</literal>
- object itself is completely unaware of JMX; instead JMX functionality is added
- through a wrapper class designed for that purpose. Furthermore, the interface exposed through JMX
- has been limited to management functions; the general
- <literal>Cache</literal>
- API is no longer exposed
- through JMX. For example, it is no longer possible to invoke a cache
- <literal>put</literal>
- or
- <literal>get</literal>
- via the JMX interface.
- </para>
- <para>
If a
<literal>CacheJmxWrapper</literal>
is registered, JBoss Cache also provides MBeans
- for each interceptor configured in the cache's interceptor stack. These
- MBeans are used to capture and expose statistics related to cache operations. They are hierarchically
+ for several other internal components and subsystems. These
+ MBeans are used to capture and expose statistics related to the subsystems they represent. They are hierarchically
associated with the
<literal>CacheJmxWrapper</literal>
MBean and have service names that reflect this relationship. For
Modified: core/trunk/src/main/docbook/userguide/en/modules/introduction.xml
===================================================================
--- core/trunk/src/main/docbook/userguide/en/modules/introduction.xml 2008-10-15 15:44:27 UTC (rev 6957)
+++ core/trunk/src/main/docbook/userguide/en/modules/introduction.xml 2008-10-15 18:11:20 UTC (rev 6958)
@@ -8,7 +8,7 @@
<para>
JBoss Cache is a tree-structured, clustered, transactional cache. It can be used in a standalone, non-clustered
environment, to cache frequently accessed data in memory thereby removing data retrieval or calculation bottlenecks
- while providing "enterprise" features such as JTA compatibility, eviction and persistence.
+ while providing "enterprise" features such as <ulink url="http://java.sun.com/products/jta">JTA</ulink> compatibility, eviction and persistence.
</para>
<para>
JBoss Cache is also a clustered cache, and can be used in a cluster to replicate state providing a high degree
@@ -17,8 +17,10 @@
</para>
<para>
When used in a clustered mode, the cache is an effective mechanism of building high availability, fault
- tolerance and even load balancing into custom applications and frameworks. For example, the JBoss Application
- Server makes extensive use of JBoss Cache in clustering services such as HTTP and <ulink url="http://java.sun.com/products/ejb/">EJB</ulink> sessions, as well as
+ tolerance and even load balancing into custom applications and frameworks. For example, the
+ <ulink url="http://www.jboss.org/projects/jbossas/">JBoss Application Server</ulink> and Red Hat's
+ <ulink url="http://www.jboss.com">Enterprise Application Platform</ulink> make extensive use of JBoss Cache to
+ cluster services such as HTTP and <ulink url="http://java.sun.com/products/ejb/">EJB</ulink> sessions, as well as
providing a distributed entity cache for <ulink url="http://en.wikipedia.org/wiki/Java_Persistence_API">JPA</ulink>.
</para>
<para>
@@ -36,8 +38,9 @@
</itemizedlist>
</para>
<para>
- POJO Cache has a complete and separate set of documentation, including a user guide, FAQ and tutorial and
- as such, POJO Cache is not discussed further in this book.
+ POJO Cache has a complete and separate set of documentation, including a user guide, FAQ and tutorial all
+ available on the JBoss Cache <ulink url="http://www.jboss.org/jbosscache">documentation website</ulink>.
+ As such, POJO Cache will not be discussed further in this book.
</para>
</section>
@@ -46,74 +49,97 @@
<section>
<title>Summary of Features</title>
- <para>
- JBoss Cache offers a simple and straightforward API, where data (simple Java objects) can be placed in the
- cache and, based on configuration options selected, this data may be one or all of:
- <itemizedlist>
- <listitem>cached in-memory for efficient, threadsafe retrieval.</listitem>
- <listitem>replicated to some or all cache instances in a cluster.</listitem>
- <listitem>persisted to disk and/or a remote cluster ("far-cache").</listitem>
- <listitem>garbage collected from memory when memory runs low, and passivated to disk so state isn't lost.
- </listitem>
- </itemizedlist>
- In addition, JBoss Cache offers a rich set of enterprise-class features:
- <itemizedlist>
- <listitem>being able to participate in JTA transactions (works with Java EE compliant TransactionManagers).
- </listitem>
- <listitem>attach to JMX consoles and provide runtime statistics on the state of the cache.</listitem>
- <listitem>allow client code to attach listeners and receive notifications on cache events.</listitem>
- </itemizedlist>
- </para>
+ <section>
+ <title>Caching objects</title>
- <para>A cache is organised as a tree, with a single root. Each node in the tree essentially contains a Map,
- which acts as a store for key/value pairs. The only requirement placed on objects that are cached is that
- they implement
- <literal>java.io.Serializable</literal>.
- </para>
+ <para>
+ JBoss Cache offers a simple and straightforward API, where data - simple Java objects - can be placed in the
+ cache. Based on configuration options selected, this data may be one or all of:
+ <itemizedlist>
+ <listitem>cached in-memory for efficient, threadsafe retrieval.</listitem>
+ <listitem>replicated to some or all cache instances in a cluster.</listitem>
+ <listitem>persisted to disk and/or a remote, in-memory cache cluster ("far-cache").</listitem>
+ <listitem>garbage collected from memory when memory runs low, and passivated to disk so state isn't lost.
+ </listitem>
+ </itemizedlist>
+ In addition, JBoss Cache offers a rich set of enterprise-class features:
+ <itemizedlist>
+ <listitem>being able to participate in <ulink url="http://java.sun.com/products/jta">JTA</ulink> transactions
+ (works with most Java EE compliant transaction managers).</listitem>
+ <listitem>attach to JMX consoles and provide runtime statistics on the state of the cache.</listitem>
+ <listitem>allow client code to attach listeners and receive notifications on cache events.</listitem>
+ <listitem>allow grouping of cache operations into batches, for efficient replication</listitem>
+ </itemizedlist>
+ </para>
+ </section>
- <para>JBoss Cache
- can be either local or replicated. Local trees exist
- only inside the JVM in which they are created, whereas replicated trees
- propagate any changes to some or all other trees in the same cluster. A
- cluster may span different hosts on a network or just different JVMs
- on a single host.
- </para>
+ <section>
+ <title>Local and clustered modes</title>
- <para>When a change is made to an object in the cache and that change is done in
- the context of a transaction, the replication of changes is deferred until the transaction
- commits successfully. All modifications are kept in a list associated with
- the transaction for the caller. When the transaction commits, we replicate the
- changes. Otherwise, (on a rollback) we simply undo the changes locally
- resulting in zero network traffic and overhead. For example, if a caller
- makes 100 modifications and then rolls back the transaction, we will not replicate
- anything, resulting in no network traffic.
- </para>
+ <para>
+ The cache is organised as a tree, with a single root. Each node in the tree essentially contains a map,
+ which acts as a store for key/value pairs. The only requirement placed on objects that are cached is that
+ they implement <literal>java.io.Serializable</literal>.
+ </para>
- <para>If a caller has no transaction associated with it, we will replicate right after each modification, e.g. in the above
- case we would send 100 messages, plus an additional message for the
- rollback. In this sense, running without a transaction can be thought of as analogous as running with
- auto-commit switched on in JDBC terminology, where each operation is committed automatically.
- </para>
+ <para>
+ JBoss Cache can be either local or replicated. Local caches exist only within the scope of the JVM in which
+ they are created, whereas replicated caches propagate any changes to some or all other caches in the same
+ cluster. A cluster may span different hosts on a network or just different JVMs on a single host.
+ </para>
- <para>
- JBoss Cache works out of the box with most popular transaction managers, and even provides an API where
- custom transaction manager lookups can be written.
- </para>
+ </section>
- <para>
- The cache is also completely thread-safe. It uses multi-versioned concurrency control (MVCC) to ensure thread
- safety between readers and writers, while maintaining a high degree of concurrency. The specific MVCC implementation
- used in JBoss Cache allows for readers to be completely free of locks and synchronized blocks, ensuring a very high
- degree of performance for read-heavy applications.
+ <section>
+ <title>Clustered caches and transactions</title>
+
+ <para>
+ When a change is made to an object in the cache and that change is done in
+ the context of a transaction, the replication of changes is deferred until the transaction
+ completes successfully. All modifications are kept in a list associated with
+ the transaction of the caller. When the transaction commits, changes are replicated. Otherwise, on a rollback,
+ we simply undo the changes locally and discard the modification list, resulting in zero network traffic and
+ overhead. For example, if a caller makes 100 modifications and then rolls back the transaction, nothing is
+ replicated, resulting in no network traffic.
</para>
- <para>
- Optimistic and pessimistic locking schemes, from older versions of JBoss Cache, are still available but are
- deprecated in favour of MVCC, and will be removed in future releases.
- </para>
- <para>
- The JBoss Cache MVCC implementation supports READ_COMMITTED and REPEATABLE_READ isolation levels, corresponding
- to their database equivalents.
- </para>
+
+ <para>
+ If a caller has no transaction or batch associated with it, modifications are replicated immediately. E.g.
+ in the example used earlier, 100 messages would be broadcast for each modification. In this sense, running without
+ a batch or transaction can be thought of as analogous as running with auto-commit switched on in JDBC terminology,
+ where each operation is committed automatically and immediately.
+ </para>
+
+ <para>
+ JBoss Cache works out of the box with most popular transaction managers, and even provides an API where
+ custom transaction manager lookups can be written.
+ </para>
+
+ <para>
+ All of the above holds true for batches as well, which has similar behavior.
+ </para>
+ </section>
+
+
+ <section>
+ <title>Thread safety</title>
+ <para>
+ The cache is completely thread-safe. It employs multi-versioned concurrency control (MVCC) to ensure thread
+ safety between readers and writers, while maintaining a high degree of concurrency. The specific MVCC implementation
+ used in JBoss Cache allows for reader threads to be completely free of locks and synchronized blocks, ensuring a very high
+ degree of performance for read-heavy applications. It also uses custom, highly performant lock implementations
+ that employ modern compare-and-swap techniques for writer threads, which are tuned to multicore CPU architectures.
+ </para>
+ <para>
+ Optimistic and pessimistic locking schemes from older versions of JBoss Cache are still available but are
+ deprecated in favour of MVCC, and will be removed in future releases. Use of these locking schemes is
+ strongly discouraged.
+ </para>
+ <para>
+ The JBoss Cache MVCC implementation only supports READ_COMMITTED and REPEATABLE_READ isolation levels, corresponding
+ to their database equivalents.
+ </para>
+ </section>
</section>
<section>
@@ -121,10 +147,11 @@
Requirements
</title>
<para>
- JBoss Cache requires Java 5.0 (or newer).
+ JBoss Cache requires a Java 5.0 (or newer) compatible virtual machine and set of libraries, and is developed
+ and tested on Sun's JDK 5.0 and JDK 6.
</para>
<para>
- However, there is a way to build JBoss Cache as a Java 1.4.x compatible binary using
+ There is a way to build JBoss Cache as a Java 1.4.x compatible binary using
<ulink url="http://www.jboss.org/community/docs/DOC-10738">JBossRetro</ulink>
to retroweave the Java 5.0 binaries. However, Red Hat Inc. does not offer professional support around the
retroweaved
@@ -135,16 +162,16 @@
</para>
<para>
In addition to Java 5.0, at a minimum, JBoss Cache has dependencies on
- <ulink url="http://www.jgroups.org">JGroups</ulink>
- , and Apache's <ulink url="http://jakarta.apache.org/commons/logging/">commons-logging</ulink>.
- JBoss Cache ships with all dependent libraries necessary to run out of the box.
+ <ulink url="http://www.jgroups.org">JGroups</ulink>, and Apache's
+ <ulink url="http://jakarta.apache.org/commons/logging/">commons-logging</ulink>. JBoss Cache ships with all
+ dependent libraries necessary to run out of the box, as well as several optional jars for optional features.
</para>
</section>
<section>
<title>License</title>
<para>
- JBoss Cache is an open source product, using the business and OEM-friendly
+ JBoss Cache is an open source project, using the business and OEM-friendly
<ulink url="http://www.opensource.org/">OSI-approved</ulink>
<ulink url="http://www.gnu.org/copyleft/lesser.html">LGPL license.</ulink>
Commercial development support, production support and training for JBoss Cache is available through
Modified: core/trunk/src/main/docbook/userguide/en/modules/preface.xml
===================================================================
--- core/trunk/src/main/docbook/userguide/en/modules/preface.xml 2008-10-15 15:44:27 UTC (rev 6957)
+++ core/trunk/src/main/docbook/userguide/en/modules/preface.xml 2008-10-15 18:11:20 UTC (rev 6958)
@@ -3,7 +3,7 @@
<para>
This is the official JBoss Cache user guide. Along with its accompanying documents (an FAQ, a tutorial and a
- whole set of documents on POJO Cache), this is freely available on the JBoss Cache <ulink url="http://labs.jboss.com/jbosscache">documentation site.</ulink>
+ whole set of documents on POJO Cache), this is freely available on the JBoss Cache <ulink url="http://www.jboss.org/jbosscache">documentation website</ulink>.
</para>
<para>
When used, JBoss Cache refers to JBoss Cache Core, a tree-structured, clustered, transactional cache.
@@ -27,16 +27,15 @@
</para>
<para>
- For further discussion, use the
- <ulink url="http://jboss.org/index.html?module=bb&op=main&c=29">user forum</ulink>
- linked on the JBoss Cache <ulink url="http://labs.jboss.com/jbosscache">website.</ulink> We also provide a mechanism for
- tracking bug reports and feature requests on the JBoss Cache <ulink url="http://jira.jboss.com/jira/browse/JBCACHE">JIRA issue tracker.</ulink>
+ For further discussion, use the user forum available on the JBoss Cache
+ <ulink url="http://www.jboss.org/jbosscache">website.</ulink> We also provide a mechanism for
+ tracking bug reports and feature requests on the JBoss Cache <ulink url="http://jira.jboss.com/jira/browse/JBCACHE">JIRA issue tracker</ulink>.
</para>
<para>
If you are interested in the development of JBoss Cache or in translating this documentation into other languages,
- we'd love to hear from you. Please post a message on the
- <ulink url="http://jboss.org/index.html?module=bb&op=main&c=29">user forum</ulink>
- or contact us by using the JBoss Cache <ulink url="https://lists.jboss.org/mailman/listinfo/jbosscache-dev">developer mailing list.</ulink>
+ we'd love to hear from you. Please post a message on the JBoss Cache
+ <ulink url="http://www.jboss.org/jbosscache">user forum</ulink>
+ or contact us by using the JBoss Cache <ulink url="https://lists.jboss.org/mailman/listinfo/jbosscache-dev">developer mailing list</ulink>.
</para>
<para>
@@ -46,7 +45,11 @@
</para>
<para>
- Happy reading!
+ I always appreciate feedback, suggestions and corrections, and these should be directed to the
+ <ulink url="https://lists.jboss.org/mailman/listinfo/jbosscache-dev">developer mailing list</ulink> rather than
+ direct emails to any of the authors. We hope you find this book useful, and wish you happy reading!
</para>
-
+ <para>
+ <emphasis role="bold">Manik Surtani</emphasis>, October 2008
+ </para>
</preface>
\ No newline at end of file
16 years, 2 months
- 1
- 0
JBoss Cache SVN: r6957 - core/branches/flat/src/main/java/org/jboss/starobrno/loader.
by jbosscache-commits＠lists.jboss.org
Author: jason.greene(a)jboss.com
Date: 2008-10-15 11:44:27 -0400 (Wed, 15 Oct 2008)
New Revision: 6957
Added:
core/branches/flat/src/main/java/org/jboss/starobrno/loader/AbstractCacheLoader.java
core/branches/flat/src/main/java/org/jboss/starobrno/loader/Modification.java
Log:
missed files
Added: core/branches/flat/src/main/java/org/jboss/starobrno/loader/AbstractCacheLoader.java
===================================================================
--- core/branches/flat/src/main/java/org/jboss/starobrno/loader/AbstractCacheLoader.java (rev 0)
+++ core/branches/flat/src/main/java/org/jboss/starobrno/loader/AbstractCacheLoader.java 2008-10-15 15:44:27 UTC (rev 6957)
@@ -0,0 +1,192 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2000 - 2008, 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.jboss.starobrno.loader;
+
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.jboss.cache.RegionManager;
+import org.jboss.cache.buddyreplication.BuddyFqnTransformer;
+import org.jboss.cache.marshall.Marshaller;
+import org.jboss.starobrno.CacheException;
+import org.jboss.starobrno.CacheSPI;
+import org.jboss.starobrno.marshall.EntryData;
+import org.jboss.starobrno.marshall.EntryDataExceptionMarker;
+import org.jboss.starobrno.marshall.EntryDataMarker;
+
+/**
+ * A convenience abstract implementation of a {@link CacheLoader}. Specific methods to note are methods like
+ * {@link #storeState(org.jboss.cache.Fqn,java.io.ObjectInputStream)}, {@link #loadState(org.jboss.cache.Fqn,java.io.ObjectOutputStream)},
+ * {@link #storeEntireState(java.io.ObjectInputStream)} and {@link #loadEntireState(java.io.ObjectOutputStream)} which have convenience
+ * implementations here.
+ * <p/>
+ * Also useful to note is the implementation of {@link #put(java.util.List)}, used during the prepare phase of a transaction.
+ * <p/>
+ *
+ * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
+ * @author <a href="mailto:galder.zamarreno@jboss.com">Galder Zamarreno</a>
+ * @since 2.0.0
+ */
+public abstract class AbstractCacheLoader<K, V> implements CacheLoader<K,V>
+{
+ protected CacheSPI<K,V> cache;
+ protected RegionManager regionManager;
+ private static final Log log = LogFactory.getLog(AbstractCacheLoader.class);
+ private static final boolean trace = log.isTraceEnabled();
+ protected BuddyFqnTransformer buddyFqnTransformer = new BuddyFqnTransformer();
+ /**
+ * HashMap<Object,List<Modification>>. List of open transactions. Note that this is purely transient, as
+ * we don't use a log, recovery is not available
+ */
+ protected Map<Object, List<Modification>> transactions = new ConcurrentHashMap<Object, List<Modification>>();
+
+ public void storeEntireState(ObjectInputStream in)
+ {
+ // store new state
+ Object objectFromStream;
+ try
+ {
+ objectFromStream = cache.getMarshaller().objectFromObjectStream(in);
+ }
+ catch (Exception e)
+ {
+ throw new CacheException(e.getMessage(), e);
+ }
+
+ if (objectFromStream instanceof EntryDataMarker)
+ {
+ // no persistent state sent across; return?
+ if (trace) log.trace("Empty persistent stream?");
+ return;
+ }
+ if (objectFromStream instanceof EntryDataExceptionMarker)
+ {
+ EntryDataExceptionMarker ndem = (EntryDataExceptionMarker) objectFromStream;
+ throw new CacheException("State provider cacheloader at node " + ndem.getCacheNodeIdentity()
+ + " threw exception during loadState (see Caused by)", ndem.getCause());
+ }
+
+ List<EntryData<K, V>> data = (List<EntryData<K, V>>) objectFromStream;
+ for (EntryData<K, V> datem : data)
+ {
+ put(datem.getKey(), datem.getValue());
+ }
+ }
+
+ public void loadEntireState(ObjectOutputStream os)
+ {
+ List<EntryData<K,V>> list = getAllEntries();
+ if (trace) log.trace("Loading state of " + list.size() + " nodes into stream");
+ try
+ {
+ cache.getMarshaller().objectToObjectStream(list, os);
+ }
+ catch (Exception e)
+ {
+ throw new CacheException(e.getMessage(), e);
+ }
+ }
+
+
+ public void setCache(CacheSPI<K,V> c)
+ {
+ this.cache = c;
+ }
+
+ public void put(List<Modification> modifications)
+ {
+ for (Modification m : modifications)
+ {
+ switch (m.getType())
+ {
+ case PUT:
+ put(m.getKey(), (V)m.getValue());
+ break;
+ case REMOVE:
+ remove(m.getKey());
+ break;
+ case CLEAR:
+ clear();
+ break;
+ default:
+ throw new CacheException("Unknown modification " + m.getType());
+ }
+ }
+ }
+
+ protected Marshaller getMarshaller()
+ {
+ return cache.getMarshaller();
+ }
+
+ // empty implementations for loaders that do not wish to implement lifecycle.
+ public void create()
+ {
+ }
+
+ public void start()
+ {
+ }
+
+ public void stop()
+ {
+ }
+
+ public void destroy()
+ {
+ }
+
+ // Adds simple transactional capabilities to cache loaders that are inherently non-transactional. If your cache loader implementation
+ // is tansactional though, then override these.
+
+ public void prepare(Object tx, List<Modification> modifications, boolean one_phase)
+ {
+ if (one_phase)
+ {
+ put(modifications);
+ }
+ else
+ {
+ transactions.put(tx, modifications);
+ }
+ }
+
+ public void commit(Object tx)
+ {
+ List<Modification> modifications = transactions.remove(tx);
+ if (modifications == null)
+ {
+ throw new CacheException("transaction " + tx + " not found in transaction table");
+ }
+ put(modifications);
+ }
+
+ public void rollback(Object tx)
+ {
+ transactions.remove(tx);
+ }
+}
Added: core/branches/flat/src/main/java/org/jboss/starobrno/loader/Modification.java
===================================================================
--- core/branches/flat/src/main/java/org/jboss/starobrno/loader/Modification.java (rev 0)
+++ core/branches/flat/src/main/java/org/jboss/starobrno/loader/Modification.java 2008-10-15 15:44:27 UTC (rev 6957)
@@ -0,0 +1,112 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2000 - 2008, 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.jboss.starobrno.loader;
+
+
+import java.io.Serializable;
+
+
+/**
+ * Represents a modification in the cache. Contains the nature of the modification
+ * (e.g. PUT, REMOVE), the fqn of the node, the new value and the previous value.
+ * A list of modifications will be sent to all nodes in a cluster when a transaction
+ * has been committed (PREPARE phase). A Modification is also used to roll back changes,
+ * e.g. since we know the previous value, we can reconstruct the previous state by
+ * applying the changes in a modification listin reverse order.
+ *
+ * @author <a href="mailto:bela@jboss.org">Bela Ban</a> Apr 12, 2003
+ * @version $Revision: 6776 $
+ */
+public final class Modification implements Serializable
+{
+
+ private static final long serialVersionUID = 7463314130283897197L;
+
+ public static enum ModificationType
+ {
+ PUT,
+ REMOVE,
+ CLEAR
+ }
+
+ private final ModificationType type;
+ private final Object key;
+ private final Object value;
+
+ /**
+ * Constructs a new modification with details.
+ */
+ public Modification(ModificationType type, Object key, Object value)
+ {
+ if (type == null)
+ throw new IllegalArgumentException();
+ this.type = type;
+ this.key = key;
+ this.value = value;
+ }
+
+
+ /**
+ * Returns the type of modification.
+ */
+ public ModificationType getType()
+ {
+ return type;
+ }
+
+ /**
+ * Returns the modification key.
+ */
+ public Object getKey()
+ {
+ return key;
+ }
+
+ /**
+ * Returns the modification value.
+ */
+ public Object getValue()
+ {
+ return value;
+ }
+
+
+ /**
+ * Returns debug information about this modification.
+ */
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
+ sb.append(type.toString()).append("{");
+ if (key != null)
+ {
+ sb.append("\nkey=").append(key);
+ }
+ if (value != null)
+ {
+ sb.append("\nvalue=").append(value);
+ }
+ return sb.append("}").toString();
+ }
+
+}
16 years, 2 months
- 1
- 0
JBoss Cache SVN: r6955 - in enterprise-docs: tags and 1 other directory.
by jbosscache-commits＠lists.jboss.org
Author: skittoli(a)redhat.com
Date: 2008-10-15 08:21:20 -0400 (Wed, 15 Oct 2008)
New Revision: 6955
Added:
enterprise-docs/tags/
enterprise-docs/tags/JBoss_EAP_4_2/
enterprise-docs/tags/JBoss_EAP_4_2_5/
enterprise-docs/tags/JBoss_EAP_4_3/
enterprise-docs/trunk/
Log:
adding tags and trunk directories
16 years, 2 months
- 1
- 0
Build failed in Hudson: jboss-cache-core-trunk-jdk1.5 » JBoss Cache - Core Edition #598
by jboss-qa-internal＠redhat.com
See http://hudson.qa.jboss.com/hudson/job/jboss-cache-core-trunk-jdk1.5/org.j...
Changes:
[manik.surtani(a)jboss.com] JBCACHE-1410: JDBCCacheLoader may attempt to create a node entry in the DB twice
[bela(a)jboss.com] changed compareTo()
[manik.surtani(a)jboss.com] Do not create node if it already exists
[manik.surtani(a)jboss.com] Optimised memory footprint
------------------------------------------
started
Building remotely on dev73-sles10
$ /qa/tools/opt/jdk1.5.0_15/bin/java -Xmx512m -cp /mnt/hudson_workspace/maven-agent.jar:/qa/tools/opt/maven-2.0.9/boot/classworlds-1.1.jar hudson.maven.agent.Main /qa/tools/opt/maven-2.0.9 /qa/services/hudson/hudson_release/WEB-INF/slave.jar /mnt/hudson_workspace/maven-interceptor.jar
channel started
[INFO] Scanning for projects...
WAGON_VERSION: 1.0-beta-2
[INFO] ------------------------------------------------------------------------
[INFO] Building JBoss Cache - Core Edition
[INFO] task-segment: [package]
[INFO] ------------------------------------------------------------------------
[INFO] artifact org.apache.maven.plugins:maven-idea-plugin: checking for updates from repository.jboss.org
[INFO] artifact org.apache.maven.plugins:maven-idea-plugin: checking for updates from Main Maven Repo
[INFO] artifact org.apache.maven.plugins:maven-idea-plugin: checking for updates from snapshots.repository.codehaus.org
[INFO] [enforcer:enforce {execution: enforce-java}]
[INFO] [resources:resources]
[INFO] Using default encoding to copy filtered resources.
[INFO] [compiler:compile]
Compiling 487 source files to /mnt/hudson_workspace/workspace/jboss-cache-core-trunk-jdk1.5/target/classes
[INFO] [resources:testResources]
[INFO] Using default encoding to copy filtered resources.
[INFO] [compiler:testCompile]
Compiling 498 source files to /mnt/hudson_workspace/workspace/jboss-cache-core-trunk-jdk1.5/target/test-classes
[HUDSON] Archiving /mnt/hudson_workspace/workspace/jboss-cache-core-trunk-jdk1.5/./pom.xml
[INFO] ------------------------------------------------------------------------
[ERROR] BUILD FAILURE
[INFO] ------------------------------------------------------------------------
[INFO] Compilation failure
/mnt/hudson_workspace/workspace/jboss-cache-core-trunk-jdk1.5/src/test/java/org/jboss/cache/optimistic/AbstractOptimisticTestCase.java:[303,13] org.jboss.cache.optimistic.AbstractOptimisticTestCase.DummyAddress is not abstract and does not override abstract method compareTo(java.lang.Object) in java.lang.Comparable
[INFO] ------------------------------------------------------------------------
[INFO] For more information, run Maven with the -e switch
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 47 seconds
[INFO] Finished at: Thu Sep 25 10:34:07 EDT 2008
[INFO] Final Memory: 16M/76M
[INFO] ------------------------------------------------------------------------
Waiting for Hudson to finish collecting data
16 years, 2 months
- 1
- 24
JBoss Cache SVN: r6954 - in core/branches/flat/src/main/java/org/jboss/starobrno: loader and 1 other directory.
by jbosscache-commits＠lists.jboss.org
Author: jason.greene(a)jboss.com
Date: 2008-10-14 21:11:16 -0400 (Tue, 14 Oct 2008)
New Revision: 6954
Modified:
core/branches/flat/src/main/java/org/jboss/starobrno/CacheSPI.java
core/branches/flat/src/main/java/org/jboss/starobrno/loader/CacheLoader.java
Log:
start of cache loader port
Modified: core/branches/flat/src/main/java/org/jboss/starobrno/CacheSPI.java
===================================================================
--- core/branches/flat/src/main/java/org/jboss/starobrno/CacheSPI.java 2008-10-15 01:02:20 UTC (rev 6953)
+++ core/branches/flat/src/main/java/org/jboss/starobrno/CacheSPI.java 2008-10-15 01:11:16 UTC (rev 6954)
@@ -21,23 +21,28 @@
*/
package org.jboss.starobrno;
+import java.util.List;
+
+import javax.transaction.Transaction;
+import javax.transaction.TransactionManager;
+
import net.jcip.annotations.ThreadSafe;
+
+import org.jboss.cache.Node;
+import org.jboss.cache.NodeSPI;
import org.jboss.cache.buddyreplication.BuddyManager;
import org.jboss.cache.buddyreplication.GravitateResult;
import org.jboss.cache.loader.CacheLoaderManager;
import org.jboss.cache.marshall.Marshaller;
-import org.jboss.starobrno.statetransfer.StateTransferManager;
import org.jboss.starobrno.context.InvocationContext;
import org.jboss.starobrno.factories.ComponentRegistry;
import org.jboss.starobrno.interceptors.base.CommandInterceptor;
+import org.jboss.starobrno.loader.CacheLoader;
import org.jboss.starobrno.notifications.Notifier;
+import org.jboss.starobrno.statetransfer.StateTransferManager;
import org.jboss.starobrno.transaction.GlobalTransaction;
import org.jboss.starobrno.transaction.TransactionTable;
-import javax.transaction.Transaction;
-import javax.transaction.TransactionManager;
-import java.util.List;
-
/**
* A more detailed interface to {@link Cache}, which is used when writing plugins for or extending JBoss Cache. A reference
* to this interface should only be obtained when it is passed in to your code, for example when you write an
Modified: core/branches/flat/src/main/java/org/jboss/starobrno/loader/CacheLoader.java
===================================================================
--- core/branches/flat/src/main/java/org/jboss/starobrno/loader/CacheLoader.java 2008-10-15 01:02:20 UTC (rev 6953)
+++ core/branches/flat/src/main/java/org/jboss/starobrno/loader/CacheLoader.java 2008-10-15 01:11:16 UTC (rev 6954)
@@ -21,18 +21,19 @@
*/
package org.jboss.starobrno.loader;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.util.List;
+import java.util.Map;
+
import net.jcip.annotations.ThreadSafe;
+
import org.jboss.cache.Fqn;
-import org.jboss.cache.Modification;
import org.jboss.cache.loader.AbstractCacheLoader;
import org.jboss.starobrno.CacheSPI;
import org.jboss.starobrno.config.CacheLoaderConfig.IndividualCacheLoaderConfig;
+import org.jboss.starobrno.marshall.EntryData;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.util.List;
-import java.util.Map;
-
/**
* A {@link org.jboss.cache.loader.CacheLoader} implementation persists and load keys to and from
* secondary storage, such as a database or filesystem. Typically,
@@ -99,7 +100,7 @@
* null if the node is not found. If the node is found but has no
* attributes, this method returns an empty Map.
*/
- V get(Object key) throws Exception;
+ V get(Object key);
/**
@@ -107,30 +108,43 @@
*
* @return true if node exists, false otherwise
*/
- boolean exists(Object key) throws Exception;
+ boolean exists(Object key);
/**
* Puts a key and value into the attribute map of a given node. If the
* node does not exist, all parent nodes from the root down are created
* automatically. Returns the old value.
*/
- V put(Object key, V value) throws Exception;
+ V put(Object key, V value) ;
/**
* Removes the given key and value from the attributes of the given node.
* Does nothing if the node doesn't exist
* Returns the removed value.
*/
- V remove(Object key, V value) throws Exception;
+ V remove(Object key, V value);
/**
+ * Removes everything from this cache-loader
+ */
+ void clear();
+
+ /**
* Removes the given node and all its subnodes, does nothing if the node does not exist.
*
* @param fqn the {@link Fqn} of the node
*/
- void remove(Object key) throws Exception;
+ void remove(Object key);
+ /**
+ * Retrieves all entries stored in this cache loader
+ *
+ * @return All entries
+ * @throws Exception on error
+ */
+ List<EntryData<K, V>> getAllEntries();
+
/**
* Prepares a list of modifications. For example, for a DB-based CacheLoader:
* <ol>
@@ -147,7 +161,7 @@
* we won't get a {@link #commit(Object)} or {@link #rollback(Object)} method call later
* @throws Exception
*/
- void prepare(Object tx, List<Modification> modifications, boolean one_phase) throws Exception;
+ void prepare(Object tx, List<Modification> modifications, boolean one_phase);
/**
* Commits the transaction. A DB-based CacheLoader would look up the local
@@ -160,7 +174,7 @@
*
* @param tx transaction to commit
*/
- void commit(Object tx) throws Exception;
+ void commit(Object tx);
/**
* Rolls the transaction back. A DB-based CacheLoader would look up the
@@ -191,7 +205,7 @@
* @see AbstractCacheLoader#loadEntireState(ObjectOutputStream)
* @see org.jboss.starobrno.marshall.NodeData
*/
- void loadEntireState(ObjectOutputStream os) throws Exception;
+ void loadEntireState(ObjectOutputStream os);
/**
* Stores the entire state for this cache by reading it from a provided ObjectInputStream.
@@ -211,21 +225,21 @@
* @see AbstractCacheLoader#storeEntireState(ObjectInputStream)
* @see org.jboss.starobrno.marshall.NodeData
*/
- void storeEntireState(ObjectInputStream is) throws Exception;
+ void storeEntireState(ObjectInputStream is);
/**
* Lifecycle method, called when the cache loader is created.
*
* @throws java.lang.Exception
*/
- void create() throws java.lang.Exception;
+ void create();
/**
* Lifecycle method, called when the cache loader is started.
*
* @throws java.lang.Exception
*/
- void start() throws java.lang.Exception;
+ void start();
/**
* Lifecycle method, called when the cache loader is stopped.
16 years, 2 months
- 1
- 0
JBoss Cache SVN: r6953 - core/branches/flat/src/main/java/org/jboss/starobrno.
by jbosscache-commits＠lists.jboss.org
Author: jason.greene(a)jboss.com
Date: 2008-10-14 21:02:20 -0400 (Tue, 14 Oct 2008)
New Revision: 6953
Removed:
core/branches/flat/src/main/java/org/jboss/starobrno/AtomicGroup.java
Modified:
core/branches/flat/src/main/java/org/jboss/starobrno/Cache.java
core/branches/flat/src/main/java/org/jboss/starobrno/CacheDelegate.java
Log:
Remove AtomicGroup
Deleted: core/branches/flat/src/main/java/org/jboss/starobrno/AtomicGroup.java
===================================================================
--- core/branches/flat/src/main/java/org/jboss/starobrno/AtomicGroup.java 2008-10-14 23:18:15 UTC (rev 6952)
+++ core/branches/flat/src/main/java/org/jboss/starobrno/AtomicGroup.java 2008-10-15 01:02:20 UTC (rev 6953)
@@ -1,34 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt 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.jboss.starobrno;
-
-import java.util.concurrent.ConcurrentMap;
-import java.util.HashMap;
-
-/**
- * @author Mircea.Markus(a)jboss.com
- */
-public class AtomicGroup extends HashMap
-{
-
-
-}
Modified: core/branches/flat/src/main/java/org/jboss/starobrno/Cache.java
===================================================================
--- core/branches/flat/src/main/java/org/jboss/starobrno/Cache.java 2008-10-14 23:18:15 UTC (rev 6952)
+++ core/branches/flat/src/main/java/org/jboss/starobrno/Cache.java 2008-10-15 01:02:20 UTC (rev 6953)
@@ -48,10 +48,6 @@
void setInvocationContext(InvocationContext ctx);
- AtomicGroup putAtomicGroup(K key, AtomicGroup group);
-
- AtomicGroup getAtomicGroup(K key);
-
CacheStatus getCacheStatus();
public void startBatch();
Modified: core/branches/flat/src/main/java/org/jboss/starobrno/CacheDelegate.java
===================================================================
--- core/branches/flat/src/main/java/org/jboss/starobrno/CacheDelegate.java 2008-10-14 23:18:15 UTC (rev 6952)
+++ core/branches/flat/src/main/java/org/jboss/starobrno/CacheDelegate.java 2008-10-15 01:02:20 UTC (rev 6953)
@@ -226,16 +226,6 @@
else invocationContextContainer.set(ctx);
}
- public AtomicGroup putAtomicGroup(K key, AtomicGroup group)
- {
- return null; //TODO: Autogenerated. Implement me properly
- }
-
- public AtomicGroup getAtomicGroup(K key)
- {
- return null; //TODO: Autogenerated. Implement me properly
- }
-
public void start()
{
componentRegistry.start();
16 years, 2 months
- 1
- 0
JBoss Cache SVN: r6952 - core/branches/flat/src/main/java/org/jboss/starobrno/marshall.
by jbosscache-commits＠lists.jboss.org
Author: jason.greene(a)jboss.com
Date: 2008-10-14 19:18:15 -0400 (Tue, 14 Oct 2008)
New Revision: 6952
Added:
core/branches/flat/src/main/java/org/jboss/starobrno/marshall/EntryData.java
core/branches/flat/src/main/java/org/jboss/starobrno/marshall/EntryDataExceptionMarker.java
core/branches/flat/src/main/java/org/jboss/starobrno/marshall/EntryDataMarker.java
Log:
Add new entry wrappers
Added: core/branches/flat/src/main/java/org/jboss/starobrno/marshall/EntryData.java
===================================================================
--- core/branches/flat/src/main/java/org/jboss/starobrno/marshall/EntryData.java (rev 0)
+++ core/branches/flat/src/main/java/org/jboss/starobrno/marshall/EntryData.java 2008-10-14 23:18:15 UTC (rev 6952)
@@ -0,0 +1,111 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2000 - 2008, 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.jboss.starobrno.marshall;
+
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Map;
+
+/**
+ * Serializable representation of the data of a node (FQN and attributes)
+ *
+ * @author Bela Ban
+ * @version $Id: NodeData.java 6776 2008-09-22 17:35:46Z manik.surtani(a)jboss.com $
+ */
+// TODO: 3.0.0: remove Externalizable and rely on the CacheMarshaller.
+public class EntryData<K, V> implements Externalizable, Map.Entry<K, V>
+{
+ private K key;
+ private V value;
+
+ static final long serialVersionUID = -7571995794010294485L;
+
+ public EntryData(K key, V value)
+ {
+ this.key = key;
+ this.value = value;
+ }
+
+ public K getKey()
+ {
+ return key;
+ }
+
+ public V getValue()
+ {
+ return value;
+ }
+
+ // TODO: 3.0.0: Remove and replace with marshallNodeData/unmarshallNodeData methods in the CacheMarshaller so that we can use the same marshalling framework for Fqns.
+ public void writeExternal(ObjectOutput out) throws IOException
+ {
+ out.writeObject(key);
+ out.writeObject(value);
+ }
+
+ // TODO: 3.0.0: Remove in and replace with marshallNodeData/unmarshallNodeData methods in the CacheMarshaller so that we can use the same marshalling framework for Fqns.
+ @SuppressWarnings("unchecked")
+ public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException
+ {
+ key = (K) in.readObject();
+ value = (V) in.readObject();
+ }
+
+ @Override
+ public String toString()
+ {
+ return "{" + key + "=" + value + "}";
+ }
+
+ private static boolean eq(Object a, Object b)
+ {
+ return a == b || (a != null && a.equals(b));
+ }
+
+
+ @Override
+ public boolean equals(Object o)
+ {
+ if (this == o) return true;
+ if (! (o instanceof EntryData))
+ return false;
+
+ EntryData<?,?> other = (EntryData<?,?>)o;
+ return eq(key, other.key) && eq(value, other.value);
+ }
+
+ @Override
+ public int hashCode()
+ {
+ int result;
+ result = (key != null ? key.hashCode() : 0);
+ result = 31 * result + (value != null ? value.hashCode() : 0);
+ return result;
+ }
+
+ public V setValue(V value)
+ {
+ throw new UnsupportedOperationException();
+ }
+}
Added: core/branches/flat/src/main/java/org/jboss/starobrno/marshall/EntryDataExceptionMarker.java
===================================================================
--- core/branches/flat/src/main/java/org/jboss/starobrno/marshall/EntryDataExceptionMarker.java (rev 0)
+++ core/branches/flat/src/main/java/org/jboss/starobrno/marshall/EntryDataExceptionMarker.java 2008-10-14 23:18:15 UTC (rev 6952)
@@ -0,0 +1,62 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2000 - 2008, 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.jboss.starobrno.marshall;
+
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+public class EntryDataExceptionMarker implements Externalizable
+{
+ private static final long serialVersionUID = 240199474174502551L;
+ private Throwable cause;
+ private Object cacheNodeIdentity;
+
+ public EntryDataExceptionMarker(Throwable t, Object node)
+ {
+ cause = t;
+ cacheNodeIdentity = node;
+ }
+
+ public Throwable getCause()
+ {
+ return cause;
+ }
+
+ public Object getCacheNodeIdentity()
+ {
+ return cacheNodeIdentity;
+ }
+
+ public void writeExternal(ObjectOutput out) throws IOException
+ {
+ out.writeObject(cause);
+ out.writeObject(cacheNodeIdentity);
+ }
+
+ public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException
+ {
+ cause = (Throwable) in.readObject();
+ cacheNodeIdentity = in.readObject();
+ }
+}
\ No newline at end of file
Added: core/branches/flat/src/main/java/org/jboss/starobrno/marshall/EntryDataMarker.java
===================================================================
--- core/branches/flat/src/main/java/org/jboss/starobrno/marshall/EntryDataMarker.java (rev 0)
+++ core/branches/flat/src/main/java/org/jboss/starobrno/marshall/EntryDataMarker.java 2008-10-14 23:18:15 UTC (rev 6952)
@@ -0,0 +1,29 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2000 - 2008, 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.jboss.starobrno.marshall;
+
+import java.io.Serializable;
+
+public class EntryDataMarker implements Serializable
+{
+ private static final long serialVersionUID = 4851793846346021014L;
+}
16 years, 2 months
- 1
- 0
JBoss Cache SVN: r6951 - in core/tags/2.2.1.CR2: src/main/java/org/jboss/cache and 1 other directory.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2008-10-14 18:55:32 -0400 (Tue, 14 Oct 2008)
New Revision: 6951
Modified:
core/tags/2.2.1.CR2/pom.xml
core/tags/2.2.1.CR2/src/main/java/org/jboss/cache/Version.java
Log:
Modified: core/tags/2.2.1.CR2/pom.xml
===================================================================
--- core/tags/2.2.1.CR2/pom.xml 2008-10-14 22:53:36 UTC (rev 6950)
+++ core/tags/2.2.1.CR2/pom.xml 2008-10-14 22:55:32 UTC (rev 6951)
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<properties>
- <jbosscache-core-version>2.2.0-SNAPSHOT</jbosscache-core-version>
+ <jbosscache-core-version>2.2.1.CR2</jbosscache-core-version>
<!-- By default only run tests in the "unit" group -->
<defaultTestGroup>unit</defaultTestGroup>
<!-- By default only generate Javadocs when we install the module. -->
@@ -412,7 +412,7 @@
<activeByDefault>false</activeByDefault>
</activation>
<properties>
- <jbosscache-core-version>2.2.0-SNAPSHOT-JBossAS</jbosscache-core-version>
+ <jbosscache-core-version>2.2.1.CR2-JBossAS</jbosscache-core-version>
<defaultTestGroup>functional,unit</defaultTestGroup>
</properties>
<dependencies>
Modified: core/tags/2.2.1.CR2/src/main/java/org/jboss/cache/Version.java
===================================================================
--- core/tags/2.2.1.CR2/src/main/java/org/jboss/cache/Version.java 2008-10-14 22:53:36 UTC (rev 6950)
+++ core/tags/2.2.1.CR2/src/main/java/org/jboss/cache/Version.java 2008-10-14 22:55:32 UTC (rev 6951)
@@ -11,10 +11,10 @@
@Immutable
public class Version
{
- public static final String version = "2.2.0-SNAPSHOT";
+ public static final String version = "2.2.1.CR2";
public static final String codename = "Poblano";
//public static final String cvs = "$Id: Version.java 4592 2007-10-10 16:44:36Z manik.surtani(a)jboss.com $";
- static final byte[] version_id = {'0', '2', '2', '0', 'S'};
+ static final byte[] version_id = {'0', '2', '2', '1', 'C', '2'};
private static final int MAJOR_SHIFT = 11;
private static final int MINOR_SHIFT = 6;
16 years, 2 months
- 1
- 0