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 19:41:59 UTC
svn commit: r519664 - in /tapestry/tapestry4/trunk: ./ config/ config/jboss/
src/site/apt/usersguide/ tapestry-annotations/ tapestry-contrib/
tapestry-examples/TimeTracker/ tapestry-examples/Workbench/
tapestry-framework/src/java/org/apache/tapestry/ t...
Author: jkuhnert
Date: Sun Mar 18 11:41:58 2007
New Revision: 519664
URL: http://svn.apache.org/viewvc?view=rev&rev=519664
Log:
Minor code cleanup, removal of old .cvsignore properties.
Removed:
tapestry/tapestry4/trunk/.cvsignore
tapestry/tapestry4/trunk/config/.cvsignore
tapestry/tapestry4/trunk/config/jboss/
tapestry/tapestry4/trunk/tapestry-contrib/.cvsignore
tapestry/tapestry4/trunk/tapestry-examples/Workbench/.cvsignore
tapestry/tapestry4/trunk/tapestry-portlet/.cvsignore
Modified:
tapestry/tapestry4/trunk/src/site/apt/usersguide/validation.apt
tapestry/tapestry4/trunk/tapestry-annotations/tapestry-annotations.iml
tapestry/tapestry4/trunk/tapestry-contrib/pom.xml
tapestry/tapestry4/trunk/tapestry-contrib/tapestry-contrib.iml
tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/TimeTracker.iml
tapestry/tapestry4/trunk/tapestry-examples/Workbench/Workbench.iml
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/IRequestCycle.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/Identity.java
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/src/site/apt/usersguide/validation.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/src/site/apt/usersguide/validation.apt?view=diff&rev=519664&r1=519663&r2=519664
==============================================================================
--- tapestry/tapestry4/trunk/src/site/apt/usersguide/validation.apt (original)
+++ tapestry/tapestry4/trunk/src/site/apt/usersguide/validation.apt Sun Mar 18 11:41:58 2007
@@ -253,4 +253,3 @@
}
+---------------------------------------------------------------
-
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=519664&r1=519663&r2=519664
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-annotations/tapestry-annotations.iml (original)
+++ tapestry/tapestry4/trunk/tapestry-annotations/tapestry-annotations.iml Sun Mar 18 11:41:58 2007
@@ -11,7 +11,6 @@
</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">
Modified: tapestry/tapestry4/trunk/tapestry-contrib/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-contrib/pom.xml?view=diff&rev=519664&r1=519663&r2=519664
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-contrib/pom.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-contrib/pom.xml Sun Mar 18 11:41:58 2007
@@ -6,7 +6,7 @@
<artifactId>tapestry-contrib</artifactId>
<packaging>jar</packaging>
<version>4.1.2-SNAPSHOT</version>
- <!-- This should change to tapestry-project -->
+
<parent>
<groupId>org.apache.tapestry</groupId>
<artifactId>tapestry-project</artifactId>
@@ -185,4 +185,4 @@
<outputDirectory>../target/site/tapestry-contrib</outputDirectory>
</reporting>
-</project>
\ No newline at end of file
+</project>
Modified: tapestry/tapestry4/trunk/tapestry-contrib/tapestry-contrib.iml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-contrib/tapestry-contrib.iml?view=diff&rev=519664&r1=519663&r2=519664
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-contrib/tapestry-contrib.iml (original)
+++ tapestry/tapestry4/trunk/tapestry-contrib/tapestry-contrib.iml Sun Mar 18 11:41:58 2007
@@ -11,7 +11,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-framework" />
<orderEntry type="module-library">
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=519664&r1=519663&r2=519664
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/TimeTracker.iml (original)
+++ tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/TimeTracker.iml Sun Mar 18 11:41:58 2007
@@ -351,6 +351,10 @@
<setting name="RUN_JASPER_VALIDATION" value="true" />
</component>
<component name="WebModuleProperties">
+ <containerElement type="module" name="tapestry">
+ <attribute name="method" value="0" />
+ <attribute name="URI" value="/WEB-INF/classes" />
+ </containerElement>
<containerElement type="module" name="tapestry-annotations">
<attribute name="method" value="0" />
<attribute name="URI" value="/WEB-INF/classes" />
@@ -436,6 +440,10 @@
<attribute name="method" value="0" />
<attribute name="URI" value="/WEB-INF/lib/hsqldb-1.8.0.1.jar" />
</containerElement>
+ <containerElement type="library" name="Maven Dependency: javax.portlet:portlet-api:jar:1.0:provided" level="module">
+ <attribute name="method" value="0" />
+ <attribute name="URI" value="/WEB-INF/lib/portlet-api-1.0.jar" />
+ </containerElement>
<containerElement type="library" name="Maven Dependency: javax.servlet:servlet-api:jar:2.4:provided" level="module">
<attribute name="method" value="0" />
<attribute name="URI" value="<N/A>" />
@@ -444,10 +452,18 @@
<attribute name="method" value="0" />
<attribute name="URI" value="/WEB-INF/lib/javassist-3.4.ga.jar" />
</containerElement>
+ <containerElement type="library" name="Maven Dependency: jboss:jboss-j2ee:jar:4.0.2:compile" level="module">
+ <attribute name="method" value="0" />
+ <attribute name="URI" value="/WEB-INF/lib/jboss-j2ee-4.0.2.jar" />
+ </containerElement>
<containerElement type="library" name="Maven Dependency: jboss:jboss-j2ee:jar:4.0.2:provided" level="module">
<attribute name="method" value="0" />
<attribute name="URI" value="/WEB-INF/lib/jboss-j2ee-4.0.2.jar" />
</containerElement>
+ <containerElement type="library" name="Maven Dependency: jcharts:jcharts:jar:0.6.0:compile" level="module">
+ <attribute name="method" value="0" />
+ <attribute name="URI" value="/WEB-INF/lib/jcharts-0.6.0.jar" />
+ </containerElement>
<containerElement type="library" name="Maven Dependency: jdom:jdom:jar:1.0:test" level="module">
<attribute name="method" value="0" />
<attribute name="URI" value="/WEB-INF/lib/jdom-1.0.jar" />
@@ -519,6 +535,10 @@
<containerElement type="library" name="Maven Dependency: oro:oro:jar:2.0.8:compile" level="module">
<attribute name="method" value="0" />
<attribute name="URI" value="/WEB-INF/lib/oro-2.0.8.jar" />
+ </containerElement>
+ <containerElement type="library" name="Maven Dependency: portlet-api:portlet-api:jar:1.0:compile" level="module">
+ <attribute name="method" value="0" />
+ <attribute name="URI" value="/WEB-INF/lib/portlet-api-1.0.jar" />
</containerElement>
<containerElement type="library" name="Maven Dependency: xerces:xercesImpl:jar:2.0.2:compile" level="module">
<attribute name="method" value="0" />
Modified: tapestry/tapestry4/trunk/tapestry-examples/Workbench/Workbench.iml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-examples/Workbench/Workbench.iml?view=diff&rev=519664&r1=519663&r2=519664
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-examples/Workbench/Workbench.iml (original)
+++ tapestry/tapestry4/trunk/tapestry-examples/Workbench/Workbench.iml Sun Mar 18 11:41:58 2007
@@ -260,6 +260,10 @@
<setting name="RUN_JASPER_VALIDATION" value="true" />
</component>
<component name="WebModuleProperties">
+ <containerElement type="module" name="tapestry">
+ <attribute name="method" value="0" />
+ <attribute name="URI" value="/WEB-INF/classes" />
+ </containerElement>
<containerElement type="module" name="tapestry-annotations">
<attribute name="method" value="1" />
<attribute name="URI" value="/WEB-INF/classes" />
@@ -305,6 +309,14 @@
<attribute name="method" value="0" />
<attribute name="URI" value="/WEB-INF/lib/commons-codec-1.3.jar" />
</containerElement>
+ <containerElement type="library" name="Maven Dependency: commons-collections:commons-collections:jar:2.1:compile" level="module">
+ <attribute name="method" value="0" />
+ <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="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" />
@@ -333,6 +345,14 @@
<attribute name="method" value="0" />
<attribute name="URI" value="/WEB-INF/lib/hivemind-1.1.1.jar" />
</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" />
+ </containerElement>
+ <containerElement type="library" name="Maven Dependency: javax.portlet:portlet-api:jar:1.0:provided" level="module">
+ <attribute name="method" value="0" />
+ <attribute name="URI" value="/WEB-INF/lib/portlet-api-1.0.jar" />
+ </containerElement>
<containerElement type="library" name="Maven Dependency: javax.servlet:servlet-api:jar:2.4:provided" level="module">
<attribute name="method" value="0" />
<attribute name="URI" value="<N/A>" />
@@ -341,8 +361,20 @@
<attribute name="method" value="0" />
<attribute name="URI" value="/WEB-INF/lib/javassist-3.4.ga.jar" />
</containerElement>
+ <containerElement type="library" name="Maven Dependency: jboss:jboss-j2ee:jar:4.0.2:compile" level="module">
+ <attribute name="method" value="0" />
+ <attribute name="URI" value="/WEB-INF/lib/jboss-j2ee-4.0.2.jar" />
+ </containerElement>
+ <containerElement type="library" name="Maven Dependency: jboss:jboss-j2ee:jar:4.0.2:optional" level="module">
+ <attribute name="method" value="0" />
+ <attribute name="URI" value="/WEB-INF/lib/jboss-j2ee-4.0.2.jar" />
+ </containerElement>
<containerElement type="library" name="Maven Dependency: jboss:jboss-j2ee:jar:4.0.2:provided" level="module">
- <attribute name="method" value="1" />
+ <attribute name="method" value="0" />
+ <attribute name="URI" value="/WEB-INF/lib/jboss-j2ee-4.0.2.jar" />
+ </containerElement>
+ <containerElement type="library" name="Maven Dependency: jboss:jboss-j2ee:jar:4.0.2:runtime" level="module">
+ <attribute name="method" value="0" />
<attribute name="URI" value="/WEB-INF/lib/jboss-j2ee-4.0.2.jar" />
</containerElement>
<containerElement type="library" name="Maven Dependency: jcharts:jcharts:jar:0.6.0:compile" level="module">
@@ -369,6 +401,10 @@
<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="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" />
@@ -416,6 +452,18 @@
<containerElement type="library" name="Maven Dependency: oro:oro:jar:2.0.8:compile" level="module">
<attribute name="method" value="0" />
<attribute name="URI" value="/WEB-INF/lib/oro-2.0.8.jar" />
+ </containerElement>
+ <containerElement type="library" name="Maven Dependency: portlet-api:portlet-api:jar:1.0:compile" level="module">
+ <attribute name="method" value="0" />
+ <attribute name="URI" value="/WEB-INF/lib/portlet-api-1.0.jar" />
+ </containerElement>
+ <containerElement type="library" name="Maven Dependency: xerces:xercesImpl:jar:2.0.2:compile" level="module">
+ <attribute name="method" value="0" />
+ <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="/WEB-INF/lib/xml-apis-1.0.b2.jar" />
</containerElement>
<deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/context/WEB-INF/web.xml" optional="false" version="2.3" />
<webroots>
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/IRequestCycle.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/IRequestCycle.java?view=diff&rev=519664&r1=519663&r2=519664
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/IRequestCycle.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/IRequestCycle.java Sun Mar 18 11:41:58 2007
@@ -14,13 +14,13 @@
package org.apache.tapestry;
-import java.util.Iterator;
-
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.tapestry.engine.IEngineService;
import org.apache.tapestry.services.Infrastructure;
import org.apache.tapestry.services.ResponseBuilder;
+import java.util.Iterator;
+
/**
* Controller object that manages a single request cycle. A request cycle is one 'hit' on the web
* server. In the case of a Tapestry application, this will involve:
@@ -71,12 +71,17 @@
* Passes the String through
* {@link javax.servlet.http.HttpServletResponse#encodeURL(java.lang.String)}, which ensures
* that the session id is encoded in the URL (if necessary).
+ *
+ * @param URL The url to encode.
+ * @return The encoded form of the url.
*/
String encodeURL(String URL);
/**
* Returns the engine which is processing this request cycle.
+ *
+ * @return The engine.
*/
IEngine getEngine();
@@ -85,12 +90,17 @@
* Retrieves a previously stored attribute, returning null if not found. Attributes allow
* components to locate each other; primarily they allow a wrapped component to locate a
* component which wraps it. Attributes are cleared at the end of the render (or rewind).
+ *
+ * @param name The name of the attribute to retrieve.
+ * @return The matching attribute with the specified name, or null if none found.
*/
Object getAttribute(String name);
/**
* Identifies the active page, the page which will ultimately render the response.
+ *
+ * @return The active page.
*/
IPage getPage();
@@ -99,6 +109,9 @@
* Returns the page with the given name. If the page has been previously loaded in the current
* request cycle, that page is returned. Otherwise, the engine's page loader is used to load the
* page.
+ *
+ * @param name The page to get a reference to.
+ * @return The page instance.
*
* @throws PageNotFoundException
* if the page does not exist.
@@ -111,6 +124,8 @@
/**
* Returns true if the context is being used to rewind a prior state of the page. This is only
* true when there is a target action id.
+ *
+ * @return True if rewinding a form, false otherwise.
*/
boolean isRewinding();
@@ -121,6 +136,9 @@
* <p>
* If theres a match on action id, then the component is compared against the target component.
* If there's a mismatch then a {@link StaleLinkException}is thrown.
+ *
+ * @param component The component to check.
+ * @return True if the specified component has been rewound.
*/
boolean isRewound(IComponent component);
@@ -197,6 +215,8 @@
/**
* Removes a previously stored attribute, if one with the given name exists.
+ *
+ * @param name The key name of the attribute to remove.
*/
void removeAttribute(String name);
@@ -205,6 +225,8 @@
* Renders the given page. Applications should always use this method to render the page, rather
* than directly invoking {@link IPage#render(IMarkupWriter, IRequestCycle)}since the request
* cycle must perform some setup before rendering.
+ *
+ * @param builder Renders the currently active page using the specified builder.
*/
void renderPage(ResponseBuilder builder);
@@ -219,6 +241,9 @@
* request cycle, and components it wraps can locate it by that name.
* <p>
* Attributes are cleared at the end of each render or rewind phase.
+ *
+ * @param name Key name of the attribute to store.
+ * @param value Value of the attribute.
*/
void setAttribute(String name, Object value);
@@ -235,7 +260,8 @@
/**
* Returns the service which initiated this request cycle.
- *
+ *
+ * @return The service associated with current request.
* @since 1.0.1
*/
@@ -244,8 +270,8 @@
/**
* Used by {@link IForm forms}to perform a <em>partial</em> rewind so as to respond to the
* form submission (using the direct service).
- * <p>
- * Note: the targetActionId parameter was removed in release 4.0.
+ *
+ * @param form The form to rewind.
*
* @since 1.0.2
*/
@@ -267,7 +293,9 @@
* Invoked by a {@link IEngineService service} to store an array of application-specific
* parameters. These can later be retrieved (typically, by an application-specific listener
* method) by invoking {@link #getListenerParameters()}.
- *
+ *
+ * @param parameters The parameters to set which will be available as method parameters
+ * to any listeners invoked in this request.
* @see org.apache.tapestry.engine.DirectService
* @since 4.0
*/
@@ -275,7 +303,8 @@
/**
* Returns parameters previously stored by {@link #setListenerParameters(Object[])}.
- *
+ *
+ * @return The current set of bound listener parameters for the current service.
* @since 4.0
*/
@@ -284,7 +313,8 @@
/**
* A convienience for invoking {@link #activate(IPage)}. Invokes {@link #getPage(String)}to
* get an instance of the named page.
- *
+ *
+ * @param name The name of the page to activate.
* @since 3.0
*/
@@ -305,7 +335,9 @@
* Validation loops can occur, where page A redirects to page B and then page B redirects back
* to page A (possibly with intermediate steps). This is detected and results in an
* {@link ApplicationRuntimeException}.
- *
+ *
+ * @param page The page to activate.
+ *
* @since 3.0
*/
void activate(IPage page);
@@ -313,7 +345,9 @@
/**
* Returns a query parameter value, or null if not provided in the request. If multiple values
* are provided, returns the first value.
- *
+ *
+ * @param name The name of the request parameter to retrieve.
+ * @return The value matching the specified parameter name, or null if none found.
* @since 4.0
*/
String getParameter(String name);
@@ -321,7 +355,9 @@
/**
* Returns all query parameter values for the given name. Returns null if no values were
* provided.
- *
+ *
+ * @param name The name of the parameters to retrieve.
+ * @return The matching multi value array for the specified name, or null if none found.
* @since 4.0
*/
String[] getParameters(String name);
@@ -330,7 +366,9 @@
* Converts a partial URL into an absolute URL. Prefixes the provided URL with servlet context
* path (if any), then expands it to a full URL by prepending with the scheme, server and port
* (determined from the current {@link org.apache.tapestry.web.WebRequest request}.
- *
+ *
+ * @param partialURL The url to modify into an absolute url.
+ * @return The converted absolute url representation of the specified partialURL.
* @since 4.0
*/
@@ -340,7 +378,8 @@
* Forgets any stored changes to the specified page. If the page has already been loaded (and
* rolled back) then the loaded page instance is not affected; if the page is only loaded
* subsequently, the page instance will not see any persisted property changes.
- *
+ *
+ * @param name The name of the page instance to throw all persistent properties away for.
* @since 4.0
*/
@@ -349,7 +388,8 @@
/**
* Returns the central {@link org.apache.tapestry.services.Infrastructure} object used to
* manage the processing of the request.
- *
+ *
+ * @return The {@link Infrastructure} object associated with this request.
* @since 4.0
*/
@@ -381,7 +421,8 @@
/**
* Sends a redirect to the client web browser. This is currently a convinience for constructing
* and throwing a {@link RedirectException}, but may change in a later release.
- *
+ *
+ * @param URL The url to send a client redirect for.
* @since 4.0
* @throws RedirectException
*/
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/Identity.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/Identity.java?view=diff&rev=519664&r1=519663&r2=519664
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/Identity.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/Identity.java Sun Mar 18 11:41:58 2007
@@ -22,13 +22,13 @@
import org.apache.tapestry.json.JSONLiteral;
import org.apache.tapestry.json.JSONObject;
import org.apache.tapestry.valid.ValidationConstants;
+import org.apache.tapestry.valid.ValidationConstraint;
import org.apache.tapestry.valid.ValidationStrings;
import org.apache.tapestry.valid.ValidatorException;
-import org.apache.tapestry.valid.ValidationConstraint;
/**
* Validates that the input value is the same as the value of another field.
- * This validator can also work in 'differ' mode.
+ * This validator can also work in 'differ' mode.
* <p/>
* Apply this validator to the second field in question and define the name
* of the component against which to compare the current value.
@@ -36,6 +36,7 @@
* @since 4.1.2
*/
public class Identity extends BaseValidator {
+
private String _fieldName;
private int _matchType;
private String _identityMessage;
@@ -43,17 +44,18 @@
private static final int DIFFER = 0;
private static final int MATCH = 1;
-
- public Identity() {
+ public Identity()
+ {
super();
}
-
- public Identity(String initializer) {
+ public Identity(String initializer)
+ {
super(initializer);
}
- public String toString(IFormComponent field, Object value) {
+ public String toString(IFormComponent field, Object value)
+ {
if (value == null)
return null;
@@ -61,7 +63,8 @@
}
public void validate(IFormComponent field, ValidationMessages messages, Object object)
- throws ValidatorException {
+ throws ValidatorException
+ {
IFormComponent referent = (IFormComponent) field.getContainer().getComponent(_fieldName);
Object referentValue = referent.getBinding("value").getObject();
@@ -72,57 +75,67 @@
throw new ValidatorException(buildIdentityMessage(messages, field, referent),
ValidationConstraint.CONSISTENCY);
}
-
+
public void renderContribution(IMarkupWriter writer, IRequestCycle cycle,
- FormComponentContributorContext context, IFormComponent field)
+ FormComponentContributorContext context, IFormComponent field)
{
- if(field.isDisabled())
+ if (field.isDisabled())
return;
-
+
IFormComponent referent = (IFormComponent) field.getContainer().getComponent(_fieldName);
-
+
JSONObject profile = context.getProfile();
-
+
if (!profile.has(ValidationConstants.CONSTRAINTS)) {
profile.put(ValidationConstants.CONSTRAINTS, new JSONObject());
}
JSONObject cons = profile.getJSONObject(ValidationConstants.CONSTRAINTS);
-
- String func = (_matchType == MATCH) ?
- "tapestry.form.validation.isEqual" :
- "tapestry.form.validation.isNotEqual";
-
- accumulateProperty(cons, field.getClientId(),
+
+ String func = (_matchType == MATCH) ?
+ "tapestry.form.validation.isEqual" :
+ "tapestry.form.validation.isNotEqual";
+
+ accumulateProperty(cons, field.getClientId(),
new JSONLiteral("[" + func + ",\""
- + referent.getClientId() + "\"]"));
+ + referent.getClientId() + "\"]"));
// could define and use a new ValidationConstants.CONFIRM here to apply to
// the profile, but it doesn't support differ.
- accumulateProfileProperty(field, profile,
- ValidationConstants.CONSTRAINTS, buildIdentityMessage(context, field, referent));
+ accumulateProfileProperty(field, profile,
+ ValidationConstants.CONSTRAINTS, buildIdentityMessage(context, field, referent));
}
- public String getMatch() {
+ public String getMatch()
+ {
return _fieldName;
}
- public void setMatch(String field) {
+ public void setMatch(String field)
+ {
_fieldName = field;
_matchType = MATCH;
}
- public String getDiffer() {
+ public String getDiffer()
+ {
return _fieldName;
}
- public void setDiffer(String field) {
+ public void setDiffer(String field)
+ {
_fieldName = field;
_matchType = DIFFER;
}
- /** @since 3.0 */
- public String getIdentityMessage() {
+ /**
+ * Get the validation message.
+ *
+ * @return The message configured for this validator, will be null unless configured
+ * via {@link #setIdentityMessage(String)}.
+ */
+ public String getIdentityMessage()
+ {
return _identityMessage;
}
@@ -130,30 +143,33 @@
* Overrides the <code>field-too-short</code> bundle key. Parameter {0} is the minimum length.
* Parameter {1} is the display name of the field.
*
- * @since 3.0
+ * @param message The message to set for this validator.
*/
- public void setIdentityMessage(String string) {
- _identityMessage = string;
+ public void setIdentityMessage(String message)
+ {
+ _identityMessage = message;
}
- /** @since 3.0 */
-
- protected String buildIdentityMessage(ValidationMessages messages, IFormComponent field, IFormComponent referent) {
+
+ protected String buildIdentityMessage(ValidationMessages messages, IFormComponent field, IFormComponent referent)
+ {
Object[] parameters = new Object[]{
field.getDisplayName(), new Integer(_matchType), referent.getDisplayName()
};
+
return messages.formatValidationMessage(_identityMessage,
ValidationStrings.INVALID_FIELD_EQUALITY, parameters);
-
}
- private boolean notEqual(Object o1, Object o2) {
+ private boolean notEqual(Object o1, Object o2)
+ {
if (o1 == null && o2 == null)
return false;
if (o1 == null || o2 == null)
return true;
+
return !o1.equals(o2);
}
-}
\ No newline at end of file
+}
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=519664&r1=519663&r2=519664
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-portlet/tapestry-portlet.iml (original)
+++ tapestry/tapestry4/trunk/tapestry-portlet/tapestry-portlet.iml Sun Mar 18 11:41:58 2007
@@ -12,7 +12,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-framework" />
<orderEntry type="module-library">
Modified: tapestry/tapestry4/trunk/tapestry.iml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry.iml?view=diff&rev=519664&r1=519663&r2=519664
==============================================================================
--- tapestry/tapestry4/trunk/tapestry.iml (original)
+++ tapestry/tapestry4/trunk/tapestry.iml Sun Mar 18 11:41:58 2007
@@ -29,14 +29,17 @@
<sourceFolder url="file://$MODULE_DIR$/tapestry-portlet/src/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/tapestry-portlet/src/test" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/bin" />
+ <excludeFolder url="file://$MODULE_DIR$/tapestry-annotations" />
<excludeFolder url="file://$MODULE_DIR$/tapestry-annotations/target" />
- <excludeFolder url="file://$MODULE_DIR$/tapestry-contrib/target" />
+ <excludeFolder url="file://$MODULE_DIR$/tapestry-contrib" />
+ <excludeFolder url="file://$MODULE_DIR$/tapestry-examples" />
<excludeFolder url="file://$MODULE_DIR$/tapestry-examples/TimeTracker/target" />
<excludeFolder url="file://$MODULE_DIR$/tapestry-examples/Vlib/target" />
<excludeFolder url="file://$MODULE_DIR$/tapestry-examples/VlibBeans/target" />
<excludeFolder url="file://$MODULE_DIR$/tapestry-examples/Workbench/target" />
<excludeFolder url="file://$MODULE_DIR$/tapestry-examples/target" />
- <excludeFolder url="file://$MODULE_DIR$/tapestry-framework/target" />
+ <excludeFolder url="file://$MODULE_DIR$/tapestry-framework" />
+ <excludeFolder url="file://$MODULE_DIR$/tapestry-portlet" />
<excludeFolder url="file://$MODULE_DIR$/tapestry-portlet/target" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
Modified: tapestry/tapestry4/trunk/tapestry.ipr
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry.ipr?view=diff&rev=519664&r1=519663&r2=519664
==============================================================================
--- tapestry/tapestry4/trunk/tapestry.ipr (original)
+++ tapestry/tapestry4/trunk/tapestry.ipr Sun Mar 18 11:41:58 2007
@@ -113,7 +113,7 @@
<component name="JavacSettings">
<option name="DEBUGGING_INFO" value="true" />
<option name="GENERATE_NO_WARNINGS" value="false" />
- <option name="DEPRECATION" value="true" />
+ <option name="DEPRECATION" value="false" />
<option name="ADDITIONAL_OPTIONS_STRING" value="" />
<option name="MAXIMUM_HEAP_SIZE" value="128" />
</component>
@@ -175,6 +175,7 @@
<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" />
@@ -183,6 +184,7 @@
<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" />
@@ -190,7 +192,15 @@
<entry>
<value>
<collection type="java.util.TreeSet">
- <entry type="java.lang.String" value="tapestry" />
+ <entry type="java.lang.String" value="tapestry-framework" />
+ </collection>
+ </value>
+ <key type="java.lang.String" value="tapestry" />
+ </entry>
+ <entry>
+ <value>
+ <collection type="java.util.TreeSet">
+ <entry type="java.lang.String" value="tapestry-framework" />
</collection>
</value>
<key type="java.lang.String" value="tapestry-annotations" />
@@ -198,7 +208,7 @@
<entry>
<value>
<collection type="java.util.TreeSet">
- <entry type="java.lang.String" value="tapestry" />
+ <entry type="java.lang.String" value="tapestry-framework" />
</collection>
</value>
<key type="java.lang.String" value="tapestry-contrib" />
@@ -206,7 +216,7 @@
<entry>
<value>
<collection type="java.util.TreeSet">
- <entry type="java.lang.String" value="tapestry" />
+ <entry type="java.lang.String" value="tapestry-framework" />
</collection>
</value>
<key type="java.lang.String" value="tapestry-portlet" />
Modified: tapestry/tapestry4/trunk/tapestry.iws
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry.iws?view=diff&rev=519664&r1=519663&r2=519664
==============================================================================
--- tapestry/tapestry4/trunk/tapestry.iws (original)
+++ tapestry/tapestry4/trunk/tapestry.iws Sun Mar 18 11:41:58 2007
@@ -18,11 +18,28 @@
<component name="ChangeListManager">
<list default="true" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry.iws" afterPath="$PROJECT_DIR$/tapestry.iws" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/config/jboss/data/hypersonic/localDB.properties" afterPath="" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry-contrib/pom.xml" afterPath="$PROJECT_DIR$/tapestry-contrib/pom.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry-annotations/tapestry-annotations.iml" afterPath="$PROJECT_DIR$/tapestry-annotations/tapestry-annotations.iml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry.ipr" afterPath="$PROJECT_DIR$/tapestry.ipr" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/config/jboss/data/hypersonic/localDB.script" afterPath="" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/form/validator/Identity.java" afterPath="$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/form/validator/Identity.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-examples/Workbench/Workbench.iml" afterPath="$PROJECT_DIR$/tapestry-examples/Workbench/Workbench.iml" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/tapestry-contrib/.cvsignore" afterPath="" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/site/apt/usersguide/validation.apt" afterPath="$PROJECT_DIR$/src/site/apt/usersguide/validation.apt" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/tapestry-portlet/.cvsignore" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/config/.cvsignore" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/config/jboss" afterPath="" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry-contrib/tapestry-contrib.iml" afterPath="$PROJECT_DIR$/tapestry-contrib/tapestry-contrib.iml" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/config/jboss/data/hypersonic" afterPath="" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/IRequestCycle.java" afterPath="$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/IRequestCycle.java" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/config/jboss/deploy" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/tapestry-examples/Workbench/.cvsignore" afterPath="" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry.iml" afterPath="$PROJECT_DIR$/tapestry.iml" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/.cvsignore" afterPath="" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry-portlet/tapestry-portlet.iml" afterPath="$PROJECT_DIR$/tapestry-portlet/tapestry-portlet.iml" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/config/jboss/data" afterPath="" />
</list>
</component>
<component name="ChangesViewManager" flattened_view="true" />
@@ -196,6 +213,48 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
</PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="tapestry.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="tapestry" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="tapestry.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="tapestry" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="tapestry.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="tapestry" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/config" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
</subPane>
</component>
<component name="ProjectReloadState">
@@ -220,6 +279,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="true" />
<property name="MemberChooser.sorted" value="false" />
<property name="MemberChooser.showClasses" value="true" />
<property name="GoToClass.includeLibraries" value="false" />
@@ -230,136 +291,27 @@
<option name="SHOW_DIALOG" value="true" />
</component>
<component name="RecentsManager" />
- <component name="RestoreUpdateTree">
- <UpdateInfo date="3/18/07 11:24 AM" ActionInfo="Chec_k Status">
- <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" />
- </FILE-GROUP>
- <FILE-GROUP>
- <option name="myUpdateName" value="UpdatedOnServer" />
- <option name="myStatusName" value="Modified on Server" />
- <option name="mySupportsDeletion" value="true" />
- <option name="myCanBeAbsent" value="false" />
- <option name="myId" value="Modified On Server" />
- </FILE-GROUP>
- <FILE-GROUP>
- <option name="myUpdateName" value="ReplacedOnServer" />
- <option name="myStatusName" value="Replaced on Server" />
- <option name="mySupportsDeletion" value="true" />
- <option name="myCanBeAbsent" value="false" />
- <option name="myId" value="Replaced On Server" />
- </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" />
- <PATH>$PROJECT_DIR$/tapestry-annotations/tapestry-annotations.iml</PATH>
- <PATH>$PROJECT_DIR$/tapestry-examples/TimeTracker/TimeTracker.iml</PATH>
- <PATH>$PROJECT_DIR$/tapestry-examples/Workbench/Workbench.iml</PATH>
- <PATH>$PROJECT_DIR$/tapestry-portlet/tapestry-portlet.iml</PATH>
- <PATH>$PROJECT_DIR$/tapestry.iml</PATH>
- <PATH>$PROJECT_DIR$/tapestry.iws</PATH>
- </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="RestoreUpdateTree" />
<component name="RunManager" selected="TestNG.ExternalServiceTest">
<tempConfiguration default="false" name="ExternalServiceTest" 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.engine" />
<option name="MAIN_CLASS_NAME" value="org.apache.tapestry.engine.ExternalServiceTest" />
<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" />
@@ -374,21 +326,17 @@
<option name="HOST" value="localhost" />
<option name="PORT" value="5005" />
</configuration>
- <configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false">
+ <configuration default="true" type="Applet" factoryName="Applet">
<module name="" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- <option name="PACKAGE_NAME" />
<option name="MAIN_CLASS_NAME" />
- <option name="METHOD_NAME" />
- <option name="TEST_OBJECT" value="class" />
+ <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="PARAMETERS" />
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
- <option name="ADDITIONAL_CLASS_PATH" />
- <option name="TEST_SEARCH_SCOPE">
- <value defaultName="wholeProject" />
- </option>
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
</configuration>
<configuration default="true" type="TestNG" factoryName="TestNG" enabled="false" merge="false">
<module name="" />
@@ -414,17 +362,21 @@
<option name="Make" value="true" />
</method>
</configuration>
- <configuration default="true" type="Applet" factoryName="Applet">
+ <configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false">
<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" />
+ <option name="PACKAGE_NAME" />
+ <option name="MAIN_CLASS_NAME" />
+ <option name="METHOD_NAME" />
+ <option name="TEST_OBJECT" value="class" />
+ <option name="VM_PARAMETERS" />
+ <option name="PARAMETERS" />
+ <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+ <option name="ADDITIONAL_CLASS_PATH" />
+ <option name="TEST_SEARCH_SCOPE">
+ <value defaultName="wholeProject" />
+ </option>
</configuration>
<configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false">
<option name="MAIN_CLASS_NAME" />
@@ -507,7 +459,7 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="84" y="151" width="2112" height="1362" extended-state="0" />
+ <frame x="67" y="150" width="2112" height="1362" extended-state="0" />
<editor active="false" />
<layout>
<window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
@@ -517,7 +469,7 @@
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" 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="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.20995851" 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" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="1" />
@@ -526,10 +478,10 @@
<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.19376826" order="0" />
+ <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.26224068" order="2" />
+ <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2620232" 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" />
@@ -546,15 +498,15 @@
</component>
<component name="VcsManagerConfiguration">
<option name="OFFER_MOVE_TO_ANOTHER_CHANGELIST_ON_PARTIAL_COMMIT" value="true" />
- <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="true" />
+ <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
<option name="PERFORM_UPDATE_IN_BACKGROUND" value="false" />
<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" />
+ <option name="LAST_COMMIT_MESSAGE" value="Minor code cleanup, removal of old .cvsignore properties." />
<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="false" />
+ <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="true" />
<option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="false" />
<option name="REFORMAT_BEFORE_FILE_COMMIT" value="false" />
<option name="FILE_HISTORY_DIALOG_COMMENTS_SPLITTER_PROPORTION" value="0.8" />
@@ -564,74 +516,135 @@
<option name="UPDATE_GROUP_BY_PACKAGES" value="false" />
<option name="SHOW_FILE_HISTORY_AS_TREE" value="false" />
<option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
+ <MESSAGE value="Cleaned up shared idea properties." />
+ <MESSAGE value="Minor code cleanup, removal of old .cvsignore properties." />
</component>
<component name="antWorkspaceConfiguration">
<option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
<option name="FILTER_TARGETS" value="false" />
</component>
- <component name="com.intellij.ide.util.scopeChooser.ScopeChooserConfigurable" proportions="" version="1">
- <option name="myLastEditedConfigurable" />
+ <component name="com.intellij.ide.util.scopeChooser.ScopeChooserConfigurable" proportions="0.16666667" version="1">
+ <option name="myLastEditedConfigurable" value="Shared Scopes" />
</component>
- <component name="com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectRootMasterDetailsConfigurable" proportions="0.22673559" version="1">
+ <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="Workbench" />
+ <option name="myLastEditedConfigurable" value="tapestry" />
</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/descriptor/META-INF/tapestry.coerce.xml">
+ <entry file="file://$PROJECT_DIR$/tapestry-examples/TimeTracker/src/java/org/apache/tapestry/timetracker/servlet/ConfigurationServlet.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="22" column="2" selection-start="948" selection-end="948" vertical-scroll-proportion="-0.67717206">
+ <state line="30" column="7" selection-start="1044" selection-end="1044" vertical-scroll-proportion="0.17887564">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/tapestry-framework/src/test/org/apache/tapestry/engine/EngineServiceLinkTest.java">
+ <entry file="file://$PROJECT_DIR$/tapestry-framework/src/conf/log4j.properties">
<provider selected="true" editor-type-id="text-editor">
- <state line="47" column="0" selection-start="1507" selection-end="1507" vertical-scroll-proportion="0.012776831">
+ <state line="25" column="0" selection-start="926" selection-end="926" vertical-scroll-proportion="0.31942078">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/tapestry-examples/Vlib/src/java/org/apache/tapestry/vlib/services/ModelSource.java">
+ <entry file="file://$PROJECT_DIR$/tapestry-framework/src/site/apt/index.apt">
<provider selected="true" editor-type-id="text-editor">
- <state line="38" column="0" selection-start="1262" selection-end="1262" vertical-scroll-proportion="0.3321976">
+ <state line="12" column="0" selection-start="244" selection-end="244" vertical-scroll-proportion="0.15332198">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/tapestry-framework/src/test/org/apache/tapestry/engine/ResetServiceTest.java">
+ <entry file="file://$PROJECT_DIR$/tapestry-framework/src/scripts/TestDefaultParameterValues.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="49" column="0" selection-start="1580" selection-end="1580" vertical-scroll-proportion="0.35775128">
+ <state line="30" column="19" selection-start="914" selection-end="914" vertical-scroll-proportion="0.38330495">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/tapestry-examples/Vlib/src/java/org/apache/tapestry/vlib/EntitySelectionModel.java">
+ <entry file="file://$PROJECT_DIR$/tapestry-framework/src/js/build.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="38" column="0" selection-start="1224" selection-end="1224" vertical-scroll-proportion="0.2810903">
+ <state line="27" column="4" selection-start="1021" selection-end="1021" vertical-scroll-proportion="0.34497446">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/tapestry-examples/VlibBeans/src/java/org/apache/tapestry/vlib/ejb/impl/AbstractEntityBean.java">
+ <entry file="file://$PROJECT_DIR$/tapestry-framework/src/js/tapestry.profile.js">
<provider selected="true" editor-type-id="text-editor">
- <state line="62" column="5" selection-start="1886" selection-end="1886" vertical-scroll-proportion="0.42163545">
+ <state line="20" column="0" selection-start="708" selection-end="708" vertical-scroll-proportion="0.25553662">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/tapestry-examples/TimeTracker/src/java/org/apache/tapestry/timetracker/servlet/ConfigurationServlet.java">
+ <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/ConfigurationDefaults.properties">
<provider selected="true" editor-type-id="text-editor">
- <state line="30" column="7" selection-start="1044" selection-end="1044" vertical-scroll-proportion="0.17887564">
+ <state line="17" column="0" selection-start="738" selection-end="738" vertical-scroll-proportion="0.21720614">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/ComponentEvent.script">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="24" column="21" selection-start="1002" selection-end="1002" vertical-scroll-proportion="0.30664396">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/package.html">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="44" column="0" selection-start="1576" selection-end="1576" vertical-scroll-proportion="0.5749129">
+ <folding />
+ </state>
+ </provider>
+ <provider editor-type-id="HtmlPreview">
+ <state />
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/IRequestCycle.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="40" column="3" selection-start="1487" selection-end="1487" vertical-scroll-proportion="-0.051107325">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/tapestry-contrib/pom.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="16" column="4" selection-start="647" selection-end="647" vertical-scroll-proportion="0.2044293">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/form/validator/Identity.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="127" column="5" selection-start="4265" selection-end="4265" vertical-scroll-proportion="0.2640545">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/form/FormEventType.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">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/tapestry-examples/Workbench/src/context/WEB-INF/Fields.page">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="50" column="0" selection-start="2037" selection-end="2037" vertical-scroll-proportion="0.06729131">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/site/apt/usersguide/validation.apt">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="168" column="0" selection-start="9264" selection-end="9264" vertical-scroll-proportion="0.5340811">
<folding />
</state>
</provider>
</entry>
</component>
<component name="testng.defaultConfiguration">
- <outputDirectory>/tmp</outputDirectory>
+ <outputDirectory />
<properties />
</component>
</project>