You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by jk...@apache.org on 2007/04/08 22:21:09 UTC

svn commit: r526598 - in /tapestry/tapestry4/trunk: ./ src/site/ tapestry-annotations/ tapestry-contrib/ tapestry-examples/TimeTracker/ tapestry-examples/TimeTracker/src/context/ tapestry-examples/TimeTracker/src/java/org/apache/tapestry/timetracker/pa...

Author: jkuhnert
Date: Sun Apr  8 13:21:06 2007
New Revision: 526598

URL: http://svn.apache.org/viewvc?view=rev&rev=526598
Log:
Fixes TAPESTRY-1407. During XHR exception page renders it was possible to have the response returned be ill formed xml if other components had partially written content before the exception page was rendered. Added clear method to clear out previous writers before rendering exception pages.

Modified:
    tapestry/tapestry4/trunk/pom.xml
    tapestry/tapestry4/trunk/src/site/site.xml
    tapestry/tapestry4/trunk/tapestry-annotations/tapestry-annotations.iml
    tapestry/tapestry4/trunk/tapestry-contrib/pom.xml
    tapestry/tapestry4/trunk/tapestry-contrib/tapestry-contrib.iml
    tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/TimeTracker.iml
    tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/context/LocaleList.html
    tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/java/org/apache/tapestry/timetracker/page/LocaleList.java
    tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/java/org/apache/tapestry/timetracker/page/TaskEntryPage.java
    tapestry/tapestry4/trunk/tapestry-examples/Workbench/Workbench.iml
    tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/DojoAjaxResponseBuilder.java
    tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/HiveMindExpressionCompiler.java
    tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/DojoAjaxResponseBuilderTest.java
    tapestry/tapestry4/trunk/tapestry-framework/tapestry-framework.iml
    tapestry/tapestry4/trunk/tapestry-portlet/tapestry-portlet.iml
    tapestry/tapestry4/trunk/tapestry.iml
    tapestry/tapestry4/trunk/tapestry.ipr
    tapestry/tapestry4/trunk/tapestry.iws

Modified: tapestry/tapestry4/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/pom.xml?view=diff&rev=526598&r1=526597&r2=526598
==============================================================================
--- tapestry/tapestry4/trunk/pom.xml (original)
+++ tapestry/tapestry4/trunk/pom.xml Sun Apr  8 13:21:06 2007
@@ -420,9 +420,13 @@
                             <report>scm</report>
                             <report>index</report>
                             <report>dependencies</report>
+                            <report>dependency-convergence</report>
                         </reports>
                     </reportSet>
                 </reportSets>
+                <configuration>
+                    <dependencyLocationsEnabled>true</dependencyLocationsEnabled>
+                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -436,6 +440,11 @@
                         </reports>
                     </reportSet>
                 </reportSets>
+                <configuration>
+                    <filter>pid=10573&amp;status=5&amp;fixfor=12312202&amp;sorter/field=issuekey&amp;sorter/order=DESC</filter>
+                    <statusIds>Resolved,Closed</statusIds>
+                    <maxEntries>200</maxEntries>
+                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

Modified: tapestry/tapestry4/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/src/site/site.xml?view=diff&rev=526598&r1=526597&r2=526598
==============================================================================
--- tapestry/tapestry4/trunk/src/site/site.xml (original)
+++ tapestry/tapestry4/trunk/src/site/site.xml Sun Apr  8 13:21:06 2007
@@ -164,7 +164,7 @@
             </item>
             
         </menu>
-                
+
         <menu name="Modules">
             <item name="Tapestry Core" href="/tapestry-framework/index.html" />
             <item name="Contrib Library" href="/tapestry-contrib/index.html" />

Modified: tapestry/tapestry4/trunk/tapestry-annotations/tapestry-annotations.iml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-annotations/tapestry-annotations.iml?view=diff&rev=526598&r1=526597&r2=526598
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-annotations/tapestry-annotations.iml (original)
+++ tapestry/tapestry4/trunk/tapestry-annotations/tapestry-annotations.iml Sun Apr  8 13:21:06 2007
@@ -11,7 +11,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="tapestry" exported="" />
+    <orderEntry type="module" module-name="tapestry-framework" />
     <orderEntry type="module-library" exported="">
       <library name="Maven Dependency: backport-util-concurrent:backport-util-concurrent:jar:2.2:compile">
         <CLASSES>
@@ -205,6 +205,17 @@
         </SOURCES>
       </library>
     </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Maven Dependency: org.apache.tapestry:tapestry-framework:jar:4.1.2-SNAPSHOT:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/apache/tapestry/tapestry-framework/4.1.2-SNAPSHOT/tapestry-framework-4.1.2-SNAPSHOT.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/apache/tapestry/tapestry-framework/4.1.2-SNAPSHOT/tapestry-framework-4.1.2-SNAPSHOT-sources.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
     <orderEntry type="module-library" exported="">
       <library name="Maven Dependency: org.apache.tapestry:tapestry-test:jar:4.1.1-SNAPSHOT:test">
         <CLASSES>
@@ -238,7 +249,7 @@
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
+    <orderEntry type="module-library">
       <library name="Maven Dependency: org.testng:testng:jar:jdk15:5.1:test">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/testng/testng/5.1/testng-5.1-jdk15.jar!/" />

Modified: tapestry/tapestry4/trunk/tapestry-contrib/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-contrib/pom.xml?view=diff&rev=526598&r1=526597&r2=526598
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-contrib/pom.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-contrib/pom.xml Sun Apr  8 13:21:06 2007
@@ -183,6 +183,7 @@
     
     <reporting>
         <outputDirectory>../target/site/tapestry-contrib</outputDirectory>
+        <excludeDefaults>true</excludeDefaults>
     </reporting>
 
 </project>

Modified: tapestry/tapestry4/trunk/tapestry-contrib/tapestry-contrib.iml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-contrib/tapestry-contrib.iml?view=diff&rev=526598&r1=526597&r2=526598
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-contrib/tapestry-contrib.iml (original)
+++ tapestry/tapestry4/trunk/tapestry-contrib/tapestry-contrib.iml Sun Apr  8 13:21:06 2007
@@ -11,7 +11,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="tapestry" />
+    <orderEntry type="module" module-name="tapestry-framework" exported="" />
     <orderEntry type="module-library" exported="">
       <library name="Maven Dependency: backport-util-concurrent:backport-util-concurrent:jar:2.2:compile">
         <CLASSES>
@@ -211,6 +211,17 @@
         </JAVADOC>
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../.m2/repository/ognl/ognl/2.7-SNAPSHOT/ognl-2.7-SNAPSHOT-sources.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Maven Dependency: org.apache.tapestry:tapestry-framework:jar:4.1.2-SNAPSHOT:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/apache/tapestry/tapestry-framework/4.1.2-SNAPSHOT/tapestry-framework-4.1.2-SNAPSHOT.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/apache/tapestry/tapestry-framework/4.1.2-SNAPSHOT/tapestry-framework-4.1.2-SNAPSHOT-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>

Modified: tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/TimeTracker.iml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/TimeTracker.iml?view=diff&rev=526598&r1=526597&r2=526598
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/TimeTracker.iml (original)
+++ tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/TimeTracker.iml Sun Apr  8 13:21:06 2007
@@ -13,8 +13,9 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="tapestry" />
     <orderEntry type="module" module-name="tapestry-annotations" />
