Index: C:/lokahi/conf/ApplicationResources.properties
===================================================================
--- C:/lokahi/conf/ApplicationResources.properties	(revision 619464)
+++ C:/lokahi/conf/ApplicationResources.properties	(working copy)
@@ -69,7 +69,7 @@
 function.success.AddApacheWorker=The Apache Worker was added.
 function.success.AddContext=The Context was added.
 function.success.AddEnvironment=The Environment was added.
-function.success.AddFile=The File was added.
+function.success.AddFile=The Template was added.
 function.success.AddFunction=The Function was added.
 function.success.AddHardware=The Hardware was added.
 function.success.AddHelpItem=The Help Topic was added.
@@ -94,7 +94,7 @@
 function.success.DeleteApacheWorker=The apache worker has been deleted.
 function.success.DeleteContext=The context has been deleted.
 function.success.DeleteEnvironment=The environment has been deleted.
-function.success.DeleteFile=The file has been deleted.
+function.success.DeleteFile=The template has been deleted.
 function.success.DeleteFunction=The function has been deleted.
 function.success.DeleteHardware=The hardware has been deleted.  Why would you want to do that to me?
 function.success.DeleteHelpItem=The Help Topic has been deleted.
@@ -138,7 +138,7 @@
 function.success.UpdateApacheWorker=The apache worker has been updated.
 function.success.UpdateContext=The context has been updated.
 function.success.UpdateEnvironment=The environment has been updated.
-function.success.UpdateFile=The file has been updated.
+function.success.UpdateFile=The template has been updated.
 function.success.UpdateFunction=The function has been updated.
 function.success.UpdateHardware=The hadware has been updated.
 function.success.UpdateHelpItem=The help topic has been updated.
Index: C:/lokahi/conf/function.xml
===================================================================
--- C:/lokahi/conf/function.xml	(revision 619464)
+++ C:/lokahi/conf/function.xml	(working copy)
@@ -126,7 +126,6 @@
   <function id="20" name="Add IP" command="AddIp"/>
   <function id="103" name="Graceful Agent" command="GracefulAgent"/>
   <function id="111" name="Add User To Project" command="AddUserToProject"/>
-  <function id="27" name="Update Apache" command="UpdateApache"/>
   <function id="118" name="Deploy Apache Config" command="DeployApacheConfig"/>
   <function id="88" name="Restart Tomcat" command="RestartTomcat"/>
   <function id="23" name="Update IP" command="UpdateIp"/>
Index: C:/lokahi/conf/lokahi.properties
===================================================================
--- C:/lokahi/conf/lokahi.properties	(revision 619464)
+++ C:/lokahi/conf/lokahi.properties	(working copy)
@@ -39,7 +39,7 @@
 SchemaOwner=tmc
 DatabasePropertiesFile=dbpool.props
 LogActivity=yes
-ApacheConfFile=httpd.conf
+ApacheConfFile=httpsd.conf
 WorkersProperties=workers.properties
 TimeoutForURLThread=5
 TimeoutForContextOp=20
@@ -53,8 +53,20 @@
 wap.function.TomcatWorker=RestartTomcat,StartTomcat,StopTomcat,DeployTomcatConfig
 
 # Generic DB support
-lokahi.broker.implementation=org.apache.lokahi.core.common.database.MySqlBroker
-#lokahi.broker.implementation=org.apache.lokahi.core.common.database.OracleBroker
+#lokahi.broker.implementation=org.apache.lokahi.core.common.database.MySqlBroker
+lokahi.broker.implementation=org.apache.lokahi.core.common.database.OracleBroker
 lokahi.broker.autocommit=true
-lokahi.broker.type=mysql
+#lokahi.broker.type=mysql
+lokahi.broker.type=oracle
 
+# Config Templating support
+lokahi.template.engine=org.apache.lokahi.core.common.templating.VelocityTemplateBuilder
+# variables are a comma separated list explaining the substitutions (use \ for a new line)
+lokahi.template.variables=server root=$worker.getApplication().getServerRoot(),\
+test=$worker.getApplication().getTest(),\
+newline=$n,\
+hosting pool tool=$hpTool,\
+virtualhost tool=$vhTool,\
+velocity view tool=$view
+
+
Index: C:/lokahi/conf/struts-config.xml
===================================================================
--- C:/lokahi/conf/struts-config.xml	(revision 619464)
+++ C:/lokahi/conf/struts-config.xml	(working copy)
@@ -181,12 +181,13 @@
       <form-property name="startClass" type="java.lang.String"/>
       <form-property name="stdOutLog" type="java.lang.String"/>
       <form-property name="javaHome" type="java.lang.String"/>
