Index: org/apache/lokahi/core/agent/jmx/JMXConnect.java
===================================================================
--- org/apache/lokahi/core/agent/jmx/JMXConnect.java	(revision 619464)
+++ org/apache/lokahi/core/agent/jmx/JMXConnect.java	(working copy)
@@ -125,7 +125,7 @@
   /**
    * @param pid
    *
-   * @return
+   * @return a string containing the JMX url
    * @throws IOException
    * @deprecated
    */
@@ -180,7 +180,7 @@
   /**
    * @param JMXurl
    *
-   * @return
+   * @return a new connection to the JMX URL. 
    * @throws IOException
    * @deprecated
    */
@@ -203,7 +203,7 @@
   /**
    * @param pid
    *
-   * @return
+   * @return a new connection to the JMX URL using the pid of the JMX url
    * @throws IOException
    * @deprecated
    */
Index: org/apache/lokahi/core/api/environment/Environment.java
===================================================================
--- org/apache/lokahi/core/api/environment/Environment.java	(revision 619464)
+++ org/apache/lokahi/core/api/environment/Environment.java	(working copy)
@@ -92,7 +92,7 @@
    * @param id
    * @param fromCache
    *
-   * @return
+   * @return an environment with the given ID or null if it is not found
    * @throws SQLException
    * @deprecated
    */
Index: org/apache/lokahi/core/api/file/File.java
===================================================================
--- org/apache/lokahi/core/api/file/File.java	(revision 619464)
+++ org/apache/lokahi/core/api/file/File.java	(working copy)
@@ -206,7 +206,7 @@
   /**
    * @param id
    *
-   * @return
+   * @return a file with the given ID or null if it is not found
    * @throws SQLException
    * @deprecated
    */
Index: org/apache/lokahi/core/api/instance/Instance.java
===================================================================
--- org/apache/lokahi/core/api/instance/Instance.java	(revision 619464)
+++ org/apache/lokahi/core/api/instance/Instance.java	(working copy)
@@ -103,7 +103,7 @@
    * @param id
    * @param fromCache
    *
-   * @return
+   * @return an instance with the given ID or null if it is not found
    * @throws SQLException
    * @deprecated
    */
Index: org/apache/lokahi/core/api/project/Project.java
===================================================================
--- org/apache/lokahi/core/api/project/Project.java	(revision 619464)
+++ org/apache/lokahi/core/api/project/Project.java	(working copy)
@@ -262,7 +262,7 @@
   /**
    * @param id
    *
-   * @return
+   * @return a project with the given ID or null if it is not found
    * @throws SQLException
    * @deprecated
    */
Index: org/apache/lokahi/core/api/server/HardwareModel.java
===================================================================
--- org/apache/lokahi/core/api/server/HardwareModel.java	(revision 619464)
+++ org/apache/lokahi/core/api/server/HardwareModel.java	(working copy)
@@ -100,44 +100,11 @@
     JobPool.update(jp);
   }
 
-  public void deployJvmConf(User u, Collection<Hardware> c, JobPool jobPool) throws SQLException, IOException {
-    for (final Hardware h : c) {
-      this.deployJvmConf(u, h, jobPool);
-    }
-  }
-
-  public void deployJvmConf(User u, Hardware h, JobPool jobPool) throws SQLException, IOException {
-    Function f = Function.getFunction("PutFile");
-    Job j = new Job("./jvm.conf", h, f, jobPool);
-    j.setResult(this.buildJvmConf(h));
-    j = Job.store(j);
-    j = new Job(j, "", h, Function.getFunction("UpdateTomcat"), jobPool);
-    Job.store(j);
-  }
-
-  public String buildJvmConf(Hardware h) throws SQLException {
-    Collection<TomcatWorker> c = TomcatWorker.getTomcatWorkers(h, false);
-    StringBuffer ret = new StringBuffer();
-    for (final TomcatWorker tw : c) {
-      Tomcat t = tw.getTomcat();
-      if (t != null)
-        ret.append(t.buildJvmconfEntry());
-    }
-    return ret.toString();
-  }
-
   public void addHardware(User u, String hardwareName, String physicalLocation, String comments, int instanceId, int envId, int statusId, String defaultIp, String... ips) throws AuthorizationException, TMCIllegalArgumentException, SQLException, IOException {
     Hardware h = new Hardware(); //todo finish this
     this.addHardware(u, h);
   }
 
-//  public void addHardware(User u, Hardware h) throws AuthorizationException, TMCIllegalArgumentException, SQLException, IOException {
-//    Function f = Function.getFunction("AddHardware");
-//    this.jpInit(f, u, h.getName());
-//    if (!u.isAllowed(f)) throw new AuthorizationException("User " + u.getName() + " Not allowed to " + f.getName());
-//    this.addHardware(jp, h);
-//  }
-
   public void addHardware(JobPool jp, Hardware h) throws AuthorizationException, TMCIllegalArgumentException, SQLException, IOException {
 
   }
@@ -173,7 +140,7 @@
   }
 
   /**
-   * @return
+   * @return A collection of all of the hardware
    * @throws SQLException
    * @deprecated
    */
