Index: nbproject/project.properties
===================================================================
--- nbproject/project.properties	(revision 99)
+++ nbproject/project.properties	(working copy)
@@ -66,7 +66,7 @@
 main.class=
 manifest.file=manifest.mf
 meta.inf.dir=${src.dir}/META-INF
-platform.active=default_platform
+platform.active=Java_HotSpot_TM__Client_VM_1.5.0_06-b05
 run.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}
Index: nbproject/project.xml
===================================================================
--- nbproject/project.xml	(revision 99)
+++ nbproject/project.xml	(working copy)
@@ -5,6 +5,7 @@
         <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
             <name>Stripes</name>
             <minimum-ant-version>1.6.5</minimum-ant-version>
+            <explicit-platform explicit-source-supported="true"/>
             <source-roots>
                 <root id="src.dir"/>
             </source-roots>
Index: nbproject/genfiles.properties
===================================================================
--- nbproject/genfiles.properties	(revision 99)
+++ nbproject/genfiles.properties	(working copy)
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=1ecb6362
+build.xml.data.CRC32=767f3b7b
 build.xml.script.CRC32=118e755d
 build.xml.stylesheet.CRC32=a12b3d02
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=1ecb6362
-nbproject/build-impl.xml.script.CRC32=93fae3cd
-nbproject/build-impl.xml.stylesheet.CRC32=ccee9889
+nbproject/build-impl.xml.data.CRC32=767f3b7b
+nbproject/build-impl.xml.script.CRC32=9a11c6b6
+nbproject/build-impl.xml.stylesheet.CRC32=d6fac558
Index: nbproject/build-impl.xml
===================================================================
--- nbproject/build-impl.xml	(revision 99)
+++ nbproject/build-impl.xml	(working copy)
@@ -47,6 +47,36 @@
         <property file="nbproject/project.properties"/>
     </target>
     <target name="-do-init" depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property">
+        <j2seproject1:property name="platform.home" value="platforms.${platform.active}.home"/>
+        <j2seproject1:property name="platform.bootcp" value="platforms.${platform.active}.bootclasspath"/>
+        <j2seproject1:property name="platform.compiler" value="platforms.${platform.active}.compile"/>
+        <j2seproject1:property name="platform.javac.tmp" value="platforms.${platform.active}.javac"/>
+        <condition property="platform.javac" value="${platform.home}/bin/javac">
+            <equals arg1="${platform.javac.tmp}" arg2="$${platforms.${platform.active}.javac}"/>
+        </condition>
+        <property name="platform.javac" value="${platform.javac.tmp}"/>
+        <j2seproject1:property name="platform.java.tmp" value="platforms.${platform.active}.java"/>
+        <condition property="platform.java" value="${platform.home}/bin/java">
+            <equals arg1="${platform.java.tmp}" arg2="$${platforms.${platform.active}.java}"/>
+        </condition>
+        <property name="platform.java" value="${platform.java.tmp}"/>
+        <j2seproject1:property name="platform.javadoc.tmp" value="platforms.${platform.active}.javadoc"/>
+        <condition property="platform.javadoc" value="${platform.home}/bin/javadoc">
+            <equals arg1="${platform.javadoc.tmp}" arg2="$${platforms.${platform.active}.javadoc}"/>
+        </condition>
+        <property name="platform.javadoc" value="${platform.javadoc.tmp}"/>
+        <condition property="platform.invalid" value="true">
+            <or>
+                <contains string="${platform.javac}" substring="$${platforms."/>
+                <contains string="${platform.java}" substring="$${platforms."/>
+                <contains string="${platform.javadoc}" substring="$${platforms."/>
+            </or>
+        </condition>
+        <fail unless="platform.home">Must set platform.home</fail>
+        <fail unless="platform.bootcp">Must set platform.bootcp</fail>
+        <fail unless="platform.java">Must set platform.java</fail>
+        <fail unless="platform.javac">Must set platform.javac</fail>
+        <fail if="platform.invalid">Platform is not correctly set up</fail>
         <available file="${manifest.file}" property="manifest.available"/>
         <condition property="manifest.available+main.class">
             <and>
@@ -91,6 +121,7 @@
         <property name="javac.debug" value="true"/>
         <property name="javadoc.preview" value="true"/>
         <property name="application.args" value=""/>
+        <property name="source.encoding" value="${file.encoding}"/>
         <property name="includes" value="**"/>
         <property name="excludes" value=""/>
     </target>
@@ -128,27 +159,49 @@
             <attribute name="debug" default="${javac.debug}"/>
             <element name="customize" optional="true"/>
             <sequential>
