Index: trunk/build/buildwar.xml
===================================================================
--- trunk/build/buildwar.xml (revision 1686)
+++ trunk/build/buildwar.xml (revision 1765)
@@ -167,4 +167,9 @@
 
     <delete file="${app.temp.web.xml}" />
+
+    <!-- Add the contex root to the file. Note that newline is required -->
+    <echo file="${org.bedework.global.context.roots}" append="yes">
+${propval.app.war.name}.context=${propval.app.context.root}
+    </echo>
 
     <!-- ===============================================================
@@ -571,17 +576,19 @@
       <filterset refid="property.filters" />
     </copy>
-    <antcall target="jboss-virtual-host" inheritRefs="true" />
-  </target>
-
-  <target name="jboss-virtual-host" if="org.bedework.global.virtual.host">
-    <replace file="${app.dest.webinf}/jboss-web.xml">
-      <replacetoken><![CDATA[<!-- Virtual host -->]]></replacetoken>
-      <replacevalue><![CDATA[<virtual-host>@VIRTUAL-HOST@</virtual-host>
-      ]]>
-      </replacevalue>
-    </replace>
-    <replace file="${app.dest.webinf}/jboss-web.xml">
-      <replacefilter token="@VIRTUAL-HOST@" value="${propval.app.virtual.host}"/>
-    </replace>
+
+    <if>
+      <isset property="propval.app.virtual.host" />
+      <then>
+        <replace file="${app.dest.webinf}/jboss-web.xml">
+          <replacetoken><![CDATA[<!-- Virtual host -->]]></replacetoken>
+          <replacevalue><![CDATA[<virtual-host>@VIRTUAL-HOST@</virtual-host>
+          ]]>
+          </replacevalue>
+        </replace>
+        <replace file="${app.dest.webinf}/jboss-web.xml">
+          <replacefilter token="@VIRTUAL-HOST@" value="${propval.app.virtual.host}"/>
+        </replace>
+      </then>
+    </if>
   </target>
 
Index: trunk/config/configs/democal.properties
===================================================================
--- trunk/config/configs/democal.properties (revision 1698)
+++ trunk/config/configs/democal.properties (revision 1765)
@@ -61,4 +61,6 @@
 
 org.bedework.global.directory.browsing.disallowed=false
+
+# Comment this out for j2ee deploy
 org.bedework.global.build.standalone.app=true
 
Index: trunk/deployment/build.xml
===================================================================
--- trunk/deployment/build.xml (revision 1581)
+++ trunk/deployment/build.xml (revision 1765)
@@ -65,4 +65,14 @@
               location="${app.root.dir}/resources" />
 
+    <if>
+      <not>
+        <isset property="org.bedework.global.context.roots" />
+      </not>
+      <then>
+        <tempfile property="org.bedework.global.context.roots"
+                  destdir="${org.bedework.temp.dir}"
+                  prefix="context-roots" suffix=".properties" />
+      </then>
+    </if>
 
     <!-- ==================== config properties =========================
Index: trunk/deployment/termination/jboss/build.xml
===================================================================
--- trunk/deployment/termination/jboss/build.xml (revision 1186)
+++ trunk/deployment/termination/jboss/build.xml (revision 1765)
@@ -71,5 +71,6 @@
     <applicationXml displayName="Bedework calendar suite"
                     outFile="${ear.dir}/META-INF/application.xml"
-                    warDir="${org.bedework.temp.dir}/wars">
+                    warDir="${org.bedework.temp.dir}/wars"
+                    contexts="${org.bedework.global.context.roots}">
       <fileset dir="${ear.dir}">
         <include name="*.jar"/>
Index: trunk/deployutil/src/org/bedework/deployment/ApplicationXmlTask.java
===================================================================
--- trunk/deployutil/src/org/bedework/deployment/ApplicationXmlTask.java (revision 1475)
+++ trunk/deployutil/src/org/bedework/deployment/ApplicationXmlTask.java (revision 1765)
@@ -55,4 +55,5 @@
 
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.FileWriter;
 import java.io.FilenameFilter;
@@ -60,4 +61,5 @@
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Properties;
 
 import org.apache.tools.ant.BuildException;
@@ -74,4 +76,5 @@
  * <li>warDir    Directory containing war files or expanded wars with names
  *               ending in ".war"</li>
+ * <li>contexts  property file defining context roots</li>
  * </ul>
  *
@@ -91,6 +94,9 @@
   private String displayName;
 
+  private String contexts;
+
   private File outFile;
   private Writer wtr;
+  private Properties contextProps;
 
   /** Add a fileset
@@ -108,4 +114,12 @@
   public void setDisplayName(String val) {
     displayName = val;
+  }
+
+  /** Set the contexts file name
+   *
+   * @param val   String
+   */
+  public void setContexts(String val) {
+    contexts = val;
   }
 
@@ -135,4 +149,10 @@
 
       wtr = new FileWriter(outFile);
+
+      if (contexts != null) {
+        FileInputStream propFile = new FileInputStream(contexts);
+        contextProps = new Properties();
+        contextProps.load(propFile);
+      }
 
       writeLine("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
@@ -148,7 +168,21 @@
         writeLine("    <web>");
         writeLine("      <web-uri>" + nm + "</web-uri>");
-        writeLine("      <context-root>/" +
-                  nm.substring(0, nm.lastIndexOf(".war")) +
-                  "</context-root>");
+
+        String warName = nm.substring(0, nm.lastIndexOf(".war"));
+        String contextRoot = null;
+
+        if (contextProps != null) {
+          contextRoot = contextProps.getProperty(warName + ".context");
+
+          if (contextRoot.length() == 0) {
+            contextRoot = "/";
+          }
+        }
+
+        if (contextRoot == null) {
+          contextRoot = "/" + warName;
+        }
+
+        writeLine("      <context-root>" + contextRoot + "</context-root>");
         writeLine("    </web>");
         writeLine("  </module>");