Index: org/apache/lokahi/core/api/template/Template.java
===================================================================
--- org/apache/lokahi/core/api/template/Template.java	(revision 0)
+++ org/apache/lokahi/core/api/template/Template.java	(revision 0)
@@ -0,0 +1,289 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+* 
+*   http://www.apache.org/licenses/LICENSE-2.0
+* 
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+package org.apache.lokahi.core.api.template;
+
+import org.apache.log4j.Logger;
+import org.apache.lokahi.core.common.database.BrokerFactory;
+import org.apache.lokahi.core.common.interfaces.Entity;
+import org.apache.lokahi.core.common.interfaces.TMCBroker;
+import org.apache.lokahi.core.common.interfaces.TMCDao;
+import org.apache.lokahi.core.common.util.PropertiesFile;
+
+import java.sql.Blob;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.Collection;
+import java.util.LinkedHashMap;
+
+/**
+ * @author The Apache Incubated Lokahi project - http://incubator.apache.org/lokahi/
+ * @version $Id$
+ */
+public class Template extends TMCDao<Template> implements Entity {
+  static final Logger logger = Logger.getLogger(Template.class);
+  private static final TMCBroker<Template> broker = new BrokerFactory<Template>().getBroker();
+  private int pk;
+  private String name;
+  private String content;
+  private String descriptor;
+  private String path;
+
+  public Template() {
+	  // create a new empty template
+  }
+
+  public Template(String name, String content, String discriptor, String path) {
+    this.name = name;
+    this.content = content;
+    this.descriptor = discriptor;
+    this.path = path;
+  }
+
+  public Template(int pk, String name, String discriptor, String path, Blob content) throws SQLException {
+    this.pk = pk;
+    this.name = name;
+    this.descriptor = discriptor;
+    this.path = path;
+    if (content != null)
+      this.setContent(content.getBytes(1, (int) content.length()));
+  }
+
+  public int getPk() {
+    return this.pk;
+  }
+
+  public void setPk(int pk) {
+    this.pk = pk;
+  }
+
+  public String getName() {
+    return this.name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public String getContent() {
+    if (this.content == null) {
+      this.content = "";
+    }
+    return this.content;
+  }
+
+  public void setContent(byte[] content) {
+    if (content != null) {
+      this.content = new String(content);
+    } else {
+      if (logger.isDebugEnabled()) {
+        logger.debug("content=" + content);
+      }
+      this.content = "";
+    }
+  }
+
+  public void setContent(String content) {
+    this.content = content;
+  }
+
+  public String getDescriptor() {
+    return this.descriptor;
+  }
+
+  public void setDescriptor(String discriptor) {
+    this.descriptor = discriptor;
+  }
+
+  public String getPath() {
+    return this.path;
+  }
+
+  public void setPath(String path) {
+    this.path = path;
+  }
+
+  public Template fillObject(ResultSet r) throws SQLException {
+    return new Template(r.getInt("FILE_ID"), r.getString("FILE_NAME"), r.getString("FILE_DESCRIPTOR"), r.getString("FILE_PATH"), r.getBlob("FILE_CONTENT"));
+  }
+
+  static Template store(Template t) throws SQLException {
+	Template ret = null;
+    try {
+      t.setPk(broker.save("core.file.store", t.getName(), t.getDescriptor(), t.getPath()));
+      if (logger.isDebugEnabled()) {
+        logger.debug("t=" + t);
+      }
+      if (storeBlob(t.getPk(), t.getContent())) {
+        ret = t;
+      }
+    } catch (SQLException e) {
+        logger.error("Exception: " + e.getMessage());
+      throw e;
+    }
+    if (logger.isDebugEnabled()) {
+      logger.debug("Returning " + ret);
+    }
+    return ret;
+  }
+
+  static boolean update(Template t) throws SQLException {
+    boolean ret = false;
+    try {
+      broker.update("core.file.update", t.getPk(), t.getName(), t.getDescriptor(), t.getPath());
+      if (logger.isDebugEnabled()) {
+        logger.debug("t=" + t);
+      }
+      if (storeBlob(t.getPk(), t.getContent())) {
+        ret = true;
+      }
+    } catch (SQLException e) {
+        logger.error("Exception: " + e.getMessage());
+      throw e;
+    }
+    if (logger.isDebugEnabled()) {
+      logger.debug("Returning " + ret);
+    }
+    return ret;
+  }
+
+  private static boolean storeBlob(int id, String toStore) throws SQLException {
+    boolean ret = false;
+    try {
+        if ("oracle".equals(PropertiesFile.getConstantValue("lokahi.broker.type")))
+            storeBlobOracleImpl(id, toStore);
+        else
+            storeBlobStdImpl(id, toStore);
+      ret = true;
+    } catch (SQLException e) {
+        logger.error("Exception: " + e.getMessage());
+      throw e;
+    }
+    return ret;
+  }
+
+  private static void storeBlobOracleImpl(int id, String toStore) throws SQLException {   
+      broker.useSQL("core.file.prep.blob", id);
+      if (toStore == null) toStore = "";
+      byte[] blobBytes = toStore.getBytes();
+      broker.blobHack("core.file.content.lock", "core.file.content.update", id, blobBytes);      
+  }
+
+  private static void storeBlobStdImpl(int id, String toStore) throws SQLException {
+      if (toStore == null) toStore = "";
+      byte[] blobBytes = toStore.getBytes();
+      broker.useSQL("core.file.prep.blob", id ,blobBytes);
+  }
+
+  static boolean delete(Template f) throws SQLException {
+    return broker.delete("core.file.delete", f.getPk());
+  }
+
+  public Template get(int id) throws SQLException {
+    return broker.getObject(Template.class, "core.file.by.id", false, id);
+  }
+
+  /**
+   * @param id
+   *
+   * @return A template with the given id or null if it isn't found
+   * @throws SQLException
+   * @deprecated
+   */
+  public static Template getTemplate(int id) throws SQLException {
+	Template t;
+    try {
+      t = broker.getObject(Template.class, "core.file.by.id", false, id);
+    } catch (SQLException e) {
+        logger.error("SQLException: " + e.getMessage());
+      throw e;
+    }   
+    return t;
+  }
+
+  public static Collection<Template> getTemplates() throws SQLException {
+    Collection<Template> c;
+    try {
+      c = broker.getObjects(Template.class, false, "core.file.all");
+    } catch (SQLException e) {
+      if (logger.isInfoEnabled()) {
+        logger.info("Exception: " + e.getMessage());
+      }
+      throw e;
+    }
+    return c;
+  }
+
+  public StringBuilder buildShortXMLRepresentation() {
+    LinkedHashMap<String, String> map = new LinkedHashMap<String, String>(3, 1);
+    map.put("id", Integer.toString(this.getPk()));
+    map.put("name", this.getName());
+    map.put("href", PropertiesFile.getConstantValue("rest.servlet.url") + "template/" + this.getPk() + '/');
+    return elementBuilder("template", map);
+  }
+
+  public StringBuilder buildXMLRepresention() {
+    StringBuilder ret = new StringBuilder();
+    ret.append("<template>\n");
+    ret.append(elementBuilder("id", Integer.toString(this.getPk())));
+    ret.append(elementBuilder("name", this.getName()));
+    ret.append(elementBuilder("content", this.getContent()));
+    ret.append(elementBuilder("descriptor", this.getDescriptor()));
+    ret.append(elementBuilder("path", this.getPath()));
+    ret.append("</template>\n");
+    return ret;
+  }
+
+  public String toString() {
+    final StringBuffer buf = new StringBuffer();
+    buf.append("Template");
+    buf.append("{pk=").append(this.pk);
+    buf.append(",name=").append(this.name);
+    buf.append(",content=").append(this.content);
+    buf.append(",descriptor=").append(this.descriptor);
+    buf.append(",path=").append(this.path);
+    buf.append('}');
+    return buf.toString();
+  }
+
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (!(o instanceof Template)) return false;
+
+    final Template template = (Template) o;
+
+    if (this.pk != template.pk) return false;
+    if (this.descriptor != null ? !this.descriptor.equals(template.descriptor) : template.descriptor != null) return false;
+    if (this.name != null ? !this.name.equals(template.name) : template.name != null) return false;
+    if (this.path != null ? !this.path.equals(template.path) : template.path != null) return false;
+
+    return true;
+  }
+
+  public int hashCode() {
+    int result;
+    result = this.pk;
+    result = 29 * result + (this.name != null ? this.name.hashCode() : 0);
+    result = 29 * result + (this.descriptor != null ? this.descriptor.hashCode() : 0);
+    result = 29 * result + (this.path != null ? this.path.hashCode() : 0);
+    return result;
+  }
+}
+
+
+
Index: org/apache/lokahi/core/api/template/TemplateModel.java
===================================================================
--- org/apache/lokahi/core/api/template/TemplateModel.java	(revision 0)
+++ org/apache/lokahi/core/api/template/TemplateModel.java	(revision 0)
@@ -0,0 +1,100 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+* 
+*   http://www.apache.org/licenses/LICENSE-2.0
+* 
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+package org.apache.lokahi.core.api.template;
+
+import org.apache.lokahi.core.api.function.Function;
+import org.apache.lokahi.core.api.jobpool.JobPool;
+import org.apache.lokahi.core.api.state.State;
+import org.apache.lokahi.core.api.user.User;
+import org.apache.lokahi.core.common.collection.TMCSet;
+import org.apache.lokahi.core.common.exception.AuthorizationException;
+import org.apache.lokahi.core.common.exception.TMCIllegalArgumentException;
+import org.apache.lokahi.core.common.interfaces.LokahiModel;
+
+import java.sql.SQLException;
+import java.util.Collection;
+
+/**
+ * @author The Apache Incubated Lokahi project - http://incubator.apache.org/lokahi/
+ * @version $Id$
+ */
+public class TemplateModel extends LokahiModel<Template> {
+
+  public void addFile(User u, Template template, Function f) throws AuthorizationException, SQLException {
+    this.jpInit(f, u, template.getName());
+    if (u.isAllowed(f) && "AddFile".equals(f.getCommand())) {
+    	Template.store(template);
+    } else {
+      throw new AuthorizationException("User " + u.getName() + " Not allowed to " + f.getName());
+    }
+    this.jp.setState(State.COMPLETE);
+    JobPool.update(this.jp);
+  }
+
+  public void deleteFile(User u, Template template, Function f) throws SQLException, AuthorizationException, TMCIllegalArgumentException {
+    if (template == null || template.getPk() < 1) throw new TMCIllegalArgumentException("File can not be null");
+    this.jpInit(f, u, template.getName());
+    if (u.isAllowed(f) && "DeleteFile".equals(f.getCommand())) {
+    	Template.delete(template);
+    } else {
+      throw new AuthorizationException("User " + u.getName() + " Not allowed to " + f.getName());
+    }
+    this.jp.setState(State.COMPLETE);
+    JobPool.update(this.jp);
+  }
+
+  public void deleteFile(User u, Collection<Template> templates, Function f) throws AuthorizationException, TMCIllegalArgumentException, SQLException {
+    for (Template template : templates) this.deleteFile(u, template, f);
+  }  //todo fix the quick hack so that we only create one jobpool for the list of files we want to delete.
+
+  public void updateFile(User u, Template template, Function f) throws AuthorizationException, TMCIllegalArgumentException, SQLException {
+    this.jpInit(f, u, template.getName());
+    if (u.isAllowed(f) && "UpdateFile".equals(f.getCommand())) {
+      if (template.getPk() >= 1 && template.getName() != null && !"".equals(template.getName())) {
+    	  Template.update(template);
+      } else {
+        throw new TMCIllegalArgumentException("Template can not be null");
+      }
+    } else {
+      throw new AuthorizationException("User " + u.getName() + " Not allowed to " + f.getName());
+    }
+    this.jp.setState(State.COMPLETE);
+    JobPool.update(this.jp);
+  }
+
+  public Template viewTemplate(int id) throws SQLException {
+    return Template.getTemplate(id);
+  }
+
+  public Collection<Template> viewTemplates() throws SQLException {
+    return Template.getTemplates();
+  }
+
+  public Collection<Template> getObjects() throws SQLException {
+    return new TMCSet<Template>(this.viewTemplates());
+  }
+
+  public Template getObject(int id) throws SQLException {
+    return this.viewTemplate(id);
+  }
+}
+
+
+
+
Index: org/apache/lokahi/core/api/template/Template.java
===================================================================
--- org/apache/lokahi/core/api/template/Template.java	(revision 0)
+++ org/apache/lokahi/core/api/template/Template.java	(revision 0)
@@ -0,0 +1,289 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+* 
+*   http://www.apache.org/licenses/LICENSE-2.0
+* 
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+package org.apache.lokahi.core.api.template;
+
+import org.apache.log4j.Logger;
+import org.apache.lokahi.core.common.database.BrokerFactory;
+import org.apache.lokahi.core.common.interfaces.Entity;
+import org.apache.lokahi.core.common.interfaces.TMCBroker;
+import org.apache.lokahi.core.common.interfaces.TMCDao;
+import org.apache.lokahi.core.common.util.PropertiesFile;
+
+import java.sql.Blob;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.Collection;
+import java.util.LinkedHashMap;
+
+/**
+ * @author The Apache Incubated Lokahi project - http://incubator.apache.org/lokahi/
+ * @version $Id$
+ */
+public class Template extends TMCDao<Template> implements Entity {
+  static final Logger logger = Logger.getLogger(Template.class);
+  private static final TMCBroker<Template> broker = new BrokerFactory<Template>().getBroker();
+  private int pk;
+  private String name;
+  private String content;
+  private String descriptor;
+  private String path;
+
+  public Template() {
+	  // create a new empty template
+  }
+
+  public Template(String name, String content, String discriptor, String path) {
+    this.name = name;
+    this.content = content;
+    this.descriptor = discriptor;
+    this.path = path;
+  }
+
+  public Template(int pk, String name, String discriptor, String path, Blob content) throws SQLException {
+    this.pk = pk;
+    this.name = name;
+    this.descriptor = discriptor;
+    this.path = path;
+    if (content != null)
+      this.setContent(content.getBytes(1, (int) content.length()));
+  }
+
+  public int getPk() {
+    return this.pk;
+  }
+
+  public void setPk(int pk) {
+    this.pk = pk;
+  }
+
+  public String getName() {
+    return this.name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public String getContent() {
+    if (this.content == null) {
+      this.content = "";
+    }
+    return this.content;
+  }
+
+  public void setContent(byte[] content) {
+    if (content != null) {
+      this.content = new String(content);
+    } else {
+      if (logger.isDebugEnabled()) {
+        logger.debug("content=" + content);
+      }
+      this.content = "";
+    }
+  }
+
+  public void setContent(String content) {
+    this.content = content;
+  }
+
+  public String getDescriptor() {
+    return this.descriptor;
+  }
+
+  public void setDescriptor(String discriptor) {
+    this.descriptor = discriptor;
+  }
+
+  public String getPath() {
+    return this.path;
+  }
+
+  public void setPath(String path) {
+    this.path = path;
+  }
+
+  public Template fillObject(ResultSet r) throws SQLException {
+    return new Template(r.getInt("FILE_ID"), r.getString("FILE_NAME"), r.getString("FILE_DESCRIPTOR"), r.getString("FILE_PATH"), r.getBlob("FILE_CONTENT"));
+  }
+
+  static Template store(Template t) throws SQLException {
+	Template ret = null;
+    try {
+      t.setPk(broker.save("core.file.store", t.getName(), t.getDescriptor(), t.getPath()));
+      if (logger.isDebugEnabled()) {
+        logger.debug("t=" + t);
+      }
+      if (storeBlob(t.getPk(), t.getContent())) {
+        ret = t;
+      }
+    } catch (SQLException e) {
+        logger.error("Exception: " + e.getMessage());
+      throw e;
+    }
+    if (logger.isDebugEnabled()) {
+      logger.debug("Returning " + ret);
+    }
+    return ret;
+  }
+
+  static boolean update(Template t) throws SQLException {
+    boolean ret = false;
+    try {
+      broker.update("core.file.update", t.getPk(), t.getName(), t.getDescriptor(), t.getPath());
+      if (logger.isDebugEnabled()) {
+        logger.debug("t=" + t);
+      }
+      if (storeBlob(t.getPk(), t.getContent())) {
+        ret = true;
+      }
+    } catch (SQLException e) {
+        logger.error("Exception: " + e.getMessage());
+      throw e;
+    }
+    if (logger.isDebugEnabled()) {
+      logger.debug("Returning " + ret);
+    }
+    return ret;
+  }
+
+  private static boolean storeBlob(int id, String toStore) throws SQLException {
+    boolean ret = false;
+    try {
+        if ("oracle".equals(PropertiesFile.getConstantValue("lokahi.broker.type")))
+            storeBlobOracleImpl(id, toStore);
+        else
+            storeBlobStdImpl(id, toStore);
+      ret = true;
+    } catch (SQLException e) {
+        logger.error("Exception: " + e.getMessage());
+      throw e;
+    }
+    return ret;
+  }
+
+  private static void storeBlobOracleImpl(int id, String toStore) throws SQLException {   
+      broker.useSQL("core.file.prep.blob", id);
+      if (toStore == null) toStore = "";
+      byte[] blobBytes = toStore.getBytes();
+      broker.blobHack("core.file.content.lock", "core.file.content.update", id, blobBytes);      
+  }
+
+  private static void storeBlobStdImpl(int id, String toStore) throws SQLException {
+      if (toStore == null) toStore = "";
+      byte[] blobBytes = toStore.getBytes();
+      broker.useSQL("core.file.prep.blob", id ,blobBytes);
+  }
+
+  static boolean delete(Template f) throws SQLException {
+    return broker.delete("core.file.delete", f.getPk());
+  }
+
+  public Template get(int id) throws SQLException {
+    return broker.getObject(Template.class, "core.file.by.id", false, id);
+  }
+
+  /**
+   * @param id
+   *
+   * @return A template with the given id or null if it isn't found
+   * @throws SQLException
+   * @deprecated
+   */
+  public static Template getTemplate(int id) throws SQLException {
+	Template t;
+    try {
+      t = broker.getObject(Template.class, "core.file.by.id", false, id);
+    } catch (SQLException e) {
+        logger.error("SQLException: " + e.getMessage());
+      throw e;
+    }   
+    return t;
+  }
+
+  public static Collection<Template> getTemplates() throws SQLException {
+    Collection<Template> c;
+    try {
+      c = broker.getObjects(Template.class, false, "core.file.all");
+    } catch (SQLException e) {
+      if (logger.isInfoEnabled()) {
+        logger.info("Exception: " + e.getMessage());
+      }
+      throw e;
+    }
+    return c;
+  }
+
+  public StringBuilder buildShortXMLRepresentation() {
+    LinkedHashMap<String, String> map = new LinkedHashMap<String, String>(3, 1);
+    map.put("id", Integer.toString(this.getPk()));
+    map.put("name", this.getName());
+    map.put("href", PropertiesFile.getConstantValue("rest.servlet.url") + "template/" + this.getPk() + '/');
+    return elementBuilder("template", map);
+  }
+
+  public StringBuilder buildXMLRepresention() {
+    StringBuilder ret = new StringBuilder();
+    ret.append("<template>\n");
+    ret.append(elementBuilder("id", Integer.toString(this.getPk())));
+    ret.append(elementBuilder("name", this.getName()));
+    ret.append(elementBuilder("content", this.getContent()));
+    ret.append(elementBuilder("descriptor", this.getDescriptor()));
+    ret.append(elementBuilder("path", this.getPath()));
+    ret.append("</template>\n");
+    return ret;
+  }
+
+  public String toString() {
+    final StringBuffer buf = new StringBuffer();
+    buf.append("Template");
+    buf.append("{pk=").append(this.pk);
+    buf.append(",name=").append(this.name);
+    buf.append(",content=").append(this.content);
+    buf.append(",descriptor=").append(this.descriptor);
+    buf.append(",path=").append(this.path);
+    buf.append('}');
+    return buf.toString();
+  }
+
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (!(o instanceof Template)) return false;
+
+    final Template template = (Template) o;
+
+    if (this.pk != template.pk) return false;
+    if (this.descriptor != null ? !this.descriptor.equals(template.descriptor) : template.descriptor != null) return false;
+    if (this.name != null ? !this.name.equals(template.name) : template.name != null) return false;
+    if (this.path != null ? !this.path.equals(template.path) : template.path != null) return false;
+
+    return true;
+  }
+
+  public int hashCode() {
+    int result;
+    result = this.pk;
+    result = 29 * result + (this.name != null ? this.name.hashCode() : 0);
+    result = 29 * result + (this.descriptor != null ? this.descriptor.hashCode() : 0);
+    result = 29 * result + (this.path != null ? this.path.hashCode() : 0);
+    return result;
+  }
+}
+
+
+
Index: org/apache/lokahi/core/api/template/TemplateModel.java
===================================================================
--- org/apache/lokahi/core/api/template/TemplateModel.java	(revision 0)
+++ org/apache/lokahi/core/api/template/TemplateModel.java	(revision 0)
@@ -0,0 +1,100 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+* 
+*   http://www.apache.org/licenses/LICENSE-2.0
+* 
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+package org.apache.lokahi.core.api.template;
+
+import org.apache.lokahi.core.api.function.Function;
+import org.apache.lokahi.core.api.jobpool.JobPool;
+import org.apache.lokahi.core.api.state.State;
+import org.apache.lokahi.core.api.user.User;
+import org.apache.lokahi.core.common.collection.TMCSet;
+import org.apache.lokahi.core.common.exception.AuthorizationException;
+import org.apache.lokahi.core.common.exception.TMCIllegalArgumentException;
+import org.apache.lokahi.core.common.interfaces.LokahiModel;
+
+import java.sql.SQLException;
+import java.util.Collection;
+
+/**
+ * @author The Apache Incubated Lokahi project - http://incubator.apache.org/lokahi/
+ * @version $Id$
+ */
+public class TemplateModel extends LokahiModel<Template> {
+
+  public void addFile(User u, Template template, Function f) throws AuthorizationException, SQLException {
+    this.jpInit(f, u, template.getName());
+    if (u.isAllowed(f) && "AddFile".equals(f.getCommand())) {
+    	Template.store(template);
+    } else {
+      throw new AuthorizationException("User " + u.getName() + " Not allowed to " + f.getName());
+    }
+    this.jp.setState(State.COMPLETE);
+    JobPool.update(this.jp);
+  }
+
+  public void deleteFile(User u, Template template, Function f) throws SQLException, AuthorizationException, TMCIllegalArgumentException {
+    if (template == null || template.getPk() < 1) throw new TMCIllegalArgumentException("File can not be null");
+    this.jpInit(f, u, template.getName());
+    if (u.isAllowed(f) && "DeleteFile".equals(f.getCommand())) {
+    	Template.delete(template);
+    } else {
+      throw new AuthorizationException("User " + u.getName() + " Not allowed to " + f.getName());
+    }
+    this.jp.setState(State.COMPLETE);
+    JobPool.update(this.jp);
+  }
+
+  public void deleteFile(User u, Collection<Template> templates, Function f) throws AuthorizationException, TMCIllegalArgumentException, SQLException {
+    for (Template template : templates) this.deleteFile(u, template, f);
+  }  //todo fix the quick hack so that we only create one jobpool for the list of files we want to delete.
+
+  public void updateFile(User u, Template template, Function f) throws AuthorizationException, TMCIllegalArgumentException, SQLException {
+    this.jpInit(f, u, template.getName());
+    if (u.isAllowed(f) && "UpdateFile".equals(f.getCommand())) {
+      if (template.getPk() >= 1 && template.getName() != null && !"".equals(template.getName())) {
+    	  Template.update(template);
+      } else {
+        throw new TMCIllegalArgumentException("Template can not be null");
+      }
+    } else {
+      throw new AuthorizationException("User " + u.getName() + " Not allowed to " + f.getName());
+    }
+    this.jp.setState(State.COMPLETE);
+    JobPool.update(this.jp);
+  }
+
+  public Template viewTemplate(int id) throws SQLException {
+    return Template.getTemplate(id);
+  }
+
+  public Collection<Template> viewTemplates() throws SQLException {
+    return Template.getTemplates();
+  }
+
+  public Collection<Template> getObjects() throws SQLException {
+    return new TMCSet<Template>(this.viewTemplates());
+  }
+
+  public Template getObject(int id) throws SQLException {
+    return this.viewTemplate(id);
+  }
+}
+
+
+
+
Index: org/apache/lokahi/core/common/database/OracleBroker.java
===================================================================
--- org/apache/lokahi/core/common/database/OracleBroker.java	(revision 619464)
+++ org/apache/lokahi/core/common/database/OracleBroker.java	(working copy)
@@ -256,7 +256,7 @@
       stmt = getStatement(conn, statement, params, true);
       stmt.execute();
       r = (ResultSet) stmt.getObject(1);
