Index: modules/hibernate/src/xdoclet/modules/hibernate/JBossServiceSubTask.java
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/modules/hibernate/src/xdoclet/modules/hibernate/JBossServiceSubTask.java,v
retrieving revision 1.10
diff -u -r1.10 JBossServiceSubTask.java
--- modules/hibernate/src/xdoclet/modules/hibernate/JBossServiceSubTask.java	9 Feb 2004 20:13:38 -0000	1.10
+++ modules/hibernate/src/xdoclet/modules/hibernate/JBossServiceSubTask.java	26 Mar 2004 03:55:47 -0000
@@ -46,6 +46,7 @@
     private String  _password = null;
     private String  _userTransactionName = null;
     private String  _transactionStrategy = null;
+    private String  _cacheProvider = null;
     private String  _depends = null;
 
     private String  _transactionManagerStrategy = null;
@@ -76,6 +77,11 @@
         return _transactionStrategy;
     }
 
+    public String getCacheProvider()
+    {
+        return _cacheProvider;
+    }
+
     public String getDepends()
     {
         return _depends;
@@ -177,6 +183,17 @@
     public void setTransactionStrategy(String transactionStrategy)
     {
         _transactionStrategy = transactionStrategy;
+    }
+
+    /**
+     * The fully qualified class name of the Hibernate <tt>CacheProvider</tt> implementation.
+     *
+     * @param cacheProvider
+     * @ant.not-required
+     */
+    public void setCacheProvider(String cacheProvider)
+    {
+        _cacheProvider = cacheProvider;
     }
 
     /**
Index: modules/hibernate/src/xdoclet/modules/hibernate/resources/hibernate.xdt
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/modules/hibernate/src/xdoclet/modules/hibernate/resources/hibernate.xdt,v
retrieving revision 1.21
diff -u -r1.21 hibernate.xdt
--- modules/hibernate/src/xdoclet/modules/hibernate/resources/hibernate.xdt	16 Feb 2004 21:51:36 -0000	1.21
+++ modules/hibernate/src/xdoclet/modules/hibernate/resources/hibernate.xdt	26 Mar 2004 03:55:47 -0000
@@ -48,8 +48,10 @@
     <XDtHibernate:ifHasPrimitiveId>
         <id
             name="<XDtMethod:propertyName/>"
-            column="<XDtMethod:methodTagValue tagName="hibernate.id" paramName="column" default="<XDtMethod:propertyName/>" />"
             type="<XDtMethod:methodTagValue tagName="hibernate.id" paramName="type" default="<XDtMethod:methodType/>" />"
+          <XDtMethod:ifHasMethodTag tagName="hibernate.id" paramName="column">
+            length="<XDtMethod:methodTagValue tagName="hibernate.id" paramName="column" />"
+          </XDtMethod:ifHasMethodTag>
           <XDtMethod:ifHasMethodTag tagName="hibernate.id" paramName="length">
             length="<XDtMethod:methodTagValue tagName="hibernate.id" paramName="length" />"
           </XDtMethod:ifHasMethodTag>
@@ -71,6 +73,27 @@
                 <param><XDtMethod:methodTagValue tagName="hibernate.id" paramName="generator-parameter-3" /></param>
               </XDtMethod:ifHasMethodTag>
             </generator>
+            <column
+                name="<XDtMethod:methodTagValue tagName="hibernate.column" paramName="name" />"
+              <XDtMethod:ifHasMethodTag tagName="hibernate.column" paramName="length">
+                length="<XDtMethod:methodTagValue tagName="hibernate.column" paramName="length" />"
+              </XDtMethod:ifHasMethodTag>
+              <XDtMethod:ifHasMethodTag tagName="hibernate.column" paramName="unique-key">
+                unique-key="<XDtMethod:methodTagValue tagName="hibernate.column" paramName="unique-key" />"
+              </XDtMethod:ifHasMethodTag>
+              <XDtMethod:ifHasMethodTag tagName="hibernate.column" paramName="index">
+                index="<XDtMethod:methodTagValue tagName="hibernate.column" paramName="index" />"
+              </XDtMethod:ifHasMethodTag>
+              <XDtMethod:ifHasMethodTag tagName="hibernate.column" paramName="not-null">
+                not-null="<XDtMethod:methodTagValue tagName="hibernate.column" paramName="not-null" default="false" />"
+              </XDtMethod:ifHasMethodTag>
+              <XDtMethod:ifHasMethodTag tagName="hibernate.column" paramName="unique">
+                unique="<XDtMethod:methodTagValue tagName="hibernate.column" paramName="unique" default="false" />"
+              </XDtMethod:ifHasMethodTag>
+              <XDtMethod:ifHasMethodTag tagName="hibernate.column" paramName="sql-type">
+                sql-type="<XDtMethod:methodTagValue tagName="hibernate.column" paramName="sql-type" />"
+              </XDtMethod:ifHasMethodTag>
+            />
         </id>
     </XDtHibernate:ifHasPrimitiveId>
     <XDtHibernate:ifHasCompositeId>
Index: modules/hibernate/src/xdoclet/modules/hibernate/resources/jboss-service.xdt
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/modules/hibernate/src/xdoclet/modules/hibernate/resources/jboss-service.xdt,v
retrieving revision 1.10
diff -u -r1.10 jboss-service.xdt
--- modules/hibernate/src/xdoclet/modules/hibernate/resources/jboss-service.xdt	16 Feb 2004 23:49:39 -0000	1.10
+++ modules/hibernate/src/xdoclet/modules/hibernate/resources/jboss-service.xdt	26 Mar 2004 03:55:47 -0000
@@ -30,6 +30,9 @@
      <XDtConfig:ifHasConfigParam paramName="transactionManagerStrategy">
        <attribute name="TransactionManagerLookupStrategy"><XDtConfig:configParameterValue paramName="transactionManagerStrategy"/></attribute>
      </XDtConfig:ifHasConfigParam>
+     <XDtConfig:ifHasConfigParam paramName="cacheProvider">
+       <attribute name="CacheProvider"><XDtConfig:configParameterValue paramName="cacheProvider"/></attribute>
+     </XDtConfig:ifHasConfigParam>
    </mbean>
 
    <XDtMerge:merge file="jboss-service-custom.xdt">