db-torque-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tfisc...@apache.org
Subject svn commit: r1373800 - in /db/torque/torque4/trunk/torque-templates: ./ src/main/resources/org/apache/torque/templates/om/outlets/ src/main/resources/org/apache/torque/templates/om/templates/peer/base/ src/main/resources/org/apache/torque/templates/om/...
Date Thu, 16 Aug 2012 12:26:05 GMT
Author: tfischer
Date: Thu Aug 16 12:26:04 2012
New Revision: 1373800

URL: http://svn.apache.org/viewvc?rev=1373800&view=rev
Log:
TORQUE-220 removed commented-out mergepoints and unused templates

Removed:
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/addSelectColumns.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/correctBooleans.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/getTableMap.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/resultSet2Objects.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/setDbName.vm
Modified:
    db/torque/torque4/trunk/torque-templates/   (props changed)
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/outlets/peer.xml
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/getTableMap.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/basePeerForViewImpl.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/basePeerImpl.vm

Propchange: db/torque/torque4/trunk/torque-templates/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Aug 16 12:26:04 2012
@@ -3,3 +3,4 @@ target
 .settings
 .classpath
 .checkstyle
+checkstyle-cache.ccf

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/outlets/peer.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/outlets/peer.xml?rev=1373800&r1=1373799&r2=1373800&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/outlets/peer.xml
(original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/outlets/peer.xml
Thu Aug 16 12:26:04 2012
@@ -70,18 +70,9 @@
     <mergepoint name="serialVersionUid">
       <action xsi:type="applyAction" outlet="torque.om.serialVersionUid"/>
     </mergepoint>
-    <mergepoint name="resultSet2Objects">
-      <action xsi:type="applyAction" outlet="torque.om.peer.impl.base.resultSet2Objects"/>
-    </mergepoint>
     <mergepoint name="doInsert">
       <action xsi:type="applyAction" outlet="torque.om.peer.impl.base.doInsert"/>
     </mergepoint>
-    <mergepoint name="addSelectColumns">
-      <action xsi:type="applyAction" outlet="torque.om.peer.impl.base.addSelectColumns"/>
-    </mergepoint>
-    <mergepoint name="correctBooleans">
-      <action xsi:type="applyAction" outlet="torque.om.peer.impl.base.correctBooleans"/>
-    </mergepoint>
     <mergepoint name="doSelect">
       <action xsi:type="applyAction" outlet="torque.om.peer.impl.base.doSelect"/>
     </mergepoint>
@@ -134,12 +125,6 @@
       <action xsi:type="applyAction"
           outlet="torque.om.peer.impl.base.fillerChunkSizeGetter"/>
     </mergepoint>
-    <mergepoint name="getTableMap">
-      <action xsi:type="applyAction" outlet="torque.om.peer.impl.base.getTableMap"/>
-    </mergepoint>
-    <mergepoint name="setDbName">
-      <action xsi:type="applyAction" outlet="torque.om.peer.impl.base.setDbName"/>
-    </mergepoint>
     <mergepoint name="extensions" />
   </outlet>
 
@@ -158,15 +143,6 @@
     <mergepoint name="serialVersionUid">
       <action xsi:type="applyAction" outlet="torque.om.serialVersionUid"/>
     </mergepoint>
-    <mergepoint name="resultSet2Objects">
-      <action xsi:type="applyAction" outlet="torque.om.peer.impl.base.resultSet2Objects"/>
-    </mergepoint>
-    <mergepoint name="addSelectColumns">
-      <action xsi:type="applyAction" outlet="torque.om.peer.impl.base.addSelectColumns"/>
-    </mergepoint>
-    <mergepoint name="correctBooleans">
-      <action xsi:type="applyAction" outlet="torque.om.peer.impl.base.correctBooleans"/>
-    </mergepoint>
     <mergepoint name="doSelect">
       <action xsi:type="applyAction" outlet="torque.om.peer.impl.base.doSelect"/>
     </mergepoint>
@@ -185,12 +161,6 @@
     <mergepoint name="retrieveByPKs">
       <action xsi:type="applyAction" outlet="torque.om.peer.impl.base.retrieveByPKs"/>
     </mergepoint>
-    <mergepoint name="getTableMap">
-      <action xsi:type="applyAction" outlet="torque.om.peer.impl.base.getTableMap"/>
-    </mergepoint>
-    <mergepoint name="setDbName">
-      <action xsi:type="applyAction" outlet="torque.om.peer.impl.base.setDbName"/>
-    </mergepoint>
     <mergepoint name="extensions" />
   </outlet>
 
@@ -209,26 +179,11 @@
       path="peer/impl/base/log.vm">
   </outlet>
 
- <outlet name="torque.om.peer.impl.base.resultSet2Objects"
-      xsi:type="velocityOutlet"
-      path="peer/impl/base/resultSet2Objects.vm">
-  </outlet>
-
   <outlet name="torque.om.peer.impl.base.doInsert"
       xsi:type="velocityOutlet"
       path="peer/impl/base/doInsert.vm">
   </outlet>
 
-  <outlet name="torque.om.peer.impl.base.addSelectColumns"
-      xsi:type="velocityOutlet"
-      path="peer/impl/base/addSelectColumns.vm">
-  </outlet>
-
-  <outlet name="torque.om.peer.impl.base.correctBooleans"
-      xsi:type="velocityOutlet"
-      path="peer/impl/base/correctBooleans.vm">
-  </outlet>
-
   <outlet name="torque.om.peer.impl.base.doSelect"
       xsi:type="velocityOutlet"
       path="peer/impl/base/doSelect.vm">
@@ -299,16 +254,6 @@
       path="peer/impl/base/fillerChunkSizeGetter.vm">
   </outlet>
 
-  <outlet name="torque.om.peer.impl.base.getTableMap"
-      xsi:type="velocityOutlet"
-      path="peer/impl/base/getTableMap.vm">
-  </outlet>
-
-  <outlet name="torque.om.peer.impl.base.setDbName"
-      xsi:type="velocityOutlet"
-      path="peer/impl/base/setDbName.vm">
-  </outlet>
-
   <outlet name="torque.om.basePeer"
       xsi:type="velocityOutlet"
       path="peer/base/basePeer.vm">
@@ -365,7 +310,7 @@
     <mergepoint name="correctBooleans">
       <action xsi:type="applyAction" outlet="torque.om.peer.base.correctBooleans"/>
     </mergepoint>
-    <mergepoint name="doSelect">
+     <mergepoint name="doSelect">
       <action xsi:type="applyAction" outlet="torque.om.peer.base.doSelect"/>
     </mergepoint>
     <mergepoint name="getDbObjectInstance">

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/getTableMap.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/getTableMap.vm?rev=1373800&r1=1373799&r2=1373800&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/getTableMap.vm
(original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/getTableMap.vm
Thu Aug 16 12:26:04 2012
@@ -25,8 +25,9 @@
     /**
      * Returns the TableMap related to this peer.
      *
-     * @throws TorqueException Any exceptions caught during processing will be
-     *         rethrown wrapped into a TorqueException.
+     * @return the table map, not null.
+     *
+     * @throws TorqueException if the Peer instance does not hold a Table map.
      */
     public static TableMap getTableMap()
         throws TorqueException

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/basePeerForViewImpl.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/basePeerForViewImpl.vm?rev=1373800&r1=1373799&r2=1373800&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/basePeerForViewImpl.vm
(original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/basePeerForViewImpl.vm
Thu Aug 16 12:26:04 2012
@@ -41,9 +41,6 @@ $torqueGen.mergepoint("log")
 
 $torqueGen.mergepoint("serialVersionUid")
 
-##$torqueGen.mergepoint("resultSet2Objects")
-##$torqueGen.mergepoint("addSelectColumns")
-##$torqueGen.mergepoint("correctBooleans")
 $torqueGen.mergepoint("doSelect")
 $torqueGen.mergepoint("getDbObjectInstance")
 $torqueGen.mergepoint("doInsert")
@@ -68,7 +65,5 @@ $torqueGen.mergepoint("fillReferencingOb
 $torqueGen.mergepoint("fillerChunkSizeGetter")
   #end
 #end
-##$torqueGen.mergepoint("getTableMap")
-##$torqueGen.mergepoint("setDbName")
 $torqueGen.mergepoint("extensions")
 }

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/basePeerImpl.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/basePeerImpl.vm?rev=1373800&r1=1373799&r2=1373800&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/basePeerImpl.vm
(original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/basePeerImpl.vm
Thu Aug 16 12:26:04 2012
@@ -41,9 +41,6 @@ $torqueGen.mergepoint("log")
 
 $torqueGen.mergepoint("serialVersionUid")
 
-##$torqueGen.mergepoint("resultSet2Objects")
-##$torqueGen.mergepoint("addSelectColumns")
-##$torqueGen.mergepoint("correctBooleans")
 $torqueGen.mergepoint("doSelect")
 $torqueGen.mergepoint("getDbObjectInstance")
 $torqueGen.mergepoint("doInsert")
@@ -68,7 +65,5 @@ $torqueGen.mergepoint("fillReferencingOb
 $torqueGen.mergepoint("fillerChunkSizeGetter")
   #end
 #end
-##$torqueGen.mergepoint("getTableMap")
-##$torqueGen.mergepoint("setDbName")
 $torqueGen.mergepoint("extensions")
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org
For additional commands, e-mail: torque-dev-help@db.apache.org


Mime
View raw message