-      if (r != null && r.next()) {
+      if (r != null && r.next()) {    	  
         o = fillObject(c, r);
         r.close();
       } else {
Index: org/apache/lokahi/core/common/interfaces/Application.java
===================================================================
--- org/apache/lokahi/core/common/interfaces/Application.java	(revision 619464)
+++ org/apache/lokahi/core/common/interfaces/Application.java	(working copy)
@@ -18,6 +18,11 @@
 */
 package org.apache.lokahi.core.common.interfaces;
 
+import java.util.Collection;
+
+import org.apache.lokahi.core.api.template.Template;
+
+
 /**
  * @author The Apache Incubated Lokahi project - http://incubator.apache.org/lokahi/
  * @version $Id$
@@ -30,7 +35,11 @@
   public abstract String getSysUser();
 
   public abstract String getSysGroup();
-
+  
+  public abstract Collection<Template> getTemplates();
+  
+  public abstract String getServerLocation();
+  
 }
 
 
Index: org/apache/lokahi/core/common/interfaces/LokahiModel.java
===================================================================
--- org/apache/lokahi/core/common/interfaces/LokahiModel.java	(revision 619464)
+++ org/apache/lokahi/core/common/interfaces/LokahiModel.java	(working copy)
@@ -24,11 +24,15 @@
 import org.apache.lokahi.core.api.project.Project;
 import org.apache.lokahi.core.api.state.State;
 import org.apache.lokahi.core.api.user.User;
+import org.apache.lokahi.core.common.database.BrokerFactory;
 import org.apache.lokahi.core.common.exception.AlreadyExistException;
 import org.apache.lokahi.core.common.exception.AuthorizationException;
 import org.apache.lokahi.core.common.exception.TMCException;
 import org.apache.lokahi.core.common.exception.TMCIllegalArgumentException;
 import org.apache.lokahi.core.common.exception.UnsupportedParameterException;
+import org.apache.lokahi.core.common.templating.TemplateBuilder;
+import org.apache.lokahi.core.common.templating.TemplateFactory;
+import org.apache.lokahi.httpd.api.worker.ApacheWorker;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -44,7 +48,8 @@
  */
 public abstract class LokahiModel<T extends Restable> {
   protected static final Logger logger = Logger.getLogger(LokahiModel.class);
-
+  protected static final TemplateEngine templateEngine = new TemplateFactory().getEngine();
+  
   protected static ThreadPoolExecutor tpe = new ThreadPoolExecutor(5, 20, 300, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>(25));
 
   public abstract Collection<T> getObjects() throws SQLException;
Index: org/apache/lokahi/core/common/interfaces/TemplateEngine.java
===================================================================
--- org/apache/lokahi/core/common/interfaces/TemplateEngine.java	(revision 0)
+++ org/apache/lokahi/core/common/interfaces/TemplateEngine.java	(revision 0)
@@ -0,0 +1,26 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+* 
+*   http://www.apache.org/licenses/LICENSE-2.0
+* 
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+package org.apache.lokahi.core.common.interfaces;
+
+import java.util.Collection;
+
+public interface TemplateEngine {
+	Collection<String> buildConfs(Object param);
+	String buildConf(Object... params);
+}
Index: org/apache/lokahi/core/common/interfaces/Worker.java
===================================================================
--- org/apache/lokahi/core/common/interfaces/Worker.java	(revision 0)
+++ org/apache/lokahi/core/common/interfaces/Worker.java	(revision 0)
@@ -0,0 +1,30 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+* 
+*   http://www.apache.org/licenses/LICENSE-2.0
+* 
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+package org.apache.lokahi.core.common.interfaces;
+
+import org.apache.lokahi.core.api.server.Hardware;
+
+/**
+ * @author The Apache Incubated Lokahi project - http://incubator.apache.org/lokahi/
+ * @version $Id$
+ */
+public interface Worker {
+	public Application getApplication();
+	public Hardware getHardware();
+}
Index: org/apache/lokahi/core/common/templating/TemplateDeployer.java
===================================================================
--- org/apache/lokahi/core/common/templating/TemplateDeployer.java	(revision 0)
+++ org/apache/lokahi/core/common/templating/TemplateDeployer.java	(revision 0)
@@ -0,0 +1,86 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+* 
+*   http://www.apache.org/licenses/LICENSE-2.0
+* 
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+package org.apache.lokahi.core.common.templating;
+
+import java.io.IOException;
+import java.sql.SQLException;
+
+import org.apache.log4j.Logger;
+import org.apache.lokahi.core.api.function.Function;
+import org.apache.lokahi.core.api.job.Job;
+import org.apache.lokahi.core.api.jobpool.JobPool;
+import org.apache.lokahi.core.api.template.Template;
+import org.apache.lokahi.core.common.interfaces.TemplateEngine;
+import org.apache.lokahi.core.common.interfaces.Worker;
+
+/**
+ * TemplateDeployer
+ * Deploys configuration files based on templates
+ * @author The Apache Incubated Lokahi project - http://incubator.apache.org/lokahi/
+ * @version $Id$
+ */
+public class TemplateDeployer implements Runnable {
+	public static final Logger logger = Logger.getLogger(TemplateDeployer.class);
+	protected static final TemplateEngine templateEngine = new TemplateFactory().getEngine();
+	
+	private final Worker worker;
+	private final JobPool jp;
+	private final boolean graceful;
+	private final Job prereq;
+	  
+	public TemplateDeployer(Worker worker, JobPool jobPool, boolean shouldGraceful) {
+		this.worker = worker;
+		this.graceful = shouldGraceful;
+		this.jp = jobPool;
+		this.prereq = null;
+	}
+
+	public TemplateDeployer(Job j, Worker worker, JobPool jobPool, boolean shouldGraceful) {
+		this.worker = worker;
+		this.graceful = shouldGraceful;
+		this.jp = jobPool;
+		this.prereq = j;
+	}
+  
+	/**
+	 * Gets all of the template files from the worker and deploys them 
+	 * 	 The path and file name are read from the template
+	 */
+	public void run() {
+	    try {
+	      Function f = Function.getFunction("PutFile");
+	      Job j = new Job();
+	      for (Object temp : this.worker.getApplication().getTemplates()) {
+	    	  Template template = (Template) temp; 
+	    	  j = new Job(this.prereq, template.getPath() + template.getDescriptor(), this.worker.getHardware(), f, this.jp);
+	    	  String conf = templateEngine.buildConf(this.worker, template.getPk());
+		      j.setResult(conf);
+		      j = Job.store(j);
+	      }
+	      if (j != null && this.graceful) {
+	    	  j = new Job(j, this.worker.getApplication().getServerLocation(), this.worker.getHardware(), Function.getFunction("GracefulApache"), this.jp);
+	    	  Job.store(j);
+	      }
+	    } catch (SQLException e) {
+	        logger.error("SQLException: " + e.getMessage());
+	    } catch (IOException e) {
+	        logger.error("SQLException: " + e.getMessage());
+	    }
+	  }
+}
Index: org/apache/lokahi/core/common/templating/VelocityTemplateBuilder.java
===================================================================
--- org/apache/lokahi/core/common/templating/VelocityTemplateBuilder.java	(revision 0)
+++ org/apache/lokahi/core/common/templating/VelocityTemplateBuilder.java	(revision 0)
@@ -0,0 +1,110 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+* 
+*   http://www.apache.org/licenses/LICENSE-2.0
+* 
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+package org.apache.lokahi.core.common.templating;
+
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.apache.log4j.Logger;
+import org.apache.lokahi.core.api.pool.HostingPool;
+import org.apache.lokahi.core.api.template.Template;
+import org.apache.lokahi.core.common.interfaces.TemplateEngine;
+import org.apache.lokahi.core.common.interfaces.Worker;
+import org.apache.lokahi.core.common.util.TMCVelocityViewTool;
+import org.apache.lokahi.httpd.api.entity.VirtualHost;
+import org.apache.lokahi.tomcat.api.entity.TomcatContext;
+import org.apache.velocity.VelocityContext;
+import org.apache.velocity.app.Velocity;
+
+/**
+ * VelocityTemplateBuilder
+ * Builds configuration files based on a velocity template
+ * @author The Apache Incubated Lokahi project - http://incubator.apache.org/lokahi/
+ * @version $Id$
+ */
+public class VelocityTemplateBuilder implements TemplateEngine {
+	static final Logger logger = Logger.getLogger(VelocityTemplateBuilder.class);
+	
+	/**
+	 * Builds a collection of configuration files from the workers templates
+	 * @param worker - The worker whose configuration files will be built 
+	 * @return A collection of the built configuration files
+	 */
+	public Collection<String> buildConfs(Object worker) {
+		Collection<String> confFiles = new ArrayList<String>();
+		StringWriter w = new StringWriter();
+		try {
+			Collection<Template> confTemplates = ((Worker) worker).getApplication().getTemplates();
+			for (Template confTemplate : confTemplates) {
+				String confFile = confTemplate.getContent();
+		
+				Velocity.init();
+				VelocityContext context = new VelocityContext();
+				context.put("worker", worker); // replace the $worker with the actual worker
+				context.put("hpTool", new HostingPool());
+				context.put("vhTool", new VirtualHost());
+				context.put("contextTool", new TomcatContext());
+				context.put("view", new TMCVelocityViewTool());
+				context.put("n", '\n');
+				Velocity.evaluate(context, w, confTemplate.getName(), confFile);
+				confFiles.add(w.toString());
+			}
+		} catch (Exception e) {
+			logger.error("Exception building the cofig file: " + e.getMessage());
+		}
+	    return confFiles;
+	}
+	
+	/**
+	 * Builds a configuration file from a worker and its template
+	 * @param params - An array of parameters: The worker and the template ID 
+	 * @return A built configuration file
+	 */
+	public String buildConf(Object[] params) {
+		Worker worker = (Worker) params[0];
+		int id = (Integer)params[1];
+		String builtConfFile = "";
+		StringWriter w = new StringWriter();
+		try {
+			Collection<Template> confTemplates = worker.getApplication().getTemplates();
+			for (Template confTemplate : confTemplates) {
+				if (confTemplate.getPk() == id) {
+					String confFile = confTemplate.getContent();
+					
+					Velocity.init();
+					VelocityContext context = new VelocityContext();
+					context.put("worker", worker); // replace the $worker with the actual worker 
+					context.put("hpTool", new HostingPool());
+					context.put("vhTool", new VirtualHost());
+					context.put("contextTool", new TomcatContext());
+					context.put("view", new TMCVelocityViewTool());
+					context.put("n", '\n');
+					Velocity.evaluate(context, w, confTemplate.getName(), confFile);
+					builtConfFile = w.toString();
+					break;
+				}
+			}
+		} catch (Exception e) {
+			logger.error("Exception building the cofig file: " + e.getMessage());
+		}
+	    return builtConfFile;
+	}
+
+}
Index: org/apache/lokahi/core/common/templating/TemplateBuilder.java
===================================================================
--- org/apache/lokahi/core/common/templating/TemplateBuilder.java	(revision 0)
+++ org/apache/lokahi/core/common/templating/TemplateBuilder.java	(revision 0)
@@ -0,0 +1,86 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+* 
+*   http://www.apache.org/licenses/LICENSE-2.0
+* 
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+package org.apache.lokahi.core.common.templating;
+
+import java.util.Collection;
+
+import org.apache.log4j.Logger;
+import org.apache.lokahi.core.common.interfaces.TemplateEngine;
+
+/**
+ * 
+ * @author feist
+ * 
+ */
+/**
+ * TemplateBuilder 
+ * Builds a configuration file from a template
+ * @author The Apache Incubated Lokahi project - http://incubator.apache.org/lokahi/
+ * @version $Id$
+ */
+public class TemplateBuilder implements TemplateEngine {
+	static final Logger logger = Logger.getLogger(TemplateBuilder.class);
+	public final static String DEFAULT_ENGINE_IMPLEMENTATION = "org.apache.lokahi.core.common.templating.VelocityTemplateBuilder";
+	    
+	private static String masterEngineClassName = DEFAULT_ENGINE_IMPLEMENTATION;
+	    
+	private TemplateEngine masterEngine;
+	
+	/**
+	 * Create a new Template builder. 
+	 * This instantiates a new template builder with the class name of masterEngineClassName
+	 */
+	public TemplateBuilder() {
+		super();
+		if (logger.isDebugEnabled()) {
+			logger.debug("Instantiate a '"+masterEngineClassName+"' template builder.");
+		}
+		try {
+			masterEngine = (TemplateEngine) Class.forName(masterEngineClassName).newInstance();
+		} catch (InstantiationException e) {
+			e.printStackTrace();
+		} catch (IllegalAccessException e) {
+			e.printStackTrace();
+		} catch (ClassNotFoundException e) {
+			e.printStackTrace();
+		}
+	}
+	
+	/**
+	 * Sets the master engine class name
+	 * @param masterEngineClassName - The class name of the templating engine to use
+	 */
+	public static void setMasterEngineClassName(String masterEngineClassName) {
+		TemplateBuilder.masterEngineClassName = masterEngineClassName;
+	}
+	 
+	/**
+	 * Builds a collection of configuration files from templates
+	 */
+	public Collection<String> buildConfs(Object param) {
+		return masterEngine.buildConfs(param);
+	}
+	  
+	/**
+	 * Builds a single configuration file from a template
+	 */
+	public String buildConf(Object... params) {
+		return masterEngine.buildConf(params);
+	}
+}
Index: org/apache/lokahi/core/common/templating/TemplateFactory.java
===================================================================
--- org/apache/lokahi/core/common/templating/TemplateFactory.java	(revision 0)
+++ org/apache/lokahi/core/common/templating/TemplateFactory.java	(revision 0)
@@ -0,0 +1,41 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+* 
+*   http://www.apache.org/licenses/LICENSE-2.0
+* 
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+package org.apache.lokahi.core.common.templating;
+
+import org.apache.log4j.Logger;
+import org.apache.lokahi.core.common.interfaces.TemplateEngine;
+
+/**
+ * TemplateFactory 
+ * Gets a new template builder based on the engine that is provided
+ * @author The Apache Incubated Lokahi project - http://incubator.apache.org/lokahi/
+ * @version $Id$
+ */
+public class TemplateFactory {
+	static final Logger logger = Logger.getLogger(TemplateFactory.class);
+
+	public TemplateFactory() {
+	}
+	
+	  public TemplateEngine getEngine() {
+		    return new TemplateBuilder();
+		  }
+	
+	
+}
Index: org/apache/lokahi/core/common/templating/TemplateBuilder.java
===================================================================
--- org/apache/lokahi/core/common/templating/TemplateBuilder.java	(revision 0)
+++ org/apache/lokahi/core/common/templating/TemplateBuilder.java	(revision 0)
@@ -0,0 +1,86 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+* 
+*   http://www.apache.org/licenses/LICENSE-2.0
+* 
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+package org.apache.lokahi.core.common.templating;
+
+import java.util.Collection;
+
+import org.apache.log4j.Logger;
+import org.apache.lokahi.core.common.interfaces.TemplateEngine;
+
+/**
+ * 
+ * @author feist
+ * 
+ */
+/**
+ * TemplateBuilder 
+ * Builds a configuration file from a template
+ * @author The Apache Incubated Lokahi project - http://incubator.apache.org/lokahi/
+ * @version $Id$
+ */
+public class TemplateBuilder implements TemplateEngine {
+	static final Logger logger = Logger.getLogger(TemplateBuilder.class);
+	public final static String DEFAULT_ENGINE_IMPLEMENTATION = "org.apache.lokahi.core.common.templating.VelocityTemplateBuilder";
+	    
+	private static String masterEngineClassName = DEFAULT_ENGINE_IMPLEMENTATION;
+	    
+	private TemplateEngine masterEngine;
+	
+	/**
+	 * Create a new Template builder. 
+	 * This instantiates a new template builder with the class name of masterEngineClassName
+	 */
+	public TemplateBuilder() {
+		super();
+		if (logger.isDebugEnabled()) {
+			logger.debug("Instantiate a '"+masterEngineClassName+"' template builder.");
+		}
+		try {
+			masterEngine = (TemplateEngine) Class.forName(masterEngineClassName).newInstance();
+		} catch (InstantiationException e) {
+			e.printStackTrace();
+		} catch (IllegalAccessException e) {
+			e.printStackTrace();
+		} catch (ClassNotFoundException e) {
+			e.printStackTrace();
+		}
+	}
+	
+	/**
+	 * Sets the master engine class name
+	 * @param masterEngineClassName - The class name of the templating engine to use
+	 */
+	public static void setMasterEngineClassName(String masterEngineClassName) {
+		TemplateBuilder.masterEngineClassName = masterEngineClassName;
+	}
+	 
+	/**
+	 * Builds a collection of configuration files from templates
+	 */
+	public Collection<String> buildConfs(Object param) {
+		return masterEngine.buildConfs(param);
+	}
+	  
+	/**
+	 * Builds a single configuration file from a template
+	 */
+	public String buildConf(Object... params) {
+		return masterEngine.buildConf(params);
+	}
+}
Index: org/apache/lokahi/core/common/templating/TemplateDeployer.java
===================================================================
--- org/apache/lokahi/core/common/templating/TemplateDeployer.java	(revision 0)
+++ org/apache/lokahi/core/common/templating/TemplateDeployer.java	(revision 0)
@@ -0,0 +1,86 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+* 
+*   http://www.apache.org/licenses/LICENSE-2.0
+* 
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+package org.apache.lokahi.core.common.templating;
+
+import java.io.IOException;
+import java.sql.SQLException;
+
+import org.apache.log4j.Logger;
+import org.apache.lokahi.core.api.function.Function;
+import org.apache.lokahi.core.api.job.Job;
+import org.apache.lokahi.core.api.jobpool.JobPool;
+import org.apache.lokahi.core.api.template.Template;
+import org.apache.lokahi.core.common.interfaces.TemplateEngine;
+import org.apache.lokahi.core.common.interfaces.Worker;
+
+/**
+ * TemplateDeployer
+ * Deploys configuration files based on templates
+ * @author The Apache Incubated Lokahi project - http://incubator.apache.org/lokahi/
+ * @version $Id$
+ */
+public class TemplateDeployer implements Runnable {
+	public static final Logger logger = Logger.getLogger(TemplateDeployer.class);
+	protected static final TemplateEngine templateEngine = new TemplateFactory().getEngine();
+	
+	private final Worker worker;
+	private final JobPool jp;
+	private final boolean graceful;
+	private final Job prereq;
+	  
+	public TemplateDeployer(Worker worker, JobPool jobPool, boolean shouldGraceful) {
+		this.worker = worker;
+		this.graceful = shouldGraceful;
+		this.jp = jobPool;
+		this.prereq = null;
+	}
+
+	public TemplateDeployer(Job j, Worker worker, JobPool jobPool, boolean shouldGraceful) {
+		this.worker = worker;
+		this.graceful = shouldGraceful;
+		this.jp = jobPool;
+		this.prereq = j;
+	}
+  
+	/**
+	 * Gets all of the template files from the worker and deploys them 
+	 * 	 The path and file name are read from the template
+	 */
+	public void run() {
+	    try {
+	      Function f = Function.getFunction("PutFile");
+	      Job j = new Job();
+	      for (Object temp : this.worker.getApplication().getTemplates()) {
+	    	  Template template = (Template) temp; 
+	    	  j = new Job(this.prereq, template.getPath() + template.getDescriptor(), this.worker.getHardware(), f, this.jp);
+	    	  String conf = templateEngine.buildConf(this.worker, template.getPk());
+		      j.setResult(conf);
+		      j = Job.store(j);
+	      }
+	      if (j != null && this.graceful) {
+	    	  j = new Job(j, this.worker.getApplication().getServerLocation(), this.worker.getHardware(), Function.getFunction("GracefulApache"), this.jp);
+	    	  Job.store(j);
+	      }
+	    } catch (SQLException e) {
+	        logger.error("SQLException: " + e.getMessage());
+	    } catch (IOException e) {
+	        logger.error("SQLException: " + e.getMessage());
+	    }
+	  }
+}
Index: org/apache/lokahi/core/common/templating/TemplateFactory.java
===================================================================
--- org/apache/lokahi/core/common/templating/TemplateFactory.java	(revision 0)
+++ org/apache/lokahi/core/common/templating/TemplateFactory.java	(revision 0)
@@ -0,0 +1,41 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+* 
+*   http://www.apache.org/licenses/LICENSE-2.0
+* 
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+package org.apache.lokahi.core.common.templating;
+
+import org.apache.log4j.Logger;
+import org.apache.lokahi.core.common.interfaces.TemplateEngine;
+
+/**
+ * TemplateFactory 
+ * Gets a new template builder based on the engine that is provided
+ * @author The Apache Incubated Lokahi project - http://incubator.apache.org/lokahi/
+ * @version $Id$
+ */
+public class TemplateFactory {
+	static final Logger logger = Logger.getLogger(TemplateFactory.class);
+
+	public TemplateFactory() {
+	}
+	
+	  public TemplateEngine getEngine() {
+		    return new TemplateBuilder();
+		  }
+	
+	
+}
Index: org/apache/lokahi/core/common/templating/VelocityTemplateBuilder.java
===================================================================
--- org/apache/lokahi/core/common/templating/VelocityTemplateBuilder.java	(revision 0)
+++ org/apache/lokahi/core/common/templating/VelocityTemplateBuilder.java	(revision 0)
@@ -0,0 +1,110 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+* 
+*   http://www.apache.org/licenses/LICENSE-2.0
+* 
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+package org.apache.lokahi.core.common.templating;
+
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.apache.log4j.Logger;
+import org.apache.lokahi.core.api.pool.HostingPool;
+import org.apache.lokahi.core.api.template.Template;
+import org.apache.lokahi.core.common.interfaces.TemplateEngine;
+import org.apache.lokahi.core.common.interfaces.Worker;
+import org.apache.lokahi.core.common.util.TMCVelocityViewTool;
+import org.apache.lokahi.httpd.api.entity.VirtualHost;
+import org.apache.lokahi.tomcat.api.entity.TomcatContext;
+import org.apache.velocity.VelocityContext;
+import org.apache.velocity.app.Velocity;
+
+/**
+ * VelocityTemplateBuilder
+ * Builds configuration files based on a velocity template
+ * @author The Apache Incubated Lokahi project - http://incubator.apache.org/lokahi/
+ * @version $Id$
+ */
+public class VelocityTemplateBuilder implements TemplateEngine {
+	static final Logger logger = Logger.getLogger(VelocityTemplateBuilder.class);
+	
+	/**
+	 * Builds a collection of configuration files from the workers templates
+	 * @param worker - The worker whose configuration files will be built 
+	 * @return A collection of the built configuration files
+	 */
+	public Collection<String> buildConfs(Object worker) {
+		Collection<String> confFiles = new ArrayList<String>();
+		StringWriter w = new StringWriter();
+		try {
+			Collection<Template> confTemplates = ((Worker) worker).getApplication().getTemplates();
+			for (Template confTemplate : confTemplates) {
+				String confFile = confTemplate.getContent();
+		
+				Velocity.init();
+				VelocityContext context = new VelocityContext();
+				context.put("worker", worker); // replace the $worker with the actual worker
+				context.put("hpTool", new HostingPool());
+				context.put("vhTool", new VirtualHost());
+				context.put("contextTool", new TomcatContext());
+				context.put("view", new TMCVelocityViewTool());
+				context.put("n", '\n');
+				Velocity.evaluate(context, w, confTemplate.getName(), confFile);
+				confFiles.add(w.toString());
+			}
+		} catch (Exception e) {
+			logger.error("Exception building the cofig file: " + e.getMessage());
+		}
+	    return confFiles;
+	}
+	
+	/**
+	 * Builds a configuration file from a worker and its template
+	 * @param params - An array of parameters: The worker and the template ID 
+	 * @return A built configuration file
+	 */
+	public String buildConf(Object[] params) {
+		Worker worker = (Worker) params[0];
+		int id = (Integer)params[1];
+		String builtConfFile = "";
+		StringWriter w = new StringWriter();
+		try {
+			Collection<Template> confTemplates = worker.getApplication().getTemplates();
+			for (Template confTemplate : confTemplates) {
+				if (confTemplate.getPk() == id) {
+					String confFile = confTemplate.getContent();
+					
+					Velocity.init();
+					VelocityContext context = new VelocityContext();
+					context.put("worker", worker); // replace the $worker with the actual worker 
+					context.put("hpTool", new HostingPool());
+					context.put("vhTool", new VirtualHost());
+					context.put("contextTool", new TomcatContext());
+					context.put("view", new TMCVelocityViewTool());
+					context.put("n", '\n');
+					Velocity.evaluate(context, w, confTemplate.getName(), confFile);
+					builtConfFile = w.toString();
+					break;
+				}
+			}
+		} catch (Exception e) {
+			logger.error("Exception building the cofig file: " + e.getMessage());
+		}
+	    return builtConfFile;
+	}
+
+}
Index: org/apache/lokahi/core/common/util/TMCVelocityViewTool.java
===================================================================
--- org/apache/lokahi/core/common/util/TMCVelocityViewTool.java	(revision 619464)
+++ org/apache/lokahi/core/common/util/TMCVelocityViewTool.java	(working copy)
@@ -30,8 +30,10 @@
 import org.apache.lokahi.core.api.project.Project;
 import org.apache.lokahi.core.api.server.Hardware;
 import org.apache.lokahi.core.api.state.State;
+import org.apache.lokahi.core.api.template.Template;
 import org.apache.lokahi.core.api.user.User;
 import org.apache.lokahi.core.common.collection.TMCCollectionImpl;
+import org.apache.lokahi.core.common.interfaces.Collectable;
 import org.apache.lokahi.httpd.api.entity.VirtualHost;
 import org.apache.lokahi.httpd.api.pool.ApachePool;
 import org.apache.lokahi.httpd.api.server.Apache;
@@ -44,6 +46,7 @@
 import java.sql.SQLException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
 import java.util.TreeMap;
@@ -63,9 +66,7 @@
     try {
       c = Project.getProjects(name.trim() + '%');
     } catch (SQLException e) {
-      if (logger.isInfoEnabled()) {
-        logger.info("Exception: " + e.getMessage());
-      }
+        logger.error("SQLException: " + e.getMessage());
     }
     return c;
   }
@@ -76,9 +77,7 @@
     try {
       c = Project.getProjects('%' + name.trim());
     } catch (SQLException e) {
-      if (logger.isInfoEnabled()) {
-        logger.info("Exception: " + e.getMessage());
-      }
+        logger.error("SQLException: " + e.getMessage());
     }
     return c;
   }
@@ -89,9 +88,7 @@
     try {
       c = Project.getProjects('%' + name.trim() + '%');
     } catch (SQLException e) {
-      if (logger.isInfoEnabled()) {
-        logger.info("Exception: " + e.getMessage());
-      }
+        logger.error("SQLException: " + e.getMessage());
     }
     return c;
   }
