--- src/etc/apps-127.0.0.1.xml.orig	Sun Sep 23 17:48:15 2001
+++ src/etc/apps-127.0.0.1.xml	Tue Sep 25 08:23:54 2001
@@ -8,9 +8,9 @@
     <!--
     <Host name="127.0.0.1" >
         <Context path="" 
-                 docBase="webapps/examples" />
+                 docBase="@@@TCINST@@@webapps/examples" />
         <Context path="/examples" 
-                 docBase="webapps/ROOT" />
+                 docBase="@@@TCINST@@@webapps/ROOT" />
     </Host>
     -->
 
--- src/etc/apps-admin.xml.orig	Sun Sep 23 17:48:54 2001
+++ src/etc/apps-admin.xml	Tue Sep 25 08:24:33 2001
@@ -4,7 +4,7 @@
 
     <!-- Change "trusted" to true in order to run the admin -->
     <Context path="/admin" 
-             docBase="webapps/admin" 
+             docBase="@@@TCINST@@@/webapps/admin" 
              reloadable="true" 
              trusted="false" > 
             <SimpleRealm filename="conf/users/admin-users.xml" />
--- src/etc/apps-examples.xml.orig	Sun Sep 23 17:48:39 2001
+++ src/etc/apps-examples.xml	Tue Sep 25 08:25:50 2001
@@ -5,13 +5,13 @@
       -->
 
    <Context path="/examples" 
-            docBase="webapps/examples" 
+            docBase="@@@TCINST@@@/webapps/examples" 
             debug="0" 
 	    reloadable="true" > 
               <SimpleRealm filename="conf/users/example-users.xml" />
-              <LogSetter name="example_tc.log" path="logs/examples.log" />
+              <LogSetter name="example_tc.log" path="@@@TCLOG@@@/examples.log" />
               <LogSetter name="example_servlet_log" 
-                         path="logs/servlet_examples.log" 
+                         path="@@@TCLOG@@@/servlet_examples.log" 
 			 servletLogger="true"/>
   </Context>
 
--- src/etc/tomcat.policy.orig	Sun Sep 23 17:48:47 2001
+++ src/etc/tomcat.policy	Tue Sep 25 08:28:42 2001
@@ -6,11 +6,11 @@
 };
 
 // Tomcat gets all permissions
-grant codeBase "file:${tomcat.home}/lib/-" {
+grant codeBase "file:@@@TCINST@@@/lib/-" {
        permission java.security.AllPermission;
 };
 
-grant codeBase "file:${tomcat.home}/classes/-" {
+grant codeBase "file:@@@TCINST@@@/classes/-" {
 	permission java.security.AllPermission;
 };
 
@@ -18,16 +18,16 @@
 // By default Tomcat grants read access on webapp dir and read of the
 // line.separator, path.separator, and file.separator PropertyPermissions. 
 // Any permissions you grant here are in addition to the default.
-grant codeBase "file:${tomcat.home}/webapps/examples" {
+grant codeBase "file:@@@TCINST@@@/webapps/examples" {
       // Allow the example web application to read all java properties
       permission java.util.PropertyPermission "*", "read";
 };
 
-grant codeBase "file:${tomcat.home}/webapps/admin/-" {
+grant codeBase "file:@@@TCINST@@@/webapps/admin/-" {
       permission java.security.AllPermission;
 };
 
-grant codeBase "file:${tomcat.home}/work/DEFAULT/admin/-" {
+grant codeBase "file:@@@TCWORK@@@/DEFAULT/admin/-" {
       permission java.security.AllPermission;
 };
 
--- src/etc/server.xml.orig	Fri Feb  8 22:07:40 2002
+++ src/etc/server.xml	Tue Feb 12 09:18:48 2002
@@ -7,7 +7,7 @@
          webapps/, work/ and log/ will be relative to this ( unless 
          set explicitely to absolute paths ).
       -->
-    <ContextManager workDir="work" >
+    <ContextManager workDir="@@@TCWORK@@@" >
 
       <!-- ==================== Global modules ==================== -->
         <LoaderInterceptor11  useApplicationLoader="true" />
@@ -25,14 +25,14 @@
         <!-- Separated Context -->
         <ContextXmlReader config="conf/apps.xml" />
 
-        <AutoDeploy source="modules" target="modules" 
+        <AutoDeploy source="@@@TCINST@@@/modules" target="@@@TCINST@@@/modules" 
 		    redeploy="true" />
 
-        <AutoWebApp dir="modules" host="DEFAULT" trusted="true"/>
+        <AutoWebApp dir="@@@TCINST@@@/modules" host="DEFAULT" trusted="true"/>
 
-        <AutoDeploy source="webapps" target="webapps" />
+        <AutoDeploy source="@@@TCINST@@@/webapps" target="@@@TCINST@@@/webapps" />
 
-        <AutoWebApp dir="webapps" host="DEFAULT" />
+        <AutoWebApp dir="@@@TCINST@@@/webapps" host="DEFAULT" />
 
         <PolicyLoader securityManagerClass="java.lang.SecurityManager"
 		      policyFile="conf/tomcat.policy" />
@@ -53,12 +53,12 @@
         <LogSetter name="servlet_log" 
 		   timestamps="true"
 		   verbosityLevel = "INFORMATION"
-		   path="logs/servlet-${yyyyMMdd}.log" 
+		   path="@@@TCLOG@@@/servlet-${yyyyMMdd}.log" 
 		   />
 
         <LogSetter  name="JASPER_LOG"
 		   timestamps="true" 
-		   path="logs/jasper-${yyyyMMdd}.log" 
+		   path="@@@TCLOG@@@/jasper-${yyyyMMdd}.log" 
 		   verbosityLevel = "INFORMATION"  />
 
         <WebXmlReader validate="true" />
@@ -143,7 +143,7 @@
         -->
         <!--
         <LogSetter  name="tag_pool_log" timestamps="true" 
-            path="logs/tagpool-${yyyyMMdd}.log" 
+            path="@@@TCLOG@@@/tagpool-${yyyyMMdd}.log" 
             verbosityLevel="INFORMATION" />
 
         <TagPoolManagerInterceptor />
@@ -233,7 +233,7 @@
              tomcatAuthentication="false"
              
           -->
-        <Ajp12Connector	 port="8007" />
+        <Ajp12Connector address="127.0.0.1" port="8007" AjpidFile="@@@AJP12ID@@@" />
 
         <!-- Apache AJP13 support (mod_jk)
              Parameter "address" defines network interface this Interceptor
@@ -250,7 +250,7 @@
              
 
           -->
-        <Ajp13Connector port="8009" />
+        <Ajp13Connector port="8009" AjpidFile="@@@AJP13ID@@@" />
 
       <!-- 
            Context definitions can be placed here ( not recommended ) or