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 21:52:53 UTC
svn commit: r519691 - in /tapestry/tapestry4/trunk: ./
tapestry-contrib/src/site/xdoc/componentreference/
tapestry-examples/TimeTracker/ tapestry-examples/Workbench/
tapestry-examples/Workbench/src/config/
tapestry-examples/Workbench/src/java/org/apach...
Author: jkuhnert
Date: Sun Mar 18 13:52:52 2007
New Revision: 519691
URL: http://svn.apache.org/viewvc?view=rev&rev=519691
Log:
Minor code cleanup.
Fixed Palette documentation by removing funky character causing td definitions.
Removed:
tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/config/jetty.xml
Modified:
tapestry/tapestry4/trunk/tapestry-contrib/src/site/xdoc/componentreference/palette.xml
tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/TimeTracker.iml
tapestry/tapestry4/trunk/tapestry-examples/Workbench/Workbench.iml
tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/java/org/apache/tapestry/workbench/palette/Palette.java
tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/java/org/apache/tapestry/workbench/palette/PaletteResults.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/binding/ExpressionBinding.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/ExpressionEvaluatorImpl.java
tapestry/tapestry4/trunk/tapestry.iws
Modified: tapestry/tapestry4/trunk/tapestry-contrib/src/site/xdoc/componentreference/palette.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-contrib/src/site/xdoc/componentreference/palette.xml?view=diff&rev=519691&r1=519690&r2=519691
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-contrib/src/site/xdoc/componentreference/palette.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-contrib/src/site/xdoc/componentreference/palette.xml Sun Mar 18 13:52:52 2007
@@ -58,7 +58,7 @@
<td>selected</td>
<td>java.util.List</td>
<td>yes</td>
- <td>Â </td>
+ <td> </td>
<td>
A List of selected values. Possible selections are defined by the model;
this should be a subset of the possible values. This may be null when
@@ -78,7 +78,7 @@
</a>
</td>
<td>yes</td>
- <td>Â </td>
+ <td> </td>
<td>
Works, as with a
<a href="../../components/form/propertyselection.html">PropertySelection</a>
@@ -106,7 +106,7 @@
<td>id</td>
<td>string</td>
<td>no</td>
- <td></td>
+ <td> </td>
<td>
Sets the id for the rendered <code><select></code> element that displays the
selected items.
@@ -116,7 +116,7 @@
<td>displayName</td>
<td>string</td>
<td>no</td>
- <td></td>
+ <td> </td>
<td>
The user-presentable name for the component, which will be used by a
<a href="../../components/form/fieldlabel.html">FieldLabel</a>
@@ -133,7 +133,7 @@
</a>
</td>
<td>no</td>
- <td></td>
+ <td> </td>
<td>
The validators to apply to the component. Something along the lines of:
<code>validators:required</code> .<br/><br/>
@@ -211,7 +211,7 @@
</a>
</td>
<td>no</td>
- <td>Â </td>
+ <td> </td>
<td>
If any of these are specified then they override the default images
provided with the component. This allows the look and feel to be
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=519691&r1=519690&r2=519691
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/TimeTracker.iml (original)
+++ tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/TimeTracker.iml Sun Mar 18 13:52:52 2007
@@ -512,6 +512,18 @@
<attribute name="method" value="0" />
<attribute name="URI" value="/WEB-INF/lib/easymockclassextension-2.2.jar" />
</containerElement>
+ <containerElement type="library" name="Maven Dependency: org.mortbay.jetty:jetty-util:jar:6.1.1:compile" level="module">
+ <attribute name="method" value="0" />
+ <attribute name="URI" value="/WEB-INF/lib/jetty-util-6.1.1.jar" />
+ </containerElement>
+ <containerElement type="library" name="Maven Dependency: org.mortbay.jetty:jetty:jar:6.1.1:compile" level="module">
+ <attribute name="method" value="0" />
+ <attribute name="URI" value="/WEB-INF/lib/jetty-6.1.1.jar" />
+ </containerElement>
+ <containerElement type="library" name="Maven Dependency: org.mortbay.jetty:start:jar:6.1.1:compile" level="module">
+ <attribute name="method" value="0" />
+ <attribute name="URI" value="/WEB-INF/lib/start-6.1.1.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="/WEB-INF/lib/selenium-java-client-driver-0.9.1-SNAPSHOT.jar" />
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=519691&r1=519690&r2=519691
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-examples/Workbench/Workbench.iml (original)
+++ tapestry/tapestry4/trunk/tapestry-examples/Workbench/Workbench.iml Sun Mar 18 13:52:52 2007
@@ -3,8 +3,11 @@
<component name="AppServerSpecificValidatorsManager" />
<component name="ModuleRootManager" />
<component name="NewModuleRootManager" inherit-compiler-output="true">
+ <output url="file://$MODULE_DIR$/src/context/WEB-INF/classes" />
<exclude-output />
+ <exploded url="file://$MODULE_DIR$/target/exploded" />
<exclude-exploded />
+ <output-test url="file://$MODULE_DIR$/../../target/classes/test/Workbench" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
@@ -13,8 +16,8 @@
<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-annotations" exported="" />
+ <orderEntry type="module" module-name="tapestry-contrib" exported="" />
<orderEntry type="module" module-name="tapestry-framework" />
<orderEntry type="module-library">
<library>
@@ -250,31 +253,31 @@
<orderEntryProperties />
</component>
<component name="WebModuleBuildComponent">
- <setting name="EXPLODED_URL" value="file://" />
+ <setting name="EXPLODED_URL" value="file://$MODULE_DIR$/target/exploded" />
<setting name="EXPLODED_ENABLED" value="false" />
<setting name="JAR_URL" value="file://" />
<setting name="JAR_ENABLED" value="false" />
<setting name="SYNC_EXPLODED_DIR" value="true" />
<setting name="BUILD_MODULE_ON_FRAME_DEACTIVATION" value="false" />
<setting name="BUILD_EXTERNAL_DEPENDENCIES" value="false" />
- <setting name="RUN_JASPER_VALIDATION" value="true" />
+ <setting name="RUN_JASPER_VALIDATION" value="false" />
</component>
<component name="WebModuleProperties">
<containerElement type="module" name="tapestry">
<attribute name="method" value="0" />
- <attribute name="URI" value="/WEB-INF/classes" />
+ <attribute name="URI" value="<N/A>" />
</containerElement>
<containerElement type="module" name="tapestry-annotations">
- <attribute name="method" value="1" />
- <attribute name="URI" value="/WEB-INF/classes" />
+ <attribute name="method" value="0" />
+ <attribute name="URI" value="<N/A>" />
</containerElement>
<containerElement type="module" name="tapestry-contrib">
- <attribute name="method" value="1" />
- <attribute name="URI" value="/WEB-INF/classes" />
+ <attribute name="method" value="0" />
+ <attribute name="URI" value="<N/A>" />
</containerElement>
<containerElement type="module" name="tapestry-framework">
- <attribute name="method" value="1" />
- <attribute name="URI" value="/WEB-INF/classes" />
+ <attribute name="method" value="0" />
+ <attribute name="URI" value="<N/A>" />
</containerElement>
<containerElement type="library" level="module">
<attribute name="method" value="0" />
@@ -282,16 +285,16 @@
<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="1" />
- <attribute name="URI" value="/WEB-INF/lib/ant-1.6.5.jar" />
+ <attribute name="method" value="0" />
+ <attribute name="URI" value="<N/A>" />
</containerElement>
<containerElement type="library" name="Maven Dependency: avalon-framework:avalon-framework:jar:4.1.3:provided" level="module">
- <attribute name="method" value="1" />
- <attribute name="URI" value="/WEB-INF/lib/avalon-framework-4.1.3.jar" />
+ <attribute name="method" value="0" />
+ <attribute name="URI" value="<N/A>" />
</containerElement>
<containerElement type="library" name="Maven Dependency: backport-util-concurrent:backport-util-concurrent:jar:2.2:compile" level="module">
<attribute name="method" value="0" />
- <attribute name="URI" value="/WEB-INF/lib/backport-util-concurrent-2.2.jar" />
+ <attribute name="URI" value="<N/A>" />
</containerElement>
<containerElement type="library" name="Maven Dependency: cglib:cglib-nodep:jar:2.1_3:compile" level="module">
<attribute name="method" value="0" />
@@ -331,27 +334,27 @@
</containerElement>
<containerElement type="library" name="Maven Dependency: commons-logging:commons-logging:jar:1.1:provided" level="module">
<attribute name="method" value="0" />
- <attribute name="URI" value="/WEB-INF/lib/commons-logging-1.1.jar" />
+ <attribute name="URI" value="<N/A>" />
</containerElement>
<containerElement type="library" name="Maven Dependency: commons-pool:commons-pool:jar:1.3:compile" level="module">
<attribute name="method" value="0" />
- <attribute name="URI" value="/WEB-INF/lib/commons-pool-1.3.jar" />
+ <attribute name="URI" value="<N/A>" />
</containerElement>
<containerElement type="library" name="Maven Dependency: hivemind:hivemind-lib:jar:1.1.1:compile" level="module">
<attribute name="method" value="0" />
- <attribute name="URI" value="/WEB-INF/lib/hivemind-lib-1.1.1.jar" />
+ <attribute name="URI" value="<N/A>" />
</containerElement>
<containerElement type="library" name="Maven Dependency: hivemind:hivemind:jar:1.1.1:compile" level="module">
<attribute name="method" value="0" />
- <attribute name="URI" value="/WEB-INF/lib/hivemind-1.1.1.jar" />
+ <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="/WEB-INF/lib/hsqldb-1.8.0.1.jar" />
+ <attribute name="URI" value="<N/A>" />
</containerElement>
<containerElement type="library" name="Maven Dependency: javax.portlet:portlet-api:jar:1.0:provided" level="module">
<attribute name="method" value="0" />
- <attribute name="URI" value="/WEB-INF/lib/portlet-api-1.0.jar" />
+ <attribute name="URI" value="<N/A>" />
</containerElement>
<containerElement type="library" name="Maven Dependency: javax.servlet:servlet-api:jar:2.4:provided" level="module">
<attribute name="method" value="0" />
@@ -359,7 +362,7 @@
</containerElement>
<containerElement type="library" name="Maven Dependency: jboss:javassist:jar:3.4.ga:runtime" level="module">
<attribute name="method" value="0" />
- <attribute name="URI" value="/WEB-INF/lib/javassist-3.4.ga.jar" />
+ <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" />
@@ -382,40 +385,40 @@
<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="1" />
- <attribute name="URI" value="/WEB-INF/lib/jdom-1.0.jar" />
+ <attribute name="method" value="0" />
+ <attribute name="URI" value="<N/A>" />
</containerElement>
<containerElement type="library" name="Maven Dependency: jetty:org.mortbay.jetty:jar:5.1.10:test" level="module">
- <attribute name="method" value="1" />
- <attribute name="URI" value="/WEB-INF/lib/org.mortbay.jetty-5.1.10.jar" />
+ <attribute name="method" value="0" />
+ <attribute name="URI" value="<N/A>" />
</containerElement>
<containerElement type="library" name="Maven Dependency: junit:junit:jar:3.8.1:provided" level="module">
- <attribute name="method" value="1" />
- <attribute name="URI" value="/WEB-INF/lib/junit-3.8.1.jar" />
+ <attribute name="method" value="0" />
+ <attribute name="URI" value="<N/A>" />
</containerElement>
<containerElement type="library" name="Maven Dependency: junit:junit:jar:3.8.1:test" level="module">
- <attribute name="method" value="1" />
- <attribute name="URI" value="/WEB-INF/lib/junit-3.8.1.jar" />
+ <attribute name="method" value="0" />
+ <attribute name="URI" value="<N/A>" />
</containerElement>
<containerElement type="library" name="Maven Dependency: log4j:log4j:jar:1.2.8:test" level="module">
- <attribute name="method" value="1" />
- <attribute name="URI" value="/WEB-INF/lib/log4j-1.2.8.jar" />
+ <attribute name="method" value="0" />
+ <attribute name="URI" value="<N/A>" />
</containerElement>
<containerElement type="library" name="Maven Dependency: log4j:log4j:jar:1.2.9:compile" level="module">
<attribute name="method" value="0" />
<attribute name="URI" value="/WEB-INF/lib/log4j-1.2.9.jar" />
</containerElement>
<containerElement type="library" name="Maven Dependency: log4j:log4j:jar:1.2.9:test" level="module">
- <attribute name="method" value="1" />
- <attribute name="URI" value="/WEB-INF/lib/log4j-1.2.9.jar" />
+ <attribute name="method" value="0" />
+ <attribute name="URI" value="<N/A>" />
</containerElement>
<containerElement type="library" name="Maven Dependency: logkit:logkit:jar:1.0.1:provided" level="module">
- <attribute name="method" value="1" />
- <attribute name="URI" value="/WEB-INF/lib/logkit-1.0.1.jar" />
+ <attribute name="method" value="0" />
+ <attribute name="URI" value="<N/A>" />
</containerElement>
<containerElement type="library" name="Maven Dependency: ognl:ognl:jar:2.7-SNAPSHOT:compile" level="module">
<attribute name="method" value="0" />
- <attribute name="URI" value="/WEB-INF/lib/ognl-2.7-SNAPSHOT.jar" />
+ <attribute name="URI" value="<N/A>" />
</containerElement>
<containerElement type="library" name="Maven Dependency: org.apache.tapestry:tapestry-test:jar:4.1.1-SNAPSHOT:test" level="module">
<attribute name="method" value="0" />
@@ -430,40 +433,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="1" />
- <attribute name="URI" value="/WEB-INF/lib/selenium-java-client-driver-0.9.1-SNAPSHOT.jar" />
+ <attribute name="method" value="0" />
+ <attribute name="URI" value="<N/A>" />
</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="1" />
- <attribute name="URI" value="/WEB-INF/lib/selenium-core-0.8.2-SNAPSHOT.jar" />
+ <attribute name="method" value="0" />
+ <attribute name="URI" value="<N/A>" />
</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="1" />
- <attribute name="URI" value="/WEB-INF/lib/selenium-server-coreless-0.9.1-SNAPSHOT.jar" />
+ <attribute name="method" value="0" />
+ <attribute name="URI" value="<N/A>" />
</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="1" />
- <attribute name="URI" value="/WEB-INF/lib/selenium-server-0.9.1-SNAPSHOT.jar" />
+ <attribute name="method" value="0" />
+ <attribute name="URI" value="<N/A>" />
</containerElement>
<containerElement type="library" name="Maven Dependency: org.testng:testng:jar:jdk15:5.1:test" level="module">
- <attribute name="method" value="1" />
- <attribute name="URI" value="/WEB-INF/lib/testng-5.1-jdk15.jar" />
+ <attribute name="method" value="0" />
+ <attribute name="URI" value="<N/A>" />
</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="/WEB-INF/lib/oro-2.0.8.jar" />
+ <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="/WEB-INF/lib/portlet-api-1.0.jar" />
+ <attribute name="URI" value="<N/A>" />
</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="/WEB-INF/lib/xercesImpl-2.0.2.jar" />
+ <attribute name="URI" value="<N/A>" />
</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="/WEB-INF/lib/xml-apis-1.0.b2.jar" />
+ <attribute name="URI" value="<N/A>" />
</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-examples/Workbench/src/java/org/apache/tapestry/workbench/palette/Palette.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/java/org/apache/tapestry/workbench/palette/Palette.java?view=diff&rev=519691&r1=519690&r2=519691
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/java/org/apache/tapestry/workbench/palette/Palette.java (original)
+++ tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/java/org/apache/tapestry/workbench/palette/Palette.java Sun Mar 18 13:52:52 2007
@@ -14,8 +14,6 @@
package org.apache.tapestry.workbench.palette;
-import java.util.List;
-
import org.apache.tapestry.IPage;
import org.apache.tapestry.annotations.InjectPage;
import org.apache.tapestry.annotations.Persist;
@@ -25,6 +23,8 @@
import org.apache.tapestry.html.BasePage;
import org.apache.tapestry.valid.IValidationDelegate;
+import java.util.List;
+
/**
* @author Howard Lewis Ship
*/
@@ -33,8 +33,7 @@
{
private IPropertySelectionModel colorModel;
- private String[] colors =
- { "Red", "Orange", "Yellow", "Green", "Blue", "Indigo", "Violet" };
+ private String[] colors = { "Red", "Orange", "Yellow", "Green", "Blue", "Indigo", "Violet" };
public abstract List getSelectedColors();
Modified: tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/java/org/apache/tapestry/workbench/palette/PaletteResults.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/java/org/apache/tapestry/workbench/palette/PaletteResults.java?view=diff&rev=519691&r1=519690&r2=519691
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/java/org/apache/tapestry/workbench/palette/PaletteResults.java (original)
+++ tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/java/org/apache/tapestry/workbench/palette/PaletteResults.java Sun Mar 18 13:52:52 2007
@@ -14,9 +14,9 @@
package org.apache.tapestry.workbench.palette;
-import java.util.List;
-
import org.apache.tapestry.html.BasePage;
+
+import java.util.List;
/**
* @author Howard Lewis Ship
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/binding/ExpressionBinding.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/binding/ExpressionBinding.java?view=diff&rev=519691&r1=519690&r2=519691
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/binding/ExpressionBinding.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/binding/ExpressionBinding.java Sun Mar 18 13:52:52 2007
@@ -16,7 +16,6 @@
import ognl.Node;
import ognl.enhance.ExpressionAccessor;
-
import org.apache.hivemind.Location;
import org.apache.tapestry.BindingException;
import org.apache.tapestry.IComponent;
@@ -210,7 +209,7 @@
buffer.append("ExpressionBinding[");
buffer.append(_root.getId());
- //buffer.append(_root.getExtendedId());
+ buffer.append(_root.getExtendedId());
if (_expression != null)
{
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/ExpressionEvaluatorImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/ExpressionEvaluatorImpl.java?view=diff&rev=519691&r1=519690&r2=519691
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/ExpressionEvaluatorImpl.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/ExpressionEvaluatorImpl.java Sun Mar 18 13:52:52 2007
@@ -14,18 +14,8 @@
package org.apache.tapestry.services.impl;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import ognl.ClassResolver;
-import ognl.Node;
-import ognl.Ognl;
-import ognl.OgnlContext;
-import ognl.OgnlRuntime;
-import ognl.TypeConverter;
+import ognl.*;
import ognl.enhance.ExpressionAccessor;
-
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.hivemind.service.ClassFactory;
import org.apache.tapestry.Tapestry;
@@ -33,6 +23,10 @@
import org.apache.tapestry.services.ExpressionEvaluator;
import org.apache.tapestry.spec.IApplicationSpecification;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
/**
* @author Howard M. Lewis Ship
* @since 4.0
@@ -103,8 +97,6 @@
return read(target, node.getAccessor());
return readCompiled(target, node);
-
- //return read(target, _expressionCache.getCompiledExpression(expression));
}
public Object readCompiled(Object target, Object expression)
Modified: tapestry/tapestry4/trunk/tapestry.iws
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry.iws?view=diff&rev=519691&r1=519690&r2=519691
==============================================================================
--- tapestry/tapestry4/trunk/tapestry.iws (original)
+++ tapestry/tapestry4/trunk/tapestry.iws Sun Mar 18 13:52:52 2007
@@ -17,19 +17,15 @@
</component>
<component name="ChangeListManager">
<list default="true" name="Default" comment="">
- <change type="DELETED" beforePath="$PROJECT_DIR$/eclipse/Tapestry-Vlib.launch" afterPath="" />
<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/listener/ListenerInvokerFilter.java" afterPath="$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/listener/ListenerInvokerFilter.java" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/eclipse/TimeTracker.launch" afterPath="" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/listener/ListenerMethodInvoker.java" afterPath="$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/listener/ListenerMethodInvoker.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/listener/ListenerInvokerTerminator.java" afterPath="$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/listener/ListenerInvokerTerminator.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/listener/ListenerMethodInvokerImpl.java" afterPath="$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/listener/ListenerMethodInvokerImpl.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/listener/SyntheticListener.java" afterPath="$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/listener/SyntheticListener.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/binding/ListenerMethodBinding.java" afterPath="$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/binding/ListenerMethodBinding.java" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/eclipse/Workbench.launch" afterPath="" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry-framework/src/test/org/apache/tapestry/listener/ListenerMethodInvokerTest.java" afterPath="$PROJECT_DIR$/tapestry-framework/src/test/org/apache/tapestry/listener/ListenerMethodInvokerTest.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/IActionListener.java" afterPath="$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/IActionListener.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry-framework/src/test/org/apache/tapestry/binding/TestListenerMethodBinding.java" afterPath="$PROJECT_DIR$/tapestry-framework/src/test/org/apache/tapestry/binding/TestListenerMethodBinding.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-examples/Workbench/src/java/org/apache/tapestry/workbench/palette/Palette.java" afterPath="$PROJECT_DIR$/tapestry-examples/Workbench/src/java/org/apache/tapestry/workbench/palette/Palette.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/services/impl/ExpressionEvaluatorImpl.java" afterPath="$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/services/impl/ExpressionEvaluatorImpl.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry-examples/Workbench/src/java/org/apache/tapestry/workbench/palette/PaletteResults.java" afterPath="$PROJECT_DIR$/tapestry-examples/Workbench/src/java/org/apache/tapestry/workbench/palette/PaletteResults.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry-examples/TimeTracker/TimeTracker.iml" afterPath="$PROJECT_DIR$/tapestry-examples/TimeTracker/TimeTracker.iml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry-contrib/src/site/xdoc/componentreference/palette.xml" afterPath="$PROJECT_DIR$/tapestry-contrib/src/site/xdoc/componentreference/palette.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry-examples/Workbench/Workbench.iml" afterPath="$PROJECT_DIR$/tapestry-examples/Workbench/Workbench.iml" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/tapestry-examples/Workbench/src/config/jetty.xml" afterPath="" />
</list>
</component>
<component name="ChangesViewManager" flattened_view="true" />
@@ -228,7 +224,7 @@
<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="true" />
+ <property name="RunManagerConfig.showSettingsBeforeRunnig" value="false" />
<property name="MemberChooser.sorted" value="false" />
<property name="MemberChooser.showClasses" value="true" />
<property name="GoToClass.includeLibraries" value="false" />
@@ -244,22 +240,22 @@
<tempConfiguration default="false" name="TestListenerMethodBinding" 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="ALTERNATIVE_JRE_PATH" value="" />
+ <option name="SUITE_NAME" value="" />
<option name="PACKAGE_NAME" value="org.apache.tapestry.binding" />
<option name="MAIN_CLASS_NAME" value="org.apache.tapestry.binding.TestListenerMethodBinding" />
<option name="METHOD_NAME" />
- <option name="GROUP_NAME" />
+ <option name="GROUP_NAME" value="" />
<option name="TEST_OBJECT" value="CLASS" />
- <option name="VM_PARAMETERS" />
- <option name="PARAMETERS" />
- <option name="WORKING_DIRECTORY" />
- <option name="OUTPUT_DIRECTORY" />
+ <option name="VM_PARAMETERS" value="" />
+ <option name="PARAMETERS" value="" />
+ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
+ <option name="OUTPUT_DIRECTORY" value="" />
<option name="ADDITIONAL_CLASS_PATH" />
<option name="TEST_SEARCH_SCOPE">
- <value defaultName="wholeProject" />
+ <value defaultName="singleModule" />
</option>
- <option name="PROPERTIES_FILE" />
+ <option name="PROPERTIES_FILE" value="" />
<properties />
<RunnerSettings RunnerId="Run" />
<ConfigurationWrapper RunnerId="Run" />
@@ -429,7 +425,7 @@
<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="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.2614108" order="2" />
+ <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22323652" order="2" />
<window_info id="SVN Repositories" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.27219918" order="8" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="5" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="0" />
@@ -451,7 +447,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 for TAPESTRY-838. Exposed listener method name targeted for invocation in IActionListener / ListenerInvoker." />
+ <option name="LAST_COMMIT_MESSAGE" value="Minor code cleanup. Fixed Palette documentation by removing funky character causing td definitions." />
<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" />
@@ -467,6 +463,7 @@
<MESSAGE value="Cleaned up shared idea properties." />
<MESSAGE value="Minor code cleanup, removal of old .cvsignore properties." />
<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." />
</component>
<component name="antWorkspaceConfiguration">
<option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
@@ -477,120 +474,120 @@
</component>
<component name="com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectRootMasterDetailsConfigurable" proportions="0.22673559,0.5" version="1">
<option name="myPlainMode" value="false" />
- <option name="myLastEditedConfigurable" value="tapestry" />
+ <option name="myLastEditedConfigurable" value="Workbench" />
</component>
<component name="com.intellij.profile.ui.ErrorOptionsConfigurable" proportions="0.16666667,0.5642857" version="1">
<option name="myLastEditedConfigurable" value="Project Default" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/form/FormEventType.java">
+ <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/IActionListener.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="53" column="5" selection-start="2023" selection-end="2023" vertical-scroll-proportion="0.5238501">
+ <state line="46" column="27" selection-start="1428" selection-end="1593" vertical-scroll-proportion="0.43441227">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/tapestry-examples/Workbench/src/context/WEB-INF/Fields.page">
+ <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/listener/ListenerMethodInvoker.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="50" column="0" selection-start="2037" selection-end="2037" vertical-scroll-proportion="0.06729131">
+ <state line="37" column="0" selection-start="1421" selection-end="1421" vertical-scroll-proportion="0.31942078">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/site/apt/usersguide/validation.apt">
+ <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/listener/ListenerMethodInvokerImpl.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="168" column="0" selection-start="9264" selection-end="9264" vertical-scroll-proportion="0.5340811">
+ <state line="174" column="43" selection-start="6327" selection-end="6327" vertical-scroll-proportion="0.36115843">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/tapestry-portlet/src/java/org/apache/tapestry/portlet/PortletRendererImpl.java">
+ <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/binding/ListenerMethodBinding.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="78" column="8" selection-start="2704" selection-end="2704" vertical-scroll-proportion="0.67717206">
+ <state line="42" column="0" selection-start="1663" selection-end="1663" vertical-scroll-proportion="0.3157277">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/listener/ListenerInvokerTerminator.java">
+ <entry file="file://$PROJECT_DIR$/tapestry-framework/src/test/org/apache/tapestry/binding/TestListenerMethodBinding.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="53" column="0" selection-start="1914" selection-end="1914" vertical-scroll-proportion="0.4855196">
+ <state line="201" column="0" selection-start="6137" selection-end="6137" vertical-scroll-proportion="0.83390117">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/listener/ListenerInvoker.java">
+ <entry file="file://$PROJECT_DIR$/tapestry-examples/Workbench/src/config/jetty.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="29" column="7" selection-start="1022" selection-end="1022" vertical-scroll-proportion="0.19165248">
+ <state line="24" column="35" selection-start="980" selection-end="980" vertical-scroll-proportion="0.28449744">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/tapestry-framework/src/test/org/apache/tapestry/listener/ListenerMethodHolder.java">
+ <entry file="file://$PROJECT_DIR$/tapestry-examples/Workbench/pom.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="61" column="5" selection-start="1515" selection-end="1515" vertical-scroll-proportion="0.5494037">
+ <state line="48" column="0" selection-start="1741" selection-end="1741" vertical-scroll-proportion="0.36115843">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/tapestry-framework/src/test/org/apache/tapestry/listener/ListenerMethodInvokerTest.java">
+ <entry file="file://$PROJECT_DIR$/tapestry-contrib/src/site/xdoc/componentreference/palette.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="61" column="8" selection-start="2021" selection-end="2021" vertical-scroll-proportion="0.5621806">
+ <state line="209" column="38" selection-start="9608" selection-end="9608" vertical-scroll-proportion="0.4471891">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/listener/ListenerInvokerFilter.java">
+ <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/binding/OGNLBindingFactory.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="31" column="0" selection-start="1119" selection-end="1119" vertical-scroll-proportion="0.21720614">
+ <state line="25" column="3" selection-start="1034" selection-end="1034" vertical-scroll-proportion="0.11499148">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/listener/SyntheticListener.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="58" column="0" selection-start="1997" selection-end="1997" vertical-scroll-proportion="0.5494037">
+ <state line="199" column="0" selection-start="5140" selection-end="5140" vertical-scroll-proportion="1.3577513">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/IActionListener.java">
+ <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/coerce/TypeConverter.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="46" column="27" selection-start="1428" selection-end="1593" vertical-scroll-proportion="0.43441227">
+ <state line="34" column="0" selection-start="1183" selection-end="1183" vertical-scroll-proportion="0.2810903">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/listener/ListenerMethodInvoker.java">
+ <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/services/impl/ExpressionEvaluatorImpl.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="37" column="0" selection-start="1421" selection-end="1421" vertical-scroll-proportion="0.31942078">
+ <state line="48" column="0" selection-start="1577" selection-end="1577" vertical-scroll-proportion="0.18228279">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/listener/ListenerMethodInvokerImpl.java">
+ <entry file="file://$PROJECT_DIR$/tapestry-contrib/src/java/org/apache/tapestry/contrib/palette/Palette.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="174" column="43" selection-start="6327" selection-end="6327" vertical-scroll-proportion="0.36115843">
+ <state line="512" column="5" selection-start="16668" selection-end="16668" vertical-scroll-proportion="0.5144804">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/binding/ListenerMethodBinding.java">
+ <entry file="file://$PROJECT_DIR$/tapestry-examples/Workbench/src/java/org/apache/tapestry/workbench/palette/PaletteResults.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="42" column="0" selection-start="1663" selection-end="1663" vertical-scroll-proportion="0.3157277">
+ <state line="31" column="0" selection-start="899" selection-end="899" vertical-scroll-proportion="0.21720614">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/tapestry-framework/src/test/org/apache/tapestry/binding/TestListenerMethodBinding.java">
+ <entry file="file://$PROJECT_DIR$/tapestry-examples/Workbench/src/java/org/apache/tapestry/workbench/palette/Palette.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="201" column="0" selection-start="6137" selection-end="6137" vertical-scroll-proportion="0.83390117">
+ <state line="41" column="0" selection-start="1439" selection-end="1439" vertical-scroll-proportion="0.25553662">
<folding />
</state>
</provider>
</entry>
</component>
<component name="testng.defaultConfiguration">
- <outputDirectory />
+ <outputDirectory>/tmp</outputDirectory>
<properties />
</component>
</project>