You are viewing a plain text version of this content. The canonical link for it is here.
Posted to tdk-dev@turbine.apache.org by mp...@apache.org on 2002/02/16 18:16:11 UTC
cvs commit: jakarta-turbine-tdk/src/tdk/apps/2/src/java/modules/screens Form.java Index.java
mpoeschl 02/02/16 09:16:11
Modified: src/tdk build.properties build.xml
src/tdk/apps/2 build.properties build.xml
src/tdk/apps/2/src/conf turbine-security.xml
src/tdk/apps/2/src/java/modules/actions SQL.java
src/tdk/apps/2/src/java/modules/screens Form.java Index.java
Log:
- use the decoupled torque
Revision Changes Path
1.11 +10 -1 jakarta-turbine-tdk/src/tdk/build.properties
Index: build.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/src/tdk/build.properties,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- build.properties 24 Sep 2001 16:49:49 -0000 1.10
+++ build.properties 16 Feb 2002 17:16:10 -0000 1.11
@@ -1,9 +1,18 @@
# -------------------------------------------------------------------------
# This is where you control the initial generation of the Turbine
-# sample webapp.
+# sample webapp.
# -------------------------------------------------------------------------
tdk.turbineVersion = @TURBINE_VERSION@
tdk.project = @PROJECT@
target.package = org.mycompany.newapp
target.directory = org/mycompany/newapp
+
+# database settings
+# db2400 | db2app | db2net | hypersonic | instantdb | mssql | mysql | oracle |
+# postgresql | sapdb | sybase | weblogic
+
+target.database = mysql
+databaseUser = user
+databasePassword = password
+databaseHost = localhost
1.25 +22 -4 jakarta-turbine-tdk/src/tdk/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/src/tdk/build.xml,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- build.xml 27 Dec 2001 12:06:39 -0000 1.24
+++ build.xml 16 Feb 2002 17:16:10 -0000 1.25
@@ -77,6 +77,7 @@
<antcall target="adjust-for-classic"/>
<antcall target="name-project-conf-files"/>
<antcall target="turbine-resources"/>
+ <antcall target="torque-resources"/>
<antcall target="message"/>
<antcall target="setup-webinf"/>
</target>
@@ -224,6 +225,8 @@
<target name="application-template">
+ <property file="${ancillary.dir}/torque/src/conf/database/${target.database}"/>
+
<filter token="PROJECT" value="${tdk.project}"/>
<filter token="TEMPLATE_PATH" value="${template.path}"/>
<filter token="OUTPUT_DIRECTORY" value="${output.directory}"/>
@@ -236,10 +239,10 @@
<filter token="CONF_DIR" value="${conf.dir}"/>
<filter token="TURBINE_VERSION" value="${tdk.turbineVersion}"/>
- <filter token="DATABASE" value="${database}"/>
- <filter token="DATABASE_DRIVER" value="${databaseDriver}"/>
- <filter token="DATABASE_URL" value="${databaseUrl}"/>
- <filter token="DATABASE_BUILD_URL" value="${build.databaseUrl}"/>
+ <filter token="DATABASE" value="${target.database}"/>
+ <filter token="DATABASE_DRIVER" value="${database.driver}"/>
+ <filter token="DATABASE_URL" value="${database.url}"/>
+ <filter token="DATABASE_BUILD_URL" value="${database.url}"/>
<filter token="DATABASE_USER" value="${databaseUser}"/>
<filter token="DATABASE_PASSWORD" value="${databasePassword}"/>
<filter token="DATABASE_HOST" value="${databaseHost}"/>
@@ -336,4 +339,19 @@
<property name="intake.descriptor" value="WEB-INF/conf/${tdk.project}-intake.xml"/>
</ant>
</target>
+
+ <!-- ================================================================= -->
+ <!-- T O R Q U E R E S O U R C E S P R O P E R T I E S -->
+ <!-- ================================================================= -->
+ <!-- This will dynamically generate the correct Torque.properties -->
+ <!-- file for this web application. -->
+ <!-- ================================================================= -->
+
+ <target name="torque-resources">
+ <copy file="${ancillary.dir}/torque/src/conf/master/Torque.master"
+ tofile="${abs.conf.dir}/Torque.template"/>
+ <copy file="${ancillary.dir}/torque/src/conf/build-torque.xml"
+ tofile="${abs.conf.dir}/../build/build-torque.xml"/>
+ </target>
+
</project>
1.13 +15 -6 jakarta-turbine-tdk/src/tdk/apps/2/build.properties
Index: build.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/src/tdk/apps/2/build.properties,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- build.properties 9 Oct 2001 22:41:41 -0000 1.12
+++ build.properties 16 Feb 2002 17:16:10 -0000 1.13
@@ -1,7 +1,7 @@
# -------------------------------------------------------------------
-#
+#
# P R O J E C T P R O P E R T I E S
-#
+#
# -------------------------------------------------------------------
tdk.turbineVersion = 2
@@ -24,22 +24,29 @@
deprecation = on
idTableDatabase = @PROJECT@
+# todo!!!
+lib.dir = ${build.webappRoot}/WEB-INF/lib
+torque.home = ${build.webappRoot}/WEB-INF
+outputDirectory = src
+schemaDirectory = conf
+
# -------------------------------------------------------------------
-#
+#
# D A T A B A S E S E T T I N G S
#
# -------------------------------------------------------------------
+database.name = @PROJECT@
database = @DATABASE@
databaseUrl = @DATABASE_URL@
-build.databaseUrl = @DATABASE_BUILD_URL@
+createDatabaseUrl = @DATABASE_BUILD_URL@
databaseDriver = @DATABASE_DRIVER@
databaseUser = @DATABASE_USER@
databasePassword = @DATABASE_PASSWORD@
databaseHost = @DATABASE_HOST@
# -------------------------------------------------------------------
-#
+#
# T O R Q U E C O N F I G U R A T I O N
#
# -------------------------------------------------------------------
@@ -47,6 +54,8 @@
# Peer-based object model is created.
# -------------------------------------------------------------------
+torque.buildFile=build-torque.xml
+
extend=TurbineMapBuilder
mapname=TurbineMap
suffix=MapBuilder
@@ -58,7 +67,7 @@
basePrefix=Base
# -------------------------------------------------------------------
-#
+#
# C O N T R O L T E M P L A T E S
#
# -------------------------------------------------------------------
1.32 +155 -234 jakarta-turbine-tdk/src/tdk/apps/2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/src/tdk/apps/2/build.xml,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- build.xml 23 Oct 2001 15:35:07 -0000 1.31
+++ build.xml 16 Feb 2002 17:16:10 -0000 1.32
@@ -5,7 +5,7 @@
<property file="${user.home}/build.properties"/>
<property file="build.properties"/>
<property file="project.properties"/>
-
+
<!-- This value is currently set as a property because
the top level tdk build.xml file runs the "init" target
as part of testing and texen doesn't obey the ${basedir}
@@ -24,10 +24,10 @@
<!-- D E P L O Y M E N T T A R G E T S -->
<!-- ================================================================ -->
- <target
+ <target
name="assemble-webapp-in-container"
depends="init">
-
+
<copy todir="${build.webappRoot}">
<fileset dir=".">
<include name="images/**"/>
@@ -49,7 +49,7 @@
<!-- Adjust the deployment descriptor from cvslayout mode
back to in-container mode. -->
-
+
<ant dir="${tdk.home}" target="deployment-descriptor">
<property name="app.root" value="webappContext"/>
<property name="app.properties" value="/WEB-INF/conf/TurbineResources.properties"/>
@@ -57,21 +57,21 @@
</target>
- <target
- name="deploy-war"
+ <target
+ name="deploy-war"
depends="assemble-webapp-in-container">
-
+
<jar jarfile="${tdk.project}.war">
<fileset dir="${tdk.home}/webapps">
<include name="${tdk.project}/**"/>
</fileset>
</jar>
- </target>
+ </target>
- <target
- name="deploy-container"
+ <target
+ name="deploy-container"
depends="assemble-webapp-in-container">
-
+
<mkdir dir="target/${tdk.project}"/>
<copy todir="target/${tdk.project}">
<fileset dir="${tdk.home}">
@@ -81,7 +81,7 @@
<exclude name="GETTING_STARTED.txt"/>
</fileset>
</copy>
-
+
<tar longfile="gnu" tarfile="${tdk.project}.tar">
<tarfileset dir="target" mode="755">
<include name="**/*.sh"/>
@@ -91,7 +91,7 @@
<exclude name="**/*.sh"/>
</tarfileset>
</tar>
-
+
<gzip zipfile="${tdk.project}.tar.gz" src="${tdk.project}.tar"/>
<zip zipfile="${tdk.project}.zip" basedir="target"/>
<delete file="${tdk.project}.tar"/>
@@ -103,10 +103,10 @@
<!-- Check that properties are defined correctly. -->
<!-- ================================================================ -->
- <target
- name="setup"
+ <target
+ name="setup"
unless="tdk.home">
-
+
<echo>
***
* ERROR : The 'tdk.home' property is not defined or
@@ -128,46 +128,18 @@
<!-- ================================================================ -->
<target name="init-tasks" depends="setup">
-
- <taskdef name="torque-datasql"
- classname="org.apache.turbine.torque.TorqueDataSQLTask">
- <classpath refid="classpath"/>
- </taskdef>
-
- <taskdef name="torque-sql"
- classname="org.apache.turbine.torque.TorqueSQLTask">
- <classpath refid="classpath"/>
- </taskdef>
-
- <taskdef name="torque-om"
- classname="org.apache.turbine.torque.TorqueObjectModelTask">
- <classpath refid="classpath"/>
- </taskdef>
-
- <taskdef name="torque-create-db"
- classname="org.apache.turbine.torque.TorqueCreateDatabase">
- <classpath refid="classpath"/>
- </taskdef>
- <taskdef name="sql-xml"
- classname="org.apache.turbine.torque.TorqueSQLTransformTask">
- <classpath refid="classpath"/>
- </taskdef>
-
- <taskdef name="texen"
+ <taskdef name="texen"
classname="org.apache.velocity.texen.ant.TexenTask">
<classpath refid="classpath"/>
</taskdef>
-
+
+<!--
<taskdef name="format-source"
classname="jstyle.FormatTask">
<classpath refid="classpath"/>
</taskdef>
-
- <taskdef name="sql-tdk"
- classname="org.apache.tdk.task.SQLExec">
- <classpath refid="classpath"/>
- </taskdef>
+-->
</target>
<!-- ================================================================ -->
@@ -177,11 +149,11 @@
<!-- your sources for you and compile them. -->
<!-- ================================================================ -->
- <target
+ <target
name="init"
depends="setup-webinf"
description="--> generates the full application">
-
+
<antcall target="create-database"/>
<antcall target="schema-sql"/>
<antcall target="idtable-init-sql"/>
@@ -198,38 +170,21 @@
<!-- Create the target database by executing a generated script -->
<!-- that is capable of performing the task. -->
<!-- ================================================================ -->
-
- <target
+
+ <target
name="create-database"
- depends="init-tasks,ext"
+ depends="init-tasks,ext"
unless="database.manual.creation"
description="--> generates the target database">
-
+
<property name="script" value="create-database.${ext}"/>
-
+
<echo message="${script}"/>
-
- <torque-create-db
- controlTemplate="sql/db-init/Control.vm"
- outputDirectory="${src.dir}/sql"
- templatePath="${templatePath}"
- outputFile="${script}"
- targetPlatform="${platform}"
- targetDatabase="${database}"
- databaseUser="${databaseUser}"
- databasePassword="${databasePassword}"
- databaseHost="${databaseHost}">
- <fileset dir="${conf.dir}">
- <include name="*-schema.xml"/>
- </fileset>
- </torque-create-db>
-
- <chmod file="${src.dir}/sql/${script}" perm="+x"/>
-
- <exec
- executable="${src.dir}/sql/${script}"
- failonerror="yes"
- />
+
+ <ant
+ antfile="${torque.buildFile}"
+ target="project-create-db-classpath">
+ </ant>
</target>
<!-- ================================================================ -->
@@ -238,32 +193,15 @@
<!-- -->
<!-- ================================================================ -->
- <target
- name="schema-sql"
+ <target
+ name="schema-sql"
depends="init-tasks"
description="--> generates the sql-script for your project">
- <echo>
- +------------------------------------------+
- | |
- | Generating SQL for YOUR Turbine project |
- | |
- +------------------------------------------+
- </echo>
-
- <torque-sql
- contextProperties="${build.properties}"
- controlTemplate="${SQLControlTemplate}"
- outputDirectory="${src.dir}/sql"
- templatePath="${templatePath}"
- outputFile="report.${tdk.project}.sql.generation"
- targetDatabase="${database}"
- sqldbmap="${src.dir}/sql/sqldb.map">
- <fileset dir="${conf.dir}">
- <include name="*-schema.xml"/>
- </fileset>
- </torque-sql>
-
+ <ant
+ antfile="${torque.buildFile}"
+ target="project-sql-classpath">
+ </ant>
</target>
<!-- ================================================================ -->
@@ -272,54 +210,31 @@
<!-- -->
<!-- ================================================================ -->
- <target
- name="idtable-init-sql"
- depends="init-tasks">
-
- <echo>
- +------------------------------------------+
- | |
- | Generating TURBINE initialization SQL |
- | for ID Broker system! |
- | |
- +------------------------------------------+
- </echo>
+ <target
+ name="idtable-init-sql">
- <torque-sql
- contextProperties="sql/id-table/turbine.props"
- controlTemplate="${idTableControlTemplate}"
- outputDirectory="${src.dir}/sql"
- templatePath="${templatePath}"
- outputFile="report.idtable.init.sql"
- targetDatabase="${database}"
- sqldbmap="${src.dir}/sql/sqldb.map"
- database="${idTableDatabase}"
- suffix="-idtable-init">
- <fileset dir="${conf.dir}">
- <include name="*-schema.xml"/>
- </fileset>
- </torque-sql>
+ <ant
+ antfile="${torque.buildFile}"
+ target="id-table-init-sql-classpath">
+ </ant>
</target>
- <target
+ <target
name="security-sql"
- depends="init-tasks"
unless="noSecuritySQL"
description="Creates SQL to initialize the security system.">
- <echo>
- +-----------------------------------------------+
- | |
- | Generating SQL from XML schemas |
- | |
- +-----------------------------------------------+
- </echo>
+ <taskdef
+ name="torque-datasql"
+ classname="org.apache.torque.task.TorqueDataSQLTask">
+ <classpath refid="classpath"/>
+ </taskdef>
<torque-datasql
contextProperties="${build.properties}"
controlTemplate="${DataSQLControlTemplate}"
outputDirectory="${src.dir}/sql"
- templatePath="${templatePath}"
+ useClasspath="true"
outputFile="turbine-security.sql"
xmlFile="${conf.dir}/turbine-schema.xml"
dataXmlFile="${conf.dir}/turbine-security.xml"
@@ -327,6 +242,12 @@
targetDatabase="${database}"
sqldbmap="${src.dir}/sql/sqldb.map"
/>
+<!--
+ <ant
+ antfile="${torque.buildFile}"
+ target="project-datasql">
+ </ant>
+-->
</target>
<!-- ================================================================ -->
@@ -336,31 +257,16 @@
<!-- These are in addition to the base Turbine OM! -->
<!-- ================================================================ -->
- <target
- name="project-om"
- depends="init-tasks"
+ <target
+ name="project-om"
unless="noObjectModel"
description="--> generates the peer-based object model for your project">
- <echo>
- +------------------------------------------+
- | |
- | Generating Peer-based Object Model for |
- | YOUR Turbine project! Woo hoo! |
- | |
- +------------------------------------------+
- </echo>
-
- <torque-om
- contextProperties="${build.properties}"
- controlTemplate="${OMControlTemplate}"
- outputDirectory="${src.dir}/java"
- templatePath="${templatePath}"
- outputFile="report.${tdk.project}.om.generation"
- targetPackage="${targetPackage}"
- xmlFile="${conf.dir}/${tdk.project}-schema.xml"
- />
-
+ <ant
+ antfile="${torque.buildFile}"
+ target="project-om-classpath">
+ </ant>
+
<!--
<format-source>
<fileset dir="${src.dir}/${targetDirectory}">
@@ -370,23 +276,30 @@
-->
</target>
-
+
<!-- ================================================================ -->
<!-- I N S E R T S I N G L E S Q L F I L E -->
<!-- ================================================================ -->
- <target
- name="setDatabaseUrl"
+ <target
+ name="setDatabaseUrl"
if="build.databaseUrl">
-
+
<property name="sqlInsert.databaseUrl" value="${build.databaseUrl}"/>
</target>
-
- <target
- name="insert-sql-files"
- depends="init-tasks,setDatabaseUrl">
-
+
+ <target
+ name="insert-sql-files"
+ depends="setDatabaseUrl">
+
<property name="sqlInsert.databaseUrl" value="${databaseUrl}"/>
+
+ <ant
+ antfile="${torque.buildFile}"
+ target="project-insert-sql">
+ </ant>
+
+<!--
<sql-tdk
driver="${databaseDriver}"
url="${sqlInsert.databaseUrl}"
@@ -398,15 +311,17 @@
srcDir="${src.dir}/sql">
<classpath refid="classpath"/>
</sql-tdk>
+-->
</target>
<!-- ================================================================ -->
<!-- U P D A T E T U R B I N E R E S O U R C E S P R O P S -->
<!-- ================================================================ -->
-
- <target
+
+ <target
name="update-tr-props">
-
+
+ <filter token="APPLICATION_ROOT" value="."/>
<filter token="DATABASE" value="${database}"/>
<filter token="DATABASE_DRIVER" value="${databaseDriver}"/>
<filter token="DATABASE_URL" value="${databaseUrl}"/>
@@ -415,32 +330,38 @@
<filter token="DATABASE_PASSWORD" value="${databasePassword}"/>
<filter token="DATABASE_HOST" value="${databaseHost}"/>
<filter token="DATABASE_DEFAULT" value="${tdk.project}"/>
-
+
<property name="database.descriptor" value="${master.conf.dir}/database/${database}"/>
<property name="database.name" value="${tdk.project}"/>
<property file="${database.descriptor}"/>
-
+
<filter token="DATABASE_ADAPTOR" value="${database.adaptor}"/>
-
- <copy
+
+ <copy
file="${conf.dir}/TurbineResources.template"
tofile="${conf.dir}/TurbineResources.properties"
overwrite="yes"
filtering="yes"
/>
+ <copy
+ file="${conf.dir}/Torque.template"
+ tofile="${conf.dir}/Torque.properties"
+ overwrite="yes"
+ filtering="yes"
+ />
</target>
<!-- =================================================================== -->
<!-- C O M P I L E -->
- <!-- =================================================================== -->
+ <!-- =================================================================== -->
<target
name="check-webinf-exists">
-
- <available
+
+ <available
property="webinf-exists"
file="${tdk.home}/webapps/${tdk.project}/WEB-INF"
- />
+ />
</target>
<!-- Setup the WEB-INF directory in the webapp if it already hasn't
@@ -450,22 +371,22 @@
name="setup-webinf"
depends="check-webinf-exists"
unless="webinf-exists">
-
+
<ant dir="${tdk.home}" target="setup-webinf"/>
<ant antfile="project-build.xml"/>
</target>
-
- <target
- name="compile"
- depends="setup,setup-webinf"
+
+ <target
+ name="compile"
+ depends="setup,setup-webinf"
description="--> compiles the source code">
-
+
<javac srcdir="${src.dir}/java"
destdir="${build.dest}"
debug="${debug}"
deprecation="${deprecation}"
optimize="${optimize}">
-
+
<classpath refid="classpath"/>
</javac>
</target>
@@ -475,33 +396,33 @@
<!-- ================================================================ -->
<target name="migrate-project">
- <taskdef
+ <taskdef
name="migrate"
classname="org.apache.tdk.task.transformer.SourceTransformer">
<classpath refid="classpath"/>
</taskdef>
-
+
<migrate
srcDir="${src.dir}/java"
targetDir="tmp"
descriptor="transformations.xml"
/>
-
+
</target>
-
+
<!-- ================================================================ -->
<!-- S C R U B I M P O R T S -->
<!-- ================================================================ -->
<target name="scrub-imports">
- <taskdef
+ <taskdef
name="scrub"
classname="net.sourceforge.importscrubber.ant.ImportScrubberTask">
<classpath refid="classpath"/>
</taskdef>
<property name="tmp.dir" value="tmp"/>
-
+
<!-- Make sure our tmp directory doesn't exist before we start -->
<delete dir="${tmp.dir}"/>
@@ -509,29 +430,29 @@
<copy todir="${tmp.dir}">
<fileset dir="${src.dir}/java"/>
</copy>
-
+
<!--
- Note that I compile the code with debug info first. This
- prevents the compiler from removing class references
+ Note that I compile the code with debug info first. This
+ prevents the compiler from removing class references
(i.e., by inlining static finals and such).
-->
-
- <javac
- deprecation="false"
- debug="true"
- optimize="false"
- srcdir="${tmp.dir}"
+
+ <javac
+ deprecation="false"
+ debug="true"
+ optimize="false"
+ srcdir="${tmp.dir}"
destdir="${tmp.dir}">
<classpath refid="classpath"/>
</javac>
<!-- Fully qualify the imports -->
- <scrub
- root="${tmp.dir}"
- format="nobreaks"
+ <scrub
+ root="${tmp.dir}"
+ format="nobreaks"
recurse="true"
/>
-
+
<!-- Get rid of the class files in our tmp directory -->
<delete>
<fileset dir="${tmp.dir}" includes="**/*.class"/>
@@ -546,72 +467,72 @@
<!-- ================================================================ -->
<!-- C L E A N -->
<!-- ================================================================ -->
-
- <target
- name="clean"
+
+ <target
+ name="clean"
description="--> cleans up the build directory">
-
+
<delete dir="${build.dest}"/>
<mkdir dir="${build.dest}"/>
</target>
<!-- =================================================================== -->
<!-- E X T E N S I O N F I N D E R -->
- <!-- =================================================================== -->
+ <!-- =================================================================== -->
<!-- Alleviate the user from having to type in the extension of scripts -->
<!-- for their target platform. Ant can do it just peachy. -->
- <!-- =================================================================== -->
+ <!-- =================================================================== -->
- <target
- name="ext"
+ <target
+ name="ext"
depends="set-os,windows-ext">
<echo message="Platform = ${platform}"/>
<echo message="Extension = ${ext}"/>
</target>
- <target
+ <target
name="set-os">
<property name="is${os.name}" value="true"/>
- </target>
- <target
- name="windows-ext"
- depends="unix-ext"
+ </target>
+ <target
+ name="windows-ext"
+ depends="unix-ext"
unless="ext">
<property name="platform" value="windows"/>
<property name="ext" value="bat"/>
</target>
- <target
- name="unix-ext"
- depends="set-unix"
+ <target
+ name="unix-ext"
+ depends="set-unix"
if="is.Unix">
<property name="platform" value="unix"/>
<property name="ext" value="sh"/>
</target>
- <target
- name="set-unix"
- depends="set-windows98"
+ <target
+ name="set-unix"
+ depends="set-windows98"
unless="is.Windows">
<property name="is.Unix" value="true" />
</target>
- <target
- name="set-windows98"
- depends="set-windowsNT"
+ <target
+ name="set-windows98"
+ depends="set-windowsNT"
if="isWindows 98">
<property name="is.Windows" value="true" />
</target>
- <target
- name="set-windowsNT"
- depends="set-windows2000"
+ <target
+ name="set-windowsNT"
+ depends="set-windows2000"
if="isWindows NT">
<property name="is.Windows" value="true" />
</target>
- <target
- name="set-windows2000"
- depends="set-windowsME"
+ <target
+ name="set-windows2000"
+ depends="set-windowsME"
if="isWindows 2000">
<property name="is.Windows" value="true" />
</target>
- <target
- name="set-windowsME"
+ <target
+ name="set-windowsME"
if="isWindows Me">
<property name="is.Windows" value="true" />
</target>
1.3 +12 -12 jakarta-turbine-tdk/src/tdk/apps/2/src/conf/turbine-security.xml
Index: turbine-security.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/src/tdk/apps/2/src/conf/turbine-security.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- turbine-security.xml 9 Oct 2001 22:41:41 -0000 1.2
+++ turbine-security.xml 16 Feb 2002 17:16:10 -0000 1.3
@@ -6,29 +6,29 @@
<TurbineGroup GroupId="1" GroupName="global"/>
- <!-- Roles -->
-
- <TurbineRole RoleId="1" RoleName="turbine_root"/>
- <TurbineRole RoleId="2" RoleName="Site Administrator"/>
-
<!-- Permissions -->
-
+
<TurbinePermission PermissionId="1" PermissionName="admin_users"/>
<TurbinePermission PermissionId="2" PermissionName="homepage_access"/>
+ <!-- Roles -->
+
+ <TurbineRole RoleId="1" RoleName="turbine_root"/>
+ <TurbineRole RoleId="2" RoleName="Site Administrator"/>
+
<!-- Associate Permissions with Roles -->
-
+
<TurbineRolePermission RoleId="1" PermissionId="1"/>
<TurbineRolePermission RoleId="1" PermissionId="2"/>
-
- <!-- Associate Users, Groups, and Roles -->
-
- <TurbineUserGroupRole UserId="1" GroupId="1" RoleId="1"/>
<!-- Users -->
<TurbineUser UserId="1" LoginName="turbine" PasswordValue="turbine" FirstName="turbine" LastName="turbine"/>
<TurbineUser UserId="2" LoginName="bbarker" PasswordValue="user1" FirstName="Bob" LastName="Barker"/>
<TurbineUser UserId="3" LoginName="mhall" PasswordValue="user2" FirstName="Monty" LastName="Hall"/>
-
+
+ <!-- Associate Users, Groups, and Roles -->
+
+ <TurbineUserGroupRole UserId="1" GroupId="1" RoleId="1"/>
+
</dataset>
1.2 +1 -1 jakarta-turbine-tdk/src/tdk/apps/2/src/java/modules/actions/SQL.java
Index: SQL.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/src/tdk/apps/2/src/java/modules/actions/SQL.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SQL.java 7 Sep 2001 01:40:09 -0000 1.1
+++ SQL.java 16 Feb 2002 17:16:11 -0000 1.2
@@ -57,8 +57,8 @@
import org.apache.velocity.context.Context;
import org.apache.turbine.util.RunData;
-import org.apache.turbine.util.db.Criteria;
import org.apache.turbine.modules.actions.VelocityAction;
+import org.apache.torque.util.Criteria;
import @TARGET_PACKAGE@.om.Rdf;
import @TARGET_PACKAGE@.om.RdfPeer;
1.2 +1 -1 jakarta-turbine-tdk/src/tdk/apps/2/src/java/modules/screens/Form.java
Index: Form.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/src/tdk/apps/2/src/java/modules/screens/Form.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Form.java 7 Sep 2001 01:40:10 -0000 1.1
+++ Form.java 16 Feb 2002 17:16:11 -0000 1.2
@@ -59,7 +59,7 @@
import org.apache.turbine.modules.screens.VelocityScreen;
import org.apache.turbine.util.RunData;
-import org.apache.turbine.util.db.Criteria;
+import org.apache.torque.util.Criteria;
import @TARGET_PACKAGE@.om.Rdf;
import @TARGET_PACKAGE@.om.RdfPeer;
1.2 +1 -1 jakarta-turbine-tdk/src/tdk/apps/2/src/java/modules/screens/Index.java
Index: Index.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/src/tdk/apps/2/src/java/modules/screens/Index.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Index.java 7 Sep 2001 01:40:10 -0000 1.1
+++ Index.java 16 Feb 2002 17:16:11 -0000 1.2
@@ -59,7 +59,7 @@
import org.apache.turbine.modules.screens.VelocityScreen;
import org.apache.turbine.util.RunData;
-import org.apache.turbine.util.db.Criteria;
+import org.apache.torque.util.Criteria;
import @TARGET_PACKAGE@.om.RdfPeer;
import org.apache.velocity.context.Context;
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>