@@ -102,9 +99,7 @@
     try {
       c = Project.getProjects(name.trim());
     } catch (SQLException e) {
-      if (logger.isInfoEnabled()) {
-        logger.info("Exception: " + e.getMessage());
-      }
+        logger.error("SQLException: " + e.getMessage());
     }
     return c;
   }
@@ -134,9 +129,7 @@
     try {
       jp = JobPool.getJobPool(id);
     } catch (SQLException e) {
-      if (logger.isInfoEnabled()) {
-        logger.info("Exception: " + e.getMessage());
-      }
+        logger.error("SQLException: " + e.getMessage());
     }
     return jp;
   }
@@ -147,9 +140,7 @@
     try {
       jp = JobPool.getJobPool(Integer.parseInt(id));
     } catch (SQLException e) {
-      if (logger.isInfoEnabled()) {
-        logger.info("Exception: " + e.getMessage());
-      }
+        logger.error("SQLException: " + e.getMessage());
     }
     return jp;
   }
@@ -160,9 +151,7 @@
     try {
       c.addAll(HostingPool.getHostingPools());
     } catch (SQLException e) {
-      if (logger.isInfoEnabled()) {
-        logger.info("Exception: " + e.getMessage());
-      }
+        logger.error("SQLException: " + e.getMessage());
     }
     return c.orderByName().values();
   }
@@ -172,9 +161,7 @@
     try {
       c.addAll(HostingPool.getHostingPools(ap, true));
     } catch (SQLException e) {
-      if (logger.isInfoEnabled()) {
-        logger.info("Exception: " + e.getMessage());
-      }
+        logger.error("SQLException: " + e.getMessage());
     }
     return c.orderByName().values();
   }
@@ -184,9 +171,7 @@
     try {
       c.addAll(HostingPool.getHostingPools(tp, true));
     } catch (SQLException e) {
-      if (logger.isInfoEnabled()) {
-        logger.info("Exception: " + e.getMessage());
-      }
+        logger.error("SQLException: " + e.getMessage());
     }
     return c.orderByName().values();
   }