+      <form-property name="template" type="java.lang.String[]"/>
       <form-property name="wap" type="java.lang.String" initial="false"/>
       <form-property name="methodToCall" type="java.lang.String"/>
     </form-bean>
     <form-bean name="ApacheForm" type="org.apache.struts.validator.DynaValidatorForm" dynamic="true">
       <form-property name="id" type="java.lang.String"/>
-      <form-property name="mainId" type="java.lang.String"/>
+      <form-property name="mainId" type="java.lang.String[]"/>
       <form-property name="name" type="java.lang.String"/>
       <form-property name="serverRoot" type="java.lang.String"/>
       <form-property name="logLocation" type="java.lang.String"/>
Index: C:/lokahi/conf/toolbox.xml
===================================================================
--- C:/lokahi/conf/toolbox.xml	(revision 619464)
+++ C:/lokahi/conf/toolbox.xml	(working copy)
@@ -79,4 +79,19 @@
     <scope>request</scope>
     <class>org.apache.lokahi.core.common.util.TMCVelocityViewTool</class>
   </tool>
+  <tool>
+    <key>hpTool</key>
+    <scope>request</scope>
+    <class>org.apache.lokahi.core.api.pool.HostingPool</class>
+  </tool>
+  <tool>
+    <key>vhTool</key>
+    <scope>request</scope>
+    <class>org.apache.lokahi.httpd.api.entity.VirtualHost</class>
+  </tool>  
+  <tool>
+    <key>contextTool</key>
+    <scope>request</scope>
+    <class>org.apache.lokahi.tomcat.api.entity.TomcatContext</class>
+  </tool>  
 </toolbox>
Index: C:/lokahi/database/mysql/procs.sql
===================================================================
--- C:/lokahi/database/mysql/procs.sql	(revision 619464)
+++ C:/lokahi/database/mysql/procs.sql	(working copy)
@@ -382,7 +382,7 @@
 									 IN V_PIDFILE VARCHAR(300),
 									 IN V_SROOT VARCHAR(300),
 									 IN V_LOGLOC VARCHAR(300),
-									 IN V_MAINID INT
+									 IN V_MAINID VARCHAR(300)
 				     			   	)
 BEGIN
 	INSERT INTO AM_CONTAINER (CONTAINER_NAME, SYS_USER, SYS_GROUP, START_COMMAND, STOP_COMMAND, RESTART_COMMAND, FORK_WAIT, ENV_VARIBLES, PIDFILE_LOCATION, SERVER_ROOT, LOG_LOCATION, MAIN_ID)
@@ -406,7 +406,7 @@
 									 IN V_PIDFILE VARCHAR(300),
 									 IN V_SROOT VARCHAR(300),
 									 IN V_LOGLOC VARCHAR(300),
-									 IN V_MAINID INT
+									 IN V_MAINID VARCHAR(300)
 				     			   	)
 
 BEGIN
@@ -1911,7 +1911,8 @@
 									 IN V_JAVAHOME VARCHAR(40),
 									 IN V_STARTCLASS VARCHAR(40),
 									 IN V_OUTLOG VARCHAR(40),		
-									 IN V_ENTRY BLOB
+									 IN V_ENTRY BLOB,
+									 IN V_TEMPLATE_IDS VARCHAR(300)
 				     			   	 )
 				     			   	 
 BEGIN
@@ -1928,7 +1929,8 @@
 			JAVA_HOME=V_JAVAHOME,
 			START_CLASS=V_STARTCLASS,
 			STD_OUT_LOG=V_STDOUTLOG,
-			CONF_ENTRY=V_ENTRY
+			CONF_ENTRY=V_ENTRY,
+			TEMPLATE_IDS=V_TEMPLATE_IDS
 
 		WHERE CONTAINER_ID=V_ID;
 END;
@@ -1981,11 +1983,12 @@
 									 IN V_JAVAHOME VARCHAR(300),
 									 IN V_STARTCLASS VARCHAR(40),
 									 IN V_OUTLOG VARCHAR(300),									 
