[Generator-rt-devel] generator_runtime/src/java/generator/runtime/controller GetSingleFieldFromSessionController.java, 1.8, 1.9 UpdateController.java, 1.19, 1.20

[Rick K. <ric...@us...>]

Update of /cvsroot/generator-rt/generator_runtime/src/java/generator/runtime/controller
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv11801/src/java/generator/runtime/controller

Modified Files:
	GetSingleFieldFromSessionController.java UpdateController.java 
Log Message:
A bunch of translation tag changes and addons to the velocity mail rendering. A fix to the DBConnectionPool keep alive process also included.

Index: GetSingleFieldFromSessionController.java
===================================================================
RCS file: /cvsroot/generator-rt/generator_runtime/src/java/generator/runtime/controller/GetSingleFieldFromSessionController.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** GetSingleFieldFromSessionController.java	21 Oct 2008 10:52:47 -0000	1.8
--- GetSingleFieldFromSessionController.java	5 Apr 2010 02:31:41 -0000	1.9
***************
*** 45,51 ****
   *        session-like object gets the stored item</td></tr>
   *   
-  *   <tr><td>isRemove</td><td>false</td><td>boolean</td>
-  *      <td>True if we want to remove this cookie/session/context item</td></tr>
-  *   
   *   <tr><td>attributeName</td><td>null</td><td>String</td>
   *      <td>The name of the attribute to copy into the session/context/cookie</td></tr>
--- 45,48 ----

Index: UpdateController.java
===================================================================
RCS file: /cvsroot/generator-rt/generator_runtime/src/java/generator/runtime/controller/UpdateController.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** UpdateController.java	21 Oct 2008 10:52:47 -0000	1.19
--- UpdateController.java	5 Apr 2010 02:31:41 -0000	1.20
***************
*** 100,105 ****
                      clsVOArray[n] = Class.forName(valueObjectClassArray[n]);
  
!                     String primaryKeyStr = (String) ReflectionUtils.getAttributeUsingGetter(
!                             formPKFieldArray[n], form);
  
                      if (!ParamUtils.nvl(primaryKeyStr, "").equals("")) {
--- 100,108 ----
                      clsVOArray[n] = Class.forName(valueObjectClassArray[n]);
  
!                     String primaryKeyStr = null;
!                     if ( (n < formPKFieldArray.length) && formPKFieldArray[n] != null) {
!                         primaryKeyStr = (String) ReflectionUtils.getAttributeUsingGetter(
!                                 formPKFieldArray[n], form);
!                     }
  
                      if (!ParamUtils.nvl(primaryKeyStr, "").equals("")) {
***************
*** 167,173 ****
                          }
  
!                         insertOneVO(peerNameArray[n], transferArgs[n]);
                      } else if ((n >= insertOnlyArray.length) || !insertOnlyArray[n].equals("true")) {
!                         updateOneVO(peerNameArray[n], transferArgs[n]);
                      } else {
                          log.warning("Skipping insert of " + clsVOArray[n] + 
--- 170,176 ----
                          }
  
!                         insertOneVO(peerNameArray[n], transferArgs[n], attributes);
                      } else if ((n >= insertOnlyArray.length) || !insertOnlyArray[n].equals("true")) {
!                         updateOneVO(peerNameArray[n], transferArgs[n], attributes);
                      } else {
                          log.warning("Skipping insert of " + clsVOArray[n] + 
***************
*** 225,229 ****
                  }
  
!                 deleteOneVO(peerNameArray[n], deleteObject);
                  log.debug("Delete successful: peer=" + peerNameArray[n] + ",pk=" + fieldValue);
              }
--- 228,232 ----
                  }
  
!                 deleteOneVO(peerNameArray[n], deleteObject, attributes);
                  log.debug("Delete successful: peer=" + peerNameArray[n] + ",pk=" + fieldValue);
              }
***************
*** 236,240 ****
       * Override to perform specific actions on insert of each VO
       */
!     protected void insertOneVO(String peerName, Object vo) {
          dbInsert(peerName, vo);
      }
--- 239,243 ----
       * Override to perform specific actions on insert of each VO
       */
!     protected void insertOneVO(String peerName, Object vo, Map attributes) {
          dbInsert(peerName, vo);
      }
***************
*** 242,246 ****
       * Override to perform specific actions on update of each VO
       */
!     protected void updateOneVO(String peerName, Object vo) {
          dbUpdate(peerName, vo);
      }
--- 245,249 ----
       * Override to perform specific actions on update of each VO
       */
!     protected void updateOneVO(String peerName, Object vo, Map attributes) {
          dbUpdate(peerName, vo);
      }
***************
*** 248,252 ****
       * Override to perform specific actions on delete of each VO
       */
!     protected void deleteOneVO(String peerName, Object vo) {
          dbDelete(peerName, vo);
      }
--- 251,255 ----
       * Override to perform specific actions on delete of each VO
       */
!     protected void deleteOneVO(String peerName, Object vo, Map attributes) {
          dbDelete(peerName, vo);
      }