[infinispan-commits] Infinispan SVN: r1521 - in trunk: cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje and 31 other directories.
infinispan-commits at lists.jboss.org
infinispan-commits at lists.jboss.org
Fri Feb 19 08:22:21 EST 2010
Author: manik.surtani at jboss.com
Date: 2010-02-19 08:22:18 -0500 (Fri, 19 Feb 2010)
New Revision: 1521
Modified:
trunk/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/BdbjeCacheStore.java
trunk/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/BdbjeCacheStoreConfigTest.java
trunk/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/BdbjeCacheStoreTest.java
trunk/cachestore/cloud/src/test/java/org/infinispan/loaders/cloud/CloudCacheStoreTest.java
trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/JdbcUtil.java
trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/TableManipulation.java
trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/binary/JdbcBinaryCacheStore.java
trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/binary/JdbcBinaryCacheStoreConfig.java
trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/ManagedConnectionFactory.java
trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStore.java
trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/stringbased/JdbcStringBasedCacheStore.java
trunk/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStoreConfigTest.java
trunk/core/src/main/java/org/infinispan/AbstractDelegatingCache.java
trunk/core/src/main/java/org/infinispan/atomic/AtomicHashMapDelta.java
trunk/core/src/main/java/org/infinispan/config/CustomInterceptorConfig.java
trunk/core/src/main/java/org/infinispan/context/impl/AbstractInvocationContext.java
trunk/core/src/main/java/org/infinispan/factories/AbstractComponentRegistry.java
trunk/core/src/main/java/org/infinispan/interceptors/DeadlockDetectingInterceptor.java
trunk/core/src/main/java/org/infinispan/interceptors/base/BaseRpcInterceptor.java
trunk/core/src/main/java/org/infinispan/jmx/AbstractJmxRegistration.java
trunk/core/src/main/java/org/infinispan/jmx/CacheJmxRegistration.java
trunk/core/src/main/java/org/infinispan/jmx/CacheManagerJmxRegistration.java
trunk/core/src/main/java/org/infinispan/loaders/CacheLoaderConfig.java
trunk/core/src/main/java/org/infinispan/marshall/AbstractMarshaller.java
trunk/core/src/main/java/org/infinispan/transaction/tm/BatchModeTransactionManager.java
trunk/core/src/main/java/org/infinispan/transaction/tm/DummyTransaction.java
trunk/core/src/main/java/org/infinispan/transaction/xa/DeadlockDetectingGlobalTransaction.java
trunk/core/src/main/java/org/infinispan/transaction/xa/GlobalTransactionFactory.java
trunk/core/src/main/java/org/infinispan/transaction/xa/RemoteTransaction.java
trunk/core/src/main/java/org/infinispan/transaction/xa/TransactionTable.java
trunk/core/src/main/java/org/infinispan/transaction/xa/TransactionXaAdapter.java
trunk/core/src/main/java/org/infinispan/util/BidirectionalLinkedHashMap.java
trunk/core/src/main/java/org/infinispan/util/concurrent/locks/DeadlockDetectingLockManager.java
trunk/core/src/main/resources/xslt/coherence35x2infinispan4x.xslt
trunk/core/src/test/java/org/infinispan/config/ConfigurationValidation2Test.java
trunk/core/src/test/java/org/infinispan/config/ConfigurationValidationTest.java
trunk/core/src/test/java/org/infinispan/eviction/BaseEvictionFunctionalTest.java
trunk/core/src/test/java/org/infinispan/jmx/ActivationAndPassivationInterceptorMBeanTest.java
trunk/core/src/test/java/org/infinispan/loaders/AbstractCacheStoreTest.java
trunk/core/src/test/java/org/infinispan/loaders/BaseCacheStoreTest.java
trunk/core/src/test/java/org/infinispan/loaders/decorators/AsyncTest.java
trunk/core/src/test/java/org/infinispan/profiling/ProfileTest.java
trunk/core/src/test/java/org/infinispan/test/fwk/TestCacheManagerFactory.java
trunk/core/src/test/java/org/infinispan/test/testng/UnitTestTestNGListener.java
trunk/core/src/test/java/org/infinispan/util/BidirectionalLinkedHashMapTest.java
Log:
Typos and javadocs
Modified: trunk/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/BdbjeCacheStore.java
===================================================================
--- trunk/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/BdbjeCacheStore.java 2010-02-19 12:41:06 UTC (rev 1520)
+++ trunk/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/BdbjeCacheStore.java 2010-02-19 13:22:18 UTC (rev 1521)
@@ -425,9 +425,9 @@
/**
* {@inheritDoc} This implementation reads the number of entries to load from the stream, then begins a transaction.
- * During that tranasaction, the cachestore is cleared and replaced with entries from the stream. If there are any
+ * During that transaction, the cachestore is cleared and replaced with entries from the stream. If there are any
* errors during the process, the entire transaction is rolled back. Deadlock handling is not addressed, as there is
- * no means to rollback reads from the inputstream.
+ * no means to rollback reads from the input stream.
*
* @see BdbjeCacheStore#toStream(java.io.ObjectOutput)
*/
Modified: trunk/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/BdbjeCacheStoreConfigTest.java
===================================================================
--- trunk/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/BdbjeCacheStoreConfigTest.java 2010-02-19 12:41:06 UTC (rev 1520)
+++ trunk/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/BdbjeCacheStoreConfigTest.java 2010-02-19 13:22:18 UTC (rev 1521)
@@ -33,7 +33,7 @@
}
@Test
- public void testgetMaxTxRetries() {
+ public void testGetMaxTxRetries() {
assert config.getMaxTxRetries() == 5;
}
Modified: trunk/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/BdbjeCacheStoreTest.java
===================================================================
--- trunk/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/BdbjeCacheStoreTest.java 2010-02-19 12:41:06 UTC (rev 1520)
+++ trunk/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/BdbjeCacheStoreTest.java 2010-02-19 13:22:18 UTC (rev 1521)
@@ -186,7 +186,7 @@
verifyAll();
}
- public void testExceptionClosingCacheDatabaseDoesntPreventEnvironmentFromClosing() throws Exception {
+ public void testExceptionClosingCacheDatabaseDoesNotPreventEnvironmentFromClosing() throws Exception {
start();
cacheDb.close();
expiryDb.close();
@@ -200,7 +200,7 @@
verifyAll();
}
- public void testExceptionClosingCatalogDoesntPreventEnvironmentFromClosing() throws Exception {
+ public void testExceptionClosingCatalogDoesNotPreventEnvironmentFromClosing() throws Exception {
start();
cacheDb.close();
expiryDb.close();
Modified: trunk/cachestore/cloud/src/test/java/org/infinispan/loaders/cloud/CloudCacheStoreTest.java
===================================================================
--- trunk/cachestore/cloud/src/test/java/org/infinispan/loaders/cloud/CloudCacheStoreTest.java 2010-02-19 12:41:06 UTC (rev 1520)
+++ trunk/cachestore/cloud/src/test/java/org/infinispan/loaders/cloud/CloudCacheStoreTest.java 2010-02-19 13:22:18 UTC (rev 1521)
@@ -140,7 +140,7 @@
@Override
@Test(enabled = false, description = "Disabled until we can build the blobstore stub to retain state somewhere.")
- public void testStopStartDoesntNukeValues() throws InterruptedException, CacheLoaderException {
+ public void testStopStartDoesNotNukeValues() throws InterruptedException, CacheLoaderException {
}
Modified: trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/JdbcUtil.java
===================================================================
--- trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/JdbcUtil.java 2010-02-19 12:41:06 UTC (rev 1520)
+++ trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/JdbcUtil.java 2010-02-19 13:22:18 UTC (rev 1521)
@@ -87,7 +87,7 @@
try {
return marshaller.objectFromInputStream(inputStream);
} catch (IOException e) {
- String message = "I/O error while unmarshalling from stram";
+ String message = "I/O error while unmarshalling from stream";
log.error(message, e);
throw new CacheLoaderException(message, e);
} catch (ClassNotFoundException e) {
Modified: trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/TableManipulation.java
===================================================================
--- trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/TableManipulation.java 2010-02-19 12:41:06 UTC (rev 1520)
+++ trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/TableManipulation.java 2010-02-19 13:22:18 UTC (rev 1521)
@@ -133,7 +133,7 @@
catch (SQLException e) {
// This should not happen. A J2EE compatible JDBC driver is
// required fully support meta data.
- throw new CacheLoaderException("Error while checking if table aleady exists " + tableName, e);
+ throw new CacheLoaderException("Error while checking if table already exists " + tableName, e);
}
finally {
JdbcUtil.safeClose(rs);
@@ -143,13 +143,13 @@
public void createTable(Connection conn) throws CacheLoaderException {
// removed CONSTRAINT clause as this causes problems with some databases, like Informix.
assertMandatoryElementsPresent();
- String creatTableDdl = "CREATE TABLE " + getTableName() + "(" + idColumnName + " " + idColumnType
+ String createTableDdl = "CREATE TABLE " + getTableName() + "(" + idColumnName + " " + idColumnType
+ " NOT NULL, " + dataColumnName + " " + dataColumnType + ", "
+ timestampColumnName + " " + timestampColumnType +
", PRIMARY KEY (" + idColumnName + "))";
if (log.isTraceEnabled())
- log.trace("Creating table with following DDL: '" + creatTableDdl + "'.");
- executeUpdateSql(conn, creatTableDdl);
+ log.trace("Creating table with following DDL: '" + createTableDdl + "'.");
+ executeUpdateSql(conn, createTableDdl);
}
private void assertMandatoryElementsPresent() throws CacheLoaderException {
Modified: trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/binary/JdbcBinaryCacheStore.java
===================================================================
--- trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/binary/JdbcBinaryCacheStore.java 2010-02-19 12:41:06 UTC (rev 1520)
+++ trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/binary/JdbcBinaryCacheStore.java 2010-02-19 13:22:18 UTC (rev 1521)
@@ -90,7 +90,7 @@
public void start() throws CacheLoaderException {
super.start();
String connectionFactoryClass = config.getConnectionFactoryConfig().getConnectionFactoryClass();
- if (config.isManageConnectionFatory()) {
+ if (config.isManageConnectionFactory()) {
ConnectionFactory factory = ConnectionFactory.getConnectionFactory(connectionFactoryClass);
factory.start(config.getConnectionFactoryConfig());
doConnectionFactoryInitialization(factory);
@@ -130,7 +130,7 @@
public void stop() throws CacheLoaderException {
tableManipulation.stop();
- if (config.isManageConnectionFatory()) {
+ if (config.isManageConnectionFactory()) {
connectionFactory.stop();
}
}
Modified: trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/binary/JdbcBinaryCacheStoreConfig.java
===================================================================
--- trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/binary/JdbcBinaryCacheStoreConfig.java 2010-02-19 12:41:06 UTC (rev 1520)
+++ trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/binary/JdbcBinaryCacheStoreConfig.java 2010-02-19 13:22:18 UTC (rev 1521)
@@ -53,7 +53,7 @@
cacheLoaderClassName = JdbcBinaryCacheStore.class.getName();
}
- boolean isManageConnectionFatory() {
+ boolean isManageConnectionFactory() {
return createConnectionFatory;
}
Modified: trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/ManagedConnectionFactory.java
===================================================================
--- trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/ManagedConnectionFactory.java 2010-02-19 12:41:06 UTC (rev 1520)
+++ trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/ManagedConnectionFactory.java 2010-02-19 13:22:18 UTC (rev 1521)
@@ -56,7 +56,7 @@
ctx = new InitialContext();
dataSource = (DataSource) ctx.lookup(datasourceName);
if (trace) {
- log.trace("Datasource lookup for " + datasourceName + " succeded: " + dataSource);
+ log.trace("Datasource lookup for " + datasourceName + " succeeded: " + dataSource);
}
if (dataSource == null) {
String msg = "Could not find a connection in jndi under the name '" + datasourceName + "'";
Modified: trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStore.java
===================================================================
--- trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStore.java 2010-02-19 12:41:06 UTC (rev 1520)
+++ trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStore.java 2010-02-19 13:22:18 UTC (rev 1521)
@@ -43,13 +43,13 @@
* (sometimes both, see below) based on the passed in key. In order to determine which store to use it will rely on the
* configured {@link org.infinispan.loaders.jdbc.stringbased.Key2StringMapper} )(see configuration).
* <p/>
- * The advantage it brings is the possibility of efficiently storing string(able) keyd {@link
+ * The advantage it brings is the possibility of efficiently storing string(able) keyed {@link
* org.infinispan.container.entries.InternalCacheEntry}s, and at the same time being able to store any other keys, a la
* {@link org.infinispan.loaders.jdbc.binary.JdbcBinaryCacheStore}.
* <p/>
* There will only be a performance cost for the aggregate operations: loadAll, fromStream, toStream and clear. For
* these operations there will be two distinct database call, one for each JdbcStore implementation. Most of application
- * are only using these operations at lifecycles changes (e.g. fromStram and toStream at cluster join time, loadAll at
+ * are only using these operations at lifecycles changes (e.g. fromStream and toStream at cluster join time, loadAll at
* startup for warm caches), so performance drawback shouldn't be significant (again, most of the cases).
* <p/>
* Resource sharing - both aggregated cache loaders have locks and connection pools. The locking is not shared, each
Modified: trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/stringbased/JdbcStringBasedCacheStore.java
===================================================================
--- trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/stringbased/JdbcStringBasedCacheStore.java 2010-02-19 12:41:06 UTC (rev 1520)
+++ trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/stringbased/JdbcStringBasedCacheStore.java 2010-02-19 13:22:18 UTC (rev 1521)
@@ -263,7 +263,7 @@
}
return null;
} catch (SQLException e) {
- String message = "SQL error while fetching strored entry with key:" + key + " lockingKey: " + lockingKey;
+ String message = "SQL error while fetching stored entry with key:" + key + " lockingKey: " + lockingKey;
log.error(message, e);
throw new CacheLoaderException(message, e);
} finally {
Modified: trunk/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStoreConfigTest.java
===================================================================
--- trunk/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStoreConfigTest.java 2010-02-19 12:41:06 UTC (rev 1520)
+++ trunk/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStoreConfigTest.java 2010-02-19 13:22:18 UTC (rev 1521)
@@ -68,7 +68,7 @@
config.setTableNamePrefixForBinary("table");
try {
config.setTableNamePrefixForStrings("table");
- assert false : "expection expected as same table name is not allowed for both cache stores";
+ assert false : "exception expected as same table name is not allowed for both cache stores";
} catch (Exception e) {
//expected
}
@@ -76,7 +76,7 @@
config.setTableNamePrefixForStrings("table2");
try {
config.setTableNamePrefixForBinary("table2");
- assert false : "expection expected as same table name is not allowed for both cache stores";
+ assert false : "exception expected as same table name is not allowed for both cache stores";
} catch (Exception e) {
//expected
}
@@ -101,7 +101,7 @@
assert config.getStringCacheStoreConfig().isPurgeSynchronously();
}
- public void voidTestLockAquisitionTimeout() {
+ public void voidTestLockAcquisitionTimeout() {
assert config.getStringCacheStoreConfig().getLockAcquistionTimeout() == LockSupportCacheStoreConfig.DEFAULT_LOCK_ACQUISITION_TIMEOUT;
assert config.getBinaryCacheStoreConfig().getLockAcquistionTimeout() == LockSupportCacheStoreConfig.DEFAULT_LOCK_ACQUISITION_TIMEOUT;
config.setLockAcquistionTimeout(13);
Modified: trunk/core/src/main/java/org/infinispan/AbstractDelegatingCache.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/AbstractDelegatingCache.java 2010-02-19 12:41:06 UTC (rev 1520)
+++ trunk/core/src/main/java/org/infinispan/AbstractDelegatingCache.java 2010-02-19 13:22:18 UTC (rev 1521)
@@ -13,7 +13,7 @@
/**
* This is a convenient base class for implementing a cache delegate. The only constructor takes a {@link Cache}
* argument, to which each method call is delegated. One can extend this class and override the method sub-set it is
- * interested in. There is also an similar implmentation for {@link org.infinispan.AdvancedCache}: {@link
+ * interested in. There is also an similar implementation for {@link org.infinispan.AdvancedCache}: {@link
* org.infinispan.AbstractDelegatingAdvancedCache}.
*
* @author Mircea.Markus at jboss.com
Modified: trunk/core/src/main/java/org/infinispan/atomic/AtomicHashMapDelta.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/atomic/AtomicHashMapDelta.java 2010-02-19 12:41:06 UTC (rev 1520)
+++ trunk/core/src/main/java/org/infinispan/atomic/AtomicHashMapDelta.java 2010-02-19 13:22:18 UTC (rev 1521)
@@ -46,7 +46,7 @@
private static final Log log = LogFactory.getLog(AtomicHashMapDelta.class);
private static final boolean trace = log.isTraceEnabled();
- private List<Operation> changelog;
+ private List<Operation> changeLog;
public DeltaAware merge(DeltaAware d) {
AtomicHashMap other;
@@ -55,41 +55,41 @@
else
other = new AtomicHashMap();
- for (Operation o : changelog) o.replay(other.delegate);
+ for (Operation o : changeLog) o.replay(other.delegate);
other.commit();
return other;
}
public void addOperation(Operation o) {
- if (changelog == null) {
+ if (changeLog == null) {
// lazy init
- changelog = new LinkedList<Operation>();
+ changeLog = new LinkedList<Operation>();
}
- changelog.add(o);
+ changeLog.add(o);
}
@Override
public String toString() {
return "AtomicHashMapDelta{" +
- "changelog=" + changelog +
+ "changeLog=" + changeLog +
'}';
}
public int getChangeLogSize() {
- return changelog == null ? 0 : changelog.size();
+ return changeLog == null ? 0 : changeLog.size();
}
public static class Externalizer implements org.infinispan.marshall.Externalizer {
public void writeObject(ObjectOutput output, Object object) throws IOException {
AtomicHashMapDelta delta = (AtomicHashMapDelta) object;
- if (trace) log.trace("Serializing changelog " + delta.changelog);
- output.writeObject(delta.changelog);
+ if (trace) log.trace("Serializing changeLog " + delta.changeLog);
+ output.writeObject(delta.changeLog);
}
public Object readObject(ObjectInput input) throws IOException, ClassNotFoundException {
AtomicHashMapDelta delta = new AtomicHashMapDelta();
- delta.changelog = (List<Operation>) input.readObject();
- if (trace) log.trace("Deserialized changelog " + delta.changelog);
+ delta.changeLog = (List<Operation>) input.readObject();
+ if (trace) log.trace("Deserialized changeLog " + delta.changeLog);
return delta;
}
}
Modified: trunk/core/src/main/java/org/infinispan/config/CustomInterceptorConfig.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/config/CustomInterceptorConfig.java 2010-02-19 12:41:06 UTC (rev 1520)
+++ trunk/core/src/main/java/org/infinispan/config/CustomInterceptorConfig.java 2010-02-19 13:22:18 UTC (rev 1521)
@@ -89,7 +89,7 @@
@XmlAttribute
protected Position position;
- /** @configRef name="class",desc="Fully qualified intereceptor class name which must extend org.infinispan.interceptors.base.CommandInterceptor." */
+ /** @configRef name="class",desc="Fully qualified interceptor class name which must extend org.infinispan.interceptors.base.CommandInterceptor." */
@XmlAttribute(name="class")
protected String className;
@@ -183,7 +183,7 @@
}
/**
- * Shall this intercepto be the last one in the chain?
+ * Shall this interceptor be the last one in the chain?
*/
public void setLast(boolean last) {
testImmutability("last");
@@ -204,7 +204,7 @@
}
/**
- * Adds the interceptor immediately after the first occurance of an interceptor having the given class. If the chain
+ * Adds the interceptor immediately after the first occurrence of an interceptor having the given class. If the chain
* does not contain such an interceptor then this interceptor definition is ignored.
*/
public void setAfterInterceptor(String afterClass) {
@@ -213,7 +213,7 @@
}
/**
- * Adds the interceptor immediately after the first occurance of an interceptor having the given class. If the chain
+ * Adds the interceptor immediately after the first occurrence of an interceptor having the given class. If the chain
* does not contain such an interceptor then this interceptor definition is ignored.
*/
public void setAfterInterceptor(Class<? extends CommandInterceptor> interceptorClass) {
@@ -221,7 +221,7 @@
}
/**
- * Adds the interceptor immediately before the first occurance of an interceptor having the given class. If the chain
+ * Adds the interceptor immediately before the first occurrence of an interceptor having the given class. If the chain
* does not contain such an interceptor then this interceptor definition is ignored.
*/
public void setBeforeInterceptor(String beforeClass) {
@@ -230,7 +230,7 @@
}
/**
- * Adds the interceptor immediately before the first occurance of an interceptor having the given class. If the chain
+ * Adds the interceptor immediately before the first occurrence of an interceptor having the given class. If the chain
* does not contain such an interceptor then this interceptor definition is ignored.
*/
public void setBeforeInterceptor(Class<? extends CommandInterceptor> interceptorClass) {
Modified: trunk/core/src/main/java/org/infinispan/context/impl/AbstractInvocationContext.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/context/impl/AbstractInvocationContext.java 2010-02-19 12:41:06 UTC (rev 1520)
+++ trunk/core/src/main/java/org/infinispan/context/impl/AbstractInvocationContext.java 2010-02-19 13:22:18 UTC (rev 1521)
@@ -50,7 +50,7 @@
}
/**
- * Unility method that sets a given context flag.
+ * Utility method that sets a given context flag.
*
* @param flag context flag to set
*/
@@ -59,7 +59,7 @@
}
/**
- * Utility method that unsets a context flag.
+ * Utility method that un-sets a context flag.
*
* @param flag context flag to unset
*/
@@ -68,7 +68,7 @@
}
/**
- * Utility value that sets or unsets a context flag based on a boolean passed in
+ * Utility value that sets or un-sets a context flag based on a boolean passed in
*
* @param flag flag to set or unset
* @param set if true, the context flag is set. If false, the context flag is unset.
Modified: trunk/core/src/main/java/org/infinispan/factories/AbstractComponentRegistry.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/factories/AbstractComponentRegistry.java 2010-02-19 12:41:06 UTC (rev 1520)
+++ trunk/core/src/main/java/org/infinispan/factories/AbstractComponentRegistry.java 2010-02-19 13:22:18 UTC (rev 1521)
@@ -72,7 +72,7 @@
* org.infinispan.Cache#start()} is called</li> <li>STOPPED - when {@link org.infinispan.Cache#stop()} is called</li>
* </ul>
* <p/>
- * Cache configuration can only be changed and will only be reinjected if the cache is not in the {@link
+ * Cache configuration can only be changed and will only be re-injected if the cache is not in the {@link
* org.infinispan.lifecycle.ComponentStatus#RUNNING} state.
*
* @author Manik Surtani
@@ -256,9 +256,9 @@
return name;
}
- private String findComponentName(Annotation[] anns) {
- if (anns != null && anns.length > 0) {
- for (Annotation a : anns) {
+ private String findComponentName(Annotation[] annotations) {
+ if (annotations != null && annotations.length > 0) {
+ for (Annotation a : annotations) {
if (a instanceof ComponentName) {
return ((ComponentName) a).value();
}
@@ -484,7 +484,7 @@
*/
public void registerDefaultClassLoader(ClassLoader loader) {
registerComponent(loader == null ? getClass().getClassLoader() : loader, ClassLoader.class);
- // make sure the class loaderold is non-volatile, so it survives restarts.
+ // make sure the class loader is non-volatile, so it survives restarts.
componentLookup.get(ClassLoader.class.getName()).nonVolatile = true;
}
@@ -634,7 +634,7 @@
// ------------------------------ START: Actual internal lifecycle methods --------------------------------
/**
- * Sets the cacheStatus to FAILED and rethrows the problem as one of the declared types. Converts any
+ * Sets the cacheStatus to FAILED and re-throws the problem as one of the declared types. Converts any
* non-RuntimeException Exception to CacheException.
*
* @param t throwable thrown during failure
Modified: trunk/core/src/main/java/org/infinispan/interceptors/DeadlockDetectingInterceptor.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/interceptors/DeadlockDetectingInterceptor.java 2010-02-19 12:41:06 UTC (rev 1520)
+++ trunk/core/src/main/java/org/infinispan/interceptors/DeadlockDetectingInterceptor.java 2010-02-19 13:22:18 UTC (rev 1521)
@@ -63,7 +63,7 @@
private Object handleDataCommand(InvocationContext ctx, DataCommand command) throws Throwable {
if (ctx.isInTxScope()) {
DeadlockDetectingGlobalTransaction gtx = (DeadlockDetectingGlobalTransaction) ctx.getLockOwner();
- gtx.setLockInterntion(command.getKey());
+ gtx.setLockIntention(command.getKey());
gtx.setProcessingThread(Thread.currentThread());
}
try {
Modified: trunk/core/src/main/java/org/infinispan/interceptors/base/BaseRpcInterceptor.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/interceptors/base/BaseRpcInterceptor.java 2010-02-19 12:41:06 UTC (rev 1520)
+++ trunk/core/src/main/java/org/infinispan/interceptors/base/BaseRpcInterceptor.java 2010-02-19 13:22:18 UTC (rev 1521)
@@ -30,7 +30,7 @@
import org.infinispan.remoting.rpc.RpcManager;
/**
- * Acts as a base for all RPC calls - subclassed by
+ * Acts as a base for all RPC calls
*
* @author <a href="mailto:manik at jboss.org">Manik Surtani (manik at jboss.org)</a>
* @author Mircea.Markus at jboss.com
Modified: trunk/core/src/main/java/org/infinispan/jmx/AbstractJmxRegistration.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/jmx/AbstractJmxRegistration.java 2010-02-19 12:41:06 UTC (rev 1520)
+++ trunk/core/src/main/java/org/infinispan/jmx/AbstractJmxRegistration.java 2010-02-19 13:22:18 UTC (rev 1521)
@@ -45,17 +45,17 @@
MBeanServer mBeanServer;
GlobalConfiguration globalConfig;
- protected abstract ComponentsJmxRegistration buildRegistrator(Set<AbstractComponentRegistry.Component> components);
+ protected abstract ComponentsJmxRegistration buildRegistrar(Set<AbstractComponentRegistry.Component> components);
protected void registerMBeans(Set<AbstractComponentRegistry.Component> components, GlobalConfiguration globalConfig) {
mBeanServer = getMBeanServer(globalConfig);
- ComponentsJmxRegistration registrator = buildRegistrator(components);
- registrator.registerMBeans();
+ ComponentsJmxRegistration registrar = buildRegistrar(components);
+ registrar.registerMBeans();
}
protected void unregisterMBeans(Set<AbstractComponentRegistry.Component> components) {
- ComponentsJmxRegistration registrator = buildRegistrator(components);
- registrator.unregisterMBeans();
+ ComponentsJmxRegistration registrar = buildRegistrar(components);
+ registrar.unregisterMBeans();
}
protected MBeanServer getMBeanServer(GlobalConfiguration configuration) {
Modified: trunk/core/src/main/java/org/infinispan/jmx/CacheJmxRegistration.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/jmx/CacheJmxRegistration.java 2010-02-19 12:41:06 UTC (rev 1520)
+++ trunk/core/src/main/java/org/infinispan/jmx/CacheJmxRegistration.java 2010-02-19 13:22:18 UTC (rev 1521)
@@ -123,13 +123,13 @@
@Override
- protected ComponentsJmxRegistration buildRegistrator(Set<AbstractComponentRegistry.Component> components) {
- ComponentsJmxRegistration registrator = new ComponentsJmxRegistration(mBeanServer, components, getGroupName());
- updateDomain(registrator, cache.getComponentRegistry().getGlobalComponentRegistry(), mBeanServer);
- return registrator;
+ protected ComponentsJmxRegistration buildRegistrar(Set<AbstractComponentRegistry.Component> components) {
+ ComponentsJmxRegistration registrar = new ComponentsJmxRegistration(mBeanServer, components, getGroupName());
+ updateDomain(registrar, cache.getComponentRegistry().getGlobalComponentRegistry(), mBeanServer);
+ return registrar;
}
- protected void updateDomain(ComponentsJmxRegistration registrator, GlobalComponentRegistry componentRegistry, MBeanServer mBeanServer) {
+ protected void updateDomain(ComponentsJmxRegistration registrar, GlobalComponentRegistry componentRegistry, MBeanServer mBeanServer) {
GlobalConfiguration gc = componentRegistry.getComponent(GlobalConfiguration.class);
CacheManagerJmxRegistration managerJmxReg = componentRegistry.getComponent(CacheManagerJmxRegistration.class);
if (!gc.isExposeGlobalJmxStatistics() && jmxDomain == null) {
@@ -156,7 +156,7 @@
// when cache manager was started, so no need for synchronization here.
jmxDomain = managerJmxReg.jmxDomain == null ? gc.getJmxDomain() : managerJmxReg.jmxDomain;
}
- registrator.setJmxDomain(jmxDomain);
+ registrar.setJmxDomain(jmxDomain);
}
protected Set<Component> getNonCacheComponents(Set<Component> components) {
Modified: trunk/core/src/main/java/org/infinispan/jmx/CacheManagerJmxRegistration.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/jmx/CacheManagerJmxRegistration.java 2010-02-19 12:41:06 UTC (rev 1520)
+++ trunk/core/src/main/java/org/infinispan/jmx/CacheManagerJmxRegistration.java 2010-02-19 13:22:18 UTC (rev 1521)
@@ -54,13 +54,13 @@
}
@Override
- protected ComponentsJmxRegistration buildRegistrator(Set<AbstractComponentRegistry.Component> components) {
- ComponentsJmxRegistration registrator = new ComponentsJmxRegistration(mBeanServer, components, GLOBAL_JMX_GROUP);
- updateDomain(registrator, globalReg, mBeanServer);
- return registrator;
+ protected ComponentsJmxRegistration buildRegistrar(Set<AbstractComponentRegistry.Component> components) {
+ ComponentsJmxRegistration registrar = new ComponentsJmxRegistration(mBeanServer, components, GLOBAL_JMX_GROUP);
+ updateDomain(registrar, globalReg, mBeanServer);
+ return registrar;
}
- protected void updateDomain(ComponentsJmxRegistration registrator, GlobalComponentRegistry componentRegistry, MBeanServer mBeanServer) {
+ protected void updateDomain(ComponentsJmxRegistration registrar, GlobalComponentRegistry componentRegistry, MBeanServer mBeanServer) {
if (jmxDomain == null) {
jmxDomain = getJmxDomain(globalConfig.getJmxDomain(), mBeanServer);
String configJmxDomain = globalConfig.getJmxDomain();
@@ -72,7 +72,7 @@
throw new JmxDomainConflictException(message);
}
}
- registrator.setJmxDomain(jmxDomain);
+ registrar.setJmxDomain(jmxDomain);
}
}
Modified: trunk/core/src/main/java/org/infinispan/loaders/CacheLoaderConfig.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/loaders/CacheLoaderConfig.java 2010-02-19 12:41:06 UTC (rev 1520)
+++ trunk/core/src/main/java/org/infinispan/loaders/CacheLoaderConfig.java 2010-02-19 13:22:18 UTC (rev 1521)
@@ -37,11 +37,11 @@
void setCacheLoaderClassName(String s);
}
-class CacheLoaderInvocationhandler implements InvocationHandler {
+class CacheLoaderInvocationHandler implements InvocationHandler {
private AbstractCacheStoreConfig acsc;
- public CacheLoaderInvocationhandler(AbstractCacheStoreConfig acsc) {
+ public CacheLoaderInvocationHandler(AbstractCacheStoreConfig acsc) {
super();
this.acsc = acsc;
}
Modified: trunk/core/src/main/java/org/infinispan/marshall/AbstractMarshaller.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/AbstractMarshaller.java 2010-02-19 12:41:06 UTC (rev 1520)
+++ trunk/core/src/main/java/org/infinispan/marshall/AbstractMarshaller.java 2010-02-19 13:22:18 UTC (rev 1521)
@@ -14,7 +14,7 @@
public abstract class AbstractMarshaller implements Marshaller {
public Object objectFromInputStream(InputStream inputStream) throws IOException, ClassNotFoundException {
- // TODO: available() call commented until https://issues.apache.org/jira/browse/HTTPCORE-199 httcore-nio issue is fixed.
+ // TODO: available() call commented until https://issues.apache.org/jira/browse/HTTPCORE-199 httpcore-nio issue is fixed.
// int len = inputStream.available();
int len = 1024;
ExposedByteArrayOutputStream bytes = new ExposedByteArrayOutputStream(len);
Modified: trunk/core/src/main/java/org/infinispan/transaction/tm/BatchModeTransactionManager.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/transaction/tm/BatchModeTransactionManager.java 2010-02-19 12:41:06 UTC (rev 1520)
+++ trunk/core/src/main/java/org/infinispan/transaction/tm/BatchModeTransactionManager.java 2010-02-19 13:22:18 UTC (rev 1521)
@@ -26,11 +26,9 @@
/**
* Not really a transaction manager in the truest sense of the word. Only used to batch up operations. Proper
- * transactional symantics of rollbacks and recovery are NOT used here.
+ * transactional semantics of rollbacks and recovery are NOT used here.
*
* @author bela
- * <p/>
- * Date: May 15, 2003 Time: 4:11:37 PM
* @since 4.0
*/
public class BatchModeTransactionManager extends DummyBaseTransactionManager {
Modified: trunk/core/src/main/java/org/infinispan/transaction/tm/DummyTransaction.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/transaction/tm/DummyTransaction.java 2010-02-19 12:41:06 UTC (rev 1520)
+++ trunk/core/src/main/java/org/infinispan/transaction/tm/DummyTransaction.java 2010-02-19 13:22:18 UTC (rev 1521)
@@ -88,7 +88,7 @@
//2) shall we rollback?
if (status == Status.STATUS_MARKED_ROLLBACK || status == Status.STATUS_ROLLING_BACK) {
runRollback();
- throw new RollbackException("Exception rollbacked, status is: " + status);
+ throw new RollbackException("Exception rolled back, status is: " + status);
}
//3) if we reached this point then we shall go on and commit
@@ -99,7 +99,7 @@
} catch (HeuristicMixedException e) {
status = Status.STATUS_UNKNOWN;
} finally {
- //notify syncronizations
+ //notify synchronizations
notifyAfterCompletion(status);
}
}
@@ -119,10 +119,6 @@
*/
public void rollback() throws IllegalStateException, SystemException {
try {
- // JBCACHE-360 -- to match JBossTM (and presumable the spec) a
- // rollback transaction should have status ROLLEDBACK before
- // calling afterCompletion().
- //status=Status.STATUS_ROLLING_BACK;
status = Status.STATUS_ROLLING_BACK;
runRollback();
status = Status.STATUS_ROLLEDBACK;
@@ -178,10 +174,10 @@
}
/**
- * Delist an XA resource from this transaction.
+ * De-list an XA resource from this transaction.
*
- * @return <code>true</code> if the resource could be delisted from this transaction, otherwise <code>false</code>.
- * @throws IllegalStateException If the transaction is in a state where resources cannot be delisted. This could be
+ * @return <code>true</code> if the resource could be de-listed from this transaction, otherwise <code>false</code>.
+ * @throws IllegalStateException If the transaction is in a state where resources cannot be de-listed. This could be
* because the transaction is no longer active.
* @throws SystemException If the transaction service fails in an unexpected way.
*/
Modified: trunk/core/src/main/java/org/infinispan/transaction/xa/DeadlockDetectingGlobalTransaction.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/transaction/xa/DeadlockDetectingGlobalTransaction.java 2010-02-19 12:41:06 UTC (rev 1520)
+++ trunk/core/src/main/java/org/infinispan/transaction/xa/DeadlockDetectingGlobalTransaction.java 2010-02-19 13:22:18 UTC (rev 1521)
@@ -32,7 +32,7 @@
private volatile boolean isMarkedForRollback;
- private transient volatile Object lockInterntion;
+ private transient volatile Object lockIntention;
public DeadlockDetectingGlobalTransaction() {
@@ -158,17 +158,17 @@
/**
* Returns the key this transaction intends to lock.
*/
- public Object getLockInterntion() {
- return lockInterntion;
+ public Object getLockIntention() {
+ return lockIntention;
}
/**
* Sets the lock this transaction intends to lock.
*/
- public void setLockInterntion(Object lockInterntion) {
- this.lockInterntion = lockInterntion;
+ public void setLockIntention(Object lockIntention) {
+ this.lockIntention = lockIntention;
}
-
+
public static class Externalizer extends GlobalTransaction.Externalizer {
public Externalizer() {
gtxFactory = new GlobalTransactionFactory(true);
Modified: trunk/core/src/main/java/org/infinispan/transaction/xa/GlobalTransactionFactory.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/transaction/xa/GlobalTransactionFactory.java 2010-02-19 12:41:06 UTC (rev 1520)
+++ trunk/core/src/main/java/org/infinispan/transaction/xa/GlobalTransactionFactory.java 2010-02-19 13:22:18 UTC (rev 1521)
@@ -19,7 +19,7 @@
/** this class is internally synchronized, so it can be shared between instances */
private final Random rnd = new Random();
- private long generateRandomdId() {
+ private long generateRandomId() {
return rnd.nextLong();
}
@@ -53,7 +53,7 @@
GlobalTransaction gtx;
if (isEddEnabled) {
DeadlockDetectingGlobalTransaction globalTransaction = new DeadlockDetectingGlobalTransaction(addr, remote);
- globalTransaction.setCoinToss(generateRandomdId());
+ globalTransaction.setCoinToss(generateRandomId());
gtx = globalTransaction;
} else {
gtx = new GlobalTransaction(addr, remote);
Modified: trunk/core/src/main/java/org/infinispan/transaction/xa/RemoteTransaction.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/transaction/xa/RemoteTransaction.java 2010-02-19 12:41:06 UTC (rev 1520)
+++ trunk/core/src/main/java/org/infinispan/transaction/xa/RemoteTransaction.java 2010-02-19 13:22:18 UTC (rev 1521)
@@ -12,7 +12,7 @@
import java.util.Map;
/**
- * Defines the state of a remotelly originated transaction.
+ * Defines the state of a remotely originated transaction.
*
* @author Mircea.Markus at jboss.com
* @since 4.0
Modified: trunk/core/src/main/java/org/infinispan/transaction/xa/TransactionTable.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/transaction/xa/TransactionTable.java 2010-02-19 12:41:06 UTC (rev 1520)
+++ trunk/core/src/main/java/org/infinispan/transaction/xa/TransactionTable.java 2010-02-19 13:22:18 UTC (rev 1521)
@@ -34,7 +34,7 @@
/**
* Repository for {@link org.infinispan.transaction.xa.RemoteTransaction} and {@link
- * org.infinispan.transaction.xa.TransactionXaAdapter}s (locally originated trasactions).
+ * org.infinispan.transaction.xa.TransactionXaAdapter}s (locally originated transactions).
*
* @author Mircea.Markus at jboss.com
* @since 4.0
@@ -191,7 +191,7 @@
}
/**
- * Removes the {@link org.infinispan.transaction.xa.TransactionXaAdapter} coresponding to the given tx. Returns true
+ * Removes the {@link org.infinispan.transaction.xa.TransactionXaAdapter} corresponding to the given tx. Returns true
* if such an tx exists.
*/
public boolean removeLocalTransaction(Transaction tx) {
@@ -199,7 +199,7 @@
}
/**
- * Removes the {@link org.infinispan.transaction.xa.RemoteTransaction} coresponding to the given tx. Returns true if
+ * Removes the {@link org.infinispan.transaction.xa.RemoteTransaction} corresponding to the given tx. Returns true if
* such an tx exists.
*/
public boolean removeRemoteTransaction(GlobalTransaction txId) {
Modified: trunk/core/src/main/java/org/infinispan/transaction/xa/TransactionXaAdapter.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/transaction/xa/TransactionXaAdapter.java 2010-02-19 12:41:06 UTC (rev 1520)
+++ trunk/core/src/main/java/org/infinispan/transaction/xa/TransactionXaAdapter.java 2010-02-19 13:22:18 UTC (rev 1521)
@@ -74,7 +74,7 @@
public int prepare(Xid xid) throws XAException {
if (configuration.isOnePhaseCommit()) {
if (trace)
- log.trace("Recieved prepare for tx: " + xid + " . Skipping call as 1PC will be used.");
+ log.trace("Received prepare for tx: " + xid + " . Skipping call as 1PC will be used.");
return XA_OK;
}
@@ -95,7 +95,7 @@
public void commit(Xid xid, boolean isOnePhase) throws XAException {
// always call prepare() - even if this is just a 1PC!
if (isOnePhase) prepare(xid);
- if (trace) log.trace("commiting TransactionXaAdapter: " + globalTx);
+ if (trace) log.trace("committing TransactionXaAdapter: " + globalTx);
try {
LocalTxInvocationContext ctx = icc.createTxInvocationContext();
ctx.setXaCache(this);
Modified: trunk/core/src/main/java/org/infinispan/util/BidirectionalLinkedHashMap.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/BidirectionalLinkedHashMap.java 2010-02-19 12:41:06 UTC (rev 1520)
+++ trunk/core/src/main/java/org/infinispan/util/BidirectionalLinkedHashMap.java 2010-02-19 13:22:18 UTC (rev 1521)
@@ -10,13 +10,13 @@
/**
* Similar to the JDK's {@link java.util.LinkedHashMap} except that this version makes use of the fact that entries are
- * bidirectionally linked and can hence be nagigated either from the start <i>or</i> from the end. It exposes such
+ * bidirectionally linked and can hence be navigated either from the start <i>or</i> from the end. It exposes such
* navigability by overriding {@link java.util.Map#keySet()} and {@link java.util.Map#entrySet()} to return {@link
* ReversibleOrderedSet} rather than a standard JDK {@link java.util.Set}. {@link ReversibleOrderedSet}s allow you to
* access 2 iterators: one that iterates from start to end, as usual, and a reversed one that iterates from end to start
* instead.
* <p/>
- * Unline the JDK {@link java.util.LinkedHashMap}, this implementation does not support null keys.
+ * Unlike the JDK {@link java.util.LinkedHashMap}, this implementation does not support null keys.
* <p/>
*
* @author Manik Surtani
@@ -90,7 +90,7 @@
*
* @param initialCapacity the initial capacity
* @param loadFactor the load factor
- * @throws IllegalArgumentException if the initial capacity is negative or the load factor is nonpositive
+ * @throws IllegalArgumentException if the initial capacity is negative or the load factor is non-positive
*/
public BidirectionalLinkedHashMap(int initialCapacity, float loadFactor) {
this(initialCapacity, loadFactor, false);
@@ -103,7 +103,7 @@
* @param initialCapacity the initial capacity
* @param loadFactor the load factor
* @param accessOrder the ordering mode - <tt>true</tt> for access-order, <tt>false</tt> for insertion-order
- * @throws IllegalArgumentException if the initial capacity is negative or the load factor is nonpositive
+ * @throws IllegalArgumentException if the initial capacity is negative or the load factor is non-positive
*/
public BidirectionalLinkedHashMap(int initialCapacity, float loadFactor, boolean accessOrder) {
if (initialCapacity < 0)
@@ -249,8 +249,8 @@
}
/**
- * This method is used instead of put by constructors and pseudoconstructors (clone, readObject). It does not resize
- * the table, check for comodification, etc. It calls createEntry rather than addEntry.
+ * This method is used instead of put by constructors and pseudo constructors (clone, readObject). It does not resize
+ * the table, check for co-modification, etc. It calls createEntry rather than addEntry.
*/
private void putForCreate(K key, V value) {
int hash = (key == null) ? 0 : hash(key);
@@ -529,7 +529,7 @@
}
/**
- * Called by superclass constructors and pseudoconstructors (clone, readObject) before any entries are inserted into
+ * Called by superclass constructors and pseudo constructors (clone, readObject) before any entries are inserted into
* the map. Initializes the chain.
*/
void init() {
Modified: trunk/core/src/main/java/org/infinispan/util/concurrent/locks/DeadlockDetectingLockManager.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/concurrent/locks/DeadlockDetectingLockManager.java 2010-02-19 12:41:06 UTC (rev 1520)
+++ trunk/core/src/main/java/org/infinispan/util/concurrent/locks/DeadlockDetectingLockManager.java 2010-02-19 13:22:18 UTC (rev 1521)
@@ -91,9 +91,9 @@
private void localVsLocalDld(InvocationContext ctx, DeadlockDetectingGlobalTransaction lockOwnerTx) {
if (trace) log.trace("Looking for local vs local deadlocks");
DeadlockDetectingGlobalTransaction thisThreadsTx = (DeadlockDetectingGlobalTransaction) ctx.getLockOwner();
- boolean weOwnLock = ownsLock(lockOwnerTx.getLockInterntion(), thisThreadsTx);
+ boolean weOwnLock = ownsLock(lockOwnerTx.getLockIntention(), thisThreadsTx);
if (trace) {
- log.trace("Other owner's intention is " + lockOwnerTx.getLockInterntion() + ". Do we(" + thisThreadsTx + ") own lock for it? " + weOwnLock + ". Lock owner is " + getOwner(lockOwnerTx.getLockInterntion()));
+ log.trace("Other owner's intention is " + lockOwnerTx.getLockIntention() + ". Do we(" + thisThreadsTx + ") own lock for it? " + weOwnLock + ". Lock owner is " + getOwner(lockOwnerTx.getLockIntention()));
}
if (weOwnLock) {
boolean iShouldInterrupt = thisThreadsTx.thisWillInterrupt(lockOwnerTx);
Modified: trunk/core/src/main/resources/xslt/coherence35x2infinispan4x.xslt
===================================================================
--- trunk/core/src/main/resources/xslt/coherence35x2infinispan4x.xslt 2010-02-19 12:41:06 UTC (rev 1520)
+++ trunk/core/src/main/resources/xslt/coherence35x2infinispan4x.xslt 2010-02-19 13:22:18 UTC (rev 1521)
@@ -209,8 +209,8 @@
<xsl:template name="evictionAttributes">
<xsl:if test="unit-calculator='BINARY'">
- <xsl:message terminate="no">TODO - Infinispan does not curenlty support computation based on the size of the
- cache, please adjust the eviction->maxEntries attribute to fit your need
+ <xsl:message terminate="no">TODO - Infinispan does not currently support computation based on the size of the
+ cache, please adjust the eviction/maxEntries attribute to fit your need
</xsl:message>
</xsl:if>
<xsl:if test="high-units">
Modified: trunk/core/src/test/java/org/infinispan/config/ConfigurationValidation2Test.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/config/ConfigurationValidation2Test.java 2010-02-19 12:41:06 UTC (rev 1520)
+++ trunk/core/src/test/java/org/infinispan/config/ConfigurationValidation2Test.java 2010-02-19 13:22:18 UTC (rev 1521)
@@ -38,11 +38,11 @@
@Test(groups = "functional", testName = "config.ConfigurationValidationTest")
public class ConfigurationValidation2Test extends SingleCacheManagerTest {
- public void testWrongCachemodeConfiguration() {
+ public void testWrongCacheModeConfiguration() {
cacheManager.getCache().put("key", "value");
}
- public void testCachemodeConfiguration() {
+ public void testCacheModeConfiguration() {
cacheManager.getCache("local").put("key", "value");
}
Modified: trunk/core/src/test/java/org/infinispan/config/ConfigurationValidationTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/config/ConfigurationValidationTest.java 2010-02-19 12:41:06 UTC (rev 1520)
+++ trunk/core/src/test/java/org/infinispan/config/ConfigurationValidationTest.java 2010-02-19 13:22:18 UTC (rev 1521)
@@ -40,11 +40,11 @@
public class ConfigurationValidationTest extends SingleCacheManagerTest {
@Test (expectedExceptions=ConfigurationException.class)
- public void testWrongCachemodeConfiguration() {
+ public void testWrongCacheModeConfiguration() {
cacheManager.getCache().put("key", "value");
}
- public void testCachemodeConfiguration() {
+ public void testCacheModeConfiguration() {
cacheManager.getCache("local").put("key", "value");
}
Modified: trunk/core/src/test/java/org/infinispan/eviction/BaseEvictionFunctionalTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/eviction/BaseEvictionFunctionalTest.java 2010-02-19 12:41:06 UTC (rev 1520)
+++ trunk/core/src/test/java/org/infinispan/eviction/BaseEvictionFunctionalTest.java 2010-02-19 13:22:18 UTC (rev 1521)
@@ -30,7 +30,7 @@
return cm;
}
- public void testMultithreaded() throws InterruptedException {
+ public void testMultiThreaded() throws InterruptedException {
int NUM_THREADS = 20;
Writer[] w = new Writer[NUM_THREADS];
CountDownLatch startLatch = new CountDownLatch(1);
@@ -47,9 +47,9 @@
for (Writer writer : w) writer.join();
// wait for the cache size to drop to 1, up to a specified amount of time.
- long giveupTime = System.currentTimeMillis() + (1000 * 60); // 1 mins?
- while (cache.getAdvancedCache().getDataContainer().size() > 1 && System.currentTimeMillis() < giveupTime) {
-// System.out.println("Cache size is " + cache.size() + " and time diff is " + (giveupTime - System.currentTimeMillis()));
+ long giveUpTime = System.currentTimeMillis() + (1000 * 60); // 1 min?
+ while (cache.getAdvancedCache().getDataContainer().size() > 1 && System.currentTimeMillis() < giveUpTime) {
+// System.out.println("Cache size is " + cache.size() + " and time diff is " + (giveUpTime - System.currentTimeMillis()));
Thread.sleep(100);
}
Modified: trunk/core/src/test/java/org/infinispan/jmx/ActivationAndPassivationInterceptorMBeanTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/jmx/ActivationAndPassivationInterceptorMBeanTest.java 2010-02-19 12:41:06 UTC (rev 1520)
+++ trunk/core/src/test/java/org/infinispan/jmx/ActivationAndPassivationInterceptorMBeanTest.java 2010-02-19 13:22:18 UTC (rev 1521)
@@ -65,7 +65,7 @@
threadMBeanServer.invoke(activationInterceptorObjName, "resetStatistics", new Object[0], new String[0]);
}
- public void testDisbaleStatistics() throws Exception {
+ public void testDisableStatistics() throws Exception {
threadMBeanServer.setAttribute(activationInterceptorObjName, new Attribute("StatisticsEnabled", Boolean.FALSE));
assert threadMBeanServer.getAttribute(activationInterceptorObjName, "Activations").toString().equals("N/A");
threadMBeanServer.setAttribute(activationInterceptorObjName, new Attribute("StatisticsEnabled", Boolean.TRUE));
Modified: trunk/core/src/test/java/org/infinispan/loaders/AbstractCacheStoreTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/loaders/AbstractCacheStoreTest.java 2010-02-19 12:41:06 UTC (rev 1520)
+++ trunk/core/src/test/java/org/infinispan/loaders/AbstractCacheStoreTest.java 2010-02-19 13:22:18 UTC (rev 1521)
@@ -37,7 +37,7 @@
}
@Test
- void testSynchExecutorIsSetWhenCfgPurgeSynchIsTrueOnStart() throws Exception {
+ void testSyncExecutorIsSetWhenCfgPurgeSyncIsTrueOnStart() throws Exception {
cfg.setPurgeSynchronously(true);
cs.start();
ExecutorService service = (ExecutorService) ReflectionUtil.getValue(cs, "purgerService");
@@ -45,7 +45,7 @@
}
@Test
- void testASynchExecutorIsDefaultOnStart() throws Exception {
+ void testAsyncExecutorIsDefaultOnStart() throws Exception {
cs.start();
ExecutorService service = (ExecutorService) ReflectionUtil.getValue(cs, "purgerService");
assert !(service instanceof WithinThreadExecutor);
Modified: trunk/core/src/test/java/org/infinispan/loaders/BaseCacheStoreTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/loaders/BaseCacheStoreTest.java 2010-02-19 12:41:06 UTC (rev 1520)
+++ trunk/core/src/test/java/org/infinispan/loaders/BaseCacheStoreTest.java 2010-02-19 13:22:18 UTC (rev 1521)
@@ -196,7 +196,7 @@
assert cs.loadAll().isEmpty();
}
- public void testStopStartDoesntNukeValues() throws InterruptedException, CacheLoaderException {
+ public void testStopStartDoesNotNukeValues() throws InterruptedException, CacheLoaderException {
assert !cs.containsKey("k1");
assert !cs.containsKey("k2");
Modified: trunk/core/src/test/java/org/infinispan/loaders/decorators/AsyncTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/loaders/decorators/AsyncTest.java 2010-02-19 12:41:06 UTC (rev 1520)
+++ trunk/core/src/test/java/org/infinispan/loaders/decorators/AsyncTest.java 2010-02-19 13:22:18 UTC (rev 1521)
@@ -159,7 +159,7 @@
} catch (TimeoutException e) {
assert false : "Timed out applying for modifications";
} catch (Exception e) {
- throw new CacheLoaderException("Barried failed", e);
+ throw new CacheLoaderException("Barrier failed", e);
}
}
};
@@ -229,7 +229,7 @@
} catch (TimeoutException e) {
assert false : "Timed out applying for modifications";
} catch (Exception e) {
- throw new CacheLoaderException("Barried failed", e);
+ throw new CacheLoaderException("Barrier failed", e);
}
}
};
Modified: trunk/core/src/test/java/org/infinispan/profiling/ProfileTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/profiling/ProfileTest.java 2010-02-19 12:41:06 UTC (rev 1520)
+++ trunk/core/src/test/java/org/infinispan/profiling/ProfileTest.java 2010-02-19 13:22:18 UTC (rev 1521)
@@ -53,11 +53,11 @@
}
}
- protected void testWith(String cachename) throws Exception {
- log.warn("Starting profile test, cache name = {0}", cachename);
+ protected void testWith(String cacheName) throws Exception {
+ log.warn("Starting profile test, cache name = {0}", cacheName);
initTest();
- cache = cacheManager.getCache(cachename);
- runCompleteTest(cachename);
+ cache = cacheManager.getCache(cacheName);
+ runCompleteTest(cacheName);
}
Modified: trunk/core/src/test/java/org/infinispan/test/fwk/TestCacheManagerFactory.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/test/fwk/TestCacheManagerFactory.java 2010-02-19 12:41:06 UTC (rev 1520)
+++ trunk/core/src/test/java/org/infinispan/test/fwk/TestCacheManagerFactory.java 2010-02-19 13:22:18 UTC (rev 1521)
@@ -130,7 +130,7 @@
}
/**
- * Creates a cache manager and ammends the supplied configuration in order to avoid conflicts (e.g. jmx, jgroups)
+ * Creates a cache manager and amends the supplied configuration in order to avoid conflicts (e.g. jmx, jgroups)
* during running tests in parallel.
*/
public static CacheManager createCacheManager(GlobalConfiguration configuration) {
@@ -154,7 +154,7 @@
}
/**
- * Creates a local cache manager and ammends so that it won't conflict (e.g. jmx) with other managers whilst running
+ * Creates a local cache manager and amends so that it won't conflict (e.g. jmx) with other managers whilst running
* tests in parallel. This is a non-transactional cache manager.
*/
public static CacheManager createCacheManager(Configuration defaultCacheConfig) {
Modified: trunk/core/src/test/java/org/infinispan/test/testng/UnitTestTestNGListener.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/test/testng/UnitTestTestNGListener.java 2010-02-19 12:41:06 UTC (rev 1520)
+++ trunk/core/src/test/java/org/infinispan/test/testng/UnitTestTestNGListener.java 2010-02-19 13:22:18 UTC (rev 1521)
@@ -22,7 +22,7 @@
private static final Log log = LogFactory.getLog(UnitTestTestNGListener.class);
private AtomicInteger failed = new AtomicInteger(0);
- private AtomicInteger succeded = new AtomicInteger(0);
+ private AtomicInteger succeeded = new AtomicInteger(0);
private AtomicInteger skipped = new AtomicInteger(0);
public void onTestStart(ITestResult res) {
@@ -33,7 +33,7 @@
synchronized public void onTestSuccess(ITestResult arg0) {
System.out.println(getThreadId() + " Test " + getTestDesc(arg0) + " succeeded.");
log.info("Test succeeded " + getTestDesc(arg0) + ".");
- succeded.incrementAndGet();
+ succeeded.incrementAndGet();
printStatus();
}
@@ -70,6 +70,6 @@
}
private void printStatus() {
- System.out.println("Test suite progress: tests succeeded: " + succeded.get() + ", failed: " + failed.get() + ", skipped: " + skipped.get() + ".");
+ System.out.println("Test suite progress: tests succeeded: " + succeeded.get() + ", failed: " + failed.get() + ", skipped: " + skipped.get() + ".");
}
}
Modified: trunk/core/src/test/java/org/infinispan/util/BidirectionalLinkedHashMapTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/util/BidirectionalLinkedHashMapTest.java 2010-02-19 12:41:06 UTC (rev 1520)
+++ trunk/core/src/test/java/org/infinispan/util/BidirectionalLinkedHashMapTest.java 2010-02-19 13:22:18 UTC (rev 1521)
@@ -19,7 +19,7 @@
testOrderAfterRemoval(map);
- // now attemp a visit and test that the visits are NOT recorded
+ // now attempt a visit and test that the visits are NOT recorded
map.get(200);
// order should still be maintained
@@ -36,7 +36,7 @@
testOrderBeforeRemoval(map);
- // now attemp a visit and test that the visits are NOT recorded
+ // now attempt a visit and test that the visits are NOT recorded
map.get(200);
// check the forward iterator that everything is in order of entry
More information about the infinispan-commits
mailing list