-									 IN V_ENTRY BLOB
+									 IN V_ENTRY BLOB,
+									 IN V_TEMPLATE_IDS VARCHAR(300)
 				     			   	 )
 BEGIN
-	INSERT INTO TM_CONTAINER (CONTAINER_NAME, BASE_LOCATION, TOMCAT_HOME, HTTP_PORT, SYS_USER, SYS_GROUP, TOMCAT_TYPE, DESCRIPTION,STD_OUT_LOG, START_CLASS, JAVA_HOME, CONF_ENTRY)
-	VALUES ( V_NAME, V_BASELOCATION, V_TOMCATHOME, V_HTTPPORT, V_SYSUSER, V_SYSGROUP, V_TT, V_DESCRIP, V_OUTLOG, V_STARTCLASS, V_JAVAHOME, V_ENTRY);
+	INSERT INTO TM_CONTAINER (CONTAINER_NAME, BASE_LOCATION, TOMCAT_HOME, HTTP_PORT, SYS_USER, SYS_GROUP, TOMCAT_TYPE, DESCRIPTION,STD_OUT_LOG, START_CLASS, JAVA_HOME, CONF_ENTRY, TEMPLATE_IDS)
+	VALUES ( V_NAME, V_BASELOCATION, V_TOMCATHOME, V_HTTPPORT, V_SYSUSER, V_SYSGROUP, V_TT, V_DESCRIP, V_OUTLOG, V_STARTCLASS, V_JAVAHOME, V_ENTRY, V_TEMPLATE_IDS);
 	SELECT LAST_INSERT_ID() INTO V_ID;
 END;
 /
Index: C:/lokahi/database/mysql/tables.sql
===================================================================
--- C:/lokahi/database/mysql/tables.sql	(revision 619464)
+++ C:/lokahi/database/mysql/tables.sql	(working copy)
@@ -19,7 +19,7 @@
 -- SQL99
 
 DROP TABLE IF EXISTS AM_CONTAINER;/
-CREATE TABLE AM_CONTAINER (CONTAINER_ID INT(11) NOT NULL auto_increment, PRIMARY KEY (CONTAINER_ID),CONTAINER_NAME VARCHAR(100) NOT NULL,SERVER_ROOT VARCHAR(300) ,LOG_LOCATION VARCHAR(300) ,SYS_USER VARCHAR(8) ,SYS_GROUP VARCHAR(8) ,START_COMMAND VARCHAR(4000) ,STOP_COMMAND VARCHAR(4000) ,RESTART_COMMAND VARCHAR(4000) ,FORK_WAIT INT(11) ,PIDFILE_LOCATION VARCHAR(300) ,ENV_VARIBLES VARCHAR(4000) ,MAIN_ID INT(11) , KEY (MAIN_ID));/
+CREATE TABLE AM_CONTAINER (CONTAINER_ID INT(11) NOT NULL auto_increment, PRIMARY KEY (CONTAINER_ID),CONTAINER_NAME VARCHAR(100) NOT NULL,SERVER_ROOT VARCHAR(300) ,LOG_LOCATION VARCHAR(300) ,SYS_USER VARCHAR(8) ,SYS_GROUP VARCHAR(8) ,START_COMMAND VARCHAR(4000) ,STOP_COMMAND VARCHAR(4000) ,RESTART_COMMAND VARCHAR(4000) ,FORK_WAIT INT(11) ,PIDFILE_LOCATION VARCHAR(300) ,ENV_VARIBLES VARCHAR(4000) ,MAIN_ID VARCHAR(300) , KEY (MAIN_ID));/
 
 DROP TABLE IF EXISTS AM_POOL;/
 CREATE TABLE AM_POOL (POOL_ID INT(11) NOT NULL auto_increment, PRIMARY KEY (POOL_ID),POOL_NAME VARCHAR(40) NOT NULL,ENV_ID INT(11) NOT NULL, KEY (ENV_ID));/
@@ -186,7 +186,7 @@
 
 
 DROP TABLE IF EXISTS TM_CONTAINER;/
