xdoclet-plugins-commits

[Konstantin P. <ko...@us...>]

Update of /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv26483/src/main/java/org/xdoclet/plugin/hibernate

Modified Files:
	HibernateConfigPlugin.java HibernateConfigPlugin.jelly 
Log Message:
fix for XDP-169


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.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** HibernateConfigPlugin.jelly	17 May 2005 13:42:39 -0000	1.8
--- HibernateConfigPlugin.jelly	10 Sep 2006 10:43:04 -0000	1.9
***************
*** 186,189 ****
--- 186,193 ----
                  <property name="hibernate.c3p0.acquire_increment">${plugin.C3p0acquireincrement}</property>
              </j:if>
+             
+             <j:if test="${!empty(plugin.Currentsessioncontextclass)}">
+                 <property name="hibernate.current_session_context_class">${plugin.Currentsessioncontextclass}</property>
+             </j:if>
  
              <j:forEach var="property" items="${plugin.PropertyMap.entrySet()}">

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.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** HibernateConfigPlugin.java	10 Aug 2005 15:42:03 -0000	1.13
--- HibernateConfigPlugin.java	10 Sep 2006 10:43:04 -0000	1.14
***************
*** 36,40 ****
  public class HibernateConfigPlugin extends AbstractHibernatePlugin {
      private Collection allClasses;
-     private Properties props;
      private String c3p0acquireincrement;
      private String c3p0idletestperiod;
--- 36,39 ----
***************
*** 49,52 ****
--- 48,52 ----
      private String cacheusequerycache;
      private String connectionprovider;
+     private String currentsessioncontextclass;
      private String defaultentitymode;
      private String defaultschema;
***************
*** 76,79 ****
--- 76,80 ----
      private String mappingExtension;
      private String maxfetchdepth;
+     private Properties props;
      private String querysubstitutions;
      private String showsql;
***************
*** 99,102 ****
--- 100,310 ----
      }
  
