[infinispan-commits] Infinispan SVN: r747 - in trunk: tools/src/main/java/org/infinispan/tools/doclet/config and 1 other directory.

[infinispan-commits at lists.jboss.org]

Author: vblagojevic at jboss.com
Date: 2009-08-28 11:29:43 -0400 (Fri, 28 Aug 2009)
New Revision: 747

Modified:
   trunk/core/src/main/java/org/infinispan/config/GlobalConfiguration.java
   trunk/core/src/main/java/org/infinispan/config/InfinispanConfiguration.java
   trunk/tools/src/main/java/org/infinispan/tools/doclet/config/ConfigHtmlGenerator.java
Log:
configuration reference documentation content added

Modified: trunk/core/src/main/java/org/infinispan/config/GlobalConfiguration.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/config/GlobalConfiguration.java	2009-08-28 09:19:49 UTC (rev 746)
+++ trunk/core/src/main/java/org/infinispan/config/GlobalConfiguration.java	2009-08-28 15:29:43 UTC (rev 747)
@@ -540,7 +540,7 @@
    
    /**
     * 
-    * @configRef serialization|Serialization and marshalling settings
+    * @configRef serialization|Serialization and marshalling settings.
     */   
    @XmlAccessorType(XmlAccessType.PROPERTY)
    private static class SerializationType extends AbstractConfigurationBeanWithGCR {
@@ -570,7 +570,7 @@
    
    /**
     * 
-    * @configRef globalJmxStatistics|Determines global JMX settings for all cache instances 
+    * @configRef globalJmxStatistics|Determines global JMX settings for all cache instances. 
     */
    @XmlAccessorType(XmlAccessType.PROPERTY)
    private static class GlobalJmxStatisticsType extends AbstractConfigurationBeanWithGCR {

Modified: trunk/core/src/main/java/org/infinispan/config/InfinispanConfiguration.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/config/InfinispanConfiguration.java	2009-08-28 09:19:49 UTC (rev 746)
+++ trunk/core/src/main/java/org/infinispan/config/InfinispanConfiguration.java	2009-08-28 15:29:43 UTC (rev 747)
@@ -51,7 +51,9 @@
  * file XML schema generation. Please modify these annotations and Java element types they annotate with utmost
  * understanding and care.
  * 
- * @configRef infinispan|Root of Infinispan configuration.
+ * @configRef infinispan|Root of Infinispan configuration. Infinispan configuration element can optionally have multiple 
+ * namedCache child elements. Each namedCache builds up on a template provided by default cache. namedCache has 
+ * the exact same XML structure as default cache and is therefore omitted from this reference. 
  *
  * @author Vladimir Blagojevic
  * @since 4.0

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-08-28 09:19:49 UTC (rev 746)
+++ trunk/tools/src/main/java/org/infinispan/tools/doclet/config/ConfigHtmlGenerator.java	2009-08-28 15:29:43 UTC (rev 747)
@@ -201,7 +201,7 @@
             }
          }
       } catch (Exception e) {
-         System.out.println("Did noc construct object " + bean);
+         System.out.println("Did not construct object " + bean);
       }
 
       Set<XSAttributeDecl> attributes = n.getAttributes();
@@ -210,8 +210,25 @@
          sb.append("<td>").append("<code>" + a.getName() + "</code>").append("</td>\n");
          sb.append("<td>").append("<code>" + a.getType().getName() + "</code>");
          
+         boolean isRestricted = false;
          XSRestrictionSimpleType restriction = a.getType().asRestriction();
          Collection<? extends XSFacet> declaredFacets = restriction.getDeclaredFacets();
+         for (XSFacet facet : declaredFacets) {
+            if(facet.getName().equalsIgnoreCase("enumeration")){
+               isRestricted = true;
+               break;
+            }            
+         }
+         if(isRestricted){
+            sb.append("* (");
+            for (XSFacet facet : declaredFacets) {
+               sb.append(facet.getValue().toString() + '|');
+            }            
+            sb.deleteCharAt(sb.length()-1);
+            sb.append(")</td>\n");         
+         } else{
+            sb.append("</td>\n");
+         }           
 
          // if default value specified in annotation use it
          if (a.getDefaultValue() != null) {