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 15:27:05 UTC
cvs commit: jakarta-turbine-tdk/src/tdk/apps/2/templates/app/navigations DefaultTop.vm
jvanzyl 01/10/10 06:27:05
Modified: . build-tomcat4.xml build.properties
src/tdk/apps/2/resources/ui/skins/default skin.props
src/tdk/apps/2/templates/app/navigations DefaultTop.vm
Added: src/tdk/apps/2 project-build.xml project.properties
src/tdk/apps/2/src/conf second-schema.xml third-schema.xml
Log:
- adding some additional schema files that are used to test the
multi-database capabilities of the tdk.
- making the sample app use the UI manager for creating
the img link in the navigation template. fixed the bug
with context path in 2.x that was causing the problem.
- separating out the properties for tomcat4 into it's own
file to match the small ant build file used for assembling
the tdk with tomcat. i would like to try some other servlet
containers soon.
Revision Changes Path
1.5 +1 -0 jakarta-turbine-tdk/build-tomcat4.xml
Index: build-tomcat4.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/build-tomcat4.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build-tomcat4.xml 2001/09/19 16:48:57 1.4
+++ build-tomcat4.xml 2001/10/10 13:27:05 1.5
@@ -5,6 +5,7 @@
<property file="${user.home}/build.properties" />
<property file="build.properties" />
+ <property file="build-tomcat4.properties"/>
<target name="main">
1.23 +0 -11 jakarta-turbine-tdk/build.properties
Index: build.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/build.properties,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- build.properties 2001/09/27 06:17:59 1.22
+++ build.properties 2001/10/10 13:27:05 1.23
@@ -48,17 +48,6 @@
tdk.flux3.home = ../jakarta-turbine-flux
# -------------------------------------------------------------------
-# T O M C A T P R O P E R T I E S
-# -------------------------------------------------------------------
-# These are container specific. How best to deal with containers
-# other than tomcat4.
-# -------------------------------------------------------------------
-
-tdk.tomcat.home = ../jakarta-tomcat-4.0
-tdk.tomcat.dist = ${tdk.tomcat.home}/dist
-tdk.tomcat.conf = ${tdk.tomcat.dist}/conf
-
-# -------------------------------------------------------------------
# D O C U M E N T A T I O N
# -------------------------------------------------------------------
1.1 jakarta-turbine-tdk/src/tdk/apps/2/project-build.xml
Index: project-build.xml
===================================================================
<?xml version="1.0"?>
<project name="project-build" default="init" basedir=".">
<property file="${user.home}/build.properties"/>
<property file="build.properties"/>
<property file="project.properties"/>
<target name="init">
<!--
<copy file="${tambora-system.jar}" todir="${build.webappRoot}/WEB-INF/lib"/>
-->
</target>
</project>
1.1 jakarta-turbine-tdk/src/tdk/apps/2/project.properties
Index: project.properties
===================================================================
# These are properties that are specific to this
# Turbine project.
1.2 +1 -1 jakarta-turbine-tdk/src/tdk/apps/2/resources/ui/skins/default/skin.props
Index: skin.props
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/src/tdk/apps/2/resources/ui/skins/default/skin.props,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- skin.props 2001/09/07 01:40:10 1.1
+++ skin.props 2001/10/10 13:27:05 1.2
@@ -19,7 +19,7 @@
# Images
alertImage = alert1.gif
-logo = tambora.gif
+logo = tdm.jpg
poweredByImage = powered_by_tambora.gif
line = line.gif
1.1 jakarta-turbine-tdk/src/tdk/apps/2/src/conf/second-schema.xml
Index: second-schema.xml
===================================================================
<!-- ==================================================================== -->
<!-- -->
<!-- T U R B I N E P R O J E C T S C H E M A -->
<!-- -->
<!-- ==================================================================== -->
<!-- This is an example Turbine project schema. -->
<!-- ==================================================================== -->
<database name="second">
<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>
1.1 jakarta-turbine-tdk/src/tdk/apps/2/src/conf/third-schema.xml
Index: third-schema.xml
===================================================================
<!-- ==================================================================== -->
<!-- -->
<!-- T U R B I N E P R O J E C T S C H E M A -->
<!-- -->
<!-- ==================================================================== -->
<!-- This is an example Turbine project schema. -->
<!-- ==================================================================== -->
<database name="third">
<table name="RDF3" 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.3 +2 -2 jakarta-turbine-tdk/src/tdk/apps/2/templates/app/navigations/DefaultTop.vm
Index: DefaultTop.vm
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/src/tdk/apps/2/templates/app/navigations/DefaultTop.vm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultTop.vm 2001/09/12 15:08:44 1.2
+++ DefaultTop.vm 2001/10/10 13:27:05 1.3
@@ -1,5 +1,5 @@
-$page.setBgColor("#ffffff")
+$page.setBgColor($ui.bgcolor)
-<img src="$content.getURI("images/tdm.jpg")">
+<img src="$ui.image($ui.logo)">
<hr>
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-tdk-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-tdk-dev-help@jakarta.apache.org