+    <orderEntry type="module" module-name="tapestry-contrib" />
+    <orderEntry type="module" module-name="tapestry-framework" />
     <orderEntry type="module-library">
       <library>
         <CLASSES>
@@ -275,6 +276,39 @@
       </library>
     </orderEntry>
     <orderEntry type="module-library">
+      <library name="Maven Dependency: org.apache.tapestry:tapestry-annotations:jar:4.1.2-SNAPSHOT:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../.m2/repository/org/apache/tapestry/tapestry-annotations/4.1.2-SNAPSHOT/tapestry-annotations-4.1.2-SNAPSHOT.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/../../../../.m2/repository/org/apache/tapestry/tapestry-annotations/4.1.2-SNAPSHOT/tapestry-annotations-4.1.2-SNAPSHOT-sources.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Maven Dependency: org.apache.tapestry:tapestry-contrib:jar:4.1.2-SNAPSHOT:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../.m2/repository/org/apache/tapestry/tapestry-contrib/4.1.2-SNAPSHOT/tapestry-contrib-4.1.2-SNAPSHOT.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/../../../../.m2/repository/org/apache/tapestry/tapestry-contrib/4.1.2-SNAPSHOT/tapestry-contrib-4.1.2-SNAPSHOT-sources.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Maven Dependency: org.apache.tapestry:tapestry-framework:jar:4.1.2-SNAPSHOT:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../.m2/repository/org/apache/tapestry/tapestry-framework/4.1.2-SNAPSHOT/tapestry-framework-4.1.2-SNAPSHOT.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/../../../../.m2/repository/org/apache/tapestry/tapestry-framework/4.1.2-SNAPSHOT/tapestry-framework-4.1.2-SNAPSHOT-sources.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
       <library name="Maven Dependency: org.apache.tapestry:tapestry-test:jar:4.1.1-SNAPSHOT:test">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../.m2/repository/org/apache/tapestry/tapestry-test/4.1.1-SNAPSHOT/tapestry-test-4.1.1-SNAPSHOT.jar!/" />
@@ -351,10 +385,6 @@
     <setting name="RUN_JASPER_VALIDATION" value="true" />
   </component>
   <component name="WebModuleProperties">
-    <containerElement type="module" name="tapestry">
-      <attribute name="method" value="0" />
-      <attribute name="URI" value="/WEB-INF/classes" />
-    </containerElement>
     <containerElement type="module" name="tapestry-annotations">
       <attribute name="method" value="1" />
       <attribute name="URI" value="/WEB-INF/classes" />
@@ -452,10 +482,6 @@
       <attribute name="method" value="0" />
       <attribute name="URI" value="/WEB-INF/lib/hsqldb-1.8.0.1.jar" />
     </containerElement>
-    <containerElement type="library" name="Maven Dependency: javax.portlet:portlet-api:jar:1.0:provided" level="module">
-      <attribute name="method" value="0" />
-      <attribute name="URI" value="/WEB-INF/lib/portlet-api-1.0.jar" />
-    </containerElement>
     <containerElement type="library" name="Maven Dependency: javax.servlet:servlet-api:jar:2.4:provided" level="module">
       <attribute name="method" value="0" />
       <attribute name="URI" value="&lt;N/A&gt;" />
@@ -464,18 +490,10 @@
       <attribute name="method" value="0" />
       <attribute name="URI" value="/WEB-INF/lib/javassist-3.4.ga.jar" />
     </containerElement>
-    <containerElement type="library" name="Maven Dependency: jboss:jboss-j2ee:jar:4.0.2:compile" level="module">
-      <attribute name="method" value="0" />
-      <attribute name="URI" value="/WEB-INF/lib/jboss-j2ee-4.0.2.jar" />
-    </containerElement>
     <containerElement type="library" name="Maven Dependency: jboss:jboss-j2ee:jar:4.0.2:provided" level="module">
       <attribute name="method" value="1" />
       <attribute name="URI" value="/WEB-INF/lib/jboss-j2ee-4.0.2.jar" />
     </containerElement>
-    <containerElement type="library" name="Maven Dependency: jcharts:jcharts:jar:0.6.0:compile" level="module">
-      <attribute name="method" value="0" />
-      <attribute name="URI" value="/WEB-INF/lib/jcharts-0.6.0.jar" />
-    </containerElement>
     <containerElement type="library" name="Maven Dependency: jdom:jdom:jar:1.0:test" level="module">
       <attribute name="method" value="0" />
       <attribute name="URI" value="/WEB-INF/lib/jdom-1.0.jar" />
@@ -563,10 +581,6 @@
     <containerElement type="library" name="Maven Dependency: oro:oro:jar:2.0.8:compile" level="module">
       <attribute name="method" value="0" />
       <attribute name="URI" value="/WEB-INF/lib/oro-2.0.8.jar" />
-    </containerElement>
-    <containerElement type="library" name="Maven Dependency: portlet-api:portlet-api:jar:1.0:compile" level="module">
-      <attribute name="method" value="0" />
-      <attribute name="URI" value="/WEB-INF/lib/portlet-api-1.0.jar" />
     </containerElement>
     <containerElement type="library" name="Maven Dependency: xerces:xercesImpl:jar:2.0.2:compile" level="module">
       <attribute name="method" value="0" />

Modified: tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/context/LocaleList.html
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/context/LocaleList.html?view=diff&rev=526598&r1=526597&r2=526598
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/context/LocaleList.html (original)
+++ tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/context/LocaleList.html Sun Apr  8 13:21:06 2007
@@ -74,11 +74,10 @@
 		jwcid="localeList@For" 
 		source="ognl:locales" value="ognl:currLocale">
 	
-	<a jwcid="localeLink@DirectLink" listener="listener:selectLocale" parameters="ognl:{currLocale.language, currLocale.country, currLocale.variant}""
+	<a jwcid="localeLink@DirectLink" listener="listener:selectLocale" parameters="ognl:{currLocale.language, currLocale.country, currLocale.variant}"
 		updateComponents="ognl:{'localeDetail',page.components.localeList.clientId}">
 		<span jwcid="@Insert" value="ognl:currLocale.toString()" />
 	</a>
-	
 </div>
 <br/>
 

Modified: tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/java/org/apache/tapestry/timetracker/page/LocaleList.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/java/org/apache/tapestry/timetracker/page/LocaleList.java?view=diff&rev=526598&r1=526597&r2=526598
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/java/org/apache/tapestry/timetracker/page/LocaleList.java (original)
+++ tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/java/org/apache/tapestry/timetracker/page/LocaleList.java Sun Apr  8 13:21:06 2007
@@ -13,11 +13,11 @@
 // limitations under the License.
 package org.apache.tapestry.timetracker.page;
 
-import java.util.Locale;
-
 import org.apache.tapestry.event.BrowserEvent;
 import org.apache.tapestry.html.BasePage;
 import org.apache.tapestry.services.ResponseBuilder;
