head	1.4;
access;
symbols
	TIGRIS_1_1_0RC2:1.3
	TIGRIS_1_1_0RC1:1.3
	TIGRIS_1_1:1.3.0.10
	TIGRIS_1_0_8:1.3
	TIGRIS_1_0_8RC3:1.3
	TIGRIS_1_0_8RC2:1.3
	TIGRIS_1_0_8RC1:1.3
	TIGRIS_1_0_7:1.3
	TIGRIS_1_0_7RC3:1.3
	TIGRIS_1_0_7RC2:1.3
	TIGRIS_1_0_7RC1:1.3
	TIGRIS_1_0_6:1.3
	TIGRIS_1_0_6RC5:1.3
	TIGRIS_1_0_6RC4:1.3
	TIGRIS_1_0_6RC3:1.3
	TIGRIS_1_0_6RC2:1.3
	TIGRIS_1_0_6RC1:1.3
	TIGRIS_1_0_5:1.3
	TIGRIS_1_0_5RC6:1.3
	TIGRIS_1_0_5RC5:1.3
	TIGRIS_1_0_5RC4:1.3
	TIGRIS_1_0_5RC3:1.3
	TIGRIS_1_0_5RC2:1.3
	TIGRIS_1_0_5RC1:1.3
	TIGRIS_1_0_4:1.3
	TIGRIS_1_0_3:1.3
	TIGRIS_1_0_2:1.3
	TIGRIS_1_0_1:1.3
	TIGRIS_1_0:1.3.0.12
	TIGRIS_1_0_0:1.3
	TIGRIS_1_0_0_RC1:1.3.0.8
	dlr:1.1.1
	TIGRIS_0_9_2_4:1.3
	TIGRIS_0_9_2_3:1.3
	HELM_PEER_PORT_BRANCH:1.1.1.1
	TURBINE_PEER:1.3
	TIGRIS_0_9_2_1:1.3
	TIGRIS_0_9_2:1.3.0.6
	TIGRIS_0_9_0:1.3.0.4
	TIGRIS_0_8_4:1.3.0.2
	NEWHELM:1.1.1.1
	TIGRIS_NOV_12_2000:1.1.1
	OLDHELM:1.2.0.4
	TIGRIS_NOV_11_2000:1.2
	TIGRIS_SEP_13_2000:1.2.0.2
	TIGRIS_BASELINE:1.2;
locks; strict;
comment	@# @;


1.4
date	2001.05.23.02.04.15;	author dlr;	state dead;
branches;
next	1.3;

1.3
date	2000.11.12.22.57.35;	author dlr;	state Exp;
branches;
next	1.2;

1.2
date	2000.03.25.23.54.29;	author jrobbins;	state Exp;
branches;
next	1.1;

1.1
date	2000.02.02.05.23.12;	author jrobbins;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	2000.11.12.21.18.26;	author dlr;	state Exp;
branches;
next	;


desc
@@


1.4
log
@Removed WM templates in favor of Velocity templates.
@
text
@<!-- Servlet-Specific Content -->
<!-- project-specific header -->
#if ($joistFileUtil.fileExists("$projectDocRoot;/project_header.html"))
{
#include "$projectDocRoot;/project_header.html"
}
<!-- end project-specific header -->

#if ($joistFileUtil.fileExists("$projectDocRoot;/$page"))
{
#include "$projectDocRoot;/$page"
}

<!-- project-specific footer -->
#if ($joistFileUtil.fileExists("$projectDocRoot;/project_footer.html"))
{
#include "$projectDocRoot;/project_footer.html"
}
<!-- end project-specific footer -->
<!-- End Servlet-Specific Content -->
@


1.3
log
@Resolved merge conflicts.
@
text
@@


1.2
log
@added #include statements to put in project_header.html and project_footer.html
@
text
@d3 2
d6 1
d9 2
d12 1
d15 2
d18 1
@


1.1
log
@iniital checkin
@
text
@d1 5
a5 1
<!-- Servlet-Specific Help -->
d7 5
@


1.1.1.1
log
@Merging newhelm tree into helm, as per IZ issue #557.  Previous major version of helm is tagged TIGRIS_NOV_11_2000.
@
text
@d1 1
a1 10
<!-- Servlet-Specific Content -->
<!-- project-specific header -->
#if ($joistFileUtil.fileExists("$projectDocRoot;/project_header.html"))
{
#include "$projectDocRoot;/project_header.html"
}
<!-- end project-specific header -->

#if ($joistFileUtil.fileExists("$projectDocRoot;/$page"))
{
a2 9
}

<!-- project-specific footer -->
#if ($joistFileUtil.fileExists("$projectDocRoot;/project_footer.html"))
{
#include "$projectDocRoot;/project_footer.html"
}
<!-- end project-specific footer -->
<!-- End Servlet-Specific Content -->
@


