[infinispan-commits] Infinispan SVN: r588 - in trunk: tools/src/main/java/org/infinispan/tools/doclet/config and 1 other directories.
infinispan-commits at lists.jboss.org
infinispan-commits at lists.jboss.org
Thu Jul 16 04:22:08 EDT 2009
Author: vblagojevic at jboss.com
Date: 2009-07-16 04:22:08 -0400 (Thu, 16 Jul 2009)
New Revision: 588
Modified:
trunk/core/src/main/java/org/infinispan/config/Configuration.java
trunk/core/src/main/java/org/infinispan/config/ConfigurationAttribute.java
trunk/core/src/main/java/org/infinispan/config/ConfigurationElement.java
trunk/core/src/main/java/org/infinispan/config/GlobalConfiguration.java
trunk/tools/src/main/java/org/infinispan/tools/doclet/config/ConfigHtmlGenerator.java
trunk/tools/src/main/java/org/infinispan/tools/schema/SchemaGeneratorTreeWalker.java
Log:
[ISPN-97] - Improve configuration processing and maintenance
change allowedValues to array
Modified: trunk/core/src/main/java/org/infinispan/config/Configuration.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/config/Configuration.java 2009-07-16 07:42:27 UTC (rev 587)
+++ trunk/core/src/main/java/org/infinispan/config/Configuration.java 2009-07-16 08:22:08 UTC (rev 588)
@@ -379,7 +379,7 @@
}
@ConfigurationAttribute(name = "mode",
- containingElement = "clustering", allowedValues="LOCAL,REPL,INVALIDATION,DIST")
+ containingElement = "clustering", allowedValues={"LOCAL","REPL","INVALIDATION","DIST"})
public void setCacheMode(String cacheMode) {
testImmutability("cacheMode");
if (cacheMode == null) throw new ConfigurationException("Cache mode cannot be null", "CacheMode");
@@ -419,7 +419,7 @@
}
@ConfigurationAttribute(name = "strategy",
- containingElement = "eviction",allowedValues="NONE, FIFO, LRU")
+ containingElement = "eviction",allowedValues={"NONE", "FIFO", "LRU"})
public void setEvictionStrategy(String eStrategy){
testImmutability("evictionStrategy");
this.evictionStrategy = EvictionStrategy.valueOf(uc(eStrategy));
@@ -522,7 +522,7 @@
@ConfigurationAttribute(name = "isolationLevel",
containingElement = "locking",
- allowedValues="NONE,SERIALIZABLE,REPEATABLE_READ,READ_COMMITTED,READ_UNCOMMITTED")
+ allowedValues={"NONE","SERIALIZABLE","REPEATABLE_READ","READ_COMMITTED","READ_UNCOMMITTED"})
public void setIsolationLevel(String isolationLevel) {
testImmutability("isolationLevel");
if (isolationLevel == null) throw new ConfigurationException("Isolation level cannot be null", "IsolationLevel");
Modified: trunk/core/src/main/java/org/infinispan/config/ConfigurationAttribute.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/config/ConfigurationAttribute.java 2009-07-16 07:42:27 UTC (rev 587)
+++ trunk/core/src/main/java/org/infinispan/config/ConfigurationAttribute.java 2009-07-16 08:22:08 UTC (rev 588)
@@ -31,8 +31,8 @@
* of the appropriate AbstractConfigurationBean.
* <p>
*
- * ConfigurationAttribute should annotate the corresponding setter methods with one parameter that
- * could be either primitive or java.lang.String.
+ * ConfigurationAttribute should annotate the corresponding setter methods having one parameter that
+ * could be either any primitive or java.lang.String.
*
*
* @author Vladimir Blagojevic
@@ -58,11 +58,11 @@
String name();
/**
- * Returns comma delimited list of allowed values for this attribute
+ * Returns an array of String values representing allowed values for this attribute
*
* @return
*/
- String allowedValues() default "";
+ String [] allowedValues() default {};
/**
* Returns default value for this attribute
Modified: trunk/core/src/main/java/org/infinispan/config/ConfigurationElement.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/config/ConfigurationElement.java 2009-07-16 07:42:27 UTC (rev 587)
+++ trunk/core/src/main/java/org/infinispan/config/ConfigurationElement.java 2009-07-16 08:22:08 UTC (rev 588)
@@ -62,7 +62,7 @@
String name();
/**
- * Returns name of corresponding XML element.
+ * Returns name of corresponding parent XML element.
*
* @return
*/
@@ -85,14 +85,14 @@
String description() default "";
/**
- * Returns class of customer parser needed to process this ConfigurationElement
+ * Returns class of custom parser needed to process this ConfigurationElement
*
* @return
*/
Class<? extends ConfigurationElementReader> customReader() default ConfigurationElementReader.class;
/**
- * Returns class of customer writer for this ConfigurationElement
+ * Returns class of custom writer for this ConfigurationElement
*
* @return
*/
Modified: trunk/core/src/main/java/org/infinispan/config/GlobalConfiguration.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/config/GlobalConfiguration.java 2009-07-16 07:42:27 UTC (rev 587)
+++ trunk/core/src/main/java/org/infinispan/config/GlobalConfiguration.java 2009-07-16 08:22:08 UTC (rev 588)
@@ -272,7 +272,7 @@
@ConfigurationAttribute(name = "hookBehavior",
containingElement = "shutdown",
- allowedValues = "DEFAULT, REGISTER, DONT_REGISTER",
+ allowedValues = {"DEFAULT", "REGISTER", "DONT_REGISTER"},
defaultValue = "DEFAULT")
public void setShutdownHookBehavior(String shutdownHookBehavior) {
if (shutdownHookBehavior == null)
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 07:42:27 UTC (rev 587)
+++ trunk/tools/src/main/java/org/infinispan/tools/doclet/config/ConfigHtmlGenerator.java 2009-07-16 08:22:08 UTC (rev 588)
@@ -137,8 +137,13 @@
sb.append("<td>").append("<code>" + a.name() +"</code>").append("</td>\n");
sb.append("<td>").append("<code>" + m.getParameterTypes()[0].getSimpleName() + "</code>");
- if(a.allowedValues().length()>0){
- sb.append("* (" + a.allowedValues().replace(',', '|') +")</td>\n");
+ if(a.allowedValues().length>0){
+ sb.append("* (");
+ for(String s:a.allowedValues()){
+ sb.append(s+'|');
+ }
+ sb.deleteCharAt(sb.length()-1);
+ sb.append(")</td>\n");
} else{
sb.append("</td>\n");
}
Modified: trunk/tools/src/main/java/org/infinispan/tools/schema/SchemaGeneratorTreeWalker.java
===================================================================
--- trunk/tools/src/main/java/org/infinispan/tools/schema/SchemaGeneratorTreeWalker.java 2009-07-16 07:42:27 UTC (rev 587)
+++ trunk/tools/src/main/java/org/infinispan/tools/schema/SchemaGeneratorTreeWalker.java 2009-07-16 08:22:08 UTC (rev 588)
@@ -175,7 +175,7 @@
}
Element att = xmldoc.createElement("xs:attribute");
att.setAttribute("name", a.name());
- boolean hasRestriction = a.allowedValues().length()>0;
+ boolean hasRestriction = a.allowedValues().length >0;
if(!hasRestriction){
att.setAttribute("type", "xs:" + type);
}
@@ -185,7 +185,7 @@
Element restriction = xmldoc.createElement("xs:restriction");
restriction.setAttribute("base", "xs:" + type);
simpleType.appendChild(restriction);
- String [] values = a.allowedValues().split(",");
+ String [] values = a.allowedValues();
for (String constraint : values) {
Element restrictionValue = xmldoc.createElement("xs:enumeration");
restrictionValue.setAttribute("value", constraint.trim());
More information about the infinispan-commits
mailing list