You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by jk...@apache.org on 2007/03/18 23:20:52 UTC
svn commit: r519711 - in /tapestry/tapestry4/trunk: ./ tapestry-annotations/
tapestry-contrib/ tapestry-examples/TimeTracker/
tapestry-examples/Workbench/ tapestry-framework/
tapestry-framework/src/java/org/apache/tapestry/multipart/ tapestry-portlet/
Author: jkuhnert
Date: Sun Mar 18 15:20:51 2007
New Revision: 519711
URL: http://svn.apache.org/viewvc?view=rev&rev=519711
Log:
Upgraded commons-fileupload/commons-io.
Modified:
tapestry/tapestry4/trunk/pom.xml
tapestry/tapestry4/trunk/tapestry-annotations/tapestry-annotations.iml
tapestry/tapestry4/trunk/tapestry-contrib/tapestry-contrib.iml
tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/TimeTracker.iml
tapestry/tapestry4/trunk/tapestry-examples/Workbench/Workbench.iml
tapestry/tapestry4/trunk/tapestry-framework/pom.xml
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/multipart/AbstractMultipartDecoder.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/multipart/MultipartDecoderImpl.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=519711&r1=519710&r2=519711
==============================================================================
--- tapestry/tapestry4/trunk/pom.xml (original)
+++ tapestry/tapestry4/trunk/pom.xml Sun Mar 18 15:20:51 2007
@@ -186,7 +186,7 @@
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>1.1.1</version>
+ <version>1.2</version>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
@@ -197,6 +197,11 @@
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.3.1</version>
</dependency>
<dependency>
<groupId>org.apache.tapestry</groupId>
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=519711&r1=519710&r2=519711
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-annotations/tapestry-annotations.iml (original)
+++ tapestry/tapestry4/trunk/tapestry-annotations/tapestry-annotations.iml Sun Mar 18 15:20:51 2007
@@ -11,7 +11,7 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="tapestry-framework" />
+ <orderEntry type="module" module-name="tapestry" />
<orderEntry type="module-library" exported="">
<library name="Maven Dependency: backport-util-concurrent:backport-util-concurrent:jar:2.2:compile">
<CLASSES>
@@ -72,25 +72,21 @@
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="Maven Dependency: commons-fileupload:commons-fileupload:jar:1.1.1:compile">
+ <library name="Maven Dependency: commons-fileupload:commons-fileupload:jar:1.2:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-fileupload/commons-fileupload/1.1.1/commons-fileupload-1.1.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="Maven Dependency: commons-io:commons-io:jar:1.1:compile">
+ <library name="Maven Dependency: commons-io:commons-io:jar:1.3.1:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-io/commons-io/1.1/commons-io-1.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-io/commons-io/1.3.1/commons-io-1.3.1.jar!/" />
</CLASSES>
- <JAVADOC>
- <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-io/commons-io/1.1/commons-io-1.1-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-io/commons-io/1.1/commons-io-1.1-sources.jar!/" />
- </SOURCES>
+ <JAVADOC />
+ <SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
@@ -256,6 +252,7 @@
</SOURCES>
</library>
</orderEntry>
+ <orderEntry type="module" module-name="tapestry-framework" />
<orderEntryProperties />
</component>
</module>
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=519711&r1=519710&r2=519711
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-contrib/tapestry-contrib.iml (original)
+++ tapestry/tapestry4/trunk/tapestry-contrib/tapestry-contrib.iml Sun Mar 18 15:20:51 2007
@@ -11,9 +11,7 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="tapestry-annotations" />
- <orderEntry type="module" module-name="tapestry-framework" />
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="Maven Dependency: backport-util-concurrent:backport-util-concurrent:jar:2.2:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../.m2/repository/backport-util-concurrent/backport-util-concurrent/2.2/backport-util-concurrent-2.2.jar!/" />
@@ -24,7 +22,7 @@
</SOURCES>
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="Maven Dependency: cglib:cglib-nodep:jar:2.1_3:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../.m2/repository/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar!/" />
@@ -35,7 +33,7 @@
</SOURCES>
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="Maven Dependency: com.javaforge.tapestry:tapestry-testng:jar:1.0.0-SNAPSHOT:provided">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../.m2/repository/com/javaforge/tapestry/tapestry-testng/1.0.0-SNAPSHOT/tapestry-testng-1.0.0-SNAPSHOT.jar!/" />
@@ -46,7 +44,7 @@
</SOURCES>
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="Maven Dependency: commons-beanutils:commons-beanutils:jar:1.7.0:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar!/" />
@@ -59,7 +57,7 @@
</SOURCES>
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="Maven Dependency: commons-codec:commons-codec:jar:1.3:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-codec/commons-codec/1.3/commons-codec-1.3.jar!/" />
@@ -72,29 +70,25 @@
</SOURCES>
</library>
</orderEntry>
- <orderEntry type="module-library">
- <library name="Maven Dependency: commons-fileupload:commons-fileupload:jar:1.1.1:compile">
+ <orderEntry type="module-library" exported="">
+ <library name="Maven Dependency: commons-fileupload:commons-fileupload:jar:1.2:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-fileupload/commons-fileupload/1.1.1/commons-fileupload-1.1.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
- <library name="Maven Dependency: commons-io:commons-io:jar:1.1:compile">
+ <orderEntry type="module-library" exported="">
+ <library name="Maven Dependency: commons-io:commons-io:jar:1.3.1:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-io/commons-io/1.1/commons-io-1.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-io/commons-io/1.3.1/commons-io-1.3.1.jar!/" />
</CLASSES>
- <JAVADOC>
- <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-io/commons-io/1.1/commons-io-1.1-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-io/commons-io/1.1/commons-io-1.1-sources.jar!/" />
- </SOURCES>
+ <JAVADOC />
+ <SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="Maven Dependency: commons-lang:commons-lang:jar:2.2:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-lang/commons-lang/2.2/commons-lang-2.2.jar!/" />
@@ -107,7 +101,7 @@
</SOURCES>
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="Maven Dependency: commons-logging:commons-logging:jar:1.1:provided">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-logging/commons-logging/1.1/commons-logging-1.1.jar!/" />
@@ -118,7 +112,7 @@
</SOURCES>
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="Maven Dependency: commons-pool:commons-pool:jar:1.3:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-pool/commons-pool/1.3/commons-pool-1.3.jar!/" />
@@ -127,7 +121,7 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="Maven Dependency: hivemind:hivemind-lib:jar:1.1.1:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../.m2/repository/hivemind/hivemind-lib/1.1.1/hivemind-lib-1.1.1.jar!/" />
@@ -138,7 +132,7 @@
</SOURCES>
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="Maven Dependency: hivemind:hivemind:jar:1.1.1:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../.m2/repository/hivemind/hivemind/1.1.1/hivemind-1.1.1.jar!/" />
@@ -149,7 +143,7 @@
</SOURCES>
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="Maven Dependency: javax.servlet:servlet-api:jar:2.4:provided">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../.m2/repository/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar!/" />
@@ -160,7 +154,7 @@
</SOURCES>
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="Maven Dependency: jboss:javassist:jar:3.4.ga:runtime">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../.m2/repository/jboss/javassist/3.4.ga/javassist-3.4.ga.jar!/" />
@@ -169,7 +163,7 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="Maven Dependency: jboss:jboss-j2ee:jar:4.0.2:provided">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../.m2/repository/jboss/jboss-j2ee/4.0.2/jboss-j2ee-4.0.2.jar!/" />
@@ -178,7 +172,7 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="Maven Dependency: junit:junit:jar:3.8.1:test">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar!/" />
@@ -189,7 +183,7 @@
</SOURCES>
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="Maven Dependency: log4j:log4j:jar:1.2.9:test">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../.m2/repository/log4j/log4j/1.2.9/log4j-1.2.9.jar!/" />
@@ -200,7 +194,7 @@
</SOURCES>
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="Maven Dependency: ognl:ognl:jar:2.7-SNAPSHOT:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../.m2/repository/ognl/ognl/2.7-SNAPSHOT/ognl-2.7-SNAPSHOT.jar!/" />
@@ -213,7 +207,7 @@
</SOURCES>
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<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!/" />
@@ -224,7 +218,7 @@
</SOURCES>
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="Maven Dependency: org.easymock:easymock:jar:2.2:test">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../.m2/repository/org/easymock/easymock/2.2/easymock-2.2.jar!/" />
@@ -235,7 +229,7 @@
</SOURCES>
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="Maven Dependency: org.easymock:easymockclassextension:jar:2.2:test">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../.m2/repository/org/easymock/easymockclassextension/2.2/easymockclassextension-2.2.jar!/" />
@@ -246,7 +240,7 @@
</SOURCES>
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<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!/" />
@@ -255,7 +249,7 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="Maven Dependency: oro:oro:jar:2.0.8:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../.m2/repository/oro/oro/2.0.8/oro-2.0.8.jar!/" />
@@ -266,6 +260,7 @@
</SOURCES>
</library>
</orderEntry>
+ <orderEntry type="module" module-name="tapestry-framework" />
<orderEntryProperties />
</component>
</module>
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=519711&r1=519710&r2=519711
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/TimeTracker.iml (original)
+++ tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/TimeTracker.iml Sun Mar 18 15:20:51 2007
@@ -13,10 +13,6 @@
</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>
@@ -121,25 +117,21 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="Maven Dependency: commons-fileupload:commons-fileupload:jar:1.1.1:compile">
+ <library name="Maven Dependency: commons-fileupload:commons-fileupload:jar:1.2:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../.m2/repository/commons-fileupload/commons-fileupload/1.1.1/commons-fileupload-1.1.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../.m2/repository/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="Maven Dependency: commons-io:commons-io:jar:1.1:compile">
+ <library name="Maven Dependency: commons-io:commons-io:jar:1.3.1:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../.m2/repository/commons-io/commons-io/1.1/commons-io-1.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../.m2/repository/commons-io/commons-io/1.3.1/commons-io-1.3.1.jar!/" />
</CLASSES>
- <JAVADOC>
- <root url="jar://$MODULE_DIR$/../../../../.m2/repository/commons-io/commons-io/1.1/commons-io-1.1-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MODULE_DIR$/../../../../.m2/repository/commons-io/commons-io/1.1/commons-io-1.1-sources.jar!/" />
- </SOURCES>
+ <JAVADOC />
+ <SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
@@ -338,6 +330,9 @@
</SOURCES>
</library>
</orderEntry>
+ <orderEntry type="module" module-name="tapestry-annotations" />
+ <orderEntry type="module" module-name="tapestry-contrib" />
+ <orderEntry type="module" module-name="tapestry-framework" />
<orderEntryProperties />
</component>
<component name="WebModuleBuildComponent">
@@ -356,15 +351,15 @@
<attribute name="URI" value="/WEB-INF/classes" />
</containerElement>
<containerElement type="module" name="tapestry-annotations">
- <attribute name="method" value="0" />
+ <attribute name="method" value="1" />
<attribute name="URI" value="/WEB-INF/classes" />
</containerElement>
<containerElement type="module" name="tapestry-contrib">
- <attribute name="method" value="0" />
+ <attribute name="method" value="1" />
<attribute name="URI" value="/WEB-INF/classes" />
</containerElement>
<containerElement type="module" name="tapestry-framework">
- <attribute name="method" value="0" />
+ <attribute name="method" value="1" />
<attribute name="URI" value="/WEB-INF/classes" />
</containerElement>
<containerElement type="library" level="module">
@@ -412,10 +407,18 @@
<attribute name="method" value="0" />
<attribute name="URI" value="/WEB-INF/lib/commons-fileupload-1.1.1.jar" />
</containerElement>
+ <containerElement type="library" name="Maven Dependency: commons-fileupload:commons-fileupload:jar:1.2:compile" level="module">
+ <attribute name="method" value="0" />
+ <attribute name="URI" value="/WEB-INF/lib/commons-fileupload-1.2.jar" />
+ </containerElement>
<containerElement type="library" name="Maven Dependency: commons-io:commons-io:jar:1.1:compile" level="module">
<attribute name="method" value="0" />
<attribute name="URI" value="/WEB-INF/lib/commons-io-1.1.jar" />
</containerElement>
+ <containerElement type="library" name="Maven Dependency: commons-io:commons-io:jar:1.3.1:compile" level="module">
+ <attribute name="method" value="0" />
+ <attribute name="URI" value="/WEB-INF/lib/commons-io-1.3.1.jar" />
+ </containerElement>
<containerElement type="library" name="Maven Dependency: commons-lang:commons-lang:jar:2.2:compile" level="module">
<attribute name="method" value="0" />
<attribute name="URI" value="/WEB-INF/lib/commons-lang-2.2.jar" />
@@ -457,7 +460,7 @@
<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="0" />
+ <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">
@@ -473,7 +476,7 @@
<attribute name="URI" value="/WEB-INF/lib/org.mortbay.jetty-5.1.10.jar" />
</containerElement>
<containerElement type="library" name="Maven Dependency: junit:junit:jar:3.8.1:provided" level="module">
- <attribute name="method" value="0" />
+ <attribute name="method" value="1" />
<attribute name="URI" value="/WEB-INF/lib/junit-3.8.1.jar" />
</containerElement>
<containerElement type="library" name="Maven Dependency: junit:junit:jar:3.8.1:test" level="module">
@@ -481,7 +484,7 @@
<attribute name="URI" value="/WEB-INF/lib/junit-3.8.1.jar" />
</containerElement>
<containerElement type="library" name="Maven Dependency: log4j:log4j:jar:1.2.8:test" level="module">
- <attribute name="method" value="0" />
+ <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">
@@ -489,7 +492,7 @@
<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="0" />
+ <attribute name="method" value="1" />
<attribute name="URI" value="/WEB-INF/lib/log4j-1.2.9.jar" />
</containerElement>
<containerElement type="library" name="Maven Dependency: logkit:logkit:jar:1.0.1:provided" level="module">
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=519711&r1=519710&r2=519711
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-examples/Workbench/Workbench.iml (original)
+++ tapestry/tapestry4/trunk/tapestry-examples/Workbench/Workbench.iml Sun Mar 18 15:20:51 2007
@@ -15,10 +15,6 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="tapestry" />
- <orderEntry type="module" module-name="tapestry-annotations" exported="" />
- <orderEntry type="module" module-name="tapestry-contrib" exported="" />
- <orderEntry type="module" module-name="tapestry-framework" />
<orderEntry type="module-library">
<library>
<CLASSES>
@@ -88,25 +84,21 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="Maven Dependency: commons-fileupload:commons-fileupload:jar:1.1.1:compile">
+ <library name="Maven Dependency: commons-fileupload:commons-fileupload:jar:1.2:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../.m2/repository/commons-fileupload/commons-fileupload/1.1.1/commons-fileupload-1.1.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../.m2/repository/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="Maven Dependency: commons-io:commons-io:jar:1.1:compile">
+ <library name="Maven Dependency: commons-io:commons-io:jar:1.3.1:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../.m2/repository/commons-io/commons-io/1.1/commons-io-1.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../.m2/repository/commons-io/commons-io/1.3.1/commons-io-1.3.1.jar!/" />
</CLASSES>
- <JAVADOC>
- <root url="jar://$MODULE_DIR$/../../../../.m2/repository/commons-io/commons-io/1.1/commons-io-1.1-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MODULE_DIR$/../../../../.m2/repository/commons-io/commons-io/1.1/commons-io-1.1-sources.jar!/" />
- </SOURCES>
+ <JAVADOC />
+ <SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
@@ -250,6 +242,9 @@
</SOURCES>
</library>
</orderEntry>
+ <orderEntry type="module" module-name="tapestry-annotations" />
+ <orderEntry type="module" module-name="tapestry-contrib" />
+ <orderEntry type="module" module-name="tapestry-framework" />
<orderEntryProperties />
</component>
<component name="WebModuleBuildComponent">
@@ -264,20 +259,20 @@
</component>
<component name="WebModuleProperties">
<containerElement type="module" name="tapestry">
- <attribute name="method" value="0" />
- <attribute name="URI" value="<N/A>" />
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/classes" />
</containerElement>
<containerElement type="module" name="tapestry-annotations">
- <attribute name="method" value="0" />
- <attribute name="URI" value="<N/A>" />
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/classes" />
</containerElement>
<containerElement type="module" name="tapestry-contrib">
- <attribute name="method" value="0" />
- <attribute name="URI" value="<N/A>" />
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/classes" />
</containerElement>
<containerElement type="module" name="tapestry-framework">
- <attribute name="method" value="0" />
- <attribute name="URI" value="<N/A>" />
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/classes" />
</containerElement>
<containerElement type="library" level="module">
<attribute name="method" value="0" />
@@ -285,12 +280,12 @@
<url>jar://$MODULE_DIR$/../../../idea/lib/j2ee.jar!/</url>
</containerElement>
<containerElement type="library" name="Maven Dependency: ant:ant:jar:1.6.5:test" level="module">
- <attribute name="method" value="0" />
- <attribute name="URI" value="<N/A>" />
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/ant-1.6.5.jar" />
</containerElement>
<containerElement type="library" name="Maven Dependency: avalon-framework:avalon-framework:jar:4.1.3:provided" level="module">
- <attribute name="method" value="0" />
- <attribute name="URI" value="<N/A>" />
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/avalon-framework-4.1.3.jar" />
</containerElement>
<containerElement type="library" name="Maven Dependency: backport-util-concurrent:backport-util-concurrent:jar:2.2:compile" level="module">
<attribute name="method" value="0" />
@@ -313,21 +308,29 @@
<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="0" />
+ <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="0" />
+ <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" />
</containerElement>
+ <containerElement type="library" name="Maven Dependency: commons-fileupload:commons-fileupload:jar:1.2:compile" level="module">
+ <attribute name="method" value="0" />
+ <attribute name="URI" value="/WEB-INF/lib/commons-fileupload-1.2.jar" />
+ </containerElement>
<containerElement type="library" name="Maven Dependency: commons-io:commons-io:jar:1.1:compile" level="module">
<attribute name="method" value="0" />
<attribute name="URI" value="/WEB-INF/lib/commons-io-1.1.jar" />
</containerElement>
+ <containerElement type="library" name="Maven Dependency: commons-io:commons-io:jar:1.3.1:compile" level="module">
+ <attribute name="method" value="0" />
+ <attribute name="URI" value="/WEB-INF/lib/commons-io-1.3.1.jar" />
+ </containerElement>
<containerElement type="library" name="Maven Dependency: commons-lang:commons-lang:jar:2.2:compile" level="module">
<attribute name="method" value="0" />
<attribute name="URI" value="/WEB-INF/lib/commons-lang-2.2.jar" />
@@ -349,12 +352,12 @@
<attribute name="URI" value="<N/A>" />
</containerElement>
<containerElement type="library" name="Maven Dependency: hsqldb:hsqldb:jar:1.8.0.1:compile" level="module">
- <attribute name="method" value="0" />
- <attribute name="URI" value="<N/A>" />
+ <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="0" />
- <attribute name="URI" value="<N/A>" />
+ <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" />
@@ -365,7 +368,7 @@
<attribute name="URI" value="<N/A>" />
</containerElement>
<containerElement type="library" name="Maven Dependency: jboss:jboss-j2ee:jar:4.0.2:compile" level="module">
- <attribute name="method" value="0" />
+ <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">
@@ -373,7 +376,7 @@
<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="0" />
+ <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:runtime" level="module">
@@ -385,36 +388,36 @@
<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="<N/A>" />
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/jdom-1.0.jar" />
</containerElement>
<containerElement type="library" name="Maven Dependency: jetty:org.mortbay.jetty:jar:5.1.10:test" level="module">
- <attribute name="method" value="0" />
- <attribute name="URI" value="<N/A>" />
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/org.mortbay.jetty-5.1.10.jar" />
</containerElement>
<containerElement type="library" name="Maven Dependency: junit:junit:jar:3.8.1:provided" level="module">
- <attribute name="method" value="0" />
- <attribute name="URI" value="<N/A>" />
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/junit-3.8.1.jar" />
</containerElement>
<containerElement type="library" name="Maven Dependency: junit:junit:jar:3.8.1:test" level="module">
- <attribute name="method" value="0" />
- <attribute name="URI" value="<N/A>" />
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/junit-3.8.1.jar" />
</containerElement>
<containerElement type="library" name="Maven Dependency: log4j:log4j:jar:1.2.8:test" level="module">
- <attribute name="method" value="0" />
- <attribute name="URI" value="<N/A>" />
+ <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="0" />
+ <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="0" />
- <attribute name="URI" value="<N/A>" />
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/log4j-1.2.9.jar" />
</containerElement>
<containerElement type="library" name="Maven Dependency: logkit:logkit:jar:1.0.1:provided" level="module">
- <attribute name="method" value="0" />
- <attribute name="URI" value="<N/A>" />
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/logkit-1.0.1.jar" />
</containerElement>
<containerElement type="library" name="Maven Dependency: ognl:ognl:jar:2.7-SNAPSHOT:compile" level="module">
<attribute name="method" value="0" />
@@ -433,40 +436,40 @@
<attribute name="URI" value="/WEB-INF/lib/easymockclassextension-2.2.jar" />
</containerElement>
<containerElement type="library" name="Maven Dependency: org.openqa.selenium.client-drivers:selenium-java-client-driver:jar:0.9.1-SNAPSHOT:test" level="module">
- <attribute name="method" value="0" />
- <attribute name="URI" value="<N/A>" />
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/selenium-java-client-driver-0.9.1-SNAPSHOT.jar" />
</containerElement>
<containerElement type="library" name="Maven Dependency: org.openqa.selenium.core:selenium-core:jar:0.8.2-SNAPSHOT:test" level="module">
- <attribute name="method" value="0" />
- <attribute name="URI" value="<N/A>" />
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/selenium-core-0.8.2-SNAPSHOT.jar" />
</containerElement>
<containerElement type="library" name="Maven Dependency: org.openqa.selenium.server:selenium-server-coreless:jar:0.9.1-SNAPSHOT:test" level="module">
- <attribute name="method" value="0" />
- <attribute name="URI" value="<N/A>" />
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/selenium-server-coreless-0.9.1-SNAPSHOT.jar" />
</containerElement>
<containerElement type="library" name="Maven Dependency: org.openqa.selenium.server:selenium-server:jar:0.9.1-SNAPSHOT:test" level="module">
- <attribute name="method" value="0" />
- <attribute name="URI" value="<N/A>" />
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/selenium-server-0.9.1-SNAPSHOT.jar" />
</containerElement>
<containerElement type="library" name="Maven Dependency: org.testng:testng:jar:jdk15:5.1:test" level="module">
- <attribute name="method" value="0" />
- <attribute name="URI" value="<N/A>" />
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/testng-5.1-jdk15.jar" />
</containerElement>
<containerElement type="library" name="Maven Dependency: oro:oro:jar:2.0.8:compile" level="module">
<attribute name="method" value="0" />
<attribute name="URI" value="<N/A>" />
</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="<N/A>" />
+ <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="0" />
- <attribute name="URI" value="<N/A>" />
+ <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="0" />
- <attribute name="URI" value="<N/A>" />
+ <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/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/pom.xml?view=diff&rev=519711&r1=519710&r2=519711
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/pom.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/pom.xml Sun Mar 18 15:20:51 2007
@@ -69,6 +69,10 @@
<artifactId>commons-fileupload</artifactId>
</dependency>
<dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ <dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
</dependency>
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/multipart/AbstractMultipartDecoder.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/multipart/AbstractMultipartDecoder.java?view=diff&rev=519711&r1=519710&r2=519711
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/multipart/AbstractMultipartDecoder.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/multipart/AbstractMultipartDecoder.java Sun Mar 18 15:20:51 2007
@@ -13,16 +13,16 @@
// limitations under the License.
package org.apache.tapestry.multipart;
+import org.apache.commons.fileupload.FileItem;
+import org.apache.hivemind.ApplicationRuntimeException;
+import org.apache.tapestry.request.IUploadFile;
+
import java.io.UnsupportedEncodingException;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import org.apache.commons.fileupload.FileItem;
-import org.apache.hivemind.ApplicationRuntimeException;
-import org.apache.tapestry.request.IUploadFile;
-
/**
* @author Raphael Jean
*/
@@ -135,8 +135,7 @@
{
try
{
- return (_encoding == null) ? item.getString() : item
- .getString(_encoding);
+ return (_encoding == null) ? item.getString() : item.getString(_encoding);
}
catch (UnsupportedEncodingException ex)
{
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/multipart/MultipartDecoderImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/multipart/MultipartDecoderImpl.java?view=diff&rev=519711&r1=519710&r2=519711
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/multipart/MultipartDecoderImpl.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/multipart/MultipartDecoderImpl.java Sun Mar 18 15:20:51 2007
@@ -14,18 +14,17 @@
package org.apache.tapestry.multipart;
-import java.io.File;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-
import org.apache.commons.fileupload.FileItemFactory;
import org.apache.commons.fileupload.FileUploadException;
import org.apache.commons.fileupload.disk.DiskFileItemFactory;
import org.apache.commons.fileupload.servlet.ServletFileUpload;
import org.apache.hivemind.ApplicationRuntimeException;
+import javax.servlet.http.HttpServletRequest;
+import java.io.File;
+import java.util.List;
+import java.util.Map;
+
/**
* Implementation of {@link org.apache.tapestry.multipart.MultipartDecoder} that
* is based on <a href="http://jakarta.apache.org/commons/fileupload/">Jakarta
@@ -69,9 +68,10 @@
ServletFileUpload upload = new ServletFileUpload(factory);
// set maximum file upload size
+
upload.setSizeMax(_maxSize);
- if (_encoding != null)
+ if (_encoding != null)
upload.setHeaderEncoding(_encoding);
return upload;
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=519711&r1=519710&r2=519711
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/tapestry-framework.iml (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/tapestry-framework.iml Sun Mar 18 15:20:51 2007
@@ -14,6 +14,7 @@
</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>
@@ -94,25 +95,21 @@
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="Maven Dependency: commons-fileupload:commons-fileupload:jar:1.1.1:compile">
+ <library name="Maven Dependency: commons-fileupload:commons-fileupload:jar:1.2:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-fileupload/commons-fileupload/1.1.1/commons-fileupload-1.1.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="Maven Dependency: commons-io:commons-io:jar:1.1:compile">
+ <library name="Maven Dependency: commons-io:commons-io:jar:1.3.1:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-io/commons-io/1.1/commons-io-1.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-io/commons-io/1.3.1/commons-io-1.3.1.jar!/" />
</CLASSES>
- <JAVADOC>
- <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-io/commons-io/1.1/commons-io-1.1-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-io/commons-io/1.1/commons-io-1.1-sources.jar!/" />
- </SOURCES>
+ <JAVADOC />
+ <SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
@@ -355,7 +352,6 @@
</SOURCES>
</library>
</orderEntry>
- <orderEntry type="module" module-name="tapestry-annotations" />
<orderEntryProperties />
</component>
</module>
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=519711&r1=519710&r2=519711
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-portlet/tapestry-portlet.iml (original)
+++ tapestry/tapestry4/trunk/tapestry-portlet/tapestry-portlet.iml Sun Mar 18 15:20:51 2007
@@ -12,8 +12,7 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="tapestry-annotations" />
- <orderEntry type="module" module-name="tapestry-framework" />
+ <orderEntry type="module" module-name="tapestry" />
<orderEntry type="module-library">
<library name="Maven Dependency: backport-util-concurrent:backport-util-concurrent:jar:2.2:compile">
<CLASSES>
@@ -74,25 +73,21 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="Maven Dependency: commons-fileupload:commons-fileupload:jar:1.1.1:compile">
+ <library name="Maven Dependency: commons-fileupload:commons-fileupload:jar:1.2:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-fileupload/commons-fileupload/1.1.1/commons-fileupload-1.1.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="Maven Dependency: commons-io:commons-io:jar:1.1:compile">
+ <library name="Maven Dependency: commons-io:commons-io:jar:1.3.1:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-io/commons-io/1.1/commons-io-1.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-io/commons-io/1.3.1/commons-io-1.3.1.jar!/" />
</CLASSES>
- <JAVADOC>
- <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-io/commons-io/1.1/commons-io-1.1-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-io/commons-io/1.1/commons-io-1.1-sources.jar!/" />
- </SOURCES>
+ <JAVADOC />
+ <SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
@@ -276,6 +271,7 @@
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module" module-name="tapestry-framework" />
<orderEntryProperties />
</component>
</module>
Modified: tapestry/tapestry4/trunk/tapestry.iml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry.iml?view=diff&rev=519711&r1=519710&r2=519711
==============================================================================
--- tapestry/tapestry4/trunk/tapestry.iml (original)
+++ tapestry/tapestry4/trunk/tapestry.iml Sun Mar 18 15:20:51 2007
@@ -45,9 +45,6 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="tapestry-annotations" exported="" />
- <orderEntry type="module" module-name="tapestry-contrib" exported="" />
- <orderEntry type="module" module-name="tapestry-framework" exported="" />
<orderEntry type="module-library" exported="">
<library name="Maven Dependency: ant:ant:jar:1.6.5:test">
<CLASSES>
@@ -154,25 +151,21 @@
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="Maven Dependency: commons-fileupload:commons-fileupload:jar:1.1.1:compile">
+ <library name="Maven Dependency: commons-fileupload:commons-fileupload:jar:1.2:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../.m2/repository/commons-fileupload/commons-fileupload/1.1.1/commons-fileupload-1.1.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../.m2/repository/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="Maven Dependency: commons-io:commons-io:jar:1.1:compile">
+ <library name="Maven Dependency: commons-io:commons-io:jar:1.3.1:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../.m2/repository/commons-io/commons-io/1.1/commons-io-1.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../.m2/repository/commons-io/commons-io/1.3.1/commons-io-1.3.1.jar!/" />
</CLASSES>
- <JAVADOC>
- <root url="jar://$MODULE_DIR$/../../.m2/repository/commons-io/commons-io/1.1/commons-io-1.1-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MODULE_DIR$/../../.m2/repository/commons-io/commons-io/1.1/commons-io-1.1-sources.jar!/" />
- </SOURCES>
+ <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=519711&r1=519710&r2=519711
==============================================================================
--- tapestry/tapestry4/trunk/tapestry.ipr (original)
+++ tapestry/tapestry4/trunk/tapestry.ipr Sun Mar 18 15:20:51 2007
@@ -158,8 +158,8 @@
<option name="respondToPomChangesEnabled" value="true" />
<option name="manageSourceRootsEnabled" value="true" />
<option name="manageModuleInterdependenciesEnabled" value="true" />
- <option name="downloadSourcesEnabled" value="false" />
- <option name="downloadJavadocEnabled" value="false" />
+ <option name="downloadSourcesEnabled" value="true" />
+ <option name="downloadJavadocEnabled" value="true" />
<option name="generateSourcesEnabled" value="false" />
<option name="settingsPath" value="$USERPROFILE$/.m2/settings.xml" />
<option name="searchFilter" value="target" />
@@ -175,7 +175,6 @@
<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="TimeTracker" />
@@ -184,7 +183,6 @@
<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="Workbench" />
@@ -192,15 +190,7 @@
<entry>
<value>
<collection type="java.util.TreeSet">
- <entry type="java.lang.String" value="tapestry-framework" />
- </collection>
- </value>
- <key type="java.lang.String" value="tapestry" />
- </entry>
- <entry>
- <value>
- <collection type="java.util.TreeSet">
- <entry type="java.lang.String" value="tapestry-framework" />
+ <entry type="java.lang.String" value="tapestry" />
</collection>
</value>
<key type="java.lang.String" value="tapestry-annotations" />
@@ -208,7 +198,7 @@
<entry>
<value>
<collection type="java.util.TreeSet">
- <entry type="java.lang.String" value="tapestry-framework" />
+ <entry type="java.lang.String" value="tapestry" />
</collection>
</value>
<key type="java.lang.String" value="tapestry-contrib" />
@@ -216,7 +206,7 @@
<entry>
<value>
<collection type="java.util.TreeSet">
- <entry type="java.lang.String" value="tapestry-framework" />
+ <entry type="java.lang.String" value="tapestry" />
</collection>
</value>
<key type="java.lang.String" value="tapestry-portlet" />
Modified: tapestry/tapestry4/trunk/tapestry.iws
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry.iws?view=diff&rev=519711&r1=519710&r2=519711
==============================================================================
--- tapestry/tapestry4/trunk/tapestry.iws (original)
+++ tapestry/tapestry4/trunk/tapestry.iws Sun Mar 18 15:20:51 2007
@@ -18,15 +18,18 @@
<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$/tapestry-framework/src/java/org/apache/tapestry/pageload/PageLoader.java" afterPath="$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/pageload/PageLoader.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/binding/ExpressionBinding.java" afterPath="$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/binding/ExpressionBinding.java" />
+ <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/TimeTracker.iml" afterPath="$PROJECT_DIR$/tapestry-examples/TimeTracker/TimeTracker.iml" />
+ <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/multipart/MultipartDecoderImpl.java" afterPath="$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/multipart/MultipartDecoderImpl.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/test/org/apache/tapestry/html/TestPageEvents.java" afterPath="$PROJECT_DIR$/tapestry-framework/src/test/org/apache/tapestry/html/TestPageEvents.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry-framework/src/test/org/apache/tapestry/binding/TestExpressionBinding.java" afterPath="$PROJECT_DIR$/tapestry-framework/src/test/org/apache/tapestry/binding/TestExpressionBinding.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/AbstractPage.java" afterPath="$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/AbstractPage.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/engine/RequestCycle.java" afterPath="$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/engine/RequestCycle.java" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/tapestry-annotations/.cvsignore" afterPath="" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry-framework/pom.xml" afterPath="$PROJECT_DIR$/tapestry-framework/pom.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/multipart/AbstractMultipartDecoder.java" afterPath="$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/multipart/AbstractMultipartDecoder.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry.iml" afterPath="$PROJECT_DIR$/tapestry.iml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry-portlet/tapestry-portlet.iml" afterPath="$PROJECT_DIR$/tapestry-portlet/tapestry-portlet.iml" />
</list>
</component>
<component name="ChangesViewManager" flattened_view="true" />
@@ -138,7 +141,16 @@
<component name="FavoritesManager">
<favorites_list name="tapestry" />
</component>
- <component name="FavoritesProjectViewPane" />
+ <component name="FavoritesProjectViewPane">
+ <subPane subId="tapestry">
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" />
+ <option name="myItemType" value="com.intellij.ide.favoritesTreeView.FavoritesTreeNodeDescriptor" />
+ </PATH_ELEMENT>
+ </PATH>
+ </subPane>
+ </component>
<component name="FileEditorManager">
<leaf />
</component>
@@ -213,7 +225,7 @@
<showLibraryContents />
<hideEmptyPackages />
<abbreviatePackageNames />
- <showStructure ProjectPane="false" Scope="false" PackagesPane="false" />
+ <showStructure PackagesPane="false" ProjectPane="false" Scope="false" Favorites="false" />
<autoscrollToSource />
<autoscrollFromSource />
<sortByType />
@@ -237,14 +249,14 @@
</component>
<component name="RecentsManager" />
<component name="RestoreUpdateTree" />
- <component name="RunManager" selected="TestNG.TestPageEvents">
- <tempConfiguration default="false" name="TestPageEvents" type="TestNG" factoryName="TestNG" enabled="false" merge="false">
+ <component name="RunManager" selected="TestNG.TestUploadPart">
+ <tempConfiguration default="false" name="TestUploadPart" 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.html" />
- <option name="MAIN_CLASS_NAME" value="org.apache.tapestry.html.TestPageEvents" />
+ <option name="PACKAGE_NAME" value="org.apache.tapestry.multipart" />
+ <option name="MAIN_CLASS_NAME" value="org.apache.tapestry.multipart.TestUploadPart" />
<option name="METHOD_NAME" />
<option name="GROUP_NAME" />
<option name="TEST_OBJECT" value="CLASS" />
@@ -264,24 +276,15 @@
<option name="Make" value="true" />
</method>
</tempConfiguration>
- <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="Applet" factoryName="Applet">
- <module name="" />
+ <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false">
<option name="MAIN_CLASS_NAME" />
- <option name="HTML_FILE_NAME" />
- <option name="HTML_USED" value="false" />
- <option name="WIDTH" value="400" />
- <option name="HEIGHT" value="300" />
- <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
<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="TestNG" factoryName="TestNG" enabled="false" merge="false">
<module name="" />
@@ -307,6 +310,25 @@
<option name="Make" value="true" />
</method>
</configuration>
+ <configuration default="true" type="Applet" factoryName="Applet">
+ <module name="" />
+ <option name="MAIN_CLASS_NAME" />
+ <option name="HTML_FILE_NAME" />
+ <option name="HTML_USED" value="false" />
+ <option name="WIDTH" value="400" />
+ <option name="HEIGHT" value="300" />
+ <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
+ <option name="VM_PARAMETERS" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ </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>
<configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false">
<module name="" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
@@ -323,16 +345,6 @@
<value defaultName="wholeProject" />
</option>
</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 name="<template>" type="WebApp" default="true" selected="false">
<Host>localhost</Host>
<Port>5050</Port>
@@ -423,7 +435,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.1932814" order="0" />
+ <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.19717625" order="0" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" 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.25892118" order="2" />
@@ -448,7 +460,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-872. The documented usage of PageAttachListener stated that page properties should be restored before the listener is called. Modified logic so that RequestCycle calls firePageAttached directly and removed the firePageAttached call within AbstractPage.attach" />
+ <option name="LAST_COMMIT_MESSAGE" value="Upgraded commons-fileupload/commons-io." />
<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" />
@@ -466,6 +478,7 @@
<MESSAGE value="Fixes for TAPESTRY-838. Exposed listener method name targeted for invocation in IActionListener / ListenerInvoker." />
<MESSAGE value="Minor code cleanup. Fixed Palette documentation by removing funky character causing td definitions." />
<MESSAGE value="Fixes TAPESTRY-872. The documented usage of PageAttachListener stated that page properties should be restored before the listener is called. Modified logic so that RequestCycle calls firePageAttached directly and removed the firePageAttached call within AbstractPage.attach" />
+ <MESSAGE value="Upgraded commons-fileupload/commons-io." />
</component>
<component name="antWorkspaceConfiguration">
<option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
@@ -476,120 +489,122 @@
</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="tapestry-contrib" />
</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/test/org/apache/tapestry/pageload/PageLoaderTest.java">
+ <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/binding/ExpressionBinding.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="63" column="9" selection-start="2304" selection-end="2304" vertical-scroll-proportion="0.42163545">
+ <state line="208" column="0" selection-start="5513" selection-end="5513" vertical-scroll-proportion="0.65502554">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/enhance/AbstractPropertyWorker.java">
+ <entry file="file://$PROJECT_DIR$/tapestry-framework/src/test/org/apache/tapestry/html/ListenerFixture.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="40" column="0" selection-start="1456" selection-end="1456" vertical-scroll-proportion="0.23274854">
+ <state line="40" column="0" selection-start="1318" selection-end="1318" vertical-scroll-proportion="0.40350878">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/enhance/SpecifiedPropertyWorker.java">
+ <entry file="file://$PROJECT_DIR$/tapestry-framework/src/test/org/apache/tapestry/html/TestPageEvents.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="192" column="8" selection-start="7637" selection-end="7637" vertical-scroll-proportion="1.671345">
+ <state line="74" column="0" selection-start="1957" selection-end="1957" vertical-scroll-proportion="0.3321976">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/engine/RequestCycle.java">
+ <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/event/PageAttachListener.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="259" column="0" selection-start="6952" selection-end="6952" vertical-scroll-proportion="0.52982455">
+ <state line="30" column="39" selection-start="1193" selection-end="1193" vertical-scroll-proportion="0.22998296">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/pageload/PageSource.java">
+ <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/multipart/UploadPart.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="117" column="0" selection-start="3854" selection-end="3854" vertical-scroll-proportion="0.451462">
+ <state line="79" column="34" selection-start="2084" selection-end="2084" vertical-scroll-proportion="0.7410562">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/enhance/EnhanceUtils.java">
+ <entry file="file://$PROJECT_DIR$/tapestry-framework/pom.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="45" column="0" selection-start="1670" selection-end="1670" vertical-scroll-proportion="0.2982456">
+ <state line="62" column="20" selection-start="2337" selection-end="2337" vertical-scroll-proportion="0.40971038">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/IComponent.java">
+ <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/multipart/ServletMultipartDecoder.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="145" column="11" selection-start="4555" selection-end="4555" vertical-scroll-proportion="0.33333334">
+ <state line="33" column="1" selection-start="1144" selection-end="1144" vertical-scroll-proportion="0.26831347">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/tapestry-framework/src/test/org/apache/tapestry/binding/TestExpressionBinding.java">
+ <entry file="jar://$USERPROFILE$/.m2/repository/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2.jar!/org/apache/commons/fileupload/servlet/ServletFileUpload.class">
<provider selected="true" editor-type-id="text-editor">
- <state line="177" column="0" selection-start="5771" selection-end="5771" vertical-scroll-proportion="0.4471891">
+ <state line="16" column="0" selection-start="985" selection-end="985" vertical-scroll-proportion="0.19413288">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/AbstractComponent.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="442" column="12" selection-start="11900" selection-end="11900" vertical-scroll-proportion="0.39608178">
- <folding />
+ <state line="18" column="38" selection-start="754" selection-end="754" vertical-scroll-proportion="0.07666099">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/AbstractPage.java">
+ <entry file="file://$PROJECT_DIR$/tapestry-examples/TimeTracker/pom.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="326" column="0" selection-start="8300" selection-end="8300" vertical-scroll-proportion="0.23764907">
+ <state line="15" column="0" selection-start="705" selection-end="705" vertical-scroll-proportion="0.19165248">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/pageload/PageLoader.java">
+ <entry file="file://$PROJECT_DIR$/tapestry-contrib/src/java/org/apache/tapestry/contrib/table/model/ITableColumn.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="593" column="9" selection-start="20705" selection-end="20705" vertical-scroll-proportion="0.2427598">
+ <state line="28" column="21" selection-start="1137" selection-end="1137" vertical-scroll-proportion="0.2128821">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/binding/ExpressionBinding.java">
+ <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/multipart/AbstractMultipartDecoder.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="208" column="0" selection-start="5513" selection-end="5513" vertical-scroll-proportion="0.65502554">
+ <state line="36" column="0" selection-start="1190" selection-end="1190" vertical-scroll-proportion="0.2044293">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/tapestry-framework/src/test/org/apache/tapestry/html/ListenerFixture.java">
+ <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/multipart/MultipartDecoderImpl.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="40" column="0" selection-start="1318" selection-end="1318" vertical-scroll-proportion="0.40350878">
+ <state line="72" column="8" selection-start="2473" selection-end="2473" vertical-scroll-proportion="0.6516184">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/tapestry-framework/src/test/org/apache/tapestry/html/TestPageEvents.java">
+ <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/multipart/MultipartDecoderFilter.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="74" column="0" selection-start="1957" selection-end="1957" vertical-scroll-proportion="0.3321976">
+ <state line="34" column="20" selection-start="1253" selection-end="1253" vertical-scroll-proportion="0.19165248">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/event/PageAttachListener.java">
+ <entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="30" column="39" selection-start="1193" selection-end="1193" vertical-scroll-proportion="0.22998296">
+ <state line="203" column="40" selection-start="7952" selection-end="7952" vertical-scroll-proportion="0.42248723">
<folding />
</state>
</provider>
</entry>
</component>
<component name="testng.defaultConfiguration">
- <outputDirectory>/tmp</outputDirectory>
+ <outputDirectory />
<properties />
</component>
</project>