@@ -198,9 +183,7 @@
       try {
         hp = HostingPool.getHostingPool(Integer.parseInt(id), true);
       } catch (SQLException e) {
-        if (logger.isInfoEnabled()) {
-          logger.info("Exception: " + e.getMessage());
-        }
+          logger.error("SQLException: " + e.getMessage());
       }
     }
     return hp;
@@ -212,9 +195,7 @@
     try {
       c.addAll(HostingPool.getHostingPools(name, true));
     } catch (SQLException e) {
-      if (logger.isInfoEnabled()) {
-        logger.info("Exception: " + e.getMessage());
-      }
+        logger.error("SQLException: " + e.getMessage());
     }
     return c.orderByName().values();
   }
@@ -225,9 +206,7 @@
     try {
       c.addAll(ApachePool.getApachePools());
     } catch (SQLException e) {
-      if (logger.isInfoEnabled()) {
-        logger.info("Exception: " + e.getMessage());
-      }
+        logger.error("SQLException: " + e.getMessage());
     }
     return c.orderByName().values();
   }
@@ -237,9 +216,7 @@
     try {
       c.addAll(ApachePool.getApachePools(aw));
     } catch (SQLException e) {
-      if (logger.isInfoEnabled()) {
-        logger.info("Exception: " + e.getMessage());
-      }
+        logger.error("SQLException: " + e.getMessage());
     }
     return c.orderByName().values();
   }
@@ -250,9 +227,7 @@
     try {
       c.addAll(ApachePool.getApachePools(name));
     } catch (SQLException e) {
-      if (logger.isInfoEnabled()) {
-        logger.info("Exception: " + e.getMessage());
-      }
+        logger.error("SQLException: " + e.getMessage());
     }
     return c.orderByName().values();
   }
@@ -264,9 +239,7 @@
       try {
         ap = ApachePool.getApachePool(Integer.parseInt(id));
       } catch (SQLException e) {
-        if (logger.isInfoEnabled()) {
-          logger.info("Exception: " + e.getMessage());
-        }
+          logger.error("SQLException: " + e.getMessage());
       }
     }
     return ap;
@@ -277,9 +250,7 @@
     try {
       c.addAll(Function.getFunctions());
     } catch (SQLException e) {
-      if (logger.isInfoEnabled()) {
-        logger.info("Exception: " + e.getMessage());
-      }
+        logger.error("SQLException: " + e.getMessage());
     }
     return c.orderByName().values();
   }
@@ -314,9 +285,7 @@
     try {
       c.addAll(TomcatPool.getTomcatPools());
     } catch (SQLException e) {
-      if (logger.isInfoEnabled()) {
-        logger.info("Exception: " + e.getMessage());
-      }
+        logger.error("SQLException: " + e.getMessage());
     }
     return c.orderByName().values();
   }
@@ -326,9 +295,7 @@
     try {
       c.addAll(TomcatPool.getTomcatPools(tw));
     } catch (SQLException e) {
-      if (logger.isInfoEnabled()) {
-        logger.info("Exception: " + e.getMessage());
-      }
+        logger.error("SQLException: " + e.getMessage());
     }
     return c.orderByName().values();
   }
@@ -339,9 +306,7 @@
     try {
       c.addAll(TomcatPool.getTomcatPools(name));
     } catch (SQLException e) {
-      if (logger.isInfoEnabled()) {
-        logger.info("Exception: " + e.getMessage());
-      }
+        logger.error("SQLException: " + e.getMessage());
     }
     return c.orderByName().values();
   }
@@ -353,9 +318,7 @@
       try {
         tp = TomcatPool.getTomcatPool(Integer.parseInt(id));
       } catch (SQLException e) {
-        if (logger.isInfoEnabled()) {
-          logger.info("Exception: " + e.getMessage());
-        }
+          logger.error("SQLException: " + e.getMessage());
       }
     }
     return tp;
@@ -367,9 +330,7 @@
     try {
       c.addAll(Tomcat.getTomcats());
     } catch (SQLException e) {
-      if (logger.isInfoEnabled()) {
-        logger.info("Exception: " + e.getMessage());
-      }
+        logger.error("SQLException: " + e.getMessage());
     }
     return c.orderByName().values();
   }
@@ -380,9 +341,7 @@
     try {
       c.addAll(Tomcat.getTomcats(name, true));
     } catch (SQLException e) {
-      if (logger.isInfoEnabled()) {
-        logger.info("Exception: " + e.getMessage());
-      }
+        logger.error("SQLException: " + e.getMessage());
     }
     return c.orderByName().values();
   }
@@ -394,9 +353,7 @@
       try {
         tc = Tomcat.getTomcat(Integer.parseInt(id), true);
       } catch (SQLException e) {
-        if (logger.isInfoEnabled()) {
-          logger.info("Exception: " + e.getMessage());
-        }
+          logger.error("SQLException: " + e.getMessage());
       }
     }
     return tc;
@@ -408,9 +365,7 @@
     try {
       c.addAll(TomcatWorker.getTomcatWorkers(false));
     } catch (SQLException e) {
-      if (logger.isInfoEnabled()) {
-        logger.info("Exception: " + e.getMessage());
-      }
+        logger.error("SQLException: " + e.getMessage());
     }
     return c.orderByName().values();
   }
@@ -420,9 +375,7 @@
     try {
       c.addAll(TomcatWorker.getTomcatWorkers(t, false));
     } catch (SQLException e) {
-      if (logger.isInfoEnabled()) {
-        logger.info("Exception: " + e.getMessage());
-      }
+        logger.error("SQLException: " + e.getMessage());
     }
     return c.orderByName().values();
   }
@@ -433,9 +386,7 @@
     try {
       c.addAll(TomcatWorker.getTomcatWorkers(name, false));
     } catch (SQLException e) {
-      if (logger.isInfoEnabled()) {
-        logger.info("Exception: " + e.getMessage());
-      }
+        logger.error("Exception: " + e.getMessage());
     }
     return c.orderByName().values();
   }
@@ -447,9 +398,7 @@
       try {
         tc = TomcatWorker.getTomcatWorker(Integer.parseInt(id), false);
       } catch (SQLException e) {
-        if (logger.isInfoEnabled()) {
-          logger.info("Exception: " + e.getMessage());
-        }
+          logger.error("Exception: " + e.getMessage());
       }
     } else {
       if (logger.isDebugEnabled()) {
@@ -469,9 +418,7 @@
       try {
         h = Hardware.getHardware(Integer.parseInt(id), true);
       } catch (SQLException e) {
-        if (logger.isInfoEnabled()) {
-          logger.info("Exception: " + e.getMessage());
-        }
+          logger.error("Exception: " + e.getMessage());
       }
     }
     return h;
@@ -483,9 +430,7 @@
     try {
       c.addAll(Hardware.getHardwares());
     } catch (SQLException e) {
-      if (logger.isInfoEnabled()) {
-        logger.info("Exception: " + e.getMessage());
-      }
+        logger.error("Exception: " + e.getMessage());
     }
     return c.orderByName().values();
   }
@@ -496,9 +441,7 @@
     try {
       c.addAll(Hardware.getHardwares(name, true));
     } catch (SQLException e) {
-      if (logger.isInfoEnabled()) {
-        logger.info("Exception: " + e.getMessage());
-      }
+        logger.error("Exception: " + e.getMessage());
     }
     return c.orderByName().values();
   }
@@ -509,9 +452,7 @@
     try {
       c.addAll(Apache.getApaches());
     } catch (SQLException e) {
-      if (logger.isInfoEnabled()) {
-        logger.info("Exception: " + e.getMessage());
-      }
+        logger.error("Exception: " + e.getMessage());
     }
     return c.orderByName().values();
   }
@@ -522,9 +463,7 @@
     try {
       c.addAll(Apache.getApaches(name, true));
     } catch (SQLException e) {
-      if (logger.isInfoEnabled()) {
-        logger.info("Exception: " + e.getMessage());
-      }
+        logger.error("Exception: " + e.getMessage());
     }
     return c.orderByName().values();
   }
@@ -536,9 +475,7 @@
       try {
         ap = Apache.getApache(Integer.parseInt(id), true);
       } catch (SQLException e) {
-        if (logger.isInfoEnabled()) {
-          logger.info("Exception: " + e.getMessage());
-        }
+          logger.error("Exception: " + e.getMessage());
       }
     }
     return ap;
@@ -550,9 +487,7 @@
     try {
       c.addAll(ApacheWorker.getApacheWorkers(false));
     } catch (SQLException e) {
-      if (logger.isInfoEnabled()) {
-        logger.info("Exception: " + e.getMessage());
-      }
+        logger.error("Exception: " + e.getMessage());
     }
     return c.orderByName().values();
   }
@@ -563,9 +498,7 @@
     try {
       c.addAll(ApacheWorker.getApacheWorkers(name, false));
     } catch (SQLException e) {
-      if (logger.isInfoEnabled()) {
-        logger.info("Exception: " + e.getMessage());
-      }
+        logger.error("Exception: " + e.getMessage());
     }
     return c.orderByName().values();
   }
@@ -577,9 +510,7 @@
       try {
         ap = ApacheWorker.getApacheWorker(Integer.parseInt(id), false);
       } catch (SQLException e) {
-        if (logger.isInfoEnabled()) {
-          logger.info("Exception: " + e.getMessage());
-        }
+          logger.error("Exception: " + e.getMessage());
       }
     }
     return ap;
@@ -613,9 +544,7 @@
         c = ((TMCCollectionImpl<Environment>) c).orderByName().values();
       }
     } catch (SQLException e) {
-      if (logger.isInfoEnabled()) {
-        logger.info("Exception: " + e.getMessage());
-      }
+        logger.error("Exception: " + e.getMessage());
     }
     if (logger.isDebugEnabled()) {
       logger.debug("Returning " + c);
@@ -630,9 +559,7 @@
       try {
         e = Environment.getEnviroment(Integer.parseInt(id), true);
       } catch (SQLException e1) {
-        if (logger.isInfoEnabled()) {
-          logger.info("Exception: " + e1.getMessage());
-        }
+          logger.error("Exception: " + e1.getMessage());
       }
     }
     return e;
@@ -647,9 +574,7 @@
         c = ((TMCCollectionImpl<Instance>) c).orderByName().values();
       }
     } catch (SQLException e) {
-      if (logger.isInfoEnabled()) {
-        logger.info("Exception: " + e.getMessage());
-      }
+        logger.error("Exception: " + e.getMessage());
     }
     return c;
   }
@@ -661,9 +586,7 @@
       try {
         i = Instance.getInstance(Integer.parseInt(id), true);
       } catch (SQLException e) {
-        if (logger.isInfoEnabled()) {
-          logger.info("Exception: " + e.getMessage());
-        }
+          logger.error("Exception: " + e.getMessage());
       }
     }
     return i;
@@ -678,9 +601,7 @@
         c = ((TMCCollectionImpl<File>) c).orderByName().values();
       }
     } catch (SQLException e) {
-      if (logger.isInfoEnabled()) {
-        logger.info("Exception: " + e.getMessage());
-      }
+        logger.error("Exception: " + e.getMessage());
     }
     return c;
   }
@@ -692,23 +613,46 @@
       try {
         file = File.getFile(Integer.parseInt(id));
       } catch (SQLException e) {
-        if (logger.isInfoEnabled()) {
-          logger.info("Exception: " + e.getMessage());
-        }
+          logger.error("Exception: " + e.getMessage());
       }
     }
     return file;
   }
 
   /** @deprecated  */
+  public Collection<Template> getTemplates() {
+    Collection<Template> c = null;
+    try {
+      c = Template.getTemplates();
+      if (c instanceof TMCCollectionImpl) {
+        c = ((TMCCollectionImpl<Template>) c).orderByName().values();
+      }
+    } catch (SQLException e) {
+        logger.error("SQLException: " + e.getMessage());
+    }
+    return c;
+  }
+
+  /** @deprecated  */
+  public Template getTemplate(String id) {
+	Template template = null;
+    if (!"".equals(id)) {
+      try {
+    	  template = Template.getTemplate(Integer.parseInt(id));
+      } catch (SQLException e) {
+          logger.error("SQLException: " + e.getMessage());
+      }
+    }
+    return template;
+  }
+  
+  /** @deprecated  */
   public Collection<User> getUsers() {
     TMCCollectionImpl<User> c = new TMCCollectionImpl<User>();
     try {
       c.addAll(User.getAllUsers());
     } catch (SQLException e) {
-      if (logger.isInfoEnabled()) {
-        logger.info("Exception: " + e.getMessage());
-      }
+        logger.error("Exception: " + e.getMessage());
     }
     return c.orderByName().values();
   }
@@ -719,9 +663,7 @@
     try {
       c = User.getAllUsers();
     } catch (SQLException e) {
-      if (logger.isInfoEnabled()) {
-        logger.info("Exception: " + e.getMessage());
-      }
+        logger.error("Exception: " + e.getMessage());
     }
     TreeMap<String, User> tm = new TreeMap<String, User>();
     if (c != null) {
@@ -739,9 +681,7 @@
       try {
         user = User.getUser(Integer.parseInt(id));
       } catch (SQLException e) {
-        if (logger.isInfoEnabled()) {
-          logger.info("Exception: " + e.getMessage());
-        }
+          logger.error("Exception: " + e.getMessage());
       }
     }
     return user;
@@ -756,9 +696,7 @@
         c = ((TMCCollectionImpl<Ip>) c).orderByName().values();
       }
     } catch (SQLException e) {
-      if (logger.isInfoEnabled()) {
-        logger.info("Exception: " + e.getMessage());
-      }
+        logger.error("Exception: " + e.getMessage());
     }
     return c;
   }
@@ -770,9 +708,7 @@
       try {
         i = Ip.getIp(Integer.parseInt(id), true);
       } catch (SQLException e) {
-        if (logger.isInfoEnabled()) {
-          logger.info("Exception: " + e.getMessage());
-        }
+          logger.error("Exception: " + e.getMessage());
       }
     }
     return i;
@@ -784,9 +720,7 @@
     try {
       c.addAll(VirtualHost.getVirtualHosts());
     } catch (SQLException e) {
-      if (logger.isInfoEnabled()) {
-        logger.info("Exception: " + e.getMessage());
-      }
+        logger.error("Exception: " + e.getMessage());
     }
     return c.orderByName().values();
   }
@@ -797,9 +731,7 @@
     try {
       c.addAll(VirtualHost.getVirtualHosts(name));
     } catch (SQLException e) {
-      if (logger.isInfoEnabled()) {
-        logger.info("Exception: " + e.getMessage());
-      }
+        logger.error("Exception: " + e.getMessage());
     }
     return c.orderByName().values();
   }
