Refctored config file.

build.xml

@@ -1,43 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <project name="ieat2" basedir="." default="war" xmlns:ivy="antlib:org.apache.ivy.ant">
+  
   <property name="app.name" value="ieat"/>
 
+  <property name="ant.lib" value="${user.home}/.ant/lib"/>
+  
   <property name="conf.dir" value="conf/"/>
   <property name="lib.dir" value="lib/"/>
   <property name="web.dir" value="web/"/>
-  
-  <property name="build.version" value="2.0.0"/>
-  <property name="build.java.version" value="1.8"/>
-  <property name="build.dir" value="build/"/>
-  <property name="build.bootstrap.path" value="/usr/lib/jvm/java-8-openjdk/jre/lib/rt.jar"/>
+
+  <property prefix="tomcat" file="${conf.dir}/tomcat.properties"/>
+
+  <property prefix="build" file="${conf.dir}/build.properties"/>
   <property name="build.lib" value="${lib.dir}/war/"/>
   <property name="build.warfile" value="${build.dir}/${app.name}-${build.version}.war"/>
+  <tstamp>
+	<format property="build.time" pattern="MM/dd/yyyy hh:mm aa z" />
+  </tstamp>
 
-  <property name="source.dir" value="src/"/>
-  <property name="target.dir" value="${build.dir}/${app.name}/WEB-INF/classes"/>
-  
-  <property name="compile.verbose" value="false"/>
-  <property name="compile.debug" value="true"/>
-  <property name="compile.deprecation" value="true"/>
-  <property name="compile.optimize" value="false"/>
-  <property name="compile.nowarn" value="false"/>
+  <property prefix="compile" file="${conf.dir}/compile.properties"/>
   <property name="compile.lib" value="${lib.dir}/compile"/>
-  <property name="compile.include.ant" value="false"/>
   <path id="compile.classpath">
 	<pathelement location="${target.dir}"/>
 	<fileset dir="${compile.lib}" includes="*.jar"/>
   </path>
-
-  <property name="ant.lib" value="${user.home}/.ant/lib"/>
+  
+  <property name="source.dir" value="src/"/>
+  <property name="target.dir" value="${build.dir}/${app.name}/WEB-INF/classes"/>
   
   <property name="ivy.jar" value="${ant.lib}/ivy.jar"/>
+  <property name="ivy.dep.file" value="${conf.dir}/ivy.xml" />
   <available property="ivy.installed" file="${ivy.jar}"/>
   
-  <tstamp>
-	<format property="build.time" pattern="MM/dd/yyyy hh:mm aa z" />
-  </tstamp>
-  
   <target name="help" description="Display build help">
 	<echo>iEat v${build.version}</echo>
 	<echo>To see list of targets, use ant -p</echo>
@@ -47,8 +42,7 @@
     <mkdir dir="${ant.lib}"/>
     <get dest="${ivy.jar}"
          src="http://search.maven.org/remotecontent?filepath=org/apache/ivy/ivy/2.3.0/ivy-2.3.0.jar"/>
-    <taskdef resource="org/apache/ivy/ant/antlib.xml"
-             uri="antlib:org.apache.ivy.ant"/>
+    <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"/>
     <property name="ivy.installed" value="true"/>
   </target>
 
@@ -66,8 +60,7 @@
 
   <target name="ivy.resolve.deploy" depends="ivy.install">
     <ivy:retrieve pattern="${ant.lib}/[artifact].[ext]" conf="deploy"/>
-    <taskdef resource="org/apache/catalina/ant/antlib.xml"
-             uri="antlib:org.apache.catalina.ant"/>
+    <taskdef resource="org/apache/catalina/ant/antlib.xml" uri="antlib:org.apache.catalina.ant"/>
     <taskdef name="deploy" classname="org.apache.catalina.ant.DeployTask" />
     <taskdef name="undeploy" classname="org.apache.catalina.ant.UndeployTask" />
   </target>
@@ -112,14 +105,19 @@
     <ivy:cleancache/>
   </target>
 
-  <property file="${conf.dir}/tomcat.properties"/>
-  
   <target name="deploy" depends="war,ivy.resolve.deploy" description="Deploy to tomcat">
 	<deploy url="http://localhost:8080/manager/text"
 		    username="${tomcat.username}"
 		    password="${tomcat.password}"
             update="true"