-CREATE TABLE TM_CONTAINER (CONTAINER_ID INT(11) NOT NULL auto_increment, PRIMARY KEY (CONTAINER_ID),CONTAINER_NAME VARCHAR(40) ,BASE_LOCATION VARCHAR(100) ,TOMCAT_HOME VARCHAR(100) ,HTTP_PORT INT(11) ,SYS_USER VARCHAR(8) ,SYS_GROUP VARCHAR(8) ,CONF_ENTRY BLOB ,TOMCAT_TYPE INT(11) DEFAULT 4,DESCRIPTION VARCHAR(100) ,STD_OUT_LOG VARCHAR(300) ,START_CLASS VARCHAR(40) ,JAVA_HOME VARCHAR(300) );/
+CREATE TABLE TM_CONTAINER (CONTAINER_ID INT(11) NOT NULL auto_increment, PRIMARY KEY (CONTAINER_ID),CONTAINER_NAME VARCHAR(40) ,BASE_LOCATION VARCHAR(100) ,TOMCAT_HOME VARCHAR(100) ,HTTP_PORT INT(11) ,SYS_USER VARCHAR(8) ,SYS_GROUP VARCHAR(8) ,CONF_ENTRY BLOB ,TOMCAT_TYPE INT(11) DEFAULT 4,DESCRIPTION VARCHAR(100) ,STD_OUT_LOG VARCHAR(300) ,START_CLASS VARCHAR(40) ,JAVA_HOME VARCHAR(300),TEMPLATE_IDS VARCHAR(300) );/
 
 
 DROP TABLE IF EXISTS TM_ENTITY;/
Index: C:/lokahi/database/mysql/views.sql
===================================================================
--- C:/lokahi/database/mysql/views.sql	(revision 619464)
+++ C:/lokahi/database/mysql/views.sql	(working copy)
@@ -86,7 +86,7 @@
 (WORKER_ID, CONTAINER_ID, STATE_ID, HARDWARE_ID, CONTAINER_NAME, 
  BASE_LOCATION, TOMCAT_HOME, HTTP_PORT, SYS_USER, SYS_GROUP, 
  TOMCAT_TYPE, DESCRIPTION, CONF_ENTRY, STD_OUT_LOG, JAVA_HOME, 
- START_CLASS, HARDWARE_NAME, PHYSICAL_LOCATION, COMMENTS, INSTANCE_ID, 
+ START_CLASS, TEMPLATE_IDS, HARDWARE_NAME, PHYSICAL_LOCATION, COMMENTS, INSTANCE_ID, 
  ENV_ID, STATUS_ID, DEFAULT_IP_ID)
 AS 
 SELECT
@@ -106,6 +106,7 @@
   c.std_out_log,
   c.java_home,
   c.start_class,
+  c.template_ids,
   h.hardware_name,
   h.physical_location,
   h.comments,
Index: C:/lokahi/database/oracle/procs.sql
===================================================================
--- C:/lokahi/database/oracle/procs.sql	(revision 619464)
+++ C:/lokahi/database/oracle/procs.sql	(working copy)
@@ -235,7 +235,7 @@
 									 v_pidFile	IN	VARCHAR2,
 									 v_sRoot	IN	VARCHAR2,
 									 v_logLoc	IN	VARCHAR2,
-									 v_mainId	IN	NUMBER
+									 v_mainId	IN	VARCHAR2
 				     			   	)
 AS
 BEGIN
@@ -390,7 +390,7 @@
 									 v_pidFile	IN	VARCHAR2,
 									 v_sRoot	IN	VARCHAR2,
 									 v_logLoc	IN	VARCHAR2,
-									 v_mainId	IN	NUMBER
+									 v_mainId	IN	VARCHAR2
 				     			   	)
 AS
 BEGIN
@@ -1836,13 +1836,14 @@
 									 v_javaHome		IN	VARCHAR2,
 									 v_startClass	IN	VARCHAR2,
 									 v_outLog		IN	VARCHAR2,									 
-									 v_entry		IN	BLOB
+									 v_entry		IN	BLOB,
+									 v_template_ids IN VARCHAR2
 				     			   	 )
 AS
 BEGIN
 