@@ -811,9 +743,7 @@
       try {
         vh = VirtualHost.getVirtualHost(Integer.parseInt(id));
       } catch (SQLException e) {
-        if (logger.isInfoEnabled()) {
-          logger.info("Exception: " + e.getMessage());
-        }
+          logger.error("Exception: " + e.getMessage());
       }
     }
     return vh;
@@ -829,9 +759,7 @@
         tm.put(tc.getName() + " - " + tc.getTomcatPool().getName(), tc);
       }
     } catch (SQLException e) {
-      if (logger.isInfoEnabled()) {
-        logger.info("Exception: " + e.getMessage());
-      }
+        logger.error("Exception: " + e.getMessage());
     }
     return tm.values();
   }
@@ -846,9 +774,7 @@
         tm.put(tc.getName() + " - " + tc.getTomcatPool().getName(), tc);
       }
     } catch (SQLException e) {
-      if (logger.isInfoEnabled()) {
-        logger.info("Exception: " + e.getMessage());
-      }
+        logger.error("Exception: " + e.getMessage());
     }
     return tm.values();
   }
@@ -860,9 +786,7 @@
       try {
         tc = TomcatContext.getTomcatContext(Integer.parseInt(id));
       } catch (SQLException e) {
-        if (logger.isInfoEnabled()) {
-          logger.info("Exception: " + e.getMessage());
-        }
+          logger.error("Exception: " + e.getMessage());
       }
     }
     return tc;
@@ -875,9 +799,7 @@
       try {
         ret.addAll(VirtualHost.getVirtualHosts(aw));
       } catch (SQLException e) {
-        if (logger.isInfoEnabled()) {
-          logger.info("Exception: " + e.getMessage());
-        }
+          logger.error("Exception: " + e.getMessage());
       }
     return ret;
   }
@@ -891,9 +813,7 @@
           ret.addAll(VirtualHost.getVirtualHosts(hp));
         }
       } catch (SQLException e) {
-        if (logger.isInfoEnabled()) {
-          logger.info("Exception: " + e.getMessage());
-        }
+          logger.error("Exception: " + e.getMessage());
       }
     return ret;
   }
@@ -904,9 +824,7 @@
       try {
         ret.addAll(VirtualHost.getVirtualHosts(hp));
       } catch (SQLException e) {
-        if (logger.isInfoEnabled()) {
-          logger.info("Exception: " + e.getMessage());
-        }
+          logger.error("Exception: " + e.getMessage());
       }
     return ret;
   }
@@ -917,9 +835,7 @@
       try {
         ret.addAll(TomcatContext.getTomcatContexts(tw));
       } catch (SQLException e) {
-        if (logger.isInfoEnabled()) {
-          logger.info("Exception: " + e.getMessage());
-        }
+          logger.error("Exception: " + e.getMessage());
       }
     return ret;
   }
@@ -930,9 +846,7 @@
       try {
         ret.addAll(TomcatContext.getTomcatContexts(tp));
       } catch (SQLException e) {
-        if (logger.isInfoEnabled()) {
-          logger.info("Exception: " + e.getMessage());
-        }
+          logger.error("Exception: " + e.getMessage());
       }
     return ret;
   }
@@ -944,9 +858,7 @@
         if (hp != null && hp.getTomcatPool() != null)
           ret.addAll(TomcatContext.getTomcatContexts(hp.getTomcatPool()));
       } catch (SQLException e) {
-        if (logger.isInfoEnabled()) {
-          logger.info("Exception: " + e.getMessage());
-        }
+          logger.error("Exception: " + e.getMessage());
       }
     return ret;
   }
@@ -956,9 +868,7 @@
     try {
       ret.addAll(TomcatWorker.getTomcatWorkers(h, false));
     } catch (SQLException e) {
-      if (logger.isInfoEnabled()) {
-        logger.info("Exception: " + e.getMessage());
-      }
+        logger.error("Exception: " + e.getMessage());
     }
     return ret;
   }
@@ -968,9 +878,7 @@
     try {
       ret.addAll(ApacheWorker.getApacheWorkers(h, false));
     } catch (SQLException e) {
-      if (logger.isInfoEnabled()) {
-        logger.info("Exception: " + e.getMessage());
-      }
+        logger.error("Exception: " + e.getMessage());
     }
     return ret;
   }
@@ -980,9 +888,7 @@
     try {
       ret.addAll(ApacheWorker.getApacheWorkers(a, false));
     } catch (SQLException e) {
-      if (logger.isInfoEnabled()) {
-        logger.info("Exception: " + e.getMessage());
-      }
+        logger.error("Exception: " + e.getMessage());
     }
     return ret;
   }
@@ -1016,15 +922,24 @@
       }
       ret = JobPool.getJobPools(u, start, end, filter, functions);
     } catch (SQLException e) {
-      if (logger.isInfoEnabled()) {
-        logger.debug("SQLException:" + e);
-      }
+        logger.error("SQLException:" + e);
     } catch (ParseException e) {
-      if (logger.isInfoEnabled()) {
-        logger.debug("ParseException:" + e);
-      }
+        logger.error("ParseException:" + e);
     }
     return ret;
   }
-
+  
+  public Collection<String> getTemplateVariables() {
+	  Collection<String> templateVariablesCol = new ArrayList<String>();
+	  String templateVariables = PropertiesFile.getConstantValue("lokahi.template.variables");
+	  for (String templateVariable : templateVariables.split(",")) {
+		  templateVariablesCol.add(templateVariable);
+	  }
+	  return templateVariablesCol;
+  }
+  
+  public Collection<Ip> getNewIpCollection() {
+	  return new TMCCollectionImpl<Ip>();
+  }
+  
 }
Index: org/apache/lokahi/core/controller/task/BuildDeployApacheConfig.java
===================================================================
--- org/apache/lokahi/core/controller/task/BuildDeployApacheConfig.java	(revision 619464)
+++ org/apache/lokahi/core/controller/task/BuildDeployApacheConfig.java	(working copy)
@@ -60,7 +60,7 @@
       Function f = Function.getFunction("PutFile");
       ApacheWorkerModel awm = new ApacheWorkerModel();
       Job j = new Job(prereq, aw.getApache().getServerRoot() + "/conf/" + PropertiesFile.getConstantValue("ApacheConfFile"), aw.getHardware(), f, jp);
-      j.setResult(awm.buildConf(aw));
+      j.setResult(awm.buildConf(aw, 1));
       j = Job.store(j);
       j = new Job(j, aw.getApache().getServerRoot() + "/conf/" + PropertiesFile.getConstantValue("WorkersProperties"), aw.getHardware(), f, jp);
       j.setResult(awm.buildWorkerProperties(aw));
Index: org/apache/lokahi/core/gui/www/FileAction.java
===================================================================
--- org/apache/lokahi/core/gui/www/FileAction.java	(revision 619464)
+++ org/apache/lokahi/core/gui/www/FileAction.java	(working copy)
@@ -48,6 +48,7 @@
       if ("AddFile".equalsIgnoreCase(f.getCommand()) || "UpdateFile".equalsIgnoreCase(f.getCommand())) {
         File fi = getTemplate(form);
         fm.perform(f, new Class[]{user.getClass(), fi.getClass(), f.getClass()}, new Object[]{user, fi, f});
+        messages = this.addMessage(messages, SUCCESS_MESSAGE, new ActionMessage("function.success." + f.getCommand(), fi.getName()));
       } else {
         Collection<File> c = getMultiTemplate(form);
         fm.perform(f, new Class[]{user.getClass(), Collection.class, f.getClass()}, new Object[]{user, c, f});
Index: org/apache/lokahi/core/gui/www/TMCStartupServlet.java
===================================================================
--- org/apache/lokahi/core/gui/www/TMCStartupServlet.java	(revision 619464)
+++ org/apache/lokahi/core/gui/www/TMCStartupServlet.java	(working copy)
@@ -22,6 +22,7 @@
 import org.apache.lokahi.core.common.database.CachingBroker;
 import org.apache.lokahi.core.common.database.ConnBean;
 import org.apache.lokahi.core.common.database.DerbyBroker;
+import org.apache.lokahi.core.common.templating.TemplateBuilder;
 import org.apache.lokahi.core.common.util.PropertiesFile;
 import org.apache.lokahi.core.controller.CheckJvmThread;
 
@@ -58,6 +59,10 @@
         CachingBroker.setMasterBrokerClassName(PropertiesFile.getConstantValue("lokahi.broker.implementation"));        
     }
     
+    if (PropertiesFile.getConstantValue("lokahi.template.engine")!=null) {
+        TemplateBuilder.setMasterEngineClassName(PropertiesFile.getConstantValue("lokahi.template.engine"));        
+    }
+    
     // check for some specific init values that need non-standard action
     ConnBean.initializePool(PropertiesFile.getConstantValue("tmc.database.uri"),
                             PropertiesFile.getConstantValue("tmc.database.user"),
Index: org/apache/lokahi/httpd/api/entity/VirtualHost.java
===================================================================
--- org/apache/lokahi/httpd/api/entity/VirtualHost.java	(revision 619464)
+++ org/apache/lokahi/httpd/api/entity/VirtualHost.java	(working copy)
@@ -340,7 +340,7 @@
    * @param isNameBased
    * @param isCatchAll
    *
-   * @return
+   * @return A collection of hosting pools
    * @throws SQLException
    */
   public Collection<HostingPool> changeHostingPool(HostingPool hp, Collection<Ip> newIps, boolean isNameBased, boolean isCatchAll) throws SQLException {
Index: org/apache/lokahi/httpd/api/server/Apache.java
===================================================================
--- org/apache/lokahi/httpd/api/server/Apache.java	(revision 619464)
+++ org/apache/lokahi/httpd/api/server/Apache.java	(working copy)
@@ -20,6 +20,8 @@
 
 import org.apache.log4j.Logger;
 import org.apache.lokahi.core.api.file.File;
+import org.apache.lokahi.core.api.template.Template;
+import org.apache.lokahi.core.common.collection.TMCCollectionImpl;
 import org.apache.lokahi.core.common.database.BrokerFactory;
 import org.apache.lokahi.core.common.interfaces.Application;
 import org.apache.lokahi.core.common.interfaces.TMCBroker;
@@ -49,9 +51,9 @@
   private int forkWait;
   private String envVaribles;
   private String pidFileLocation;
-  private int mainId;
+  private String templateIds;
 
-  private File main;
+  private Collection<Template> templates;
 
   public int getPk() {
     return pk;
@@ -76,7 +78,10 @@
   public void setServerRoot(String serverRoot) {
     this.serverRoot = serverRoot;
   }
-
+  
+  public String getServerLocation() {
+	  return serverRoot;
+  }
   public String getLogLocation() {
     return logLocation;
   }
@@ -149,32 +154,39 @@
     this.pidFileLocation = pidFileLocation;
   }
 
-  public int getMainId() {
-    return mainId;
+  public String getTemplateIds() {
+    return templateIds;
   }
 
-  public void setMainId(int mainId) {
-    this.mainId = mainId;
+  public void setTemplateIds(String templateIds) {
+    this.templateIds = templateIds;
   }
 
-  public File getMain() {
-    if (main == null) {
-      try {
-        main = File.getFile(this.getMainId());
-      } catch (SQLException e) {
-        if (logger.isInfoEnabled()) {
-          logger.info("Exception: " + e.getMessage());
-        }
-      }
-    }
-    return main;
+  public Collection<Template> getTemplates() {
+	  if (templates == null) {
+		  try {
+			  templates = new TMCCollectionImpl<Template>();
+			  String[] templateIds = this.getTemplateIds().split(",");
+	    	  for (String templateId : templateIds) {
+	    		  templates.add(Template.getTemplate(Integer.parseInt(templateId)));
+	    	  }
+	      } catch (SQLException e) {
+	          logger.error("Exception: " + e.getMessage());
+	      }
+	  }
+	  return templates;
   }
 
-  public void setMain(File main) {
-    this.main = main;
-    if (main != null) {
-      this.setMainId(main.getPk());
-    }
+  public void setTemplates(Collection<Template> templates) {
+	  this.templates = templates;
+	  if (templates != null) {
+		  StringBuilder templateIds = new StringBuilder();
+		  for (Template template : templates) {
+			  templateIds.append(template.getPk()); 
+			  templateIds.append(",");
+		  }
+		  this.setTemplateIds(templateIds.toString());
+	  }
   }
 
   public Apache() {
@@ -182,7 +194,7 @@
 
   public Apache(int container_id, String containerName, String logLocation, String envVaribles, int forkWait,
                 String pidfileLocation, String restartCommand, String startCommand, String stopCommand, String sysGroup,
-                String sysUser, String serverRoot, int mainId) {
+                String sysUser, String serverRoot, String templateIds) {
     this.setPk(container_id);
     this.setName(containerName);
     this.setLogLocation(logLocation);
@@ -195,7 +207,7 @@
     this.setSysGroup(sysGroup);
     this.setSysUser(sysUser);
     this.setServerRoot(serverRoot);
-    this.setMainId(mainId);
+    this.setTemplateIds(templateIds);
   }
 
   public Apache fillObject(ResultSet r) throws SQLException {
@@ -211,8 +223,7 @@
                       r.getString("SYS_GROUP"),
                       r.getString("SYS_USER"),
                       r.getString("SERVER_ROOT"),
-                      r.getInt("MAIN_ID"));
-
+                      r.getString("MAIN_ID"));
   }
 
   public static Apache getApache(int id, boolean fromCache) throws SQLException {
@@ -259,7 +270,7 @@
                          ap.getPidFileLocation(),
                          ap.getServerRoot(),
                          ap.getLogLocation(),
-                         ap.getMainId()));
+                         ap.getTemplateIds()));
     return ap;
   }
 
@@ -277,7 +288,7 @@
                   ap.getPidFileLocation(),
                   ap.getServerRoot(),
                   ap.getLogLocation(),
-                  ap.getMainId());
+                  ap.getTemplateIds());
   }
 
   public static boolean delete(Apache ap) throws SQLException {
@@ -305,7 +316,9 @@
     ret.append(elementBuilder("stopCommand", this.getStopCommand()));
     ret.append(elementBuilder("restartCommand", this.getRestartCommand()));
     ret.append(elementBuilder("forkWait", Integer.toString(this.getForkWait())));
-    ret.append(this.getMain().buildShortXMLRepresentation());
+    for (Template template : this.getTemplates()) {
+    	ret.append(template.buildShortXMLRepresentation());
+    }
     ret.append("</apache>\n");
     return ret;
   }
@@ -325,8 +338,8 @@
     buf.append(",forkWait=").append(forkWait);
     buf.append(",envVaribles=").append(envVaribles);
     buf.append(",pidFileLocation=").append(pidFileLocation);
-    buf.append(",mainId=").append(mainId);
-    buf.append(",main=").append(main);
+    buf.append(",templateIds=").append(templateIds);
+    buf.append(",templates=").append(templates);
     buf.append('}');
     return buf.toString();
   }
