torque-dev@db.apache.org Archives

Build failed in Jenkins: torque4-test-project-derby #343

2013-05-20T01:38:39Z

See 

------------------------------------------
[...truncated 1713 lines...]
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing output torque.om.baseManagerForView
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - No start Elements found for path all-views/view
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - No start Elements found for path all-views/view
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - No start Elements found for path all-views/view
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - No start Elements found for path all-views/view
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - No start Elements found for path all-views/view
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - No start Elements found for path all-views/view
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - No start Elements found for path all-views/view
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - No start Elements found for path all-views/view
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - No start Elements found for path all-views/view
[INFO] Generation successful
[INFO] [torque:generate {execution: generate-sql}]
INFO  org.apache.torque.generator.control.Controller - readConfiguration() : Starting to read
configuration files
May 20, 2013 1:37:44 AM org.codehaus.groovy.runtime.m12n.SimpleExtensionModule getMetaMethods
WARNING: Module [groovy-all] - Unable to load extension class [class org.codehaus.groovy.jsr223.ScriptExtensions]
due to [javax/script/ScriptEngine]. Maybe this module is not supported by your JVM version.
May 20, 2013 1:37:44 AM org.codehaus.groovy.runtime.m12n.SimpleExtensionModule getMetaMethods
WARNING: Module [groovy-all] - Unable to load extension class [class org.codehaus.groovy.jsr223.ScriptStaticExtensions]
due to [javax/script/ScriptEngineManager]. Maybe this module is not supported by your JVM
version.
INFO  org.apache.torque.generator.control.Controller - readConfiguration() : Configuration
read.
INFO  org.apache.torque.generator.control.Controller - Processing output torque.sql.ddl
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
[INFO] Generation successful
[INFO] [torque:generate {execution: generate-createdb-sql}]
INFO  org.apache.torque.generator.control.Controller - readConfiguration() : Starting to read
configuration files
INFO  org.apache.torque.generator.control.Controller - readConfiguration() : Configuration
read.
INFO  org.apache.torque.generator.control.Controller - Processing output torque.sql.createdb
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
[INFO] Generation successful
[INFO] [torque:generate {execution: generate-idtable-sql}]
INFO  org.apache.torque.generator.control.Controller - readConfiguration() : Starting to read
configuration files
INFO  org.apache.torque.generator.control.Controller - readConfiguration() : Configuration
read.
INFO  org.apache.torque.generator.control.Controller - Processing output torque.sql.idtable.idtable
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
[INFO] Generation successful
[INFO] [torque:generate {execution: generate-html-doc}]
INFO  org.apache.torque.generator.control.Controller - readConfiguration() : Starting to read
configuration files
INFO  org.apache.torque.generator.control.Controller - readConfiguration() : Configuration
read.
INFO  org.apache.torque.generator.control.Controller - Processing output torque.doc.html.css
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing output torque.doc.html.html
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
[INFO] Generation successful
[WARNING] The parameter expression: 'project.build.resources' used in mojo: 'process' has
been deprecated. Use 'project.resources' instead.
[INFO] [remote-resources:process {execution: default}]
[debug] execute contextualize
[INFO] [resources:resources {execution: default-resources}]
[INFO] Using 'ISO-8859-1' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 
[INFO] Copying 3 resources
[INFO] [compiler:compile {execution: default-compile}]
[INFO] Compiling 670 source files to 
[INFO] [sql:execute {execution: execute-ddl}]
[INFO] Executing file: 
[INFO] Executing file: 
[INFO] Executing file: 
[INFO] Executing file: 
[INFO] Executing file: 
[INFO] Executing file: 
[INFO] Executing file: 
[INFO] Executing file: 
[INFO] Executing file: 
[INFO] Executing file: 
[INFO] Executing file: 
[INFO] 120 of 120 SQL statements executed successfully
[INFO] [sql:execute {execution: execute-idtable-sql}]
[INFO] Executing file: 
[INFO] Executing file: 
[INFO] Executing file: 
[INFO] Executing file: 
[INFO] Executing file: 
[INFO] Executing file: 
[INFO] Executing file: 
[INFO] Executing file: 
[INFO] Executing file: 
[INFO] Executing file: 
[INFO] Executing file: 
[INFO] 75 of 75 SQL statements executed successfully
[INFO] [sql:execute {execution: shutdown-db-after-ddl}]
[debug] execute contextualize
[INFO] [resources:testResources {execution: default-testResources}]
[INFO] Using 'ISO-8859-1' encoding to copy filtered resources.
[INFO] Copying 6 resources
[INFO] Copying 3 resources
[INFO] [compiler:testCompile {execution: default-testCompile}]
[INFO] Compiling 52 source files to 
[INFO] -------------------------------------------------------------
[ERROR] COMPILATION ERROR : 
[INFO] -------------------------------------------------------------
[ERROR] :[1388,11]
org.apache.torque.DataTest.DoNothingMapper is not abstract and does not override abstract
method processRow(java.sql.ResultSet,int,org.apache.torque.criteria.CriteriaInterface)
in org.apache.torque.om.mapper.RecordMapper

[INFO] 1error
[INFO] -------------------------------------------------------------
[JENKINS] Archiving 
to /home/hudson/hudson/jobs/torque4-test-project-derby/modules/org.apache.torque$torque-test/builds/2013-05-20_01-36-41/archive/org.apache.torque/torque-test/4.1-SNAPSHOT/torque-test-4.1-SNAPSHOT.pom
[INFO] ------------------------------------------------------------------------
[ERROR] BUILD FAILURE
[INFO] ------------------------------------------------------------------------
[INFO] Compilation failure
:[1388,11]
org.apache.torque.DataTest.DoNothingMapper is not abstract and does not override abstract
method processRow(java.sql.ResultSet,int,org.apache.torque.criteria.CriteriaInterface)
in org.apache.torque.om.mapper.RecordMapper


[INFO] ------------------------------------------------------------------------
[INFO] For more information, run Maven with the -e switch
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 1 minute 31 seconds
[INFO] Finished at: Mon May 20 01:38:37 UTC 2013
[INFO] Final Memory: 52M/320M
[INFO] ------------------------------------------------------------------------
Waiting for Jenkins to finish collecting data
Sending e-mails to: torque-dev@db.apache.org
channel stopped

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

Build failed in Jenkins: torque4-test-project-derby » Torque Test Project #343

2013-05-20T01:38:38Z

See 

------------------------------------------
[...truncated 1697 lines...]
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing output torque.om.baseManagerForView
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - No start Elements found for path all-views/view
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - No start Elements found for path all-views/view
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - No start Elements found for path all-views/view
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - No start Elements found for path all-views/view
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - No start Elements found for path all-views/view
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - No start Elements found for path all-views/view
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - No start Elements found for path all-views/view
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - No start Elements found for path all-views/view
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - No start Elements found for path all-views/view
[INFO] Generation successful
[INFO] [torque:generate {execution: generate-sql}]
INFO  org.apache.torque.generator.control.Controller - readConfiguration() : Starting to read
configuration files
May 20, 2013 1:37:44 AM org.codehaus.groovy.runtime.m12n.SimpleExtensionModule getMetaMethods
WARNING: Module [groovy-all] - Unable to load extension class [class org.codehaus.groovy.jsr223.ScriptExtensions]
due to [javax/script/ScriptEngine]. Maybe this module is not supported by your JVM version.
May 20, 2013 1:37:44 AM org.codehaus.groovy.runtime.m12n.SimpleExtensionModule getMetaMethods
WARNING: Module [groovy-all] - Unable to load extension class [class org.codehaus.groovy.jsr223.ScriptStaticExtensions]
due to [javax/script/ScriptEngineManager]. Maybe this module is not supported by your JVM
version.
INFO  org.apache.torque.generator.control.Controller - readConfiguration() : Configuration
read.
INFO  org.apache.torque.generator.control.Controller - Processing output torque.sql.ddl
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
[INFO] Generation successful
[INFO] [torque:generate {execution: generate-createdb-sql}]
INFO  org.apache.torque.generator.control.Controller - readConfiguration() : Starting to read
configuration files
INFO  org.apache.torque.generator.control.Controller - readConfiguration() : Configuration
read.
INFO  org.apache.torque.generator.control.Controller - Processing output torque.sql.createdb
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
[INFO] Generation successful
[INFO] [torque:generate {execution: generate-idtable-sql}]
INFO  org.apache.torque.generator.control.Controller - readConfiguration() : Starting to read
configuration files
INFO  org.apache.torque.generator.control.Controller - readConfiguration() : Configuration
read.
INFO  org.apache.torque.generator.control.Controller - Processing output torque.sql.idtable.idtable
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
[INFO] Generation successful
[INFO] [torque:generate {execution: generate-html-doc}]
INFO  org.apache.torque.generator.control.Controller - readConfiguration() : Starting to read
configuration files
INFO  org.apache.torque.generator.control.Controller - readConfiguration() : Configuration
read.
INFO  org.apache.torque.generator.control.Controller - Processing output torque.doc.html.css
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing output torque.doc.html.html
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
INFO  org.apache.torque.generator.control.Controller - Processing source 
INFO  org.apache.torque.generator.control.Controller - Start generation of File 
[INFO] Generation successful
[WARNING] The parameter expression: 'project.build.resources' used in mojo: 'process' has
been deprecated. Use 'project.resources' instead.
[INFO] [remote-resources:process {execution: default}]
[debug] execute contextualize
[INFO] [resources:resources {execution: default-resources}]
[INFO] Using 'ISO-8859-1' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 
[INFO] Copying 3 resources
[INFO] [compiler:compile {execution: default-compile}]
[INFO] Compiling 670 source files to 
[INFO] [sql:execute {execution: execute-ddl}]
[INFO] Executing file: 
[INFO] Executing file: 
[INFO] Executing file: 
[INFO] Executing file: 
[INFO] Executing file: 
[INFO] Executing file: 
[INFO] Executing file: 
[INFO] Executing file: 
[INFO] Executing file: 
[INFO] Executing file: 
[INFO] Executing file: 
[INFO] 120 of 120 SQL statements executed successfully
[INFO] [sql:execute {execution: execute-idtable-sql}]
[INFO] Executing file: 
[INFO] Executing file: 
[INFO] Executing file: 
[INFO] Executing file: 
[INFO] Executing file: 
[INFO] Executing file: 
[INFO] Executing file: 
[INFO] Executing file: 
[INFO] Executing file: 
[INFO] Executing file: 
[INFO] Executing file: 
[INFO] 75 of 75 SQL statements executed successfully
[INFO] [sql:execute {execution: shutdown-db-after-ddl}]
[debug] execute contextualize
[INFO] [resources:testResources {execution: default-testResources}]
[INFO] Using 'ISO-8859-1' encoding to copy filtered resources.
[INFO] Copying 6 resources
[INFO] Copying 3 resources
[INFO] [compiler:testCompile {execution: default-testCompile}]
[INFO] Compiling 52 source files to 
[INFO] -------------------------------------------------------------
[ERROR] COMPILATION ERROR : 
[INFO] -------------------------------------------------------------
[ERROR] :[1388,11]
org.apache.torque.DataTest.DoNothingMapper is not abstract and does not override abstract
method processRow(java.sql.ResultSet,int,org.apache.torque.criteria.CriteriaInterface)
in org.apache.torque.om.mapper.RecordMapper

[INFO] 1error
[INFO] -------------------------------------------------------------
[JENKINS] Archiving 
to /home/hudson/hudson/jobs/torque4-test-project-derby/modules/org.apache.torque$torque-test/builds/2013-05-20_01-36-41/archive/org.apache.torque/torque-test/4.1-SNAPSHOT/torque-test-4.1-SNAPSHOT.pom
[INFO] ------------------------------------------------------------------------
[ERROR] BUILD FAILURE
[INFO] ------------------------------------------------------------------------
[INFO] Compilation failure
:[1388,11]
org.apache.torque.DataTest.DoNothingMapper is not abstract and does not override abstract
method processRow(java.sql.ResultSet,int,org.apache.torque.criteria.CriteriaInterface)
in org.apache.torque.om.mapper.RecordMapper


[INFO] ------------------------------------------------------------------------
[INFO] For more information, run Maven with the -e switch
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 1 minute 31 seconds
[INFO] Finished at: Mon May 20 01:38:37 UTC 2013
[INFO] Final Memory: 52M/320M
[INFO] ------------------------------------------------------------------------
Waiting for Jenkins to finish collecting data

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

Jenkins build is back to normal : Torque4-trunk #434

2013-05-20T00:23:04Z

See 


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

svn commit: r1484364 - /db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/Transaction.java

2013-05-19T22:29:37Z

Author: tfischer
Date: Sun May 19 22:29:37 2013
New Revision: 1484364

URL: http://svn.apache.org/r1484364
Log:
TORQUE-287 add method Transaction.getTransactionManager()
use final modifier in method parameters