-                <depend srcdir="@{srcdir}" destdir="@{destdir}" cache="${build.dir}/depcache">
+                <javac srcdir="@{srcdir}" sourcepath="" destdir="@{destdir}" debug="@{debug}" deprecation="${javac.deprecation}" encoding="${source.encoding}" source="${javac.source}" target="${javac.target}" includes="@{includes}" excludes="@{excludes}" fork="yes" executable="${platform.javac}" tempdir="${java.io.tmpdir}" includeantruntime="false">
                     <classpath>
                         <path path="@{classpath}"/>
                     </classpath>
-                </depend>
-                <javac srcdir="@{srcdir}" sourcepath="" destdir="@{destdir}" debug="@{debug}" deprecation="${javac.deprecation}" source="${javac.source}" target="${javac.target}" includes="@{includes}" excludes="@{excludes}" includeantruntime="false">
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
                     <compilerarg line="${javac.compilerargs}"/>
                     <customize/>
                 </javac>
             </sequential>
         </macrodef>
+        <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute name="srcdir" default="${src.dir}"/>
+            <attribute name="destdir" default="${build.classes.dir}"/>
+            <attribute name="classpath" default="${javac.classpath}"/>
+            <sequential>
+                <depend srcdir="@{srcdir}" destdir="@{destdir}" cache="${build.dir}/depcache" includes="${includes}" excludes="${excludes}">
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                </depend>
+            </sequential>
+        </macrodef>
+        <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute name="destdir" default="${build.classes.dir}"/>
+            <sequential>
+                <fail unless="javac.includes">Must set javac.includes</fail>
+                <pathconvert property="javac.includes.binary" pathsep=",">
+                    <path>
+                        <filelist dir="@{destdir}" files="${javac.includes}"/>
+                    </path>
+                    <globmapper from="*.java" to="*.class"/>
+                </pathconvert>
+                <delete>
+                    <files includes="${javac.includes.binary}"/>
+                </delete>
+            </sequential>
+        </macrodef>
     </target>
     <target name="-init-macrodef-junit">
         <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
             <attribute name="includes" default="${includes}"/>
             <attribute name="excludes" default="${excludes}"/>
             <sequential>
-                <junit showoutput="true" fork="true" dir="${basedir}" failureproperty="tests.failed" errorproperty="tests.failed">
+                <junit showoutput="true" fork="true" dir="${basedir}" failureproperty="tests.failed" errorproperty="tests.failed" jvm="${platform.java}">
                     <batchtest todir="${build.test.results.dir}"/>
                     <classpath>
                         <path path="${run.test.classpath}"/>
@@ -174,6 +227,9 @@
                     <classpath>
                         <path path="@{classpath}"/>
                     </classpath>
+                    <bootclasspath>
+                        <path path="${platform.bootcp}"/>
+                    </bootclasspath>
                 </nbjpdastart>
             </sequential>
         </macrodef>
@@ -187,7 +243,9 @@
         </macrodef>
     </target>
     <target name="-init-debug-args">
-        <property name="version-output" value="java version &quot;${ant.java.version}"/>
+        <exec executable="${platform.java}" outputproperty="version-output">
+            <arg value="-version"/>
+        </exec>
         <condition property="have-jdk-older-than-1.4">
             <or>
                 <contains string="${version-output}" substring="java version &quot;1.0"/>
@@ -206,7 +264,7 @@
             <attribute name="classpath" default="${debug.classpath}"/>
             <element name="customize" optional="true"/>
             <sequential>
-                <java fork="true" classname="@{classname}" dir="${work.dir}">
+                <java fork="true" classname="@{classname}" dir="${work.dir}" jvm="${platform.java}">
                     <jvmarg line="${debug-args-line}"/>
                     <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
                     <jvmarg line="${run.jvmargs}"/>
@@ -227,7 +285,7 @@
             <attribute name="classname" default="${main.class}"/>
             <element name="customize" optional="true"/>
             <sequential>
-                <java fork="true" classname="@{classname}" dir="${work.dir}">
+                <java fork="true" classname="@{classname}" dir="${work.dir}" jvm="${platform.java}">
                     <jvmarg line="${run.jvmargs}"/>
                     <classpath>
                         <path path="${run.classpath}"/>
@@ -263,6 +321,7 @@
         <!-- You can override this target in the ../build.xml file. -->
     </target>
     <target name="-do-compile" depends="init,deps-jar,-pre-pre-compile,-pre-compile" if="have.sources">
+        <j2seproject3:depend/>
         <j2seproject3:javac/>
         <copy todir="${build.classes.dir}">
             <fileset dir="${src.dir}" includes="${includes}" excludes="${build.classes.excludes},${excludes}"/>
