[infinispan-commits] Infinispan SVN: r589 - in trunk: cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/binary and 6 other directories.
infinispan-commits at lists.jboss.org
infinispan-commits at lists.jboss.org
Thu Jul 16 06:21:55 EDT 2009
Author: vblagojevic at jboss.com
Date: 2009-07-16 06:21:54 -0400 (Thu, 16 Jul 2009)
New Revision: 589
Modified:
trunk/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/BdbjeCacheStoreConfig.java
trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/binary/JdbcBinaryCacheStoreConfig.java
trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStoreConfig.java
trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/stringbased/JdbcStringBasedCacheStoreConfig.java
trunk/cachestore/s3/src/main/java/org/infinispan/loaders/s3/S3CacheStoreConfig.java
trunk/core/src/main/java/org/infinispan/config/CustomInterceptorConfig.java
trunk/core/src/main/java/org/infinispan/config/GlobalConfiguration.java
trunk/core/src/main/java/org/infinispan/loaders/LockSupportCacheStoreConfig.java
trunk/tools/src/main/java/org/infinispan/tools/doclet/config/ConfigHtmlGenerator.java
Log:
ns
Modified: trunk/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/BdbjeCacheStoreConfig.java
===================================================================
--- trunk/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/BdbjeCacheStoreConfig.java 2009-07-16 08:22:08 UTC (rev 588)
+++ trunk/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/BdbjeCacheStoreConfig.java 2009-07-16 10:21:54 UTC (rev 589)
@@ -31,7 +31,7 @@
*/
@ConfigurationElements(elements = {
@ConfigurationElement(name = "loader", parent = "loaders",
- description = "org.infinispan.loaders.bdbje.BdbjeCacheStoreConfig",
+ description = "org.infinispan.loaders.bdbje.BdbjeCacheStore",
cardinalityInParent=Cardinality.UNBOUNDED),
@ConfigurationElement(name = "properties", parent = "loader") })
public class BdbjeCacheStoreConfig extends AbstractCacheStoreConfig {
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 2009-07-16 08:22:08 UTC (rev 588)
+++ trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/binary/JdbcBinaryCacheStoreConfig.java 2009-07-16 10:21:54 UTC (rev 589)
@@ -15,7 +15,7 @@
*/
@ConfigurationElements(elements = {
@ConfigurationElement(name = "loader", parent = "loaders",
- description = "org.infinispan.loaders.jdbc.binary.JdbcBinaryCacheStoreConfig",
+ description = "org.infinispan.loaders.jdbc.binary.JdbcBinaryCacheStore",
cardinalityInParent=Cardinality.UNBOUNDED),
@ConfigurationElement(name = "properties", parent = "loader") })
public class JdbcBinaryCacheStoreConfig extends LockSupportCacheStoreConfig {
Modified: trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStoreConfig.java
===================================================================
--- trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStoreConfig.java 2009-07-16 08:22:08 UTC (rev 588)
+++ trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStoreConfig.java 2009-07-16 10:21:54 UTC (rev 589)
@@ -18,7 +18,7 @@
*/
@ConfigurationElements(elements = {
@ConfigurationElement(name = "loader", parent = "loaders",
- description = "org.infinispan.loaders.jdbc.mixed.JdbcMixedCacheStoreConfig",
+ description = "org.infinispan.loaders.jdbc.mixed.JdbcMixedCacheStore",
cardinalityInParent=Cardinality.UNBOUNDED),
@ConfigurationElement(name = "properties", parent = "loader") })
public class JdbcMixedCacheStoreConfig extends AbstractCacheStoreConfig {
Modified: trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/stringbased/JdbcStringBasedCacheStoreConfig.java
===================================================================
--- trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/stringbased/JdbcStringBasedCacheStoreConfig.java 2009-07-16 08:22:08 UTC (rev 588)
+++ trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/stringbased/JdbcStringBasedCacheStoreConfig.java 2009-07-16 10:21:54 UTC (rev 589)
@@ -17,7 +17,7 @@
*/
@ConfigurationElements(elements = {
@ConfigurationElement(name = "loader", parent = "loaders",
- description = "org.infinispan.loaders.jdbc.stringbased.JdbcStringBasedCacheStoreConfig",
+ description = "org.infinispan.loaders.jdbc.stringbased.JdbcStringBasedCacheStore",
cardinalityInParent=Cardinality.UNBOUNDED),
@ConfigurationElement(name = "properties", parent = "loader") })
public class JdbcStringBasedCacheStoreConfig extends LockSupportCacheStoreConfig {
Modified: trunk/cachestore/s3/src/main/java/org/infinispan/loaders/s3/S3CacheStoreConfig.java
===================================================================
--- trunk/cachestore/s3/src/main/java/org/infinispan/loaders/s3/S3CacheStoreConfig.java 2009-07-16 08:22:08 UTC (rev 588)
+++ trunk/cachestore/s3/src/main/java/org/infinispan/loaders/s3/S3CacheStoreConfig.java 2009-07-16 10:21:54 UTC (rev 589)
@@ -21,7 +21,7 @@
*/
@ConfigurationElements(elements = {
@ConfigurationElement(name = "loader", parent = "loaders",
- description = "org.infinispan.loaders.s3.S3CacheStoreConfig",
+ description = "org.infinispan.loaders.s3.S3CacheStore",
cardinalityInParent=Cardinality.UNBOUNDED),
@ConfigurationElement(name = "properties", parent = "loader") })
public class S3CacheStoreConfig extends LockSupportCacheStoreConfig {
Modified: trunk/core/src/main/java/org/infinispan/config/CustomInterceptorConfig.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/config/CustomInterceptorConfig.java 2009-07-16 08:22:08 UTC (rev 588)
+++ trunk/core/src/main/java/org/infinispan/config/CustomInterceptorConfig.java 2009-07-16 10:21:54 UTC (rev 589)
@@ -47,8 +47,8 @@
private boolean isFirst;
private boolean isLast;
private int index = -1;
- private String after;
- private String before;
+ private String afterInterceptor;
+ private String beforeInterceptor;
private Position position;
private String className;
private TypedProperties properties = EMPTY_PROPERTIES;
@@ -73,8 +73,8 @@
isFirst = first;
isLast = last;
this.index = index;
- this.after = after;
- this.before = before;
+ this.afterInterceptor = after;
+ this.beforeInterceptor = before;
}
/**
@@ -93,8 +93,8 @@
isFirst = first;
isLast = last;
this.index = index;
- this.after = after == null ? null : after.getName();
- this.before = before == null ? null : before.getName();
+ this.afterInterceptor = after == null ? null : after.getName();
+ this.beforeInterceptor = before == null ? null : before.getName();
}
/**
@@ -175,7 +175,7 @@
containingElement = "interceptor")
public void setAfterInterceptor(String afterClass) {
testImmutability("after");
- this.after = afterClass;
+ this.afterInterceptor = afterClass;
}
/**
@@ -194,7 +194,7 @@
containingElement = "interceptor")
public void setBeforeInterceptor(String beforeClass) {
testImmutability("before");
- this.before = beforeClass;
+ this.beforeInterceptor = beforeClass;
}
/**
@@ -244,14 +244,14 @@
* @see #getAfter()
*/
public String getAfter() {
- return after;
+ return afterInterceptor;
}
/**
* @see #getBefore()
*/
public String getBefore() {
- return before;
+ return beforeInterceptor;
}
public String toString() {
@@ -260,8 +260,8 @@
", isFirst=" + isFirst +
", isLast=" + isLast +
", index=" + index +
- ", after='" + after + '\'' +
- ", before='" + before + '\'' +
+ ", after='" + afterInterceptor + '\'' +
+ ", before='" + beforeInterceptor + '\'' +
'}';
}
@@ -274,8 +274,8 @@
if (index != that.index) return false;
if (isFirst != that.isFirst) return false;
if (isLast != that.isLast) return false;
- if (after != null ? !after.equals(that.after) : that.after != null) return false;
- if (before != null ? !before.equals(that.before) : that.before != null) return false;
+ if (afterInterceptor != null ? !afterInterceptor.equals(that.afterInterceptor) : that.afterInterceptor != null) return false;
+ if (beforeInterceptor != null ? !beforeInterceptor.equals(that.beforeInterceptor) : that.beforeInterceptor != null) return false;
if (interceptor != null ? !interceptor.equals(that.interceptor) : that.interceptor != null)
return false;
return true;
@@ -287,8 +287,8 @@
result = 31 * result + (isFirst ? 1 : 0);
result = 31 * result + (isLast ? 1 : 0);
result = 31 * result + index;
- result = 31 * result + (after != null ? after.hashCode() : 0);
- result = 31 * result + (before != null ? before.hashCode() : 0);
+ result = 31 * result + (afterInterceptor != null ? afterInterceptor.hashCode() : 0);
+ result = 31 * result + (beforeInterceptor != null ? beforeInterceptor.hashCode() : 0);
return result;
}
@@ -298,8 +298,8 @@
dolly.interceptor = interceptor;
dolly.isFirst = isFirst;
dolly.isLast = isLast;
- dolly.after = after;
- dolly.before = before;
+ dolly.afterInterceptor = afterInterceptor;
+ dolly.beforeInterceptor = beforeInterceptor;
return dolly;
}
Modified: trunk/core/src/main/java/org/infinispan/config/GlobalConfiguration.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/config/GlobalConfiguration.java 2009-07-16 08:22:08 UTC (rev 588)
+++ trunk/core/src/main/java/org/infinispan/config/GlobalConfiguration.java 2009-07-16 10:21:54 UTC (rev 589)
@@ -369,7 +369,7 @@
}
@ConfigurationAttribute(name = "version",
- containingElement = "serialization")
+ containingElement = "serialization", defaultValue=Version.version)
public void setMarshallVersion(String marshallVersion) {
testImmutability("marshallVersion");
this.marshallVersion = Version.getVersionShort(marshallVersion);
Modified: trunk/core/src/main/java/org/infinispan/loaders/LockSupportCacheStoreConfig.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/loaders/LockSupportCacheStoreConfig.java 2009-07-16 08:22:08 UTC (rev 588)
+++ trunk/core/src/main/java/org/infinispan/loaders/LockSupportCacheStoreConfig.java 2009-07-16 10:21:54 UTC (rev 589)
@@ -26,7 +26,7 @@
*/
@ConfigurationProperty(name = "lockConcurrencyLevel",
parentElement = "properties",
- description = "Concurrency level as integer. Default is 2048")
+ description = "Concurrency level as integer. Default is " + DEFAULT_CONCURRENCY_LEVEL)
public void setLockConcurrencyLevel(int lockConcurrencyLevel) {
testImmutability("lockConcurrencyLevel");
this.lockConcurrencyLevel = lockConcurrencyLevel;
@@ -38,7 +38,7 @@
@ConfigurationProperty(name = "lockAcquistionTimeout",
parentElement = "properties",
- description= "Default lock acquisition timeout as long. Default is 60000")
+ description= "Default lock acquisition timeout as long. Default is " + DEFAULT_LOCK_ACQUISITION_TIMEOUT)
public void setLockAcquistionTimeout(long lockAcquistionTimeout) {
testImmutability("lockAcquistionTimeout");
this.lockAcquistionTimeout = lockAcquistionTimeout;
Modified: trunk/tools/src/main/java/org/infinispan/tools/doclet/config/ConfigHtmlGenerator.java
===================================================================
--- trunk/tools/src/main/java/org/infinispan/tools/doclet/config/ConfigHtmlGenerator.java 2009-07-16 08:22:08 UTC (rev 588)
+++ trunk/tools/src/main/java/org/infinispan/tools/doclet/config/ConfigHtmlGenerator.java 2009-07-16 10:21:54 UTC (rev 589)
@@ -72,7 +72,7 @@
createdAttributes = true;
}
if (attribute) {
- generateAttributeTableRow(sb, m, a);
+ generateAttributeTableRow(clazz,sb, m, a);
}
}
if (createdAttributes) {
@@ -132,7 +132,7 @@
return cprops;
}
- private void generateAttributeTableRow(StringBuilder sb, Method m, ConfigurationAttribute a) {
+ private void generateAttributeTableRow(Class<?> bean,StringBuilder sb, Method m, ConfigurationAttribute a) {
sb.append("<tr class=\"b\">");
sb.append("<td>").append("<code>" + a.name() +"</code>").append("</td>\n");
@@ -157,9 +157,9 @@
else {
try {
//reflect default value
- Object matchingFieldValue = matchingFieldValue(m);
+ Object matchingFieldValue = matchingFieldValue(bean,m);
sb.append("<td>").append(matchingFieldValue).append("</td>\n");
- } catch (Exception e) {
+ } catch (Exception e) {
sb.append("<td>").append("N/A").append("</td>\n");
}
}
@@ -218,15 +218,14 @@
return ces;
}
- private Object matchingFieldValue(Method m) throws Exception {
+ private Object matchingFieldValue(Class<?> bean, Method m) throws Exception {
String name = m.getName();
if (!name.startsWith("set")) throw new IllegalArgumentException("Not a setter method");
String fieldName = name.substring(name.indexOf("set") + 3);
fieldName = fieldName.substring(0, 1).toLowerCase() + fieldName.substring(1);
Field f = m.getDeclaringClass().getDeclaredField(fieldName);
- return getField(f, m.getDeclaringClass().newInstance());
-
+ return getField(f, bean.newInstance());
}
private static Object getField(Field field, Object target) {
More information about the infinispan-commits
mailing list