Modified:
    db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/Transaction.java

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/Transaction.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/Transaction.java?rev=1484364&r1=1484363&r2=1484364&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/Transaction.java
(original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/Transaction.java
Sun May 19 22:29:37 2013
@@ -35,7 +35,7 @@ import org.apache.torque.TorqueException
  */
 public final class Transaction
 {
-    /** The transaction manager to sue. */
+    /** The transaction manager to use. */
     private static TransactionManager transactionManager;
 
     /**
@@ -55,12 +55,22 @@ public final class Transaction
      * @param transactionManager the transaction manager to use.
      */
     public static void setTransactionManager(
-            TransactionManager transactionManager)
+            final TransactionManager transactionManager)
     {
         Transaction.transactionManager = transactionManager;
     }
 
     /**
+     * Returns the current transaction manager.
+     *
+     * @return the current transaction manager.
+     */
+    public static TransactionManager getTransactionManager()
+    {
+        return transactionManager;
+    }
+
+    /**
      * Begin a transaction by retrieving a connection from the default database
      * connection pool.
      * WARNING: If the database does not support transaction or the pool has set
@@ -89,7 +99,7 @@ public final class Transaction
      *
      * @throws TorqueException If the connection cannot be retrieved.
      */
-    public static Connection begin(String dbName) throws TorqueException
+    public static Connection begin(final String dbName) throws TorqueException
     {
         return transactionManager.begin(dbName);
     }
@@ -104,7 +114,7 @@ public final class Transaction
      * @throws TorqueException Any exceptions caught during processing will be
      *         rethrown wrapped into a TorqueException.
      */
-    public static void commit(Connection con) throws TorqueException
+    public static void commit(final Connection con) throws TorqueException
     {
         transactionManager.commit(con);
     }
@@ -119,7 +129,7 @@ public final class Transaction
      * @throws TorqueException Any exceptions caught during processing will be
      *         rethrown wrapped into a TorqueException.
      */
-    public static void rollback(Connection con) throws TorqueException
+    public static void rollback(final Connection con) throws TorqueException
     {
         transactionManager.rollback(con);
     }
@@ -132,7 +142,7 @@ public final class Transaction
      * @param con The Connection for the transaction.
      * @see Transaction#rollback(Connection)
      */
-    public static void safeRollback(Connection con)
+    public static void safeRollback(final Connection con)
     {
         transactionManager.safeRollback(con);
     }



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

[jira] [Updated] (TORQUE-287) Transaction.getTransactionManager() method is missing

2013-05-19T22:29:16Z


     [ https://issues.apache.org/jira/browse/TORQUE-287?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]

Thomas Fox updated TORQUE-287:
------------------------------

    Priority: Minor  (was: Major)
    
> Transaction.getTransactionManager() method is missing
> -----------------------------------------------------
>
>                 Key: TORQUE-287
>                 URL: https://issues.apache.org/jira/browse/TORQUE-287
>             Project: Torque
>          Issue Type: Improvement
>          Components: Runtime
>    Affects Versions: 4.0
>            Reporter: Thomas Fox
>            Priority: Minor
>             Fix For: 4.1
>
>
> The method should be added.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira

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

[jira] [Created] (TORQUE-287) Transaction.getTransactionManager() method is missing

2013-05-19T22:29:16Z

Thomas Fox created TORQUE-287:
---------------------------------

             Summary: Transaction.getTransactionManager() method is missing
                 Key: TORQUE-287
                 URL: https://issues.apache.org/jira/browse/TORQUE-287
             Project: Torque
          Issue Type: Improvement
          Components: Runtime
    Affects Versions: 4.0
            Reporter: Thomas Fox
             Fix For: 4.1


The method should be added.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira

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

[jira] [Resolved] (TORQUE-285) DatabaseMap.getName() should be public

2013-05-19T22:27:15Z


     [ https://issues.apache.org/jira/browse/TORQUE-285?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]

Thomas Fox resolved TORQUE-285.
-------------------------------

    Resolution: Fixed
    
> DatabaseMap.getName() should be public
> --------------------------------------
>
>                 Key: TORQUE-285
>                 URL: https://issues.apache.org/jira/browse/TORQUE-285
>             Project: Torque
>          Issue Type: Improvement
>          Components: Runtime
>    Affects Versions: 4.0
>            Reporter: Thomas Fox
>            Assignee: Thomas Fox
>            Priority: Minor
>             Fix For: 4.1
>
>


--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira

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

svn commit: r1484359 - /db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/DatabaseMap.java

2013-05-19T22:25:29Z

Author: tfischer
Date: Sun May 19 22:25:28 2013
New Revision: 1484359

URL: http://svn.apache.org/r1484359
Log:
TORQUE-285 DatabaseMap.getName() should be public
use final modifiers in method parameters

Modified:
    db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/DatabaseMap.java

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/DatabaseMap.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/DatabaseMap.java?rev=1484359&r1=1484358&r2=1484359&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/DatabaseMap.java
(original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/DatabaseMap.java
Sun May 19 22:25:28 2013
@@ -111,7 +111,7 @@ public class DatabaseMap implements Seri
     /**
      * Constructs a new DatabaseMap.
      */
-    public DatabaseMap(Database database)
+    public DatabaseMap(final Database database)
     {
         if (database == null)
         {
@@ -125,7 +125,7 @@ public class DatabaseMap implements Seri
      *
      * @return the database name, not null.
      */
-    String getName()
+    public String getName()
     {
         return name;
     }
@@ -136,7 +136,7 @@ public class DatabaseMap implements Seri
      * @param table The TableMap representation of the table.
      * @return True if the database contains the table.
      */
-    public boolean containsTable(TableMap table)
+    public boolean containsTable(final TableMap table)
     {
         return containsTable(table.getName());
     }
@@ -172,7 +172,7 @@ public class DatabaseMap implements Seri
      * @param name Name of the table.
      * @return A TableMap, null if the table was not found.
      */
-    public TableMap getTable(String name)
+    public TableMap getTable(final String name)
     {
         TableMap result = tables.get(name);
         if (result != null)
@@ -228,7 +228,7 @@ public class DatabaseMap implements Seri
      *
      * @return the new table map.
      */
-    public TableMap addTable(String tableName)
+    public TableMap addTable(final String tableName)
     {
         TableMap tmap = new TableMap(tableName, this);
         tables.put(tableName, tmap);
@@ -240,7 +240,7 @@ public class DatabaseMap implements Seri
      *
      * @param idTableMap The TableMap representation.
      */
-    public void setIdTable(TableMap idTableMap)
+    public void setIdTable(final TableMap idTableMap)
     {
         this.idTable = idTableMap;
     }
@@ -261,7 +261,7 @@ public class DatabaseMap implements Seri
      * @param key the key of the option
      * @param value the value of the option.
      */
-    public void setOption(String key, String value)
+    public void setOption(final String key, final String value)
     {
         optionsMap.put(key, value);
     }
@@ -273,7 +273,7 @@ public class DatabaseMap implements Seri
      *
      * @return the value of the option, or null if not set.
      */
-    public String getOption(String key)
+    public String getOption(final String key)
     {
         return optionsMap.get(key);
     }
@@ -417,7 +417,7 @@ public class DatabaseMap implements Seri
      *
      * @param databaseMap the database map to copy from, not null.
      */
-    public void copyFrom(DatabaseMap databaseMap)
+    public void copyFrom(final DatabaseMap databaseMap)
     {
         this.isInitialized = databaseMap.isInitialized;
         this.optionsMap.clear();



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

[jira] [Created] (TORQUE-286) BasePeerImpl.doUpdate(ColumnValues) and BasePeerImpl.doUpdate(ColumnValues, Connection) did not work

2013-05-19T22:17:15Z

Thomas Fox created TORQUE-286:
---------------------------------

             Summary: BasePeerImpl.doUpdate(ColumnValues) and BasePeerImpl.doUpdate(ColumnValues,
Connection) did not work
                 Key: TORQUE-286
                 URL: https://issues.apache.org/jira/browse/TORQUE-286
             Project: Torque
          Issue Type: Bug
          Components: Runtime
    Affects Versions: 4.0
            Reporter: Thomas Fox
             Fix For: 4.1


The primary key was not determined correctly, it could not be found, so the method always
threw
new TorqueException("No PK specified for database update")

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira

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

[jira] [Created] (TORQUE-285) DatabaseMap.getName() should be public

2013-05-19T20:43:15Z

Thomas Fox created TORQUE-285:
---------------------------------

             Summary: DatabaseMap.getName() should be public
                 Key: TORQUE-285
                 URL: https://issues.apache.org/jira/browse/TORQUE-285
             Project: Torque
          Issue Type: Improvement
          Components: Runtime
    Affects Versions: 4.0
            Reporter: Thomas Fox
            Assignee: Thomas Fox
            Priority: Minor
             Fix For: 4.1




--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira

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

[jira] [Created] (TORQUE-284) Object ColumnValues contains unused constructor arguments table

2013-05-19T20:41:16Z

Thomas Fox created TORQUE-284:
---------------------------------

             Summary: Object ColumnValues contains unused constructor arguments table
                 Key: TORQUE-284
                 URL: https://issues.apache.org/jira/browse/TORQUE-284
             Project: Torque
          Issue Type: Improvement
          Components: Runtime
    Affects Versions: 4.0
            Reporter: Thomas Fox
            Assignee: Thomas Fox
            Priority: Minor
             Fix For: 4.1


These constructor arguments should be removed.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira

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

Build failed in Jenkins: Torque4-trunk #433

2013-05-19T20:30:24Z

See 

Changes:

[tfischer] TORQUE-283 Remove unsupported xalanOutlet from generator configuration xsd

------------------------------------------
[...truncated 349 lines...]
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.045 sec
Cobertura: Loaded information on 111 classes.
Cobertura: Saved information on 111 classes.
Running org.apache.torque.util.functions.SumTest
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.044 sec
Cobertura: Loaded information on 111 classes.
Cobertura: Saved information on 111 classes.
Running org.apache.torque.criteria.CriterionTest
Tests run: 10, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.256 sec
Cobertura: Loaded information on 111 classes.
Cobertura: Saved information on 111 classes.
Running org.apache.torque.util.functions.AggregateFunctionTest
Tests run: 12, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.053 sec
Cobertura: Loaded information on 111 classes.
Cobertura: Saved information on 111 classes.
Running org.apache.torque.util.functions.AvgTest
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.044 sec
Cobertura: Loaded information on 111 classes.
Cobertura: Saved information on 111 classes.
Running org.apache.torque.util.functions.CountTest
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.045 sec
Cobertura: Loaded information on 111 classes.
Cobertura: Saved information on 111 classes.
Running org.apache.torque.util.functions.AbstractFunctionTest
Tests run: 11, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.057 sec
Cobertura: Loaded information on 111 classes.
Cobertura: Saved information on 111 classes.
Running org.apache.torque.sql.SqlBuilderTest
Tests run: 115, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.698 sec
Cobertura: Loaded information on 111 classes.
Cobertura: Saved information on 111 classes.
Running org.apache.torque.om.mapper.StringMapperTest
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.465 sec
Cobertura: Loaded information on 111 classes.
Cobertura: Saved information on 111 classes.
Running org.apache.torque.util.functions.MinTest
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.045 sec
Cobertura: Loaded information on 111 classes.
Cobertura: Saved information on 111 classes.
Running org.apache.torque.ColumnImplTest
Tests run: 41, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.344 sec
Cobertura: Loaded information on 111 classes.
Cobertura: Saved information on 111 classes.
Running org.apache.torque.map.ColumnMapTest
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.19 sec
Cobertura: Loaded information on 111 classes.
Cobertura: Saved information on 111 classes.
Running org.apache.torque.om.mapper.BigDecimalMapperTest
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.466 sec
Cobertura: Loaded information on 111 classes.
Cobertura: Saved information on 111 classes.
Running org.apache.torque.avalon.AvalonTest
[DEBUG] Starting container...
[DEBUG] Loading the service container class org.apache.fulcrum.yaafi.framework.container.ServiceContainerImpl
[DEBUG] Instantiating the service container class org.apache.fulcrum.yaafi.framework.container.ServiceContainerImpl
[DEBUG] Using the following configuration : yaafiorg.apache.fulcrum.yaafi.framework.container.ServiceContainerImplsrc/test/resources/TestRoleConfig.xmlfalsesrc/test/resources/TestComponentConfig.xmlfalsefalse
[DEBUG] Using the following container type : yaafi
[DEBUG] YAAFI Service Framework is starting up
[DEBUG] Setting applicationRootDir to 
[DEBUG] Setting tempRootDir to /tmp
[DEBUG] Looking for src/test/resources/TestRoleConfig.xml in the root directory
[DEBUG] Found src/test/resources/TestRoleConfig.xml as 
[DEBUG] Looking for src/test/resources/TestComponentConfig.xml in the root directory
[DEBUG] Found src/test/resources/TestComponentConfig.xml as 
[DEBUG] Looking for /componentConfiguration.properties in the root directory
[DEBUG] Looking for /componentConfiguration.properties as absolute file location
[DEBUG] Looking for /componentConfiguration.properties using the class loader
[WARNING] Unable to find any resource with the name '/componentConfiguration.properties'
[DEBUG] Unable to load the following optional file :/componentConfiguration.properties
[DEBUG] Using the following componentConfigurationProperties: {java.runtime.name=Java(TM)
2 Runtime Environment, Standard Edition, urn:avalon:temp=/tmp, sun.boot.library.path=/home/jenkins/tools/java/jdk1.5.0_22-32/jre/lib/i386,
java.vm.version=1.5.0_22-b03, urn:avalon:home=
java.vm.vendor=Sun Microsystems Inc., java.vendor.url=http://java.sun.com/, path.separator=:,
java.vm.name=Java HotSpot(TM) Server VM, file.encoding.pkg=sun.io, user.country=US, sun.java.launcher=SUN_STANDARD,
sun.os.patch.level=unknown, urn:avalon:name=fulcrum-yaafi, java.vm.specification.name=Java
Virtual Machine Specification, user.dir=
urn:avalon:partition=root, java.runtime.version=1.5.0_22-b03, java.awt.graphicsenv=sun.awt.X11GraphicsEnvironment,
basedir=
java.endorsed.dirs=/home/jenkins/tools/java/jdk1.5.0_22-32/jre/lib/endorsed, os.arch=i386,
java.io.tmpdir=/tmp, line.separator=
, java.vm.specification.vendor=Sun Microsystems Inc., os.name=Linux, sun.jnu.encoding=ANSI_X3.4-1968,
java.library.path=/home/jenkins/tools/java/jdk1.5.0_22-32/jre/lib/i386/server:/home/jenkins/tools/java/jdk1.5.0_22-32/jre/lib/i386:/home/jenkins/tools/java/jdk1.5.0_22-32/jre/../lib/i386:/usr/lib/jvm/java-6-openjdk-amd64/jre/lib/amd64/server:/usr/lib/jvm/java-6-openjdk-amd64/jre/lib/amd64:/usr/lib/jvm/java-6-openjdk-amd64/jre/../lib/amd64,
java.specification.name=Java Platform API Specification, java.class.version=49.0, sun.management.compiler=HotSpot
Server Compiler, os.version=3.2.0-38-generic, user.home=/home/jenkins, user.timezone=, java.awt.printerjob=sun.print.PSPrinterJob,
file.encoding=ANSI_X3.4-1968, java.specification.version=1.5, user.name=jenkins, java.class.path=/tmp/surefirebooter8449826451220271578.jar,
java.vm.specification.version=1.0, sun.arch.data.model=32, java.home=/home/jenkins/tools/java/jdk1.5.0_22-32/jre,
java.specification.vendor=Sun Microsystems Inc., user.language=en, java.vm.info=mixed mode,
java.version=1.5.0_22, java.ext.dirs=/home/jenkins/tools/java/jdk1.5.0_22-32/jre/lib/ext,
sun.boot.class.path=/home/jenkins/tools/java/jdk1.5.0_22-32/jre/lib/rt.jar:/home/jenkins/tools/java/jdk1.5.0_22-32/jre/lib/i18n.jar:/home/jenkins/tools/java/jdk1.5.0_22-32/jre/lib/sunrsasign.jar:/home/jenkins/tools/java/jdk1.5.0_22-32/jre/lib/jsse.jar:/home/jenkins/tools/java/jdk1.5.0_22-32/jre/lib/jce.jar:/home/jenkins/tools/java/jdk1.5.0_22-32/jre/lib/charsets.jar:/home/jenkins/tools/java/jdk1.5.0_22-32/jre/classes,
java.vendor=Sun Microsystems Inc., localRepository=/home/jenkins/jenkins-slave/maven-repositories/0,
file.separator=/, derby.stream.error.file=target/derby.log, java.vendor.url.bug=http://java.sun.com/cgi-bin/bugreport.cgi,
sun.cpu.endian=little, sun.io.unicode.encoding=UnicodeLittle, sun.cpu.isalist=}
[DEBUG] Looking for /parameters.properties in the root directory
[DEBUG] Looking for /parameters.properties as absolute file location
[DEBUG] Looking for /parameters.properties using the class loader
[WARNING] Unable to find any resource with the name '/parameters.properties'
[DEBUG] Configuring the service component TorqueComponent
[DEBUG] Incarnating the service TorqueComponent
[DEBUG] Instantiating the implementation class for TorqueComponent
[DEBUG] Incarnating the service TorqueComponent
[DEBUG] LogEnabled.enableLogging() for TorqueComponent
[DEBUG] Contextualizable.contextualize() for TorqueComponent
[DEBUG] Configurable.configure() for TorqueComponent
[DEBUG] configure(TorqueComponent:::@null:20:22)
[DEBUG] Config File changes to src/test/resources/Torque.properties
[DEBUG] Config File is 
[DEBUG] Initializable.initialize() for TorqueComponent
[DEBUG] initialize()
[DEBUG] YAAFI Avalon Service Container is up and running
[INFO] YaffiContainer ready.
[DEBUG] Located the service 'org.apache.torque.avalon.Torque' in the local container
[DEBUG] Disposing of container...
[DEBUG] Disposing all services
[DEBUG] Decommision the service TorqueComponent
[DEBUG] Decommisioning the service TorqueComponent
[DEBUG] Disposable.dispose() for TorqueComponent
[DEBUG] dispose()
[DEBUG] Disposing the service TorqueComponent
[DEBUG] All services are disposed
[INFO] YaffiContainer has been disposed.
[DEBUG] Starting container...
[DEBUG] Loading the service container class org.apache.fulcrum.yaafi.framework.container.ServiceContainerImpl
[DEBUG] Instantiating the service container class org.apache.fulcrum.yaafi.framework.container.ServiceContainerImpl
[DEBUG] Using the following configuration : yaafiorg.apache.fulcrum.yaafi.framework.container.ServiceContainerImplsrc/test/resources/TestRoleConfig.xmlfalsesrc/test/resources/TestComponentConfig.xmlfalsefalse
[DEBUG] Using the following container type : yaafi
[DEBUG] YAAFI Service Framework is starting up
[DEBUG] Setting applicationRootDir to 
[DEBUG] Setting tempRootDir to /tmp
[DEBUG] Looking for src/test/resources/TestRoleConfig.xml in the root directory
[DEBUG] Found src/test/resources/TestRoleConfig.xml as 
[DEBUG] Looking for src/test/resources/TestComponentConfig.xml in the root directory
[DEBUG] Found src/test/resources/TestComponentConfig.xml as 
[DEBUG] Looking for /componentConfiguration.properties in the root directory
[DEBUG] Looking for /componentConfiguration.properties as absolute file location
[DEBUG] Looking for /componentConfiguration.properties using the class loader
[WARNING] Unable to find any resource with the name '/componentConfiguration.properties'
[DEBUG] Unable to load the following optional file :/componentConfiguration.properties
[DEBUG] Using the following componentConfigurationProperties: {java.runtime.name=Java(TM)
2 Runtime Environment, Standard Edition, urn:avalon:temp=/tmp, sun.boot.library.path=/home/jenkins/tools/java/jdk1.5.0_22-32/jre/lib/i386,
java.vm.version=1.5.0_22-b03, urn:avalon:home=
java.vm.vendor=Sun Microsystems Inc., java.vendor.url=http://java.sun.com/, path.separator=:,
java.vm.name=Java HotSpot(TM) Server VM, file.encoding.pkg=sun.io, user.country=US, sun.java.launcher=SUN_STANDARD,
sun.os.patch.level=unknown, urn:avalon:name=fulcrum-yaafi, java.vm.specification.name=Java
Virtual Machine Specification, user.dir=
urn:avalon:partition=root, java.runtime.version=1.5.0_22-b03, java.awt.graphicsenv=sun.awt.X11GraphicsEnvironment,
basedir=
java.endorsed.dirs=/home/jenkins/tools/java/jdk1.5.0_22-32/jre/lib/endorsed, os.arch=i386,
java.io.tmpdir=/tmp, line.separator=
, java.vm.specification.vendor=Sun Microsystems Inc., os.name=Linux, sun.jnu.encoding=ANSI_X3.4-1968,
java.library.path=/home/jenkins/tools/java/jdk1.5.0_22-32/jre/lib/i386/server:/home/jenkins/tools/java/jdk1.5.0_22-32/jre/lib/i386:/home/jenkins/tools/java/jdk1.5.0_22-32/jre/../lib/i386:/usr/lib/jvm/java-6-openjdk-amd64/jre/lib/amd64/server:/usr/lib/jvm/java-6-openjdk-amd64/jre/lib/amd64:/usr/lib/jvm/java-6-openjdk-amd64/jre/../lib/amd64,
java.specification.name=Java Platform API Specification, java.class.version=49.0, sun.management.compiler=HotSpot
Server Compiler, os.version=3.2.0-38-generic, user.home=/home/jenkins, user.timezone=, java.awt.printerjob=sun.print.PSPrinterJob,
file.encoding=ANSI_X3.4-1968, java.specification.version=1.5, user.name=jenkins, java.class.path=/tmp/surefirebooter8449826451220271578.jar,
java.vm.specification.version=1.0, sun.arch.data.model=32, java.home=/home/jenkins/tools/java/jdk1.5.0_22-32/jre,
java.specification.vendor=Sun Microsystems Inc., user.language=en, java.vm.info=mixed mode,
java.version=1.5.0_22, java.ext.dirs=/home/jenkins/tools/java/jdk1.5.0_22-32/jre/lib/ext,
sun.boot.class.path=/home/jenkins/tools/java/jdk1.5.0_22-32/jre/lib/rt.jar:/home/jenkins/tools/java/jdk1.5.0_22-32/jre/lib/i18n.jar:/home/jenkins/tools/java/jdk1.5.0_22-32/jre/lib/sunrsasign.jar:/home/jenkins/tools/java/jdk1.5.0_22-32/jre/lib/jsse.jar:/home/jenkins/tools/java/jdk1.5.0_22-32/jre/lib/jce.jar:/home/jenkins/tools/java/jdk1.5.0_22-32/jre/lib/charsets.jar:/home/jenkins/tools/java/jdk1.5.0_22-32/jre/classes,
java.vendor=Sun Microsystems Inc., localRepository=/home/jenkins/jenkins-slave/maven-repositories/0,
file.separator=/, derby.stream.error.file=target/derby.log, java.vendor.url.bug=http://java.sun.com/cgi-bin/bugreport.cgi,
sun.cpu.endian=little, sun.io.unicode.encoding=UnicodeLittle, sun.cpu.isalist=}
[DEBUG] Looking for /parameters.properties in the root directory
[DEBUG] Looking for /parameters.properties as absolute file location
[DEBUG] Looking for /parameters.properties using the class loader
[WARNING] Unable to find any resource with the name '/parameters.properties'
[DEBUG] Configuring the service component TorqueComponent
[DEBUG] Incarnating the service TorqueComponent
[DEBUG] Instantiating the implementation class for TorqueComponent
[DEBUG] Incarnating the service TorqueComponent
[DEBUG] LogEnabled.enableLogging() for TorqueComponent
[DEBUG] Contextualizable.contextualize() for TorqueComponent
[DEBUG] Configurable.configure() for TorqueComponent
[DEBUG] configure(TorqueComponent:::@null:20:22)
[DEBUG] Config File changes to src/test/resources/Torque.properties
[DEBUG] Config File is 
[DEBUG] Initializable.initialize() for TorqueComponent
[DEBUG] initialize()
[DEBUG] YAAFI Avalon Service Container is up and running
[INFO] YaffiContainer ready.
[DEBUG] Located the service 'org.apache.torque.avalon.Torque' in the local container
[DEBUG] Disposing of container...
[DEBUG] Disposing all services
[DEBUG] Decommision the service TorqueComponent
[DEBUG] Decommisioning the service TorqueComponent
[DEBUG] Disposable.dispose() for TorqueComponent
[DEBUG] dispose()
[DEBUG] Disposing the service TorqueComponent
[DEBUG] All services are disposed
[INFO] YaffiContainer has been disposed.
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.277 sec
Cobertura: Loaded information on 111 classes.
Cobertura: Saved information on 111 classes.
Running org.apache.torque.om.NumberKeyTest
Tests run: 23, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.053 sec
Cobertura: Loaded information on 111 classes.
Cobertura: Saved information on 111 classes.
Running org.apache.torque.om.mapper.IntegerMapperTest
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.456 sec
Cobertura: Loaded information on 111 classes.
Cobertura: Saved information on 111 classes.
Running org.apache.torque.criteria.JoinTest
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.2 sec
Cobertura: Loaded information on 111 classes.
Cobertura: Saved information on 111 classes.
Running org.apache.torque.om.mapper.LongMapperTest
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.453 sec
Cobertura: Loaded information on 111 classes.
Cobertura: Saved information on 111 classes.
Running org.apache.torque.om.mapper.DateMapperTest
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.458 sec
Cobertura: Loaded information on 111 classes.
Cobertura: Saved information on 111 classes.
Running org.apache.torque.criteria.CriteriaTest
Tests run: 33, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.412 sec
Cobertura: Loaded information on 111 classes.
Cobertura: Saved information on 111 classes.
Running org.apache.torque.util.UniqueListTest
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.032 sec
Cobertura: Loaded information on 111 classes.
Cobertura: Saved information on 111 classes.
Running org.apache.torque.TorqueRuntimeExceptionTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.171 sec

Results :

Tests run: 324, Failures: 0, Errors: 0, Skipped: 0

Cobertura: Loaded information on 111 classes.
Cobertura: Saved information on 111 classes.
[JENKINS] Recording test results
[INFO] [cobertura:cobertura {execution: default-cli}]
May 19, 2013 8:30:06 PM hudson.remoting.SynchronousCommandTransport$ReaderThread run
SEVERE: I/O error in channel channel
java.io.StreamCorruptedException
	at java.io.ObjectInputStream.readObject0(ObjectInputStream.java:1332)
	at java.io.ObjectInputStream.readObject(ObjectInputStream.java:348)
	at hudson.remoting.Command.readFrom(Command.java:92)
	at hudson.remoting.ClassicCommandTransport.read(ClassicCommandTransport.java:59)
	at hudson.remoting.SynchronousCommandTransport$ReaderThread.run(SynchronousCommandTransport.java:48)
channel stopped
[ERROR] Error in Cobertura Report generation: Unable to execute Cobertura.
org.apache.maven.plugin.MojoExecutionException: Unable to execute Cobertura.
	at org.codehaus.mojo.cobertura.tasks.AbstractTask.executeJava(AbstractTask.java:225)
	at org.codehaus.mojo.cobertura.tasks.ReportTask.execute(ReportTask.java:80)
	at org.codehaus.mojo.cobertura.CoberturaReportMojo.executeReportTask(CoberturaReportMojo.java:177)
	at org.codehaus.mojo.cobertura.CoberturaReportMojo.executeReport(CoberturaReportMojo.java:218)
	at org.codehaus.mojo.cobertura.CoberturaReportMojo.generate(CoberturaReportMojo.java:166)
	at org.apache.maven.reporting.AbstractMavenReport.execute(AbstractMavenReport.java:73)
	at org.apache.maven.plugin.DefaultPluginManager.executeMojo(DefaultPluginManager.java:490)
	at hudson.maven.agent.PluginManagerInterceptor.executeMojo(PluginManagerInterceptor.java:182)
	at org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoals(DefaultLifecycleExecutor.java:694)
	at org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeStandaloneGoal(DefaultLifecycleExecutor.java:569)
	at org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoal(DefaultLifecycleExecutor.java:539)
	at org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoalAndHandleFailures(DefaultLifecycleExecutor.java:387)
	at org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeTaskSegments(DefaultLifecycleExecutor.java:348)
	at org.apache.maven.lifecycle.DefaultLifecycleExecutor.execute(DefaultLifecycleExecutor.java:180)
	at org.apache.maven.lifecycle.LifecycleExecutorInterceptor.execute(LifecycleExecutorInterceptor.java:65)
	at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:328)
	at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:138)
	at org.apache.maven.cli.MavenCli.main(MavenCli.java:362)
	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
	at java.lang.reflect.Method.invoke(Method.java:592)
	at org.codehaus.classworlds.Launcher.launchEnhanced(Launcher.java:315)
	at org.codehaus.classworlds.Launcher.launch(Launcher.java:255)
	at hudson.maven.agent.Main.launch(Main.java:185)
	at hudson.maven.MavenBuilder.call(MavenBuilder.java:154)
	at hudson.maven.Maven2Builder.call(Maven2Builder.java:79)
	at hudson.maven.Maven2Builder.call(Maven2Builder.java:55)
	at hudson.remoting.UserRequest.perform(UserRequest.java:118)
	at hudson.remoting.UserRequest.perform(UserRequest.java:48)
	at hudson.remoting.Request$2.run(Request.java:326)
	at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72)
	at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:269)
	at java.util.concurrent.FutureTask.run(FutureTask.java:123)
	at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:651)
	at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:676)
	at java.lang.Thread.run(Thread.java:595)
Caused by: org.codehaus.plexus.util.cli.CommandLineException: Error while executing external
command.
	at org.codehaus.plexus.util.cli.CommandLineUtils.executeCommandLine(CommandLineUtils.java:137)
	at org.codehaus.plexus.util.cli.CommandLineUtils.executeCommandLine(CommandLineUtils.java:60)
	at org.codehaus.mojo.cobertura.tasks.AbstractTask.executeJava(AbstractTask.java:221)
	... 36 more
Caused by: java.lang.InterruptedException
	at java.lang.Object.wait(Native Method)
	at java.lang.Object.wait(Object.java:474)
	at java.lang.UNIXProcess.waitFor(UNIXProcess.java:165)
	at org.codehaus.plexus.util.cli.CommandLineUtils.executeCommandLine(CommandLineUtils.java:98)
	... 38 more
ERROR: Maven JVM terminated unexpectedly with exit code 0
Skipping Cobertura coverage report as build was not UNSTABLE or better ...

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

[jira] [Assigned] (TORQUE-277) Need ability to update a date column during update to sysdate

2013-05-19T19:57:16Z


     [ https://issues.apache.org/jira/browse/TORQUE-277?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]

Thomas Fox reassigned TORQUE-277:
---------------------------------

    Assignee: Thomas Fox
    
> Need ability to update a date column during update to sysdate
> -------------------------------------------------------------
>
>                 Key: TORQUE-277
>                 URL: https://issues.apache.org/jira/browse/TORQUE-277
>             Project: Torque
>          Issue Type: Improvement
>          Components: Runtime
>    Affects Versions: 4.0
>            Reporter: rajguru
>            Assignee: Thomas Fox
>
> I have an entity which has a timestamp column. On every update to the record in that
table (using save() method) I need to set that column to the SYSDATE. I would like to add
columnName=SYSDATE while constructing the query itself i.e. Criteria from which the query
gets formed.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira

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

[jira] [Commented] (TORQUE-277) Need ability to update a date column during update to sysdate

2013-05-19T19:57:16Z


    [ https://issues.apache.org/jira/browse/TORQUE-277?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13661636#comment-13661636
] 

Thomas Fox commented on TORQUE-277:
-----------------------------------

Extending JdbcTypedValue is not so easy because building the query does not consider the update
values, only the columns to update. See Query.java line 542 ff.
                
> Need ability to update a date column during update to sysdate
> -------------------------------------------------------------
>
>                 Key: TORQUE-277
>                 URL: https://issues.apache.org/jira/browse/TORQUE-277
>             Project: Torque
>          Issue Type: Improvement
>          Components: Runtime
>    Affects Versions: 4.0
>            Reporter: rajguru
>
> I have an entity which has a timestamp column. On every update to the record in that
table (using save() method) I need to set that column to the SYSDATE. I would like to add
columnName=SYSDATE while constructing the query itself i.e. Criteria from which the query
gets formed.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira

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

[jira] [Resolved] (TORQUE-282) add attribute class to element input

2013-05-19T19:35:15Z


     [ https://issues.apache.org/jira/browse/TORQUE-282?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]

Thomas Fox resolved TORQUE-282.
-------------------------------

    Resolution: Fixed
    
> add attribute class to element input
> ------------------------------------
>
>                 Key: TORQUE-282
>                 URL: https://issues.apache.org/jira/browse/TORQUE-282
>             Project: Torque
>          Issue Type: Sub-task
>          Components: Generator
>    Affects Versions: 4.0
>            Reporter: Thomas Fox
>            Assignee: Thomas Fox
>             Fix For: 4.1
>
>
> The attribute elementName in the inpout tag does not work anymore for typed models.
> Therefore, ane needs to add a second attribute "class".
> Exactly one of the attributes needs to be set.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira

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

[jira] [Resolved] (TORQUE-273) Support typed models in the generator

2013-05-19T19:35:15Z


     [ https://issues.apache.org/jira/browse/TORQUE-273?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]

Thomas Fox resolved TORQUE-273.
-------------------------------

       Resolution: Fixed
    Fix Version/s: 4.1
    
> Support typed models in the generator
> -------------------------------------
>
>                 Key: TORQUE-273
>                 URL: https://issues.apache.org/jira/browse/TORQUE-273
>             Project: Torque
>          Issue Type: Improvement
>          Components: Generator
>    Affects Versions: 4.0
>            Reporter: Thomas Fox
>            Assignee: Thomas Fox
>             Fix For: 4.1
>
>
> Apart from the generic graph model, the generator should be able to fill a user-supplied
model with the graph information and use this in tranformer and templates

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira

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

[jira] [Resolved] (TORQUE-283) Remove unsupported xalanOutlet from generator configuration xsd

2013-05-19T19:33:16Z


     [ https://issues.apache.org/jira/browse/TORQUE-283?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]

Thomas Fox resolved TORQUE-283.
-------------------------------

    Resolution: Fixed
    
> Remove unsupported xalanOutlet from generator configuration xsd
> ---------------------------------------------------------------
>
>                 Key: TORQUE-283
>                 URL: https://issues.apache.org/jira/browse/TORQUE-283
>             Project: Torque
>          Issue Type: Improvement
>          Components: Generator
>    Affects Versions: 4.0
>            Reporter: Thomas Fox
>            Assignee: Thomas Fox
>             Fix For: 4.1
>
>


--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira

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

[jira] [Created] (TORQUE-283) Remove unsupported xalanOutlet from generator configuration xsd

2013-05-19T19:33:16Z

Thomas Fox created TORQUE-283:
---------------------------------

             Summary: Remove unsupported xalanOutlet from generator configuration xsd
                 Key: TORQUE-283
                 URL: https://issues.apache.org/jira/browse/TORQUE-283
             Project: Torque
          Issue Type: Improvement
          Components: Generator
    Affects Versions: 4.0
            Reporter: Thomas Fox
            Assignee: Thomas Fox
             Fix For: 4.1




--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira

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

svn commit: r1484342 - /db/torque/torque4/trunk/torque-generator/src/main/resources/org/apache/torque/generator/configuration/outlet.xsd

2013-05-19T19:32:47Z

Author: tfischer
Date: Sun May 19 19:32:47 2013
New Revision: 1484342

URL: http://svn.apache.org/r1484342
Log:
TORQUE-283 Remove unsupported xalanOutlet from generator configuration xsd 

Modified:
    db/torque/torque4/trunk/torque-generator/src/main/resources/org/apache/torque/generator/configuration/outlet.xsd

Modified: db/torque/torque4/trunk/torque-generator/src/main/resources/org/apache/torque/generator/configuration/outlet.xsd
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/resources/org/apache/torque/generator/configuration/outlet.xsd?rev=1484342&r1=1484341&r2=1484342&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/resources/org/apache/torque/generator/configuration/outlet.xsd
(original)
+++ db/torque/torque4/trunk/torque-generator/src/main/resources/org/apache/torque/generator/configuration/outlet.xsd
Sun May 19 19:32:47 2013
@@ -102,15 +102,11 @@
     
   
   
-  
-  
-    
-      
-        
-      
-    
-  
-  
+  
   
     
     



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

Jenkins build is back to normal : Torque4-trunk #432

2013-05-19T10:42:50Z

See 


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

Build failed in Jenkins: Torque4-trunk #431

2013-05-19T10:29:54Z

See 

------------------------------------------
Started by user tfischer
Building remotely on ubuntu4 in workspace 
Cleaning up 
Updating http://svn.apache.org/repos/asf/db/torque/torque4/trunk
At revision 1484263
no change for http://svn.apache.org/repos/asf/db/torque/torque4/trunk since the previous build
Parsing POMs
[torque4-trunk] $ /home/hudson/tools/java/latest1.5/bin/java -cp /home/jenkins/jenkins-slave/maven-agent.jar:/home/jenkins/jenkins-slave/classworlds.jar
hudson.maven.agent.Main /home/hudson/tools/maven/apache-maven-2.2.1 /home/jenkins/jenkins-slave/slave.jar
/home/jenkins/jenkins-slave/maven-interceptor.jar 52068 /home/jenkins/jenkins-slave/maven2.1-interceptor.jar
<===[JENKINS REMOTING CAPACITY]===>channel started
   log4j:WARN No appenders could be found for logger (org.apache.commons.beanutils.converters.BooleanConverter).
log4j:WARN Please initialize the log4j system properly.
Executing Maven:  -B -f 
-Dmaven.repo.local=/home/jenkins/jenkins-slave/maven-repositories/0 clean install cobertura:cobertura
findbugs:findbugs checkstyle:checkstyle pmd:pmd pmd:cpd
[INFO] Scanning for projects...
[INFO] Reactor build order: 
[INFO]   Torque Maven Parent
[INFO]   Torque Runtime
[INFO]   Torque Generator
[INFO]   Torque Templates
[INFO]   Torque Generator Maven 2 Plugin
[INFO]   Torque Generator Ant tasks
[INFO]   Torque Site
[INFO] ------------------------------------------------------------------------
[INFO] Building Torque Maven Parent
[INFO]    task-segment: [clean, install, cobertura:cobertura, findbugs:findbugs, checkstyle:checkstyle,
pmd:pmd, pmd:cpd]
[INFO] ------------------------------------------------------------------------
[INFO] [clean:clean {execution: default-clean}]
[WARNING] The parameter expression: 'project.build.resources' used in mojo: 'process' has
been deprecated. Use 'project.resources' instead.
[INFO] [remote-resources:process {execution: default}]
[INFO] [site:attach-descriptor {execution: default-attach-descriptor}]
[INFO] [source:jar-no-fork {execution: attach-sources}]
[INFO] [apache-rat:check {execution: default}]
[INFO] Exclude: velocity.log
[INFO] Exclude: .checkstyle
[INFO] Exclude: checkstyle-cache.ccf
[INFO] Exclude: derby.log
[INFO] Exclude: LICENSE-EDL.txt
[INFO] Exclude: DEPENDENCIES
[INFO] Exclude: torque-test/target/**/*
[INFO] Exclude: torque-test/.classpath
[INFO] Exclude: torque-test/.project
[INFO] Exclude: torque-test/.settings/**
[INFO] Exclude: torque-test/src/main/generated-java/**/*
[CHECKSTYLE] No report found for mojo check
[PMD] No report found for mojo check
[INFO] [install:install {execution: default-install}]
[INFO] Installing 
to /home/jenkins/jenkins-slave/maven-repositories/0/org/apache/torque/torque/4.1-SNAPSHOT/torque-4.1-SNAPSHOT.pom
[INFO] Preparing cobertura:cobertura
[JENKINS] Archiving 
to /home/hudson/hudson/jobs/Torque4-trunk/modules/org.apache.torque$torque/builds/2013-05-19_10-28-35/archive/org.apache.torque/torque/4.1-SNAPSHOT/torque-4.1-SNAPSHOT.pom
[WARNING] The parameter expression: 'project.build.resources' used in mojo: 'process' has
been deprecated. Use 'project.resources' instead.
[INFO] [remote-resources:process {execution: default}]
[INFO] [cobertura:instrument {execution: default-instrument}]
[INFO] Not executing cobertura:instrument as the project is not a Java classpath-capable package
[INFO] [cobertura:cobertura {execution: default-cli}]
[INFO] Not executing cobertura:report as the cobertura data file (
could not be found
[INFO] [findbugs:findbugs {execution: default-cli}]
ERROR: Maven JVM terminated unexpectedly with exit code 143
Skipping Cobertura coverage report as build was not UNSTABLE or better ...

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

Build failed in Jenkins: Torque4-trunk #430

2013-05-19T10:18:19Z

See 

Changes:

[tfischer] TORQUE-279 Remove deprecated methods and classes from the runtime

[tfischer] Add index and unique definition to test schema

[tfischer] TORQUE-279 Remove deprecated methods and classes from the runtime

[tfischer] TORQUE-279 Remove deprecated methods and classes from the runtime

------------------------------------------
Started by user tfischer
Started by an SCM change
Building remotely on ubuntu4 in workspace 
Cleaning up 
Deleting 
Deleting 
Deleting 
Deleting 
Deleting 
Deleting 
Deleting 
Updating http://svn.apache.org/repos/asf/db/torque/torque4/trunk
D         torque-runtime/src/test/java/org/apache/torque/sql/SqlBuilderOldCriteriaTest.java
U         torque-runtime/src/test/java/org/apache/torque/sql/SqlBuilderTest.java
U         torque-runtime/src/test/java/org/apache/torque/criteria/CriterionTest.java
U         torque-runtime/src/test/java/org/apache/torque/TorqueInstanceTest.java
D         torque-runtime/src/test/java/org/apache/torque/util/CriteriaTest.java
U         torque-runtime/src/test/resources/torque-schematest.properties
U         torque-runtime/src/main/java/org/apache/torque/avalon/Torque.java
U         torque-runtime/src/main/java/org/apache/torque/Database.java
U         torque-runtime/src/main/java/org/apache/torque/TorqueInstance.java
U         torque-runtime/src/main/java/org/apache/torque/sql/JoinBuilder.java
U         torque-runtime/src/main/java/org/apache/torque/sql/SqlBuilder.java
U         torque-runtime/src/main/java/org/apache/torque/sql/objectbuilder/ObjectOrColumnPsPartBuilder.java
D         torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/CustomBuilder.java
U         torque-runtime/src/main/java/org/apache/torque/Torque.java
D         torque-runtime/src/main/java/org/apache/torque/criteria/CriteriaInterface.java
U         torque-runtime/src/main/java/org/apache/torque/criteria/Join.java
U         torque-runtime/src/main/java/org/apache/torque/criteria/Criteria.java
U         torque-runtime/src/main/java/org/apache/torque/criteria/SqlEnum.java
U         torque-runtime/src/main/java/org/apache/torque/criteria/Criterion.java
U         torque-runtime/src/main/java/org/apache/torque/om/mapper/DateMapper.java
U         torque-runtime/src/main/java/org/apache/torque/om/mapper/IntegerMapper.java
U         torque-runtime/src/main/java/org/apache/torque/om/mapper/RecordMapper.java
U         torque-runtime/src/main/java/org/apache/torque/om/mapper/LongMapper.java
U         torque-runtime/src/main/java/org/apache/torque/om/mapper/BigDecimalMapper.java
U         torque-runtime/src/main/java/org/apache/torque/om/mapper/CompositeMapper.java
U         torque-runtime/src/main/java/org/apache/torque/om/mapper/ObjectListMapper.java
U         torque-runtime/src/main/java/org/apache/torque/om/mapper/StringMapper.java
U         torque-runtime/src/main/java/org/apache/torque/map/ColumnMap.java
U         torque-runtime/src/main/java/org/apache/torque/map/MapHelper.java
D         torque-runtime/src/main/java/org/apache/torque/util/Criteria.java
D         torque-runtime/src/main/java/org/apache/torque/util/BasePeer.java
U         torque-runtime/src/main/java/org/apache/torque/util/BasePeerImpl.java
U         torque-runtime/src/main/java/org/apache/torque/util/CountHelper.java
U         torque-runtime/src/main/java/org/apache/torque/util/LargeSelect.java
U         torque-runtime/src/main/java/org/apache/torque/util/SummaryHelper.java
U         torque-templates/src/test/schema/schema.xml
U         torque-templates/src/main/resources/org/apache/torque/templates/om/templates/recordmapper/base/recordMapperBase.vm
U         torque-test/src/test/java/org/apache/torque/DataTest.java
U         torque-test/src/test/java/org/apache/torque/DocsTest.java
U         torque-test/src/test/java/org/apache/torque/BaseDatabaseTestCase.java
U         torque-test/src/test/java/org/apache/torque/util/BasePeerTest.java
At revision 1484260
Parsing POMs
[torque4-trunk] $ /home/hudson/tools/java/latest1.5/bin/java -cp /home/jenkins/jenkins-slave/maven-agent.jar:/home/jenkins/jenkins-slave/classworlds.jar
hudson.maven.agent.Main /home/hudson/tools/maven/apache-maven-2.2.1 /home/jenkins/jenkins-slave/slave.jar
/home/jenkins/jenkins-slave/maven-interceptor.jar 51780 /home/jenkins/jenkins-slave/maven2.1-interceptor.jar
<===[JENKINS REMOTING CAPACITY]===channel started
>   log4j:WARN No appenders could be found for logger (org.apache.commons.beanutils.converters.BooleanConverter).
log4j:WARN Please initialize the log4j system properly.
Executing Maven:  -B -f 
-Dmaven.repo.local=/home/jenkins/jenkins-slave/maven-repositories/0 clean install cobertura:cobertura
findbugs:findbugs checkstyle:checkstyle pmd:pmd pmd:cpd
[INFO] Scanning for projects...
[INFO] Reactor build order: 
[INFO]   Torque Maven Parent
[INFO]   Torque Runtime
[INFO]   Torque Generator
[INFO]   Torque Templates
[INFO]   Torque Generator Maven 2 Plugin
[INFO]   Torque Generator Ant tasks
[INFO]   Torque Site
[INFO] ------------------------------------------------------------------------
[INFO] Building Torque Maven Parent
[INFO]    task-segment: [clean, install, cobertura:cobertura, findbugs:findbugs, checkstyle:checkstyle,
pmd:pmd, pmd:cpd]
[INFO] ------------------------------------------------------------------------
May 19, 2013 10:18:09 AM hudson.remoting.SynchronousCommandTransport$ReaderThread run
SEVERE: I/O error in channel channel
java.io.StreamCorruptedException
	at java.io.ObjectInputStream.readObject0(ObjectInputStream.java:1332)
	at java.io.ObjectInputStream.readObject(ObjectInputStream.java:348)
	at hudson.remoting.Command.readFrom(Command.java:92)
	at hudson.remoting.ClassicCommandTransport.read(ClassicCommandTransport.java:59)
	at hudson.remoting.SynchronousCommandTransport$ReaderThread.run(SynchronousCommandTransport.java:48)
channel stopped
[INFO] ------------------------------------------------------------------------
[ERROR] FATAL ERROR
[INFO] ------------------------------------------------------------------------
[INFO] null
[INFO] ------------------------------------------------------------------------
[INFO] Trace
java.lang.reflect.UndeclaredThrowableException
	at $Proxy1.fetch2(Unknown Source)
	at hudson.remoting.RemoteClassLoader.findClass(RemoteClassLoader.java:127)
	at java.lang.ClassLoader.loadClass(ClassLoader.java:307)
	at java.lang.ClassLoader.loadClass(ClassLoader.java:252)
	at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:320)
	at hudson.maven.reporters.MavenArtifactArchiver.postBuild(MavenArtifactArchiver.java:101)
	at hudson.maven.Maven2Builder.postModule(Maven2Builder.java:129)
	at hudson.maven.MavenBuilder$Adapter.fireLeaveModule(MavenBuilder.java:354)
	at hudson.maven.MavenBuilder$Adapter.postBuild(MavenBuilder.java:308)
	at org.apache.maven.lifecycle.LifecycleExecutorInterceptor.execute(LifecycleExecutorInterceptor.java:68)
	at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:328)
	at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:138)
	at org.apache.maven.cli.MavenCli.main(MavenCli.java:362)
	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
	at java.lang.reflect.Method.invoke(Method.java:592)
	at org.codehaus.classworlds.Launcher.launchEnhanced(Launcher.java:315)
	at org.codehaus.classworlds.Launcher.launch(Launcher.java:255)
	at hudson.maven.agent.Main.launch(Main.java:185)
	at hudson.maven.MavenBuilder.call(MavenBuilder.java:154)
	at hudson.maven.Maven2Builder.call(Maven2Builder.java:79)
	at hudson.maven.Maven2Builder.call(Maven2Builder.java:55)
	at hudson.remoting.UserRequest.perform(UserRequest.java:118)
	at hudson.remoting.UserRequest.perform(UserRequest.java:48)
	at hudson.remoting.Request$2.run(Request.java:326)
	at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72)
	at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:269)
	at java.util.concurrent.FutureTask.run(FutureTask.java:123)
	at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:651)
	at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:676)
	at java.lang.Thread.run(Thread.java:595)
Caused by: hudson.remoting.ChannelClosedException: channel is already closed
	at hudson.remoting.Channel.send(Channel.java:494)
	at hudson.remoting.Request.call(Request.java:129)
	at hudson.remoting.RemoteInvocationHandler.invoke(RemoteInvocationHandler.java:160)
	... 32 more
Caused by: java.io.StreamCorruptedException
	at java.io.ObjectInputStream.readObject0(ObjectInputStream.java:1332)
	at java.io.ObjectInputStream.readObject(ObjectInputStream.java:348)
	at hudson.remoting.Command.readFrom(Command.java:92)
	at hudson.remoting.ClassicCommandTransport.read(ClassicCommandTransport.java:59)
	at hudson.remoting.SynchronousCommandTransport$ReaderThread.run(SynchronousCommandTransport.java:48)
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 3 seconds
[INFO] Finished at: Sun May 19 10:18:09 UTC 2013
ERROR: Maven JVM terminated unexpectedly with exit code 0
Skipping Cobertura coverage report as build was not UNSTABLE or better ...

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

[jira] [Created] (TORQUE-282) add attribute class to element input

2013-05-19T10:11:16Z

Thomas Fox created TORQUE-282:
---------------------------------

             Summary: add attribute class to element input
                 Key: TORQUE-282
                 URL: https://issues.apache.org/jira/browse/TORQUE-282
             Project: Torque
          Issue Type: Sub-task
          Components: Generator
    Affects Versions: 4.0
            Reporter: Thomas Fox
            Assignee: Thomas Fox
             Fix For: 4.1


The attribute elementName in the inpout tag does not work anymore for typed models.
Therefore, ane needs to add a second attribute "class".
Exactly one of the attributes needs to be set.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira

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

[jira] [Resolved] (TORQUE-276) Change semantics of elements attribute of source tag in generator config.xml

2013-05-19T10:09:15Z


     [ https://issues.apache.org/jira/browse/TORQUE-276?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]

Thomas Fox resolved TORQUE-276.
-------------------------------

       Resolution: Fixed
    Fix Version/s: 4.1
    
> Change semantics of elements attribute of source tag in generator config.xml
> ----------------------------------------------------------------------------
>
>                 Key: TORQUE-276
>                 URL: https://issues.apache.org/jira/browse/TORQUE-276
>             Project: Torque
>          Issue Type: Sub-task
>          Components: Generator
>    Affects Versions: 4.0
>            Reporter: Thomas Fox
>            Assignee: Thomas Fox
>             Fix For: 4.1
>
>
> The elements attributes select the root elements for file generation.
> E.g. with the current semantics, elements="database/table" would create files for all
table elements in the database root element.
> However, this does not work for a typed model, because there the root element has no
name. So there, we sould have to write elements="table" or elements="/table"
> To have consistenht behaviour across typed and untyped model,s the secoond behavour will
be used for both typed and untyped models.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira

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

[jira] [Resolved] (TORQUE-275) Remove attribute elements of tag transformers in the generator configuration xml

2013-05-19T10:07:15Z


     [ https://issues.apache.org/jira/browse/TORQUE-275?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]

Thomas Fox resolved TORQUE-275.
-------------------------------

       Resolution: Fixed
    Fix Version/s: 4.1
    
> Remove attribute elements of tag transformers in the generator configuration xml
> --------------------------------------------------------------------------------
>
>                 Key: TORQUE-275
>                 URL: https://issues.apache.org/jira/browse/TORQUE-275
>             Project: Torque
>          Issue Type: Sub-task
>          Components: Generator
>            Reporter: Thomas Fox
>            Assignee: Thomas Fox
>             Fix For: 4.1
>
>
> The elements attribute was used if transformations were not applied to the root of the
source tree but to child elements. This does not work any more if the source is not a SourceElement
but consists of a typed model.
> So this attribute needs to be removed.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira

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

svn commit: r1484256 - in /db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque: BaseDatabaseTestCase.java DataTest.java DocsTest.java util/BasePeerTest.java

2013-05-19T10:03:24Z

Author: tfischer
Date: Sun May 19 10:03:24 2013
New Revision: 1484256

URL: http://svn.apache.org/r1484256
Log:
TORQUE-279 Remove deprecated methods and classes from the runtime

Modified:
    db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/BaseDatabaseTestCase.java
    db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/DataTest.java
    db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/DocsTest.java
    db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/BasePeerTest.java

Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/BaseDatabaseTestCase.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/BaseDatabaseTestCase.java?rev=1484256&r1=1484255&r2=1484256&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/BaseDatabaseTestCase.java
(original)
+++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/BaseDatabaseTestCase.java
Sun May 19 10:03:24 2013
@@ -32,7 +32,7 @@ import org.apache.torque.test.dbobject.A
 import org.apache.torque.test.dbobject.Book;
 import org.apache.torque.test.peer.AuthorPeer;
 import org.apache.torque.test.peer.BookPeer;
-import org.apache.torque.util.BasePeer;
+import org.apache.torque.util.BasePeerImpl;
 import org.apache.torque.util.CountHelper;
 
 /**
@@ -83,7 +83,7 @@ public abstract class BaseDatabaseTestCa
                     "getMysqlVersion called but database adapter is "
                         + adapter.getClass().getName());
         }
-        List records = BasePeer.doSelect(
+        List records = new BasePeerImpl().doSelect(
                 "show variables like \"version\"",
                 new StringMapper(1),
                 (String) null);
@@ -189,7 +189,7 @@ public abstract class BaseDatabaseTestCa
      *
      * @throws TorqueException if reading data fails.
      */
-    protected void verifyBookstore(List toVerify) throws TorqueException
+    protected void verifyBookstore(final List toVerify) throws TorqueException
     {
         int numBooks = 0;
 

Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/DataTest.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/DataTest.java?rev=1484256&r1=1484255&r2=1484256&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/DataTest.java (original)
+++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/DataTest.java Sun
May 19 10:03:24 2013
@@ -34,7 +34,6 @@ import org.apache.torque.adapter.DerbyAd
 import org.apache.torque.adapter.MssqlAdapter;
 import org.apache.torque.adapter.MysqlAdapter;
 import org.apache.torque.criteria.Criteria;
-import org.apache.torque.criteria.CriteriaInterface;
 import org.apache.torque.criteria.Criterion;
 import org.apache.torque.om.mapper.CompositeMapper;
 import org.apache.torque.om.mapper.IntegerMapper;
@@ -72,7 +71,7 @@ import org.apache.torque.test.peer.NopkP
 import org.apache.torque.test.peer.VarcharTypePeer;
 import org.apache.torque.test.recordmapper.AuthorRecordMapper;
 import org.apache.torque.test.recordmapper.BookRecordMapper;
-import org.apache.torque.util.BasePeer;
+import org.apache.torque.util.BasePeerImpl;
 import org.apache.torque.util.CountHelper;
 import org.apache.torque.util.Transaction;
 
@@ -392,13 +391,13 @@ public class DataTest extends BaseDataba
         Criteria criteria = new Criteria();
         criteria.addSelectColumn(
                 new ColumnImpl("count(distinct(" + BookPeer.BOOK_ID + "))"));
-        BasePeer.doSelect(criteria, new IntegerMapper());
+        new BasePeerImpl().doSelect(criteria, new IntegerMapper());
 
         // test qualifiers in function in select columns
         criteria = new Criteria();
         criteria.addSelectColumn(
                 new ColumnImpl("count(distinct " + BookPeer.BOOK_ID + ")"));
-        BasePeer.doSelect(criteria, new IntegerMapper());
+        new BasePeerImpl().doSelect(criteria, new IntegerMapper());
     }
 
     /**
@@ -411,7 +410,7 @@ public class DataTest extends BaseDataba
 
         criteria.addSelectColumn(BookPeer.BOOK_ID);
 
-        BasePeer.doSelect(criteria, new IntegerMapper());
+        new BasePeerImpl().doSelect(criteria, new IntegerMapper());
     }
 
     /**
@@ -835,7 +834,7 @@ public class DataTest extends BaseDataba
         // we need an additional column to select from,
         // to indicate the table we want use
         criteria.addSelectColumn(AuthorPeer.AUTHOR_ID);
-        BasePeer.doSelect(criteria, new DoNothingMapper());
+        new BasePeerImpl().doSelect(criteria, new DoNothingMapper());
     }
 
     /**
@@ -1373,7 +1372,7 @@ public class DataTest extends BaseDataba
      * @param fullyQualifiedColumnName the fully qualified column name, not null
      * @return the column name stripped from the table (and schema) prefixes
      */
-    public static String getRawColumnName(String fullyQualifiedColumnName)
+    public static String getRawColumnName(final String fullyQualifiedColumnName)
     {
         int dotPosition = fullyQualifiedColumnName.lastIndexOf(".");
         if (dotPosition == -1)
@@ -1390,9 +1389,9 @@ public class DataTest extends BaseDataba
     {
 
         public Object processRow(
-                    ResultSet resultSet,
-                    int rowOffset,
-                    CriteriaInterface criteria)
+                    final ResultSet resultSet,
+                    final int rowOffset,
+                    final Criteria criteria)
                 throws TorqueException
         {
             return null;

Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/DocsTest.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/DocsTest.java?rev=1484256&r1=1484255&r2=1484256&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/DocsTest.java (original)
+++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/DocsTest.java Sun
May 19 10:03:24 2013
@@ -31,7 +31,7 @@ import org.apache.torque.test.dbobject.A
 import org.apache.torque.test.dbobject.Book;
 import org.apache.torque.test.peer.AuthorPeer;
 import org.apache.torque.test.peer.BookPeer;
-import org.apache.torque.util.BasePeer;
+import org.apache.torque.util.BasePeerImpl;
 
 /**
  * Runtime tests to make sure that the code which is supplied
@@ -219,7 +219,7 @@ public class DocsTest extends BaseDataba
         List result = null;
         try
         {
-            result = BasePeer.doSelect(
+            result = new BasePeerImpl().doSelect(
                     "SELECT book.* FROM book "
                         + "INNER JOIN author "
                         + "ON book.AUTHOR_ID=author.AUTHOR_ID",
@@ -242,7 +242,7 @@ public class DocsTest extends BaseDataba
         result = null;
         try
         {
-            result = BasePeer.doSelect(
+            result = new BasePeerImpl().doSelect(
                     "SELECT book.* FROM book,author "
                         + "WHERE book.AUTHOR_ID=author.AUTHOR_ID",
                     new ObjectListMapper(),

Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/BasePeerTest.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/BasePeerTest.java?rev=1484256&r1=1484255&r2=1484256&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/BasePeerTest.java
(original)
+++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/BasePeerTest.java
Sun May 19 10:03:24 2013
@@ -24,6 +24,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.torque.BaseDatabaseTestCase;
+import org.apache.torque.criteria.Criteria;
 import org.apache.torque.test.dbobject.Author;
 import org.apache.torque.test.peer.BookPeer;
 
@@ -42,16 +43,17 @@ public class BasePeerTest extends BaseDa
         cleanBookstore();
         insertBookstoreData();
         Criteria criteria = new Criteria(BookPeer.DATABASE_NAME);
-        criteria.add(BookPeer.TITLE, "Book 1 - Author 1");
+        criteria.where(BookPeer.TITLE, "Book 1 - Author 1");
 
         // execute
-        int deleted = BasePeer.doDelete(criteria);
+        BasePeerImpl basePeerImpl = new BasePeerImpl();
+        int deleted = basePeerImpl.doDelete(criteria);
 
         // verify
         assertEquals(1, deleted);
         assertEquals(99, countHelper.count(BookPeer.getTableMap()));
         criteria = new Criteria();
-        criteria.add(BookPeer.TITLE, "Book 1 - Author 1");
+        criteria.where(BookPeer.TITLE, "Book 1 - Author 1");
         assertEquals(0, countHelper.count(criteria));
     }
 



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

svn commit: r1484255 - /db/torque/torque4/trunk/torque-templates/src/test/schema/schema.xml

2013-05-19T10:02:16Z

Author: tfischer
Date: Sun May 19 10:02:16 2013
New Revision: 1484255

URL: http://svn.apache.org/r1484255
Log:
Add index and unique definition to test schema

Modified:
    db/torque/torque4/trunk/torque-templates/src/test/schema/schema.xml

Modified: db/torque/torque4/trunk/torque-templates/src/test/schema/schema.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/test/schema/schema.xml?rev=1484255&r1=1484254&r2=1484255&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/test/schema/schema.xml (original)
+++ db/torque/torque4/trunk/torque-templates/src/test/schema/schema.xml Sun May 19 10:02:16
2013
@@ -44,7 +44,9 @@
       size="50"
       default="a_name"
     />
-
+    
+      
+    
   
 
   
@@ -64,7 +66,9 @@
       type="VARCHAR"
       size="50"
     />
-
+    
+      
+    
   
 
 



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

svn commit: r1484254 - /db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/recordmapper/base/recordMapperBase.vm

2013-05-19T10:01:21Z

Author: tfischer
Date: Sun May 19 10:01:21 2013
New Revision: 1484254

URL: http://svn.apache.org/r1484254
Log:
TORQUE-279 Remove deprecated methods and classes from the runtime

Modified:
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/recordmapper/base/recordMapperBase.vm

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/recordmapper/base/recordMapperBase.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/recordmapper/base/recordMapperBase.vm?rev=1484254&r1=1484253&r2=1484254&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/recordmapper/base/recordMapperBase.vm
(original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/recordmapper/base/recordMapperBase.vm
Sun May 19 10:01:21 2013
@@ -37,7 +37,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.torque.Column;
 import org.apache.torque.TorqueException;
-import org.apache.torque.criteria.CriteriaInterface;
+import org.apache.torque.criteria.Criteria;
 import org.apache.torque.om.mapper.RecordMapper;
 
 #if (${baseRecordMapperPackage} != $dbObjectPackage)
@@ -105,7 +105,7 @@ public class ${baseRecordMapperClassName
     public $dbObjectClassName processRow(
                 ResultSet resultSet,
                 int offset,
-                CriteriaInterface criteria)
+                Criteria criteria)
             throws TorqueException
     {
 #set ( $inheritanceBaseColumnElement = $torqueGen.getChild("inheritance-column") )



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

[jira] [Resolved] (TORQUE-274) Change interface of source transformers

2013-05-19T09:59:17Z


     [ https://issues.apache.org/jira/browse/TORQUE-274?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]

Thomas Fox resolved TORQUE-274.
-------------------------------

    Resolution: Fixed
    
> Change interface of source transformers
> ---------------------------------------
>
>                 Key: TORQUE-274
>                 URL: https://issues.apache.org/jira/browse/TORQUE-274
>             Project: Torque
>          Issue Type: Sub-task
>          Components: Generator
>    Affects Versions: 4.0
>            Reporter: Thomas Fox
>            Assignee: Thomas Fox
>
> If the source model can either be typed or untyped, the interface of the source transformers
must be changed.
> Currently the interface requires the method
> SourceElement transform(SourceElement, ControllerState)
> which needs to be changed into
> Object transform(Object, ControllerState)

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira

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

[jira] [Updated] (TORQUE-274) Change interface of source transformers

2013-05-19T09:59:17Z


     [ https://issues.apache.org/jira/browse/TORQUE-274?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]

Thomas Fox updated TORQUE-274:
------------------------------

    Fix Version/s: 4.1
    
> Change interface of source transformers
> ---------------------------------------
>
>                 Key: TORQUE-274
>                 URL: https://issues.apache.org/jira/browse/TORQUE-274
>             Project: Torque
>          Issue Type: Sub-task
>          Components: Generator
>    Affects Versions: 4.0
>            Reporter: Thomas Fox
>            Assignee: Thomas Fox
>             Fix For: 4.1
>
>
> If the source model can either be typed or untyped, the interface of the source transformers
must be changed.
> Currently the interface requires the method
> SourceElement transform(SourceElement, ControllerState)
> which needs to be changed into
> Object transform(Object, ControllerState)

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira

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

[jira] [Resolved] (TORQUE-279) Remove deprecated methods and classes from the runtime

2013-05-19T09:59:16Z


     [ https://issues.apache.org/jira/browse/TORQUE-279?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]

Thomas Fox resolved TORQUE-279.
-------------------------------

    Resolution: Fixed
    
> Remove deprecated methods and classes from the runtime
> ------------------------------------------------------
>
>                 Key: TORQUE-279
>                 URL: https://issues.apache.org/jira/browse/TORQUE-279
>             Project: Torque
>          Issue Type: Improvement
>          Components: Runtime
>    Affects Versions: 4.0
>            Reporter: Thomas Fox
>            Assignee: Thomas Fox
>             Fix For: 4.1
>
>


--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira

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

svn commit: r1484252 [1/3] - in /db/torque/torque4/trunk/torque-runtime/src: main/java/org/apache/torque/ main/java/org/apache/torque/avalon/ main/java/org/apache/torque/criteria/ main/java/org/apache/torque/map/ main/java/org/apache/torque/om/mapper/ ...

2013-05-19T09:58:01Z

Author: tfischer
Date: Sun May 19 09:58:00 2013
New Revision: 1484252

URL: http://svn.apache.org/r1484252
Log:
TORQUE-279 Remove deprecated methods and classes from the runtime

Removed:
    db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/CriteriaInterface.java
    db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/CustomBuilder.java
    db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/BasePeer.java
    db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/Criteria.java
    db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/sql/SqlBuilderOldCriteriaTest.java
    db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/util/CriteriaTest.java
Modified:
    db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/Database.java
    db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/Torque.java
    db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueInstance.java
    db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/avalon/Torque.java
    db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Criteria.java
    db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Criterion.java
    db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Join.java
    db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/SqlEnum.java
    db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/ColumnMap.java
    db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/MapHelper.java
    db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/BigDecimalMapper.java
    db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/CompositeMapper.java
    db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/DateMapper.java
    db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/IntegerMapper.java
    db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/LongMapper.java
    db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/ObjectListMapper.java
    db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/RecordMapper.java
    db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/StringMapper.java
    db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/JoinBuilder.java
    db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/SqlBuilder.java
    db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/objectbuilder/ObjectOrColumnPsPartBuilder.java
    db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/BasePeerImpl.java
    db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/CountHelper.java
    db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/LargeSelect.java
    db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/SummaryHelper.java
    db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/TorqueInstanceTest.java
    db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/criteria/CriterionTest.java
    db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/sql/SqlBuilderTest.java
    db/torque/torque4/trunk/torque-runtime/src/test/resources/torque-schematest.properties

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/Database.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/Database.java?rev=1484252&r1=1484251&r2=1484252&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/Database.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/Database.java Sun May 19 09:58:00 2013
@@ -79,7 +79,7 @@ public class Database
      *
      * @throws NullPointerException if name is null.
      */
-    Database(String name)
+    Database(final String name)
     {
         if (name == null)
         {
@@ -114,7 +114,7 @@ public class Database
      * @param anAdapter The adapter for this database, or null to remove the
      *        current adapter from this database.
      */
-    public void setAdapter(Adapter anAdapter)
+    public void setAdapter(final Adapter anAdapter)
     {
         this.adapter = anAdapter;
     }
@@ -153,7 +153,7 @@ public class Database
      * @param aDataSourceFactory The new DataSorceFactory for this database,
      *        or null to remove the current DataSourceFactory.
      */
-    public void setDataSourceFactory(DataSourceFactory aDataSourceFactory)
+    public void setDataSourceFactory(final DataSourceFactory aDataSourceFactory)
     {
         this.dataSourceFactory = aDataSourceFactory;
     }
@@ -174,7 +174,7 @@ public class Database
      *
      * @param idTable The TableMap representation for the ID table.
      */
-    public void setIdTable(TableMap idTable)
+    public void setIdTable(final TableMap idTable)
     {
         this.idTable = idTable;
         getDatabaseMap().setIdTable(idTable);
@@ -185,7 +185,7 @@ public class Database
      *
      * @param tableName The name for the ID table.
      */
-    public void setIdTable(String tableName)
+    public void setIdTable(final String tableName)
     {
         TableMap tmap = new TableMap(tableName, getDatabaseMap());
         setIdTable(tmap);
@@ -211,25 +211,6 @@ public class Database
      * does nothing.
      *
      * @return true if a new IDBroker was created, false otherwise.
-     *
-     * @deprecated This method will be removed in a future version of Torque.
-     *             Please use createAndRegisterIdBroker() instead.
-     */
-    @Deprecated
-    public synchronized boolean startIdBroker()
-    {
-        return createAndRegisterIdBroker();
-    }
-
-    /**
-     * Creates the IDBroker for this Database and registers it with Torque.
-     * so it is either started instantly if Torque is already initialized
-     * or it is started when Torque is initialized.
-     * The information about the IdTable is stored in the databaseMap.
-     * If an IDBroker already exists for this Database, the method
-     * does nothing.
-     *
-     * @return true if a new IDBroker was created, false otherwise.
      */
     public synchronized boolean createAndRegisterIdBroker()
     {
@@ -265,7 +246,7 @@ public class Database
      * @return The IdGenerator of the requested type, or null if no IdGenerator
      *         exists for the requested type.
      */
-    public IdGenerator getIdGenerator(IDMethod type)
+    public IdGenerator getIdGenerator(final IDMethod type)
     {
         return idGenerators.get(type);
     }
@@ -277,7 +258,7 @@ public class Database
      * @param idGen The new IdGenerator for the type, or null
      *        to remove the IdGenerator of the given type.
      */
-    public void addIdGenerator(IDMethod type, IdGenerator idGen)
+    public void addIdGenerator(final IDMethod type, final IdGenerator idGen)
     {
         idGenerators.put(type, idGen);
     }
@@ -299,7 +280,7 @@ public class Database
      * @param schema the name of the database schema to set, or null to remove
      *        the current schema.
      */
-    public void setSchema(String schema)
+    public void setSchema(final String schema)
     {
         this.schema = schema;
     }

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/Torque.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/Torque.java?rev=1484252&r1=1484251&r2=1484252&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/Torque.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/Torque.java Sun May 19 09:58:00 2013
@@ -118,7 +118,7 @@ public final class Torque
      *
      * @param instance Our singleton.
      */
-    public static void setInstance(TorqueInstance instance)
+    public static void setInstance(final TorqueInstance instance)
     {
         torqueSingleton = instance;
     }
@@ -131,7 +131,7 @@ public final class Torque
      * @throws TorqueException Any exceptions caught during processing will be
      *         rethrown wrapped into a TorqueException.
      */
-    public static void init(String configFile)
+    public static void init(final String configFile)
         throws TorqueException
     {
         getInstance().init(configFile);
@@ -145,7 +145,7 @@ public final class Torque
      * @throws TorqueException Any exceptions caught during processing will be
      *         rethrown wrapped into a TorqueException.
      */
-    public static void init(Configuration conf)
+    public static void init(final Configuration conf)
         throws TorqueException
     {
         getInstance().init(conf);
@@ -169,7 +169,7 @@ public final class Torque
      * @throws TorqueException if the configuration does not contain
      *         any keys starting with Torque.TORQUE_KEY.
      */
-    public static void setConfiguration(Configuration conf)
+    public static void setConfiguration(final Configuration conf)
             throws TorqueException
     {
         getInstance().setConfiguration(conf);
@@ -193,7 +193,7 @@ public final class Torque
      * @return The requested Manager.
      */
     @SuppressWarnings("unchecked")
-	public static > T getManager(String name)
+	public static > T getManager(final String name)
     {
         /*
          *  The cast is necessary to work around bug
@@ -214,8 +214,8 @@ public final class Torque
      */
     @SuppressWarnings("unchecked")
     public static > T getManager(
-            String name,
-            String defaultClassName)
+            final String name,
+            final String defaultClassName)
     {
         /*
          *  The cast is necessary to work around bug
@@ -266,7 +266,7 @@ public final class Torque
      *
      * @throws TorqueException if Torque is not initialized and name is null.
      */
-    public static DatabaseMap getDatabaseMap(String name)
+    public static DatabaseMap getDatabaseMap(final String name)
             throws TorqueException
     {
         return getInstance().getDatabaseMap(name);
@@ -281,7 +281,7 @@ public final class Torque
      *
      * @throws NullPointerException if idBroker is null.
      */
-    public static void registerIDBroker(IDBroker idBroker)
+    public static void registerIDBroker(final IDBroker idBroker)
     {
         getInstance().registerIDBroker(idBroker);
     }
@@ -310,7 +310,7 @@ public final class Torque
      * @throws TorqueException Any exceptions caught during processing will be
      *         rethrown wrapped into a TorqueException.
      */
-    public static Connection getConnection(String name)
+    public static Connection getConnection(final String name)
         throws TorqueException
     {
         return getInstance().getConnection(name);
@@ -330,8 +330,8 @@ public final class Torque
      * @throws TorqueException Any exceptions caught during processing will be
      *         rethrown wrapped into a TorqueException.
      */
-    public static Connection getConnection(String name, String username,
-            String password)
+    public static Connection getConnection(final String name, final String username,
+            final String password)
             throws TorqueException
     {
         return getInstance().getConnection(name, username, password);
@@ -342,32 +342,13 @@ public final class Torque
      *
      * @param name the database name, or null for the default db.
      *
-     * @return The corresponding database adapter.
-     *
-     * @throws TorqueException Any exceptions caught during processing will be
-     *         rethrown wrapped into a TorqueException.
-     *
-     * @deprecated use getAdapter(String) instead.
-     *             This method will be removed in a future version of Torque.
-     */
-    @Deprecated
-    public static Adapter getDB(String name) throws TorqueException
-    {
-        return getInstance().getDB(name);
-    }
-
-    /**
-     * Returns the database adapter for a specific database name.
-     *
-     * @param name the database name, or null for the default db.
-     *
      * @return The corresponding database adapter, or null if no database
      *         adapter is defined for the given database.
      *
      * @throws TorqueException Any exceptions caught during processing will be
      *         rethrown wrapped into a TorqueException.
      */
-    public static Adapter getAdapter(String name) throws TorqueException
+    public static Adapter getAdapter(final String name) throws TorqueException
     {
         return getInstance().getAdapter(name);
     }
@@ -387,7 +368,7 @@ public final class Torque
      *
      * @param con A Connection to close.
      */
-    public static void closeConnection(Connection con)
+    public static void closeConnection(final Connection con)
     {
         getInstance().closeConnection(con);
     }
@@ -400,7 +381,7 @@ public final class Torque
      *
      * @throws NullPointerException if databaseName is null.
      */
-    public static void setSchema(String name, String schema)
+    public static void setSchema(final String name, final String schema)
     {
         getInstance().setSchema(name, schema);
     }
@@ -415,7 +396,7 @@ public final class Torque
      * @throws TorqueException Any exceptions caught during processing will be
      *         rethrown wrapped into a TorqueException.
      */
-    public static String getSchema(String name)
+    public static String getSchema(final String name)
         throws TorqueException
     {
         return getInstance().getSchema(name);
@@ -432,7 +413,7 @@ public final class Torque
      *
      * @throws TorqueException if Torque is not yet initialized.
      */
-    public static Database getDatabase(String name) throws TorqueException
+    public static Database getDatabase(final String name) throws TorqueException
     {
         return getInstance().getDatabase(name);
     }
@@ -449,7 +430,7 @@ public final class Torque
      *
      * @throws IllegalArgumentException if databaseName is null.
      */
-    public static Database getOrCreateDatabase(String name)
+    public static Database getOrCreateDatabase(final String name)
     {
         return getInstance().getOrCreateDatabase(name);
     }

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueInstance.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueInstance.java?rev=1484252&r1=1484251&r2=1484252&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueInstance.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueInstance.java Sun May 19 09:58:00 2013
@@ -193,7 +193,7 @@ public class TorqueInstance
      * @throws TorqueException if the transaction manger configuration
      *         is invalid.
      */
-    private void initTransactionManager(Configuration conf)
+    private void initTransactionManager(final Configuration conf)
             throws TorqueException
     {
         log.debug("initTransactionManager(" + conf + ")");
@@ -247,7 +247,7 @@ public class TorqueInstance
      *
      * @throws TorqueException if the appropriate key is not set.
      */
-    private void initDefaultDbName(Configuration conf)
+    private void initDefaultDbName(final Configuration conf)
             throws TorqueException
     {
         log.debug("initDefaultDbName(" + conf + ")");
@@ -283,7 +283,7 @@ public class TorqueInstance
      * @throws TorqueException Any exceptions caught during processing will be
      *         rethrown wrapped into a TorqueException.
      */
-    private void initAdapters(Configuration conf)
+    private void initAdapters(final Configuration conf)
             throws TorqueException
     {
         log.debug("initAdapters(" + conf + ")");
@@ -409,7 +409,7 @@ public class TorqueInstance
      * @throws TorqueException Any exceptions caught during processing will be
      *         rethrown wrapped into a TorqueException.
      */
-    private void initDataSourceFactories(Configuration conf)
+    private void initDataSourceFactories(final Configuration conf)
             throws TorqueException
     {
         log.debug("initDataSourceFactories(" + conf + ")");
@@ -447,18 +447,6 @@ public class TorqueInstance
 
                     Database database = getOrCreateDatabase(handle);
                     database.setDataSourceFactory(dsf);
-
-                    // deprecated method of schema configuration
-                    // TODO: remove in Torque 4.1
-                    String schema = subConf.getString(Torque.SCHEMA_KEY, null);
-                    if (!StringUtils.isEmpty(schema))
-                    {
-                        log.warn("Defining the schema in the dsfactory "
-                                + "is deprecated, please configure it "
-                                + "via the config key "
-                                + "torque.database.${databasename}.schema");
-                    }
-                    database.setSchema(schema);
                 }
             }
         }
@@ -502,7 +490,7 @@ public class TorqueInstance
      * @throws TorqueException Any exceptions caught during processing will be
      *         rethrown wrapped into a TorqueException.
      */
-    private void initSchemata(Configuration conf)
+    private void initSchemata(final Configuration conf)
             throws TorqueException
     {
         log.debug("initSchemata(" + conf + ")");
@@ -574,7 +562,7 @@ public class TorqueInstance
      * @throws TorqueException Any exceptions caught during processing will be
      *         rethrown wrapped into a TorqueException.
      */
-    public void init(String configFile)
+    public void init(final String configFile)
             throws TorqueException
     {
         log.debug("init(" + configFile + ")");
@@ -600,7 +588,7 @@ public class TorqueInstance
      * @throws TorqueException Any exceptions caught during processing will be
      *         rethrown wrapped into a TorqueException.
      */
-    public synchronized void init(Configuration conf)
+    public synchronized void init(final Configuration conf)
             throws TorqueException
     {
         log.debug("init(" + conf + ")");
@@ -631,7 +619,7 @@ public class TorqueInstance
      * @throws TorqueException Any exceptions caught during processing will be
      *         rethrown wrapped into a TorqueException.
      */
-    protected synchronized void initManagerMappings(Configuration conf)
+    protected synchronized void initManagerMappings(final Configuration conf)
             throws TorqueException
     {
         int pref = Torque.MANAGER_PREFIX.length();
@@ -677,7 +665,7 @@ public class TorqueInstance
      * @throws TorqueException Any exceptions caught during processing will be
      *         rethrown wrapped into a TorqueException.
      */
-    private synchronized void initManager(String name, String className)
+    private synchronized void initManager(final String name, final String className)
             throws TorqueException
     {
         AbstractBaseManager manager = managers.get(name);
@@ -730,7 +718,7 @@ public class TorqueInstance
      * @throws TorqueException if the configuration does not contain
      *         any keys starting with Torque.TORQUE_KEY.
      */
-    public void setConfiguration(Configuration conf)
+    public void setConfiguration(final Configuration conf)
             throws TorqueException
     {
         log.debug("setConfiguration(" + conf + ")");
@@ -764,7 +752,7 @@ public class TorqueInstance
      * @param name name of the manager
      * @return a Manager
      */
-    public > T getManager(String name)
+    public > T getManager(final String name)
     {
         @SuppressWarnings("unchecked")
         T m = (T) managers.get(name);
@@ -785,8 +773,8 @@ public class TorqueInstance
      * @return a Manager
      */
     @SuppressWarnings("unchecked")
-    public > T getManager(String name,
-            String defaultClassName)
+    public > T getManager(final String name,
+            final String defaultClassName)
     {
         T m = (T) managers.get(name);
         if (m == null)
@@ -953,7 +941,7 @@ public class TorqueInstance
      *
      * @throws NullPointerException if idBroker is null.
      */
-    public void registerIDBroker(IDBroker idBroker)
+    public void registerIDBroker(final IDBroker idBroker)
     {
         idBrokers.add(idBroker);
         if (isInit())
@@ -989,7 +977,7 @@ public class TorqueInstance
      *         named database, the connection information is wrong, or the
      *         connection cannot be returned for any other reason.
      */
-    public Connection getConnection(String name)
+    public Connection getConnection(final String name)
             throws TorqueException
     {
         if (!isInit())
@@ -1020,7 +1008,7 @@ public class TorqueInstance
      * @throws TorqueException if Torque is not initialized, or
      *         no DatasourceFactory is configured for the given name.
      */
-    public DataSourceFactory getDataSourceFactory(String name)
+    public DataSourceFactory getDataSourceFactory(final String name)
             throws TorqueException
     {
         if (!isInit())
@@ -1060,8 +1048,8 @@ public class TorqueInstance
      * @throws TorqueException Any exceptions caught during processing will be
      *         rethrown wrapped into a TorqueException.
      */
-    public Connection getConnection(String name, String username,
-            String password)
+    public Connection getConnection(final String name, final String username,
+            final String password)
             throws TorqueException
     {
         if (!isInit())
@@ -1088,36 +1076,8 @@ public class TorqueInstance
      *         adapter is defined for the given database.
      *
      * @throws TorqueException if Torque is not initialized.
-     *
-     * @deprecated use getAdapter(String) instead.
-     *             This method will be removed in a future version of Torque.
-     */
-    @Deprecated
-    public Adapter getDB(String name) throws TorqueException
-    {
-        if (!isInit())
-        {
-            throw new TorqueException("Torque is not initialized");
-        }
-        Database database = getDatabase(name);
-        if (database == null)
-        {
-            return null;
-        }
-        return database.getAdapter();
-    }
-
-    /**
-     * Returns the database adapter for a specific database.
-     *
-     * @param name the database name, or null for the default db.
-     *
-     * @return The corresponding database adapter, or null if no database
-     *         adapter is defined for the given database.
-     *
-     * @throws TorqueException if Torque is not initialized.
      */
-    public Adapter getAdapter(String name) throws TorqueException
+    public Adapter getAdapter(final String name) throws TorqueException
     {
         if (!isInit())
         {
@@ -1148,7 +1108,7 @@ public class TorqueInstance
      *
      * @param con A Connection to close.
      */
-    public void closeConnection(Connection con)
+    public void closeConnection(final Connection con)
     {
         if (con != null)
         {
@@ -1171,7 +1131,7 @@ public class TorqueInstance
      *
      * @throws NullPointerException if databaseName is null.
      */
-    public void setSchema(String name, String schema)
+    public void setSchema(final String name, final String schema)
     {
         getOrCreateDatabase(name).setSchema(schema);
     }
@@ -1186,7 +1146,7 @@ public class TorqueInstance
      *
      * @throws TorqueException if Torque is not yet initialized.
      */
-    public String getSchema(String name)
+    public String getSchema(final String name)
             throws TorqueException
     {
         if (!isInit())
@@ -1259,7 +1219,7 @@ public class TorqueInstance
      *
      * @throws NullPointerException if databaseName is null.
      */
-    public Database getOrCreateDatabase(String databaseName)
+    public Database getOrCreateDatabase(final String databaseName)
     {
         if (databaseName == null)
         {

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/avalon/Torque.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/avalon/Torque.java?rev=1484252&r1=1484251&r2=1484252&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/avalon/Torque.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/avalon/Torque.java Sun May 19 09:58:00 2013
@@ -146,19 +146,6 @@ public interface Torque
      * @return The corresponding database adapter.
      * @throws TorqueException Any exceptions caught during processing will be
      *         rethrown wrapped into a TorqueException.
-     * @deprecated use getAdapter(String) instead.
-     *             This method will be removed in a future version of Torque.
-     */
-    @Deprecated
-    Adapter getDB(String name) throws TorqueException;
-
-    /**
-     * Returns database adapter for a specific connection pool.
-     *
-     * @param name A pool name.
-     * @return The corresponding database adapter.
-     * @throws TorqueException Any exceptions caught during processing will be
-     *         rethrown wrapped into a TorqueException.
      */
     Adapter getAdapter(String name) throws TorqueException;
 

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Criteria.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Criteria.java?rev=1484252&r1=1484251&r2=1484252&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Criteria.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Criteria.java Sun May 19 09:58:00 2013
@@ -52,8 +52,7 @@ import org.apache.torque.util.UniqueList
  * @author Thomas Vandahl
  * @version $Id$
  */
-public class Criteria
-        implements Serializable, Cloneable, CriteriaInterface
+public class Criteria implements Serializable, Cloneable
 {
     /** Serial version. */
     private static final long serialVersionUID = -9001666575933085601L;
@@ -214,7 +213,7 @@ public class Criteria
      *
      * @param dbName The database name.
      */
-    public Criteria(String dbName)
+    public Criteria(final String dbName)
     {
         this();
         this.dbName = dbName;
@@ -227,7 +226,7 @@ public class Criteria
      *
      * @param toCopy the criteria to copy.
      */
-    public Criteria(Criteria toCopy)
+    public Criteria(final Criteria toCopy)
     {
         ignoreCase = toCopy.ignoreCase;
         singleRecord = toCopy.singleRecord;
@@ -270,7 +269,7 @@ public class Criteria
      *
      * @return A modified Criteria object.
      */
-    public Criteria addAsColumn(String name, Column clause)
+    public Criteria addAsColumn(final String name, final Column clause)
     {
         asColumns.put(name, clause);
         return this;
@@ -304,7 +303,7 @@ public class Criteria
      * @param alias the alias for the table name.
      * @param table the table name as known in the database.
      */
-    public Criteria addAlias(String alias, String table)
+    public Criteria addAlias(final String alias, final String table)
     {
         aliases.put(alias, table);
         return this;
@@ -316,7 +315,7 @@ public class Criteria
      * @param alias the alias for the subselect.
      * @param subselect the Criteria for the subselect.
      */
-    public Criteria addAlias(String alias, Criteria subselect)
+    public Criteria addAlias(final String alias, final Criteria subselect)
     {
         aliases.put(alias, subselect);
         return this;
@@ -333,7 +332,7 @@ public class Criteria
      *         alias is defined but is no alias for a table name
      *         (e.g. it is an alias for a subselect).
      */
-    public String getTableForAlias(String alias)
+    public String getTableForAlias(final String alias)
     {
         Object aliasResolved = aliases.get(alias);
         if (aliasResolved == null)
@@ -360,7 +359,7 @@ public class Criteria
      *         alias is defined but is not an alias for a subselect
      *         (e.g. it is an alias for a table).
      */
-    public Criteria getSubselectForAlias(String alias)
+    public Criteria getSubselectForAlias(final String alias)
     {
         Object aliasResolved = aliases.get(alias);
         if (aliasResolved == null)
@@ -403,7 +402,7 @@ public class Criteria
      *
      * @param dbName The Database(Map) name.
      */
-    public void setDbName(String dbName)
+    public void setDbName(final String dbName)
     {
         this.dbName = dbName;
     }
@@ -421,7 +420,7 @@ public class Criteria
      * @param having A Criterion object
      * @return A modified Criteria object.
      */
-    public Criteria addHaving(Criterion having)
+    public Criteria addHaving(final Criterion having)
     {
         this.having = having;
         return this;
@@ -456,7 +455,7 @@ public class Criteria
      *
      * @return this object.
      */
-    public Criteria setForUpdate(boolean forUpdate)
+    public Criteria setForUpdate(final boolean forUpdate)
     {
         this.forUpdate = forUpdate;
         return this;
@@ -485,7 +484,7 @@ public class Criteria
      * @param right A String with the right side of the join.
      * @return A modified Criteria object.
      */
-    public Criteria addJoin(Column left, Column right)
+    public Criteria addJoin(final Column left, final Column right)
     {
         return addJoin(left, right, null);
     }
@@ -506,7 +505,7 @@ public class Criteria
      *        Criteria.LEFT_JOIN, Criteria.RIGHT_JOIN, Criteria.INNER_JOIN
      * @return A modified Criteria object.
      */
-    public Criteria addJoin(Column left, Column right, JoinType joinType)
+    public Criteria addJoin(final Column left, final Column right, final JoinType joinType)
     {
         joins.add(new Join(left, right, Criteria.EQUAL, joinType));
 
@@ -536,10 +535,10 @@ public class Criteria
      * @return A modified Criteria object.
      */
     public Criteria addJoin(
-            Column left,
-            Column right,
-            SqlEnum comparison,
-            JoinType joinType)
+            final Column left,
+            final Column right,
+            final SqlEnum comparison,
+            final JoinType joinType)
     {
         joins.add(new Join(left, right, comparison, joinType));
 
@@ -572,10 +571,10 @@ public class Criteria
      * @return A modified Criteria object.
      */
     public Criteria addJoin(
-            String leftTable,
-            String rightTable,
-            Criterion joinCondition,
-            JoinType joinType)
+            final String leftTable,
+            final String rightTable,
+            final Criterion joinCondition,
+            final JoinType joinType)
     {
         joins.add(new Join(
                 new PreparedStatementPart(leftTable),
@@ -612,10 +611,10 @@ public class Criteria
      * @return A modified Criteria object.
      */
     public Criteria addJoin(
-            PreparedStatementPart leftTable,
-            PreparedStatementPart rightTable,
-            Criterion joinCondition,
-            JoinType joinType)
+            final PreparedStatementPart leftTable,
+            final PreparedStatementPart rightTable,
+            final Criterion joinCondition,
+            final JoinType joinType)
     {
         joins.add(new Join(
                 leftTable,
@@ -659,7 +658,7 @@ public class Criteria
      * @param ignoreCase True if case should be ignored.
      * @return A modified Criteria object.
      */
-    public Criteria setIgnoreCase(boolean ignoreCase)
+    public Criteria setIgnoreCase(final boolean ignoreCase)
     {
         this.ignoreCase = ignoreCase;
         return this;
@@ -689,7 +688,7 @@ public class Criteria
      *        exactly one record.
      * @return A modified Criteria object.
      */
-    public Criteria setSingleRecord(boolean b)
+    public Criteria setSingleRecord(final boolean b)
     {
         singleRecord = b;
         return this;
@@ -713,7 +712,7 @@ public class Criteria
      *        by a query.
      * @return A modified Criteria object.
      */
-    public Criteria setLimit(int limit)
+    public Criteria setLimit(final int limit)
     {
         this.limit = limit;
         return this;
@@ -736,7 +735,7 @@ public class Criteria
      *        result.
      * @return A modified Criteria object.
      */
-    public Criteria setOffset(long offset)
+    public Criteria setOffset(final long offset)
     {
         this.offset = offset;
         return this;
@@ -767,7 +766,7 @@ public class Criteria
      *
      * @param fetchSize the fetch size, or null for not set.
      */
-    public void setFetchSize(Integer fetchSize)
+    public void setFetchSize(final Integer fetchSize)
     {
         this.fetchSize = fetchSize;
     }
@@ -779,7 +778,7 @@ public class Criteria
      *
      * @return A modified Criteria object.
      */
-    public Criteria addSelectColumn(Column column)
+    public Criteria addSelectColumn(final Column column)
     {
         selectColumns.add(column);
         return this;
@@ -812,7 +811,7 @@ public class Criteria
      *
      * @return A modified Criteria object.
      */
-    public Criteria addGroupByColumn(Column groupBy)
+    public Criteria addGroupByColumn(final Column groupBy)
     {
         groupByColumns.add(groupBy);
         return this;
@@ -835,7 +834,7 @@ public class Criteria
      *
      * @return A modified Criteria object.
      */
-    public Criteria addAscendingOrderByColumn(Column column)
+    public Criteria addAscendingOrderByColumn(final Column column)
     {
         orderByColumns.add(new OrderBy(column, SqlEnum.ASC, false));
         return this;
@@ -849,7 +848,7 @@ public class Criteria
      *
      * @return A modified Criteria object.
      */
-    public Criteria addAscendingOrderByColumn(Column column, boolean ignoreCase)
+    public Criteria addAscendingOrderByColumn(final Column column, final boolean ignoreCase)
     {
         orderByColumns.add(new OrderBy(column, SqlEnum.ASC, ignoreCase));
         return this;
@@ -862,7 +861,7 @@ public class Criteria
      *
      * @return A modified Criteria object.
      */
-    public Criteria addDescendingOrderByColumn(Column column)
+    public Criteria addDescendingOrderByColumn(final Column column)
     {
         orderByColumns.add(new OrderBy(column, SqlEnum.DESC, false));
         return this;
@@ -878,8 +877,8 @@ public class Criteria
      * @return A modified Criteria object.
      */
     public Criteria addDescendingOrderByColumn(
-            Column column,
-            boolean ignoreCase)
+            final Column column,
+            final boolean ignoreCase)
     {
         orderByColumns.add(new OrderBy(column, SqlEnum.DESC, ignoreCase));
         return this;
@@ -911,7 +910,7 @@ public class Criteria
      *
      * @return the modified Criteria object.
      */
-    public Criteria addFrom(String tableName)
+    public Criteria addFrom(final String tableName)
     {
         fromElements.add(new FromElement(tableName));
         return this;
@@ -922,7 +921,7 @@ public class Criteria
      *
      * @return the modified Criteria object.
      */
-    public Criteria addFrom(FromElement fromElement)
+    public Criteria addFrom(final FromElement fromElement)
     {
         fromElements.add(fromElement);
         return this;
@@ -961,7 +960,7 @@ public class Criteria
      * @return true if the object is equal to this Criteria, false otherwise.
      */
     @Override
-    public boolean equals(Object object)
+    public boolean equals(final Object object)
     {
         if (object == null)
         {
@@ -1064,7 +1063,7 @@ public class Criteria
      *
      * @return A modified Criteria object.
      */
-    public Criteria and(Criterion criterion)
+    public Criteria and(final Criterion criterion)
     {
         if (topLevelCriterion == null)
         {
@@ -1103,7 +1102,7 @@ public class Criteria
      *
      * @return A modified Criteria object.
      */
-    public Criteria and(Object lValue, Object rValue)
+    public Criteria and(final Object lValue, final Object rValue)
     {
         if (rValue instanceof SqlEnum)
         {
@@ -1136,23 +1135,9 @@ public class Criteria
      *
      * @return A modified Criteria object.
      */
-    @SuppressWarnings("deprecation")
-    public Criteria and(Object lValue, Object rValue, SqlEnum comparison)
+    public Criteria and(final Object lValue, final Object rValue, final SqlEnum comparison)
     {
-        Criterion newCriterion;
-        if (comparison == SqlEnum.CUSTOM)
-        {
-            newCriterion = new Criterion(
-                    lValue,
-                    null,
-                    null,
-                    (String) rValue,
-                    null);
-        }
-        else
-        {
-            newCriterion = new Criterion(lValue, rValue, comparison);
-        }
+        Criterion newCriterion = new Criterion(lValue, rValue, comparison);
         if (topLevelCriterion == null)
         {
             topLevelCriterion = newCriterion;
@@ -1184,7 +1169,7 @@ public class Criteria
      *
      * @return A modified Criteria object.
      */
-    public Criteria andDate(Object lValue, int year, int month, int day)
+    public Criteria andDate(final Object lValue, final int year, final int month, final int day)
     {
         return and(lValue,
                 new GregorianCalendar(year, month, day).getTime(),
@@ -1212,8 +1197,8 @@ public class Criteria
      *
      * @return A modified Criteria object.
      */
-    public Criteria andDate(Object lValue, int year, int month, int day,
-            SqlEnum comparison)
+    public Criteria andDate(final Object lValue, final int year, final int month, final int day,
+            final SqlEnum comparison)
     {
         return and(lValue,
                 new GregorianCalendar(year, month, day).getTime(),
@@ -1238,7 +1223,7 @@ public class Criteria
      *
      * @return A modified Criteria object.
      */
-    public Criteria andIn(Object lValue, Object[] rValues)
+    public Criteria andIn(final Object lValue, final Object[] rValues)
     {
         return and(lValue, rValues, Criteria.IN);
     }
@@ -1261,7 +1246,7 @@ public class Criteria
      *
      * @return A modified Criteria object.
      */
-    public Criteria andIn(Object lValue, Collection rValues)
+    public Criteria andIn(final Object lValue, final Collection rValues)
     {
         return and(lValue, rValues, Criteria.IN);
     }
@@ -1284,7 +1269,7 @@ public class Criteria
      *
      * @return A modified Criteria object.
      */
-    public Criteria andNotIn(Object lValue, Object[] rValues)
+    public Criteria andNotIn(final Object lValue, final Object[] rValues)
     {
         return and(lValue, rValues, Criteria.NOT_IN);
     }
@@ -1307,7 +1292,7 @@ public class Criteria
      *
      * @return A modified Criteria object.
      */
-    public Criteria andNotIn(Object lValue, Collection rValues)
+    public Criteria andNotIn(final Object lValue, final Collection rValues)
     {
         return and(lValue, rValues, Criteria.NOT_IN);
     }
@@ -1326,7 +1311,7 @@ public class Criteria
      *
      * @return the modified Criteria.
      */
-    public Criteria andVerbatimSql(String sql, Object[] replacements)
+    public Criteria andVerbatimSql(final String sql, final Object[] replacements)
     {
         Criterion criterion
                 = new Criterion(null, null, null, sql, replacements);
@@ -1355,10 +1340,10 @@ public class Criteria
      * @return the modified Criteria.
      */
     public Criteria andVerbatimSql(
-            String sql,
-            Object[] replacements,
-            Column toAddToFromClause1,
-            Column toAddToFromClause2)
+            final String sql,
+            final Object[] replacements,
+            final Column toAddToFromClause1,
+            final Column toAddToFromClause2)
     {
         Criterion criterion = new Criterion(
                 toAddToFromClause1,
@@ -1393,7 +1378,7 @@ public class Criteria
      *
      * @return A modified Criteria object.
      */
-    public Criteria or(Criterion criterion)
+    public Criteria or(final Criterion criterion)
     {
         if (topLevelCriterion == null)
         {
@@ -1432,7 +1417,7 @@ public class Criteria
      *
      * @return A modified Criteria object.
      */
-    public Criteria or(Object lValue, Object rValue)
+    public Criteria or(final Object lValue, final Object rValue)
     {
         if (rValue instanceof SqlEnum)
         {
@@ -1465,23 +1450,9 @@ public class Criteria
      *
      * @return A modified Criteria object.
      */
-    @SuppressWarnings("deprecation")
-    public Criteria or(Object lValue, Object rValue, SqlEnum comparison)
+    public Criteria or(final Object lValue, final Object rValue, final SqlEnum comparison)
     {
-        Criterion newCriterion;
-        if (comparison == SqlEnum.CUSTOM)
-        {
-            newCriterion = new Criterion(
-                    lValue,
-                    null,
-                    null,
-                    (String) rValue,
-                    null);
-        }
-        else
-        {
-            newCriterion = new Criterion(lValue, rValue, comparison);
-        }
+        Criterion newCriterion = new Criterion(lValue, rValue, comparison);
         if (topLevelCriterion == null)
         {
             topLevelCriterion = newCriterion;
@@ -1513,7 +1484,7 @@ public class Criteria
      *
      * @return A modified Criteria object.
      */
-    public Criteria orDate(Object lValue, int year, int month, int day)
+    public Criteria orDate(final Object lValue, final int year, final int month, final int day)
     {
         return or(lValue,
                 new GregorianCalendar(year, month, day).getTime(),
@@ -1541,8 +1512,8 @@ public class Criteria
      *
      * @return A modified Criteria object.
      */
-    public Criteria orDate(Object lValue, int year, int month, int day,
-            SqlEnum comparison)
+    public Criteria orDate(final Object lValue, final int year, final int month, final int day,
+            final SqlEnum comparison)
     {
         return or(lValue,
                 new GregorianCalendar(year, month, day).getTime(),
@@ -1567,7 +1538,7 @@ public class Criteria
      *
      * @return A modified Criteria object.
      */
-    public Criteria orIn(Object lValue, Object[] rValues)
+    public Criteria orIn(final Object lValue, final Object[] rValues)
     {
         return or(lValue, rValues, Criteria.IN);
     }
@@ -1590,7 +1561,7 @@ public class Criteria
      *
      * @return A modified Criteria object.
      */
-    public Criteria orIn(Object lValue, Collection rValues)
+    public Criteria orIn(final Object lValue, final Collection rValues)
     {
         return or(lValue, rValues, Criteria.IN);
     }
@@ -1613,7 +1584,7 @@ public class Criteria
      *
      * @return A modified Criteria object.
      */
-    public Criteria orNotIn(Object lValue, Object[] rValues)
+    public Criteria orNotIn(final Object lValue, final Object[] rValues)
     {
         return or(lValue, rValues, Criteria.NOT_IN);
     }
@@ -1636,7 +1607,7 @@ public class Criteria
      *
      * @return A modified Criteria object.
      */
-    public Criteria orNotIn(Object lValue, Collection rValues)
+    public Criteria orNotIn(final Object lValue, final Collection rValues)
     {
         return or(lValue, rValues, Criteria.NOT_IN);
     }
@@ -1655,7 +1626,7 @@ public class Criteria
      *
      * @return the modified Criteria.
      */
-    public Criteria orVerbatimSql(String sql, Object[] replacements)
+    public Criteria orVerbatimSql(final String sql, final Object[] replacements)
     {
         Criterion criterion
                 = new Criterion(null, null, null, sql, replacements);
@@ -1684,10 +1655,10 @@ public class Criteria
      * @return the modified Criteria.
      */
     public Criteria orVerbatimSql(
-            String sql,
-            Object[] replacements,
-            Column toAddToFromClause1,
-            Column toAddToFromClause2)
+            final String sql,
+            final Object[] replacements,
+            final Column toAddToFromClause1,
+            final Column toAddToFromClause2)
     {
         Criterion criterion = new Criterion(
                 toAddToFromClause1,
@@ -1716,7 +1687,7 @@ public class Criteria
      *
      * @return A modified Criteria object.
      */
-    public Criteria where(Criterion criterion)
+    public Criteria where(final Criterion criterion)
     {
         return and(criterion);
     }
@@ -1749,7 +1720,7 @@ public class Criteria
      *
      * @return A modified Criteria object.
      */
-    public Criteria where(Object lValue, Object rValue)
+    public Criteria where(final Object lValue, final Object rValue)
     {
         return and(lValue, rValue);
     }
@@ -1776,7 +1747,7 @@ public class Criteria
      *
      * @return A modified Criteria object.
      */
-    public Criteria where(Object lValue, Object rValue, SqlEnum comparison)
+    public Criteria where(final Object lValue, final Object rValue, final SqlEnum comparison)
     {
         return and(lValue, rValue, comparison);
     }
@@ -1799,7 +1770,7 @@ public class Criteria
      *
      * @return A modified Criteria object.
      */
-    public Criteria whereDate(Object lValue, int year, int month, int day)
+    public Criteria whereDate(final Object lValue, final int year, final int month, final int day)
     {
         return andDate(lValue, year, month, day);
     }
@@ -1823,8 +1794,8 @@ public class Criteria
      *
      * @return A modified Criteria object.
      */
-    public Criteria whereDate(Object lValue, int year, int month, int day,
-            SqlEnum comparison)
+    public Criteria whereDate(final Object lValue, final int year, final int month, final int day,
+            final SqlEnum comparison)
     {
         return andDate(lValue, year, month, day, comparison);
     }
@@ -1845,7 +1816,7 @@ public class Criteria
      *
      * @return A modified Criteria object.
      */
-    public Criteria whereIn(Object lValue, Object[] rValues)
+    public Criteria whereIn(final Object lValue, final Object[] rValues)
     {
         return andIn(lValue, rValues);
     }
@@ -1866,7 +1837,7 @@ public class Criteria
      *
      * @return A modified Criteria object.
      */
-    public Criteria whereIn(Object lValue, Collection rValues)
+    public Criteria whereIn(final Object lValue, final Collection rValues)
     {
         return andIn(lValue, rValues);
     }
@@ -1887,7 +1858,7 @@ public class Criteria
      *
      * @return A modified Criteria object.
      */
-    public Criteria whereNotIn(Object lValue, Object[] rValues)
+    public Criteria whereNotIn(final Object lValue, final Object[] rValues)
     {
         return andNotIn(lValue, rValues);
     }
@@ -1907,7 +1878,7 @@ public class Criteria
      * @param rValues The values to compare against.
      * @return A modified Criteria object.
      */
-    public Criteria whereNotIn(Object lValue, Collection rValues)
+    public Criteria whereNotIn(final Object lValue, final Collection rValues)
     {
         return andNotIn(lValue, rValues);
     }
@@ -1929,7 +1900,7 @@ public class Criteria
      *
      * @return the modified Criteria.
      */
-    public Criteria whereVerbatimSql(String sql, Object[] replacements)
+    public Criteria whereVerbatimSql(final String sql, final Object[] replacements)
     {
         Criterion criterion
                 = new Criterion(null, null, null, sql, replacements);
@@ -1961,10 +1932,10 @@ public class Criteria
      * @return the modified Criteria.
      */
     public Criteria whereVerbatimSql(
-            String sql,
-            Object[] replacements,
-            Column toAddToFromClause1,
-            Column toAddToFromClause2)
+            final String sql,
+            final Object[] replacements,
+            final Column toAddToFromClause1,
+            final Column toAddToFromClause2)
     {
         Criterion criterion = new Criterion(
                 toAddToFromClause1,

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Criterion.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Criterion.java?rev=1484252&r1=1484251&r2=1484252&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Criterion.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Criterion.java Sun May 19 09:58:00 2013
@@ -24,7 +24,6 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.commons.collections.ListUtils;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.torque.Column;
@@ -119,11 +118,11 @@ public class Criterion implements Serial
      * @throws NullPointerException if column is null.
      */
     public Criterion(
-            Object lValue,
-            Object rValue,
-            SqlEnum comparison,
-            String sql,
-            Object[] preparedStatementReplacements)
+            final Object lValue,
+            final Object rValue,
+            final SqlEnum comparison,
+            final String sql,
+            final Object[] preparedStatementReplacements)
     {
         if (comparison != null
                 && (sql != null || preparedStatementReplacements != null))
@@ -159,7 +158,7 @@ public class Criterion implements Serial
      *        the object must implement the
      *        org.apache.torque.Column interface.
      */
-    public Criterion(Object lValue, Object rValue)
+    public Criterion(final Object lValue, final Object rValue)
     {
         this(lValue, rValue, Criteria.EQUAL, null, null);
     }
@@ -177,7 +176,7 @@ public class Criterion implements Serial
      *        org.apache.torque.Column interface.
      * @param comparison The comparison operator, not null.
      */
-    public Criterion(Object lValue, Object rValue, SqlEnum comparison)
+    public Criterion(final Object lValue, final Object rValue, final SqlEnum comparison)
     {
         this(lValue, rValue, comparison, null, null);
     }
@@ -187,7 +186,7 @@ public class Criterion implements Serial
      *
      * @param toCopy the Criterion to copy from, not null.
      */
-    public Criterion(Criterion toCopy)
+    public Criterion(final Criterion toCopy)
     {
         this.lValue = toCopy.lValue;
         this.comparison = toCopy.comparison;
@@ -228,7 +227,7 @@ public class Criterion implements Serial
      *        the object must implement the
      *        org.apache.torque.Column interface.
      */
-    public void setLValue(Object lValue)
+    public void setLValue(final Object lValue)
     {
         this.lValue = lValue;
     }
@@ -265,7 +264,7 @@ public class Criterion implements Serial
      *         the object must implement the
      *         org.apache.torque.Column interface.
      */
-    public void setRValue(Object rValue)
+    public void setRValue(final Object rValue)
     {
         this.rValue = rValue;
     }
@@ -308,7 +307,7 @@ public class Criterion implements Serial
      * @param b True if case should be ignored.
      * @return A modified Criterion object.
      */
-    public Criterion setIgnoreCase(boolean b)
+    public Criterion setIgnoreCase(final boolean b)
     {
         ignoreCase = b;
         return this;
@@ -368,7 +367,7 @@ public class Criterion implements Serial
      * @param criterion the criterion to and with this criterion,
      *        not null.
      */
-    public Criterion and(Criterion criterion)
+    public Criterion and(final Criterion criterion)
     {
         addCompositeCriterion(criterion, AND);
         return this;
@@ -381,7 +380,7 @@ public class Criterion implements Serial
      * @param criterion the criterion to and with this criterion,
      *        not null.
      */
-    public Criterion or(Criterion criterion)
+    public Criterion or(final Criterion criterion)
     {
         addCompositeCriterion(criterion, OR);
         return this;
@@ -397,8 +396,8 @@ public class Criterion implements Serial
      * @throws NullPointerException if criterion is null.
      */
     private void addCompositeCriterion(
-            Criterion criterion,
-            String conjunction)
+            final Criterion criterion,
+            final String conjunction)
     {
         if (criterion == null)
         {
@@ -428,8 +427,7 @@ public class Criterion implements Serial
      * Appends a debug String representation of the Criterion
      * onto the String builder.
      */
-    @SuppressWarnings("deprecation")
-    public void appendTo(StringBuilder sb)
+    public void appendTo(final StringBuilder sb)
     {
         if (isComposite())
         {
@@ -454,14 +452,7 @@ public class Criterion implements Serial
         }
         else
         {
-            if (SqlEnum.CUSTOM == comparison)
-            {
-                if (rValue != null && !"".equals(rValue))
-                {
-                    sb.append((String) rValue);
-                }
-            }
-            else if (isVerbatimSqlCondition())
+            if (isVerbatimSqlCondition())
             {
                 sb.append(sql);
             }
@@ -518,7 +509,7 @@ public class Criterion implements Serial
      * the same attributes.
      */
     @Override
-    public boolean equals(Object obj)
+    public boolean equals(final Object obj)
     {
         if (this == obj)
         {

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Join.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Join.java?rev=1484252&r1=1484251&r2=1484252&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Join.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Join.java Sun May 19 09:58:00 2013
@@ -72,7 +72,6 @@ public class Join implements Serializabl
      *         are null.
      * @throws IllegalArgumentException if comparison id SqlEnum.CUSTOM
      */
-    @SuppressWarnings("deprecation")
     public Join(
             final Column leftColumn,
             final Column rightColumn,
@@ -91,11 +90,6 @@ public class Join implements Serializabl
         {
             throw new NullPointerException("comparison is null");
         }
-        if (comparison == SqlEnum.CUSTOM)
-        {
-            throw new IllegalArgumentException(
-                    "The comparison SqlEnum.CUSTOM is not supported for Joins.");
-        }
         this.joinCondition = new Criterion(leftColumn, rightColumn, comparison);
         this.joinType = joinType;
     }
@@ -180,7 +174,7 @@ public class Join implements Serializabl
      * same attributes.
      */
     @Override
-    public boolean equals(Object obj)
+    public boolean equals(final Object obj)
     {
         if (this == obj)
         {

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/SqlEnum.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/SqlEnum.java?rev=1484252&r1=1484251&r2=1484252&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/SqlEnum.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/SqlEnum.java Sun May 19 09:58:00 2013
@@ -46,7 +46,7 @@ public final class SqlEnum implements ja
      */
     private final int numberOfCompareOperands;
 
-    private SqlEnum(String s, int numberOfCompareOperands)
+    private SqlEnum(final String s, final int numberOfCompareOperands)
     {
         this.s = s;
         this.numberOfCompareOperands = numberOfCompareOperands;
@@ -109,19 +109,6 @@ public final class SqlEnum implements ja
     /** SQL Expression " NOT IN ". */
     public static final SqlEnum NOT_IN =
         new SqlEnum(" NOT IN ", 2);
-    /**
-     * Constant for "CUSTOM".
-     *
-     * @deprecated use the methods Criteria.whereVerbatimSql,
-     *             Criteria.andVerbatimSql, Criteria.orVerbatimSql
-     *             or the Constructor
-     *             Criterion(null, null, null, String, Object[])
-     *             instead of using SqlEnum.CUSTOM.
-     *             This constant will be removed in Torque 4.1.
-     */
-    @Deprecated
-    public static final SqlEnum CUSTOM =
-        new SqlEnum("CUSTOM", -1);
     /** SQL Expression "JOIN". */
     public static final SqlEnum JOIN =
         new SqlEnum("JOIN", -1);
@@ -168,7 +155,7 @@ public final class SqlEnum implements ja
      * @param o the object to compare the SqlEnum with.
      */
     @Override
-    public boolean equals(Object o)
+    public boolean equals(final Object o)
     {
         if (o == null)
         {

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/ColumnMap.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/ColumnMap.java?rev=1484252&r1=1484251&r2=1484252&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/ColumnMap.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/ColumnMap.java Sun May 19 09:58:00 2013
@@ -127,7 +127,7 @@ public class ColumnMap implements Column
      * @param name The name of the column.
      * @param containingTable TableMap of the table this column is in.
      */
-    public ColumnMap(String name, TableMap containingTable)
+    public ColumnMap(final String name, final TableMap containingTable)
     {
         table = containingTable;
         this.columnName = normalizeName(name);
@@ -140,7 +140,7 @@ public class ColumnMap implements Column
      * @param name The name to check
      * @return The corrected name if needed or the same name if not.
      */
-    protected String normalizeName(String name)
+    protected String normalizeName(final String name)
     {
         if (name.indexOf('.') > 0)
         {
@@ -160,19 +160,6 @@ public class ColumnMap implements Column
     }
 
     /**
-     * Get the table name + column name.
-     *
-     * @return A String with the full column name.
-     *
-     * @deprecated use getSqlExpression() instead.
-     */
-    @Deprecated
-    public String getFullyQualifiedName()
-    {
-        return table.getName() + "." + columnName;
-    }
-
-    /**
      * Get the name of the table this column is in.
      *
      * @return A String with the table name.
@@ -212,7 +199,7 @@ public class ColumnMap implements Column
      *
      * @param type An Object specifying the type.
      */
-    public void setType(Object type)
+    public void setType(final Object type)
     {
         this.type = type;
     }
@@ -222,7 +209,7 @@ public class ColumnMap implements Column
      *
      * @param torqueType the Torque type of the column.
      */
-    public void setTorqueType(String torqueType)
+    public void setTorqueType(final String torqueType)
     {
         this.torqueType = torqueType;
     }
@@ -232,7 +219,7 @@ public class ColumnMap implements Column
      *
      * @param size An int specifying the size.
      */
-    public void setSize(int size)
+    public void setSize(final int size)
     {
         this.size = size;
     }
@@ -242,7 +229,7 @@ public class ColumnMap implements Column
      *
      * @param pk True if column is a primary key.
      */
-    public void setPrimaryKey(boolean pk)
+    public void setPrimaryKey(final boolean pk)
     {
         this.pk = pk;
     }
@@ -252,7 +239,7 @@ public class ColumnMap implements Column
      *
      * @param nn True if column may be null.
      */
-    public void setNotNull(boolean nn)
+    public void setNotNull(final boolean nn)
     {
         this.notNull = nn;
     }
@@ -333,7 +320,7 @@ public class ColumnMap implements Column
     /**
      * @param scale The scale to set.
      */
-    public void setScale(int scale)
+    public void setScale(final int scale)
     {
         this.scale = scale;
     }
@@ -354,7 +341,7 @@ public class ColumnMap implements Column
      *
      * @param name the Java Name.
      */
-    public void setJavaName(String name)
+    public void setJavaName(final String name)
     {
         this.javaName = name;
     }
@@ -374,7 +361,7 @@ public class ColumnMap implements Column
      *
      * @param autoIncrement whether this colimn is an autoincrement column.
      */
-    public void setAutoIncrement(boolean autoIncrement)
+    public void setAutoIncrement(final boolean autoIncrement)
     {
         this.autoIncrement = autoIncrement;
     }
@@ -394,7 +381,7 @@ public class ColumnMap implements Column
      *
      * @param defaultValue The defaultValue to set.
      */
-    public void setDefault(String defaultValue)
+    public void setDefault(final String defaultValue)
     {
         this.defaultValue = defaultValue;
     }
@@ -414,7 +401,7 @@ public class ColumnMap implements Column
      *
      * @param description The description to set.
      */
-    public void setDescription(String description)
+    public void setDescription(final String description)
     {
         this.description = description;
     }
@@ -445,7 +432,7 @@ public class ColumnMap implements Column
      *
      * @param map The inheritanceMap to associate with this column.
      */
-    public void addInheritanceMap(InheritanceMap map)
+    public void addInheritanceMap(final InheritanceMap map)
     {
         setUseInheritance(true);
         this.inheritanceMaps.put(map.getKey(), map);
@@ -466,7 +453,7 @@ public class ColumnMap implements Column
      *
      * @param inheritanceType The inheritance type to set.
      */
-    public void setInheritance(String inheritanceType)
+    public void setInheritance(final String inheritanceType)
     {
         this.inheritance = inheritanceType;
     }
@@ -489,7 +476,7 @@ public class ColumnMap implements Column
      * @param isProtected whether getters and setters for this column
      *        are protected.
      */
-    public void setProtected(boolean isProtected)
+    public void setProtected(final boolean isProtected)
     {
         this.isProtected = isProtected;
     }
@@ -509,7 +496,7 @@ public class ColumnMap implements Column
      *
      * @param pk whether this column is a primary key.
      */
-    public void setPk(boolean pk)
+    public void setPk(final boolean pk)
     {
         this.pk = pk;
     }
@@ -529,7 +516,7 @@ public class ColumnMap implements Column
      *
      * @param useInheritance whether this column uses Inheritance subclasses.
      */
-    public void setUseInheritance(boolean useInheritance)
+    public void setUseInheritance(final boolean useInheritance)
     {
         this.useInheritance = useInheritance;
     }
@@ -541,7 +528,7 @@ public class ColumnMap implements Column
      * @return the inheritance map with the specified key, or null if no
      *         inheritance map with the specified key exists in this column.
      */
-    public InheritanceMap getInheritanceMap(String key)
+    public InheritanceMap getInheritanceMap(final String key)
     {
         return inheritanceMaps.get(key);
     }
@@ -563,7 +550,7 @@ public class ColumnMap implements Column
      * @param usePrimitive whether primitive objects are used
      *        rather than objects.
      */
-    public void setUsePrimitive(boolean usePrimitive)
+    public void setUsePrimitive(final boolean usePrimitive)
     {
         this.usePrimitive = usePrimitive;
     }
@@ -583,7 +570,7 @@ public class ColumnMap implements Column
      *
      * @param javaNamingMethod The javaNamingMethod to set.
      */
-    public void setJavaNamingMethod(String javaNamingMethod)
+    public void setJavaNamingMethod(final String javaNamingMethod)
     {
         this.javaNamingMethod = javaNamingMethod;
     }
@@ -614,7 +601,7 @@ public class ColumnMap implements Column
      *
      * @param position The position to set.
      */
-    public void setPosition(int position)
+    public void setPosition(final int position)
     {
         this.position = position;
     }
@@ -634,7 +621,7 @@ public class ColumnMap implements Column
      *
      * @param javaType The javaType to set.
      */
-    public void setJavaType(String javaType)
+    public void setJavaType(final String javaType)
     {
         this.javaType = javaType;
     }
@@ -655,7 +642,7 @@ public class ColumnMap implements Column
      * @param key the key of the option
      * @param value the value of the option.
      */
-    public void setOption(String key, String value)
+    public void setOption(final String key, final String value)
     {
         optionsMap.put(key, value);
     }
@@ -667,7 +654,7 @@ public class ColumnMap implements Column
      *
      * @return the value of the option, or null if not set.
      */
-    public String getOption(String key)
+    public String getOption(final String key)
     {
         return optionsMap.get(key);
     }

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/MapHelper.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/MapHelper.java?rev=1484252&r1=1484251&r2=1484252&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/MapHelper.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/MapHelper.java Sun May 19 09:58:00 2013
@@ -24,14 +24,13 @@ import java.util.Map;
 import org.apache.torque.Column;
 import org.apache.torque.Torque;
 import org.apache.torque.TorqueException;
-import org.apache.torque.criteria.CriteriaInterface;
+import org.apache.torque.criteria.Criteria;
 
 /**
  * Utility methods for Database, Table and Column Maps.
  *
  * @version $Id$
  */
-@SuppressWarnings("deprecation")
 public final class MapHelper
 {
     /** Private constructor. */
@@ -57,9 +56,9 @@ public final class MapHelper
      * @throws TorqueException possibly if Torque is not initialized.
      */
     public static TableMap getTableMap(
-                Object possibleColumn,
-                CriteriaInterface criteria,
-                TableMap defaultTableMap)
+                final Object possibleColumn,
+                final Criteria criteria,
+                final TableMap defaultTableMap)
             throws TorqueException
     {
         if (!(possibleColumn instanceof Column))
@@ -123,7 +122,7 @@ public final class MapHelper
      */
     public static ColumnMap getColumnMap(
                 Column column,
-                CriteriaInterface criteria)
+                final Criteria criteria)
             throws TorqueException
     {
         String tableName = column.getTableName();

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/BigDecimalMapper.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/BigDecimalMapper.java?rev=1484252&r1=1484251&r2=1484252&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/BigDecimalMapper.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/BigDecimalMapper.java Sun May 19 09:58:00 2013
@@ -24,7 +24,7 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 
 import org.apache.torque.TorqueException;
-import org.apache.torque.criteria.CriteriaInterface;
+import org.apache.torque.criteria.Criteria;
 
 /**
  * Maps a database record to a BigDecimal.
@@ -52,7 +52,7 @@ public class BigDecimalMapper implements
      *
      * @param offset the additional offset (0 based).
      */
-    public BigDecimalMapper(int offset)
+    public BigDecimalMapper(final int offset)
     {
         this.internalOffset = offset;
     }
@@ -69,9 +69,9 @@ public class BigDecimalMapper implements
      * @return the BigDecimal retrieved from the result set.
      */
     public BigDecimal processRow(
-                ResultSet resultSet,
-                int rowOffset,
-                CriteriaInterface criteria)
+                final ResultSet resultSet,
+                final int rowOffset,
+                final Criteria criteria)
             throws TorqueException
     {
         try

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/CompositeMapper.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/CompositeMapper.java?rev=1484252&r1=1484251&r2=1484252&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/CompositeMapper.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/CompositeMapper.java Sun May 19 09:58:00 2013
@@ -25,7 +25,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.torque.TorqueException;
-import org.apache.torque.criteria.CriteriaInterface;
+import org.apache.torque.criteria.Criteria;
 
 /**
  * Uses a list of mappers to map a database record to a list of objects.
@@ -50,7 +50,7 @@ public class CompositeMapper implements 
      * @param mapper the mapper.
      * @param offset the offset of the mapper within this mapper, 0 based.
      */
-    public void addMapper(RecordMapper mapper, int offset)
+    public void addMapper(final RecordMapper mapper, final int offset)
     {
         mapperList.add(new MapperWithOffset(mapper, offset));
     }
@@ -69,9 +69,9 @@ public class CompositeMapper implements 
      *         were ordered, not null.
      */
     public List processRow(
-            ResultSet resultSet,
-            int offset,
-            CriteriaInterface criteria)
+            final ResultSet resultSet,
+            final int offset,
+            final Criteria criteria)
         throws TorqueException
     {
         List result = new ArrayList(mapperList.size());
@@ -102,7 +102,7 @@ public class CompositeMapper implements 
          * @param mapper the mapper, not null.
          * @param offset the internal offset of the mapper.
          */
-        public MapperWithOffset(RecordMapper mapper, int offset)
+        public MapperWithOffset(final RecordMapper mapper, final int offset)
         {
             this.mapper = mapper;
             this.offset = offset;

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/DateMapper.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/DateMapper.java?rev=1484252&r1=1484251&r2=1484252&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/DateMapper.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/DateMapper.java Sun May 19 09:58:00 2013
@@ -24,7 +24,7 @@ import java.sql.SQLException;
 import java.util.Date;
 
 import org.apache.torque.TorqueException;
-import org.apache.torque.criteria.CriteriaInterface;
+import org.apache.torque.criteria.Criteria;
 
 /**
  * Maps a database record to a java.util.Date.
@@ -53,7 +53,7 @@ public class DateMapper implements Recor
      * @param offset
      *            the additional offset (0 based).
      */
-    public DateMapper(int offset)
+    public DateMapper(final int offset)
     {
         this.internalOffset = offset;
     }
@@ -71,9 +71,9 @@ public class DateMapper implements Recor
      * @return the date retrieved from the result set.
      */
     public Date processRow(
-                ResultSet resultSet,
-                int rowOffset,
-                CriteriaInterface criteria)
+                final ResultSet resultSet,
+                final int rowOffset,
+                final Criteria criteria)
             throws TorqueException
     {
         try

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/IntegerMapper.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/IntegerMapper.java?rev=1484252&r1=1484251&r2=1484252&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/IntegerMapper.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/IntegerMapper.java Sun May 19 09:58:00 2013
@@ -23,7 +23,7 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 
 import org.apache.torque.TorqueException;
-import org.apache.torque.criteria.CriteriaInterface;
+import org.apache.torque.criteria.Criteria;
 
 /**
  * Maps a database record to a Integer.
@@ -51,7 +51,7 @@ public class IntegerMapper implements Re
      *
      * @param offset the additional offset (0 based).
      */
-    public IntegerMapper(int offset)
+    public IntegerMapper(final int offset)
     {
         this.internalOffset = offset;
     }
@@ -68,9 +68,9 @@ public class IntegerMapper implements Re
      * @return the Integer retrieved from the result set.
      */
     public Integer processRow(
-                ResultSet resultSet,
-                int rowOffset,
-                CriteriaInterface criteria)
+                final ResultSet resultSet,
+                final int rowOffset,
+                final Criteria criteria)
             throws TorqueException
     {
         try

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/LongMapper.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/LongMapper.java?rev=1484252&r1=1484251&r2=1484252&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/LongMapper.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/LongMapper.java Sun May 19 09:58:00 2013
@@ -23,7 +23,7 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 
 import org.apache.torque.TorqueException;
-import org.apache.torque.criteria.CriteriaInterface;
+import org.apache.torque.criteria.Criteria;
 
 /**
  * Maps a database record to a Long.
@@ -51,7 +51,7 @@ public class LongMapper implements Recor
      *
      * @param offset the additional offset (0 based).
      */
-    public LongMapper(int offset)
+    public LongMapper(final int offset)
     {
         this.internalOffset = offset;
     }
@@ -68,9 +68,9 @@ public class LongMapper implements Recor
      * @return the Long retrieved from the result set.
      */
     public Long processRow(
-                ResultSet resultSet,
-                int rowOffset,
-                CriteriaInterface criteria)
+                final ResultSet resultSet,
+                final int rowOffset,
+                final Criteria criteria)
             throws TorqueException
     {
         try

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/ObjectListMapper.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/ObjectListMapper.java?rev=1484252&r1=1484251&r2=1484252&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/ObjectListMapper.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/ObjectListMapper.java Sun May 19 09:58:00 2013
@@ -36,7 +36,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.torque.TorqueException;
-import org.apache.torque.criteria.CriteriaInterface;
+import org.apache.torque.criteria.Criteria;
 
 /**
  * Maps a record to a list of objects.
@@ -83,7 +83,7 @@ public class ObjectListMapper implements
      *        result set's metadata (this may issue
      *        additional database queries).
      */
-    public ObjectListMapper(int numberOfColumnsToMap)
+    public ObjectListMapper(final int numberOfColumnsToMap)
     {
         this.convertClasses = new ArrayList>(numberOfColumnsToMap);
         if (numberOfColumnsToMap != -1)
@@ -110,7 +110,7 @@ public class ObjectListMapper implements
      *        which class is returned), java.sql.Ref, Short, String,
      *        java.sql.Time, java.sql.Timestamp and java.net.URL.
      */
-    public ObjectListMapper(List> convertClasses)
+    public ObjectListMapper(final List> convertClasses)
     {
         if (convertClasses != null)
         {
@@ -136,9 +136,9 @@ public class ObjectListMapper implements
      *         from the result set.
      */
     public List processRow(
-                ResultSet resultSet,
-                int offset,
-                CriteriaInterface criteria)
+                final ResultSet resultSet,
+                final int offset,
+                final Criteria criteria)
             throws TorqueException
     {
         try

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/RecordMapper.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/RecordMapper.java?rev=1484252&r1=1484251&r2=1484252&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/RecordMapper.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/RecordMapper.java Sun May 19 09:58:00 2013
@@ -23,7 +23,7 @@ import java.io.Serializable;
 import java.sql.ResultSet;
 
 import org.apache.torque.TorqueException;
-import org.apache.torque.criteria.CriteriaInterface;
+import org.apache.torque.criteria.Criteria;
 
 /**
  * Maps an object to a database record and back.
@@ -59,6 +59,6 @@ public interface RecordMapper extends
     T processRow(
                 ResultSet resultSet,
                 int rowOffset,
-                CriteriaInterface criteria)
+                Criteria criteria)
             throws TorqueException;
 }

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/StringMapper.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/StringMapper.java?rev=1484252&r1=1484251&r2=1484252&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/StringMapper.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/StringMapper.java Sun May 19 09:58:00 2013
@@ -23,7 +23,7 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 
 import org.apache.torque.TorqueException;
-import org.apache.torque.criteria.CriteriaInterface;
+import org.apache.torque.criteria.Criteria;
 
 /**
  * Maps a database record to a String.
@@ -51,7 +51,7 @@ public class StringMapper implements Rec
      *
      * @param offset the additional offset (0 based).
      */
-    public StringMapper(int offset)
+    public StringMapper(final int offset)
     {
         this.internalOffset = offset;
     }
@@ -68,9 +68,9 @@ public class StringMapper implements Rec
      * @return the String retrieved from the result set.
      */
     public String processRow(
-                ResultSet resultSet,
-                int rowOffset,
-                CriteriaInterface criteria)
+                final ResultSet resultSet,
+                final int rowOffset,
+                final Criteria criteria)
             throws TorqueException
     {
         try

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/JoinBuilder.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/JoinBuilder.java?rev=1484252&r1=1484251&r2=1484252&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/JoinBuilder.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/JoinBuilder.java Sun May 19 09:58:00 2013
@@ -22,7 +22,7 @@ package org.apache.torque.sql;
 import java.util.List;
 
 import org.apache.torque.TorqueException;
-import org.apache.torque.criteria.CriteriaInterface;
+import org.apache.torque.criteria.Criteria;
 import org.apache.torque.criteria.Criterion;
 import org.apache.torque.criteria.FromElement;
 import org.apache.torque.criteria.Join;
@@ -37,7 +37,6 @@ import org.apache.torque.util.UniqueList
  * @author Henning P. Schmiedehausen
  * @version $Id$
  */
-@SuppressWarnings("deprecation")
 public final class JoinBuilder
 {
     /**
@@ -60,7 +59,7 @@ public final class JoinBuilder
      * @throws TorqueException if the Joins can not be processed
      */
     public static void processJoins(
-                final CriteriaInterface criteria,
+                final Criteria criteria,
                 final Query query)
             throws TorqueException
     {
@@ -237,8 +236,8 @@ public final class JoinBuilder
      * @throws TorqueException if the join condition cannot be built.
      */
     private static PreparedStatementPart buildJoinCondition(
-                Criterion joinCondition,
-                CriteriaInterface criteria)
+                final Criterion joinCondition,
+                final Criteria criteria)
             throws TorqueException
     {
         PreparedStatementPart joinPart = new PreparedStatementPart();
@@ -258,9 +257,9 @@ public final class JoinBuilder
      * @throws TorqueException if the join condition cannot be built.
      */
     private static void appendJoinCondition(
-                Criterion joinCondition,
-                CriteriaInterface criteria,
-                PreparedStatementPart joinPart)
+                final Criterion joinCondition,
+                final Criteria criteria,
+                final PreparedStatementPart joinPart)
             throws TorqueException
     {
         if (joinCondition.isComposite())



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

svn commit: r1484252 [3/3] - in /db/torque/torque4/trunk/torque-runtime/src: main/java/org/apache/torque/ main/java/org/apache/torque/avalon/ main/java/org/apache/torque/criteria/ main/java/org/apache/torque/map/ main/java/org/apache/torque/om/mapper/ ...

2013-05-19T09:58:01Z

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/CountHelper.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/CountHelper.java?rev=1484252&r1=1484251&r2=1484252&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/CountHelper.java
(original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/CountHelper.java
Sun May 19 09:58:00 2013
@@ -35,6 +35,7 @@ import org.apache.torque.Column;
 import org.apache.torque.ColumnImpl;
 import org.apache.torque.Torque;
 import org.apache.torque.TorqueException;
+import org.apache.torque.criteria.Criteria;
 import org.apache.torque.criteria.SqlEnum;
 import org.apache.torque.map.TableMap;
 import org.apache.torque.om.mapper.IntegerMapper;
@@ -56,30 +57,8 @@ public class CountHelper
      * @param c Criteria to get the count for.
      * @return number of rows matching the query provided
      * @throws TorqueException if the query could not be executed
-     *
-     * @deprecated use org.apache.torque.criteria.Criteria instead of
-     *             org.apache.torque.util.Criteria. This method will be removed
-     *             in Torque 4.1.
-     */
-    @Deprecated
-    public int count(Criteria c) throws TorqueException
-    {
-        return count(c, null, "*", null);
-    }
-
-    /**
-     * The COUNT function returns the number of rows in a query.
-     * Does not use a connection, hardcode the column to "*" and
-     * set the distinct qualifier to false.
-     * Only use this function if you have added additional constraints to
-     * the criteria, otherwise Torque does not know which table it should
-     * count the datasets in.
-     *
-     * @param c Criteria to get the count for.
-     * @return number of rows matching the query provided
-     * @throws TorqueException if the query could not be executed
      */
-    public int count(org.apache.torque.criteria.Criteria c)
+    public int count(final Criteria c)
             throws TorqueException
     {
         return count(c, null, "*", null);
@@ -96,30 +75,8 @@ public class CountHelper
      * @param conn Connection to use
      * @return number of rows matching the query provided
      * @throws TorqueException if the query could not be executed
-     *
-     * @deprecated use org.apache.toraue.criteria.Criteria instead of
-     *             org.apache.toraue.util.Criteria. This method will be removed
-     *             in Torque 4.1.
-     */
-    @Deprecated
-    public int count(Criteria c, Connection conn) throws TorqueException
-    {
-        return count(c, conn, "*", null);
-    }
-
-    /**
-     * The COUNT function returns the number of rows in a query.
-     * Hard code the distinct parameter to false and set the column to "*".
-     * Only use this function if you have added additional constraints to
-     * the criteria, otherwise Torque does not know which table it should
-     * count the datasets in.
-     *
-     * @param c Criteria to get the count for.
-     * @param conn Connection to use
-     * @return number of rows matching the query provided
-     * @throws TorqueException if the query could not be executed
      */
-    public int count(org.apache.torque.criteria.Criteria c, Connection conn)
+    public int count(final Criteria c, final Connection conn)
             throws TorqueException
     {
         return count(c, conn, "*", null);
@@ -133,28 +90,8 @@ public class CountHelper
      *        use the primary key here.
      * @return number of rows matching the query provided
      * @throws TorqueException if the query could not be executed
-     *
-     * @deprecated use org.apache.toraue.criteria.Criteria instead of
-     *             org.apache.toraue.util.Criteria. This method will be removed
-     *             in Torque 4.1.
      */
-    @Deprecated
-    public int count(Criteria c, String columnName)
-        throws TorqueException
-    {
-        return count(c, null, columnName, null);
-    }
-
-    /**
-     * Returns the number of rows in a query.
-     *
-     * @param c Criteria to get the count for.
-     * @param columnName Name of database Column which is counted. Preferably,
-     *        use the primary key here.
-     * @return number of rows matching the query provided
-     * @throws TorqueException if the query could not be executed
-     */
-    public int count(org.apache.torque.criteria.Criteria c, String columnName)
+    public int count(final Criteria c, final String columnName)
         throws TorqueException
     {
         return count(c, null, columnName, null);
@@ -168,28 +105,8 @@ public class CountHelper
      *        use the primary key here.
      * @return number of rows matching the query provided
      * @throws TorqueException if the query could not be executed
-     *
-     * @deprecated use org.apache.toraue.criteria.Criteria instead of
-     *             org.apache.toraue.util.Criteria. This method will be removed
-     *             in Torque 4.1.
      */
-    @Deprecated
-    public int count(Criteria c, Column column)
-        throws TorqueException
-    {
-        return count(c, null, column.getSqlExpression(), null);
-    }
-
-    /**
-     * Returns the number of rows in a query.
-     *
-     * @param c Criteria to get the count for.
-     * @param column the database Column which is counted. Preferably,
-     *        use the primary key here.
-     * @return number of rows matching the query provided
-     * @throws TorqueException if the query could not be executed
-     */
-    public int count(org.apache.torque.criteria.Criteria c, Column column)
+    public int count(final Criteria c, final Column column)
         throws TorqueException
     {
         return count(c, column.getSqlExpression());
@@ -204,32 +121,11 @@ public class CountHelper
      *        use the primary key here.
      * @return number of rows matching the query provided
      * @throws TorqueException if the query could not be executed
-     *
-     * @deprecated use org.apache.toraue.criteria.Criteria instead of
-     *             org.apache.toraue.util.Criteria. This method will be removed
-     *             in Torque 4.1.
-     */
-    @Deprecated
-    public int count(Criteria c, Connection conn, Column column)
-        throws TorqueException
-    {
-        return count(c, conn, column.getSqlExpression(), null);
-    }
-
-    /**
-     * Returns the number of rows in a query.
-     *
-     * @param c Criteria to get the count for.
-     * @param conn Connection to use
-     * @param column The database Column which is counted. Preferably,
-     *        use the primary key here.
-     * @return number of rows matching the query provided
-     * @throws TorqueException if the query could not be executed
      */
     public int count(
-            org.apache.torque.criteria.Criteria c,
-            Connection conn,
-            Column column)
+            final Criteria c,
+            final Connection conn,
+            final Column column)
         throws TorqueException
     {
         return count(c, conn, column.getSqlExpression(), null);
@@ -244,11 +140,11 @@ public class CountHelper
      *
      * @throws TorqueException if the query could not be executed
      */
-    public int count(TableMap tableMap)
+    public int count(final TableMap tableMap)
         throws TorqueException
     {
         return count(
-                new org.apache.torque.criteria.Criteria(),
+                new Criteria(),
                 null,
                 "*",
                 tableMap);
@@ -264,11 +160,11 @@ public class CountHelper
      *
      * @throws TorqueException if the query could not be executed
      */
-    public int count(TableMap tableMap, Connection conn)
+    public int count(final TableMap tableMap, final Connection conn)
             throws TorqueException
     {
         return count(
-                new org.apache.torque.criteria.Criteria(),
+                new Criteria(),
                 conn,
                 "*",
                 tableMap);
@@ -287,72 +183,12 @@ public class CountHelper
      * @return number of rows matching the query provided.
      *
      * @throws TorqueException if the query could not be executed.
-     *
-     * @deprecated use org.apache.toraue.criteria.Criteria instead of
-     *             org.apache.toraue.util.Criteria. This method will be removed
-     *             in Torque 4.1.
-     */
-    @Deprecated
-    public int count(
-                Criteria c,
-                Connection conn,
-                String columnName,
-                TableMap tableMap)
-            throws TorqueException
-    {
-        /* Clear the select columns. */
-        c.getSelectColumns().clear();
-        c.getOrderByColumns().clear();
-        c.getGroupByColumns().clear();
-
-        UniqueList criteriaSelectModifiers
-            = c.getSelectModifiers();
-
-        boolean distinct = false;
-        if (criteriaSelectModifiers != null
-            && criteriaSelectModifiers.size() > 0
-            && criteriaSelectModifiers.contains(SqlEnum.DISTINCT.toString()))
-        {
-            criteriaSelectModifiers.remove(SqlEnum.DISTINCT.toString());
-            distinct = true;
-        }
-
-        c.addSelectColumn(new Count(new ColumnImpl(columnName), distinct));
-
-        String databaseName = (c.getDbName() == null)
-                ? Torque.getDefaultDB()
-                : c.getDbName();
-
-        BasePeerImpl peer = new BasePeerImpl(
-                new IntegerMapper(),
-                tableMap, databaseName);
-
-        List result = (conn == null)
-            ? peer.doSelect(c)
-            : peer.doSelect(c, conn);
-
-        return result.get(0);
-    }
-
-    /**
-     * Returns the number of rows in a query.
-     *
-     * @param c Criteria to get the count for.
-     * @param conn Connection to use
-     * @param columnName Name of database Column which is counted. Preferably,
-     *        use the primary key here.
-     * @param tableMap the table to count the columns in, or null to determine
-     *        the table automatically from the criteria.
-     *
-     * @return number of rows matching the query provided.
-     *
-     * @throws TorqueException if the query could not be executed.
      */
     public int count(
-                org.apache.torque.criteria.Criteria c,
-                Connection conn,
-                String columnName,
-                TableMap tableMap)
+                final Criteria c,
+                final Connection conn,
+                final String columnName,
+                final TableMap tableMap)
             throws TorqueException
     {
         /* Clear the select columns. */

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/LargeSelect.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/LargeSelect.java?rev=1484252&r1=1484251&r2=1484252&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/LargeSelect.java
(original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/LargeSelect.java
Sun May 19 09:58:00 2013
@@ -34,7 +34,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.torque.Torque;
 import org.apache.torque.TorqueException;
-import org.apache.torque.criteria.CriteriaInterface;
+import org.apache.torque.criteria.Criteria;
 import org.apache.torque.sql.SqlBuilder;
 
 /**
@@ -167,7 +167,7 @@ public class LargeSelect implements R
     private int totalRecords = 0;
 
     /** The criteria used for the query. */
-    private CriteriaInterface criteria = null;
+    private Criteria criteria = null;
 
     /** The last page of results that were returned. */
     private transient List lastResults;
@@ -239,9 +239,9 @@ public class LargeSelect implements R
      * the Criteria object does not contain SELECT columns.
      */
     public LargeSelect(
-            CriteriaInterface criteria,
-            int pageSize,
-            BasePeerImpl peerImpl)
+            final Criteria criteria,
+            final int pageSize,
+            final BasePeerImpl peerImpl)
     {
         this(
             criteria,
@@ -272,10 +272,10 @@ public class LargeSelect implements R
      * contain SELECT columns..
      */
     public LargeSelect(
-            CriteriaInterface criteria,
-            int pageSize,
-            int memoryPageLimit,
-            BasePeerImpl peerImpl)
+            final Criteria criteria,
+            final int pageSize,
+            final int memoryPageLimit,
+            final BasePeerImpl peerImpl)
     {
         this.peer = peerImpl;
 
@@ -316,7 +316,7 @@ public class LargeSelect implements R
      * greater than zero.
      * @throws TorqueException if a sleep is unexpectedly interrupted.
      */
-    public List getPage(int pageNumber) throws TorqueException
+    public List getPage(final int pageNumber) throws TorqueException
     {
         if (pageNumber < 1)
         {
@@ -389,7 +389,7 @@ public class LargeSelect implements R
      * pageSize results.
      * @throws TorqueException if a sleep is unexpectedly interrupted.
      */
-    private List getResults(int start) throws TorqueException
+    private List getResults(final int start) throws TorqueException
     {
         return getResults(start, pageSize);
     }
@@ -407,7 +407,7 @@ public class LargeSelect implements R
      * not catered for.
      * @throws TorqueException if a sleep is unexpectedly interrupted.
      */
-    private synchronized List getResults(int start, int size)
+    private synchronized List getResults(final int start, final int size)
             throws TorqueException
     {
         if (log.isDebugEnabled())
@@ -547,21 +547,12 @@ public class LargeSelect implements R
              * columns not fully qualified will not be modified.
              */
             String query;
-            if (criteria instanceof Criteria)
-            {
-                peer.correctBooleans((Criteria) criteria);
-                peer.setDbName((Criteria) criteria);
-                query = SqlBuilder.buildQuery((Criteria) criteria).toString();
-            }
-            else
-            {
-                peer.correctBooleans(
-                        (org.apache.torque.criteria.Criteria) criteria);
-                peer.setDbName((org.apache.torque.criteria.Criteria) criteria);
-                query = SqlBuilder.buildQuery(
-                        (org.apache.torque.criteria.Criteria) criteria)
-                    .toString();
-            }
+            peer.correctBooleans(
+                    criteria);
+            peer.setDbName(criteria);
+            query = SqlBuilder.buildQuery(
+                    criteria)
+                .toString();
 
             // Execute the query.
             if (log.isDebugEnabled())
@@ -588,19 +579,9 @@ public class LargeSelect implements R
                     log.debug("run(): Invoking BasePeerImpl.doSelect()");
                 }
 
-                List tempResults;
-                if (criteria instanceof Criteria)
-                {
-                    tempResults = peer.doSelect(
-                            (Criteria) criteria,
-                            conn);
-                }
-                else
-                {
-                    tempResults = peer.doSelect(
-                            (org.apache.torque.criteria.Criteria) criteria,
-                            conn);
-                }
+                List tempResults = peer.doSelect(
+                        criteria,
+                        conn);
 
                 if (tempResults.size() < criteria.getLimit())
                 {
@@ -694,7 +675,7 @@ public class LargeSelect implements R
      *
      * @param initialSize the initial size for each block.
      */
-    private synchronized void startQuery(int initialSize)
+    private synchronized void startQuery(final int initialSize)
     {
         if (log.isDebugEnabled())
         {
@@ -848,7 +829,7 @@ public class LargeSelect implements R
      * @param moreIndicator the indicator to use in place of the default
      * (">").
      */
-    public void setMoreIndicator(String moreIndicator)
+    public void setMoreIndicator(final String moreIndicator)
     {
         this.moreIndicator = moreIndicator;
     }
@@ -869,7 +850,7 @@ public class LargeSelect implements R
      * @param memoryPageLimit the maximum number of pages to be in memory
      * at one time.
      */
-    public void setMemoryPageLimit(int memoryPageLimit)
+    public void setMemoryPageLimit(final int memoryPageLimit)
     {
         this.memoryPageLimit = memoryPageLimit;
     }
@@ -1052,7 +1033,7 @@ public class LargeSelect implements R
      * @param name the search parameter key to retrieve.
      * @return the value of the search parameter.
      */
-    public String getSearchParam(String name)
+    public String getSearchParam(final String name)
     {
         return getSearchParam(name, null);
     }
@@ -1068,7 +1049,7 @@ public class LargeSelect implements R
      * @param defaultValue the default value to return if the key is not found.
      * @return the value of the search parameter.
      */
-    public String getSearchParam(String name, String defaultValue)
+    public String getSearchParam(final String name, final String defaultValue)
     {
         if (null == params)
         {
@@ -1085,7 +1066,7 @@ public class LargeSelect implements R
      * @param name the search parameter key to set.
      * @param value the value of the search parameter to store.
      */
-    public void setSearchParam(String name, String value)
+    public void setSearchParam(final String name, final String value)
     {
         if (null == value)
         {
@@ -1109,7 +1090,7 @@ public class LargeSelect implements R
      *
      * @param name the search parameter key to remove.
      */
-    public void removeSearchParam(String name)
+    public void removeSearchParam(final String name)
     {
         if (null != params)
         {
@@ -1124,7 +1105,7 @@ public class LargeSelect implements R
      * @throws IOException
      * @throws ClassNotFoundException
      */
-    private void readObject(ObjectInputStream inputStream)
+    private void readObject(final ObjectInputStream inputStream)
             throws IOException, ClassNotFoundException
     {
         inputStream.defaultReadObject();

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/SummaryHelper.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/SummaryHelper.java?rev=1484252&r1=1484251&r2=1484252&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/SummaryHelper.java
(original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/SummaryHelper.java
Sun May 19 09:58:00 2013
@@ -36,6 +36,7 @@ import org.apache.commons.logging.LogFac
 import org.apache.torque.Column;
 import org.apache.torque.ColumnImpl;
 import org.apache.torque.TorqueException;
+import org.apache.torque.criteria.Criteria;
 import org.apache.torque.criteria.SqlEnum;
 import org.apache.torque.om.mapper.ObjectListMapper;
 import org.apache.torque.om.mapper.RecordMapper;
@@ -114,34 +115,9 @@ public class SummaryHelper
      * @return Results as a OrderMap object.
      *
      * @throws TorqueException if a database error occurs.
-     *
-     * @deprecated please use
-     *             summarize(org.apache.torque.criteria.Criteria)
-     *             instead.
-     *             This method will be removed in a future version of Torque.
-     */
-    @Deprecated
-    public List summarize(Criteria crit)
-            throws TorqueException
-    {
-        return summarize(crit, (List>) null);
-    }
-
-    /**
-     * Return a list of ListOrderedMapCI objects with the results of the summary
-     * query.  The ListOrderedMapCI objects have a key of the column name or
-     * function alias and are in the order generated by the query.
-     * The class of the return values are decided by the database driver,
-     * which makes this method not database independent.
-     *
-     * @param crit The base criteria to build on.
-     *
-     * @return Results as a OrderMap object.
-     *
-     * @throws TorqueException if a database error occurs.
      */
     public List summarize(
-                org.apache.torque.criteria.Criteria crit)
+                final Criteria crit)
             throws TorqueException
     {
         return summarize(crit, (List>) null);
@@ -161,54 +137,10 @@ public class SummaryHelper
      * @return Results as a ListOrderMapCI object.
      *
      * @throws TorqueException if a database error occurs.
-     *
-     * @deprecated Please use
-     *             summarize(org.apache.torque.criteria.Criteria, List>)
-     *             instead.
-     *             This method will be removed in a future version of Torque.
      */
-    @Deprecated
     public List summarize(
-                Criteria crit,
-                List> resultTypes)
-            throws TorqueException
-    {
-        Connection connection = null;
-        try
-        {
-            connection = Transaction.begin(crit.getDbName());
-            List result = summarize(crit, resultTypes, connection);
-            Transaction.commit(connection);
-            connection = null;
-            return result;
-        }
-        finally
-        {
-            if (connection != null)
-            {
-                Transaction.safeRollback(connection);
-            }
-        }
-    }
-
-    /**
-     * Return a list of ListOrderedMapCI objects with the results of the summary
-     * query.  The ListOrderedMapCI objects have a key of the column name or
-     * function alias and are in the order generated by the query.
-     *
-     * @param crit The base criteria to build on.
-     * @param resultTypes the classes to which the return values of the query
-     *        should be cast, or null to let the database driver decide.
-     *        See org.apache.torque.om.mapper.ObjectListMapperï¿½for the supported
-     *        classes.
-     *
-     * @return Results as a ListOrderMapCI object.
-     *
-     * @throws TorqueException if a database error occurs.
-     */
-    public List summarize(
-                org.apache.torque.criteria.Criteria crit,
-                List> resultTypes)
+                final Criteria crit,
+                final List> resultTypes)
             throws TorqueException
     {
         Connection connection = null;
@@ -242,36 +174,10 @@ public class SummaryHelper
      * @return Results as a OrderMap object.
      *
      * @throws TorqueException if a database error occurs.
-     *
-     * @deprecated please use
-     *             summarize(org.apache.torque.criteria.Criteria, Connection)
-     *             instead.
-     *             This method will be removed in a future version of Torque.
-     */
-    @Deprecated
-    public List summarize(Criteria crit, Connection conn)
-            throws TorqueException
-    {
-        return summarize(crit, null, conn);
-    }
-
-    /**
-     * Return a list of OrderedMap objects with the results of the summary
-     * query.  The OrderedMap objects have a key of the column name or
-     * function alias and are in the order generated by the query.
-     * The class of the return values are decided by the database driver,
-     * which makes this method not database independent.
-     *
-     * @param crit The base criteria to build on.
-     * @param conn The DB Connection to use.
-     *
-     * @return Results as a OrderMap object.
-     *
-     * @throws TorqueException if a database error occurs.
      */
     public List summarize(
-                org.apache.torque.criteria.Criteria crit,
-                Connection conn)
+                final Criteria crit,
+                final Connection conn)
             throws TorqueException
     {
         return summarize(crit, null, conn);
@@ -292,17 +198,11 @@ public class SummaryHelper
      * @return Results as a ListOrderedMapCI object.
      *
      * @throws TorqueException if a database error occurs.
-     *
-     * @deprecated please use
-     *             summarize(org.apache.torque.criteria.Criteria, List>,
Connection)
-     *             instead.
-     *             This method will be removed in a future version of Torque.
      */
-    @Deprecated
     public List summarize(
-                Criteria crit,
-                List> resultTypes,
-                Connection conn)
+                final Criteria crit,
+                final List> resultTypes,
+                final Connection conn)
             throws TorqueException
     {
         Criteria c = buildCriteria(crit);
@@ -393,202 +293,6 @@ public class SummaryHelper
     }
 
     /**
-     * Return a list of ListOrderedMapCI objects with the results of the summary
-     * query.  The ListOrderedMapCI objects have a key of the column name or
-     * function alias and are in the order generated by the query.
-     *
-     * @param crit The base criteria to build on.
-     * @param resultTypes the classes to which the return values of the query
-     *        should be cast, or null to let the database driver decide.
-     *        See org.apache.torque.om.mapper.ObjectListMapperï¿½for the supported
-     *        classes.
-     * @param conn The DB Connection to use.
-     *
-     * @return Results as a ListOrderedMapCI object.
-     *
-     * @throws TorqueException if a database error occurs.
-     */
-    public List summarize(
-                org.apache.torque.criteria.Criteria crit,
-                List> resultTypes,
-                Connection conn)
-            throws TorqueException
-    {
-        org.apache.torque.criteria.Criteria c = buildCriteria(crit);
-        // TODO use BasePeerImpl.doSelect instead of parsing the result manually
-        String query = SqlBuilder.buildQuery(c).toString();
-        RecordMapper mapper = new ObjectListMapper(resultTypes);
-
-        Statement statement = null;
-        ResultSet resultSet = null;
-        List rows = new ArrayList();
-        try
-        {
-            statement = conn.createStatement();
-            long startTime = System.currentTimeMillis();
-            logger.debug("Executing query " + query);
-
-            resultSet = statement.executeQuery(query.toString());
-            long queryEndTime = System.currentTimeMillis();
-            logger.trace("query took " + (queryEndTime - startTime)
-                    + " milliseconds");
-
-            while (resultSet.next())
-            {
-                List rowResult = mapper.processRow(resultSet, 0, null);
-                rows.add(rowResult);
-            }
-            long mappingEndTime = System.currentTimeMillis();
-            logger.trace("mapping took " + (mappingEndTime - queryEndTime)
-                    + " milliseconds");
-        }
-        catch (SQLException e)
-        {
-            throw new TorqueException(e);
-        }
-        finally
-        {
-            if (resultSet != null)
-            {
-                try
-                {
-                    resultSet.close();
-                }
-                catch (SQLException e)
-                {
-                    logger.warn("error closing resultSet", e);
-                }
-            }
-            if (statement != null)
-            {
-                try
-                {
-                    statement.close();
-                }
-                catch (SQLException e)
-                {
-                    logger.warn("error closing statement", e);
-                }
-            }
-        }
-
-        List resultsList = new Vector(rows.size());
-        List columnNames = new ArrayList();
-        for (Column column : c.getSelectColumns())
-        {
-            columnNames.add(column.getColumnName());
-        }
-        columnNames.addAll(c.getAsColumns().keySet());
-        for (List row : rows)
-        {
-            ListOrderedMapCI recordMap = new ListOrderedMapCI();
-            for (int i = 0; i < row.size(); i++)
-            {
-                Object value = row.get(i);
-                String cName = columnNames.get(i);
-                if (cName == null || cName.equals(""))
-                 {
-                    if (excludeExprColumns())
-                    {
-                        continue;
-                    }
-                    cName = "Expr" + i;
-                }
-                recordMap.put(cName, value);
-            }
-            resultsList.add(recordMap);
-        }
-        return resultsList;
-    }
-
-    /**
-     * Builds the criteria to use in summarizing the information.  Note that
-     * the criteria passed in will be modified.
-     *
-     * @param c The base criteria to build the summary criteria from.
-     * @return A criteria to use in summarizing the information.
-     * @throws TorqueException
-     *
-     * @deprecated please use
-     *             buildCriteria(org.apache.torque.criteria.Criteria)
-     *             instead.
-     *             This method will be removed in a future version of Torque.
-     */
-    @Deprecated
-    public Criteria buildCriteria(Criteria c) throws TorqueException
-    {
-        c.getSelectColumns().clear();
-        c.getGroupByColumns().clear();
-
-        UniqueList criteriaSelectModifiers;
-        criteriaSelectModifiers = c.getSelectModifiers();
-
-        if (criteriaSelectModifiers != null
-            && criteriaSelectModifiers.size() > 0
-            && criteriaSelectModifiers.contains(SqlEnum.DISTINCT.toString()))
-        {
-            criteriaSelectModifiers.remove(SqlEnum.DISTINCT.toString());
-        }
-        c.setIgnoreCase(false);
-
-        List cols = getGroupByColumns();
-        boolean haveFromTable = !cols.isEmpty(); // Group By cols define src table.
-        for (Column col : cols)
-        {
-            c.addGroupByColumn(col);
-            c.addSelectColumn(col);
-        }
-        if (haveFromTable)
-        {
-            logger.debug("From table defined by Group By Cols");
-        }
-
-        // Check if the from table is set via a where clause.
-        if (!haveFromTable && !c.isEmpty())
-        {
-            haveFromTable = true;
-            logger.debug("From table defined by a where clause");
-        }
-
-        ListOrderedMapCI cMap = getAggregates();
-        OrderedMapIterator iMap = cMap.orderedMapIterator();
-        while (iMap.hasNext())
-        {
-            String key = (String) iMap.next();
-            SQLFunction f = (SQLFunction) iMap.getValue();
-            Column col =  f.getColumn();
-            c.addAsColumn(key, new ColumnImpl(
-                    null,
-                    col.getTableName(),
-                    col.getColumnName(),
-                    f.getSqlExpression()));
-            if (!haveFromTable)    // Last chance. Get it from the func.
-            {
-                {
-                    // Kludgy Where table.col = table.col clause to force
-                    // from table identification.
-                    c.add(col,
-                            (col.getColumnName()
-                                    + "=" + col.getColumnName()),
-                            SqlEnum.CUSTOM);
-                    haveFromTable = true;
-
-                    String table = col.getTableName();
-                    logger.debug("From table, '" + table
-                            + "', defined from aggregate column");
-                }
-            }
-        }
-        if (!haveFromTable)
-        {
-            throw new TorqueException(
-                    "No FROM table defined by the GroupBy set, "
-                    + "criteria.setAlias, or specified function column!");
-        }
-        return c;
-    }
-
-    /**
      * Builds the criteria to use in summarizing the information.  Note that
      * the criteria passed in will be modified.
      *
@@ -596,8 +300,7 @@ public class SummaryHelper
      * @return A criteria to use in summarizing the information.
      * @throws TorqueException
      */
-    public org.apache.torque.criteria.Criteria buildCriteria(
-            org.apache.torque.criteria.Criteria c) throws TorqueException
+    public Criteria buildCriteria(final Criteria c) throws TorqueException
     {
         c.getSelectColumns().clear();
         c.getGroupByColumns().clear();
@@ -649,10 +352,9 @@ public class SummaryHelper
                 {
                     // Kludgy Where table.col = table.col clause to force
                     // from table identification.
-                    c.and(col,
-                            (col.getColumnName()
-                                    + "=" + col.getColumnName()),
-                            SqlEnum.CUSTOM);
+                    c.andVerbatimSql(
+                            col.getColumnName() + "=" + col.getColumnName(),
+                            new Object[] {});
                     haveFromTable = true;
 
                     String table = col.getTableName();
@@ -684,7 +386,7 @@ public class SummaryHelper
      *
      * @param column
      */
-    public void addGroupBy(Column column)
+    public void addGroupBy(final Column column)
     {
         getGroupByColumns().add(column);
     }
@@ -696,7 +398,7 @@ public class SummaryHelper
      *               no key words, e.g. function names.
      * @param function One of the inner classes from the Aggregate class.
      */
-    public void addAggregate(String alias, SQLFunction function)
+    public void addAggregate(final String alias, final SQLFunction function)
     {
         getAggregates().put(alias, function);
     }
@@ -747,7 +449,7 @@ public class SummaryHelper
      * @param includeHeader
      * @throws IOException
      */
-    public void dumpResults(Writer out, List results, boolean includeHeader)
+    public void dumpResults(final Writer out, final List results, final boolean
includeHeader)
                                                             throws IOException
     {
         Iterator i = results.iterator();
@@ -808,7 +510,7 @@ public class SummaryHelper
      *
      * @param excludeExprColumns if True, these columns won't be included.
      */
-    public void setExcludeExprColumns(boolean excludeExprColumns)
+    public void setExcludeExprColumns(final boolean excludeExprColumns)
     {
         this.excludeExprColumns = excludeExprColumns;
     }

Modified: db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/TorqueInstanceTest.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/TorqueInstanceTest.java?rev=1484252&r1=1484251&r2=1484252&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/TorqueInstanceTest.java
(original)
+++ db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/TorqueInstanceTest.java
Sun May 19 09:58:00 2013
@@ -121,9 +121,6 @@ public class TorqueInstanceTest extends 
         assertEquals(
                 "defaultschema",
                 databases.get(POSTGRESQL_NAME).getSchema());
-        assertEquals(
-                "orschema2",
-                databases.get(ORACLE_NAME).getSchema());
     }
 
     public void testShutdown() throws Exception

Modified: db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/criteria/CriterionTest.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/criteria/CriterionTest.java?rev=1484252&r1=1484251&r2=1484252&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/criteria/CriterionTest.java
(original)
+++ db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/criteria/CriterionTest.java
Sun May 19 09:58:00 2013
@@ -60,15 +60,15 @@ public class CriterionTest extends BaseT
                 "myValue");
         Criterion innerCriterion = (new Criterion(
                 new ColumnImpl("myTable", "myColumn2"),
-                "myColumn2=3)",
             criterion.toString());
     }

Modified: db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/sql/SqlBuilderTest.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/sql/SqlBuilderTest.java?rev=1484252&r1=1484251&r2=1484252&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/sql/SqlBuilderTest.java
(original)
+++ db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/sql/SqlBuilderTest.java
Sun May 19 09:58:00 2013
@@ -1547,28 +1547,6 @@ public class SqlBuilderTest extends Base
     }
 
 
-    public void testCustom() throws Exception
-    {
-        Criteria criteria = new Criteria();
-        criteria.addSelectColumn(new ColumnImpl("table.column"));
-        criteria.where("A", "A = functionOf(B)", SqlEnum.CUSTOM);
-        Query query = SqlBuilder.buildQuery(criteria);
-        assertEquals("SELECT table.column FROM table WHERE A = functionOf(B)",
-                query.toString());
-        assertEquals(0, query.getPreparedStatementReplacements().size());
-    }
-
-    public void testCustomLvalueNull() throws Exception
-    {
-        Criteria criteria = new Criteria();
-        criteria.addSelectColumn(new ColumnImpl("table.column"));
-        criteria.where(null, "A = functionOf(B)", SqlEnum.CUSTOM);
-        Query query = SqlBuilder.buildQuery(criteria);
-        assertEquals("SELECT table.column FROM table WHERE A = functionOf(B)",
-                query.toString());
-        assertEquals(0, query.getPreparedStatementReplacements().size());
-    }
-
     public void testCriterionCustomSql() throws Exception
     {
         Criteria criteria = new Criteria();
@@ -1582,25 +1560,6 @@ public class SqlBuilderTest extends Base
         assertEquals(0, query.getPreparedStatementReplacements().size());
     }
 
-    public void testCriterionCustomNoString() throws Exception
-    {
-        Criteria criteria = new Criteria();
-        criteria.addSelectColumn(new ColumnImpl("table.column"));
-        Criterion criterion
-                = new Criterion("A", 3, SqlEnum.CUSTOM);
-        criteria.where(criterion);
-        try
-        {
-            SqlBuilder.buildQuery(criteria);
-            fail("Exception expected");
-        }
-        catch (TorqueException e)
-        {
-            assertEquals(
-                    "rValue must be a String for the operator CUSTOM",
-                    e.getMessage());
-        }
-    }
     public void testLvalueIsObject() throws Exception
     {
         Criteria criteria = new Criteria();

Modified: db/torque/torque4/trunk/torque-runtime/src/test/resources/torque-schematest.properties
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/test/resources/torque-schematest.properties?rev=1484252&r1=1484251&r2=1484252&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/test/resources/torque-schematest.properties
(original)
+++ db/torque/torque4/trunk/torque-runtime/src/test/resources/torque-schematest.properties
Sun May 19 09:58:00 2013
@@ -20,16 +20,11 @@ torque.database.default = postgresql
 
 torque.database.mysql.adapter=mysql
 torque.dsfactory.mysql.factory= org.apache.torque.dsfactory.SharedPoolDataSourceFactory
-torque.dsfactory.mysql.schema=myschema
+torque.database.mysql.schema=myschema
 
 torque.database.postgresql.adapter=postgresql
 torque.dsfactory.postgresql.factory= org.apache.torque.dsfactory.SharedPoolDataSourceFactory
 
-torque.database.oracle.adapter=oracle
-torque.dsfactory.oracle.factory= org.apache.torque.dsfactory.SharedPoolDataSourceFactory
-torque.dsfactory.oracle.schema= orschema1
-torque.database.oracle.schema=orschema2
-
 torque.idbroker.prefetch=false
 
 torque.defaults.schema = defaultschema



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

svn commit: r1484252 [2/3] - in /db/torque/torque4/trunk/torque-runtime/src: main/java/org/apache/torque/ main/java/org/apache/torque/avalon/ main/java/org/apache/torque/criteria/ main/java/org/apache/torque/map/ main/java/org/apache/torque/om/mapper/ ...

2013-05-19T09:58:01Z

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/SqlBuilder.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/SqlBuilder.java?rev=1484252&r1=1484251&r2=1484252&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/SqlBuilder.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/SqlBuilder.java Sun May 19 09:58:00 2013
@@ -33,7 +33,6 @@ import org.apache.torque.Torque;
 import org.apache.torque.TorqueException;
 import org.apache.torque.adapter.Adapter;
 import org.apache.torque.criteria.Criteria;
-import org.apache.torque.criteria.CriteriaInterface;
 import org.apache.torque.criteria.Criterion;
 import org.apache.torque.criteria.FromElement;
 import org.apache.torque.criteria.PreparedStatementPart;
@@ -42,9 +41,7 @@ import org.apache.torque.map.ColumnMap;
 import org.apache.torque.map.DatabaseMap;
 import org.apache.torque.map.MapHelper;
 import org.apache.torque.map.TableMap;
-import org.apache.torque.om.ObjectKey;
 import org.apache.torque.sql.whereclausebuilder.CurrentDateTimePsPartBuilder;
-import org.apache.torque.sql.whereclausebuilder.CustomBuilder;
 import org.apache.torque.sql.whereclausebuilder.InBuilder;
 import org.apache.torque.sql.whereclausebuilder.LikeBuilder;
 import org.apache.torque.sql.whereclausebuilder.NullValueBuilder;
@@ -63,7 +60,6 @@ import org.apache.torque.util.UniqueList
  * @author Thomas Fischer
  * @version $Id$
  */
-@SuppressWarnings("deprecation")
 public final class SqlBuilder
 {
     /** Logging */
@@ -85,7 +81,6 @@ public final class SqlBuilder
     static
     {
         whereClausePsPartBuilders.add(new VerbatimSqlConditionBuilder());
-        whereClausePsPartBuilders.add(new CustomBuilder());
         whereClausePsPartBuilders.add(new CurrentDateTimePsPartBuilder());
         whereClausePsPartBuilders.add(new NullValueBuilder());
         whereClausePsPartBuilders.add(new LikeBuilder());
@@ -124,36 +119,6 @@ public final class SqlBuilder
      * @return the corresponding query to the criteria.
      *
      * @exception TorqueException if an error occurs
-     * @deprecated please use org.apache.torque.criteria.Criteria
-     *             instead of org.apache.torque.util.Criteria.
-     */
-    @Deprecated
-    public static Query buildQuery(final org.apache.torque.util.Criteria crit)
-            throws TorqueException
-    {
-        Query sqlStatement = new Query();
-
-        JoinBuilder.processJoins(crit, sqlStatement);
-        processModifiers(crit, sqlStatement);
-        processSelectColumns(crit, sqlStatement);
-        processAsColumns(crit, sqlStatement);
-        processCriterions(crit, sqlStatement);
-        processGroupBy(crit, sqlStatement);
-        processHaving(crit, sqlStatement);
-        processOrderBy(crit, sqlStatement);
-        processLimits(crit, sqlStatement);
-
-        return sqlStatement;
-    }
-
-    /**
-     * Builds a Query from a criteria.
-     *
-     * @param crit the criteria to build the query from, not null.
-     *
-     * @return the corresponding query to the criteria.
-     *
-     * @exception TorqueException if an error occurs
      */
     public static Query buildQuery(final Criteria crit)
             throws TorqueException
@@ -185,7 +150,7 @@ public final class SqlBuilder
      * @throws TorqueException if the select columns can not be processed.
      */
     private static void processSelectColumns(
-                final CriteriaInterface criteria,
+                final Criteria criteria,
                 final Query query)
             throws TorqueException
     {
@@ -221,7 +186,7 @@ public final class SqlBuilder
      * @throws TorqueException if the as columns can not be processed.
      */
     private static void processAsColumns(
-                final CriteriaInterface criteria,
+                final Criteria criteria,
                 final Query query)
             throws TorqueException
     {
@@ -251,7 +216,7 @@ public final class SqlBuilder
      *        not null.
      */
     private static void processModifiers(
-            final CriteriaInterface criteria,
+            final Criteria criteria,
             final Query query)
     {
         UniqueList selectModifiers = query.getSelectModifiers();
@@ -289,10 +254,10 @@ public final class SqlBuilder
     }
 
     static void appendCriterion(
-                Criterion criterion,
-                CriteriaInterface criteria,
-                StringBuilder where,
-                Query query)
+                final Criterion criterion,
+                final Criteria criteria,
+                final StringBuilder where,
+                final Query query)
             throws TorqueException
     {
         if (criterion.isComposite())
@@ -337,8 +302,8 @@ public final class SqlBuilder
     }
 
     static PreparedStatementPart processCriterion(
-                Criterion criterion,
-                CriteriaInterface criteria)
+                final Criterion criterion,
+                final Criteria criteria)
             throws TorqueException
     {
         final String dbName = criteria.getDbName();
@@ -379,130 +344,13 @@ public final class SqlBuilder
     }
 
     /**
-     * Adds the Criterions from the criteria to the query.
-     *
-     * @param criteria the criteria from which the Criterion-objects are taken
-     * @param query the query to which the Criterion-objects should be added.
-     *
-     * @throws TorqueException if the Criterion-objects can not be processed
-     * @deprecated please use org.apache.torque.criteria.Criteria
-     *             instead of org.apache.torque.util.Criteria.
-     */
-    @Deprecated
-    private static void processCriterions(
-            final org.apache.torque.util.Criteria criteria,
-            final Query query)
-        throws TorqueException
-    {
-        UniqueList whereClause = query.getWhereClause();
-
-        for (org.apache.torque.util.Criteria.Criterion criterion
-                : criteria.values())
-        {
-            StringBuilder sb = new StringBuilder();
-            appendCriterionToPs(
-                    criterion,
-                    criteria,
-                    sb,
-                    query);
-            whereClause.add(sb.toString());
-        }
-    }
-
-    /**
-     * @deprecated please use org.apache.torque.criteria.Criteria
-     *             instead of org.apache.torque.util.Criteria.
-     */
-    @Deprecated
-    private static void appendCriterionToPs(
-                org.apache.torque.util.Criteria.Criterion criterion,
-                org.apache.torque.util.Criteria criteria,
-                StringBuilder sb,
-                Query query)
-            throws TorqueException
-    {
-        Column column = criterion.getColumn();
-
-        // add the table to the from clause, if it is not already
-        // contained there
-        // it is important that this piece of code is executed AFTER
-        // the joins are processed
-        addTableToFromClause(
-            column,
-            criteria,
-            query);
-
-        boolean ignoreCase
-                = criteria.isIgnoreCase() || criterion.isIgnoreCase();
-        final String dbName = criteria.getDbName();
-        final Adapter adapter = Torque.getAdapter(dbName);
-        final Database database = Torque.getDatabase(dbName);
-        {
-            Column databaseColumn = resolveAliasAndAsColumnAndSchema(
-                    column,
-                    criteria);
-            ColumnMap columnMap = null;
-            {
-                DatabaseMap databaseMap = database.getDatabaseMap();
-                TableMap tableMap = databaseMap.getTable(
-                        databaseColumn.getTableName());
-                if (tableMap != null)
-                {
-                    columnMap = tableMap.getColumn(
-                            databaseColumn.getColumnName());
-                }
-            }
-            if (columnMap != null)
-            {
-                // do not use ignoreCase on columns
-                // which do not contain String values
-                ignoreCase = ignoreCase
-                    && columnMap.getType() instanceof String;
-            }
-        }
-
-        for (int j = 0; j < criterion.getClauses().size(); j++)
-        {
-            sb.append('(');
-        }
-        String columnName = criterion.getColumn().getSqlExpression();
-        WhereClauseExpression whereClausePartInput
-                = new WhereClauseExpression(
-                        columnName,
-                        criterion.getComparison(),
-                        criterion.getValue(),
-                        null,
-                        null);
-        PreparedStatementPart whereClausePartOutput
-            = buildPs(
-                whereClausePartInput,
-                ignoreCase,
-                adapter);
-        sb.append(whereClausePartOutput.getSql());
-        query.getWhereClausePreparedStatementReplacements().addAll(
-                whereClausePartOutput.getPreparedStatementReplacements());
-
-        for (int i = 0; i < criterion.getClauses().size(); i++)
-        {
-            sb.append(criterion.getConjunctions().get(i));
-            org.apache.torque.util.Criteria.Criterion clause
-                = criterion.getClauses().get(i);
-            appendCriterionToPs(
-                    clause,
-                    criteria,
-                    sb,
-                    query);
-            sb.append(')');
-        }
-    }
-    /**
      * adds the OrderBy-Columns from the criteria to the query
      * @param criteria the criteria from which the OrderBy-Columns are taken
      * @param query the query to which the OrderBy-Columns should be added
      * @throws TorqueException if the OrderBy-Columns can not be processed
      */
     private static void processOrderBy(
-            final CriteriaInterface crit,
+            final Criteria crit,
             final Query query)
             throws TorqueException
     {
@@ -571,7 +419,7 @@ public final class SqlBuilder
      * @throws TorqueException if the GroupBy-Columns can not be processed
      */
     private static void processGroupBy(
-            final CriteriaInterface criteria,
+            final Criteria criteria,
             final Query query)
             throws TorqueException
     {
@@ -614,24 +462,6 @@ public final class SqlBuilder
     }
 
     /**
-     * adds the Having-Columns from the criteria to the query
-     * @param criteria the criteria from which the Having-Columns are taken
-     * @param query the query to which the Having-Columns should be added
-     * @throws TorqueException if the Having-Columns can not be processed
-     */
-    private static void processHaving(
-            final org.apache.torque.util.Criteria crit,
-            final Query query)
-            throws TorqueException
-    {
-        org.apache.torque.util.Criteria.Criterion having = crit.getHaving();
-        if (having != null)
-        {
-            query.setHaving(having.toString());
-        }
-    }
-
-    /**
      * Adds a Limit clause to the query if supported by the database.
      *
      * @param criteria the criteria from which the Limit and Offset values
@@ -641,7 +471,7 @@ public final class SqlBuilder
      * @throws TorqueException if the Database adapter cannot be obtained
      */
     private static void processLimits(
-            final CriteriaInterface crit,
+            final Criteria crit,
             final Query query)
             throws TorqueException
     {
@@ -715,7 +545,7 @@ public final class SqlBuilder
      */
     static PreparedStatementPart getExpressionForFromClause(
             final Object toAddToFromClause,
-            final CriteriaInterface criteria)
+            final Criteria criteria)
             throws TorqueException
     {
         if (!(toAddToFromClause instanceof Column))
@@ -854,7 +684,7 @@ public final class SqlBuilder
      *
      * @throws TorqueException if the table name cannot be determined.
      */
-    public static String guessFullTableFromCriteria(Criteria criteria)
+    public static String guessFullTableFromCriteria(final Criteria criteria)
             throws TorqueException
     {
         org.apache.torque.criteria.Criterion criterion
@@ -894,7 +724,7 @@ public final class SqlBuilder
      *
      * @throws TorqueException if the database or table is unknown.
      */
-    public static TableMap getTableMap(String tableName, String dbName)
+    public static TableMap getTableMap(final String tableName, String dbName)
             throws TorqueException
     {
 
@@ -933,7 +763,7 @@ public final class SqlBuilder
      */
     static Column resolveAliasAndAsColumnAndSchema(
             final Column columnToResolve,
-            final CriteriaInterface criteria)
+            final Criteria criteria)
             throws TorqueException
     {
         String columnNameToResolve = columnToResolve.getColumnName();
@@ -1030,8 +860,8 @@ public final class SqlBuilder
      */
     static void addTableToFromClause(
                 final Object possibleColumn,
-                final CriteriaInterface criteria,
-                Query query)
+                final Criteria criteria,
+                final Query query)
             throws TorqueException
     {
         if (possibleColumn == null)
@@ -1082,9 +912,9 @@ public final class SqlBuilder
      * @throws TorqueException in the case of an error.
      */
     static boolean isIgnoreCase(
-                Criterion criterion,
-                CriteriaInterface criteria,
-                Database database)
+                final Criterion criterion,
+                final Criteria criteria,
+                final Database database)
             throws TorqueException
     {
         boolean ignoreCase
@@ -1116,9 +946,9 @@ public final class SqlBuilder
      * @throws TorqueException in the case of an error.
      */
     private static boolean ignoreCaseApplicable(
-                Object value,
-                CriteriaInterface criteria,
-                Database database)
+                final Object value,
+                final Criteria criteria,
+                final Database database)
             throws TorqueException
     {
         if (value == null)
@@ -1158,428 +988,4 @@ public final class SqlBuilder
         // which do not contain String values
         return columnMap.getType() instanceof String;
     }
-
-    /**
-     * Builds an element of the where clause of a prepared statement.
-     *
-     * @param whereClausePart the part of the where clause to build.
-     *        Can be modified during this method.
-     * @param ignoreCase If true and columns represent Strings, the appropriate
-     *        function defined for the database will be used to ignore
-     *        differences in case.
-     * @param adapter The adapter for the database for which the SQL
-     *        should be created, not null.
-     *
-     * @deprecated remove when util.Criteria is removed
-     */
-    @Deprecated
-    private static PreparedStatementPart buildPs(
-                WhereClauseExpression whereClausePart,
-                boolean ignoreCase,
-                Adapter adapter)
-            throws TorqueException
-    {
-        PreparedStatementPart result = new PreparedStatementPart();
-
-        // Handle SqlEnum.Custom
-        if (SqlEnum.CUSTOM == whereClausePart.getOperator())
-        {
-            result.getSql().append(whereClausePart.getRValue());
-            return result;
-        }
-
-        // Handle SqlEnum.CURRENT_DATE and SqlEnum.CURRENT_TIME
-        if (whereClausePart.getRValue() instanceof SqlEnum)
-        {
-            result.getSql().append(whereClausePart.getLValue())
-                .append(whereClausePart.getOperator())
-                .append(whereClausePart.getRValue());
-            return result;
-        }
-
-        // If rValue is an ObjectKey, take the value of that ObjectKey.
-        if (whereClausePart.getRValue() instanceof ObjectKey)
-        {
-            whereClausePart.setRValue(
-                    ((ObjectKey) whereClausePart.getRValue()).getValue());
-        }
-
-        /*  If rValue is null, check to see if the operator
-         *  is an =, <>, or !=.  If so, replace the comparison
-         *  with SqlEnum.ISNULL or SqlEnum.ISNOTNULL.
-         */
-        if (whereClausePart.getRValue() == null)
-        {
-            if (whereClausePart.getOperator().equals(SqlEnum.EQUAL))
-            {
-                result.getSql().append(whereClausePart.getLValue())
-                        .append(SqlEnum.ISNULL);
-                return result;
-            }
-            if (whereClausePart.getOperator().equals(SqlEnum.NOT_EQUAL)
-                || whereClausePart.getOperator().equals(
-                        SqlEnum.ALT_NOT_EQUAL))
-            {
-                result.getSql().append(whereClausePart.getLValue())
-                    .append(SqlEnum.ISNOTNULL);
-                return result;
-            }
-        }
-
-        // Handle SqlEnum.ISNULL and SqlEnum.ISNOTNULL
-        if (whereClausePart.getOperator().equals(SqlEnum.ISNULL)
-            || whereClausePart.getOperator().equals(SqlEnum.ISNOTNULL))
-        {
-            result.getSql().append(whereClausePart.getLValue())
-                    .append(whereClausePart.getOperator());
-            return result;
-        }
-
-        // handle Subqueries
-        if (whereClausePart.getRValue() instanceof Criteria)
-        {
-            Query subquery = SqlBuilder.buildQuery(
-                    (Criteria) whereClausePart.getRValue());
-            result.getPreparedStatementReplacements().addAll(
-                    subquery.getPreparedStatementReplacements());
-            result.getSql().append(whereClausePart.getLValue())
-                    .append(whereClausePart.getOperator())
-                    .append("(").append(subquery.toString()).append(")");
-                return result;
-        }
-        if (whereClausePart.getRValue()
-                instanceof org.apache.torque.util.Criteria)
-        {
-            Query subquery = SqlBuilder.buildQuery(
-                    (org.apache.torque.util.Criteria)
-                        whereClausePart.getRValue());
-            result.getPreparedStatementReplacements().addAll(
-                    subquery.getPreparedStatementReplacements());
-            result.getSql().append(whereClausePart.getLValue())
-                    .append(whereClausePart.getOperator())
-                    .append("(").append(subquery.toString()).append(")");
-                return result;
-        }
-
-        // handle LIKE and similar
-        if (whereClausePart.getOperator().equals(Criteria.LIKE)
-            || whereClausePart.getOperator().equals(Criteria.NOT_LIKE)
-            || whereClausePart.getOperator().equals(Criteria.ILIKE)
-            || whereClausePart.getOperator().equals(Criteria.NOT_ILIKE))
-        {
-            return buildPsLike(whereClausePart, ignoreCase, adapter);
-        }
-
-        // handle IN and similar
-        if (whereClausePart.getOperator().equals(Criteria.IN)
-                || whereClausePart.getOperator().equals(Criteria.NOT_IN))
-        {
-            return buildPsIn(whereClausePart, ignoreCase, adapter);
-        }
-
-        // Standard case
-        result.getPreparedStatementReplacements().add(
-                whereClausePart.getRValue());
-        if (ignoreCase
-            && whereClausePart.getRValue() instanceof String)
-        {
-            result.getSql().append(
-                    adapter.ignoreCase((String) whereClausePart.getLValue()))
-                .append(whereClausePart.getOperator())
-                .append(adapter.ignoreCase("?"));
-        }
-        else
-        {
-            result.getSql().append(whereClausePart.getLValue())
-                .append(whereClausePart.getOperator())
-                .append("?");
-        }
-        return result;
-    }
-
-    /**
-     * Takes a WhereClauseExpression with a LIKE operator
-     * and builds an SQL phrase based on whether wildcards are present
-     * and the state of theignoreCase flag.
-     * Multicharacter wildcards % and * may be used
-     * as well as single character wildcards, _ and ?.  These
-     * characters can be escaped with \.
-     *
-     * e.g. criteria = "fre%" -> columnName LIKE 'fre%'
-     *                        -> UPPER(columnName) LIKE UPPER('fre%')
-     *      criteria = "50\%" -> columnName = '50%'
-     *
-     * @param whereClausePart the part of the where clause to build.
-     *        Can be modified in this method.
-     * @param ignoreCase If true and columns represent Strings, the appropriate
-     *        function defined for the database will be used to ignore
-     *        differences in case.
-     * @param adapter The adapter for the database for which the SQL
-     *        should be created, not null.
-     *
-     * @return the rendered SQL for the WhereClauseExpression
-     *
-     * @deprecated remove when util.Criteria is removed
-     */
-    @Deprecated
-    static PreparedStatementPart buildPsLike(
-                WhereClauseExpression whereClausePart,
-                boolean ignoreCase,
-                Adapter adapter)
-            throws TorqueException
-    {
-        if (!(whereClausePart.getRValue() instanceof String))
-        {
-            throw new TorqueException(
-                "rValue must be a String for the operator "
-                    + whereClausePart.getOperator());
-        }
-        String value = (String) whereClausePart.getRValue();
-        // If selection criteria contains wildcards use LIKE otherwise
-        // use = (equals).  Wildcards can be escaped by prepending
-        // them with \ (backslash). However, if we switch from
-        // like to equals, we need to remove the escape characters.
-        // from the wildcards.
-        // So we need two passes: The first replaces * and ? by % and _,
-        // and checks whether we switch to equals,
-        // the second removes escapes if we have switched to equals.
-        int position = 0;
-        StringBuffer sb = new StringBuffer();
-        boolean replaceWithEquals = true;
-        while (position < value.length())
-        {
-            char checkWildcard = value.charAt(position);
-
-            switch (checkWildcard)
-            {
-            case BACKSLASH:
-                if (position + 1 >= value.length())
-                {
-                    // ignore backslashes at end
-                    break;
-                }
-                position++;
-                char escapedChar = value.charAt(position);
-                if (escapedChar != '*' && escapedChar != '?')
-                {
-                    sb.append(checkWildcard);
-                }
-                // code below copies escaped character into sb
-                checkWildcard = escapedChar;
-                break;
-            case '%':
-            case '_':
-                replaceWithEquals = false;
-                break;
-            case '*':
-                replaceWithEquals = false;
-                checkWildcard = '%';
-                break;
-            case '?':
-                replaceWithEquals = false;
-                checkWildcard = '_';
-                break;
-            default:
-                break;
-            }
-
-            sb.append(checkWildcard);
-            position++;
-        }
-        value = sb.toString();
-
-        if (ignoreCase)
-        {
-            if (adapter.useIlike() && !replaceWithEquals)
-            {
-                if (SqlEnum.LIKE.equals(whereClausePart.getOperator()))
-                {
-                    whereClausePart.setOperator(SqlEnum.ILIKE);
-                }
-                else if (SqlEnum.NOT_LIKE.equals(whereClausePart.getOperator()))
-                {
-                    whereClausePart.setOperator(SqlEnum.NOT_ILIKE);
-                }
-            }
-            else
-            {
-                // no native case insensitive like is offered by the DB,
-                // or the LIKE was replaced with equals.
-                // need to ignore case manually.
-                whereClausePart.setLValue(
-                        adapter.ignoreCase((String) whereClausePart.getLValue()));
-            }
-        }
-
-        PreparedStatementPart result = new PreparedStatementPart();
-        result.getSql().append(whereClausePart.getLValue());
-
-        if (replaceWithEquals)
-        {
-            if (whereClausePart.getOperator().equals(SqlEnum.NOT_LIKE)
-                    || whereClausePart.getOperator().equals(SqlEnum.NOT_ILIKE))
-            {
-                result.getSql().append(SqlEnum.NOT_EQUAL);
-            }
-            else
-            {
-                result.getSql().append(SqlEnum.EQUAL);
-            }
-
-            // remove escape backslashes from String
-            position = 0;
-            sb = new StringBuffer();
-            while (position < value.length())
-            {
-                char checkWildcard = value.charAt(position);
-
-                if (checkWildcard == BACKSLASH
-                        && position + 1 < value.length())
-                {
-                    position++;
-                    // code below copies escaped character into sb
-                    checkWildcard = value.charAt(position);
-                }
-                sb.append(checkWildcard);
-                position++;
-            }
-            value = sb.toString();
-        }
-        else
-        {
-            result.getSql().append(whereClausePart.getOperator());
-        }
-
-        String rValueSql = "?";
-        // handle ignoreCase if necessary
-        if (ignoreCase && (!(adapter.useIlike()) || replaceWithEquals))
-        {
-            rValueSql = adapter.ignoreCase(rValueSql);
-        }
-        // handle escape clause if necessary
-        if (!replaceWithEquals && adapter.useEscapeClauseForLike())
-        {
-            rValueSql = rValueSql + SqlEnum.ESCAPE + "'\\'";
-        }
-
-        result.getPreparedStatementReplacements().add(value);
-        result.getSql().append(rValueSql);
-        return result;
-    }
-
-    /**
-     * Takes a columnName and criteria and
-     * builds a SQL 'IN' expression taking into account the ignoreCase
-     * flag.
-     *
-     * @param whereClausePart the part of the where clause to build.
-     *        Can be modified in this method.
-     * @param ignoreCase If true and columns represent Strings, the appropriate
-     *        function defined for the database will be used to ignore
-     *        differences in case.
-     * @param adapter The adapter for the database for which the SQL
-     *        should be created, not null.
-     *
-     * @return the built part.
-     *
-     * @deprecated remove when util.Criteria is removed
-     */
-    @Deprecated
-    static PreparedStatementPart buildPsIn(
-            WhereClauseExpression whereClausePart,
-            boolean ignoreCase,
-            Adapter adapter)
-    {
-        PreparedStatementPart result = new PreparedStatementPart();
-
-        boolean ignoreCaseApplied = false;
-        List inClause = new ArrayList();
-        boolean nullContained = false;
-        if (whereClausePart.getRValue() instanceof Iterable)
-        {
-            for (Object listValue : (Iterable) whereClausePart.getRValue())
-            {
-                if (listValue == null)
-                {
-                    nullContained = true;
-                    continue;
-                }
-                result.getPreparedStatementReplacements().add(listValue);
-                if (ignoreCase && listValue instanceof String)
-                {
-                    inClause.add(adapter.ignoreCase("?"));
-                    ignoreCaseApplied = true;
-                }
-                else
-                {
-                    inClause.add("?");
-                }
-            }
-        }
-        else if (whereClausePart.getRValue().getClass().isArray())
-        {
-            for (Object arrayValue : (Object[]) whereClausePart.getRValue())
-            {
-                if (arrayValue == null)
-                {
-                    nullContained = true;
-                    continue;
-                }
-                result.getPreparedStatementReplacements().add(arrayValue);
-                if (ignoreCase && arrayValue instanceof String)
-                {
-                    inClause.add(adapter.ignoreCase("?"));
-                    ignoreCaseApplied = true;
-                }
-                else
-                {
-                    inClause.add("?");
-                }
-            }
-        }
-        else
-        {
-            throw new IllegalArgumentException(
-                    "Unknown rValue type "
-                    + whereClausePart.getRValue().getClass().getName()
-                    + ". rValue must be an instance of "
-                    + " Iterable or Array");
-        }
-
-        if (nullContained)
-        {
-            result.getSql().append('(');
-        }
-
-        if (ignoreCaseApplied)
-        {
-            result.getSql().append(
-                    adapter.ignoreCase((String) whereClausePart.getLValue()));
-        }
-        else
-        {
-            result.getSql().append(whereClausePart.getLValue());
-        }
-
-        result.getSql().append(whereClausePart.getOperator())
-                .append('(')
-                .append(StringUtils.join(inClause.iterator(), ","))
-                .append(')');
-        if (nullContained)
-        {
-            if (whereClausePart.getOperator() == SqlEnum.IN)
-            {
-                result.getSql().append(Criterion.OR)
-                    .append(whereClausePart.getLValue()).append(SqlEnum.ISNULL);
-            }
-            else if (whereClausePart.getOperator() == SqlEnum.NOT_IN)
-            {
-                result.getSql().append(Criterion.AND)
-                    .append(whereClausePart.getLValue()).append(
-                            SqlEnum.ISNOTNULL);
-            }
-            result.getSql().append(')');
-        }
-        return result;
-    }
 }

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/objectbuilder/ObjectOrColumnPsPartBuilder.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/objectbuilder/ObjectOrColumnPsPartBuilder.java?rev=1484252&r1=1484251&r2=1484252&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/objectbuilder/ObjectOrColumnPsPartBuilder.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/objectbuilder/ObjectOrColumnPsPartBuilder.java Sun May 19 09:58:00 2013
@@ -52,8 +52,8 @@ public class ObjectOrColumnPsPartBuilder
      */
     public PreparedStatementPart buildPs(
             Object toBuildFrom,
-            boolean ignoreCase,
-            Adapter adapter)
+            final boolean ignoreCase,
+            final Adapter adapter)
         throws TorqueException
     {
         PreparedStatementPart result = new PreparedStatementPart();
@@ -84,16 +84,6 @@ public class ObjectOrColumnPsPartBuilder
             return result;
         }
 
-        if (toBuildFrom instanceof org.apache.torque.util.Criteria)
-        {
-            Query subquery = SqlBuilder.buildQuery(
-                    (org.apache.torque.util.Criteria) toBuildFrom);
-            result.getPreparedStatementReplacements().addAll(
-                    subquery.getPreparedStatementReplacements());
-            result.getSql().append("(").append(subquery.toString()).append(")");
-            return result;
-        }
-
         if (toBuildFrom.equals(
                 SqlEnum.CURRENT_DATE)
                 || toBuildFrom.equals(

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/BasePeerImpl.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/BasePeerImpl.java?rev=1484252&r1=1484251&r2=1484252&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/BasePeerImpl.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/BasePeerImpl.java Sun May 19 09:58:00 2013
@@ -41,6 +41,8 @@ import org.apache.torque.Torque;
 import org.apache.torque.TorqueException;
 import org.apache.torque.adapter.Adapter;
 import org.apache.torque.adapter.IDMethod;
+import org.apache.torque.criteria.Criteria;
+import org.apache.torque.criteria.Criterion;
 import org.apache.torque.criteria.FromElement;
 import org.apache.torque.map.ColumnMap;
 import org.apache.torque.map.MapHelper;
@@ -107,7 +109,7 @@ public class BasePeerImpl implements 
      * @param tableMap the default table map
      * @param databaseName the name of the database
      */
-    public BasePeerImpl(RecordMapper recordMapper, TableMap tableMap, String databaseName)
+    public BasePeerImpl(final RecordMapper recordMapper, final TableMap tableMap, final String databaseName)
     {
         this();
         setRecordMapper(recordMapper);
@@ -120,7 +122,7 @@ public class BasePeerImpl implements 
      *
      * @param recordMapper the recordMapper to set
      */
-    public void setRecordMapper(RecordMapper recordMapper)
+    public void setRecordMapper(final RecordMapper recordMapper)
     {
         this.recordMapper = recordMapper;
     }
@@ -145,7 +147,7 @@ public class BasePeerImpl implements 
      *
      * @param tableMap the tableMap to set
      */
-    public void setTableMap(TableMap tableMap)
+    public void setTableMap(final TableMap tableMap)
     {
         this.tableMap = tableMap;
     }
@@ -170,7 +172,7 @@ public class BasePeerImpl implements 
      *
      * @param databaseName the databaseName to set
      */
-    public void setDatabaseName(String databaseName)
+    public void setDatabaseName(final String databaseName)
     {
         this.databaseName = databaseName;
     }
@@ -191,132 +193,6 @@ public class BasePeerImpl implements 
     }
 
     /**
-     * Convenience method to create a String array of criteria keys.
-     *
-     * @param tableName Name of table.
-     * @param columnNames A String[].
-     * @return A String[].
-     *
-     * @deprecated This method is not used any more and will be removed in a
-     *             future version of Torque.
-     */
-    @Deprecated
-    public String[] initCriteriaKeys(
-        String tableName,
-        String[] columnNames)
-    {
-        String[] keys = new String[columnNames.length];
-        for (int i = 0; i < columnNames.length; i++)
-        {
-            keys[i] = tableName + "." + columnNames[i].toUpperCase();
-        }
-        return keys;
-    }
-
-    /**
-     * Convenience method that uses straight JDBC to delete multiple
-     * rows.
-     *
-     * @param con A Connection.
-     * @param table The table to delete records from.
-     * @param column The column in the where clause.
-     * @param value The value of the column.
-     *
-     * @return the number of deleted rows.
-     *
-     * @throws TorqueException Any exceptions caught during processing will be
-     *         rethrown wrapped into a TorqueException.
-     *
-     * @deprecated The value is not SQL escaped.
-     *             Better use doDelete(Criteria, String, Connection)
-     *             for automatic escaping and more flexibility.
-     *             This method will be removed in a future version of Torque.
-     */
-    @Deprecated
-    public int deleteAll(
-                Connection con,
-                String table,
-                String column,
-                int value)
-            throws TorqueException
-    {
-        Statement statement = null;
-        try
-        {
-            statement = con.createStatement();
-
-            StringBuffer query = new StringBuffer();
-            query.append("DELETE FROM ")
-                .append(table)
-                .append(" WHERE ")
-                .append(column)
-                .append(" = ")
-                .append(value);
-
-            return statement.executeUpdate(query.toString());
-        }
-        catch (SQLException e)
-        {
-            throw new TorqueException(e);
-        }
-        finally
-        {
-            if (statement != null)
-            {
-                try
-                {
-                    statement.close();
-                }
-                catch (SQLException e)
-                {
-                    throw new TorqueException(e);
-                }
-            }
-        }
-    }
-
-    /**
-     * Convenience method that uses straight JDBC to delete multiple
-     * rows. This method attempts to get the default database from
-     * the pool.
-     *
-     * @param table The table to delete records from.
-     * @param column The column in the where clause.
-     * @param value The value of the column.
-     *
-     * @return the number of deleted rows.
-     *
-     * @throws TorqueException Any exceptions caught during processing will be
-     *         rethrown wrapped into a TorqueException.
-     *
-     * @deprecated The value is not SQL escaped.
-     *             Better use doDelete(Criteria, String)
-     *             for automatic escaping and more flexibility.
-     *             This method will be removed in a future version of Torque.
-     */
-    @Deprecated
-    public int deleteAll(String table, String column, int value)
-        throws TorqueException
-    {
-        Connection con = null;
-        try
-        {
-            con = Transaction.begin(Torque.getDefaultDB());
-            int result = deleteAll(con, table, column, value);
-            Transaction.commit(con);
-            con = null;
-            return result;
-        }
-        finally
-        {
-            if (con != null)
-            {
-                Transaction.safeRollback(con);
-            }
-        }
-    }
-
-    /**
      * Deletes rows from a database table.
      *
      * @param criteria defines the rows to be deleted, not null.
@@ -326,7 +202,7 @@ public class BasePeerImpl implements 
      * @throws TorqueException Any exceptions caught during processing will be
      *         rethrown wrapped into a TorqueException.
      */
-     public int doDelete(org.apache.torque.criteria.Criteria criteria)
+     public int doDelete(final Criteria criteria)
              throws TorqueException
      {
         Connection connection = null;
@@ -361,8 +237,8 @@ public class BasePeerImpl implements 
      *         rethrown wrapped into a TorqueException.
      */
      public int doDelete(
-             org.apache.torque.criteria.Criteria criteria,
-             Connection connection)
+             final Criteria criteria,
+             final Connection connection)
         throws TorqueException
      {
         correctBooleans(criteria);
@@ -442,154 +318,6 @@ public class BasePeerImpl implements 
      }
 
     /**
-     * Method to perform deletes based on conditions in a Criteria.
-     *
-     * @param criteria The criteria to use.
-     *
-     * @return the number of deleted rows.
-     *
-     * @throws TorqueException Any exceptions caught during processing will be
-     *         rethrown wrapped into a TorqueException.
-     *
-     * @deprecated This method causes unexpected results when joins are used.
-     *             Please use doDelete(
-     *                 org.apache.torque.criteria.Criteria, TableMap).
-     *             This method will be removed in a future version of Torque.
-     */
-    @Deprecated
-    protected int doDelete(Criteria criteria) throws TorqueException
-    {
-        Connection con = null;
-        try
-        {
-            con = Transaction.begin(criteria.getDbName());
-            int result = doDelete(criteria, con);
-            Transaction.commit(con);
-            con = null;
-            return result;
-        }
-        finally
-        {
-            if (con != null)
-            {
-                Transaction.safeRollback(con);
-            }
-        }
-    }
-
-    /**
-     * Method to perform deletes based on conditions a Criteria.
-     *
-     * @param criteria The criteria to use.
-     * @param con the Connection to be used for deleting.
-     *
-     * @return the number of deleted rows.
-     *
-     * @throws TorqueException Any exceptions caught during processing will be
-     *         rethrown wrapped into a TorqueException.
-     *
-     * @deprecated This method causes unexpected results when joins are used.
-     *             Please use doDelete(
-     *                 org.apache.torque.criteria.Criteria, TableMap, Connection).
-     *             This method will be removed in a future version of Torque.
-     */
-    @Deprecated
-    protected int doDelete(Criteria criteria, Connection con)
-        throws TorqueException
-    {
-        if (criteria.values().isEmpty())
-        {
-            throw new TorqueException("No conditions found in Criteria");
-        }
-        Criteria.Criterion criterion
-                = criteria.values().iterator().next();
-
-        TableMap tableMapFromCriteria = MapHelper.getTableMap(
-                criterion.getColumn(), criteria, null);
-        if (tableMapFromCriteria == null)
-        {
-            throw new TorqueException("Unqualified column name in criteria"
-                    + " or table name not found in database map");
-        }
-
-        Query query = SqlBuilder.buildQuery(criteria);
-        query.setType(Query.Type.DELETE);
-
-        String fullTableName = null;
-        if (tableMap != null)
-        {
-            fullTableName = SqlBuilder.getFullTableName(
-                    tableMap.getFullyQualifiedTableName(),
-                    criteria.getDbName());
-        }
-        else
-        {
-            Column column = criteria.values().iterator().next().getColumn();
-            fullTableName = SqlBuilder.getFullTableName(
-                    column.getFullTableName(),
-                    criteria.getDbName());
-        }
-
-        boolean ownTableAdded = false;
-        for (FromElement fromElement : query.getFromClause())
-        {
-            // Table names are case insensitive in known databases
-            // so use case-insensitive compare
-            if (fullTableName.equalsIgnoreCase(fromElement.getFromExpression()))
-            {
-                ownTableAdded = true;
-                break;
-            }
-        }
-        if (!ownTableAdded)
-        {
-            query.getFromClause().add(new FromElement(fullTableName));
-        }
-        String sql = query.toString();
-
-        PreparedStatement preparedStatement = null;
-        try
-        {
-            preparedStatement = con.prepareStatement(sql);
-            List replacements = setPreparedStatementReplacements(
-                    preparedStatement,
-                    query.getPreparedStatementReplacements(),
-                    0);
-            long startTime = System.currentTimeMillis();
-            log.debug("Executing delete " + sql
-                    + ", parameters = "
-                    + replacements);
-
-            int affectedRows = preparedStatement.executeUpdate();
-            long queryEndTime = System.currentTimeMillis();
-            log.trace("delete took " + (queryEndTime - startTime)
-                    + " milliseconds");
-
-            preparedStatement.close();
-            preparedStatement = null;
-            return affectedRows;
-        }
-        catch (SQLException e)
-        {
-            throw ExceptionMapper.getInstance().toTorqueException(e);
-        }
-        finally
-        {
-            if (preparedStatement != null)
-            {
-                try
-                {
-                    preparedStatement.close();
-                }
-                catch (SQLException e)
-                {
-                    log.warn("error closing prepared statement", e);
-                }
-            }
-        }
-    }
-
-    /**
      * Inserts a record into a database table.
      * 
      * If the primary key is included in Criteria, then that value will
@@ -610,7 +338,7 @@ public class BasePeerImpl implements 
      *
      * @throws TorqueException if a database error occurs.
      */
-    public ObjectKey doInsert(ColumnValues insertValues)
+    public ObjectKey doInsert(final ColumnValues insertValues)
           throws TorqueException
     {
         String databaseNameFromInsertValues = insertValues.getDbName();
@@ -659,8 +387,8 @@ public class BasePeerImpl implements 
      * @throws TorqueException if a database error occurs.
      */
     public ObjectKey doInsert(
-                ColumnValues insertValues,
-                Connection connection)
+                final ColumnValues insertValues,
+                final Connection connection)
             throws TorqueException
     {
         if (insertValues == null)
@@ -850,10 +578,10 @@ public class BasePeerImpl implements 
      * @throws TorqueException Possible errors get wrapped in here.
      */
     private SimpleKey getId(
-                ColumnMap pk,
-                IdGenerator keyGen,
-                Connection con,
-                Object keyInfo)
+                final ColumnMap pk,
+                final IdGenerator keyGen,
+                final Connection con,
+                final Object keyInfo)
             throws TorqueException
     {
         SimpleKey id = null;
@@ -880,7 +608,7 @@ public class BasePeerImpl implements 
      * @param criteria the Criteria to which the select columns should
      *        be added.
      */
-    public void addSelectColumns(org.apache.torque.criteria.Criteria criteria)
+    public void addSelectColumns(final Criteria criteria)
     {
         ColumnMap[] columns = this.tableMap.getColumns();
 
@@ -891,55 +619,6 @@ public class BasePeerImpl implements 
     }
 
     /**
-     * Add all the columns needed to create a new object.
-     *
-     * @param criteria the Criteria to which the select columns should
-     *        be added.
-     *
-     * @deprecated Please use addSelectColumns(
-     *                 org.apache.torque.criteria.Criteria).
-     *             This method will be removed in a future version of Torque.
-     */
-    @Deprecated
-    public void addSelectColumns(Criteria criteria)
-    {
-        ColumnMap[] columns = this.tableMap.getColumns();
-
-        for (ColumnMap c : columns)
-        {
-            criteria.addSelectColumn(c);
-        }
-    }
-
-    /**
-     * Selects objects from a database.
-     *
-     * @param criteria object used to create the SELECT statement.
-     *
-     * @return the list of selected objects, not null.
-     *
-     * @throws TorqueException Any exceptions caught during processing will be
-     *         rethrown wrapped into a TorqueException.
-     *
-     * @deprecated Please use doSelect(org.apache.torque.criteria.Criteria).
-     *             This method will be removed in a future version of Torque.
-     */
-    @Deprecated
-    public List doSelect(Criteria criteria)
-            throws TorqueException
-    {
-        if (criteria.getSelectColumns().size() == 0)
-        {
-            addSelectColumns(criteria);
-        }
-        setDbName(criteria);
-
-        return doSelect(
-            criteria,
-            getRecordMapper());
-    }
-
-    /**
      * Selects objects from a database.
      *
      * @param criteria object used to create the SELECT statement.
@@ -949,7 +628,7 @@ public class BasePeerImpl implements 
      * @throws TorqueException Any exceptions caught during processing will be
      *         rethrown wrapped into a TorqueException.
      */
-    public List doSelect(org.apache.torque.criteria.Criteria criteria)
+    public List doSelect(final Criteria criteria)
             throws TorqueException
     {
         if (criteria.getSelectColumns().size() == 0)
@@ -974,44 +653,10 @@ public class BasePeerImpl implements 
      *
      * @throws TorqueException Any exceptions caught during processing will be
      *         rethrown wrapped into a TorqueException.
-     *
-     * @deprecated Please use doSelect(org.apache.torque.criteria.Criteria,
-     *                 Connection).
-     *             This method will be removed in a future version of Torque.
-     */
-    @Deprecated
-    public List doSelect(
-                Criteria criteria,
-                Connection connection)
-            throws TorqueException
-    {
-        if (criteria.getSelectColumns().size() == 0)
-        {
-            addSelectColumns(criteria);
-        }
-        setDbName(criteria);
-
-        return doSelect(
-                criteria,
-                getRecordMapper(),
-                connection);
-    }
-
-    /**
-     * Selects objects from a database
-     * within a transaction.
-     *
-     * @param criteria object used to create the SELECT statement.
-     * @param connection the connection to use, not null.
-     *
-     * @return the list of selected objects, not null.
-     *
-     * @throws TorqueException Any exceptions caught during processing will be
-     *         rethrown wrapped into a TorqueException.
      */
     public List doSelect(
-                org.apache.torque.criteria.Criteria criteria,
-                Connection connection)
+                final Criteria criteria,
+                final Connection connection)
             throws TorqueException
     {
         if (criteria.getSelectColumns().size() == 0)
@@ -1036,7 +681,7 @@ public class BasePeerImpl implements 
      * @throws TorqueException If more than one record is selected or if
      *         an error occurs when processing the query.
      */
-    public T doSelectSingleRecord(org.apache.torque.criteria.Criteria criteria)
+    public T doSelectSingleRecord(final Criteria criteria)
             throws TorqueException
     {
         List recordList = doSelect(criteria);
@@ -1066,8 +711,8 @@ public class BasePeerImpl implements 
      *         an error occurs when processing the query.
      */
     public T doSelectSingleRecord(
-                org.apache.torque.criteria.Criteria criteria,
-                Connection connection)
+                final Criteria criteria,
+                final Connection connection)
             throws TorqueException
     {
         List recordList = doSelect(criteria, connection);
@@ -1094,54 +739,10 @@ public class BasePeerImpl implements 
      * @return The results of the query, not null.
      *
      * @throws TorqueException if querying the database fails.
-     *
-     * @deprecated Please use doSelect(org.apache.torque.criteria.Criteria,
-     *                 RecordMapper).
-     *             This method will be removed in a future version of Torque.
      */
-    @Deprecated
     public  List doSelect(
-                Criteria criteria,
-                RecordMapper mapper)
-            throws TorqueException
-    {
-        Connection connection = null;
-        try
-        {
-            connection = Transaction.begin(criteria.getDbName());
-
-            List result = doSelect(
-                    criteria,
-                    mapper,
-                    connection);
-
-            Transaction.commit(connection);
-            connection = null;
-            return result;
-        }
-        finally
-        {
-            if (connection != null)
-            {
-                Transaction.safeRollback(connection);
-            }
-        }
-    }
-
-    /**
-     * Selects rows from a database an maps them to objects.
-     *
-     * @param criteria A Criteria specifying the records to select, not null.
-     * @param mapper The mapper creating the objects from the resultSet,
-     *        not null.
-     *
-     * @return The results of the query, not null.
-     *
-     * @throws TorqueException if querying the database fails.
-     */
-    public  List doSelect(
-                org.apache.torque.criteria.Criteria criteria,
-                RecordMapper mapper)
+                final Criteria criteria,
+                final RecordMapper mapper)
             throws TorqueException
     {
         Connection connection = null;
@@ -1176,7 +777,7 @@ public class BasePeerImpl implements 
      *
      * @throws TorqueException if querying the database fails.
      */
-    public List doSelect(String query)
+    public List doSelect(final String query)
             throws TorqueException
     {
         return doSelect(
@@ -1196,8 +797,8 @@ public class BasePeerImpl implements 
      * @throws TorqueException if querying the database fails.
      */
     public List doSelect(
-                String query,
-                Connection connection)
+                final String query,
+                final Connection connection)
             throws TorqueException
     {
         return doSelect(
@@ -1220,9 +821,9 @@ public class BasePeerImpl implements 
      * @throws TorqueException if querying the database fails.
      */
     public  List doSelect(
-                String query,
-                RecordMapper mapper,
-                String dbName)
+                final String query,
+                final RecordMapper mapper,
+                final String dbName)
             throws TorqueException
     {
         Connection connection = null;
@@ -1259,197 +860,43 @@ public class BasePeerImpl implements 
      *        not null.
      * @param connection the database connection, not null.
      *
-     * @return The results of the query, not null.
-     *
-     * @throws TorqueException if querying the database fails.
-     */
-    public  List doSelect(
-                String query,
-                RecordMapper mapper,
-                Connection connection)
-            throws TorqueException
-    {
-        if (connection == null)
-        {
-            throw new NullPointerException("connection is null");
-        }
-
-        List result = new ArrayList();
-        Statement statement = null;
-        ResultSet resultSet = null;
-        try
-        {
-            statement = connection.createStatement();
-            long startTime = System.currentTimeMillis();
-            log.debug("Executing query " + query);
-
-            resultSet = statement.executeQuery(query.toString());
-            long queryEndTime = System.currentTimeMillis();
-            log.trace("query took " + (queryEndTime - startTime)
-                    + " milliseconds");
-
-            while (resultSet.next())
-            {
-                TT rowResult = mapper.processRow(resultSet, 0, null);
-                result.add(rowResult);
-            }
-            long mappingEndTime = System.currentTimeMillis();
-            log.trace("mapping took " + (mappingEndTime - queryEndTime)
-                    + " milliseconds");
-        }
-        catch (SQLException e)
-        {
-            throw ExceptionMapper.getInstance().toTorqueException(e);
-        }
-        finally
-        {
-            if (resultSet != null)
-            {
-                try
-                {
-                    resultSet.close();
-                }
-                catch (SQLException e)
-                {
-                    log.warn("error closing resultSet", e);
-                }
-            }
-            if (statement != null)
-            {
-                try
-                {
-                    statement.close();
-                }
-                catch (SQLException e)
-                {
-                    log.warn("error closing statement", e);
-                }
-            }
-        }
-        return result;
-    }
-
-    /**
-     * Performs a SQL select using a PreparedStatement.
-     *
-     * @param criteria A Criteria specifying the records to select, not null.
-     * @param mapper The mapper creating the objects from the resultSet,
-     *        not null.
-     * @param connection the database connection for selecting records,
-     *        not null.
-     *
-     * @return The results of the query, not null.
-     *
-     * @throws TorqueException Error performing database query.
-     *
-     * @deprecated Please use doSelect(org.apache.torque.criteria.Criteria,
-     *                 RecordMapper, Connection).
-     *             This method will be removed in a future version of Torque.
-     */
-    @Deprecated
-    public  List doSelect(
-            Criteria criteria,
-            RecordMapper mapper,
-            Connection connection)
-        throws TorqueException
-    {
-        correctBooleans(criteria);
-
-        Query query = SqlBuilder.buildQuery(criteria);
-        if (query.getFromClause().isEmpty())
-        {
-            String tableName = SqlBuilder.getFullTableName(
-                    getTableMap().getFullyQualifiedTableName(),
-                    criteria.getDbName());
-            query.getFromClause().add(new FromElement(tableName));
-        }
-
-        PreparedStatement statement = null;
-        ResultSet resultSet = null;
-        try
-        {
-            statement = connection.prepareStatement(query.toString());
-
-            List replacements = setPreparedStatementReplacements(
-                    statement,
-                    query.getPreparedStatementReplacements(),
-                    0);
-
-            long startTime = System.currentTimeMillis();
-            log.debug("Executing query " + query
-                    + ", parameters = "
-                    + replacements);
-
-            resultSet = statement.executeQuery();
-            long queryEndTime = System.currentTimeMillis();
-            log.trace("query took " + (queryEndTime - startTime)
-                    + " milliseconds");
-
-            long offset;
-            Database database = Torque.getDatabase(criteria.getDbName());
-            if (database.getAdapter().supportsNativeOffset())
-            {
-                offset = 0; //database takes care of offset
-            }
-            else
-            {
-                offset = criteria.getOffset();
-            }
-
-            long limit;
-            if (database.getAdapter().supportsNativeLimit())
-            {
-                limit = -1; //database takes care of offset
-            }
-            else
-            {
-                if (database.getAdapter().supportsNativeOffset())
-                {
-                    limit = criteria.getLimit();
-                }
-                else
-                {
-                    if (criteria.getLimit() == -1)
-                    {
-                        limit = criteria.getLimit();
-                    }
-                    else
-                    {
-                        limit = offset + criteria.getLimit();
-                    }
-                }
-            }
+     * @return The results of the query, not null.
+     *
+     * @throws TorqueException if querying the database fails.
+     */
+    public  List doSelect(
+                final String query,
+                final RecordMapper mapper,
+                final Connection connection)
+            throws TorqueException
+    {
+        if (connection == null)
+        {
+            throw new NullPointerException("connection is null");
+        }
+
+        List result = new ArrayList();
+        Statement statement = null;
+        ResultSet resultSet = null;
+        try
+        {
+            statement = connection.createStatement();
+            long startTime = System.currentTimeMillis();
+            log.debug("Executing query " + query);
+
+            resultSet = statement.executeQuery(query.toString());
+            long queryEndTime = System.currentTimeMillis();
+            log.trace("query took " + (queryEndTime - startTime)
+                    + " milliseconds");
 
-            List result = new ArrayList();
-            int rowNumber = 0;
             while (resultSet.next())
             {
-                if (rowNumber < offset)
-                {
-                    rowNumber++;
-                    continue;
-                }
-                if (limit >= 0 && rowNumber >= limit)
-                {
-                    break;
-                }
-
-                TT rowResult = mapper.processRow(resultSet, 0, criteria);
+                TT rowResult = mapper.processRow(resultSet, 0, null);
                 result.add(rowResult);
-
-                rowNumber++;
             }
             long mappingEndTime = System.currentTimeMillis();
             log.trace("mapping took " + (mappingEndTime - queryEndTime)
                     + " milliseconds");
-
-            if (criteria.isSingleRecord() && result.size() > 1)
-            {
-                throw new TooManyRowsException(
-                        "Criteria expected single Record and "
-                        + "Multiple Records were selected");
-            }
-            return result;
         }
         catch (SQLException e)
         {
@@ -1480,6 +927,7 @@ public class BasePeerImpl implements 
                 }
             }
         }
+        return result;
     }
 
     /**
@@ -1496,9 +944,9 @@ public class BasePeerImpl implements 
      * @throws TorqueException Error performing database query.
      */
     public  List doSelect(
-                org.apache.torque.criteria.Criteria criteria,
-                RecordMapper mapper,
-                Connection connection)
+                final Criteria criteria,
+                final RecordMapper mapper,
+                final Connection connection)
             throws TorqueException
     {
         correctBooleans(criteria);
@@ -1646,8 +1094,8 @@ public class BasePeerImpl implements 
      * @throws TorqueException if querying the database fails.
      */
     public  TT doSelectSingleRecord(
-                org.apache.torque.criteria.Criteria criteria,
-                RecordMapper mapper)
+                final Criteria criteria,
+                final RecordMapper mapper)
             throws TorqueException
     {
         List resultList = doSelect(criteria, mapper);
@@ -1677,9 +1125,9 @@ public class BasePeerImpl implements 
      * @throws TorqueException if querying the database fails.
      */
     public  TT doSelectSingleRecord(
-                org.apache.torque.criteria.Criteria criteria,
-                RecordMapper mapper,
-                Connection connection)
+                final Criteria criteria,
+                final RecordMapper mapper,
+                final Connection connection)
             throws TorqueException
     {
         List resultList = doSelect(
@@ -1722,7 +1170,7 @@ public class BasePeerImpl implements 
      * @throws TorqueException Any exceptions caught during processing will be
      *         rethrown wrapped into a TorqueException.
      */
-    public int doUpdate(ColumnValues updateValues)
+    public int doUpdate(final ColumnValues updateValues)
             throws TorqueException
     {
         String databaseNameFromUpdateValues = updateValues.getDbName();
@@ -1773,16 +1221,16 @@ public class BasePeerImpl implements 
      *         rethrown wrapped into a TorqueException.
      */
     public int doUpdate(
-                ColumnValues updateValues,
-                Connection connection)
+                final ColumnValues updateValues,
+                final Connection connection)
             throws TorqueException
     {
         ColumnMap pk = getTableMap().getPrimaryKey();
-        org.apache.torque.criteria.Criteria selectCriteria = null;
+        Criteria selectCriteria = null;
 
         if (pk != null && updateValues.containsKey(pk.getSqlExpression()))
         {
-            selectCriteria = new org.apache.torque.criteria.Criteria();
+            selectCriteria = new Criteria();
             selectCriteria.where(pk,
                 updateValues.remove(pk.getSqlExpression()));
         }
@@ -1806,56 +1254,10 @@ public class BasePeerImpl implements 
      * @return the number of affected rows.
      *
      * @throws TorqueException if updating fails.
-     *
-     * @deprecated Please use doUpdate(
-     *                 org.apache.torque.criteria.Criteria, ColumnValues).
-     *             This method will be removed in a future version of Torque.
-     */
-    @Deprecated
-    public int doUpdate(
-                Criteria selectCriteria,
-                ColumnValues updateValues)
-            throws TorqueException
-    {
-        String databaseNameFromUpdateValues = updateValues.getDbName();
-        if (databaseNameFromUpdateValues == null)
-        {
-            databaseNameFromUpdateValues = getDatabaseName();
-        }
-        Connection connection = null;
-        try
-        {
-            connection = Transaction.begin(databaseNameFromUpdateValues);
-            int result = doUpdate(selectCriteria, updateValues, connection);
-            Transaction.commit(connection);
-            connection = null;
-            return result;
-        }
-        finally
-        {
-            if (connection != null)
-            {
-                Transaction.safeRollback(connection);
-            }
-        }
-    }
-
-    /**
-     * Executes an update against the database. The rows to be updated
-     * are selected using criteria and updated using the values
-     * in updateValues.
-     *
-     * @param selectCriteria selects which rows of which table
-     *        should be updated, not null.
-     * @param updateValues Which columns to update with which values, not null.
-     *
-     * @return the number of affected rows.
-     *
-     * @throws TorqueException if updating fails.
      */
     public int doUpdate(
-                org.apache.torque.criteria.Criteria selectCriteria,
-                ColumnValues updateValues)
+                final Criteria selectCriteria,
+                final ColumnValues updateValues)
             throws TorqueException
     {
         String databaseNameFromUpdateValues = updateValues.getDbName();
@@ -1893,113 +1295,11 @@ public class BasePeerImpl implements 
      * @return the number of affected rows.
      *
      * @throws TorqueException if updating fails.
-     *
-     * @deprecated Please use doUpdate(org.apache.torque.criteria.Criteria,
-     *                 ColumnValues, Connection).
-     *             This method will be removed in a future version of Torque.
-     */
-    @Deprecated
-    public int doUpdate(
-                Criteria criteria,
-                ColumnValues updateValues,
-                Connection connection)
-            throws TorqueException
-    {
-        Query query = SqlBuilder.buildQuery(criteria);
-        query.setType(Query.Type.UPDATE);
-
-        query.getFromClause().clear();
-        String fullTableName = SqlBuilder.getFullTableName(
-                getTableMap().getFullyQualifiedTableName(),
-                criteria.getDbName());
-        query.getFromClause().add(new FromElement(fullTableName));
-
-        List replacementObjects
-                = new ArrayList();
-        for (Map.Entry updateValue
-                : updateValues.entrySet())
-        {
-            Column column = updateValue.getKey();
-            query.getSelectClause().add(column.getColumnName());
-            replacementObjects.add(updateValue.getValue());
-        }
-
-        PreparedStatement preparedStatement = null;
-        try
-        {
-            preparedStatement = connection.prepareStatement(query.toString());
-            int position = 1;
-            for (JdbcTypedValue replacementObject : replacementObjects)
-            {
-                Object value = replacementObject.getValue();
-                if (value != null)
-                {
-                    preparedStatement.setObject(position, value);
-                }
-                else
-                {
-                    preparedStatement.setNull(
-                            position,
-                            replacementObject.getJdbcType());
-                }
-                position++;
-            }
-            List replacements = setPreparedStatementReplacements(
-                    preparedStatement,
-                    query.getPreparedStatementReplacements(),
-                    position - 1);
-            long startTime = System.currentTimeMillis();
-            log.debug("Executing update " + query.toString()
-                    + " using update parameters " + replacementObjects
-                    + " and query parameters "
-                    + replacements);
-
-            int affectedRows = preparedStatement.executeUpdate();
-            long queryEndTime = System.currentTimeMillis();
-            log.trace("update took " + (queryEndTime - startTime)
-                    + " milliseconds");
-
-            preparedStatement.close();
-            preparedStatement = null;
-            return affectedRows;
-        }
-        catch (SQLException e)
-        {
-            throw ExceptionMapper.getInstance().toTorqueException(e);
-        }
-        finally
-        {
-            if (preparedStatement != null)
-            {
-                try
-                {
-                    preparedStatement.close();
-                }
-                catch (SQLException e)
-                {
-                    log.warn("error closing prepared statement", e);
-                }
-            }
-        }
-    }
-
-    /**
-     * Executes an update against the database. The rows to be updated
-     * are selected using criteria and updated using the values
-     * in updateValues.
-     *
-     * @param criteria selects which rows of which table should be updated.
-     * @param updateValues Which columns to update with which values, not null.
-     * @param connection the database connection to use, not null.
-     *
-     * @return the number of affected rows.
-     *
-     * @throws TorqueException if updating fails.
      */
     public int doUpdate(
-                org.apache.torque.criteria.Criteria criteria,
-                ColumnValues updateValues,
-                Connection connection)
+                final Criteria criteria,
+                final ColumnValues updateValues,
+                final Connection connection)
             throws TorqueException
     {
         Query query = SqlBuilder.buildQuery(criteria);
@@ -2093,7 +1393,7 @@ public class BasePeerImpl implements 
      * @throws TorqueException if executing the statement fails
      *         or no database connection can be established.
      */
-    public int executeStatement(String statementString) throws TorqueException
+    public int executeStatement(final String statementString) throws TorqueException
     {
         return executeStatement(statementString, Torque.getDefaultDB(), null);
     }
@@ -2114,8 +1414,8 @@ public class BasePeerImpl implements 
      *         or no database connection can be established.
      */
     public int executeStatement(
-                String statementString,
-                List replacementValues)
+                final String statementString,
+                final List replacementValues)
             throws TorqueException
     {
         return executeStatement(
@@ -2142,9 +1442,9 @@ public class BasePeerImpl implements 
      *         or no database connection can be established.
      */
     public int executeStatement(
-            String statementString,
-            String dbName,
-            List replacementValues)
+            final String statementString,
+            final String dbName,
+            final List replacementValues)
         throws TorqueException
     {
         Connection con = null;
@@ -2184,9 +1484,9 @@ public class BasePeerImpl implements 
      * @throws TorqueException if executing the statement fails.
      */
     public int executeStatement(
-            String statementString,
-            Connection con,
-            List replacementValues)
+            final String statementString,
+            final Connection con,
+            final List replacementValues)
         throws TorqueException
     {
         int rowCount = -1;
@@ -2251,9 +1551,9 @@ public class BasePeerImpl implements 
      * @throws SQLException if setting the parameter fails.
      */
     private List setPreparedStatementReplacements(
-                PreparedStatement statement,
-                List replacements,
-                int offset)
+                final PreparedStatement statement,
+                final List replacements,
+                final int offset)
             throws SQLException
     {
         List result = new ArrayList(replacements.size());
@@ -2314,85 +1614,6 @@ public class BasePeerImpl implements 
     }
 
     /**
-     * Changes the boolean values in the criteria to the appropriate type,
-     * whenever a booleanchar or booleanint column is involved.
-     * This enables the user to create criteria using Boolean values
-     * for booleanchar or booleanint columns.
-     *
-     * @param criteria the criteria in which the boolean values should be
-     *        corrected.
-     * @throws TorqueException if the database map for the criteria cannot be
-     *         obtained.
-     *
-     * @deprecated Please use correctBooleans(
-     *                 org.apache.torque.criteria.Criteria).
-     *             This method will be removed in a future version of Torque.
-     */
-    @Deprecated
-    public void correctBooleans(Criteria criteria)
-            throws TorqueException
-    {
-        for (Object criterionObject : criteria.values())
-        {
-            Criteria.Criterion criterion = (Criteria.Criterion) criterionObject;
-            correctBooleans(criteria, criterion);
-       }
-    }
-
-    /**
-     * Checks all columns in the criteria to see whether
-     * booleanchar and booleanint columns are queried with a boolean.
-     * If yes, the query values are mapped onto values the database
-     * does understand, i.e. 0 and 1 for booleanints and N and Y for
-     * booleanchar columns.
-     *
-     * @param criteria The criteria to which teh criterion belongs.
-     * @param criterion The criterion to be checked for booleanint
-     *        and booleanchar columns.
-     *
-     * @throws TorqueException if the database map for the criteria cannot be
-     *         retrieved.
-     *
-     * @deprecated
-     */
-    @Deprecated
-    private void correctBooleans(
-                Criteria criteria,
-                Criteria.Criterion criterion)
-            throws TorqueException
-    {
-        Column column = criterion.getColumn();
-        TableMap tableMapFromCriteria = MapHelper.getTableMap(
-                column,
-                criteria,
-                tableMap);
-        // if no description of table available, do not modify anything
-        if (tableMapFromCriteria != null)
-        {
-            String columnName = column.getColumnName();
-            ColumnMap columnMap = tableMapFromCriteria.getColumn(columnName);
-            if (columnMap != null)
-            {
-                if ("BOOLEANINT".equals(columnMap.getTorqueType()))
-                {
-                    replaceBooleanValues(
-                            criterion,
-                            Integer.valueOf(1),
-                            Integer.valueOf(0));
-                }
-                else if ("BOOLEANCHAR".equals(columnMap.getTorqueType()))
-                {
-                    replaceBooleanValues(criterion, "Y", "N");
-                 }
-            }
-        }
-        for (Criteria.Criterion attachedCriterion : criterion.getClauses())
-        {
-            correctBooleans(criteria, attachedCriterion);
-        }
-    }
-
-    /**
      * Checks all columns in the criteria to see whether
      * booleanchar and booleanint columns are queried with a boolean.
      * If yes, the query values are mapped onto values the database
@@ -2406,7 +1627,7 @@ public class BasePeerImpl implements 
      *         retrieved.
      */
     public void correctBooleans(
-                org.apache.torque.criteria.Criteria criteria)
+                final Criteria criteria)
             throws TorqueException
     {
        correctBooleans(
@@ -2415,8 +1636,8 @@ public class BasePeerImpl implements 
     }
 
     private void correctBooleans(
-                org.apache.torque.criteria.Criteria criteria,
-                org.apache.torque.criteria.Criterion criterion)
+                final Criteria criteria,
+                final Criterion criterion)
             throws TorqueException
     {
         if (criterion == null)
@@ -2425,7 +1646,7 @@ public class BasePeerImpl implements 
         }
         if (criterion.isComposite())
         {
-            for (org.apache.torque.criteria.Criterion part
+            for (Criterion part
                     : criterion.getParts())
             {
                 correctBooleans(criteria, part);
@@ -2467,51 +1688,14 @@ public class BasePeerImpl implements 
      * and falseValue if the Boolean equals Boolean.FALSE.
      *
      * @param criterion the criterion to replace Boolean values in.
-     * @param trueValue the value by which Boolean.TRUE should be replaced.
-     * @param falseValue the value by which Boolean.FALSE should be replaced.
-     *
-     * @deprecated
-     */
-    @Deprecated
-    private void replaceBooleanValues(
-            Criteria.Criterion criterion,
-            Object trueValue,
-            Object falseValue)
-    {
-        // attachedCriterions also contains the criterion itself,
-        // so no additional treatment is needed for the criterion itself.
-        Criteria.Criterion[] attachedCriterions
-            = criterion.getAttachedCriterion();
-        for (int i = 0; i < attachedCriterions.length; ++i)
-        {
-            Object criterionValue
-                    = attachedCriterions[i].getValue();
-            if (criterionValue instanceof Boolean)
-            {
-                Boolean booleanValue = (Boolean) criterionValue;
-                attachedCriterions[i].setValue(
-                        Boolean.TRUE.equals(booleanValue)
-                                ? trueValue
-                                : falseValue);
-            }
-
-        }
-    }
-
-    /**
-     * Replaces any Boolean value in the criterion and its attached Criterions
-     * by trueValue if the Boolean equals Boolean.TRUE
-     * and falseValue if the Boolean equals Boolean.FALSE.
-     *
-     * @param criterion the criterion to replace Boolean values in.
      *        May not be a composite criterion.
      * @param trueValue the value by which Boolean.TRUE should be replaced.
      * @param falseValue the value by which Boolean.FALSE should be replaced.
      */
     private void replaceBooleanValues(
-            org.apache.torque.criteria.Criterion criterion,
-            Object trueValue,
-            Object falseValue)
+            final Criterion criterion,
+            final Object trueValue,
+            final Object falseValue)
     {
         Object rValue = criterion.getRValue();
         if (rValue instanceof Boolean)
@@ -2546,7 +1730,7 @@ public class BasePeerImpl implements 
      *         retrieved.
      */
     public void correctBooleans(
-            ColumnValues columnValues)
+            final ColumnValues columnValues)
         throws TorqueException
     {
         for (Map.Entry entry : columnValues.entrySet())
@@ -2596,7 +1780,7 @@ public class BasePeerImpl implements 
      *
      * @param crit the criteria to set the database name in, not null.
      */
-    protected void setDbName(org.apache.torque.criteria.Criteria crit)
+    protected void setDbName(final Criteria crit)
             throws TorqueException
     {
         if (crit.getDbName() == null)
@@ -2604,23 +1788,4 @@ public class BasePeerImpl implements 
             crit.setDbName(getDatabaseName());
         }
     }
-
-    /**
-     * Sets the database name in the passed criteria to the table's default,
-     * if it is not already set.
-     *
-     * @param crit the criteria to set the database name in, not null.
-     *
-     * @deprecated Please use addSelectColumns(
-     *                 org.apache.torque.criteria.Criteria).
-     *             This method will be removed in a future version of Torque.
-     */
-    @Deprecated
-    protected void setDbName(Criteria crit) throws TorqueException
-    {
-        if (crit.getDbName() == null)
-        {
-            crit.setDbName(getDatabaseName());
-        }
-    }
 }



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

[jira] [Assigned] (TORQUE-279) Remove deprecated methods and classes from the runtime 2013-05-19T09:43:16Z [ https://issues.apache.org/jira/browse/TORQUE-279?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Thomas Fox reassigned TORQUE-279: --------------------------------- Assignee: Thomas Fox > Remove deprecated methods and classes from the runtime > ------------------------------------------------------ > > Key: TORQUE-279 > URL: https://issues.apache.org/jira/browse/TORQUE-279 > Project: Torque > Issue Type: Improvement > Components: Runtime > Affects Versions: 4.0 > Reporter: Thomas Fox > Assignee: Thomas Fox > Fix For: 4.1 > > -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira --------------------------------------------------------------------- To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org For additional commands, e-mail: torque-dev-help@db.apache.org svn commit: r1484026 - /db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/TypeMap.java 2013-05-17T23:05:49Z Author: tfischer Date: Fri May 17 23:05:49 2013 New Revision: 1484026 URL: http://svn.apache.org/r1484026 Log: use final modifier where possible Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/TypeMap.java Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/TypeMap.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/TypeMap.java?rev=1484026&r1=1484025&r2=1484026&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/TypeMap.java (original) +++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/TypeMap.java Fri May 17 23:05:49 2013 @@ -161,7 +161,7 @@ public final class TypeMap /** * The result set getter methods for a given schema type. */ - private static Map + private static final Map SCHEMA_TYPE_TO_RESULT_SET_GETTER; // fill SCHEMA_TYPE_TO_INIT_VALUE_MAP @@ -307,7 +307,7 @@ public final class TypeMap * @param jdbcType the JDBC type * @return name of the Object */ - public static String getJavaObject(SchemaType jdbcType) + public static String getJavaObject(final SchemaType jdbcType) { return SCHEMA_TYPE_TO_INIT_VALUE_MAP.get(jdbcType); } @@ -319,7 +319,7 @@ public final class TypeMap * @param schemaType the schema type. * @return name of the native java type */ - public static JavaType getJavaPrimitiveType(SchemaType schemaType) + public static JavaType getJavaPrimitiveType(final SchemaType schemaType) { return SCHEMA_TYPE_TO_JAVA_PRIMITIVE_TYPE_MAP.get(schemaType); } @@ -331,7 +331,7 @@ public final class TypeMap * @param schemaType the schema type. * @return the corresponding java Type. */ - public static JavaType getJavaObjectType(SchemaType schemaType) + public static JavaType getJavaObjectType(final SchemaType schemaType) { return SCHEMA_TYPE_TO_JAVA_OBJECT_TYPE_MAP.get(schemaType); } @@ -343,7 +343,7 @@ public final class TypeMap * @param schemaType the schema type * @return the result set getter method. */ - public static ResultSetGetter getResultSetGetter(SchemaType schemaType) + public static ResultSetGetter getResultSetGetter(final SchemaType schemaType) { return SCHEMA_TYPE_TO_RESULT_SET_GETTER.get(schemaType); } @@ -355,7 +355,7 @@ public final class TypeMap * @param type The type to check. * @return true if the type is BOOLEANINT */ - public static boolean isBooleanInt(SchemaType type) + public static boolean isBooleanInt(final SchemaType type) { return SchemaType.BOOLEANINT.equals(type); } @@ -367,7 +367,7 @@ public final class TypeMap * @param type The type to check. * @return true if the type is BOOLEANCHAR */ - public static boolean isBooleanChar(SchemaType type) + public static boolean isBooleanChar(final SchemaType type) { return SchemaType.BOOLEANCHAR.equals(type); } @@ -379,7 +379,7 @@ public final class TypeMap * @param type The type to check. * @return true if the type is BIT */ - public static boolean isBit(SchemaType type) + public static boolean isBit(final SchemaType type) { return SchemaType.BIT.equals(type); } @@ -390,7 +390,7 @@ public final class TypeMap * @param type The type to check. * @return true if values for the type need to be quoted. */ - public static boolean isTextType(SchemaType type) + public static boolean isTextType(final SchemaType type) { return TEXT_TYPES.contains(type); } --------------------------------------------------------------------- To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org For additional commands, e-mail: torque-dev-help@db.apache.org svn commit: r1484025 - /db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/VillageMethod.java 2013-05-17T23:04:58Z Author: tfischer Date: Fri May 17 23:04:58 2013 New Revision: 1484025 URL: http://svn.apache.org/r1484025 Log: remove unused enum Removed: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/VillageMethod.java --------------------------------------------------------------------- To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org For additional commands, e-mail: torque-dev-help@db.apache.org svn commit: r1484024 - in /db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model: Column.java Table.java Unique.java UniqueColumn.java View.java ViewColumn.java 2013-05-17T22:56:36Z Author: tfischer Date: Fri May 17 22:56:36 2013 New Revision: 1484024 URL: http://svn.apache.org/r1484024 Log: TORQUE-273 change model types from String to Boolean where possible fix some checkstyle and javadoc issues Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Column.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Table.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Unique.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/UniqueColumn.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/View.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/ViewColumn.java Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Column.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Column.java?rev=1484024&r1=1484023&r2=1484024&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Column.java (original) +++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Column.java Fri May 17 22:56:36 2013 @@ -87,7 +87,7 @@ public class Column /** * Whether getters and setters for the field in the database object - * should be public instead of protected. + * should be protected instead of public. */ public Boolean _protected; Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Table.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Table.java?rev=1484024&r1=1484023&r2=1484024&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Table.java (original) +++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Table.java Fri May 17 22:56:36 2013 @@ -84,7 +84,7 @@ public class Table /** * The unqualified name of the data object class. - * If null, the class name will be determined frome the name attribute. + * If null, the class name will be determined from the name attribute. */ public String javaName; @@ -101,56 +101,87 @@ public class Table // properties for generation of ORM classes + /** The class name of the data object class. */ public String dbObjectClassName; + /** The class name of the data object base class. */ public String baseDbObjectClassName; + /** The class name of the peer static wrapper class. */ public String peerClassName; + /** The class name of the peer static wrapper base class. */ public String basePeerClassName; + /** The class name of the peer implementation class. */ public String peerImplClassName; + /** The class name of the peer implementation base class. */ public String basePeerImplClassName; + /** The class name of the data object bean class. */ public String beanClassName; + /** The class name of the data object bean base class. */ public String baseBeanClassName; + /** The class name of the manager class. */ public String managerClassName; + /** The class name of the manager base class. */ public String baseManagerClassName; + /** The class name of the record mapper class. */ public String recordMapperClassName; + /** The class name of the record mapper base class. */ public String baseRecordMapperClassName; + /** The package of the data object class. */ public String dbObjectPackage; + /** The package of the data object base class. */ public String baseDbObjectPackage; + /** The package of the peer class. */ public String peerPackage; + /** The package of the peer base class. */ public String basePeerPackage; + /** The package of the record mapper class. */ public String recordMapperPackage; + /** The package of the record mapper base class. */ public String baseRecordMapperPackage; + /** The package of the manager class. */ public String managerPackage; + /** The package of the manager base class. */ public String baseManagerPackage; + /** The package of the data object bean class. */ public String beanPackage; + /** The package of the data object bean base class. */ public String baseBeanPackage; + /** + * The optimistic Locking mode to use. + * Valid values are "selectForUpdate", "simpleSelect". */ public String optimisticLockingMode; - public String useManagers; + /** Override flag whether manager classes are used in this table. */ + public Boolean useManagers; - public String saveMethodsInDbObjects; + /** + * Whether the save method resides in the data objects + * (default is it is in the peer). + */ + public Boolean saveMethodsInDbObjects; + /** The interface for the peer class. */ public String peerInterface; // properties for sql generation Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Unique.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Unique.java?rev=1484024&r1=1484023&r2=1484024&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Unique.java (original) +++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Unique.java Fri May 17 22:56:36 2013 @@ -1,9 +1,5 @@ package org.apache.torque.templates.model; -import java.util.ArrayList; -import java.util.List; - - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -23,6 +19,9 @@ import java.util.List; * under the License. */ +import java.util.ArrayList; +import java.util.List; + /** * The model of the unique tag in a Torque schema file. * @@ -32,12 +31,16 @@ public class Unique { // schema properties + /** The table where this unique constraint belongs to. */ public Table parent; + /** The options for this unique constraint. */ public List Jenkins build is back to normal : torque4-test-project-derby #340 2013-05-16T15:14:06Z See --------------------------------------------------------------------- To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org For additional commands, e-mail: torque-dev-help@db.apache.org Build failed in Jenkins: torque4-test-project-derby #339 2013-05-16T08:39:54Z See ------------------------------------------ Started by upstream project "Torque4-trunk" build number 427 originally caused by: Started by an SCM change Started by an SCM change Building remotely on ubuntu4 in workspace Cleaning up Deleting Deleting Deleting Updating http://svn.apache.org/repos/asf/db/torque/torque4/trunk/torque-test At revision 1483248 no change for http://svn.apache.org/repos/asf/db/torque/torque4/trunk/torque-test since the previous build Parsing POMs Failed to transfer Could not find metadata org.apache.torque:torque:4.1-SNAPSHOT/maven-metadata.xml in Nexus (http://repository.apache.org/snapshots) [torque4-test-project-derby] $ /home/hudson/tools/java/latest1.5/bin/java -cp /home/jenkins/jenkins-slave/maven-agent.jar:/home/jenkins/jenkins-slave/classworlds.jar hudson.maven.agent.Main /home/hudson/tools/maven/apache-maven-2.2.1 /home/jenkins/jenkins-slave/slave.jar /home/jenkins/jenkins-slave/maven-interceptor.jar 59329 /home/jenkins/jenkins-slave/maven2.1-interceptor.jar <===[JENKINS REMOTING CAPACITY]===> channel started log4j:WARN No appenders could be found for logger (org.apache.commons.beanutils.converters.BooleanConverter). log4j:WARN Please initialize the log4j system properly. Executing Maven: -B -f -Dmaven.repo.local=/home/jenkins/jenkins-slave/maven-repositories/0 -PderbyEmbedded clean test [INFO] Scanning for projects... [INFO] ------------------------------------------------------------------------ [INFO] Building Torque Test Project [INFO] task-segment: [clean, test] [INFO] ------------------------------------------------------------------------ [INFO] snapshot org.apache.torque:torque-maven-plugin:4.1-SNAPSHOT: checking for updates from apache.snapshots May 16, 2013 8:39:52 AM hudson.remoting.SynchronousCommandTransport$ReaderThread run SEVERE: I/O error in channel channel java.io.StreamCorruptedException at java.io.ObjectInputStream.readObject0(ObjectInputStream.java:1332) at java.io.ObjectInputStream.readObject(ObjectInputStream.java:348) at hudson.remoting.Command.readFrom(Command.java:92) at hudson.remoting.ClassicCommandTransport.read(ClassicCommandTransport.java:59) at hudson.remoting.SynchronousCommandTransport$ReaderThread.run(SynchronousCommandTransport.java:48) channel stopped [INFO] ------------------------------------------------------------------------ [ERROR] FATAL ERROR [INFO] ------------------------------------------------------------------------ [INFO] null [INFO] ------------------------------------------------------------------------ [INFO] Trace java.lang.reflect.UndeclaredThrowableException at $Proxy1.fetch2(Unknown Source) at hudson.remoting.RemoteClassLoader.findClass(RemoteClassLoader.java:127) at java.lang.ClassLoader.loadClass(ClassLoader.java:307) at java.lang.ClassLoader.loadClass(ClassLoader.java:252) at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:320) at hudson.maven.reporters.MavenArtifactArchiver.postBuild(MavenArtifactArchiver.java:101) at hudson.maven.Maven2Builder.postModule(Maven2Builder.java:129) at hudson.maven.MavenBuilder$Adapter.fireLeaveModule(MavenBuilder.java:354) at hudson.maven.MavenBuilder$Adapter.postBuild(MavenBuilder.java:308) at org.apache.maven.lifecycle.LifecycleExecutorInterceptor.execute(LifecycleExecutorInterceptor.java:68) at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:328) at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:138) at org.apache.maven.cli.MavenCli.main(MavenCli.java:362) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) at java.lang.reflect.Method.invoke(Method.java:592) at org.codehaus.classworlds.Launcher.launchEnhanced(Launcher.java:315) at org.codehaus.classworlds.Launcher.launch(Launcher.java:255) at hudson.maven.agent.Main.launch(Main.java:185) at hudson.maven.MavenBuilder.call(MavenBuilder.java:154) at hudson.maven.Maven2Builder.call(Maven2Builder.java:79) at hudson.maven.Maven2Builder.call(Maven2Builder.java:55) at hudson.remoting.UserRequest.perform(UserRequest.java:118) at hudson.remoting.UserRequest.perform(UserRequest.java:48) at hudson.remoting.Request$2.run(Request.java:326) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:269) at java.util.concurrent.FutureTask.run(FutureTask.java:123) at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:651) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:676) at java.lang.Thread.run(Thread.java:595) Caused by: hudson.remoting.ChannelClosedException: channel is already closed at hudson.remoting.Channel.send(Channel.java:494) at hudson.remoting.Request.call(Request.java:129) at hudson.remoting.RemoteInvocationHandler.invoke(RemoteInvocationHandler.java:160) ... 32 more Caused by: java.io.StreamCorruptedException at java.io.ObjectInputStream.readObject0(ObjectInputStream.java:1332) at java.io.ObjectInputStream.readObject(ObjectInputStream.java:348) at hudson.remoting.Command.readFrom(Command.java:92) at hudson.remoting.ClassicCommandTransport.read(ClassicCommandTransport.java:59) at hudson.remoting.SynchronousCommandTransport$ReaderThread.run(SynchronousCommandTransport.java:48) [INFO] ------------------------------------------------------------------------ [INFO] Total time: 3 seconds [INFO] Finished at: Thu May 16 08:39:52 UTC 2013 [INFO] Final Memory: 15M/314M [INFO] ------------------------------------------------------------------------ ERROR: Maven JVM terminated unexpectedly with exit code 0 --------------------------------------------------------------------- To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org For additional commands, e-mail: torque-dev-help@db.apache.org