Index: trunk/build/buildjar.xml
===================================================================
--- trunk/bedework/build/buildjar.xml (revision 952)
+++ trunk/build/buildjar.xml (revision 1134)
@@ -80,70 +80,73 @@
     </uptodate>
 
-    <antcall target="do.build.uptodate" inheritRefs="true" />
-    <antcall target="do.build.notuptodate" inheritRefs="true" />
-  </target>
+    <if>
+      <isset property="build.jar.uptodate"/>
+      <then>
+        <echo message="**** ${build.jar.file} is up to date" />
+      </then>
+    </if>
 
-  <target name="do.build.notuptodate"
-          if="build.jar.uptodate">
-    <echo message="**** ${build.jar.file} is up to date" />
-  </target>
+    <if>
+      <not>
+        <isset property="build.jar.uptodate"/>
+      </not>
+      <then>
+        <echo message="**** ${build.jar.file} needs rebuilding" />
 
-  <target name="do.build.uptodate"
-          unless="build.jar.uptodate">
-    <echo message="**** ${build.jar.file} needs rebuilding" />
+        <!-- Delete jar file -->
+        <delete file="${build.jar.file}"/>
 
-    <!-- Delete jar file -->
-    <delete file="${build.jar.file}"/>
+        <dirname property="build.jar.dir" file="${build.jar.file}"/>
 
-    <dirname property="build.jar.dir" file="${build.jar.file}"/>
+        <mkdir dir="${build.jar.dir}" />
 
-    <mkdir dir="${build.jar.dir}" />
+        <!-- ==========================================================
+                          Build the classes
+             ========================================================== -->
 
-    <!-- ==============================================================
-                      Build the classes
-         ============================================================== -->
+        <!-- First copy the sources we are going to compile into a temp
+             directory. -->
+        <mkdir dir="${jar.temp.sources}" />
+        <copy toDir="${jar.temp.sources}">
+          <fileset refid="base.java.sources" />
+          <fileset refid="base.resource.files"/>
+        </copy>
 
-    <!-- First copy the sources we are going to compile into a temp
-         directory. -->
-    <mkdir dir="${jar.temp.sources}" />
-    <copy toDir="${jar.temp.sources}">
-      <fileset refid="base.java.sources" />
-      <fileset refid="base.resource.files"/>
-    </copy>
+        <mkdir dir="${jar.temp.classes}"/>
+        <echo message="About to build jar ${build.jar.file}"/>
+        <property name="cp" refid="compile.classpath" />
+        <echo message="***************cp: ${cp}"/>
 
-    <mkdir dir="${jar.temp.classes}"/>
-    <echo message="About to build jar ${build.jar.file}"/>
-    <property name="cp" refid="compile.classpath" />
-    <echo message="***************cp: ${cp}"/>
+        <javac srcdir="${jar.temp.sources}"
+               destdir="${jar.temp.classes}"
+               debug="${compile.debug}"
+               verbose="${compile.verbose}"
+               listfiles="${compile.listfiles}"
+               deprecation="${compile.deprecation}"
+               optimize="${compile.optimize}">
+          <classpath refid="compile.classpath"/>
+          <include name="**/*.java"/>
+          <compilerarg value="-nowarn" compiler="jikes" />
+        </javac>
 
-    <javac srcdir="${jar.temp.sources}"
-           destdir="${jar.temp.classes}"
-           debug="${compile.debug}"
-           verbose="${compile.verbose}"
-           listfiles="${compile.listfiles}"
-           deprecation="${compile.deprecation}"
-           optimize="${compile.optimize}">
-      <classpath refid="compile.classpath"/>
-      <include name="**/*.java"/>
-      <compilerarg value="-nowarn" compiler="jikes" />
-    </javac>
+        <!-- ==========================================================
+                          Build jar file
+             ========================================================== -->
 
-    <!-- ==============================================================
-                      Build jar file
-         ============================================================== -->
+        <jar jarfile="${build.jar.file}">
+          <fileset dir="${jar.temp.classes}">
+            <patternset refid="base.class.patternset"/>
+          </fileset>
+          <fileset refid="base.resource.files"/>
+        </jar>
 
-    <jar jarfile="${build.jar.file}">
-      <fileset dir="${jar.temp.classes}">
-        <patternset refid="base.class.patternset"/>
-      </fileset>
-      <fileset refid="base.resource.files"/>
-    </jar>
+        <!-- ==========================================================
+                          Clean up
+             ========================================================== -->
 
