Update of
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17901/src/main/java/org/xdoclet/plugin/hibernate
Modified Files:
Class.jelly HibernateConfigPlugin.java
HibernateConfigPlugin.jelly
Log Message:
(XDP-57) Apply patch
Index: HibernateConfigPlugin.jelly
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/HibernateConfigPlugin.jelly,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** HibernateConfigPlugin.jelly 13 May 2005 08:10:11 -0000 1.7
--- HibernateConfigPlugin.jelly 17 May 2005 13:42:39 -0000 1.8
***************
*** 27,30 ****
--- 27,46 ----
</j:if>
+ <j:if test="${!empty(plugin.Jdbcautocommit)}">
+ <property
name="hibernate.connection.autocommit">${plugin.Jdbcautocommit}</property>
+ </j:if>
+
+ <j:if test="${!empty(plugin.Jdbcautoreconnect)}">
+ <property
name="hibernate.connection.autoReconnect">${plugin.Jdbcautoreconnect}</property>
+ </j:if>
+
+ <j:if test="${!empty(plugin.Jdbcautoreconnectforpools)}">
+ <property
name="hibernate.connection.autoReconnectForPools">${plugin.Jdbcautoreconnectforpools}</property>
+ </j:if>
+
+ <j:if test="${!empty(plugin.Jdbcisconnectionvalidationrequired)}">
+ <property
name="hibernate.connection.is-connection-validation-required">${plugin.Jdbcisconnectionvalidationrequired}</property>
+ </j:if>
+
<j:if test="${!empty(plugin.Jdbcpoolsize)}">
<property
name="hibernate.connection.pool_size">${plugin.Jdbcpoolsize}</property>
***************
*** 87,90 ****
--- 103,110 ----
</j:if>
+ <j:if test="${!empty(plugin.Defaultentitymode)}">
+ <property
name="hibernate.default_entity_mode">${plugin.Defaultentitymode}</property>
+ </j:if>
+
<j:if test="${!empty(plugin.Jndisessionfactoryname)}">
<property
name="hibernate.session_factory_name">${plugin.Jndisessionfactoryname}</property>
***************
*** 143,146 ****
--- 163,190 ----
</j:if>
+ <j:if test="${!empty(plugin.C3p0maxsize)}">
+ <property
name="hibernate.c3p0.max_size">${plugin.C3p0maxsize}</property>
+ </j:if>
+
+ <j:if test="${!empty(plugin.C3p0minsize)}">
+ <property
name="hibernate.c3p0.min_size">${plugin.C3p0minsize}</property>
+ </j:if>
+
+ <j:if test="${!empty(plugin.C3p0timeout)}">
+ <property
name="hibernate.c3p0.timeout">${plugin.C3p0timeout}</property>
+ </j:if>
+
+ <j:if test="${!empty(plugin.C3p0maxstatements)}">
+ <property
name="hibernate.c3p0.max_statements">${plugin.C3p0maxstatements}</property>
+ </j:if>
+
+ <j:if test="${!empty(plugin.C3p0idletestperiod)}">
+ <property
name="hibernate.c3p0.idle_test_period">${plugin.C3p0idletestperiod}</property>
+ </j:if>
+
+ <j:if test="${!empty(plugin.C3p0acquireincrement)}">
+ <property
name="hibernate.c3p0.acquire_increment">${plugin.C3p0acquireincrement}</property>
+ </j:if>
+
<j:forEach var="property"
items="${plugin.PropertyMap.entrySet()}">
<property name="${property.Key}">${property.Value}</property>
Index: Class.jelly
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/Class.jelly,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Class.jelly 13 May 2005 07:50:37 -0000 1.17
--- Class.jelly 17 May 2005 13:42:38 -0000 1.18
***************
*** 163,183 ****
<!-- queries todo: refactor it -->
<j:forEach var="query"
items="${metadata.getTagsByName('hibernate.query',true)}">
! <query name="${query.name_}"><![CDATA[${query.query}]]></query>
</j:forEach>
<j:forEach var="subclass"
items="${plugin.getSubclasses(metadata,'hibernate.subclass')}">
<j:forEach var="query"
items="${subclass.getTagsByName('hibernate.query',false)}">
! <query
name="${query.name_}"><![CDATA[${query.query}]]></query>
</j:forEach>
</j:forEach>
<j:forEach var="subclass"
items="${plugin.getSubclasses(metadata,'hibernate.joined-subclass')}">
<j:forEach var="query"
items="${subclass.getTagsByName('hibernate.query',false)}">
! <query
name="${query.name_}"><![CDATA[${query.query}]]></query>
</j:forEach>
</j:forEach>
<j:forEach var="subclass"
items="${plugin.getSubclasses(metadata,'hibernate.union-subclass')}">
<j:forEach var="query"
items="${subclass.getTagsByName('hibernate.query',false)}">
! <query
name="${query.name_}"><![CDATA[${query.query}]]></query>
</j:forEach>
</j:forEach>
</j:jelly>
\ No newline at end of file
--- 163,198 ----
<!-- queries todo: refactor it -->
<j:forEach var="query"
items="${metadata.getTagsByName('hibernate.query',true)}">
! <query name="${query.name_}" cacheable="${query.cacheable}"
cache-region="${query.cacheRegion}">
! <j:if test="${!empty(query.representation)}">
! <representation name="${query.representation}"/>
! </j:if>
! <![CDATA[${query.query}]]>
! </query>
</j:forEach>
<j:forEach var="subclass"
items="${plugin.getSubclasses(metadata,'hibernate.subclass')}">
<j:forEach var="query"
items="${subclass.getTagsByName('hibernate.query',false)}">
! <query name="${query.name_}" cacheable="${query.cacheable}"
cache-region="${query.cacheRegion}"><![CDATA[${query.query}]]></query>
</j:forEach>
</j:forEach>
<j:forEach var="subclass"
items="${plugin.getSubclasses(metadata,'hibernate.joined-subclass')}">
<j:forEach var="query"
items="${subclass.getTagsByName('hibernate.query',false)}">
! <query name="${query.name_}" cacheable="${query.cacheable}"
cache-region="${query.cacheRegion}"><![CDATA[${query.query}]]></query>
</j:forEach>
</j:forEach>
<j:forEach var="subclass"
items="${plugin.getSubclasses(metadata,'hibernate.union-subclass')}">
<j:forEach var="query"
items="${subclass.getTagsByName('hibernate.query',false)}">
! <query name="${query.name_}" cacheable="${query.cacheable}"
cache-region="${query.cacheRegion}"><![CDATA[${query.query}]]></query>
</j:forEach>
</j:forEach>
+ <!--sql-queries -->
+ <j:forEach var="query"
items="${metadata.getTagsByName('hibernate.sql-query',true)}">
+ <sql-query name="${query.name_}" cacheable="${query.cacheable}"
cache-region="${query.cacheRegion}">
+ <j:if test="${!empty(query.returnScalarType) ||
!empty(query.returnScalarColumn)}">
+ <return-scalar type="${query.returnScalarType}"
column="${query.returnScalarColumn}"/>
+ </j:if>
+ <![CDATA[${query.query}]]>
+ </sql-query>
+ </j:forEach>
+
</j:jelly>
\ No newline at end of file
Index: HibernateConfigPlugin.java
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/HibernateConfigPlugin.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** HibernateConfigPlugin.java 6 May 2005 08:09:40 -0000 1.9
--- HibernateConfigPlugin.java 17 May 2005 13:42:38 -0000 1.10
***************
*** 34,37 ****
--- 34,43 ----
private Collection allClasses;
private Properties props;
+ private String c3p0acquireincrement;
+ private String c3p0idletestperiod;
+ private String c3p0maxsize;
+ private String c3p0maxstatements;
+ private String c3p0minsize;
+ private String c3p0timeout;
private String cacheprovider;
private String cachequerycachefactory;
***************
*** 40,50 ****
--- 46,61 ----
private String cacheusequerycache;
private String connectionprovider;
+ private String defaultentitymode;
private String defaultschema;
private String dialect;
private String hbm2ddlauto;
+ private String jdbcautocommit;
+ private String jdbcautoreconnect;
+ private String jdbcautoreconnectforpools;
private String jdbcbatchsize;
private String jdbcbatchversioneddata;
private String jdbcdriver;
private String jdbcfetchsize;
+ private String jdbcisconnectionvalidationrequired;
private String jdbcisolation;
private String jdbcpassword;
***************
*** 80,83 ****
--- 91,160 ----
/**
+ * hibernate.c3p0.acquire_increment
+ */
+ public void setC3p0acquireincrement(String c3p0acquireincrement) {
+ this.c3p0acquireincrement = c3p0acquireincrement;
+ }
+
+ public String getC3p0acquireincrement() {
+ return c3p0acquireincrement;
+ }
+
+ /**
+ * hibernate.c3p0.idle_test_period
+ */
+ public void setC3p0idletestperiod(String c3p0idletestperiod) {
+ this.c3p0idletestperiod = c3p0idletestperiod;
+ }
+
+ public String getC3p0idletestperiod() {
+ return c3p0idletestperiod;
+ }
+
+ /**
+ * hibernate.c3p0.max_size
+ */
+ public void setC3p0maxsize(String c3p0maxsize) {
+ this.c3p0maxsize = c3p0maxsize;
+ }
+
+ public String getC3p0maxsize() {
+ return c3p0maxsize;
+ }
+
+ /**
+ * hibernate.c3p0.max_statements
+ */
+ public void setC3p0maxstatements(String c3p0maxstatements) {
+ this.c3p0maxstatements = c3p0maxstatements;
+ }
+
+ public String getC3p0maxstatements() {
+ return c3p0maxstatements;
+ }
+
+ /**
+ * hibernate.c3p0.min_size
+ */
+ public void setC3p0minsize(String c3p0minsize) {
+ this.c3p0minsize = c3p0minsize;
+ }
+
+ public String getC3p0minsize() {
+ return c3p0minsize;
+ }
+
+ /**
+ * hibernate.c3p0.timeout
+ */
+ public void setC3p0timeout(String c3p0timeout) {
+ this.c3p0timeout = c3p0timeout;
+ }
+
+ public String getC3p0timeout() {
+ return c3p0timeout;
+ }
+
+ /**
* hibernate.cache.provider_class
*/
***************
*** 130,136 ****
}
- /**
- * hibernate.cache.use_query_cache
- */
public String getCacheusequerycache() {
return cacheusequerycache;
--- 207,210 ----
***************
*** 149,152 ****
--- 223,237 ----
/**
+ * hibernate.default_entity_mode
+ */
+ public void setDefaultentitymode(String defaultentitymode) {
+ this.defaultentitymode = defaultentitymode;
+ }
+
+ public String getDefaultentitymode() {
+ return defaultentitymode;
+ }
+
+ /**
* hibernate.default_schema
*/
***************
*** 182,185 ****
--- 267,303 ----
/**
+ * hibernate.connection.autocommit
+ */
+ public void setJdbcautocommit(String jdbcautocommit) {
+ this.jdbcautocommit = jdbcautocommit;
+ }
+
+ public String getJdbcautocommit() {
+ return jdbcautocommit;
+ }
+
+ /**
+ * hibernate.connection.autoReconnect
+ */
+ public void setJdbcautoreconnect(String jdbcautoreconnect) {
+ this.jdbcautoreconnect = jdbcautoreconnect;
+ }
+
+ public String getJdbcautoreconnect() {
+ return jdbcautoreconnect;
+ }
+
+ /**
+ * hibernate.connection.autoReconnectForPools
+ */
+ public void setJdbcautoreconnectforpools(String
jdbcautoreconnectforpools) {
+ this.jdbcautoreconnectforpools = jdbcautoreconnectforpools;
+ }
+
+ public String getJdbcautoreconnectforpools() {
+ return jdbcautoreconnectforpools;
+ }
+
+ /**
* hibernate.jdbc.batch_size
*/
***************
*** 226,229 ****
--- 344,358 ----
/**
+ * hibernate.connection.is-connection-validation-required
+ */
+ public void setJdbcisconnectionvalidationrequired(String
jdbcisconnectionvalidationrequired) {
+ this.jdbcisconnectionvalidationrequired =
jdbcisconnectionvalidationrequired;
+ }
+
+ public String getJdbcisconnectionvalidationrequired() {
+ return jdbcisconnectionvalidationrequired;
+ }
+
+ /**
* hibernate.connection.isolation
*/
-------------------------------------------------------
This SF.Net email is sponsored by Oracle Space Sweepstakes
Want to be the first software developer in space?
Enter now for the Oracle Space Sweepstakes!
http://ads.osdn.com/?ad_id=7412&alloc_id=16344&op=click
_______________________________________________
xdoclet-plugins-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xdoclet-plugins-commits