@@ -279,6 +338,7 @@
     </target>
     <target name="-do-compile-single" depends="init,deps-jar,-pre-pre-compile">
         <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
+        <j2seproject3:force-recompile/>
         <j2seproject3:javac includes="${javac.includes}" excludes=""/>
     </target>
     <target name="-post-compile-single">
@@ -318,7 +378,7 @@
             <path path="${run.classpath}"/>
             <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
         </pathconvert>
-        <echo>java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
+        <echo>${platform.java} -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
     </target>
     <target name="-do-jar-with-libraries" depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class+mkdist.available">
         <property name="build.classes.dir.resolved" location="${build.classes.dir}"/>
@@ -343,7 +403,7 @@
         </copylibs>
         <echo>To run this application from the command line without Ant, try:</echo>
         <property name="dist.jar.resolved" location="${dist.jar}"/>
-        <echo>java -jar "${dist.jar.resolved}"</echo>
+        <echo>${platform.java} -jar "${dist.jar.resolved}"</echo>
     </target>
     <target name="-post-jar">
         <!-- Empty placeholder for easier customization. -->
@@ -362,7 +422,7 @@
             </customize>
         </j2seproject1:java>
     </target>
-    <target name="run-single" depends="init,compile-single">
+    <target name="run-single" depends="init,compile">
         <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
         <j2seproject1:java classname="${run.class}"/>
     </target>
@@ -390,7 +450,7 @@
         <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
         <j2seproject3:debug classname="${debug.class}"/>
     </target>
-    <target name="debug-single" if="netbeans.home" depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-single"/>
+    <target name="debug-single" if="netbeans.home" depends="init,compile,-debug-start-debugger,-debug-start-debuggee-single"/>
     <target name="-pre-debug-fix" depends="init">
         <fail unless="fix.includes">Must set fix.includes</fail>
         <property name="javac.includes" value="${fix.includes}.java"/>
@@ -406,7 +466,7 @@
     -->
     <target name="-javadoc-build" depends="init">
         <mkdir dir="${dist.javadoc.dir}"/>
-        <javadoc destdir="${dist.javadoc.dir}" source="${javac.source}" notree="${javadoc.notree}" use="${javadoc.use}" nonavbar="${javadoc.nonavbar}" noindex="${javadoc.noindex}" splitindex="${javadoc.splitindex}" author="${javadoc.author}" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}" private="${javadoc.private}" additionalparam="${javadoc.additionalparam}" failonerror="true" useexternalfile="true">
+        <javadoc destdir="${dist.javadoc.dir}" source="${javac.source}" notree="${javadoc.notree}" use="${javadoc.use}" nonavbar="${javadoc.nonavbar}" noindex="${javadoc.noindex}" splitindex="${javadoc.splitindex}" author="${javadoc.author}" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}" private="${javadoc.private}" additionalparam="${javadoc.additionalparam}" failonerror="true" useexternalfile="true" executable="${platform.javadoc}">
             <classpath>
                 <path path="${javac.classpath}"/>
             </classpath>
@@ -433,6 +493,7 @@
         <!-- You can override this target in the ../build.xml file. -->
     </target>
     <target name="-do-compile-test" if="have.tests" depends="init,compile,-pre-pre-compile-test,-pre-compile-test">
+        <j2seproject3:depend srcdir="" destdir="${build.test.classes.dir}" classpath="${javac.test.classpath}"/>
         <j2seproject3:javac srcdir="" destdir="${build.test.classes.dir}" debug="true" classpath="${javac.test.classpath}"/>
         <copy todir="${build.test.classes.dir}"/>
     </target>
@@ -447,6 +508,7 @@
     </target>
     <target name="-do-compile-test-single" if="have.tests" depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single">
         <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
+        <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
         <j2seproject3:javac srcdir="" destdir="${build.test.classes.dir}" debug="true" classpath="${javac.test.classpath}" includes="${javac.includes}" excludes=""/>
         <copy todir="${build.test.classes.dir}"/>
     </target>
@@ -482,7 +544,7 @@
     <target name="-post-test-run-single" if="have.tests" depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single">
         <fail if="tests.failed">Some tests failed; see details above.</fail>
     </target>
-    <target name="test-single" depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test."/>
+    <target name="test-single" depends="init,compile-test,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test."/>
     <!--
     =======================
     JUNIT DEBUGGING SECTION
Index: src/META-INF/stripes.tld
===================================================================
--- src/META-INF/stripes.tld	(revision 99)
+++ src/META-INF/stripes.tld	(working copy)
@@ -458,6 +458,14 @@
             <description>Scripting code run prior to the form being submitted to the server, (HTML Pass-through)</description>
             <name>onsubmit</name><required>false</required><rtexprvalue>true</rtexprvalue>
         </attribute>
