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 jv...@apache.org on 2001/10/10 00:41:41 UTC
cvs commit: jakarta-turbine-tdk/src/tdk/apps/2/src/conf project-schema.xml turbine-security.xml project-intake.xml
jvanzyl 01/10/09 15:41:41
Modified: . build-turbine2.xml build.xml
profile t2-tc4-mysql.profile
src/tdk build.xml
src/tdk/apps/2 build.properties build.xml
src/tdk/apps/2/src/conf project-schema.xml
turbine-security.xml
Removed: src/tdk/apps/2/src/conf project-intake.xml
Log:
- starting to check in the slew of changes i've made over the last
couple of weeks. none of the changes for the 2.x app will work
until the torque changes are checked in. no one can build the
the tdk anyway but at least i'll push the changes through.
Revision Changes Path
1.6 +0 -5 jakarta-turbine-tdk/build-turbine2.xml
Index: build-turbine2.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/build-turbine2.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build-turbine2.xml 2001/09/19 16:48:57 1.5
+++ build-turbine2.xml 2001/10/09 22:41:41 1.6
@@ -25,11 +25,6 @@
file="${tdk.turbine2.home}/conf/master/turbine-schema.xml"
/>
- <copy
- todir="${tdk.app2.template.dir}/src/conf"
- file="${tdk.torque.home}/src/schema/id-table-schema.xml"
- />
-
<copy todir="${tdk.ancillary2.dir}/src/conf/database">
<fileset dir="${tdk.torque.home}/src/conf/database"/>
</copy>
1.28 +1 -0 jakarta-turbine-tdk/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/build.xml,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- build.xml 2001/10/02 19:17:24 1.27
+++ build.xml 2001/10/09 22:41:41 1.28
@@ -197,6 +197,7 @@
<pathelement location="${digester.jar}"/>
<pathelement location="${oro.jar}"/>
<pathelement location="${velocity.jar}"/>
+ <pathelement location="${commons-util.jar}"/>
</path>
<target
1.7 +2 -2 jakarta-turbine-tdk/profile/t2-tc4-mysql.profile
Index: t2-tc4-mysql.profile
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/profile/t2-tc4-mysql.profile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- t2-tc4-mysql.profile 2001/09/25 03:00:20 1.6
+++ t2-tc4-mysql.profile 2001/10/09 22:41:41 1.7
@@ -9,8 +9,8 @@
tdk.servletContainer = tomcat4
database = mysql
databaseUrl = jdbc:mysql://127.0.0.1/${tdk.project}
-build.databaseUrl = jdbc:mysql://127.0.0.1/${tdk.project}
-test.databaseUrl = jdbc:mysql://127.0.0.1/${tdk.project}
+build.databaseUrl = jdbc:mysql://127.0.0.1/@DB@
+test.databaseUrl = jdbc:mysql://127.0.0.1/@DB@
databaseDriver = org.gjt.mm.mysql.Driver
databaseUser = turbine
databasePassword = turbine
1.22 +11 -6 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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- build.xml 2001/09/27 15:42:38 1.21
+++ build.xml 2001/10/09 22:41:41 1.22
@@ -109,8 +109,18 @@
file="${tdk.home}/webapps/${tdk.project}/build.xml"
todir="${tdk.home}/webapps/${tdk.project}/WEB-INF/build"
/>
+
+ <move
+ file="${tdk.home}/webapps/${tdk.project}/project.properties"
+ todir="${tdk.home}/webapps/${tdk.project}/WEB-INF/build"
+ />
<move
+ file="${tdk.home}/webapps/${tdk.project}/project-build.xml"
+ todir="${tdk.home}/webapps/${tdk.project}/WEB-INF/build"
+ />
+
+ <move
file="${tdk.home}/webapps/${tdk.project}/GETTING_STARTED.txt"
todir="${tdk.home}/webapps/${tdk.project}/WEB-INF/build"
/>
@@ -140,11 +150,6 @@
file="${app.conf}/project-schema.xml"
tofile="${app.conf}/${tdk.project}-schema.xml"
/>
-
- <move
- file="${app.conf}/project-intake.xml"
- tofile="${app.conf}/${tdk.project}-intake.xml"
- />
</target>
<target name="message">
@@ -240,7 +245,7 @@
<filter token="DATABASE_USER" value="${databaseUser}"/>
<filter token="DATABASE_PASSWORD" value="${databasePassword}"/>
<filter token="DATABASE_HOST" value="${databaseHost}"/>
- <filter token="DATABASE_DEFAULT" value="default"/>
+ <filter token="DATABASE_DEFAULT" value="${tdk.project}"/>
<copy todir="${app.home}" filtering="yes">
<fileset dir="${app.src}">
1.12 +1 -0 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- build.properties 2001/09/27 06:16:16 1.11
+++ build.properties 2001/10/09 22:41:41 1.12
@@ -22,6 +22,7 @@
debug = on
optimize = off
deprecation = on
+idTableDatabase = @PROJECT@
# -------------------------------------------------------------------
#
1.27 +114 -308 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.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- build.xml 2001/09/27 15:48:36 1.26
+++ build.xml 2001/10/09 22:41:41 1.27
@@ -4,6 +4,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
@@ -24,38 +25,6 @@
</path>
<!-- ================================================================ -->
- <!-- S E C U R I T Y -->
- <!-- ================================================================ -->
-
- <target
- name="turbine-security-sql"
- depends="init-tasks"
- description="Creates SQL to initialize the security system.">
-
- <echo>
- +-----------------------------------------------+
- | |
- | Generating SQL from data XML ! |
- | Woo hoo! |
- | |
- +-----------------------------------------------+
- </echo>
-
- <torque-datasql
- contextProperties="${build.properties}"
- controlTemplate="${DataSQLControlTemplate}"
- outputDirectory="${src.dir}/sql"
- templatePath="${templatePath}"
- outputFile="turbine-security.sql"
- xmlFile="${conf.dir}/turbine-schema.xml"
- dataXmlFile="${conf.dir}/turbine-security.xml"
- dataDTD="${conf.dir}/turbine-security.dtd"
- databaseName="${databaseName}"
- targetDatabase="${database}"
- />
- </target>
-
- <!-- ================================================================ -->
<!-- D E P L O Y M E N T T A R G E T S -->
<!-- ================================================================ -->
@@ -63,7 +32,6 @@
name="assemble-webapp-in-container"
depends="init">
- <echo message="${build.webappRoot}"/>
<copy todir="${build.webappRoot}">
<fileset dir=".">
<include name="images/**"/>
@@ -71,17 +39,26 @@
<include name="templates/**"/>
</fileset>
</copy>
-
+
+ <copy todir="${build.webappRoot}/WEB-INF">
+ <fileset dir=".">
+ <include name="setup/**"/>
+ </fileset>
+ </copy>
+
<!-- Move the application configuration files into position. -->
<copy todir="${build.webappRoot}/WEB-INF/conf">
<fileset dir="src/conf"/>
- </copy>
-
- <!-- Move the application specific JARs into position -->
- <copy todir="${build.webappRoot}/WEB-INF/lib">
- <fileset dir="lib/**"/>
</copy>
-
+
+ <!-- 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"/>
+ </ant>
+
</target>
<target
@@ -130,18 +107,21 @@
<!-- Check that properties are defined correctly. -->
<!-- ================================================================ -->
- <target name="setup" unless="tdk.home">
- <echo>
- ***
- * ERROR : The 'tdk.home' property is not defined or
- * is pointing to an invalid directory.
- *
- * In your personal build.properties define tdk.home to
- * point to an absolute path where your tdk is installed.
- * Example: tdk.home=${user.home}/tdk
- ***
- </echo>
- <fail message="ERROR: tdk.home not defined properly: ${tdk.home}"/>
+ <target
+ name="setup"
+ unless="tdk.home">
+
+ <echo>
+ ***
+ * ERROR : The 'tdk.home' property is not defined or
+ * is pointing to an invalid directory.
+ *
+ * In your personal build.properties define tdk.home to
+ * point to an absolute path where your tdk is installed.
+ * Example: tdk.home=${user.home}/tdk
+ ***
+ </echo>
+ <fail message="ERROR: tdk.home not defined properly: ${tdk.home}"/>
</target>
<!-- ================================================================ -->
@@ -202,37 +182,19 @@
<!-- ================================================================ -->
<target
- name="init"
+ name="init"
+ depends="setup-webinf"
description="--> generates the full application">
<antcall target="create-database"/>
- <antcall target="turbine-sql"/>
- <antcall target="turbine-id-table-sql"/>
- <antcall target="turbine-id-table-init-sql"/>
- <antcall target="turbine-security-sql"/>
- <antcall target="turbine-insert-sql"/>
+ <antcall target="schema-sql"/>
+ <antcall target="idtable-init-sql"/>
+ <antcall target="security-sql"/>
+ <antcall target="insert-sql-files"/>
<antcall target="update-tr-props"/>
- <antcall target="project"/>
- <!-- <antcall target="compile-tests"/> -->
- </target>
-
- <!-- ================================================================ -->
- <!-- P R O J E C T -->
- <!-- ================================================================ -->
- <!-- This target runs all the targets required when changes -->
- <!-- are made to the project XML database schema. -->
- <!-- ================================================================ -->
-
- <target
- name="project"
- description="--> run when XML schema is changed">
-
- <antcall target="project-sql"/>
- <antcall target="project-id-table-init-sql"/>
- <antcall target="project-insert-sql"/>
<antcall target="project-om"/>
<antcall target="compile"/>
- </target>
+ </target>
<!-- ================================================================ -->
<!-- C R E A T E T A R G E T D A T A B A S E -->
@@ -253,7 +215,6 @@
<torque-create-db
controlTemplate="sql/db-init/Control.vm"
- xmlFile="${conf.dir}/${tdk.project}-schema.xml"
outputDirectory="${src.dir}/sql"
templatePath="${templatePath}"
outputFile="${script}"
@@ -261,8 +222,11 @@
targetDatabase="${database}"
databaseUser="${databaseUser}"
databasePassword="${databasePassword}"
- databaseHost="${databaseHost}"
- />
+ databaseHost="${databaseHost}">
+ <fileset dir="${conf.dir}">
+ <include name="*-schema.xml"/>
+ </fileset>
+ </torque-create-db>
<chmod file="${src.dir}/sql/${script}" perm="+x"/>
@@ -270,27 +234,23 @@
executable="${src.dir}/sql/${script}"
failonerror="yes"
/>
-
</target>
<!-- ================================================================ -->
- <!-- G E N E R A T E P R O J E C T S Q L -->
+ <!-- -->
+ <!-- G E N E R A T E T A B L E S Q L -->
+ <!-- -->
<!-- ================================================================ -->
- <!-- Generate the SQL for your project, these are in addition -->
- <!-- to the base Turbine tables! The tables you require for your -->
- <!-- project should be specified in project-schema.xml. -->
- <!-- ================================================================ -->
<target
- name="project-sql"
+ name="schema-sql"
depends="init-tasks"
description="--> generates the sql-script for your project">
<echo>
+------------------------------------------+
| |
- | Generating SQL for YOUR Turbine project! |
- | Woo hoo! |
+ | Generating SQL for YOUR Turbine project |
| |
+------------------------------------------+
</echo>
@@ -301,200 +261,120 @@
outputDirectory="${src.dir}/sql"
templatePath="${templatePath}"
outputFile="report.${tdk.project}.sql.generation"
- xmlFile="${conf.dir}/${tdk.project}-schema.xml"
targetDatabase="${database}"
- />
-
- </target>
-
- <!-- ================================================================ -->
- <!-- G E N E R A T E P R O J E C T P E E R B A S E D O M -->
- <!-- ================================================================ -->
- <!-- Generate the Peer-based object model for your project. -->
- <!-- These are in addition to the base Turbine OM! -->
- <!-- ================================================================ -->
-
- <target
- name="project-om"
- depends="init-tasks"
- 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"
- />
-
- <!--
- <format-source>
- <fileset dir="${src.dir}/${targetDirectory}">
- <include name="**/*.java"/>
+ sqldbmap="${src.dir}/sql/sqldb.map">
+ <fileset dir="${conf.dir}">
+ <include name="*-schema.xml"/>
</fileset>
- </format-source>
- -->
+ </torque-sql>
</target>
-
- <!-- ================================================================ -->
- <!-- G E N E R A T E T U R B I N E S Q L -->
- <!-- ================================================================ -->
- <!-- Generate the SQL required for the Turbine base system. -->
- <!-- You will probably do this once for your development, but -->
- <!-- may do this repeatedly when you deploy and want your app -->
- <!-- app to run with multiple DBs. -->
- <!-- ================================================================ -->
-
- <target
- name="turbine-sql"
- depends="init-tasks"
- description="--> generates the sql-script for the Turbine base system">
- <echo>
- +------------------------------------------+
- | |
- | Generating SQL for Turbine base system! |
- | |
- +------------------------------------------+
- </echo>
-
- <torque-sql
- controlTemplate="${SQLControlTemplate}"
- outputDirectory="${src.dir}/sql"
- templatePath="${templatePath}"
- outputFile="turbine-schema.sql"
- xmlFile="${conf.dir}/turbine-schema.xml"
- targetDatabase="${database}"
- />
- </target>
-
- <!-- ================================================================ -->
- <!-- G E N E R A T E P R O J E C T S Q L -->
<!-- ================================================================ -->
- <!-- Generate the SQL for your project, these are in addition -->
- <!-- to the base Turbine tables! The tables you require for your -->
- <!-- project should be specified in project-schema.xml. -->
+ <!-- -->
+ <!-- G E N E R A T E I D B R O K E R I N I T S Q L -->
+ <!-- -->
<!-- ================================================================ -->
<target
- name="turbine-id-table-sql"
+ name="idtable-init-sql"
depends="init-tasks">
<echo>
+------------------------------------------+
| |
- | Generating SQL for YOUR Turbine project! |
- | Woo hoo! |
+ | Generating TURBINE initialization SQL |
+ | for ID Broker system! |
| |
+------------------------------------------+
</echo>
<torque-sql
- controlTemplate="${SQLControlTemplate}"
+ contextProperties="sql/id-table/turbine.props"
+ controlTemplate="${idTableControlTemplate}"
outputDirectory="${src.dir}/sql"
templatePath="${templatePath}"
- outputFile="turbine-id-table-schema.sql"
- xmlFile="${conf.dir}/id-table-schema.xml"
+ 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>
</target>
- <!-- ================================================================ -->
- <!-- G E N E R A T E T U R B I N E I D B R O K E R I N I T S Q L -->
- <!-- ================================================================ -->
-
<target
- name="turbine-id-table-init-sql"
- depends="init-tasks">
+ name="security-sql"
+ depends="init-tasks"
+ unless="noSecuritySQL"
+ description="Creates SQL to initialize the security system.">
<echo>
- +------------------------------------------+
- | |
- | Generating TURBINE initialization SQL |
- | for ID Broker system! |
- | |
- +------------------------------------------+
+ +-----------------------------------------------+
+ | |
+ | Generating SQL from XML schemas |
+ | |
+ +-----------------------------------------------+
</echo>
- <torque-sql
- contextProperties="sql/id-table/turbine.props"
- controlTemplate="${idTableControlTemplate}"
+ <torque-datasql
+ contextProperties="${build.properties}"
+ controlTemplate="${DataSQLControlTemplate}"
outputDirectory="${src.dir}/sql"
templatePath="${templatePath}"
- outputFile="turbine-id-table-init.sql"
+ outputFile="turbine-security.sql"
xmlFile="${conf.dir}/turbine-schema.xml"
+ dataXmlFile="${conf.dir}/turbine-security.xml"
+ dataDTD="${conf.dir}/turbine-security.dtd"
targetDatabase="${database}"
+ sqldbmap="${src.dir}/sql/sqldb.map"
/>
</target>
<!-- ================================================================ -->
- <!-- G E N E R A T E P R O J E C T I D B R O K E R I N I T S Q L -->
+ <!-- G E N E R A T E P R O J E C T P E E R B A S E D O M -->
+ <!-- ================================================================ -->
+ <!-- Generate the Peer-based object model for your project. -->
+ <!-- These are in addition to the base Turbine OM! -->
<!-- ================================================================ -->
<target
- name="project-id-table-init-sql"
- depends="init-tasks">
+ name="project-om"
+ depends="init-tasks"
+ unless="noObjectModel"
+ description="--> generates the peer-based object model for your project">
<echo>
+------------------------------------------+
| |
- | Generating PROJECT initialization SQL |
- | for ID Broker system! |
+ | Generating Peer-based Object Model for |
+ | YOUR Turbine project! Woo hoo! |
| |
+------------------------------------------+
</echo>
-
- <torque-sql
- contextProperties="sql/id-table/project.props"
- controlTemplate="${idTableControlTemplate}"
+
+ <torque-om
+ contextProperties="${build.properties}"
+ controlTemplate="${OMControlTemplate}"
+ outputDirectory="${src.dir}/java"
templatePath="${templatePath}"
- outputDirectory="${src.dir}/sql"
- outputFile="${tdk.project}-id-table-init.sql"
+ outputFile="report.${tdk.project}.om.generation"
+ targetPackage="${targetPackage}"
xmlFile="${conf.dir}/${tdk.project}-schema.xml"
- targetDatabase="${database}"
/>
- </target>
-
- <!-- ================================================================ -->
- <!-- I N S E R T T U R B I N E S Q L -->
- <!-- ================================================================ -->
-
- <target
- name="turbine-insert-sql"
- description="--> insert turbine sql">
+
+ <!--
+ <format-source>
+ <fileset dir="${src.dir}/${targetDirectory}">
+ <include name="**/*.java"/>
+ </fileset>
+ </format-source>
+ -->
- <antcall target="insert-sql-files">
- <param name="dir" value="${src.dir}/sql"/>
- <param name="include" value="turbine*.sql"/>
- </antcall>
</target>
-
- <!-- ================================================================ -->
- <!-- I N S E R T P R O J E C T S Q L -->
- <!-- ================================================================ -->
- <target
- name="project-insert-sql"
- description="--> insert project sql">
-
- <antcall target="insert-sql-files">
- <param name="dir" value="${src.dir}/sql"/>
- <param name="include" value="${tdk.project}*.sql"/>
- </antcall>
- </target>
-
<!-- ================================================================ -->
<!-- I N S E R T S I N G L E S Q L F I L E -->
<!-- ================================================================ -->
@@ -510,9 +390,6 @@
name="insert-sql-files"
depends="init-tasks,setDatabaseUrl">
- <echo message="SQL Directory ---------> ${dir}"/>
- <echo message="SQL Include ---------> ${include}"/>
-
<property name="sqlInsert.databaseUrl" value="${databaseUrl}"/>
<sql-tdk
driver="${databaseDriver}"
@@ -520,11 +397,10 @@
userid="${databaseUser}"
password="${databasePassword}"
autocommit="true"
- onerror="continue">
+ onerror="continue"
+ sqldbmap="${src.dir}/sql/sqldb.map"
+ srcDir="${src.dir}/sql">
<classpath refid="classpath"/>
- <fileset dir="${dir}">
- <include name="${include}"/>
- </fileset>
</sql-tdk>
</target>
@@ -532,12 +408,6 @@
<!-- 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 -->
<!-- ================================================================ -->
- <!-- This is a bit hacky but it makes sure that the user
- only has to edit the project properties file. So
- they don't have to edit the TR.props as well. I will
- unify this in a less hack-ass manner next round :-)
- -->
-
<target
name="update-tr-props">
@@ -586,6 +456,7 @@
unless="webinf-exists">
<ant dir="${tdk.home}" target="setup-webinf"/>
+ <ant antfile="project-build.xml"/>
</target>
<target
@@ -603,40 +474,6 @@
</javac>
</target>
- <!-- =================================================================== -->
- <!-- C O M P I L E T E S T S -->
- <!-- =================================================================== -->
-
- <target
- name="compile-tests"
- depends="setup"
- description="--> compiles the test code">
-
- <javac srcdir="${test.src.dir}"
- destdir="${build.dest}"
- debug="${debug}"
- deprecation="${deprecation}"
- optimize="${optimize}">
- <classpath refid="classpath"/>
- </javac>
- </target>
-
- <!-- =================================================================== -->
- <!-- T E S T -->
- <!-- =================================================================== -->
-
- <target
- name="test"
- depends="setup"
- description="--> runs the tests">
-
- <junit printsummary="yes" >
- <formatter type="plain" />
- <classpath refid="classpath"/>
- <test name="org.apache.turbine.test.TestLoginLogout"/>
- </junit>
- </target>
-
<!-- ================================================================ -->
<!-- C L E A N -->
<!-- ================================================================ -->
@@ -647,37 +484,6 @@
<delete dir="${build.dest}"/>
<mkdir dir="${build.dest}"/>
- </target>
-
- <!-- =================================================================== -->
- <!-- S Q L -> X M L -->
- <!-- =================================================================== -->
- <!-- inputFile: The input sql file. This must be valid sql file but -->
- <!-- it not not be in any specific format. -->
- <!-- outputFile: The file where the xml schema will be written -->
- <!-- =================================================================== -->
-
- <target
- name="sql2xml">
-
- <sql-xml
- inputFile="${conf.dir}/schema.sql"
- outputFile="${conf.dir}/schema.xml"
- />
- </target>
-
- <!-- =================================================================== -->
- <!-- J A R -->
- <!-- =================================================================== -->
-
- <target
- name="jar"
- depends="compile">
-
- <jar jarfile="../${final.name}.jar"
- basedir="${build.dest}"
- excludes="**/package.html"
- />
</target>
<!-- =================================================================== -->
1.4 +10 -22 jakarta-turbine-tdk/src/tdk/apps/2/src/conf/project-schema.xml
Index: project-schema.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/src/tdk/apps/2/src/conf/project-schema.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project-schema.xml 2001/09/26 20:22:22 1.3
+++ project-schema.xml 2001/10/09 22:41:41 1.4
@@ -6,25 +6,13 @@
<!-- This is an example Turbine project schema. -->
<!-- ==================================================================== -->
-<app-data>
- <database name="@PROJECT@">
- <table name="RDF" idMethod="idbroker">
- <column name="RDF_ID" required="true" primaryKey="true" type="INTEGER"/>
- <column name="TITLE" size="255" type="VARCHAR"/>
- <column name="BODY" size="255" type="VARCHAR"/>
- <column name="URL" size="255" type="VARCHAR"/>
- <column name="AUTHOR" size="255" type="VARCHAR"/>
- <column name="DEPT" size="255" type="VARCHAR"/>
- </table>
- </database>
- <database name="@PROJECT@2">
- <table name="RDF2" idMethod="idbroker">
- <column name="RDF_ID" required="true" primaryKey="true" type="INTEGER"/>
- <column name="TITLE" size="255" type="VARCHAR"/>
- <column name="BODY" size="255" type="VARCHAR"/>
- <column name="URL" size="255" type="VARCHAR"/>
- <column name="AUTHOR" size="255" type="VARCHAR"/>
- <column name="DEPT" size="255" type="VARCHAR"/>
- </table>
- </database>
-</app-data>
+<database name="@PROJECT@">
+ <table name="RDF" idMethod="idbroker">
+ <column name="RDF_ID" required="true" primaryKey="true" type="INTEGER"/>
+ <column name="TITLE" size="255" type="VARCHAR"/>
+ <column name="BODY" size="255" type="VARCHAR"/>
+ <column name="URL" size="255" type="VARCHAR"/>
+ <column name="AUTHOR" size="255" type="VARCHAR"/>
+ <column name="DEPT" size="255" type="VARCHAR"/>
+ </table>
+</database>
1.2 +13 -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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- turbine-security.xml 2001/09/27 06:23:10 1.1
+++ turbine-security.xml 2001/10/09 22:41:41 1.2
@@ -2,26 +2,20 @@
<!DOCTYPE dataset SYSTEM "file://turbine-security.dtd">
<dataset name="all">
- <!-- 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"/>
-
<!-- Groups -->
<TurbineGroup GroupId="1" GroupName="global"/>
-
- <!-- 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"/>
+
+ <!-- Permissions -->
+ <TurbinePermission PermissionId="1" PermissionName="admin_users"/>
+ <TurbinePermission PermissionId="2" PermissionName="homepage_access"/>
+
<!-- Associate Permissions with Roles -->
<TurbineRolePermission RoleId="1" PermissionId="1"/>
@@ -30,4 +24,11 @@
<!-- 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"/>
+
</dataset>
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-tdk-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-tdk-dev-help@jakarta.apache.org