-		    path="/ieat-${build.version}"
+		    path="/${app.name}-${build.version}"
 		    war="file:./${build.warfile}" />
   </target>
+
+  <target name="undeploy" depends="ivy.resolve.deploy" description="Undeploy from tomcat">
+    <undeploy url="http://localhost:8080/manager/text"
+              username="${tomcat.username}"
+              password="${tomcat.password}"
+              path="/${app.name}-${build.version}"/>
+  </target>
 </project>

conf/build.properties

@@ -0,0 +1,12 @@
+# Basic information about build context
+# Includes information such as build directory and
+# java information
+
+# iEat version
+version = 2.0.0
+# Buil directory
+dir = build/
+# Java version
+java.version = 1.8
+# Path to libraries matching the java version
+bootstrap.path = /usr/lib/jvm/java-8-openjdk/jre/lib/rt.jar

conf/compile.properties

@@ -0,0 +1,10 @@
+# Compile settings
+# Determines what flags are passed to the
+# compiler
+
+verbose = false
+debug = true
+deprecation = true
+optimize = false
+nowarn = false
+include.ant = false

ivy.xml → conf/ivy.xml

@@ -12,9 +12,13 @@
     <dependency org="commons-logging" name="commons-logging" rev="1.2"/>
     <dependency org="org.springframework" name="spring-webmvc" rev="5.0.9.RELEASE"/>
     <dependency org="javax.servlet.jsp.jstl" name="jstl-api" rev="1.2" conf="war->default"/>
+    <!-- UI Resources -->
+    <dependency org="org.webjars" name="bootstrap" rev="4.1.3" conf="war->default"/>
     <dependency org="org.webjars" name="angular-ui-bootstrap" rev="2.5.0" conf="war->default"/>
     <dependency org="org.webjars" name="webjars-locator" rev="0.34" conf="war->default"/>
+    <!-- Tomcat Resources -->
     <dependency org="javax.servlet" name="javax.servlet-api" rev="4.0.1" conf="provided->default"/>
+    <!-- Ant dependencies -->
     <dependency org="org.apache.tomcat" name="catalina-ant" rev="6.0.53" conf="deploy->default"/>
   </dependencies>
 </ivy-module>

conf/tomcat.properties

@@ -7,5 +7,5 @@
 # !!! file if it contains any senstive information.  !!!
 
 # Changed these!
-tomcat.username = admin
-tomcat.password = admin
+username = admin
+password = admin

web/WEB-INF/tags/navigation.tag

@@ -1,3 +1,29 @@
 <%@tag description="Standard navigation bar" pageEncoding="UTF-8"%>
 
-Hello World
+<!-- Navigation -->
+<nav class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
+  <div class="container">
+    <a class="navbar-brand" href="#">Start Bootstrap</a>
+    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation">
+          <span class="navbar-toggler-icon"></span>
+        </button>
+    <div class="collapse navbar-collapse" id="navbarResponsive">
+      <ul class="navbar-nav ml-auto">
+        <li class="nav-item active">
+          <a class="nav-link" href="#">Home
+                <span class="sr-only">(current)</span>
+              </a>
+        </li>
+        <li class="nav-item">
+          <a class="nav-link" href="#">About</a>
+        </li>
+        <li class="nav-item">
+          <a class="nav-link" href="#">Services</a>
+        </li>
+        <li class="nav-item">
+          <a class="nav-link" href="#">Contact</a>
+        </li>
+      </ul>
+    </div>
+  </div>
+</nav>

web/WEB-INF/tags/template.tag

@@ -1,5 +1,6 @@
 <%@tag description="Page template" pageEncoding="UTF-8"%>
-
+<%@taglib prefix="t" tagdir="/WEB-INF/tags" %>
+      
 <%@attribute name="title" fragment="true" %>
 
 <!DOCTYPE html>
@@ -13,7 +14,7 @@
     <div class="container">
       <header class="page-header">
         <!--<h1><jspinvoke fragment="title"></h1>-->
-        <!--<jspnavigation>-->
+        <t:navigation/>
       </header>
       <div id="body">
         <jsp:doBody/>