-- ADD DESCRIPTION HERE -- 
 
 
******************************************************************* 
* SECTION: Modified Files 
******************************************************************* 
M common/ant/common.xml
M common/ant/tomcat55x/container.xml
 
 
 
******************************************************************* 
* SECTION: Diffs 
******************************************************************* 
Index: common/ant/common.xml
===================================================================
RCS file: /cvs/javaserverfaces-sources/common/ant/common.xml,v
retrieving revision 1.2.2.4
diff -u -r1.2.2.4 common.xml
--- common/ant/common.xml	1 Mar 2007 22:32:31 -0000	1.2.2.4
+++ common/ant/common.xml	13 Mar 2007 20:12:53 -0000
@@ -92,7 +92,7 @@
 
     <!-- Test classpaths that are used in multiple places within the project -->
     <path id="junit.classpath">
-        <pathelement location="${junit.home}/junit.jar}"/>
+        <pathelement location="${junit.home}/junit.jar"/>
     </path>    
 
     <path id="htmlunit.compile.classpath">
Index: common/ant/tomcat55x/container.xml
===================================================================
RCS file: /cvs/javaserverfaces-sources/common/ant/tomcat55x/Attic/container.xml,v
retrieving revision 1.1.2.3
diff -u -r1.1.2.3 container.xml
--- common/ant/tomcat55x/container.xml	5 May 2006 14:35:32 -0000	1.1.2.3
+++ common/ant/tomcat55x/container.xml	13 Mar 2007 19:53:14 -0000
@@ -124,7 +124,75 @@
         <echo message="PENDING = Please implement"/>
     </target>
 
-    <target name="container.deploy" 
-            description="Deploy the JSF Implementation artifacts to the target container."/>           
+    <target name="container.deploy"
+            description="Deploy the JSF Implementation artifacts to the target container.">
+        <delete>
+            <fileset dir="${container.home}/common/lib" includes="jsf-*.jar"/>
+        </delete>
+        <copy todir="${container.home}/common/lib"
+              file="${jsf-api.jar}"/>
+        <copy todir="${container.home}/common/lib"
+              file="${jsf-impl.jar}"/>
+    </target>
     
+    <macrodef name="container.start"
+            description="Start the Tomcat container">
+        <sequential>
+            <start.tomcat/>
+        </sequential>
+    </macrodef>
+    
+    <macrodef name="container.stop"
+            description="Stop the Tomcat container">
+        <sequential>
+            <stop.tomcat/>
+        </sequential>
+    </macrodef>
+    
+    <!-- 'PRIVATE' targets -->
+    <macrodef name="start.tomcat">
+        <sequential>
+            <echo>
+                
+"------------ Starting ${container.name} ------------"
+                
+            </echo>
+            <if>
+                <os family="unix"/>
+                <then>
+                    <exec executable="${container.home}/bin/startup.sh" failonerror="true"/>
+                    <waitfor>
+                        <http url="http://${container.host}:${container.port}"/>
+                    </waitfor>
+                </then>
+                <else>
+                    <echo message="${container.home}/bin/startup.bat" />
+                    <exec executable="${container.home}/bin/startup.bat" spawn="false"/>
+                    <sleep seconds="15"/>
+                </else>
+            </if>
+        </sequential>
+    </macrodef>
+
+    <macrodef name="stop.tomcat">
+        <sequential>
+            <echo>
+                
+"------------ Stopping ${container.name} ------------"
+                
+            </echo>
+            <if>
+                <os family="unix"/>
+                <then>
+                    <exec executable="${container.home}/bin/shutdown.sh" />
+                </then>
+                <else>
+                    <echo message="${container.home}/bin/shutdown.bat" />
+                    <exec executable="${container.home}/bin/shutdown.bat" spawn="false" />
+                </else>
+            </if>
+
+            <sleep seconds="15"/>
+        </sequential>
+    </macrodef>
 </project>