+
+import java.util.Locale;
 
 
 /**

Modified: tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/java/org/apache/tapestry/timetracker/page/TaskEntryPage.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/java/org/apache/tapestry/timetracker/page/TaskEntryPage.java?view=diff&rev=526598&r1=526597&r2=526598
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/java/org/apache/tapestry/timetracker/page/TaskEntryPage.java (original)
+++ tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/java/org/apache/tapestry/timetracker/page/TaskEntryPage.java Sun Apr  8 13:21:06 2007
@@ -149,7 +149,7 @@
             setSelectedProject(getSelectedProject());
         }
     }
-    
+
     public void showSubProject()
     {
         setShowSubProject(true);

Modified: tapestry/tapestry4/trunk/tapestry-examples/Workbench/Workbench.iml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-examples/Workbench/Workbench.iml?view=diff&rev=526598&r1=526597&r2=526598
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-examples/Workbench/Workbench.iml (original)
+++ tapestry/tapestry4/trunk/tapestry-examples/Workbench/Workbench.iml Sun Apr  8 13:21:06 2007
@@ -15,8 +15,9 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="tapestry" />
     <orderEntry type="module" module-name="tapestry-annotations" />
+    <orderEntry type="module" module-name="tapestry-contrib" />
+    <orderEntry type="module" module-name="tapestry-framework" />
     <orderEntry type="module-library">
       <library>
         <CLASSES>
@@ -207,6 +208,39 @@
       </library>
     </orderEntry>
     <orderEntry type="module-library">
+      <library name="Maven Dependency: org.apache.tapestry:tapestry-annotations:jar:4.1.2-SNAPSHOT:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../.m2/repository/org/apache/tapestry/tapestry-annotations/4.1.2-SNAPSHOT/tapestry-annotations-4.1.2-SNAPSHOT.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/../../../../.m2/repository/org/apache/tapestry/tapestry-annotations/4.1.2-SNAPSHOT/tapestry-annotations-4.1.2-SNAPSHOT-sources.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Maven Dependency: org.apache.tapestry:tapestry-contrib:jar:4.1.2-SNAPSHOT:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../.m2/repository/org/apache/tapestry/tapestry-contrib/4.1.2-SNAPSHOT/tapestry-contrib-4.1.2-SNAPSHOT.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/../../../../.m2/repository/org/apache/tapestry/tapestry-contrib/4.1.2-SNAPSHOT/tapestry-contrib-4.1.2-SNAPSHOT-sources.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Maven Dependency: org.apache.tapestry:tapestry-framework:jar:4.1.2-SNAPSHOT:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../.m2/repository/org/apache/tapestry/tapestry-framework/4.1.2-SNAPSHOT/tapestry-framework-4.1.2-SNAPSHOT.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/../../../../.m2/repository/org/apache/tapestry/tapestry-framework/4.1.2-SNAPSHOT/tapestry-framework-4.1.2-SNAPSHOT-sources.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
       <library name="Maven Dependency: org.apache.tapestry:tapestry-test:jar:4.1.1-SNAPSHOT:test">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../.m2/repository/org/apache/tapestry/tapestry-test/4.1.1-SNAPSHOT/tapestry-test-4.1.1-SNAPSHOT.jar!/" />
@@ -263,10 +297,6 @@
     <setting name="RUN_JASPER_VALIDATION" value="false" />
   </component>
   <component name="WebModuleProperties">
-    <containerElement type="module" name="tapestry">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/classes" />
-    </containerElement>
     <containerElement type="module" name="tapestry-annotations">
       <attribute name="method" value="1" />
       <attribute name="URI" value="/WEB-INF/classes" />
@@ -316,14 +346,6 @@
       <attribute name="method" value="0" />
       <attribute name="URI" value="/WEB-INF/lib/commons-codec-1.3.jar" />
     </containerElement>
-    <containerElement type="library" name="Maven Dependency: commons-collections:commons-collections:jar:2.1:compile" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-collections-2.1.jar" />
-    </containerElement>
-    <containerElement type="library" name="Maven Dependency: commons-dbcp:commons-dbcp:jar:1.2.1:compile" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-dbcp-1.2.1.jar" />
-    </containerElement>
     <containerElement type="library" name="Maven Dependency: commons-fileupload:commons-fileupload:jar:1.1.1:compile" level="module">
       <attribute name="method" value="0" />
       <attribute name="URI" value="/WEB-INF/lib/commons-fileupload-1.1.1.jar" />
@@ -360,14 +382,6 @@
       <attribute name="method" value="0" />
       <attribute name="URI" value="&lt;N/A&gt;" />
     </containerElement>
-    <containerElement type="library" name="Maven Dependency: hsqldb:hsqldb:jar:1.8.0.1:compile" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/hsqldb-1.8.0.1.jar" />
-    </containerElement>
-    <containerElement type="library" name="Maven Dependency: javax.portlet:portlet-api:jar:1.0:provided" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/portlet-api-1.0.jar" />
-    </containerElement>
     <containerElement type="library" name="Maven Dependency: javax.servlet:servlet-api:jar:2.4:provided" level="module">
       <attribute name="method" value="0" />
       <attribute name="URI" value="&lt;N/A&gt;" />
@@ -376,10 +390,6 @@
       <attribute name="method" value="0" />
       <attribute name="URI" value="&lt;N/A&gt;" />
     </containerElement>
-    <containerElement type="library" name="Maven Dependency: jboss:jboss-j2ee:jar:4.0.2:compile" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/jboss-j2ee-4.0.2.jar" />
-    </containerElement>
     <containerElement type="library" name="Maven Dependency: jboss:jboss-j2ee:jar:4.0.2:optional" level="module">
       <attribute name="method" value="0" />
       <attribute name="URI" value="/WEB-INF/lib/jboss-j2ee-4.0.2.jar" />
@@ -416,10 +426,6 @@
       <attribute name="method" value="1" />
       <attribute name="URI" value="/WEB-INF/lib/log4j-1.2.8.jar" />
     </containerElement>
-    <containerElement type="library" name="Maven Dependency: log4j:log4j:jar:1.2.9:compile" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/log4j-1.2.9.jar" />
-    </containerElement>
     <containerElement type="library" name="Maven Dependency: log4j:log4j:jar:1.2.9:test" level="module">
       <attribute name="method" value="1" />
       <attribute name="URI" value="/WEB-INF/lib/log4j-1.2.9.jar" />
@@ -471,18 +477,6 @@
     <containerElement type="library" name="Maven Dependency: oro:oro:jar:2.0.8:compile" level="module">
       <attribute name="method" value="0" />
       <attribute name="URI" value="&lt;N/A&gt;" />
-    </containerElement>
-    <containerElement type="library" name="Maven Dependency: portlet-api:portlet-api:jar:1.0:compile" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/portlet-api-1.0.jar" />
-    </containerElement>
-    <containerElement type="library" name="Maven Dependency: xerces:xercesImpl:jar:2.0.2:compile" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/xercesImpl-2.0.2.jar" />
-    </containerElement>
-    <containerElement type="library" name="Maven Dependency: xml-apis:xml-apis:jar:1.0.b2:compile" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/xml-apis-1.0.b2.jar" />
     </containerElement>
     <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/context/WEB-INF/web.xml" optional="false" version="2.3" />
     <webroots>

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/DojoAjaxResponseBuilder.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/DojoAjaxResponseBuilder.java?view=diff&rev=526598&r1=526597&r2=526598
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/DojoAjaxResponseBuilder.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/DojoAjaxResponseBuilder.java Sun Apr  8 13:21:06 2007
@@ -13,27 +13,11 @@
 // limitations under the License.
 package org.apache.tapestry.services.impl;
 
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hivemind.Resource;
 import org.apache.hivemind.util.Defense;
-import org.apache.tapestry.IAsset;
-import org.apache.tapestry.IComponent;
-import org.apache.tapestry.IForm;
-import org.apache.tapestry.IMarkupWriter;
-import org.apache.tapestry.IPage;
-import org.apache.tapestry.IRender;
-import org.apache.tapestry.IRequestCycle;
-import org.apache.tapestry.NestedMarkupWriter;
-import org.apache.tapestry.TapestryUtils;
+import org.apache.tapestry.*;
 import org.apache.tapestry.asset.AssetFactory;
 import org.apache.tapestry.engine.IEngineService;
 import org.apache.tapestry.engine.NullWriter;
@@ -48,6 +32,10 @@
 import org.apache.tapestry.web.WebRequest;
 import org.apache.tapestry.web.WebResponse;
 
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.*;
+
 
 /**
  * Main class that handles dojo based ajax responses. These responses are wrapped
@@ -97,32 +85,48 @@
      * block has been started.
      */
     private boolean _responseStarted = false;