+ 	public String getC3p0acquireincrement() {
+         return c3p0acquireincrement;
+     }
+ 
+ 	public String getC3p0idletestperiod() {
+         return c3p0idletestperiod;
+     }
+ 
+     public String getC3p0maxsize() {
+         return c3p0maxsize;
+     }
+ 
+     public String getC3p0maxstatements() {
+         return c3p0maxstatements;
+     }
+ 
+     public String getC3p0minsize() {
+         return c3p0minsize;
+     }
+ 
+     public String getC3p0timeout() {
+         return c3p0timeout;
+     }
+ 
+     public String getCacheprovider() {
+         return cacheprovider;
+     }
+ 
+     public String getCachequerycachefactory() {
+         return cachequerycachefactory;
+     }
+ 
+     public String getCacheregionprefix() {
+         return cacheregionprefix;
+     }
+ 
+     public String getCacheuseminimalputs() {
+         return cacheuseminimalputs;
+     }
+ 
+     public String getCacheusequerycache() {
+         return cacheusequerycache;
+     }
+ 
+     public String getConnectionprovider() {
+         return connectionprovider;
+     }
+     /**
+      * defines property hibernate.current_session_context_class
+      * @return
+      */
+     public String getCurrentsessioncontextclass() {
+ 		return currentsessioncontextclass;
+ 	}
+     /**
+      * defined 
+      * @return
+      */
+     public String getDefaultentitymode() {
+         return defaultentitymode;
+     }
+ 
+     public String getDefaultschema() {
+         return defaultschema;
+     }
+ 
+     public String getDialect() {
+         return dialect;
+     }
+ 
+     public String getHbm2ddlauto() {
+         return hbm2ddlauto;
+     }
+ 
+     public String getJdbcautocommit() {
+         return jdbcautocommit;
+     }
+ 
+     public String getJdbcautoreconnect() {
+         return jdbcautoreconnect;
+     }
+ 
+     public String getJdbcautoreconnectforpools() {
+         return jdbcautoreconnectforpools;
+     }
+ 
+     public String getJdbcbatchsize() {
+         return jdbcbatchsize;
+     }
+ 
+     public String getJdbcbatchversioneddata() {
+         return jdbcbatchversioneddata;
+     }
+ 
+     public String getJdbcdriver() {
+         return jdbcdriver;
+     }
+ 
+     public String getJdbcfetchsize() {
+         return jdbcfetchsize;
+     }
+ 
+     public String getJdbcisconnectionvalidationrequired() {
+         return jdbcisconnectionvalidationrequired;
+     }
+ 
+     public String getJdbcisolation() {
+         return jdbcisolation;
+     }
+ 
+     public String getJdbcpassword() {
+         return jdbcpassword;
+     }
+ 
+     public String getJdbcpoolsize() {
+         return jdbcpoolsize;
+     }
+ 
+     public String getJdbcurl() {
+         return jdbcurl;
+     }
+ 
+     public String getJdbcusegetgeneratedkeys() {
+         return jdbcusegetgeneratedkeys;
+     }
+ 
+     public String getJdbcusername() {
+         return jdbcusername;
+     }
+ 
+     /**
+      * configure usage of scrolable result set
+      *
+      * @return
+      */
+     public String getJdbcusescrollableresultset() {
+         return jdbcusescrollableresultset;
+     }
+ 
+     public String getJdbcusestreamsforbinary() {
+         return jdbcusestreamsforbinary;
+     }
+ 
+     public String getJndiclass() {
+         return jndiclass;
+     }
+ 
+     public String getJndidatasource() {
+         return jndidatasource;
+     }
+ 
+     public String getJndisessionfactoryname() {
+         return jndisessionfactoryname;
+     }
+ 
+     public String getJndiurl() {
+         return jndiurl;
+     }
+ 
+     public String getJtausertransaction() {
+         return jtausertransaction;
+     }
+ 
+     public Collection getMappedClasses() {
+         if (allClasses == null) {
+             allClasses = metadataProvider.getMetadata();
+         }
+ 
+         return CollectionUtils.select(allClasses, new HasTag("hibernate.class", null, null, false));
+     }
+ 
+     public String getMappingPath(JavaClass clazz) {
+         return clazz.getFullyQualifiedName().replace('.', '/') + mappingExtension;
+     }
+ 
+     public String getMaxfetchdepth() {
+         return maxfetchdepth;
+     }
+ 
+     public Map getPropertyMap() {
+         return props;
+     }
+ 
+     public String getQuerysubstitutions() {
+         return querysubstitutions;
+     }
+ 
+     public String getShowsql() {
+         return showsql;
+     }
+ 
+     public String getTransactionfactory() {
+         return transactionfactory;
+     }
+ 
+     public String getTransactionmanagerlookup() {
+         return transactionmanagerlookup;
+     }
+ 
+     public String getUseouterjoin() {
+         return useouterjoin;
+     }
+ 
+     public String getUsereflectionoptimizer() {
+         return usereflectionoptimizer;
+     }
+ 
      /**
       * hibernate.c3p0.acquire_increment
***************
*** 106,113 ****
      }
  
-     public String getC3p0acquireincrement() {
-         return c3p0acquireincrement;
-     }
- 
      /**
       * hibernate.c3p0.idle_test_period
--- 314,317 ----
***************
*** 117,124 ****
      }
  
-     public String getC3p0idletestperiod() {
-         return c3p0idletestperiod;
-     }
- 
      /**
       * hibernate.c3p0.max_size
--- 321,324 ----
***************
*** 128,135 ****
      }
  
-     public String getC3p0maxsize() {
-         return c3p0maxsize;
-     }
- 
      /**
       * hibernate.c3p0.max_statements
--- 328,331 ----
***************
*** 139,146 ****
      }
  
-     public String getC3p0maxstatements() {
-         return c3p0maxstatements;
-     }
- 
      /**
       * hibernate.c3p0.min_size
--- 335,338 ----
***************
*** 150,157 ****
      }
  
-     public String getC3p0minsize() {
-         return c3p0minsize;
-     }
- 
      /**
       * hibernate.c3p0.timeout
--- 342,345 ----
***************
*** 161,168 ****
      }
  
-     public String getC3p0timeout() {
-         return c3p0timeout;
-     }
- 
      /**
       * hibernate.cache.provider_class
--- 349,352 ----
***************
*** 172,179 ****
      }
  
-     public String getCacheprovider() {
-         return cacheprovider;
-     }
- 
      /**
       * hibernate.cache.query_cache_factory
--- 356,359 ----
***************
*** 183,190 ****
      }
  
-     public String getCachequerycachefactory() {
-         return cachequerycachefactory;
-     }
- 
      /**
       * hibernate.cache.region_prefix
--- 363,366 ----
***************
*** 194,201 ****
      }
  
-     public String getCacheregionprefix() {
-         return cacheregionprefix;
-     }
- 
      /**
       * hibernate.cache.use_minimal_puts
--- 370,373 ----
***************
*** 205,212 ****
      }
  
-     public String getCacheuseminimalputs() {
-         return cacheuseminimalputs;
-     }
- 
      /**
       * hibernate.cache.use_query_cache
--- 377,380 ----
***************
*** 216,223 ****
      }
  
-     public String getCacheusequerycache() {
-         return cacheusequerycache;
-     }
- 
      /**
       * hibernate.connection.provider_class
--- 384,387 ----
***************
*** 227,233 ****
      }
  
!     public String getConnectionprovider() {
!         return connectionprovider;
!     }
  
      /**
--- 391,397 ----
      }
  
!     public void setCurrentsessioncontextclass(String currentSessionContextClass) {
! 		this.currentsessioncontextclass = currentSessionContextClass;
! 	}
  
      /**
***************
*** 238,245 ****
      }
  
-     public String getDefaultentitymode() {
-         return defaultentitymode;
-     }
- 
      /**
       * hibernate.default_schema
--- 402,405 ----
***************
*** 249,256 ****
      }
  
-     public String getDefaultschema() {
-         return defaultschema;
-     }
- 
      /**
       * hibernate.dialect
--- 409,412 ----
***************
*** 260,267 ****
      }
  
-     public String getDialect() {
-         return dialect;
-     }
- 
      /**
       * hibernate.hbm2ddl.auto
--- 416,419 ----
***************
*** 271,278 ****
      }
  
-     public String getHbm2ddlauto() {
-         return hbm2ddlauto;
-     }
- 
      /**
       * hibernate.connection.autocommit
--- 423,426 ----
***************
*** 282,289 ****
      }
  
-     public String getJdbcautocommit() {
-         return jdbcautocommit;
-     }
- 
      /**
       * hibernate.connection.autoReconnect
--- 430,433 ----
***************
*** 293,300 ****
      }
  
-     public String getJdbcautoreconnect() {
-         return jdbcautoreconnect;
-     }
- 
      /**
       * hibernate.connection.autoReconnectForPools
--- 437,440 ----
***************
*** 304,311 ****
      }
  
-     public String getJdbcautoreconnectforpools() {
-         return jdbcautoreconnectforpools;
-     }
- 
      /**
       * hibernate.jdbc.batch_size
--- 444,447 ----
***************
*** 315,322 ****
      }
  
-     public String getJdbcbatchsize() {
-         return jdbcbatchsize;
-     }
- 
      /**
       * hibernate.jdbc.batch_versioned_data
--- 451,454 ----
***************
*** 326,333 ****
      }
  
-     public String getJdbcbatchversioneddata() {
-         return jdbcbatchversioneddata;
-     }
- 
      /**
       * hibernate.connection.driver_class
--- 458,461 ----
***************
*** 337,344 ****
      }
  
-     public String getJdbcdriver() {
-         return jdbcdriver;
-     }
- 
      /**
       * hibernate.jdbc.fetch_size
--- 465,468 ----
***************
*** 348,355 ****
      }
  
-     public String getJdbcfetchsize() {
-         return jdbcfetchsize;
-     }
- 
      /**
       * hibernate.connection.is-connection-validation-required
--- 472,475 ----
***************
*** 359,366 ****
      }
  
-     public String getJdbcisconnectionvalidationrequired() {
-         return jdbcisconnectionvalidationrequired;
-     }
- 
      /**
       * hibernate.connection.isolation
--- 479,482 ----
***************
*** 370,377 ****
      }
  
-     public String getJdbcisolation() {
-         return jdbcisolation;
-     }
- 
      /**
       * hibernate.connection.password
--- 486,489 ----
***************
*** 381,388 ****
      }
  
-     public String getJdbcpassword() {
-         return jdbcpassword;
-     }
- 
      /**
       * hibernate.connection.pool_size
--- 493,496 ----
***************
*** 392,399 ****
      }
  
-     public String getJdbcpoolsize() {
-         return jdbcpoolsize;
-     }
- 
      /**
       * hibernate.connection.url
--- 500,503 ----
***************
*** 403,410 ****
      }
  
-     public String getJdbcurl() {
-         return jdbcurl;
-     }
- 
      /**
       * hibernate.jdbc.use_get_generated_keys
--- 507,510 ----
***************
*** 414,421 ****
      }
  
-     public String getJdbcusegetgeneratedkeys() {
-         return jdbcusegetgeneratedkeys;
-     }
- 
      /**
       * hibernate.connection.username
--- 514,517 ----
***************
*** 425,432 ****
      }
  
-     public String getJdbcusername() {
-         return jdbcusername;
-     }
- 
      /**
       * hibernate.jdbc.use_scrollable_resultset
--- 521,524 ----
***************
*** 437,449 ****
  
      /**
-      * configure usage of scrolable result set
-      *
-      * @return
-      */
-     public String getJdbcusescrollableresultset() {
-         return jdbcusescrollableresultset;
-     }
- 
-     /**
       * hibernate.jdbc.use_streams_for_binary
       */