-	 		INSERT INTO TM_CONTAINER tc (tc.CONTAINER_ID, tc.CONTAINER_NAME, tc.BASE_LOCATION, tc.TOMCAT_HOME, tc.HTTP_PORT, tc.SYS_USER, tc.SYS_GROUP, tc.TOMCAT_TYPE, tc.DESCRIPTION,tc.STD_OUT_LOG, tc.START_CLASS, tc.JAVA_HOME, tc.CONF_ENTRY)
-		   	VALUES ( tm_tomcat4_seq.NEXTVAL, v_name, v_baseLocation, v_tomcatHome, v_httpPort, v_sysUser, v_sysGroup, v_tt, v_descrip, v_outLog, v_startClass, v_javaHome, v_entry);
+	 		INSERT INTO TM_CONTAINER tc (tc.CONTAINER_ID, tc.CONTAINER_NAME, tc.BASE_LOCATION, tc.TOMCAT_HOME, tc.HTTP_PORT, tc.SYS_USER, tc.SYS_GROUP, tc.TOMCAT_TYPE, tc.DESCRIPTION,tc.STD_OUT_LOG, tc.START_CLASS, tc.JAVA_HOME, tc.CONF_ENTRY, tc.TEMPLATE_IDS)
+		   	VALUES ( tm_tomcat4_seq.NEXTVAL, v_name, v_baseLocation, v_tomcatHome, v_httpPort, v_sysUser, v_sysGroup, v_tt, v_descrip, v_outLog, v_startClass, v_javaHome, v_entry, v_template_ids);
 			-- get the newly added id
 			v_id:=f_last_sequence_number('tm_tomcat4_seq');
 END;
@@ -1942,7 +1943,8 @@
 									 v_javaHome		IN	VARCHAR2,
 									 v_startClass	IN	VARCHAR2,
 									 v_stdOutLog	IN	VARCHAR2,
-									 v_entry		IN	BLOB
+									 v_entry		IN	BLOB,
+									 v_template_ids	IN	VARCHAR2
 				     			   	 )
 AS
 BEGIN
@@ -1958,7 +1960,8 @@
 			tc.JAVA_HOME=v_javaHome,
 			tc.START_CLASS=v_startClass,
 			tc.STD_OUT_LOG=v_stdOutLog,
-			tc.conf_entry=v_entry
+			tc.conf_entry=v_entry,
+			tc.TEMPLATE_IDS=v_template_ids
 
 		WHERE tc.CONTAINER_ID=v_id;
 END;
Index: C:/lokahi/database/oracle/tables.sql
===================================================================
--- C:/lokahi/database/oracle/tables.sql	(revision 619464)
+++ C:/lokahi/database/oracle/tables.sql	(working copy)
@@ -17,7 +17,7 @@
 -- under the License.
 --
 
-CREATE TABLE AM_CONTAINER ( CONTAINER_ID NUMBER NOT NULL, CONTAINER_NAME VARCHAR2(100) NOT NULL, SERVER_ROOT VARCHAR2(300), LOG_LOCATION VARCHAR2(300), SYS_USER VARCHAR2(8), SYS_GROUP VARCHAR2(8), START_COMMAND VARCHAR2(4000), STOP_COMMAND VARCHAR2(4000), RESTART_COMMAND VARCHAR2(4000), FORK_WAIT NUMBER, PIDFILE_LOCATION VARCHAR2(300), ENV_VARIBLES VARCHAR2(4000), MAIN_ID NUMBER ) LOGGING NOCACHE NOPARALLEL;
+CREATE TABLE AM_CONTAINER ( CONTAINER_ID NUMBER NOT NULL, CONTAINER_NAME VARCHAR2(100) NOT NULL, SERVER_ROOT VARCHAR2(300), LOG_LOCATION VARCHAR2(300), SYS_USER VARCHAR2(8), SYS_GROUP VARCHAR2(8), START_COMMAND VARCHAR2(4000), STOP_COMMAND VARCHAR2(4000), RESTART_COMMAND VARCHAR2(4000), FORK_WAIT NUMBER, PIDFILE_LOCATION VARCHAR2(300), ENV_VARIBLES VARCHAR2(4000), MAIN_ID VARCHAR2(300) ) LOGGING NOCACHE NOPARALLEL;
 
 
 CREATE TABLE AM_POOL ( POOL_ID NUMBER NOT NULL, POOL_NAME VARCHAR2(40) NOT NULL, ENV_ID NUMBER NOT NULL ) LOGGING NOCACHE NOPARALLEL;
