Author: jkuhnert
Date: Sun Mar 18 17:46:21 2007
New Revision: 519767
URL: http://svn.apache.org/viewvc?view=rev&rev=519767
Log:
Fixes TAPESTRY-937. Simple stupid indexOf check using > 1 instead of > -1. I'm
sure I added this bug at some point.
Modified:
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/src/java/org/apache/tapestry/services/impl/BindingSourceImpl.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/TestBindingSource.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/tapestry-annotations/tapestry-annotations.iml
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-annotations/tapestry-annotations.iml?view=diff&rev=519767&r1=519766&r2=519767
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-annotations/tapestry-annotations.iml
(original)
+++ tapestry/tapestry4/trunk/tapestry-annotations/tapestry-annotations.iml Sun
Mar 18 17:46:21 2007
@@ -12,6 +12,7 @@
<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" exported="">
<library name="Maven Dependency:
backport-util-concurrent:backport-util-concurrent:jar:2.2:compile">
<CLASSES>
@@ -76,8 +77,12 @@
<CLASSES>
<root
url="jar://$MODULE_DIR$/../../../.m2/repository/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2.jar!/"
/>
</CLASSES>
- <JAVADOC />
- <SOURCES />
+ <JAVADOC>
+ <root
url="jar://$MODULE_DIR$/../../../.m2/repository/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2-javadoc.jar!/"
/>
+ </JAVADOC>
+ <SOURCES>
+ <root
url="jar://$MODULE_DIR$/../../../.m2/repository/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2-sources.jar!/"
/>
+ </SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
@@ -86,7 +91,9 @@
<root
url="jar://$MODULE_DIR$/../../../.m2/repository/commons-io/commons-io/1.3.1/commons-io-1.3.1.jar!/"
/>
</CLASSES>
<JAVADOC />
- <SOURCES />
+ <SOURCES>
+ <root
url="jar://$MODULE_DIR$/../../../.m2/repository/commons-io/commons-io/1.3.1/commons-io-1.3.1-sources.jar!/"
/>
+ </SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
@@ -252,7 +259,6 @@
</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=519767&r1=519766&r2=519767
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-contrib/tapestry-contrib.iml (original)
+++ tapestry/tapestry4/trunk/tapestry-contrib/tapestry-contrib.iml Sun Mar 18
17:46:21 2007
@@ -11,6 +11,8 @@
</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" exported="">
<library name="Maven Dependency:
backport-util-concurrent:backport-util-concurrent:jar:2.2:compile">
<CLASSES>
@@ -75,8 +77,12 @@
<CLASSES>
<root
url="jar://$MODULE_DIR$/../../../.m2/repository/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2.jar!/"
/>
</CLASSES>
- <JAVADOC />
- <SOURCES />
+ <JAVADOC>
+ <root
url="jar://$MODULE_DIR$/../../../.m2/repository/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2-javadoc.jar!/"
/>
+ </JAVADOC>
+ <SOURCES>
+ <root
url="jar://$MODULE_DIR$/../../../.m2/repository/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2-sources.jar!/"
/>
+ </SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
@@ -85,7 +91,9 @@
<root
url="jar://$MODULE_DIR$/../../../.m2/repository/commons-io/commons-io/1.3.1/commons-io-1.3.1.jar!/"
/>
</CLASSES>
<JAVADOC />
- <SOURCES />
+ <SOURCES>
+ <root
url="jar://$MODULE_DIR$/../../../.m2/repository/commons-io/commons-io/1.3.1/commons-io-1.3.1-sources.jar!/"
/>
+ </SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
@@ -260,7 +268,6 @@
</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=519767&r1=519766&r2=519767
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/TimeTracker.iml
(original)
+++ tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/TimeTracker.iml Sun
Mar 18 17:46:21 2007
@@ -13,6 +13,10 @@
</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,8 +125,12 @@
<CLASSES>
<root
url="jar://$MODULE_DIR$/../../../../.m2/repository/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2.jar!/"
/>
</CLASSES>
- <JAVADOC />
- <SOURCES />
+ <JAVADOC>
+ <root
url="jar://$MODULE_DIR$/../../../../.m2/repository/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2-javadoc.jar!/"
/>
+ </JAVADOC>
+ <SOURCES>
+ <root
url="jar://$MODULE_DIR$/../../../../.m2/repository/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2-sources.jar!/"
/>
+ </SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
@@ -131,7 +139,9 @@
<root
url="jar://$MODULE_DIR$/../../../../.m2/repository/commons-io/commons-io/1.3.1/commons-io-1.3.1.jar!/"
/>
</CLASSES>
<JAVADOC />
- <SOURCES />
+ <SOURCES>
+ <root
url="jar://$MODULE_DIR$/../../../../.m2/repository/commons-io/commons-io/1.3.1/commons-io-1.3.1-sources.jar!/"
/>
+ </SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
@@ -330,9 +340,6 @@
</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">
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=519767&r1=519766&r2=519767
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-examples/Workbench/Workbench.iml
(original)
+++ tapestry/tapestry4/trunk/tapestry-examples/Workbench/Workbench.iml Sun Mar
18 17:46:21 2007
@@ -15,6 +15,10 @@
</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>
@@ -88,8 +92,12 @@
<CLASSES>
<root
url="jar://$MODULE_DIR$/../../../../.m2/repository/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2.jar!/"
/>
</CLASSES>
- <JAVADOC />
- <SOURCES />
+ <JAVADOC>
+ <root
url="jar://$MODULE_DIR$/../../../../.m2/repository/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2-javadoc.jar!/"
/>
+ </JAVADOC>
+ <SOURCES>
+ <root
url="jar://$MODULE_DIR$/../../../../.m2/repository/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2-sources.jar!/"
/>
+ </SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
@@ -98,7 +106,9 @@
<root
url="jar://$MODULE_DIR$/../../../../.m2/repository/commons-io/commons-io/1.3.1/commons-io-1.3.1.jar!/"
/>
</CLASSES>
<JAVADOC />
- <SOURCES />
+ <SOURCES>
+ <root
url="jar://$MODULE_DIR$/../../../../.m2/repository/commons-io/commons-io/1.3.1/commons-io-1.3.1-sources.jar!/"
/>
+ </SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
@@ -242,9 +252,6 @@
</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">
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/BindingSourceImpl.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/BindingSourceImpl.java?view=diff&rev=519767&r1=519766&r2=519767
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/BindingSourceImpl.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/BindingSourceImpl.java
Sun Mar 18 17:46:21 2007
@@ -14,17 +14,17 @@
package org.apache.tapestry.services.impl;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
import org.apache.hivemind.Location;
import org.apache.tapestry.IBinding;
import org.apache.tapestry.IComponent;
import org.apache.tapestry.binding.BindingFactory;
import org.apache.tapestry.binding.BindingSource;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
/**
* Implementation of the <code>tapestry.bindings.BindingSource</code> service.
*
@@ -60,7 +60,7 @@
int colonx = reference.indexOf(':');
- if (colonx > 1)
+ if (colonx > -1)
{
String pathPrefix = reference.substring(0, colonx);
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/TestBindingSource.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/TestBindingSource.java?view=diff&rev=519767&r1=519766&r2=519767
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/TestBindingSource.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/TestBindingSource.java
Sun Mar 18 17:46:21 2007
@@ -14,18 +14,17 @@
package org.apache.tapestry.services.impl;
-import static org.easymock.EasyMock.expect;
-
-import java.util.Collections;
-
import org.apache.hivemind.Location;
import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.IBinding;
import org.apache.tapestry.IComponent;
import org.apache.tapestry.binding.BindingConstants;
import org.apache.tapestry.binding.BindingFactory;
+import static org.easymock.EasyMock.expect;
import org.testng.annotations.Test;
+import java.util.Collections;
+
/**
* Tests for [EMAIL PROTECTED]
org.apache.tapestry.services.impl.BindingSourceImpl}.
*
@@ -35,7 +34,7 @@
@Test
public class TestBindingSource extends BaseComponentTestCase
{
- public void testNoPrefix()
+ public void test_No_Prefix()
{
IComponent component = newComponent();
IBinding binding = newBinding();
@@ -69,7 +68,7 @@
verify();
}
- public void testNoPrefixWithDefault()
+ public void test_No_Prefix_With_Default()
{
IComponent component = newComponent();
IBinding binding = newBinding();
@@ -102,7 +101,7 @@
verify();
}
- public void testKnownPrefix()
+ public void test_Known_Prefix()
{
IComponent component = newComponent();
IBinding binding = newBinding();
@@ -136,7 +135,7 @@
verify();
}
- public void testPrefixNoMatch()
+ public void test_Prefix_No_Match()
{
IComponent component = newComponent();
IBinding binding = newBinding();
@@ -163,6 +162,74 @@
"zip",
"unknown:path part of locator",
BindingConstants.LITERAL_PREFIX,
+ l);
+
+ assertSame(binding, actual);
+
+ verify();
+ }
+
+ public void test_Single_Character_Prefix()
+ {
+ IComponent component = newComponent();
+ IBinding binding = newBinding();
+ BindingFactory factory = newFactory();
+ Location l = newLocation();
+
+ // Training
+
+ expect(factory.createBinding(component, "bar", "path part of locator",
l)).andReturn(binding);
+
+ BindingPrefixContribution c = new BindingPrefixContribution();
+ c.setPrefix("c");
+ c.setFactory(factory);
+
+ replay();
+
+ BindingSourceImpl bs = new BindingSourceImpl();
+ bs.setContributions(Collections.singletonList(c));
+
+ bs.initializeService();
+
+ IBinding actual = bs.createBinding(
+ component,
+ "bar",
+ "c:path part of locator",
+ "c",
+ l);
+
+ assertSame(binding, actual);
+
+ verify();
+ }
+
+ public void test_Empty_Character_Prefix()
+ {
+ IComponent component = newComponent();
+ IBinding binding = newBinding();
+ BindingFactory factory = newFactory();
+ Location l = newLocation();
+
+ // Training
+
+ expect(factory.createBinding(component, "bar", "path part of locator",
l)).andReturn(binding);
+
+ BindingPrefixContribution c = new BindingPrefixContribution();
+ c.setPrefix("");
+ c.setFactory(factory);
+
+ replay();
+
+ BindingSourceImpl bs = new BindingSourceImpl();
+ bs.setContributions(Collections.singletonList(c));
+
+ bs.initializeService();
+
+ IBinding actual = bs.createBinding(
+ component,
+ "bar",
+ ":path part of locator",
+ "",
l);
assertSame(binding, actual);
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=519767&r1=519766&r2=519767
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/tapestry-framework.iml
(original)
+++ tapestry/tapestry4/trunk/tapestry-framework/tapestry-framework.iml Sun Mar
18 17:46:21 2007
@@ -99,8 +99,12 @@
<CLASSES>
<root
url="jar://$MODULE_DIR$/../../../.m2/repository/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2.jar!/"
/>
</CLASSES>
- <JAVADOC />
- <SOURCES />
+ <JAVADOC>
+ <root
url="jar://$MODULE_DIR$/../../../.m2/repository/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2-javadoc.jar!/"
/>
+ </JAVADOC>
+ <SOURCES>
+ <root
url="jar://$MODULE_DIR$/../../../.m2/repository/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2-sources.jar!/"
/>
+ </SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
@@ -109,7 +113,9 @@
<root
url="jar://$MODULE_DIR$/../../../.m2/repository/commons-io/commons-io/1.3.1/commons-io-1.3.1.jar!/"
/>
</CLASSES>
<JAVADOC />
- <SOURCES />
+ <SOURCES>
+ <root
url="jar://$MODULE_DIR$/../../../.m2/repository/commons-io/commons-io/1.3.1/commons-io-1.3.1-sources.jar!/"
/>
+ </SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
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=519767&r1=519766&r2=519767
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-portlet/tapestry-portlet.iml (original)
+++ tapestry/tapestry4/trunk/tapestry-portlet/tapestry-portlet.iml Sun Mar 18
17:46:21 2007
@@ -13,6 +13,7 @@
<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>
@@ -77,8 +78,12 @@
<CLASSES>
<root
url="jar://$MODULE_DIR$/../../../.m2/repository/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2.jar!/"
/>
</CLASSES>
- <JAVADOC />
- <SOURCES />
+ <JAVADOC>
+ <root
url="jar://$MODULE_DIR$/../../../.m2/repository/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2-javadoc.jar!/"
/>
+ </JAVADOC>
+ <SOURCES>
+ <root
url="jar://$MODULE_DIR$/../../../.m2/repository/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2-sources.jar!/"
/>
+ </SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
@@ -87,7 +92,9 @@
<root
url="jar://$MODULE_DIR$/../../../.m2/repository/commons-io/commons-io/1.3.1/commons-io-1.3.1.jar!/"
/>
</CLASSES>
<JAVADOC />
- <SOURCES />
+ <SOURCES>
+ <root
url="jar://$MODULE_DIR$/../../../.m2/repository/commons-io/commons-io/1.3.1/commons-io-1.3.1-sources.jar!/"
/>
+ </SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
@@ -271,7 +278,6 @@
<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=519767&r1=519766&r2=519767
==============================================================================
--- tapestry/tapestry4/trunk/tapestry.iml (original)
+++ tapestry/tapestry4/trunk/tapestry.iml Sun Mar 18 17:46:21 2007
@@ -155,8 +155,12 @@
<CLASSES>
<root
url="jar://$MODULE_DIR$/../../.m2/repository/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2.jar!/"
/>
</CLASSES>
- <JAVADOC />
- <SOURCES />
+ <JAVADOC>
+ <root
url="jar://$MODULE_DIR$/../../.m2/repository/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2-javadoc.jar!/"
/>
+ </JAVADOC>
+ <SOURCES>
+ <root
url="jar://$MODULE_DIR$/../../.m2/repository/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2-sources.jar!/"
/>
+ </SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
@@ -165,7 +169,9 @@
<root
url="jar://$MODULE_DIR$/../../.m2/repository/commons-io/commons-io/1.3.1/commons-io-1.3.1.jar!/"
/>
</CLASSES>
<JAVADOC />
- <SOURCES />
+ <SOURCES>
+ <root
url="jar://$MODULE_DIR$/../../.m2/repository/commons-io/commons-io/1.3.1/commons-io-1.3.1-sources.jar!/"
/>
+ </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=519767&r1=519766&r2=519767
==============================================================================
--- tapestry/tapestry4/trunk/tapestry.ipr (original)
+++ tapestry/tapestry4/trunk/tapestry.ipr Sun Mar 18 17:46:21 2007
@@ -158,8 +158,8 @@
<option name="respondToPomChangesEnabled" value="true" />
<option name="manageSourceRootsEnabled" value="true" />
<option name="manageModuleInterdependenciesEnabled" value="true" />
- <option name="downloadSourcesEnabled" value="true" />
- <option name="downloadJavadocEnabled" value="true" />
+ <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="searchFilter" value="target" />
Modified: tapestry/tapestry4/trunk/tapestry.iws
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry.iws?view=diff&rev=519767&r1=519766&r2=519767
==============================================================================
--- tapestry/tapestry4/trunk/tapestry.iws (original)
+++ tapestry/tapestry4/trunk/tapestry.iws Sun Mar 18 17:46:21 2007
@@ -19,16 +19,14 @@
<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-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-contrib/tapestry-contrib.iml"
afterPath="$PROJECT_DIR$/tapestry-contrib/tapestry-contrib.iml" />
+ <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/services/impl/BindingSourceImpl.java"
afterPath="$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/services/impl/BindingSourceImpl.java"
/>
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry.ipr"
afterPath="$PROJECT_DIR$/tapestry.ipr" />
+ <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-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/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-framework/src/test/org/apache/tapestry/services/impl/TestBindingSource.java"
afterPath="$PROJECT_DIR$/tapestry-framework/src/test/org/apache/tapestry/services/impl/TestBindingSource.java"
/>
<change type="MODIFICATION"
beforePath="$PROJECT_DIR$/tapestry-portlet/tapestry-portlet.iml"
afterPath="$PROJECT_DIR$/tapestry-portlet/tapestry-portlet.iml" />
</list>
</component>
@@ -198,7 +196,7 @@
<OptionsSetting value="true" id="Remove" />
<OptionsSetting value="true" id="Checkin" />
<OptionsSetting value="true" id="Checkout" />
- <OptionsSetting value="true" id="Update" />
+ <OptionsSetting value="false" id="Update" />
<OptionsSetting value="true" id="Status" />
<OptionsSetting value="true" id="Edit" />
<ConfirmationsSetting value="0" id="Add" />
@@ -225,7 +223,7 @@
<showLibraryContents />
<hideEmptyPackages />
<abbreviatePackageNames />
- <showStructure PackagesPane="false" ProjectPane="false" Scope="false"
Favorites="false" />
+ <showStructure Favorites="false" PackagesPane="false" Scope="false"
ProjectPane="false" />
<autoscrollToSource />
<autoscrollFromSource />
<sortByType />
@@ -236,8 +234,8 @@
<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" />
@@ -248,15 +246,105 @@
<option name="SHOW_DIALOG" value="true" />
</component>
<component name="RecentsManager" />
- <component name="RestoreUpdateTree" />
- <component name="RunManager" selected="TestNG.TestUploadPart">
- <tempConfiguration default="false" name="TestUploadPart" type="TestNG"
factoryName="TestNG" enabled="false" merge="false">
+ <component name="RestoreUpdateTree">
+ <UpdateInfo date="3/18/07 7:32 PM" ActionInfo="_Update">
+ <UpdatedFiles>
+ <FILE-GROUP>
+ <option name="myUpdateName" value="Updated from server" />
+ <option name="myStatusName" value="Changed on server" />
+ <option name="mySupportsDeletion" value="false" />
+ <option name="myCanBeAbsent" value="false" />
+ <option name="myId" value="CHANGED_ON_SERVER" />
+ <FILE-GROUP>
+ <option name="myUpdateName" value="Updated" />
+ <option name="myStatusName" value="Changed" />
+ <option name="mySupportsDeletion" value="false" />
+ <option name="myCanBeAbsent" value="false" />
+ <option name="myId" value="UPDATED" />
+ </FILE-GROUP>
+ <FILE-GROUP>
+ <option name="myUpdateName" value="Created" />
+ <option name="myStatusName" value="Created" />
+ <option name="mySupportsDeletion" value="false" />
+ <option name="myCanBeAbsent" value="false" />
+ <option name="myId" value="CREATED" />
+ </FILE-GROUP>
+ <FILE-GROUP>
+ <option name="myUpdateName" value="Deleted" />
+ <option name="myStatusName" value="Deleted" />
+ <option name="mySupportsDeletion" value="false" />
+ <option name="myCanBeAbsent" value="true" />
+ <option name="myId" value="REMOVED_FROM_REPOSITORY" />
+ </FILE-GROUP>
+ <FILE-GROUP>
+ <option name="myUpdateName" value="Restored" />
+ <option name="myStatusName" value="Will be restored" />
+ <option name="mySupportsDeletion" value="false" />
+ <option name="myCanBeAbsent" value="false" />
+ <option name="myId" value="RESTORED" />
+
<PATH>$PROJECT_DIR$/tapestry-examples/Workbench/src/config/jetty6.xml</PATH>
+ </FILE-GROUP>
+ </FILE-GROUP>
+ <FILE-GROUP>
+ <option name="myUpdateName" value="Modified" />
+ <option name="myStatusName" value="Modified" />
+ <option name="mySupportsDeletion" value="false" />
+ <option name="myCanBeAbsent" value="false" />
+ <option name="myId" value="MODIFIED" />
+ </FILE-GROUP>
+ <FILE-GROUP>
+ <option name="myUpdateName" value="Skipped" />
+ <option name="myStatusName" value="Skipped" />
+ <option name="mySupportsDeletion" value="false" />
+ <option name="myCanBeAbsent" value="false" />
+ <option name="myId" value="SKIPPED" />
+ </FILE-GROUP>
+ <FILE-GROUP>
+ <option name="myUpdateName" value="Merged with conflicts" />
+ <option name="myStatusName" value="Will be merged with conflicts" />
+ <option name="mySupportsDeletion" value="false" />
+ <option name="myCanBeAbsent" value="false" />
+ <option name="myId" value="MERGED_WITH_CONFLICTS" />
+ </FILE-GROUP>
+ <FILE-GROUP>
+ <option name="myUpdateName" value="Merged" />
+ <option name="myStatusName" value="Will be merged" />
+ <option name="mySupportsDeletion" value="false" />
+ <option name="myCanBeAbsent" value="false" />
+ <option name="myId" value="MERGED" />
+ </FILE-GROUP>
+ <FILE-GROUP>
+ <option name="myUpdateName" value="Not in repository" />
+ <option name="myStatusName" value="Not in repository" />
+ <option name="mySupportsDeletion" value="true" />
+ <option name="myCanBeAbsent" value="false" />
+ <option name="myId" value="UNKNOWN" />
+ </FILE-GROUP>
+ <FILE-GROUP>
+ <option name="myUpdateName" value="Locally added" />
+ <option name="myStatusName" value="Locally added" />
+ <option name="mySupportsDeletion" value="false" />
+ <option name="myCanBeAbsent" value="false" />
+ <option name="myId" value="LOCALLY_ADDED" />
+ </FILE-GROUP>
+ <FILE-GROUP>
+ <option name="myUpdateName" value="Locally removed" />
+ <option name="myStatusName" value="Locally removed" />
+ <option name="mySupportsDeletion" value="false" />
+ <option name="myCanBeAbsent" value="false" />
+ <option name="myId" value="LOCALLY_REMOVED" />
+ </FILE-GROUP>
+ </UpdatedFiles>
+ </UpdateInfo>
+ </component>
+ <component name="RunManager" selected="TestNG.TestBindingSource">
+ <tempConfiguration default="false" name="TestBindingSource" 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.multipart" />
- <option name="MAIN_CLASS_NAME"
value="org.apache.tapestry.multipart.TestUploadPart" />
+ <option name="PACKAGE_NAME" value="org.apache.tapestry.services.impl" />
+ <option name="MAIN_CLASS_NAME"
value="org.apache.tapestry.services.impl.TestBindingSource" />
<option name="METHOD_NAME" />
<option name="GROUP_NAME" />
<option name="TEST_OBJECT" value="CLASS" />
@@ -276,15 +364,17 @@
<option name="Make" value="true" />
</method>
</tempConfiguration>
- <configuration default="true" type="Application" factoryName="Application"
enabled="false" merge="false">
+ <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="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="" />
@@ -310,25 +400,6 @@
<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" />
@@ -345,6 +416,23 @@
<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 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 name="<template>" type="WebApp" default="true"
selected="false">
<Host>localhost</Host>
<Port>5050</Port>
@@ -425,7 +513,7 @@
<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.4" order="3" />
- <window_info id="Version Control" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.32974318" order="8" />
+ <window_info id="Version Control" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.28524047" order="8" />
<window_info id="Messages" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.20829876" order="8" />
<window_info id="Maven" active="false" anchor="bottom" auto_hide="false"
internal_type="DOCKED" type="DOCKED" visible="false" weight="0.19568823"
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" />
@@ -435,7 +523,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.19717625"
order="0" />
+ <window_info id="Project" active="true" anchor="left" auto_hide="false"
internal_type="DOCKED" type="DOCKED" visible="true" weight="0.21616359"
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" />
@@ -460,7 +548,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="Upgraded
commons-fileupload/commons-io." />
+ <option name="LAST_COMMIT_MESSAGE" value="Fixes TAPESTRY-937. Simple
stupid indexOf check using > 1 instead of > -1. I'm sure I added this bug
at some point." />
<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" />
@@ -479,6 +567,7 @@
<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." />
+ <MESSAGE value="Fixes TAPESTRY-937. Simple stupid indexOf check using >
1 instead of > -1. I'm sure I added this bug at some point." />
</component>
<component name="antWorkspaceConfiguration">
<option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
@@ -495,27 +584,6 @@
<option name="myLastEditedConfigurable" value="Project Default" />
</component>
<component name="editorHistoryManager">
- <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="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/test/org/apache/tapestry/html/ListenerFixture.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">
- <folding />
- </state>
- </provider>
- </entry>
- <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="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/event/PageAttachListener.java">
<provider selected="true" editor-type-id="text-editor">
<state line="30" column="39" selection-start="1193"
selection-end="1193" vertical-scroll-proportion="0.22998296">
@@ -598,6 +666,27 @@
<entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
<state line="203" column="40" selection-start="7952"
selection-end="7952" vertical-scroll-proportion="0.42248723">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry
file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/binding/BindingConstants.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="42" column="31" selection-start="1286"
selection-end="1286" vertical-scroll-proportion="0.5263158">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry
file="file://$PROJECT_DIR$/tapestry-framework/src/test/org/apache/tapestry/services/impl/TestBindingSource.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="215" column="0" selection-start="6208"
selection-end="6208" vertical-scroll-proportion="0.56558776">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry
file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/services/impl/BindingSourceImpl.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="61" column="0" selection-start="1882"
selection-end="1882" vertical-scroll-proportion="0.51107323">
<folding />
</state>
</provider>
