kimptoc 02/04/05 15:03:29
Modified: build/torque build.properties build.xml
build/torque/schema dbpsml-schema.xml
Added: build/torque/conf/org/apache/velocity/runtime/defaults
velocity.properties
Removed: build/torque/lib torque-3.0-b2-dev.jar
build/torque/templates/data Control.vm dataset.vm table.vm
build/torque/templates/data/dump Control.vm bottom.vm row.vm
top.vm
build/torque/templates/om Control.vm ExtensionObject.vm
ExtensionPeer.vm MapBuilder.vm MultiExtendObject.vm
Object.vm Peer.vm
build/torque/templates/service Control.vm
ServiceImplementation.vm ServiceInterface.vm
ServiceStaticHelper.vm
build/torque/templates/sql/base Control.vm
build/torque/templates/sql/base/db2 columns.vm db.props
drop.vm foreignkey.vm index.vm primarykey.vm
sequence.vm table.vm tablefk.vm unique.vm
build/torque/templates/sql/base/hypersonic columns.vm
db.props drop.vm foreignkey.vm index.vm
primarykey.vm table.vm tablefk.vm unique.vm
build/torque/templates/sql/base/interbase columns.vm
db.props drop.vm foreignkey.vm index.vm
primarykey.vm table.vm tablefk.vm unique.vm
build/torque/templates/sql/base/mssql columns.vm db.props
drop.vm foreignkey.vm index.vm primarykey.vm
table.vm tablefk.vm unique.vm
build/torque/templates/sql/base/mysql columns.vm db.props
drop.vm foreignkey.vm index.vm primarykey.vm
table.vm tablefk.vm unique.vm
build/torque/templates/sql/base/oracle columns.vm db.props
drop.vm foreignkey.vm index.vm primarykey.vm
sequence.vm table.vm tablefk.vm unique.vm
build/torque/templates/sql/base/postgresql columns.vm
db.props drop.vm foreignkey.vm index.vm
primarykey.vm table.vm tablefk.vm unique.vm
build/torque/templates/sql/base/sapdb columns.vm db.props
drop.vm foreignkey.vm index.vm primarykey.vm
sequence.vm table.vm tablefk.vm unique.vm
build/torque/templates/sql/base/sybase columns.vm db.props
drop.vm foreignkey.vm index.vm primarykey.vm
table.vm tablefk.vm unique.vm
build/torque/templates/sql/db-init Control.vm
build/torque/templates/sql/db-init/hypersonic unix.vm
windows.vm
build/torque/templates/sql/db-init/mssql unix.vm windows.vm
build/torque/templates/sql/db-init/mysql unix.vm windows.vm
build/torque/templates/sql/db-init/postgresql unix.vm
build/torque/templates/sql/db-init/sapdb unix.vm windows.vm
build/torque/templates/sql/db-init/sybase unix.vm windows.vm
build/torque/templates/sql/id-table Control.vm idtable.db2
idtable.hypersonic idtable.interbase idtable.mssql
idtable.mysql idtable.oracle idtable.postgresql
idtable.sapdb idtable.sybase project.props
turbine.props
build/torque/templates/sql/load Control.vm
build/torque/templates/sql/load/hypersonic row.vm val.vm
build/torque/templates/sql/load/mysql row.vm val.vm
build/torque/templates/sql/load/postgresql row.vm val.vm
build/torque/templates/sql/security Control.vm
default-roles-perms.vm default-secure-passwords.vm
Log:
part of torque upgrade - removed templates, cos they are in the jar and add
velocity.props to enable use of jar'd templates - move torque jar to core jetspeed lib
- needed for runtime use of torque
Revision Changes Path
1.2 +1 -1 jakarta-jetspeed/build/torque/build.properties
Index: build.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/build/torque/build.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.properties 12 Nov 2001 03:33:38 -0000 1.1
+++ build.properties 5 Apr 2002 23:03:27 -0000 1.2
@@ -114,7 +114,7 @@
#
# -------------------------------------------------------------------
-templatePath = templates
+templatePath =
# -------------------------------------------------------------------
#
1.9 +14 -12 jakarta-jetspeed/build/torque/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/build/torque/build.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build.xml 19 Mar 2002 16:18:13 -0000 1.8
+++ build.xml 5 Apr 2002 23:03:27 -0000 1.9
@@ -3,14 +3,16 @@
<property name="torque.home" value="."/>
<!--
- Build classpath
- Looks like we have two different versions of velocity-1.2-dev.jar
- The one in jetspeed/lib is newer, however this version of
Torque
- is incompatible with the newer Velocity.
+ Build classpath
+ Looks like we have two different versions of velocity-1.2-dev.jar
+ The one in jetspeed/lib is newer, however this version of Torque
+ is incompatible with the newer Velocity.
-->
<path id="classpath">
- <pathelement location="./lib/torque.jar"/>
+ <pathelement path="./conf/"/>
+ <pathelement location="../../lib/commons-lang-0.1-dev.jar"/>
+ <pathelement location="../../lib/torque-3.0-b2-dev.jar"/>
<pathelement location="../../lib/commons-collections.jar"/>
<pathelement location="../../lib/turbine-2.2-b1.jar"/>
<pathelement location="../../lib/stratum-1.0-b1.jar"/>
@@ -53,37 +55,37 @@
<target name="init-tasks">
<taskdef name="torque-datasql"
- classname="org.apache.turbine.torque.TorqueDataSQLTask">
+ classname="org.apache.torque.task.TorqueDataSQLTask">
<classpath refid="classpath"/>
</taskdef>
<taskdef name="torque-datadump"
- classname="org.apache.turbine.torque.TorqueDataDumpTask">
+ classname="org.apache.torque.task.TorqueDataDumpTask">
<classpath refid="classpath"/>
</taskdef>
<taskdef name="torque-datadtd"
- classname="org.apache.turbine.torque.TorqueDataDTDTask">
+ classname="org.apache.torque.task.TorqueDataDTDTask">
<classpath refid="classpath"/>
</taskdef>
<taskdef name="torque-sql"
- classname="org.apache.turbine.torque.TorqueSQLTask">
+ classname="org.apache.torque.task.TorqueSQLTask">
<classpath refid="classpath"/>
</taskdef>
<taskdef name="torque-om"
- classname="org.apache.turbine.torque.TorqueObjectModelTask">
+ classname="org.apache.torque.task.TorqueObjectModelTask">
<classpath refid="classpath"/>
</taskdef>
<!--taskdef name="torque-intake"
- classname="org.apache.turbine.torque.TorqueIntakeTask">
+ classname="org.apache.torque.task.TorqueIntakeTask">
<classpath refid="classpath"/>
</taskdef-->
<taskdef name="sql-xml"
- classname="org.apache.turbine.torque.TorqueSQLTransformTask">
+ classname="org.apache.torque.task.TorqueSQLTransformTask">
<classpath refid="classpath"/>
</taskdef>
1.1
jakarta-jetspeed/build/torque/conf/org/apache/velocity/runtime/defaults/velocity.properties
Index: velocity.properties
===================================================================
#----------------------------------------------------------------------------
# These are the default properties for the
# Velocity Runtime. These values are used when
# Runtime.init() is called, and when Runtime.init(properties)
# fails to find the specificed properties file.
#----------------------------------------------------------------------------
#----------------------------------------------------------------------------
# R U N T I M E L O G
#----------------------------------------------------------------------------
#----------------------------------------------------------------------------
# default LogSystem to use: default: AvalonLogSystem
#----------------------------------------------------------------------------
runtime.log.logsystem.class =
org.apache.velocity.runtime.log.AvalonLogSystem,org.apache.velocity.runtime.log.SimpleLog4JLogSystem
#---------------------------------------------------------------------------
# This is the location of the Velocity Runtime log.
#----------------------------------------------------------------------------
runtime.log = velocity.log
#----------------------------------------------------------------------------
# This controls if Runtime.error(), info() and warn() messages include the
# whole stack trace. The last property controls whether invalid references
# are logged.
#----------------------------------------------------------------------------
runtime.log.error.stacktrace = false
runtime.log.warn.stacktrace = false
runtime.log.info.stacktrace = false
runtime.log.invalid.reference = true
#----------------------------------------------------------------------------
# Configuration for the Log4JLogSystem.
# You must define the runtime.log.logsystem.class property to be:
# org.apache.velocity.runtime.log.Log4JLogSystem
#
# You must also include Log4J's .jar files into your classpath. They are
# included with the Velocity distribution in the build/lib directory.
#
# There are several different options that you can configure.
# Uncomment the ones that you want and also define their settings.
#----------------------------------------------------------------------------
#runtime.log.logsystem.log4j.pattern=%d - %m%n
#runtime.log.logsystem.log4j.file.size=100000
#runtime.log.logsystem.log4j.file.backups=1
#runtime.log.logsystem.log4j.syslogd.host=my.syslog.server.com
#runtime.log.logsystem.log4j.syslogd.facility=LOG_DAEMON
#runtime.log.logsystem.log4j.remote.host=my.remote.server.com
#runtime.log.logsystem.log4j.remote.port=1099
#runtime.log.logsystem.log4j.email.server=localhost
#runtime.log.logsystem.log4j.email.from=root@localhost
#runtime.log.logsystem.log4j.email.to=root@localhost
#runtime.log.logsystem.log4j.email.subject=Velocity Error Report
#runtime.log.logsystem.log4j.email.buffer.size=512
#----------------------------------------------------------------------------
# T E M P L A T E E N C O D I N G
#----------------------------------------------------------------------------
input.encoding=ISO-8859-1
output.encoding=ISO-8859-1
#----------------------------------------------------------------------------
# F O R E A C H P R O P E R T I E S
#----------------------------------------------------------------------------
# These properties control how the counter is accessed in the #foreach
# directive. By default the reference $velocityCount will be available
# in the body of the #foreach directive. The default starting value
# for this reference is 1.
#----------------------------------------------------------------------------
directive.foreach.counter.name = velocityCount
directive.foreach.counter.initial.value = 1
#----------------------------------------------------------------------------
# I N C L U D E P R O P E R T I E S
#----------------------------------------------------------------------------
# These are the properties that governed the way #include'd content
# is governed.
#----------------------------------------------------------------------------
directive.include.output.errormsg.start = <!-- include error :
directive.include.output.errormsg.end = see error log -->
#----------------------------------------------------------------------------
# P A R S E P R O P E R T I E S
#----------------------------------------------------------------------------
directive.parse.max.depth = 10
#----------------------------------------------------------------------------
# T E M P L A T E L O A D E R S
#----------------------------------------------------------------------------
#
#
#----------------------------------------------------------------------------
#resource.loader = file
#file.resource.loader.description = Velocity File Resource Loader
#file.resource.loader.class =
org.apache.velocity.runtime.resource.loader.FileResourceLoader
#file.resource.loader.path = .
#file.resource.loader.cache = false
#file.resource.loader.modificationCheckInterval = 2
#-------------------------------------------------------------
# custom jetspeed/dbpsml settings - start
#-------------------------------------------------------------
resource.loader = class
class.resource.loader.description = Velocity Classpath Resource Loader
class.resource.loader.class =
org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
#----------------------------------------------------------------------------
# VELOCIMACRO PROPERTIES
#----------------------------------------------------------------------------
# global : name of default global library. It is expected to be in the regular
# template path. You may remove it (either the file or this property) if
# you wish with no harm.
#----------------------------------------------------------------------------
velocimacro.library = VM_global_library.vm
velocimacro.permissions.allow.inline = true
velocimacro.permissions.allow.inline.to.replace.global = false
velocimacro.permissions.allow.inline.local.scope = false
velocimacro.context.localscope = false
#----------------------------------------------------------------------------
# INTERPOLATION
#----------------------------------------------------------------------------
# turn off and on interpolation of references and directives in string
# literals. ON by default :)
#----------------------------------------------------------------------------
runtime.interpolate.string.literals = true
#----------------------------------------------------------------------------
# RESOURCE MANAGEMENT
#----------------------------------------------------------------------------
# Allows alternative ResourceManager and ResourceCache implementations
# to be plugged in.
#----------------------------------------------------------------------------
resource.manager.class = org.apache.velocity.runtime.resource.ResourceManagerImpl
resource.manager.cache.class = org.apache.velocity.runtime.resource.ResourceCacheImpl
1.3 +2 -5 jakarta-jetspeed/build/torque/schema/dbpsml-schema.xml
Index: dbpsml-schema.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/build/torque/schema/dbpsml-schema.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dbpsml-schema.xml 27 Feb 2002 21:24:53 -0000 1.2
+++ dbpsml-schema.xml 5 Apr 2002 23:03:27 -0000 1.3
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1" standalone="no" ?>
-<!DOCTYPE app-data SYSTEM
+<!DOCTYPE database SYSTEM
"http://jakarta.apache.org/turbine/dtd/database.dtd";>
<!-- ==================================================================== -->
@@ -11,10 +11,8 @@
<!-- Author: Atul Dambalkar -->
<!-- ==================================================================== -->
-<app-data>
-<database defaultIdMethod="idbroker"
- basePeer="org.apache.turbine.om.peer.BasePeer" >
+<database defaultIdMethod="idbroker" >
<table name="JETSPEED_USER_PROFILE" idMethod="idbroker" >
@@ -100,4 +98,3 @@
</database>
-</app-data>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