@@ -143,7 +143,7 @@
 CREATE TABLE TMC_USER ( FIRST_NAME VARCHAR2(30), LAST_NAME VARCHAR2(30), JOB_TITLE VARCHAR2(100), COMMENTS VARCHAR2(2000), EMAIL VARCHAR2(60), USER_ID NUMBER NOT NULL, USER_NAME VARCHAR2(30) NOT NULL, STATE_ID NUMBER DEFAULT 8, PASSWORD VARCHAR2(32) ) LOGGING NOCACHE NOPARALLEL;
 
 
-CREATE TABLE TM_CONTAINER ( CONTAINER_ID NUMBER NOT NULL, CONTAINER_NAME VARCHAR2(40), BASE_LOCATION VARCHAR2(100), TOMCAT_HOME VARCHAR2(100), HTTP_PORT NUMBER, SYS_USER VARCHAR2(8), SYS_GROUP VARCHAR2(8), CONF_ENTRY BLOB, TOMCAT_TYPE NUMBER DEFAULT 4, DESCRIPTION VARCHAR2(100), STD_OUT_LOG VARCHAR2(300), START_CLASS VARCHAR2(40), JAVA_HOME VARCHAR2(300) ) LOGGING NOCACHE NOPARALLEL;
+CREATE TABLE TM_CONTAINER ( CONTAINER_ID NUMBER NOT NULL, CONTAINER_NAME VARCHAR2(40), BASE_LOCATION VARCHAR2(100), TOMCAT_HOME VARCHAR2(100), HTTP_PORT NUMBER, SYS_USER VARCHAR2(8), SYS_GROUP VARCHAR2(8), CONF_ENTRY BLOB, TOMCAT_TYPE NUMBER DEFAULT 4, DESCRIPTION VARCHAR2(100), STD_OUT_LOG VARCHAR2(300), START_CLASS VARCHAR2(40), JAVA_HOME VARCHAR2(300), TEMPLATE_IDS VARCHAR(300) ) LOGGING NOCACHE NOPARALLEL;
 
 
 CREATE TABLE TM_ENTITY ( ENTITY_ID NUMBER NOT NULL, ENTITY_NAME VARCHAR2(60) NOT NULL, DOC_BASE VARCHAR2(500) NOT NULL, ENTITY_STATE_ID NUMBER NOT NULL, ENV_ID NUMBER NOT NULL, TOMCAT_POOL_ID NUMBER, ENTITY_DEFIN VARCHAR2(4000), EX_PROJECT_ID NUMBER DEFAULT 0 ) LOGGING NOCACHE NOPARALLEL;
Index: C:/lokahi/database/oracle/views.sql
===================================================================
--- C:/lokahi/database/oracle/views.sql	(revision 619464)
+++ C:/lokahi/database/oracle/views.sql	(working copy)
@@ -86,7 +86,7 @@
 (WORKER_ID, CONTAINER_ID, STATE_ID, HARDWARE_ID, CONTAINER_NAME, 
  BASE_LOCATION, TOMCAT_HOME, HTTP_PORT, SYS_USER, SYS_GROUP, 
  TOMCAT_TYPE, DESCRIPTION, CONF_ENTRY, STD_OUT_LOG, JAVA_HOME, 
- START_CLASS, HARDWARE_NAME, PHYSICAL_LOCATION, COMMENTS, INSTANCE_ID, 
+ START_CLASS, TEMPLATE_IDS, HARDWARE_NAME, PHYSICAL_LOCATION, COMMENTS, INSTANCE_ID, 
  ENV_ID, STATUS_ID, DEFAULT_IP_ID)
 AS 
 SELECT
@@ -106,6 +106,7 @@
   c.std_out_log,
   c.java_home,
   c.start_class,
+  c.template_ids,
   h.hardware_name,
   h.physical_location,
   h.comments,
Index: C:/lokahi/build.xml
===================================================================
--- C:/lokahi/build.xml	(revision 619464)
+++ C:/lokahi/build.xml	(working copy)
@@ -25,7 +25,7 @@
 		<delete dir="${app.build}" failonerror="true"/>    	
     </target>
 
-  <target name="install" depends="clean,build">
+  <target name="install" depends="build">
     <mkdir dir="${install.location}${app.name}"/>
     <copy todir="${install.location}${app.name}" overwrite="true">
       <fileset dir="${app.build.context}"/>