@@ -338,11 +351,11 @@
     final Apache apache = (Apache) o;
 
     if (forkWait != apache.forkWait) return false;
-    if (mainId != apache.mainId) return false;
+    if (templateIds != apache.templateIds) return false;
     if (pk != apache.pk) return false;
     if (envVaribles != null ? !envVaribles.equals(apache.envVaribles) : apache.envVaribles != null) return false;
     if (logLocation != null ? !logLocation.equals(apache.logLocation) : apache.logLocation != null) return false;
-    if (main != null ? !main.equals(apache.main) : apache.main != null) return false;
+    if (templates != null ? !templates.equals(apache.templates) : apache.templates != null) return false;
     if (!name.equals(apache.name)) return false;
     if (pidFileLocation != null ? !pidFileLocation.equals(apache.pidFileLocation) : apache.pidFileLocation != null)
       return false;
@@ -371,8 +384,8 @@
     result = 29 * result + forkWait;
     result = 29 * result + (envVaribles != null ? envVaribles.hashCode() : 0);
     result = 29 * result + (pidFileLocation != null ? pidFileLocation.hashCode() : 0);
-    result = 29 * result + mainId;
-    result = 29 * result + (main != null ? main.hashCode() : 0);
+    result = 29 * result + (templateIds != null ? templateIds.hashCode() : 0);
+    //result = 29 * result + (templates != null ? templates.hashCode() : 0);
     return result;
   }
 
Index: org/apache/lokahi/httpd/api/worker/ApacheWorker.java
===================================================================
--- org/apache/lokahi/httpd/api/worker/ApacheWorker.java	(revision 619464)
+++ org/apache/lokahi/httpd/api/worker/ApacheWorker.java	(working copy)
@@ -23,9 +23,10 @@
 import org.apache.lokahi.core.api.server.Hardware;
 import org.apache.lokahi.core.api.state.State;
 import org.apache.lokahi.core.common.database.BrokerFactory;
-import org.apache.lokahi.core.common.interfaces.Server;
+import org.apache.lokahi.core.common.interfaces.Application;
 import org.apache.lokahi.core.common.interfaces.TMCBroker;
 import org.apache.lokahi.core.common.interfaces.TMCDao;
+import org.apache.lokahi.core.common.interfaces.Worker;
 import org.apache.lokahi.core.common.util.PropertiesFile;
 import org.apache.lokahi.httpd.api.pool.ApachePool;
 import org.apache.lokahi.httpd.api.server.Apache;
@@ -39,7 +40,7 @@
  * @author The Apache Incubated Lokahi project - http://incubator.apache.org/lokahi/
  * @version $Id$
  */
-public class ApacheWorker extends TMCDao<ApacheWorker> implements Server {
+public class ApacheWorker extends TMCDao<ApacheWorker> implements Worker {
   static final Logger logger = Logger.getLogger(ApacheWorker.class);
   private static final TMCBroker<ApacheWorker> broker = new BrokerFactory<ApacheWorker>().getBroker();
   private int pk;
@@ -183,6 +184,10 @@
     }
   }
 
+  public Application getApplication() {
+	  return apache;
+  }
+  
   public int getPoolId() {
     return poolId;
   }
@@ -324,7 +329,7 @@
                                        r.getString("SYS_GROUP"),
                                        r.getString("SYS_USER"),
                                        r.getString("SERVER_ROOT"),
-                                       r.getInt("MAIN_ID")),
+                                       r.getString("MAIN_ID")),
                             new Hardware(r.getInt("HARDWARE_ID"),
                                          r.getString("HARDWARE_NAME"),
                                          r.getString("PHYSICAL_LOCATION"),
@@ -352,11 +357,11 @@
     return broker.delete("apache.worker.delete", aw.getPk());
   }
 
-  public String buildConfForWeb() {
+  public String buildConfForWeb(int templateId) {
     String ret = "A Database error has occurred.";
     ApacheWorkerModel awm = new ApacheWorkerModel();
     try {
-      ret = awm.buildConf(this);
+      ret = awm.buildConf(this, templateId);
     } catch (SQLException e) {
       if (logger.isInfoEnabled()) {
         logger.info("Exception: " + e.getMessage());
@@ -364,7 +369,11 @@
     }
     return ret;
   }
-
+  
+  public String buildConfForWeb(String templateId) {
+	  return buildConfForWeb(Integer.parseInt(templateId));
+  }
+  
   public String buildWorkersProperties() throws SQLException {
     ApacheWorkerModel awm = new ApacheWorkerModel();
     return awm.buildWorkerProperties(this);
Index: org/apache/lokahi/httpd/api/worker/ApacheWorkerModel.java
===================================================================
--- org/apache/lokahi/httpd/api/worker/ApacheWorkerModel.java	(revision 619464)
+++ org/apache/lokahi/httpd/api/worker/ApacheWorkerModel.java	(working copy)
@@ -18,7 +18,6 @@
 */
 package org.apache.lokahi.httpd.api.worker;
 
-import org.apache.lokahi.core.api.file.File;
 import org.apache.lokahi.core.api.function.Function;
 import org.apache.lokahi.core.api.ipaddress.Ip;
 import org.apache.lokahi.core.api.job.Job;
@@ -26,12 +25,13 @@
 import org.apache.lokahi.core.api.project.Project;
 import org.apache.lokahi.core.api.server.Hardware;
 import org.apache.lokahi.core.api.state.State;
+import org.apache.lokahi.core.api.template.Template;
 import org.apache.lokahi.core.api.user.User;
 import org.apache.lokahi.core.common.collection.TMCSet;
 import org.apache.lokahi.core.common.exception.AuthorizationException;
 import org.apache.lokahi.core.common.exception.TMCIllegalArgumentException;
 import org.apache.lokahi.core.common.interfaces.LokahiModel;
-import org.apache.lokahi.core.controller.task.BuildDeployApacheConfig;
+import org.apache.lokahi.core.common.templating.TemplateDeployer;
 import org.apache.lokahi.httpd.api.entity.VirtualHost;
 import org.apache.lokahi.modjk.WorkersPropertiesFile;
 
@@ -229,8 +229,8 @@
 
   private void deployApacheConfig(JobPool jobPool, ApacheWorker aw) throws TMCIllegalArgumentException {
     if (jobPool != null && aw.getApache() != null) {
-      Runnable task = new BuildDeployApacheConfig(aw, jobPool, false);
-      tpe.execute(task);
+    	Runnable task = new TemplateDeployer(aw, jobPool, false);
+    	tpe.execute(task);    	
     } else {
       throw new TMCIllegalArgumentException("Error with input");
     }
@@ -316,11 +316,21 @@
     ret.append('\n');
     return ret;
   }
-
-  public String buildConf(ApacheWorker aw) throws SQLException {
-    File f = aw.getApache().getMain();
-    StringBuffer content = new StringBuffer();
-    String temp = null;
+  
+  public String buildConf(ApacheWorker aw, int id) throws SQLException {
+	  //FIXME
+	  //Collection<Template> templates = aw.getApache().getTemplates();
+	  //StringBuffer content = new StringBuffer();
+	  String conf = templateEngine.buildConf(aw, id);
+	  return conf;    
+  }
+  
+  public Collection<String> buildConfs(ApacheWorker aw) throws SQLException {
+	  // FIXME
+	  Collection<Template> templates = aw.getApache().getTemplates();
+	  StringBuffer content = new StringBuffer();
+	  Collection<String> confs = templateEngine.buildConfs(aw);
+    /*String temp = null;
     Hardware h = aw.getHardware();
     if (f != null) {
       temp = f.getContent();
@@ -337,6 +347,8 @@
       content.append("DocumentRoot ").append(aw.getApache().getServerRoot()).append("/htdocs\n");
       content.append("ScriptAlias /htbin ").append(aw.getApache().getServerRoot()).append("/htbin\n");
       content.append("</VirtualHost>\n");
+      
+      
       Collection<VirtualHost> c = VirtualHost.getVirtualHosts(aw);
       Collection<VirtualHost> catchalls = new TMCSet<VirtualHost>();
       Collection<Ip> Ips = new TMCSet<Ip>();
@@ -378,7 +390,8 @@
       }
       content.append(this.appendVhosts(c, h));
     }
-    return content.toString();
+    */
+    return confs;
   }
 
   private StringBuffer appendIps(Collection<Ip> ips, String preface, String endOfLine) {
Index: org/apache/lokahi/httpd/gui/www/ApacheAction.java
===================================================================
--- org/apache/lokahi/httpd/gui/www/ApacheAction.java	(revision 619464)
+++ org/apache/lokahi/httpd/gui/www/ApacheAction.java	(working copy)
@@ -53,6 +53,7 @@
         Collection<Apache> c = getMultiTemplate(form, Apache.class);
         am.perform(f, new Class[]{user.getClass(), Collection.class, f.getClass()}, new Object[]{user, c, f});
       }
+      messages = this.addMessage(messages, SUCCESS_MESSAGE, new ActionMessage("function.success." + f.getCommand()));
     } catch (AuthorizationException e) {
       messages = this.addMessage(messages, new ActionMessage("error.notAuthorized"));
       if (logger.isInfoEnabled()) {
@@ -125,12 +126,27 @@
     String forkWait = (String) dynaForm.get("forkWait");
     String envVars = (String) dynaForm.get("envVaribles");
     String pidLoc = (String) dynaForm.get("pidFileLocation");
-    String mainId = (String) dynaForm.get("mainId");
+    String[] mainIds = (String[]) dynaForm.get("mainId");
     if (Id != null && !"".equals(Id)) {
       a.setPk(Integer.parseInt(Id));
     }
-    if (mainId != null && !"".equals(mainId)) {
-      a.setMainId(Integer.parseInt(mainId));
+    
+    if (mainIds != null && !"".equals(mainIds)) {
+    	StringBuilder sb = new StringBuilder();
+    	for (String mainId : mainIds) {
+    		if (mainId != null && !"".equals(mainId)) {
+    			sb.append(mainId);
+    			sb.append(",");
+    		}
+    	}
+    	// if we dont have updated templates, use the old ones
+    	if (sb.length() > 0) {
+    		a.setTemplateIds(sb.toString());
+    	} else {
+    		if (Id != null && !"".equals(Id)) {
+    			a.setTemplateIds(Apache.getApache(Integer.parseInt(Id), false).getTemplateIds());
+    		}
+    	}
     }
     a.setName(name);
     a.setServerRoot(base);
Index: org/apache/lokahi/tomcat/api/entity/TomcatContextModel.java
===================================================================
--- org/apache/lokahi/tomcat/api/entity/TomcatContextModel.java	(revision 619464)
+++ org/apache/lokahi/tomcat/api/entity/TomcatContextModel.java	(working copy)
@@ -447,10 +447,27 @@
     this.jpInit(f, u, p, tc.getContextName());
     if (!u.isAllowed(f)) throw new AuthorizationException("User " + u.getName() + " Not allowed to " + f.getName());
     if (tc.getPk() < 1) throw new TMCIllegalArgumentException("Error with input");
+    
+    TomcatContext origContext = TomcatContext.getTomcatContext(tc.getPk());
+    
+    // before we update, check to see if the NEW pool is different than the OLD pool
+    if (origContext.getTomcatPoolId() != tc.getTomcatPoolId()) {
+        // if they are different, undeploy the old context before updating
+    	this.undeployContext(this.jp, p, u, origContext);
+    }
+    
     TomcatContext.update(tc);
     this.installContext(jp, null, u, tc);
     TomcatPoolModel tpm = new TomcatPoolModel();
-    tpm.deployTomcatConfig(u, null, jp, tc.getTomcatPool(), f);
+    
+    // check to see if the NEW pool is different than the OLD pool
+    if (origContext.getTomcatPoolId() != tc.getTomcatPoolId()) {
+    	// if they are different deploy config files to OLD jvm
+    	tpm.deployTomcatConfig(u, null, this.jp, origContext.getTomcatPool(), f);
+    }
+    
+    // deploy config files to NEW jvm
+    tpm.deployTomcatConfig(u, null, this.jp, tc.getTomcatPool(), f);
     jp.setState(State.NEW);
     JobPool.update(jp);
   }
Index: org/apache/lokahi/tomcat/api/server/Tomcat.java
===================================================================
--- org/apache/lokahi/tomcat/api/server/Tomcat.java	(revision 619464)
+++ org/apache/lokahi/tomcat/api/server/Tomcat.java	(working copy)
@@ -19,6 +19,8 @@
 package org.apache.lokahi.tomcat.api.server;
 
 import org.apache.log4j.Logger;
+import org.apache.lokahi.core.api.template.Template;
+import org.apache.lokahi.core.common.collection.TMCCollectionImpl;
 import org.apache.lokahi.core.common.database.BrokerFactory;
 import org.apache.lokahi.core.common.interfaces.Application;
 import org.apache.lokahi.core.common.interfaces.TMCBroker;
@@ -57,6 +59,9 @@
   private String startClass;
   private String stdOutLog;
 
+  private String templateIds;	// comma separated value of ids
+  private Collection<Template> templates; // collection because we can have more than 1 
+  
   public int getPk() {
     return this.id;
   }
@@ -80,6 +85,10 @@
   public void setBaseLocation(String baseLocation) {
     this.baseLocation = baseLocation;
   }
+  
+  public String getServerLocation() {
+	  return baseLocation;
+  }
 
   public String getTomcatHome() {
     return tomcatHome;
@@ -202,12 +211,47 @@
     this.javaOptions = javaOptions;
   }
 
+  public String getTemplateIds() {
+    return templateIds;
+  }
+
+  public void setTemplateIds(String templateIds) {
+    this.templateIds = templateIds;
+  }
+
+  public Collection<Template> getTemplates() {
+    if (templates == null) {
+      try {
+    	  templates = new TMCCollectionImpl<Template>();
+    	  String[] templateIds = this.getTemplateIds().split(",");
+    	  for (String templateId : templateIds) {
+    		  templates.add(Template.getTemplate(Integer.parseInt(templateId)));
+    	  }
+      } catch (SQLException e) {
+          logger.error("Exception: " + e.getMessage());
+      }
+    }
+    return templates;
+  }
+
+  public void setTemplates(Collection<Template> templates) {
+    this.templates = templates;
+    if (templates != null) {
+    	StringBuilder templateIds = new StringBuilder();
+    	for (Template template : templates) {
+    		templateIds.append(template.getPk()); 
+    		templateIds.append(",");
+    	}
+    	this.setTemplateIds(templateIds.toString());
+    }
+  }
+  
   public Tomcat() {
   }
 
   public Tomcat(int id, String name, String baseLocation, String tomcatHome,
                 int httpPort, String description, String sysUser, String sysGroup, Blob entry, int version,
-                String stdOutLog, String startClass, String javaHome) throws SQLException {
+                String stdOutLog, String startClass, String javaHome, String templateIds) throws SQLException {
     this.setPk(id);
     this.setName(name);
     this.setBaseLocation(baseLocation);
@@ -222,11 +266,12 @@
     this.setStdOutLog(stdOutLog);
     this.setStartClass(startClass);
     this.setJavaHome(javaHome);
+    this.setTemplateIds(templateIds);
   }
 
   public Tomcat(String name, String baseLocation, String tomcatHome,
                 int httpPort, String description, String sysUser, String sysGroup, int version,
-                String stdOutLog, String startClass, String javaHome) {
+                String stdOutLog, String startClass, String javaHome, String templateIds) {
     this.setName(name);
     this.setBaseLocation(baseLocation);
     this.setTomcatHome(tomcatHome);
@@ -238,6 +283,7 @@
     this.setStdOutLog(stdOutLog);
     this.setStartClass(startClass);
     this.setJavaHome(javaHome);
+    this.setTemplateIds(templateIds);
   }
 
   public Tomcat fillObject(ResultSet r) throws SQLException {
@@ -253,7 +299,8 @@
                       r.getInt("TOMCAT_TYPE"),
                       r.getString("STD_OUT_LOG"),
                       r.getString("START_CLASS"),
-                      r.getString("JAVA_HOME"));
+                      r.getString("JAVA_HOME"),
+                      r.getString("TEMPLATE_IDS"));
   }
 
   public static void update(Tomcat tc) throws SQLException {
@@ -270,7 +317,8 @@
                   tc.getJavaHome(),
                   tc.getStartClass(),
                   tc.getStdOutLog(),
-                  (tc.getEntry()).getBytes());
+                  (tc.getEntry()).getBytes(),
+                  tc.getTemplateIds());
   }
 
   public static Tomcat store(Tomcat tc) throws SQLException {
@@ -286,7 +334,8 @@
                          tc.getJavaHome(),
                          tc.getStartClass(),
                          tc.getStdOutLog(),
-                         (tc.getEntry()).getBytes()));
+                         (tc.getEntry()).getBytes(),
+                         tc.getTemplateIds()));
     return tc;
   }
 