-    
+
     /**
-     * Creates a builder with a pre-configured {@link IMarkupWriter}. 
+     * Creates a builder with a pre-configured {@link IMarkupWriter}.
      * Currently only used for testing.
-     * 
+     *
      * @param writer
      *          The markup writer to render all "good" content to.
      * @param parts
-     *          A set of string ids of the components that may have 
+     *          A set of string ids of the components that may have
      *          their responses rendered.
      */
-    public DojoAjaxResponseBuilder(IRequestCycle cycle, IMarkupWriter writer, List parts)
+    public DojoAjaxResponseBuilder(IRequestCycle cycle, IMarkupWriter writer, List parts, List errorPages)
     {
         Defense.notNull(cycle, "cycle");
         Defense.notNull(writer, "writer");
-        
+
         _writer = writer;
         _cycle = cycle;
-        
-        if (parts != null) 
+
+        if (parts != null)
             _parts.addAll(parts);
-        
+
         _namespace = null;
         _assetFactory = null;
+        _errorPages = errorPages;
     }
-    
+
+    /**
+     * Creates a builder with a pre-configured {@link IMarkupWriter}. 
+     * Currently only used for testing.
+     * 
+     * @param writer
+     *          The markup writer to render all "good" content to.
+     * @param parts
+     *          A set of string ids of the components that may have 
+     *          their responses rendered.
+     */
+    public DojoAjaxResponseBuilder(IRequestCycle cycle, IMarkupWriter writer, List parts)
+    {
+        this(cycle, writer, parts, null);
+    }
+
     /**
      * Creates a new response builder with the required services it needs
      * to render the response when {@link #renderResponse(IRequestCycle)} is called.
@@ -510,6 +514,7 @@
             
             if (errorPage != null) {
                 _pageRender = true;
+                clearPartialWriters();
                 render.render(getWriter(errorPage, EXCEPTION_TYPE), cycle);
                 return;
             }
@@ -609,7 +614,16 @@
                 + "]>\n");
         _writer.printRaw("<ajax-response>");
     }
-    
+
+    /**
+     * Invoked to clear out tempoary partial writer buffers before rendering exception
+     * page.
+     */
+    void clearPartialWriters()
+    {
+        _writers.clear();
+    }
+
     /**
      * Called after the entire response has been captured. Causes
      * the writer buffer output captured to be segmented and written

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/HiveMindExpressionCompiler.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/HiveMindExpressionCompiler.java?view=diff&rev=526598&r1=526597&r2=526598
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/HiveMindExpressionCompiler.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/HiveMindExpressionCompiler.java Sun Apr  8 13:21:06 2007
@@ -141,7 +141,6 @@
 
                 // The target object may not fully resolve yet because of a partial tree with a null somewhere, we
                 // don't want to bail out forever because it might be enhancable on another pass eventually
-
                 return;
             }
 

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/DojoAjaxResponseBuilderTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/DojoAjaxResponseBuilderTest.java?view=diff&rev=526598&r1=526597&r2=526598
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/DojoAjaxResponseBuilderTest.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/DojoAjaxResponseBuilderTest.java Sun Apr  8 13:21:06 2007
@@ -13,22 +13,7 @@
 // limitations under the License.
 package org.apache.tapestry.services.impl;
 
-import static org.easymock.EasyMock.checkOrder;
-import static org.easymock.EasyMock.expect;
-
-import java.io.CharArrayWriter;
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.apache.tapestry.BaseComponentTestCase;
-import org.apache.tapestry.IComponent;
-import org.apache.tapestry.IMarkupWriter;
-import org.apache.tapestry.IPage;
-import org.apache.tapestry.IRender;
-import org.apache.tapestry.IRequestCycle;
-import org.apache.tapestry.NestedMarkupWriter;
+import org.apache.tapestry.*;
 import org.apache.tapestry.asset.AssetFactory;
 import org.apache.tapestry.engine.IEngineService;
 import org.apache.tapestry.engine.ILink;
@@ -43,9 +28,17 @@
 import org.apache.tapestry.services.ServiceConstants;
 import org.apache.tapestry.web.WebRequest;
 import org.apache.tapestry.web.WebResponse;
+import static org.easymock.EasyMock.checkOrder;
+import static org.easymock.EasyMock.expect;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.Test;
 
+import java.io.CharArrayWriter;
+import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
 
 /**
  * Tests functionality of {@link DojoAjaxResponseBuilder}.
@@ -193,8 +186,8 @@
         checkOrder(page, false);
         
         IRequestCycle cycle = newMock(IRequestCycle.class);
-        // IMarkupWriter writer = newMock(IMarkupWriter.class);
         RequestLocaleManager rlm = newMock(RequestLocaleManager.class);
+        
         MarkupWriterSource mrs = newMock(MarkupWriterSource.class);
         WebResponse resp = newMock(WebResponse.class);
         WebRequest req = newMock(WebRequest.class);
@@ -226,7 +219,7 @@
         
         verify();
     }
-    
+
     public void test_New_Page_Render()
     {
         IPage page = newMock(IPage.class);

Modified: tapestry/tapestry4/trunk/tapestry-framework/tapestry-framework.iml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/tapestry-framework.iml?view=diff&rev=526598&r1=526597&r2=526598
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/tapestry-framework.iml (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/tapestry-framework.iml Sun Apr  8 13:21:06 2007
@@ -328,6 +328,15 @@
       </library>
     </orderEntry>
     <orderEntry type="module-library" exported="">
+      <library name="Maven Dependency: org.openqa.selenium.server:selenium-server:jar:0.9.1-SNAPSHOT:test">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/openqa/selenium/server/selenium-server/0.9.1-SNAPSHOT/selenium-server-0.9.1-SNAPSHOT.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
       <library name="Maven Dependency: org.openqa.selenium.server:selenium-server:jar:standalone:0.9.1-SNAPSHOT:test">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/openqa/selenium/server/selenium-server/0.9.1-SNAPSHOT/selenium-server-0.9.1-SNAPSHOT-standalone.jar!/" />

Modified: tapestry/tapestry4/trunk/tapestry-portlet/tapestry-portlet.iml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-portlet/tapestry-portlet.iml?view=diff&rev=526598&r1=526597&r2=526598
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-portlet/tapestry-portlet.iml (original)
+++ tapestry/tapestry4/trunk/tapestry-portlet/tapestry-portlet.iml Sun Apr  8 13:21:06 2007
@@ -12,7 +12,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="tapestry" />
+    <orderEntry type="module" module-name="tapestry-framework" />
     <orderEntry type="module-library">
       <library name="Maven Dependency: backport-util-concurrent:backport-util-concurrent:jar:2.2:compile">
         <CLASSES>
@@ -212,6 +212,17 @@
         </JAVADOC>
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../.m2/repository/ognl/ognl/2.7-SNAPSHOT/ognl-2.7-SNAPSHOT-sources.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Maven Dependency: org.apache.tapestry:tapestry-framework:jar:4.1.2-SNAPSHOT:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/apache/tapestry/tapestry-framework/4.1.2-SNAPSHOT/tapestry-framework-4.1.2-SNAPSHOT.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/apache/tapestry/tapestry-framework/4.1.2-SNAPSHOT/tapestry-framework-4.1.2-SNAPSHOT-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>

Modified: tapestry/tapestry4/trunk/tapestry.iml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry.iml?view=diff&rev=526598&r1=526597&r2=526598
==============================================================================
--- tapestry/tapestry4/trunk/tapestry.iml (original)
+++ tapestry/tapestry4/trunk/tapestry.iml Sun Apr  8 13:21:06 2007
@@ -45,7 +45,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="tapestry-annotations" exported="" />
     <orderEntry type="module-library" exported="">
       <library name="Maven Dependency: ant:ant:jar:1.6.5:test">
         <CLASSES>
@@ -320,6 +319,17 @@
       </library>
     </orderEntry>
     <orderEntry type="module-library" exported="">
+      <library name="Maven Dependency: log4j:log4j:jar:1.2.8:test">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../.m2/repository/log4j/log4j/1.2.8/log4j-1.2.8.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/../../.m2/repository/log4j/log4j/1.2.8/log4j-1.2.8-sources.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
       <library name="Maven Dependency: log4j:log4j:jar:1.2.9:compile">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../.m2/repository/log4j/log4j/1.2.9/log4j-1.2.9.jar!/" />
@@ -354,6 +364,48 @@
         </SOURCES>
       </library>
     </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Maven Dependency: org.apache.tapestry:tapestry-VlibBeans:jar:4.1.2-SNAPSHOT:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../.m2/repository/org/apache/tapestry/tapestry-VlibBeans/4.1.2-SNAPSHOT/tapestry-VlibBeans-4.1.2-SNAPSHOT.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Maven Dependency: org.apache.tapestry:tapestry-annotations:jar:4.1.2-SNAPSHOT:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../.m2/repository/org/apache/tapestry/tapestry-annotations/4.1.2-SNAPSHOT/tapestry-annotations-4.1.2-SNAPSHOT.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/../../.m2/repository/org/apache/tapestry/tapestry-annotations/4.1.2-SNAPSHOT/tapestry-annotations-4.1.2-SNAPSHOT-sources.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Maven Dependency: org.apache.tapestry:tapestry-contrib:jar:4.1.2-SNAPSHOT:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../.m2/repository/org/apache/tapestry/tapestry-contrib/4.1.2-SNAPSHOT/tapestry-contrib-4.1.2-SNAPSHOT.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/../../.m2/repository/org/apache/tapestry/tapestry-contrib/4.1.2-SNAPSHOT/tapestry-contrib-4.1.2-SNAPSHOT-sources.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Maven Dependency: org.apache.tapestry:tapestry-framework:jar:4.1.2-SNAPSHOT:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../.m2/repository/org/apache/tapestry/tapestry-framework/4.1.2-SNAPSHOT/tapestry-framework-4.1.2-SNAPSHOT.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/../../.m2/repository/org/apache/tapestry/tapestry-framework/4.1.2-SNAPSHOT/tapestry-framework-4.1.2-SNAPSHOT-sources.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
     <orderEntry type="module-library" exported="">
       <library name="Maven Dependency: org.apache.tapestry:tapestry-test:jar:4.1.1-SNAPSHOT:test">
         <CLASSES>
@@ -420,6 +472,15 @@
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../.m2/repository/org/openqa/selenium/server/selenium-server-coreless/0.9.1-SNAPSHOT/selenium-server-coreless-0.9.1-SNAPSHOT-sources.jar!/" />
         </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="Maven Dependency: org.openqa.selenium.server:selenium-server:jar:0.9.1-SNAPSHOT:test">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../.m2/repository/org/openqa/selenium/server/selenium-server/0.9.1-SNAPSHOT/selenium-server-0.9.1-SNAPSHOT.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library" exported="">

Modified: tapestry/tapestry4/trunk/tapestry.ipr
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry.ipr?view=diff&rev=526598&r1=526597&r2=526598
==============================================================================
--- tapestry/tapestry4/trunk/tapestry.ipr (original)
+++ tapestry/tapestry4/trunk/tapestry.ipr Sun Apr  8 13:21:06 2007
@@ -160,14 +160,14 @@
         <option name="pluginEnabled" value="true" />
         <option name="updateClasspathsEnabled" value="true" />
         <option name="sortDependenciesEnabled" value="true" />
-        <option name="removeDuplicateDependenciesEnabled" value="true" />
+        <option name="removeDuplicateDependenciesEnabled" value="false" />
         <option name="respondToPomChangesEnabled" value="false" />
         <option name="manageSourceRootsEnabled" value="true" />
-        <option name="manageModuleInterdependenciesEnabled" value="true" />
+        <option name="manageModuleInterdependenciesEnabled" value="false" />
         <option name="downloadSourcesEnabled" value="false" />
         <option name="downloadJavadocEnabled" value="false" />
         <option name="generateSourcesEnabled" value="false" />
-        <option name="settingsPath" value="$USERPROFILE$/.m2/settings.xml" />
+        <option name="settingsPath" value="$USERPROFILE$/settings.xml" />
         <option name="searchFilter" value="target" />
         <option name="disabledPoms">
           <value>
@@ -181,7 +181,8 @@
                 <value>
                   <collection type="java.util.TreeSet">
                     <entry type="java.lang.String" value="tapestry" />
-                    <entry type="java.lang.String" value="tapestry-annotations" />
+                    <entry type="java.lang.String" value="tapestry-contrib" />
+                    <entry type="java.lang.String" value="tapestry-framework" />
                   </collection>
                 </value>
                 <key type="java.lang.String" value="TimeTracker" />
@@ -190,7 +191,8 @@
                 <value>
                   <collection type="java.util.TreeSet">
                     <entry type="java.lang.String" value="tapestry" />
-                    <entry type="java.lang.String" value="tapestry-annotations" />
+                    <entry type="java.lang.String" value="tapestry-contrib" />
+                    <entry type="java.lang.String" value="tapestry-framework" />
                   </collection>
                 </value>
                 <key type="java.lang.String" value="Workbench" />
@@ -198,7 +200,8 @@
               <entry>
                 <value>
                   <collection type="java.util.TreeSet">
-                    <entry type="java.lang.String" value="tapestry-annotations" />
+                    <entry type="java.lang.String" value="tapestry-contrib" />
+                    <entry type="java.lang.String" value="tapestry-framework" />
                   </collection>
                 </value>
                 <key type="java.lang.String" value="tapestry" />
@@ -206,7 +209,7 @@
               <entry>
                 <value>
                   <collection type="java.util.TreeSet">
-                    <entry type="java.lang.String" value="tapestry" />
+                    <entry type="java.lang.String" value="tapestry-framework" />
                   </collection>
                 </value>
                 <key type="java.lang.String" value="tapestry-annotations" />
@@ -214,7 +217,7 @@
               <entry>
                 <value>
                   <collection type="java.util.TreeSet">
-                    <entry type="java.lang.String" value="tapestry" />
+                    <entry type="java.lang.String" value="tapestry-framework" />
                   </collection>
                 </value>
                 <key type="java.lang.String" value="tapestry-contrib" />
@@ -222,7 +225,7 @@
               <entry>
                 <value>
                   <collection type="java.util.TreeSet">
-                    <entry type="java.lang.String" value="tapestry" />
+                    <entry type="java.lang.String" value="tapestry-framework" />
                   </collection>
                 </value>
                 <key type="java.lang.String" value="tapestry-portlet" />
@@ -378,6 +381,7 @@
     <option name="ADDITIONAL_OPTIONS_STRING" value="" />
   </component>
   <component name="StarteamVcsAdapter" />
+  <component name="XSLT-Support.FileAssociationsManager" />
   <component name="com.intellij.jsf.UserDefinedFacesConfigs">
     <option name="USER_DEFINED_CONFIGS">
       <value>

Modified: tapestry/tapestry4/trunk/tapestry.iws
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry.iws?view=diff&rev=526598&r1=526597&r2=526598
==============================================================================
--- tapestry/tapestry4/trunk/tapestry.iws (original)
+++ tapestry/tapestry4/trunk/tapestry.iws Sun Apr  8 13:21:06 2007
@@ -18,16 +18,22 @@
   <component name="ChangeListManager">
     <list default="true" name="Default" comment="">
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry.iws" afterPath="$PROJECT_DIR$/tapestry.iws" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pom.xml" afterPath="$PROJECT_DIR$/pom.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry-contrib/pom.xml" afterPath="$PROJECT_DIR$/tapestry-contrib/pom.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry-annotations/tapestry-annotations.iml" afterPath="$PROJECT_DIR$/tapestry-annotations/tapestry-annotations.iml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pom.xml" afterPath="$PROJECT_DIR$/pom.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry.ipr" afterPath="$PROJECT_DIR$/tapestry.ipr" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry-examples/TimeTracker/pom.xml" afterPath="$PROJECT_DIR$/tapestry-examples/TimeTracker/pom.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry-examples/TimeTracker/src/context/LocaleList.html" afterPath="$PROJECT_DIR$/tapestry-examples/TimeTracker/src/context/LocaleList.html" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry-examples/TimeTracker/TimeTracker.iml" afterPath="$PROJECT_DIR$/tapestry-examples/TimeTracker/TimeTracker.iml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry-contrib/src/site/xdoc/componentreference/palette.xml" afterPath="$PROJECT_DIR$/tapestry-contrib/src/site/xdoc/componentreference/palette.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry-examples/Workbench/Workbench.iml" afterPath="$PROJECT_DIR$/tapestry-examples/Workbench/Workbench.iml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/services/impl/DojoAjaxResponseBuilder.java" afterPath="$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/services/impl/DojoAjaxResponseBuilder.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry-examples/TimeTracker/src/java/org/apache/tapestry/timetracker/page/LocaleList.java" afterPath="$PROJECT_DIR$/tapestry-examples/TimeTracker/src/java/org/apache/tapestry/timetracker/page/LocaleList.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry-contrib/tapestry-contrib.iml" afterPath="$PROJECT_DIR$/tapestry-contrib/tapestry-contrib.iml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry-framework/tapestry-framework.iml" afterPath="$PROJECT_DIR$/tapestry-framework/tapestry-framework.iml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/services/impl/HiveMindExpressionCompiler.java" afterPath="$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/services/impl/HiveMindExpressionCompiler.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry-framework/src/test/org/apache/tapestry/services/impl/DojoAjaxResponseBuilderTest.java" afterPath="$PROJECT_DIR$/tapestry-framework/src/test/org/apache/tapestry/services/impl/DojoAjaxResponseBuilderTest.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry-examples/TimeTracker/src/java/org/apache/tapestry/timetracker/page/TaskEntryPage.java" afterPath="$PROJECT_DIR$/tapestry-examples/TimeTracker/src/java/org/apache/tapestry/timetracker/page/TaskEntryPage.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry.iml" afterPath="$PROJECT_DIR$/tapestry.iml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/site/site.xml" afterPath="$PROJECT_DIR$/src/site/site.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry-portlet/tapestry-portlet.iml" afterPath="$PROJECT_DIR$/tapestry-portlet/tapestry-portlet.iml" />
     </list>
   </component>
@@ -224,7 +230,7 @@
       <showLibraryContents />
       <hideEmptyPackages />
       <abbreviatePackageNames />
-      <showStructure Favorites="false" ProjectPane="false" Scope="false" PackagesPane="false" />
+      <showStructure Favorites="false" PackagesPane="false" Scope="false" ProjectPane="false" />
       <autoscrollToSource />
       <autoscrollFromSource />
       <sortByType />
@@ -235,13 +241,13 @@
     <property name="TEMP_MODULE_EXPLODED_DIR_FOR_Workbench" value="/tmp/webExplodedDir16585tmp" />
     <property name="GoToClass.toSaveIncludeLibraries" value="false" />
     <property name="TEMP_MODULE_EXPLODED_DIR_FOR_TimeTracker" value="/tmp/webExplodedDir16584tmp" />
-    <property name="RunManagerConfig.compileBeforeRunning" value="true" />
     <property name="RunManagerConfig.showSettingsBeforeRunnig" value="false" />
+    <property name="RunManagerConfig.compileBeforeRunning" value="true" />
     <property name="MemberChooser.sorted" value="false" />
     <property name="MemberChooser.showClasses" value="true" />
     <property name="GoToClass.includeLibraries" value="false" />
-    <property name="Web Module Deployment Descriptor Default Version" value="2.3" />
     <property name="GoToClass.includeJavaFiles" value="false" />
+    <property name="Web Module Deployment Descriptor Default Version" value="2.3" />
     <property name="MemberChooser.copyJavadoc" value="false" />
   </component>
   <component name="ReadonlyStatusHandler">
@@ -249,14 +255,14 @@
   </component>
   <component name="RecentsManager" />
   <component name="RestoreUpdateTree" />
-  <component name="RunManager" selected="TestNG.TestExpressionEvaluator">
-    <tempConfiguration default="false" name="TestExpressionEvaluator" type="TestNG" factoryName="TestNG" enabled="false" merge="false">
+  <component name="RunManager" selected="TestNG.DojoAjaxResponseBuilderTest">
+    <tempConfiguration default="false" name="DojoAjaxResponseBuilderTest" type="TestNG" factoryName="TestNG" enabled="false" merge="false">
       <module name="tapestry-framework" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
       <option name="ALTERNATIVE_JRE_PATH" />
       <option name="SUITE_NAME" />
       <option name="PACKAGE_NAME" value="org.apache.tapestry.services.impl" />
-      <option name="MAIN_CLASS_NAME" value="org.apache.tapestry.services.impl.TestExpressionEvaluator" />
+      <option name="MAIN_CLASS_NAME" value="org.apache.tapestry.services.impl.DojoAjaxResponseBuilderTest" />
       <option name="METHOD_NAME" />
       <option name="GROUP_NAME" />
       <option name="TEST_OBJECT" value="CLASS" />
@@ -276,52 +282,62 @@
         <option name="Make" value="true" />
       </method>
     </tempConfiguration>
-    <configuration default="true" type="TestNG" factoryName="TestNG" enabled="false" merge="false">
+    <configuration default="true" type="Remote" factoryName="Remote">
+      <option name="USE_SOCKET_TRANSPORT" value="true" />
+      <option name="SERVER_MODE" value="false" />
+      <option name="SHMEM_ADDRESS" value="javadebug" />
+      <option name="HOST" value="localhost" />
+      <option name="PORT" value="5005" />
+    </configuration>
+    <configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false">
       <module name="" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
       <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="SUITE_NAME" />
       <option name="PACKAGE_NAME" />
       <option name="MAIN_CLASS_NAME" />
       <option name="METHOD_NAME" />
-      <option name="GROUP_NAME" />
-      <option name="TEST_OBJECT" value="CLASS" />
+      <option name="TEST_OBJECT" value="class" />
       <option name="VM_PARAMETERS" />
       <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="OUTPUT_DIRECTORY" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
       <option name="ADDITIONAL_CLASS_PATH" />
       <option name="TEST_SEARCH_SCOPE">
         <value defaultName="wholeProject" />
       </option>
-      <option name="PROPERTIES_FILE" />
-      <properties />
       <method>
         <option name="Make" value="true" />
       </method>
     </configuration>
-    <configuration default="true" type="Remote" factoryName="Remote">
-      <option name="USE_SOCKET_TRANSPORT" value="true" />
-      <option name="SERVER_MODE" value="false" />
-      <option name="SHMEM_ADDRESS" value="javadebug" />
-      <option name="HOST" value="localhost" />
-      <option name="PORT" value="5005" />
+    <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false">
+      <option name="MAIN_CLASS_NAME" />
+      <option name="VM_PARAMETERS" />
+      <option name="PROGRAM_PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="ENABLE_SWING_INSPECTOR" value="false" />
+      <module name="" />
     </configuration>
-    <configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false">
+    <configuration default="true" type="TestNG" factoryName="TestNG" enabled="false" merge="false">
       <module name="" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
       <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="SUITE_NAME" />
       <option name="PACKAGE_NAME" />
       <option name="MAIN_CLASS_NAME" />
       <option name="METHOD_NAME" />
-      <option name="TEST_OBJECT" value="class" />
+      <option name="GROUP_NAME" />
+      <option name="TEST_OBJECT" value="CLASS" />
       <option name="VM_PARAMETERS" />
       <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="WORKING_DIRECTORY" />
+      <option name="OUTPUT_DIRECTORY" />
       <option name="ADDITIONAL_CLASS_PATH" />
       <option name="TEST_SEARCH_SCOPE">
         <value defaultName="wholeProject" />
       </option>
+      <option name="PROPERTIES_FILE" />
+      <properties />
       <method>
         <option name="Make" value="true" />
       </method>
@@ -338,16 +354,6 @@
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
       <option name="ALTERNATIVE_JRE_PATH" />
     </configuration>
-    <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false">
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
-      <module name="" />
-    </configuration>
     <configuration default="false" name="RemoteTimeTracker" type="Remote" factoryName="Remote">
       <option name="USE_SOCKET_TRANSPORT" value="true" />
       <option name="SERVER_MODE" value="false" />
@@ -412,7 +418,7 @@
     <option name="UPDATE_RUN_STATUS" value="false" />
     <option name="UPDATE_RECURSIVELY" value="true" />
     <option name="MERGE_DRY_RUN" value="false" />
-    <configuration useDefault="true">$USERPROFILE$/.subversion</configuration>
+    <configuration useDefault="true">/home/jkuhnert/.subversion</configuration>
     <checkoutURL>https://svn.apache.org/repos/asf/maven/sandbox/branches/surefire/surefire-collaboration/</checkoutURL>
     <checkoutURL>https://jkuhnert@svn.opensymphony.com/svn/ognl</checkoutURL>
     <checkoutURL>http://mavenreloaded.googlecode.com/svn/</checkoutURL>
@@ -435,7 +441,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="96" y="160" width="2112" height="1361" extended-state="0" />
+    <frame x="98" y="164" width="2112" height="1361" extended-state="0" />
     <editor active="false" />
     <layout>
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
@@ -444,8 +450,8 @@
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="1" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.23568465" order="1" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2514523" order="3" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2599668" order="8" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2076412" order="8" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.19933555" order="8" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.20681064" order="8" />
       <window_info id="Maven" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.19502075" order="8" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="7" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="1" />
@@ -454,7 +460,7 @@
       <window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
       <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
       <window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2322298" order="0" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.23369037" order="0" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24975657" order="2" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="6" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25830564" order="2" />
@@ -479,7 +485,7 @@
     <option name="PERFORM_COMMIT_IN_BACKGROUND" value="false" />
     <option name="PUT_FOCUS_INTO_COMMENT" value="false" />
     <option name="FORCE_NON_EMPTY_COMMENT" value="false" />
-    <option name="LAST_COMMIT_MESSAGE" value="Fixes TAPESTRY-1402. &#10;&#10;For whatever reason my previous catch blocks weren't being executed so I moved them around some and things seem to work now." />
+    <option name="LAST_COMMIT_MESSAGE" value="Fixes TAPESTRY-1407. During XHR exception page renders it was possible to have the response returned be ill formed xml if other components had partially written content before the exception page was rendered. Added clear method to clear out previous writers before rendering exception pages." />
     <option name="SAVE_LAST_COMMIT_MESSAGE" value="true" />
     <option name="CHECKIN_DIALOG_SPLITTER_PROPORTION" value="0.8" />
     <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="true" />
@@ -492,7 +498,6 @@
     <option name="UPDATE_GROUP_BY_PACKAGES" value="false" />
     <option name="SHOW_FILE_HISTORY_AS_TREE" value="false" />
     <option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
-    <MESSAGE value="Fixes TAPESTRY-937. Simple stupid indexOf check using &gt; 1 instead of &gt; -1. I'm sure I added this bug at some point." />
     <MESSAGE value="Fixes TAPESTRY-996.&#10;&#10;RequestLocaleManager was being extremely picky about incoming locale requests matching filtered locales if the filtered list didn't contain exact matches when the original filter list has country/language specific listings only." />
     <MESSAGE value="Minor coide cleanups. Removed unused / deprecated for 4.1 interface." />
     <MESSAGE value="Fixes TAPESTRY-1378. &#10;&#10;The dropdown Date/Time pickers had specific java.util.Date bindings that made it impossible to use any other date objects (like Joda ). Refactored these components and the associated DateTranslator to make it possible to substitute the less well liked Date object with something else.." />
@@ -502,7 +507,13 @@
     <MESSAGE value="Updated relevant OGNL interfaces to work with new codebase." />
     <MESSAGE value="The promised fail safe ognl expression evaluator changes." />
     <MESSAGE value="Fixes TAPESTRY-1402. &#10;&#10;For whatever reason my previous catch blocks weren't being executed so I moved them around some and things seem to work now." />
+    <MESSAGE value="Fixes TAPESTRY-1407. During XHR exception page renders it was possible to have the response returned be ill formed xml if other components had partially written content before the exception page was rendered. Added clear method to clear out previous writers before rendering exception pages." />
+  </component>
+  <component name="XPathView.XPathProjectComponent">
+    <history />
+    <find-history />
   </component>
+  <component name="XSLT-Support.FileAssociationsSettings" />
   <component name="antWorkspaceConfiguration">
     <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
     <option name="FILTER_TARGETS" value="false" />
@@ -512,116 +523,121 @@
   </component>
   <component name="com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectRootMasterDetailsConfigurable" proportions="0.22673559,0.5" version="1">
     <option name="myPlainMode" value="false" />
-    <option name="myLastEditedConfigurable" value="tapestry" />
+    <option name="myLastEditedConfigurable" value="Workbench" />
   </component>
   <component name="com.intellij.profile.ui.ErrorOptionsConfigurable" proportions="0.16666667,0.5642857" version="1">
     <option name="myLastEditedConfigurable" value="Project Default" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/services/impl/ExpressionEvaluatorImpl.java">
+    <entry file="file://$PROJECT_DIR$/tapestry-examples/TimeTracker/src/context/Home.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="152" column="12" selection-start="4886" selection-end="4886" vertical-scroll-proportion="0.012787724">
+        <state line="56" column="0" selection-start="1972" selection-end="1972" vertical-scroll-proportion="0.50305146">
           <folding />
         </state>
       </provider>
+      <provider editor-type-id="HtmlPreview">
+        <state />
+      </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/bean/BeanProviderPropertyAccessor.java">
+    <entry file="file://$PROJECT_DIR$/tapestry-contrib/pom.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="95" column="12" selection-start="3191" selection-end="3191" vertical-scroll-proportion="0.6803069">
+        <state line="164" column="46" selection-start="6241" selection-end="6241" vertical-scroll-proportion="0.60443306">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/listener/ListenerMapPropertyAccessor.java">
+    <entry file="file://$PROJECT_DIR$/src/site/site.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="87" column="8" selection-start="2875" selection-end="2875" vertical-scroll-proportion="0.65473145">
+        <state line="34" column="8" selection-start="1232" selection-end="1232" vertical-scroll-proportion="0.012787724">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/enhance/AbstractFab.java">
+    <entry file="file://$PROJECT_DIR$/tapestry-contrib/src/java/org/apache/tapestry/contrib/ajax/AjaxStatus.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="60" column="46" selection-start="1715" selection-end="1715" vertical-scroll-proportion="0.50877196">
+        <state line="45" column="0" selection-start="1583" selection-end="1583" vertical-scroll-proportion="0.4211663">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/enhance/ClassFabImpl.java">
+    <entry file="file://$PROJECT_DIR$/tapestry-contrib/src/java/org/apache/tapestry/contrib/ajax/AjaxStatus.script">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="165" column="9" selection-start="4366" selection-end="4366" vertical-scroll-proportion="-0.37084398">
+        <state line="15" column="0" selection-start="448" selection-end="448" vertical-scroll-proportion="0.24298055">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/tapestry-framework/src/test/org/apache/tapestry/services/impl/TestExpressionEvaluator.java">
+    <entry file="file://$PROJECT_DIR$/tapestry-framework/src/js/tapestry/fx.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="98" column="0" selection-start="2496" selection-end="2496" vertical-scroll-proportion="0.3196931">
+        <state line="21" column="4" selection-start="673" selection-end="673" vertical-scroll-proportion="0.3401728">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
+    <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/services/impl/HiveMindExpressionCompiler.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="448" column="26" selection-start="18609" selection-end="18609" vertical-scroll-proportion="0.51150894">
+        <state line="143" column="23" selection-start="5409" selection-end="5409" vertical-scroll-proportion="0.25575447">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/dojo/form/IAutocompleteModel.java">
+    <entry file="file://$PROJECT_DIR$/tapestry-contrib/src/java/org/apache/tapestry/contrib/table/model/simple/SimpleTableColumnFormRendererSource.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="46" column="4" selection-start="1624" selection-end="1624" vertical-scroll-proportion="0.39641944">
+        <state line="41" column="0" selection-start="1608" selection-end="1608" vertical-scroll-proportion="0.29411766">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/tapestry-examples/TimeTracker/src/java/org/apache/tapestry/timetracker/page/TaskEntryPage.java">
+    <entry file="file://$PROJECT_DIR$/pom.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="95" column="15" selection-start="3589" selection-end="3589" vertical-scroll-proportion="0.7800512">
+        <state line="327" column="24" selection-start="13153" selection-end="13153" vertical-scroll-proportion="0.51236147">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$USERPROFILE$/.m2/repository/hivemind/hivemind/1.1.1/hivemind-1.1.1-sources.jar!/org/apache/hivemind/service/ClassFab.java">
+    <entry file="file://$PROJECT_DIR$/tapestry-examples/TimeTracker/src/java/org/apache/tapestry/timetracker/page/TaskEntryPage.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="77" column="21" selection-start="3243" selection-end="3243" vertical-scroll-proportion="0.59079283">
+        <state line="150" column="5" selection-start="5118" selection-end="5118" vertical-scroll-proportion="0.8337596">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/tapestry-examples/TimeTracker/pom.xml">
+    <entry file="file://$PROJECT_DIR$/tapestry-examples/TimeTracker/src/java/org/apache/tapestry/timetracker/page/LocaleList.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="16" column="18" selection-start="724" selection-end="724" vertical-scroll-proportion="0.20460358">
+        <state line="50" column="0" selection-start="1523" selection-end="1523" vertical-scroll-proportion="0.4347826">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$USERPROFILE$/.m2/repository/jboss/javassist/3.4.ga/javassist-3.4.ga.jar!/javassist/compiler/CompileError.class">
+    <entry file="file://$PROJECT_DIR$/tapestry-examples/TimeTracker/src/context/LocaleList.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="22" column="0" selection-start="880" selection-end="880" vertical-scroll-proportion="0.2685422">
+        <state line="68" column="38" selection-start="1424" selection-end="1424" vertical-scroll-proportion="0.7122929">
           <folding />
         </state>
       </provider>
+      <provider editor-type-id="HtmlPreview">
+        <state />
+      </provider>
     </entry>
-    <entry file="jar://$USERPROFILE$/.m2/repository/jboss/javassist/3.4.ga/javassist-3.4.ga.jar!/javassist/compiler/SyntaxError.class">
+    <entry file="file://$PROJECT_DIR$/tapestry-framework/src/test/org/apache/tapestry/services/impl/DojoAjaxResponseBuilderTest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="5" column="54" selection-start="197" selection-end="197" vertical-scroll-proportion="0.051150896">
-          <folding />
+        <state line="231" column="8" selection-start="7454" selection-end="7454" vertical-scroll-proportion="0.28132993">
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/tapestry-examples/TimeTracker/src/context/Home.html">
-      <provider editor-type-id="HtmlPreview">
-        <state />
-      </provider>
+    <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/services/impl/DojoAjaxResponseBuilder.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="56" column="0" selection-start="1972" selection-end="1972" vertical-scroll-proportion="0.50305146">
+        <state line="616" column="0" selection-start="18073" selection-end="18073" vertical-scroll-proportion="0.39300936">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/services/impl/HiveMindExpressionCompiler.java">
+    <entry file="file://$PROJECT_DIR$/tapestry-contrib/src/site/site.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="178" column="0" selection-start="6392" selection-end="6392" vertical-scroll-proportion="0.16709292">
+        <state line="36" column="8" selection-start="1271" selection-end="1271" vertical-scroll-proportion="0.46035805">
           <folding />
         </state>
       </provider>