+        <attribute>
+            <description>
+                Tells the form whether or not actually render the &gt;form&lt; tag and the hidden 
+                sourcePage tags as well. This is useful for partial forms when you are using ajax
+                to render the segements and you don't want the additional form elements.
+            </description>
+            <name>partialForm</name><required>false</required><rtexprvalue>true</rtexprvalue>
+        </attribute>
 
         <!-- Start: Standard HTML attributes -->
         <attribute><description>The CSS class to be applied to the element. (HTML Pass-through)</description><name>class</name><required>false</required><rtexprvalue>true</rtexprvalue></attribute>
Index: src/META-INF/stripes-dynattr.tld
===================================================================
--- src/META-INF/stripes-dynattr.tld	(revision 99)
+++ src/META-INF/stripes-dynattr.tld	(working copy)
@@ -458,6 +458,14 @@
             <description>Scripting code run prior to the form being submitted to the server, (HTML Pass-through)</description>
             <name>onsubmit</name><required>false</required><rtexprvalue>true</rtexprvalue>
         </attribute>
+        <attribute>
+            <description>
+                Tells the form whether or not actually render the &gt;form&lt; tag and the hidden 
+                sourcePage tags as well. This is useful for partial forms when you are using ajax
+                to render the segements and you don't want the additional form elements.
+            </description>
+            <name>partialForm</name><required>false</required><rtexprvalue>true</rtexprvalue>
+        </attribute>
 
         <!-- Start: Standard HTML attributes -->
         <attribute><description>The CSS class to be applied to the element. (HTML Pass-through)</description><name>class</name><required>false</required><rtexprvalue>true</rtexprvalue></attribute>
Index: src/net/sourceforge/stripes/tag/FormTag.java
===================================================================
--- src/net/sourceforge/stripes/tag/FormTag.java	(revision 99)
+++ src/net/sourceforge/stripes/tag/FormTag.java	(working copy)
@@ -52,6 +52,8 @@
     /** Stores the field name (or magic values ''/'first') to set focus on. */
     private String focus;
     private boolean focusSet = false;
+    
+    private boolean partialForm;
 
     /** Stores the value of the action attribute before the context gets appended. */
     private String actionWithoutContext;
@@ -123,6 +125,8 @@
     /** Gets the name of the field that should receive focus when the form is rendered. */
     public String getFocus() { return focus; }
 
+    public void setPartialForm(boolean partialForm){ this.partialForm = partialForm; }
+    public boolean isPartialForm(){ return partialForm; }
 
     ////////////////////////////////////////////////////////////
     // Additional attributes specific to the form tag
@@ -192,28 +196,33 @@
             }
 
             JspWriter out = getPageContext().getOut();
-            writeOpenTag(out, "form");
+            if(!partialForm){
+                writeOpenTag(out, "form");
+            }
+            
             getBodyContent().writeOut( getPageContext().getOut() );
 
-            // Write out a hidden field with the name of the page in it....
-            // The div is necessary in order to be XHTML compliant, where a form can contain
-            // only block level elements (which seems stupid, but whatever).
-            out.write("<div style=\"display: none;\">");
-            out.write("<input type=\"hidden\" name=\"");
-            out.write(StripesConstants.URL_KEY_SOURCE_PAGE);
-            out.write("\" value=\"");
-            HttpServletRequest request = (HttpServletRequest) getPageContext().getRequest();
-            out.write( request.getServletPath());
-            out.write("\" />");
+            if(!partialForm){
+                // Write out a hidden field with the name of the page in it....
+                // The div is necessary in order to be XHTML compliant, where a form can contain
+                // only block level elements (which seems stupid, but whatever).
+                out.write("<div style=\"display: none;\">");
+                out.write("<input type=\"hidden\" name=\"");
+                out.write(StripesConstants.URL_KEY_SOURCE_PAGE);
+                out.write("\" value=\"");
+                HttpServletRequest request = (HttpServletRequest) getPageContext().getRequest();
+                out.write( request.getServletPath());
+                out.write("\" />");
 
-            if (isWizard()) {
-                writeWizardFields();
-            }
+                if (isWizard()) {
+                    writeWizardFields();
+                }
 
-            writeFieldsPresentHiddenField(out);
-            out.write("</div>");
+                writeFieldsPresentHiddenField(out);
+                out.write("</div>");
 
-            writeCloseTag(getPageContext().getOut(), "form");
+                writeCloseTag(getPageContext().getOut(), "form");
+            }
 
             // Write out a warning if focus didn't find a field
             if (this.focus != null && !this.focusSet) {