-    <!-- ==============================================================
-                      Clean up
-         ============================================================== -->
-
-    <delete dir="${jar.temp.sources}" />
-    <delete dir="${jar.temp.classes}"/>
+        <delete dir="${jar.temp.sources}" />
+        <delete dir="${jar.temp.classes}"/>
+      </then>
+    </if>
   </target>
 </project>
Index: trunk/deployment/build.xml
===================================================================
--- trunk/deployment/build.xml (revision 997)
+++ trunk/deployment/build.xml (revision 1134)
@@ -137,11 +137,41 @@
     <delete dir="${org.bedework.temp.wars.home}" />
 
-    <antcall target="deploy.standalone.apps" inheritrefs="true" />
-
-    <antcall target="deploy.shellscr.apps" inheritrefs="true" />
-
-    <antcall target="deploy.portal.apps" inheritrefs="true" />
-
-    <antcall target="deploy.j2ee.apps" inheritrefs="true" />
+    <!--<antcall target="deploy.standalone.apps" inheritrefs="true" />-->
+    <if>
+      <isset property="org.bedework.global.build.standalone.app" />
+      <then>
+        <antcall target="deploy.apps" inheritrefs="true" >
+          <param name="org.bedework.deploy.kind" value="webapp" />
+        </antcall>
+      </then>
+    </if>
+
+    <!--<antcall target="deploy.shellscr.apps" inheritrefs="true" />-->
+    <!-- Always build the shellscr stuff.-->
+    <antcall target="deploy.apps" inheritrefs="true" >
+      <param name="org.bedework.deploy.kind" value="shellscr" />
+    </antcall>
+
+    <!-- <antcall target="deploy.portal.apps" inheritrefs="true" />-->
+    <if>
+      <isset property="org.bedework.global.portal.platform" />
+      <then>
+        <antcall target="deploy.apps" inheritrefs="true" >
+          <param name="org.bedework.deploy.kind"
+                 value="${org.bedework.global.portal.platform}" />
+        </antcall>
+      </then>
+    </if>
+
+    <!-- <antcall target="deploy.j2ee.apps" inheritrefs="true" />-->
+    <if>
+      <isset property="org.bedework.global.j2ee.platform" />
+      <then>
+        <antcall target="deploy.apps" inheritrefs="true" >
+          <param name="org.bedework.deploy.kind"
+                 value="${org.bedework.global.j2ee.platform}" />
+        </antcall>
+      </then>
+    </if>
 
     <!-- copy startup website that sends you to the applications -->
@@ -163,4 +193,5 @@
        ================================================================= -->
 
+  <!--
   <target name="deploy.standalone.apps" if="org.bedework.global.build.standalone.app" >
     <property name="org.bedework.deploy.kind" value="webapp" />
@@ -179,10 +210,12 @@
     <antcall target="deploy.apps" inheritrefs="true" />
   </target>
-
-  <!-- Always build the shellscr stuff. -->
+  -->
+
+  <!-- Always build the shellscr stuff.
   <target name="deploy.shellscr.apps" >
     <property name="org.bedework.deploy.kind" value="shellscr" />
     <antcall target="deploy.apps" inheritrefs="true" />
   </target>
+  -->
 
   <!-- The cp.xalan task conditionally copies the xalan.jar file, if
@@ -247,5 +280,5 @@
                 projectPrefix="org.bedework.project">
       <sequential>
-        <antcall target="wrap.deploy.available.app" inheritrefs="true" />
+        <antcall target="deploy.available.app" inheritrefs="true" />
       </sequential>
     </forEachApp>
@@ -261,4 +294,21 @@
   </target>
 
+  <target name="deploy.available.app">
+    <if>
+      <available file="${org.bedework.deploy.type.dir}/${org.bedework.deploy.kind}/build.xml"/>
+      <then>
+        <propertyset id="deploy-app-properties">
+          <propertyref prefix="org.bedework.app.${org.bedework.deploy.name}"/>
+          <globmapper from="org.bedework.app.${org.bedework.deploy.name}.*" to="propval.app.*"/>
+        </propertyset>
+
+        <ant antfile="${org.bedework.deploy.type.dir}/${org.bedework.deploy.kind}/build.xml"
+             inheritrefs="true" target="deploy" >
+          <propertyset refid="deploy-app-properties" />
+        </ant>
+      </then>
+    </if>
+  </target>
+  <!--
   <target name="wrap.deploy.available.app">
     <available file="${org.bedework.deploy.type.dir}/${org.bedework.deploy.kind}/build.xml"
@@ -279,4 +329,5 @@
     </ant>
   </target>
+  -->
 </project>