@@ -339,53 +388,7 @@
   public static Tomcat getTomcat(int id, boolean fromCache) throws SQLException {
     return new Tomcat().get(id);
   }
-
-  public String buildJvmconfEntry() {
-    StringBuilder ret = new StringBuilder();
-    ret.append(this.getHttpPort());
-    ret.append(".tomcat.name=");
-    ret.append(this.getServerName());
-    ret.append('\n');
-    ret.append(this.getHttpPort());
-    ret.append(".java.param.user=www\n");
-    ret.append(this.getHttpPort());
-    ret.append(".java.param.group=www\n");
-    ret.append(this.getHttpPort());
-    ret.append(".java.param.jvmgroup=tomcat\n");
-    ret.append(this.getHttpPort());
-    ret.append(".java.param.options=-Dcatalina.base=");
-    ret.append(this.getBaseLocation());
-    ret.append(" -Dcatalina.home=");
-    ret.append(this.getTomcatHome());
-    ret.append(' ');
-    ret.append(this.getJavaOptions());
-    ret.append('\n');
-    ret.append(this.getHttpPort());
-    ret.append(".java.param.env=");
-    ret.append(this.getEnvironment());
-    ret.append('\n');
-    ret.append(this.getHttpPort());
-    ret.append(".java.home=");
-    ret.append(this.getJavaHome());
-    ret.append('\n');
-    ret.append(this.getHttpPort());
-    ret.append(".tomcat.startclass=");
-    ret.append(this.getStartClass());
-    ret.append('\n');
-    ret.append(this.getHttpPort());
-    ret.append(".java.param.standard.out.log=");
-    ret.append(this.getStdOutLog());
-    ret.append('\n');
-    ret.append(this.getHttpPort());
-    ret.append(".tomcat.param.jmx=");
-    if (this.getType() >= 6) {
-      ret.append("yes\n");
-    } else {
-      ret.append("no\n");
-    }
-    return ret.toString();
-  }
-
+  
   public StringBuilder buildShortXMLRepresentation() {
     LinkedHashMap<String, String> map = new LinkedHashMap<String, String>(3, 1);
     map.put("id", Integer.toString(this.getPk()));
@@ -409,6 +412,7 @@
     ret.append(elementBuilder("standardOutLog", this.getStdOutLog()));
     ret.append(elementBuilder("startClass", this.getStartClass()));
     ret.append(elementBuilder("javaHome", this.getJavaHome()));
+    ret.append(elementBuilder("templateIds", this.getTemplateIds()));
     ret.append("</tomcat>\n");
     return ret;
   }
@@ -433,6 +437,7 @@
     if (sysGroup != null ? !sysGroup.equals(tomcat.sysGroup) : tomcat.sysGroup != null) return false;
     if (sysUser != null ? !sysUser.equals(tomcat.sysUser) : tomcat.sysUser != null) return false;
     if (tomcatHome != null ? !tomcatHome.equals(tomcat.tomcatHome) : tomcat.tomcatHome != null) return false;
+    if (templateIds != null ? !templateIds.equals(tomcat.templateIds) : tomcat.templateIds != null) return false;
 
     return true;
   }
@@ -453,6 +458,7 @@
     result = 29 * result + (javaHome != null ? javaHome.hashCode() : 0);
     result = 29 * result + (startClass != null ? startClass.hashCode() : 0);
     result = 29 * result + (stdOutLog != null ? stdOutLog.hashCode() : 0);
+    result = 29 * result + (templateIds != null ? templateIds.hashCode() : 0);
     return result;
   }
 }
Index: org/apache/lokahi/tomcat/api/worker/TomcatWorker.java
===================================================================
--- org/apache/lokahi/tomcat/api/worker/TomcatWorker.java	(revision 619464)
+++ org/apache/lokahi/tomcat/api/worker/TomcatWorker.java	(working copy)
@@ -23,10 +23,12 @@
 import org.apache.lokahi.core.api.server.Hardware;
 import org.apache.lokahi.core.api.state.State;
 import org.apache.lokahi.core.common.database.BrokerFactory;
-import org.apache.lokahi.core.common.interfaces.Server;
+import org.apache.lokahi.core.common.interfaces.Application;
 import org.apache.lokahi.core.common.interfaces.TMCBroker;
 import org.apache.lokahi.core.common.interfaces.TMCDao;
+import org.apache.lokahi.core.common.interfaces.Worker;
 import org.apache.lokahi.core.common.util.PropertiesFile;
+import org.apache.lokahi.httpd.api.worker.ApacheWorkerModel;
 import org.apache.lokahi.tomcat.api.entity.TomcatContext;
 import org.apache.lokahi.tomcat.api.pool.TomcatPool;
 import org.apache.lokahi.tomcat.api.server.Tomcat;
@@ -40,7 +42,7 @@
  * @author The Apache Incubated Lokahi project - http://incubator.apache.org/lokahi/
  * @version $Id$
  */
-public class TomcatWorker extends TMCDao<TomcatWorker> implements Server {
+public class TomcatWorker extends TMCDao<TomcatWorker> implements Worker {
   private static final TMCBroker<TomcatWorker> broker = new BrokerFactory<TomcatWorker>().getBroker();
   static final Logger logger = Logger.getLogger(TomcatWorker.class);
   private int workerId;
@@ -146,6 +148,10 @@
       this.setTomcatId(tomcat.getPk());
     }
   }
+  
+  public Application getApplication() {
+	  return tomcat;
+  }
 
   public State getState() {
     if (state == null) {
@@ -236,19 +242,21 @@
     return getTomcatWorkers(tp.getPk(), cache);
   }
 
-  public String buildConfForWeb() {
+  public String buildConfForWeb(int templateId) {
     String ret = "A database error has occurred.";
+    TomcatWorkerModel twm = new TomcatWorkerModel();
     try {
-      ServerXmlFile sxf = new ServerXmlFile(this);
-      ret = sxf.build();
+    	ret = twm.buildConf(this, templateId);
     } catch (SQLException e) {
-      if (logger.isInfoEnabled()) {
-        logger.info("Exception: " + e.getMessage());
-      }
+    	logger.error("Exception: " + e.getMessage());
     }
     return ret;
   }
 
+  public String buildConfForWeb(String templateId) {
+	  return this.buildConfForWeb(Integer.parseInt(templateId));
+  }
+  
   public static void update(TomcatWorker tw) throws SQLException {
     broker.update("tomcat.worker.update", tw.getPk(), tw.getHardwareId(), tw.getStateId(), tw.getTomcatId());
   }
Index: org/apache/lokahi/tomcat/api/worker/TomcatWorkerModel.java
===================================================================
--- org/apache/lokahi/tomcat/api/worker/TomcatWorkerModel.java	(revision 619464)
+++ org/apache/lokahi/tomcat/api/worker/TomcatWorkerModel.java	(working copy)
@@ -22,7 +22,6 @@
 import org.apache.lokahi.core.api.job.Job;
 import org.apache.lokahi.core.api.jobpool.JobPool;
 import org.apache.lokahi.core.api.project.Project;
-import org.apache.lokahi.core.api.server.HardwareModel;
 import org.apache.lokahi.core.api.state.State;
 import org.apache.lokahi.core.api.user.User;
 import org.apache.lokahi.core.common.authorization.AuthorizationManager;
@@ -33,6 +32,7 @@
 import org.apache.lokahi.core.common.exception.TMCIllegalArgumentException;
 import org.apache.lokahi.core.common.exception.UnsupportedParameterException;
 import org.apache.lokahi.core.common.interfaces.LokahiModel;
+import org.apache.lokahi.core.common.templating.TemplateDeployer;
 import org.apache.lokahi.core.common.util.PropertiesFile;
 import org.apache.lokahi.tomcat.api.server.Tomcat;
 
@@ -143,13 +143,9 @@
       try {
         m.invoke(this, u, null, jp, tw);
       } catch (IllegalAccessException e) {
-        if (logger.isInfoEnabled()) {
-          logger.info("Exception: " + e.getMessage());
-        }
+          logger.error("Exception: " + e.getMessage());
       } catch (InvocationTargetException e) {
-        if (logger.isInfoEnabled()) {
-          logger.info("InvocationTargetException: " + e.getMessage());
-        }
+          logger.error("InvocationTargetException: " + e.getMessage());
         Throwable ex = e.getCause();
         if (ex != null) {
           logger.info("TMCMessage: " + ex.getMessage());
@@ -187,22 +183,9 @@
   }
 
   public void deployTomcatConfig(User u, Project p, JobPool jobPool, TomcatWorker tw, Function f) throws SQLException, AuthorizationException, IOException, TMCIllegalArgumentException {
-    f = Function.getFunction("PutFile");
-    State s = State.NEW;
-    if (jobPool == null) {
-      jobPool = new JobPool(p, u, s, tw.getName(), f);
-      jobPool = JobPool.store(jobPool);
-    }
-    if (jobPool != null && tw.getTomcat() != null && f != null) {
-      Job j = new Job(-1, s, tw.getTomcat().getBaseLocation() + "/conf/server.xml", tw.getHardware(), f, jobPool);
-      ServerXmlFile sxf = new ServerXmlFile(tw);
-      j.setResult(sxf.build());
-      Job.store(j);
-      HardwareModel hm = new HardwareModel();
-      hm.deployJvmConf(u, tw.getHardware(), jobPool);
-    } else {
-      throw new TMCIllegalArgumentException("Error with input");
-    }
+	  if (!u.isAllowed(f, p)) throw new AuthorizationException("User " + u.getName() + " Not allowed to " + f.getName());
+	  Runnable task = new TemplateDeployer(tw, jobPool, false);
+	  tpe.execute(task);
   }
 
   private void function(User u, Project p, String functionCommand, String options, JobPool jobPool, TomcatWorker tw) throws SQLException, IOException, AuthorizationException {
@@ -253,6 +236,11 @@
   public TomcatWorker getObject(int id) throws SQLException {
     return this.viewTomcatWorker(id);
   }
+  
+  public String buildConf(TomcatWorker tw, int id) throws SQLException {
+	  String conf = templateEngine.buildConf(tw, id);
+	  return conf;    
+  }
 }
 
 
Index: org/apache/lokahi/tomcat/gui/www/TomcatAction.java
===================================================================
--- org/apache/lokahi/tomcat/gui/www/TomcatAction.java	(revision 619464)
+++ org/apache/lokahi/tomcat/gui/www/TomcatAction.java	(working copy)
@@ -26,6 +26,7 @@
 import org.apache.lokahi.core.common.exception.TMCException;
 import org.apache.lokahi.core.common.exception.TMCIllegalArgumentException;
 import org.apache.lokahi.core.gui.www.TMCAction;
+import org.apache.lokahi.httpd.api.server.Apache;
 import org.apache.lokahi.tomcat.api.server.Tomcat;
 import org.apache.lokahi.tomcat.api.server.TomcatModel;
 import org.apache.struts.action.ActionMessage;
@@ -53,6 +54,7 @@
         Collection<Tomcat> c = getMultiTemplate(form);
         tm.perform(f, new Class[]{user.getClass(), Collection.class, f.getClass()}, new Object[]{user, c, f});
       }
+      messages = this.addMessage(messages, SUCCESS_MESSAGE, new ActionMessage("function.success." + f.getCommand()));
     } catch (AuthorizationException e) {
       messages = this.addMessage(messages, new ActionMessage("error.notAuthorized"));
       if (logger.isInfoEnabled()) {
@@ -122,6 +124,8 @@
     String javaHome = (String) dynaForm.get("javaHome");
     String startClass = (String) dynaForm.get("startClass");
     String stdOutLog = (String) dynaForm.get("stdOutLog");
+    String[] templateIds = ((String[]) dynaForm.get("template"));
+    
     if (Id != null && !"".equals(Id)) {
       t.setPk(Integer.parseInt(Id));
     }
@@ -139,9 +143,26 @@
     t.setStartClass(startClass);
     t.setStdOutLog(stdOutLog);
     t.setJavaHome(javaHome);
+    
+    
+    if (templateIds != null && !"".equals(templateIds)) {
+    	StringBuilder sb = new StringBuilder();
+    	for (String templateId : templateIds) {
+    		if (templateId != null && !"".equals(templateId)) {
+    			sb.append(templateId);
+    			sb.append(",");
+    		}
+    	}
+    	// if we dont have updated templates, use the old ones
+    	if (sb.length() > 0) {
+    		t.setTemplateIds(sb.toString());
+    	} else {
+    		if (Id != null && !"".equals(Id)) {
+    			t.setTemplateIds(Tomcat.getTomcat(Integer.parseInt(Id), false).getTemplateIds());
+    		}
+    	}
+    }
+
     return t;
   }
 }
-
-
-