db-torque-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tfisc...@apache.org
Subject svn commit: r327832 - in /db/torque: generator/trunk/src/conf/default.properties maven-plugin/trunk/plugin.properties runtime/trunk/xdocs/changes.xml templates/trunk/src/templates/om/Control.vm
Date Sun, 23 Oct 2005 18:28:41 GMT
Author: tfischer
Date: Sun Oct 23 11:28:20 2005
New Revision: 327832

URL: http://svn.apache.org/viewcvs?rev=327832&view=rev
Log:
define subpackage defaults in the properties files of the mavem plugin and the ant build instead
of in the templates

Modified:
    db/torque/generator/trunk/src/conf/default.properties
    db/torque/maven-plugin/trunk/plugin.properties
    db/torque/runtime/trunk/xdocs/changes.xml
    db/torque/templates/trunk/src/templates/om/Control.vm

Modified: db/torque/generator/trunk/src/conf/default.properties
URL: http://svn.apache.org/viewcvs/db/torque/generator/trunk/src/conf/default.properties?rev=327832&r1=327831&r2=327832&view=diff
==============================================================================
--- db/torque/generator/trunk/src/conf/default.properties (original)
+++ db/torque/generator/trunk/src/conf/default.properties Sun Oct 23 11:28:20 2005
@@ -103,6 +103,10 @@
 torque.generateBeans = false
 torque.beanSuffix = Bean
 
+torque.subpackage.base.bean = bean
+torque.subpackage.bean = bean
+torque.subpackage.map = map
+
 torque.omzip.src.base = false
 torque.omzip.src.extension = false
 torque.omzip.bin.base = false

Modified: db/torque/maven-plugin/trunk/plugin.properties
URL: http://svn.apache.org/viewcvs/db/torque/maven-plugin/trunk/plugin.properties?rev=327832&r1=327831&r2=327832&view=diff
==============================================================================
--- db/torque/maven-plugin/trunk/plugin.properties (original)
+++ db/torque/maven-plugin/trunk/plugin.properties Sun Oct 23 11:28:20 2005
@@ -131,6 +131,10 @@
 torque.generateBeans = ${generateBeans}
 torque.beanSuffix = ${beanSuffix}
 
+torque.subpackage.base.bean = bean
+torque.subpackage.bean = bean
+torque.subpackage.map = map
+
 torque.omzip.src.base = false
 torque.omzip.src.extension = false
 torque.omzip.bin.base = false

Modified: db/torque/runtime/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/db/torque/runtime/trunk/xdocs/changes.xml?rev=327832&r1=327831&r2=327832&view=diff
==============================================================================
--- db/torque/runtime/trunk/xdocs/changes.xml (original)
+++ db/torque/runtime/trunk/xdocs/changes.xml Sun Oct 23 11:28:20 2005
@@ -26,6 +26,14 @@
   <body>
 
   <release version="3.2-rc3-dev" date="in SVN">
+    <action type="update" dev="tfischer">
+      The default values of the generator options 
+      torque.subpackage.base.bean,
+      torque.subpackage.bean,
+      and torque.subpackage.map
+      are now defined in the property files plugin.properties (for maven) 
+      and default.properties (for ant) instead of in the templates
+    </action>
     <action type="fix" dev="tfischer" issue="TRQS322">
       The DataSourceFactory with the name "default" is created 
       automatically again. This was removed when fixing TRQS308,

Modified: db/torque/templates/trunk/src/templates/om/Control.vm
URL: http://svn.apache.org/viewcvs/db/torque/templates/trunk/src/templates/om/Control.vm?rev=327832&r1=327831&r2=327832&view=diff
==============================================================================
--- db/torque/templates/trunk/src/templates/om/Control.vm (original)
+++ db/torque/templates/trunk/src/templates/om/Control.vm Sun Oct 23 11:28:20 2005
@@ -40,7 +40,7 @@
     #if ($subpackageMap)
       #set ($packageMap = "${package}.${subpackageMap}")
     #else
-      #set ($packageMap = "${package}.map")
+      #set ($packageMap = "${package}")
     #end
 
     #if ($subpackageManager)
@@ -52,7 +52,7 @@
     #if ($subpackageBean)
       #set ($packageBean = "${package}.${subpackageBean}")
     #else
-      #set ($packageBean = "${package}.bean")
+      #set ($packageBean = "${package}")
     #end
 
     #if ($subpackageBase)
@@ -68,7 +68,7 @@
     #if ($subpackageBaseBean)
       #set ($packageBaseBean = "${package}.${subpackageBaseBean}")
     #else
-      #set ($packageBaseBean = "${package}.bean")
+      #set ($packageBaseBean = "${package}")
     #end
 
     Peers generated in package $packagePeer



---------------------------------------------------------------------
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