--- 529,532 ----
***************
*** 452,459 ****
      }
  
-     public String getJdbcusestreamsforbinary() {
-         return jdbcusestreamsforbinary;
-     }
- 
      /**
       * hibernate.jndi.class
--- 535,538 ----
***************
*** 463,470 ****
      }
  
-     public String getJndiclass() {
-         return jndiclass;
-     }
- 
      /**
       * hibernate.connection.datasource
--- 542,545 ----
***************
*** 474,481 ****
      }
  
-     public String getJndidatasource() {
-         return jndidatasource;
-     }
- 
      /**
       * hibernate.session_factory_name
--- 549,552 ----
***************
*** 485,492 ****
      }
  
-     public String getJndisessionfactoryname() {
-         return jndisessionfactoryname;
-     }
- 
      /**
       * hibernate.jndi.url
--- 556,559 ----
***************
*** 496,503 ****
      }
  
-     public String getJndiurl() {
-         return jndiurl;
-     }
- 
      /**
       * jta.UserTransaction
--- 563,566 ----
***************
*** 507,526 ****
      }
  
-     public String getJtausertransaction() {
-         return jtausertransaction;
-     }
- 
-     public Collection getMappedClasses() {
-         if (allClasses == null) {
-             allClasses = metadataProvider.getMetadata();
-         }
- 
-         return CollectionUtils.select(allClasses, new HasTag("hibernate.class", null, null, false));
-     }
- 
-     public String getMappingPath(JavaClass clazz) {
-         return clazz.getFullyQualifiedName().replace('.', '/') + mappingExtension;
-     }
- 
      public void setMappingextension(String mappingExtension) {
          this.mappingExtension = mappingExtension;
--- 570,573 ----
***************
*** 534,541 ****
      }
  
-     public String getMaxfetchdepth() {
-         return maxfetchdepth;
-     }
- 
      /**
       * file name of properties file containing hibernate properties
--- 581,584 ----
***************
*** 559,566 ****
      }
  
-     public Map getPropertyMap() {
-         return props;
-     }
- 
      /**
       * hibernate.query.substitutions
--- 602,605 ----
***************
*** 570,577 ****
      }
  
-     public String getQuerysubstitutions() {
-         return querysubstitutions;
-     }
- 
      /**
       * hibernate.show_sql
--- 609,612 ----
***************
*** 581,588 ****
      }
  
-     public String getShowsql() {
-         return showsql;
-     }
- 
      /**
       * hibernate.transaction.factory_class
--- 616,619 ----
***************
*** 592,599 ****
      }
  
-     public String getTransactionfactory() {
-         return transactionfactory;
-     }
- 
      /**
       * hibernate.transaction.manager_lookup_class
--- 623,626 ----
***************
*** 603,610 ****
      }
  
-     public String getTransactionmanagerlookup() {
-         return transactionmanagerlookup;
-     }
- 
      /**
       * hibernate.use_outer_join
--- 630,633 ----
***************
*** 614,621 ****
      }
  
-     public String getUseouterjoin() {
-         return useouterjoin;
-     }
- 
      /**
       * hibernate.cglib.use_reflection_optimizer
--- 637,640 ----
***************
*** 624,630 ****
          this.usereflectionoptimizer = usereflectionoptimizer;
      }
- 
-     public String getUsereflectionoptimizer() {
-         return usereflectionoptimizer;
-     }
  }
\ No newline at end of file
--- 643,645 ----