You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2007/11/12 23:23:28 UTC
svn commit: r594319 [27/40] - in /tapestry/tapestry5/trunk: ./
tapestry-annotations/
tapestry-annotations/src/main/java/org/apache/tapestry/beaneditor/
tapestry-annotations/src/site/ tapestry-component-report/
tapestry-component-report/src/main/java/or...
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry/tapestry.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry/tapestry.js?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry/tapestry.js (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry/tapestry.js Mon Nov 12 14:22:31 2007
@@ -14,122 +14,138 @@
var Tapestry = {
- registerForm : function(form) {
- form = $(form);
-
- form.errorDiv = $(form.id + ':errors');
-
- if (form.errorDiv) {
- Tapestry.hideInvisible(form.errorDiv);
-
- form.errorList = form.errorDiv.getElementsBySelector("ul").first();
- if (! form.errorList) {
- // create it now
- form.errorList = document.createElement("ul");
- form.errorDiv.appendChild(form.errorList);
- }
- }
+ registerForm : function(form)
+ {
+ form = $(form);
+
+ form.errorDiv = $(form.id + ':errors');
+
+ if (form.errorDiv)
+ {
+ Tapestry.hideInvisible(form.errorDiv);
+
+ form.errorList = form.errorDiv.getElementsBySelector("ul").first();
+ if (! form.errorList)
+ {
+ // create it now
+ form.errorList = document.createElement("ul");
+ form.errorDiv.appendChild(form.errorList);
+ }
+ }
// This can probably be cleaned up with bind() ...
-
- form.onsubmit = function() {
- var event = new Tapestry.FormEvent(form);
-
- form.firstError = true;
-
- if (form.errorList) {
- form.errorList.innerHTML = "";
- }
+
+ form.onsubmit = function()
+ {
+ var event = new Tapestry.FormEvent(form);
+
+ form.firstError = true;
+
+ if (form.errorList)
+ {
+ form.errorList.innerHTML = "";
+ }
// Locate elements that have an event manager (and therefore, validations)
- // and let those validations execute, which may result in calls to recordError().
-
- form.getElements().each(function(element) {
- if (element.fieldEventManager != undefined) {
- event.field = element;
- element.fieldEventManager.validateInput(event);
-
- if (event.abort) throw $break;
- }
- });
+ // and let those validations execute, which may result in calls to recordError().
+
+ form.getElements().each(function(element)
+ {
+ if (element.fieldEventManager != undefined)
+ {
+ event.field = element;
+ element.fieldEventManager.validateInput(event);
+
+ if (event.abort) throw $break;
+ }
+ });
// On a failure result, display the error div.
-
- if (form.errorDiv) {
- if (event.result) {
- if (form.errorDiv.visible())
- new Effect.BlindUp(form.errorDiv);
- }
- else if (! form.errorDiv.visible()) {
- new Effect.BlindDown(form.errorDiv);
- }
- }
-
- return event.result;
- };
-
- form.recordError = function(field, event, message) {
-
- if (form.firstError) {
- field = $(field);
- if (field.focus) field.focus();
- if (field.select) field.select();
-
- form.firstError = false;
- }
-
- field.decorateForValidationError(event, message);
-
- if (form.errorList)
- new Insertion.Bottom(form.errorList, "<li>" + message + "</li>");
-
- };
- },
-
- // Checks the element; if it has the "t-invisible" CSS class, then
- // the element is hidden,and the t-invisible CSS class is removed. This is necessary
- // for Prototype's visible() method, which can't determine visibility when it's defined via
- // CSS.
-
- hideInvisible : function(element) {
- element = $(element);
-
- if (element.classNames().include("t-invisible")) {
- element.hide();
- element.removeClassName("t-invisible");
+
+ if (form.errorDiv)
+ {
+ if (event.result)
+ {
+ if (form.errorDiv.visible())
+ new Effect.BlindUp(form.errorDiv);
+ }
+ else if (! form.errorDiv.visible())
+ {
+ new Effect.BlindDown(form.errorDiv);
+ }
+ }
+
+ return event.result;
+ };
+
+ form.recordError = function(field, event, message)
+ {
+
+ if (form.firstError)
+ {
+ field = $(field);
+ if (field.focus) field.focus();
+ if (field.select) field.select();
+
+ form.firstError = false;
+ }
+
+ field.decorateForValidationError(event, message);
+
+ if (form.errorList)
+ new Insertion.Bottom(form.errorList, "<li>" + message + "</li>");
+
+ };
+ },
+
+// Checks the element; if it has the "t-invisible" CSS class, then
+// the element is hidden,and the t-invisible CSS class is removed. This is necessary
+// for Prototype's visible() method, which can't determine visibility when it's defined via
+// CSS.
+
+ hideInvisible : function(element)
+ {
+ element = $(element);
+
+ if (element.classNames().include("t-invisible"))
+ {
+ element.hide();
+ element.removeClassName("t-invisible");
+ }
+ },
+
+ FormEvent : Class.create(),
+
+ FieldEventManager : Class.create(),
+
+// Adds a validator for a field. A FieldEventManager is added, if necessary.
+// The validator will be called only for non-blank values, unless acceptBlank is
+// true (in most cases, acceptBlank is flase). The validator is a function
+// that accepts the current field value as its first parameter, and a
+// Tapestry.FormEvent as its second. It can invoke recordError() on the event
+// if the input is not valid.
+
+ addValidator : function(field, acceptBlank, validator)
+ {
+ field = $(field);
+
+ if (field.fieldEventManager == undefined) new Tapestry.FieldEventManager(field);
+
+ field.fieldEventManager.addValidator(acceptBlank, validator);
}
- },
-
- FormEvent : Class.create(),
-
- FieldEventManager : Class.create(),
-
- // Adds a validator for a field. A FieldEventManager is added, if necessary.
- // The validator will be called only for non-blank values, unless acceptBlank is
- // true (in most cases, acceptBlank is flase). The validator is a function
- // that accepts the current field value as its first parameter, and a
- // Tapestry.FormEvent as its second. It can invoke recordError() on the event
- // if the input is not valid.
-
- addValidator : function(field, acceptBlank, validator) {
- field = $(field);
-
- if (field.fieldEventManager == undefined) new Tapestry.FieldEventManager(field);
-
- field.fieldEventManager.addValidator(acceptBlank, validator);
- }
-
+
};
// New methods added to Element.
Tapestry.ElementAdditions = {
- // This is added to all Elements, but really only applys to form control elements. This method is invoked
- // when a validation error is associated with a field. This gives the field a chance to decorate itself, its label
- // and its icon.
- decorateForValidationError : function (element, event, message) {
- $(element).fieldEventManager.addDecorations(event, message);
- }
+// This is added to all Elements, but really only applys to form control elements. This method is invoked
+// when a validation error is associated with a field. This gives the field a chance to decorate itself, its label
+// and its icon.
+ decorateForValidationError : function (element, event, message)
+ {
+ $(element).fieldEventManager.addDecorations(event, message);
+ }
};
Element.addMethods(Tapestry.ElementAdditions);
@@ -137,50 +153,62 @@
// Collection of field based functions related to validation.
Tapestry.Field = {
- required : function(field, message) {
- Tapestry.addValidator(field, true, function(value, event) {
- if (value == '')
- event.recordError(message);
- });
- },
-
- minlength : function(field, length, message) {
- Tapestry.addValidator(field, false, function(value, event) {
- if (value.length < length)
- event.recordError(message);
- });
- },
-
- maxlength : function(field, maxlength, message) {
- Tapestry.addValidator(field, false, function(value, event) {
- if (value.length > maxlength)
- event.recordError(message);
- });
- },
-
- min : function(field, minValue, message) {
- Tapestry.addValidator(field, false, function(value, event) {
- if (value < minValue)
- event.recordError(message);
- });
- },
-
- max : function(field, maxValue, message) {
- Tapestry.addValidator(field, false, function(value, event) {
- if (value > maxValue)
- event.recordError(message);
- });
- },
-
- regexp : function(field, pattern, message) {
- var regexp = new RegExp(pattern);
-
- Tapestry.addValidator(field, false, function(value, event) {
-
- if (! regexp.test(value))
- event.recordError(message);
- });
- }
+ required : function(field, message)
+ {
+ Tapestry.addValidator(field, true, function(value, event)
+ {
+ if (value == '')
+ event.recordError(message);
+ });
+ },
+
+ minlength : function(field, length, message)
+ {
+ Tapestry.addValidator(field, false, function(value, event)
+ {
+ if (value.length < length)
+ event.recordError(message);
+ });
+ },
+
+ maxlength : function(field, maxlength, message)
+ {
+ Tapestry.addValidator(field, false, function(value, event)
+ {
+ if (value.length > maxlength)
+ event.recordError(message);
+ });
+ },
+
+ min : function(field, minValue, message)
+ {
+ Tapestry.addValidator(field, false, function(value, event)
+ {
+ if (value < minValue)
+ event.recordError(message);
+ });
+ },
+
+ max : function(field, maxValue, message)
+ {
+ Tapestry.addValidator(field, false, function(value, event)
+ {
+ if (value > maxValue)
+ event.recordError(message);
+ });
+ },
+
+ regexp : function(field, pattern, message)
+ {
+ var regexp = new RegExp(pattern);
+
+ Tapestry.addValidator(field, false, function(value, event)
+ {
+
+ if (! regexp.test(value))
+ event.recordError(message);
+ });
+ }
};
@@ -191,120 +219,130 @@
Tapestry.FormEvent.prototype = {
- initialize : function(form) {
- this.form = $(form);
- this.result = true;
- },
-
- // Invoked by a validator function (which is passed the event) to record an error
- // for the associated field. The event knows the field and form and invoke's
- // the (added) form method invalidField(). Sets the event's result field to false
- // (i.e., don't allow the form to submit), and sets the event's error field to
- // true.
-
- recordError : function(message) {
- this.form.recordError(this.field, this, message);
- this.result = false;
- this.error = true;
- }
+ initialize : function(form)
+ {
+ this.form = $(form);
+ this.result = true;
+ },
+
+// Invoked by a validator function (which is passed the event) to record an error
+// for the associated field. The event knows the field and form and invoke's
+// the (added) form method invalidField(). Sets the event's result field to false
+// (i.e., don't allow the form to submit), and sets the event's error field to
+// true.
+
+ recordError : function(message)
+ {
+ this.form.recordError(this.field, this, message);
+ this.result = false;
+ this.error = true;
+ }
};
Tapestry.FieldEventManager.prototype = {
- initialize : function(field) {
- this.field = $(field);
-
- field.fieldEventManager = this;
-
- this.validators = [ ];
-
- var id = field.id;
- this.label = $(id + ':label');
- this.icon = $(id + ':icon');
- if (this.icon)
- Tapestry.hideInvisible(this.icon);
-
- },
-
- // Adds a validator. acceptBlank is true if the validator should be invoked regardless of
- // the value. Usually acceptBlank is false, meaning that the validator will be skipped if
- // the field's value is blank. The validator itself is a function that is passed the
- // field's value and the Tapestry.FormEvent object. When a validator invokes event.recordError(),
- // any subsequent validators for that field are skipped.
-
- addValidator : function(acceptBlank, validator) {
- this.validators.push([ acceptBlank, validator]);
- },
-
- // Removes decorations on the field and label (the "t-error" CSS class) and makes the icon
- // invisible. A field that has special decoration needs will override this method.
-
- removeDecorations : function(event) {
- this.field.removeClassName("t-error");
-
- if (this.label)
- this.label.removeClassName("t-error");
-
- if (this.icon)
- this.icon.hide();
- },
-
- // Adds decorations to the field (including label and icon if present).
- // event - the validation event
- // message - error message
-
- addDecorations : function(event, message) {
-
- this.field.addClassName("t-error");
-
- if (this.label)
- this.label.addClassName("t-error");
-
- if (this.icon) {
- if (! this.icon.visible())
- new Effect.Appear(this.icon);
- }
-
- },
-
+ initialize : function(field)
+ {
+ this.field = $(field);
+
+ field.fieldEventManager = this;
+
+ this.validators = [ ];
+
+ var id = field.id;
+ this.label = $(id + ':label');
+ this.icon = $(id + ':icon');
+ if (this.icon)
+ Tapestry.hideInvisible(this.icon);
- // Invoked from the Form's onsubmit event handler. Gets the fields value and invokes
- // each validator (unless the value is blank) until a validator returns false. Validators
- // should not modify the field's value.
-
- validateInput : function(event) {
- // Clear out old decorations. It's easier to remove the decorations
- // and then re-add them if the field is in error than it is to
- // toggle them on or off at the end.
-
- event.field.removeClassName("t-error");
-
- if (this.label)
- this.label.removeClassName("t-error");
-
- var value = $F(event.field);
- var isBlank = (value == '');
-
- event.error = false;
-
- this.validators.each(function(tuple) {
-
- var acceptBlank = tuple[0];
- var validator = tuple[1];
-
- if (acceptBlank || !isBlank) {
-
- validator(value, event);
+ },
+
+// Adds a validator. acceptBlank is true if the validator should be invoked regardless of
+// the value. Usually acceptBlank is false, meaning that the validator will be skipped if
+// the field's value is blank. The validator itself is a function that is passed the
+// field's value and the Tapestry.FormEvent object. When a validator invokes event.recordError(),
+// any subsequent validators for that field are skipped.
+
+ addValidator : function(acceptBlank, validator)
+ {
+ this.validators.push([ acceptBlank, validator]);
+ },
+
+// Removes decorations on the field and label (the "t-error" CSS class) and makes the icon
+// invisible. A field that has special decoration needs will override this method.
+
+ removeDecorations : function(event)
+ {
+ this.field.removeClassName("t-error");
+
+ if (this.label)
+ this.label.removeClassName("t-error");
+
+ if (this.icon)
+ this.icon.hide();
+ },
+
+// Adds decorations to the field (including label and icon if present).
+// event - the validation event
+// message - error message
+
+ addDecorations : function(event, message)
+ {
+
+ this.field.addClassName("t-error");
+
+ if (this.label)
+ this.label.addClassName("t-error");
+
+ if (this.icon)
+ {
+ if (! this.icon.visible())
+ new Effect.Appear(this.icon);
+ }
+
+ },
+
+
+// Invoked from the Form's onsubmit event handler. Gets the fields value and invokes
+// each validator (unless the value is blank) until a validator returns false. Validators
+// should not modify the field's value.
+
+ validateInput : function(event)
+ {
+ // Clear out old decorations. It's easier to remove the decorations
+ // and then re-add them if the field is in error than it is to
+ // toggle them on or off at the end.
+
+ event.field.removeClassName("t-error");
+
+ if (this.label)
+ this.label.removeClassName("t-error");
+
+ var value = $F(event.field);
+ var isBlank = (value == '');
+
+ event.error = false;
+
+ this.validators.each(function(tuple)
+ {
+
+ var acceptBlank = tuple[0];
+ var validator = tuple[1];
+
+ if (acceptBlank || !isBlank)
+ {
+
+ validator(value, event);
// event.error is set by Tapestry.FormEvent.recordError().
-
- if (event.error) throw $break;
- }
- });
-
- if (! event.error)
- this.removeDecorations(event);
- }
+
+ if (event.error) throw $break;
+ }
+ });
+
+ if (! event.error)
+ this.removeDecorations(event);
+ }
};
Modified: tapestry/tapestry5/trunk/tapestry-core/src/site/site.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/site/site.xml?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/site/site.xml (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/site/site.xml Mon Nov 12 14:22:31 2007
@@ -1,58 +1,57 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- Copyright 2006, 2007 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
+<!--
+ Copyright 2006, 2007 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
<project name="Tapestry Core">
<bannerLeft>
<name>Tapestry 5</name>
- <href>http://tapestry.apache.org/tapestry5/</href>
+ <href>http://tapestry.apache.org/tapestry5/</href>
<src>images/tapestry_banner.gif</src>
</bannerLeft>
<bannerRight>
<name>Apache</name>
<href>http://www.apache.org</href>
<src>images/asf_logo_wide.gif</src>
- </bannerRight>
- <skin>
- <groupId>org.apache.tapestry</groupId>
- <artifactId>maven-skin</artifactId>
- <version>1.1</version>
- </skin>
-
- <publishDate format="dd MMM yyyy" />
-
- <body>
-
-
-
-<!--
-
-This is probably useful but it drives me crazy whenever I reload a page.
-
- <head>
- <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
- <script type="text/javascript">_uacct = "UA-400821-1"; urchinTracker();</script>
- </head>
- -->
+ </bannerRight>
+ <skin>
+ <groupId>org.apache.tapestry</groupId>
+ <artifactId>maven-skin</artifactId>
+ <version>1.1</version>
+ </skin>
+
+ <publishDate format="dd MMM yyyy"/>
+
+ <body>
+
+
+ <!--
+
+ This is probably useful but it drives me crazy whenever I reload a page.
+
+ <head>
+ <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
+ <script type="text/javascript">_uacct = "UA-400821-1"; urchinTracker();</script>
+ </head>
+ -->
<menu name="Tapestry Core">
<item name="Introduction" href="/index.html"/>
<item name="Component Reference" href="component-parameters.html"/>
<item name="Upgrade from Tapestry 4" href="/upgrade.html"/>
<item name="Download" href="http://tapestry.apache.org/download.html"/>
- </menu>
+ </menu>
<menu name="User Guide">
<item name="Component Classes" href="guide/component-classes.html"/>
@@ -61,7 +60,7 @@
<item name="Page Navigation" href="guide/pagenav.html"/>
<item name="Input Validation" href="guide/validation.html"/>
<item name="BeanEditForm Guide" href="guide/beaneditform.html"/>
- <item name="Component Events" href="guide/event.html"/>
+ <item name="Component Events" href="guide/event.html"/>
<item name="Page Lifecycle" href="guide/lifecycle.html"/>
<item name="Component Mixins" href="guide/mixins.html"/>
<item name="Localization" href="guide/localization.html"/>
@@ -69,19 +68,19 @@
<item name="Type Coercion" href="guide/coercion.html"/>
<item name="Component Rendering" href="guide/rendering.html"/>
<item name="Persistent Data" href="guide/persist.html"/>
- <item name="Application State" href="guide/appstate.html"/>
+ <item name="Application State" href="guide/appstate.html"/>
<item name="Injection" href="guide/inject.html"/>
<item name="Aliases" href="guide/alias.html"/>
<item name="Configuration" href="guide/conf.html"/>
<item name="Request Processing" href="guide/request.html"/>
<item name="DOM" href="guide/dom.html"/>
- <item name="Class Reloading" href="guide/reload.html"/>
- <item name="Unit testing pages/components" href="guide/unit-testing-pages.html"/>
- <item name="Logging" href="guide/logging.html"/>
+ <item name="Class Reloading" href="guide/reload.html"/>
+ <item name="Unit testing pages/components" href="guide/unit-testing-pages.html"/>
+ <item name="Logging" href="guide/logging.html"/>
<item name="Service Status" href="guide/servicestatus.html"/>
- </menu>
-
- <menu ref="reports"/>
-
- </body>
+ </menu>
+
+ <menu ref="reports"/>
+
+ </body>
</project>
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/app1/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/app1/WEB-INF/web.xml?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/app1/WEB-INF/web.xml (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/app1/WEB-INF/web.xml Mon Nov 12 14:22:31 2007
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2006 The Apache Software Foundation
@@ -15,14 +15,14 @@
limitations under the License.
-->
-<!DOCTYPE web-app
- PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd">
+<!DOCTYPE web-app
+ PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd">
<web-app>
- <display-name>Integration Test App 1</display-name>
- <context-param>
- <param-name>tapestry.app-package</param-name>
- <param-value>org.apache.tapestry.integration.app1</param-value>
+ <display-name>Integration Test App 1</display-name>
+ <context-param>
+ <param-name>tapestry.app-package</param-name>
+ <param-value>org.apache.tapestry.integration.app1</param-value>
</context-param>
<filter>
<filter-name>app</filter-name>
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/app2/css/test.css
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/app2/css/test.css?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/app2/css/test.css (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/app2/css/test.css Mon Nov 12 14:22:31 2007
@@ -1,3 +1,3 @@
.foo {
- display: none;
+ display: none;
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/conf/testng.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/conf/testng.xml?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/conf/testng.xml (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/conf/testng.xml Mon Nov 12 14:22:31 2007
@@ -16,38 +16,38 @@
-->
<suite name="Tapestry Core" annotations="1.5" verbose="0">
- <test name="Integration Tests">
- <packages>
- <package name="org.apache.tapestry.integration"/>
- </packages>
- </test>
- <test name="Public APIs">
- <packages>
- <package name="org.apache.tapestry"/>
- <package name="org.apache.tapestry.integration.pagelevel"/>
- <package name="org.apache.tapestry.corelib.components"/>
- <package name="org.apache.tapestry.corelib.internal"/>
- <package name="org.apache.tapestry.dom"/>
- <package name="org.apache.tapestry.json"/>
- <package name="org.apache.tapestry.services"/>
- <package name="org.apache.tapestry.util"/>
- <package name="org.apache.tapestry.runtime"/>
- <package name="org.apache.tapestry.translator"/>
- <package name="org.apache.tapestry.validator"/>
- </packages>
- </test>
- <test name="Internal APIs">
- <packages>
- <package name="org.apache.internal"/>
- <package name="org.apache.tapestry.internal"/>
- <package name="org.apache.tapestry.internal.beaneditor"/>
- <package name="org.apache.tapestry.internal.grid"/>
- <package name="org.apache.tapestry.internal.services"/>
- <package name="org.apache.tapestry.internal.structure"/>
- <package name="org.apache.tapestry.internal.util"/>
- <package name="org.apache.tapestry.internal.bindings"/>
- <package name="org.apache.tapestry.internal.model"/>
- <package name="org.apache.tapestry.internal.test"/>
- </packages>
- </test>
+ <test name="Integration Tests">
+ <packages>
+ <package name="org.apache.tapestry.integration"/>
+ </packages>
+ </test>
+ <test name="Public APIs">
+ <packages>
+ <package name="org.apache.tapestry"/>
+ <package name="org.apache.tapestry.integration.pagelevel"/>
+ <package name="org.apache.tapestry.corelib.components"/>
+ <package name="org.apache.tapestry.corelib.internal"/>
+ <package name="org.apache.tapestry.dom"/>
+ <package name="org.apache.tapestry.json"/>
+ <package name="org.apache.tapestry.services"/>
+ <package name="org.apache.tapestry.util"/>
+ <package name="org.apache.tapestry.runtime"/>
+ <package name="org.apache.tapestry.translator"/>
+ <package name="org.apache.tapestry.validator"/>
+ </packages>
+ </test>
+ <test name="Internal APIs">
+ <packages>
+ <package name="org.apache.internal"/>
+ <package name="org.apache.tapestry.internal"/>
+ <package name="org.apache.tapestry.internal.beaneditor"/>
+ <package name="org.apache.tapestry.internal.grid"/>
+ <package name="org.apache.tapestry.internal.services"/>
+ <package name="org.apache.tapestry.internal.structure"/>
+ <package name="org.apache.tapestry.internal.util"/>
+ <package name="org.apache.tapestry.internal.bindings"/>
+ <package name="org.apache.tapestry.internal.model"/>
+ <package name="org.apache.tapestry.internal.test"/>
+ </packages>
+ </test>
</suite>
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/conf/webdefault.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/conf/webdefault.xml?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/conf/webdefault.xml (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/conf/webdefault.xml Mon Nov 12 14:22:31 2007
@@ -1,177 +1,294 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- Copyright 2006 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<web-app
- xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
- version="2.4">
-
- <description>
- Default web.xml file.
- This file is applied to a Web application before it's own WEB_INF/web.xml file
- </description>
-
-
-
- <!-- ==================================================================== -->
- <!-- Context params to control Session Cookies -->
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
- <!-- UNCOMMENT TO ACTIVATE
- <context-param>
- <param-name>org.mortbay.jetty.servlet.SessionDomain</param-name>
- <param-value>127.0.0.1</param-value>
- </context-param>
-
- <context-param>
- <param-name>org.mortbay.jetty.servlet.SessionPath</param-name>
- <param-value>/</param-value>
- </context-param>
-
- <context-param>
- <param-name>org.mortbay.jetty.servlet.MaxAge</param-name>
- <param-value>-1</param-value>
- </context-param>
- -->
-
-
-
- <!-- ==================================================================== -->
- <!-- The default servlet. -->
- <!-- This servlet, normally mapped to /, provides the handling for static -->
- <!-- content, OPTIONS and TRACE methods for the context. -->
- <!-- The following initParameters are supported: -->
- <!-- -->
- <!-- acceptRanges If true, range requests and responses are -->
- <!-- supported -->
- <!-- -->
- <!-- dirAllowed If true, directory listings are returned if no -->
- <!-- welcome file is found. Else 403 Forbidden. -->
- <!-- -->
- <!-- putAllowed If true, the PUT method is allowed -->
- <!-- -->
- <!-- delAllowed If true, the DELETE method is allowed -->
- <!-- -->
- <!-- redirectWelcome If true, redirect welcome file requests -->
- <!-- else use request dispatcher forwards -->
- <!-- -->
- <!-- minGzipLength If set to a positive integer, then static content -->
- <!-- larger than this will be served as gzip content -->
- <!-- encoded if a matching resource is found ending -->
- <!-- with ".gz" -->
- <!-- -->
- <!-- resoureBase Can be set to replace the context resource base -->
- <!-- -->
- <!-- relativeResourceBase -->
- <!-- Set with a pathname relative to the base of the -->
- <!-- servlet context root. Useful for only serving -->
- <!-- static content from only specific subdirectories. -->
- <!-- -->
- <!-- The MOVE method is allowed if PUT and DELETE are allowed -->
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
- <servlet>
- <servlet-name>default</servlet-name>
- <servlet-class>org.mortbay.jetty.servlet.Default</servlet-class>
- <init-param>
- <param-name>acceptRanges</param-name>
- <param-value>true</param-value>
- </init-param>
- <init-param>
- <param-name>dirAllowed</param-name>
- <param-value>true</param-value>
- </init-param>
- <init-param>
- <param-name>putAllowed</param-name>
- <param-value>false</param-value>
- </init-param>
- <init-param>
- <param-name>delAllowed</param-name>
- <param-value>false</param-value>
- </init-param>
- <init-param>
- <param-name>redirectWelcome</param-name>
- <param-value>false</param-value>
- </init-param>
- <init-param>
- <param-name>minGzipLength</param-name>
- <param-value>8192</param-value>
- </init-param>
- <load-on-startup>0</load-on-startup>
- </servlet>
-
-
- <servlet-mapping> <servlet-name>default</servlet-name> <url-pattern>/</url-pattern> </servlet-mapping>
-
- <!-- ==================================================================== -->
- <session-config>
- <session-timeout>30</session-timeout>
- </session-config>
-
-
- <!-- ==================================================================== -->
- <welcome-file-list>
- <welcome-file>index.html</welcome-file>
- <welcome-file>index.htm</welcome-file>
- </welcome-file-list>
-
- <!-- ==================================================================== -->
- <locale-encoding-mapping-list>
- <locale-encoding-mapping><locale>ar</locale><encoding>ISO-8859-6</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>be</locale><encoding>ISO-8859-5</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>bg</locale><encoding>ISO-8859-5</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>ca</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>cs</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>da</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>de</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>el</locale><encoding>ISO-8859-7</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>en</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>es</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>et</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>fi</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>fr</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>hr</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>hu</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>is</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>it</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>iw</locale><encoding>ISO-8859-8</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>ja</locale><encoding>Shift_JIS</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>ko</locale><encoding>EUC-KR</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>lt</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>lv</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>mk</locale><encoding>ISO-8859-5</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>nl</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>no</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>pl</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>pt</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>ro</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>ru</locale><encoding>ISO-8859-5</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>sh</locale><encoding>ISO-8859-5</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>sk</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>sl</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>sq</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>sr</locale><encoding>ISO-8859-5</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>sv</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>tr</locale><encoding>ISO-8859-9</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>uk</locale><encoding>ISO-8859-5</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>zh</locale><encoding>GB2312</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>zh_TW</locale><encoding>Big5</encoding></locale-encoding-mapping>
- </locale-encoding-mapping-list>
+<!--
+ Copyright 2006 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<web-app
+ xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+ version="2.4">
+
+ <description>
+ Default web.xml file.
+ This file is applied to a Web application before it's own WEB_INF/web.xml file
+ </description>
+
+
+ <!-- ==================================================================== -->
+ <!-- Context params to control Session Cookies -->
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+ <!-- UNCOMMENT TO ACTIVATE
+ <context-param>
+ <param-name>org.mortbay.jetty.servlet.SessionDomain</param-name>
+ <param-value>127.0.0.1</param-value>
+ </context-param>
+
+ <context-param>
+ <param-name>org.mortbay.jetty.servlet.SessionPath</param-name>
+ <param-value>/</param-value>
+ </context-param>
+
+ <context-param>
+ <param-name>org.mortbay.jetty.servlet.MaxAge</param-name>
+ <param-value>-1</param-value>
+ </context-param>
+ -->
+
+
+ <!-- ==================================================================== -->
+ <!-- The default servlet. -->
+ <!-- This servlet, normally mapped to /, provides the handling for static -->
+ <!-- content, OPTIONS and TRACE methods for the context. -->
+ <!-- The following initParameters are supported: -->
+ <!-- -->
+ <!-- acceptRanges If true, range requests and responses are -->
+ <!-- supported -->
+ <!-- -->
+ <!-- dirAllowed If true, directory listings are returned if no -->
+ <!-- welcome file is found. Else 403 Forbidden. -->
+ <!-- -->
+ <!-- putAllowed If true, the PUT method is allowed -->
+ <!-- -->
+ <!-- delAllowed If true, the DELETE method is allowed -->
+ <!-- -->
+ <!-- redirectWelcome If true, redirect welcome file requests -->
+ <!-- else use request dispatcher forwards -->
+ <!-- -->
+ <!-- minGzipLength If set to a positive integer, then static content -->
+ <!-- larger than this will be served as gzip content -->
+ <!-- encoded if a matching resource is found ending -->
+ <!-- with ".gz" -->
+ <!-- -->
+ <!-- resoureBase Can be set to replace the context resource base -->
+ <!-- -->
+ <!-- relativeResourceBase -->
+ <!-- Set with a pathname relative to the base of the -->
+ <!-- servlet context root. Useful for only serving -->
+ <!-- static content from only specific subdirectories. -->
+ <!-- -->
+ <!-- The MOVE method is allowed if PUT and DELETE are allowed -->
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+ <servlet>
+ <servlet-name>default</servlet-name>
+ <servlet-class>org.mortbay.jetty.servlet.Default</servlet-class>
+ <init-param>
+ <param-name>acceptRanges</param-name>
+ <param-value>true</param-value>
+ </init-param>
+ <init-param>
+ <param-name>dirAllowed</param-name>
+ <param-value>true</param-value>
+ </init-param>
+ <init-param>
+ <param-name>putAllowed</param-name>
+ <param-value>false</param-value>
+ </init-param>
+ <init-param>
+ <param-name>delAllowed</param-name>
+ <param-value>false</param-value>
+ </init-param>
+ <init-param>
+ <param-name>redirectWelcome</param-name>
+ <param-value>false</param-value>
+ </init-param>
+ <init-param>
+ <param-name>minGzipLength</param-name>
+ <param-value>8192</param-value>
+ </init-param>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
+
+
+ <servlet-mapping>
+ <servlet-name>default</servlet-name>
+ <url-pattern>/</url-pattern>
+ </servlet-mapping>
+
+ <!-- ==================================================================== -->
+ <session-config>
+ <session-timeout>30</session-timeout>
+ </session-config>
+
+
+ <!-- ==================================================================== -->
+ <welcome-file-list>
+ <welcome-file>index.html</welcome-file>
+ <welcome-file>index.htm</welcome-file>
+ </welcome-file-list>
+
+ <!-- ==================================================================== -->
+ <locale-encoding-mapping-list>
+ <locale-encoding-mapping>
+ <locale>ar</locale>
+ <encoding>ISO-8859-6</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>be</locale>
+ <encoding>ISO-8859-5</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>bg</locale>
+ <encoding>ISO-8859-5</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>ca</locale>
+ <encoding>ISO-8859-1</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>cs</locale>
+ <encoding>ISO-8859-2</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>da</locale>
+ <encoding>ISO-8859-1</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>de</locale>
+ <encoding>ISO-8859-1</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>el</locale>
+ <encoding>ISO-8859-7</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>en</locale>
+ <encoding>ISO-8859-1</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>es</locale>
+ <encoding>ISO-8859-1</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>et</locale>
+ <encoding>ISO-8859-1</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>fi</locale>
+ <encoding>ISO-8859-1</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>fr</locale>
+ <encoding>ISO-8859-1</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>hr</locale>
+ <encoding>ISO-8859-2</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>hu</locale>
+ <encoding>ISO-8859-2</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>is</locale>
+ <encoding>ISO-8859-1</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>it</locale>
+ <encoding>ISO-8859-1</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>iw</locale>
+ <encoding>ISO-8859-8</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>ja</locale>
+ <encoding>Shift_JIS</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>ko</locale>
+ <encoding>EUC-KR</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>lt</locale>
+ <encoding>ISO-8859-2</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>lv</locale>
+ <encoding>ISO-8859-2</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>mk</locale>
+ <encoding>ISO-8859-5</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>nl</locale>
+ <encoding>ISO-8859-1</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>no</locale>
+ <encoding>ISO-8859-1</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>pl</locale>
+ <encoding>ISO-8859-2</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>pt</locale>
+ <encoding>ISO-8859-1</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>ro</locale>
+ <encoding>ISO-8859-2</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>ru</locale>
+ <encoding>ISO-8859-5</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>sh</locale>
+ <encoding>ISO-8859-5</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>sk</locale>
+ <encoding>ISO-8859-2</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>sl</locale>
+ <encoding>ISO-8859-2</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>sq</locale>
+ <encoding>ISO-8859-2</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>sr</locale>
+ <encoding>ISO-8859-5</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>sv</locale>
+ <encoding>ISO-8859-1</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>tr</locale>
+ <encoding>ISO-8859-9</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>uk</locale>
+ <encoding>ISO-8859-5</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>zh</locale>
+ <encoding>GB2312</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>zh_TW</locale>
+ <encoding>Big5</encoding>
+ </locale-encoding-mapping>
+ </locale-encoding-mapping-list>
-
</web-app>
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/Stooge.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/Stooge.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/Stooge.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/Stooge.java Mon Nov 12 14:22:31 2007
@@ -14,6 +14,7 @@
package org.apache.tapestry;
-public enum Stooge {
+public enum Stooge
+{
MOE, LARRY, CURLY_JOE
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/TapestryUtilsTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/TapestryUtilsTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/TapestryUtilsTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/TapestryUtilsTest.java Mon Nov 12 14:22:31 2007
@@ -14,13 +14,13 @@
package org.apache.tapestry;
-import java.util.Arrays;
-import java.util.List;
-
import org.testng.Assert;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
+import java.util.Arrays;
+import java.util.List;
+
public class TapestryUtilsTest extends Assert
{
@Test(dataProvider = "string_quoting_input")
@@ -33,12 +33,12 @@
public Object[][] string_quoting_input()
{
return new Object[][]
- {
- { "Suzy said: \"It's not the proper time\".",
- "'Suzy said: \\\"It\\'s not the proper time\\\".'" },
- { "regexp: \\d{4}", "'regexp: \\\\d{4}'" },
+ {
+ {"Suzy said: \"It's not the proper time\".",
+ "'Suzy said: \\\"It\\'s not the proper time\\\".'"},
+ {"regexp: \\d{4}", "'regexp: \\\\d{4}'"},
- };
+ };
}
@Test(dataProvider = "join_input")
@@ -59,11 +59,11 @@
public Object[][] join_input()
{
return new Object[][]
- {
- { new String[0], "" },
- { new String[]
- { "fred" }, "fred" },
- { new String[]
- { "fred", "barney", "wilma" }, "barney fred wilma" } };
+ {
+ {new String[0], ""},
+ {new String[]
+ {"fred"}, "fred"},
+ {new String[]
+ {"fred", "barney", "wilma"}, "barney fred wilma"}};
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/ValidationTrackerImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/ValidationTrackerImplTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/ValidationTrackerImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/ValidationTrackerImplTest.java Mon Nov 12 14:22:31 2007
@@ -14,14 +14,14 @@
package org.apache.tapestry;
+import org.apache.tapestry.test.TapestryTestCase;
+import org.testng.annotations.Test;
+
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.util.Arrays;
-
-import org.apache.tapestry.test.TapestryTestCase;
-import org.testng.annotations.Test;
public class ValidationTrackerImplTest extends TapestryTestCase
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/corelib/components/DateFieldTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/corelib/components/DateFieldTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/corelib/components/DateFieldTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/corelib/components/DateFieldTest.java Mon Nov 12 14:22:31 2007
@@ -14,14 +14,14 @@
package org.apache.tapestry.corelib.components;
-import java.text.SimpleDateFormat;
-
import org.apache.tapestry.ComponentResources;
import org.apache.tapestry.ioc.Location;
import org.apache.tapestry.ioc.Messages;
import org.apache.tapestry.ioc.internal.util.TapestryException;
import org.apache.tapestry.test.TapestryTestCase;
import org.testng.annotations.Test;
+
+import java.text.SimpleDateFormat;
public class DateFieldTest extends TapestryTestCase
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/corelib/components/LoopTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/corelib/components/LoopTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/corelib/components/LoopTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/corelib/components/LoopTest.java Mon Nov 12 14:22:31 2007
@@ -14,12 +14,12 @@
package org.apache.tapestry.corelib.components;
-import java.util.Arrays;
-import java.util.Collections;
-
import org.apache.tapestry.internal.test.InternalBaseTestCase;
import org.apache.tapestry.services.Heartbeat;
import org.testng.annotations.Test;
+
+import java.util.Arrays;
+import java.util.Collections;
public class LoopTest extends InternalBaseTestCase
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/corelib/components/OutputTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/corelib/components/OutputTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/corelib/components/OutputTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/corelib/components/OutputTest.java Mon Nov 12 14:22:31 2007
@@ -14,18 +14,14 @@
package org.apache.tapestry.corelib.components;
-import java.text.DecimalFormat;
-import java.text.FieldPosition;
-import java.text.Format;
-import java.text.NumberFormat;
-import java.text.ParsePosition;
-import java.util.Locale;
-
import org.apache.tapestry.ComponentResources;
import org.apache.tapestry.MarkupWriter;
import org.apache.tapestry.test.TapestryTestCase;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
+
+import java.text.*;
+import java.util.Locale;
public class OutputTest extends TapestryTestCase
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/corelib/components/PageLinkTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/corelib/components/PageLinkTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/corelib/components/PageLinkTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/corelib/components/PageLinkTest.java Mon Nov 12 14:22:31 2007
@@ -30,7 +30,7 @@
MarkupWriter writer = mockMarkupWriter();
PageLink component = new PageLink();
-
+
component.setDisabled(true);
replay();
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/corelib/components/SelectTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/corelib/components/SelectTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/corelib/components/SelectTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/corelib/components/SelectTest.java Mon Nov 12 14:22:31 2007
@@ -14,15 +14,6 @@
package org.apache.tapestry.corelib.components;
-import java.io.BufferedInputStream;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
import org.apache.tapestry.MarkupWriter;
import org.apache.tapestry.OptionGroupModel;
import org.apache.tapestry.OptionModel;
@@ -38,6 +29,15 @@
import org.apache.tapestry.ioc.internal.util.CollectionFactory;
import org.testng.annotations.Test;
+import java.io.BufferedInputStream;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
/**
* Mostly, this is about how the Select component renders its {@link SelectModel}. The real nuts
* and bolts are tested in the integration tests.
@@ -106,7 +106,7 @@
// Extra cast needed for Sun compiler, not Eclipse compiler.
List<OptionModel> options = Arrays.asList((OptionModel) new OptionModelImpl("Fred", false,
- "fred", "class", "pixie"));
+ "fred", "class", "pixie"));
Select select = new Select();
@@ -155,7 +155,7 @@
public void option_groups() throws Exception
{
OptionGroupModel husbands = new OptionGroupModelImpl("Husbands", false,
- TapestryInternalUtils.toOptionModels("Fred,Barney"));
+ TapestryInternalUtils.toOptionModels("Fred,Barney"));
OptionGroupModel wives = new OptionGroupModelImpl("Wives", true, TapestryInternalUtils
.toOptionModels("Wilma,Betty"));
List<OptionGroupModel> groupModels = CollectionFactory.newList(husbands, wives);
@@ -181,12 +181,12 @@
public void option_groups_precede_ungroup_options() throws Exception
{
OptionGroupModel husbands = new OptionGroupModelImpl("Husbands", false,
- TapestryInternalUtils.toOptionModels("Fred,Barney"));
+ TapestryInternalUtils.toOptionModels("Fred,Barney"));
Select select = new Select();
select.setModel(new SelectModelImpl(Collections.singletonList(husbands),
- TapestryInternalUtils.toOptionModels("Wilma,Betty")));
+ TapestryInternalUtils.toOptionModels("Wilma,Betty")));
select.setValueEncoder(new StringValueEncoder());
select.setValue("Fred");
@@ -207,7 +207,8 @@
Map<String, String> attributes = Collections.singletonMap("class", "pixie");
OptionGroupModel husbands = new OptionGroupModelImpl("Husbands", false,
- TapestryInternalUtils.toOptionModels("Fred,Barney"), attributes);
+ TapestryInternalUtils.toOptionModels("Fred,Barney"),
+ attributes);
Select select = new Select();
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/dom/DOMTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/dom/DOMTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/dom/DOMTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/dom/DOMTest.java Mon Nov 12 14:22:31 2007
@@ -43,7 +43,9 @@
assertEquals(d.toString(), "<empty/>");
}
- /** Also demonstrates that attributes are provided in alphabetical order. */
+ /**
+ * Also demonstrates that attributes are provided in alphabetical order.
+ */
@Test
public void document_with_root_element_and_attributes() throws Exception
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/dom/XMLMarkupModel.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/dom/XMLMarkupModel.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/dom/XMLMarkupModel.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/dom/XMLMarkupModel.java Mon Nov 12 14:22:31 2007
@@ -14,11 +14,15 @@
package org.apache.tapestry.dom;
-/** Used for some testing where we want a model with XML style semantics. */
+/**
+ * Used for some testing where we want a model with XML style semantics.
+ */
public final class XMLMarkupModel extends DefaultMarkupModel
{
- /** Always returns ABBREVIATE. */
+ /**
+ * Always returns ABBREVIATE.
+ */
@Override
public EndTagStyle getEndTagStyle(String element)
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/IntegrationTests.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/IntegrationTests.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/IntegrationTests.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/IntegrationTests.java Mon Nov 12 14:22:31 2007
@@ -14,11 +14,6 @@
package org.apache.tapestry.integration;
-import java.io.BufferedInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.net.URL;
-
import org.apache.tapestry.corelib.mixins.RenderDisabled;
import org.apache.tapestry.internal.services.InjectContainerWorker;
import org.apache.tapestry.ioc.Resource;
@@ -26,12 +21,17 @@
import org.apache.tapestry.test.AbstractIntegrationTestSuite;
import org.testng.annotations.Test;
+import java.io.BufferedInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.net.URL;
+
/**
* Note: If these tests fail with BindException when starting Jetty, it could be Skype. At least on
* my system, Skype is listening on localhost:80.
*/
@Test(timeOut = 50000, sequential = true, groups =
-{ "integration" })
+ {"integration"})
public class IntegrationTests extends AbstractIntegrationTestSuite
{
public IntegrationTests()
@@ -168,7 +168,8 @@
// And exception message:
- assertTextPresent("Component InjectContainerMismatch is not assignable to field org.apache.tapestry.corelib.mixins.RenderDisabled._field (of type org.apache.tapestry.Field).");
+ assertTextPresent(
+ "Component InjectContainerMismatch is not assignable to field org.apache.tapestry.corelib.mixins.RenderDisabled._field (of type org.apache.tapestry.Field).");
}
@Test
@@ -196,7 +197,7 @@
start("InstanceMixin");
final String[] dates =
- { "Jun 13, 1999", "Jul 15, 2001", "Dec 4, 2005" };
+ {"Jun 13, 1999", "Jul 15, 2001", "Dec 4, 2005"};
for (String date : dates)
{
@@ -309,7 +310,8 @@
{
start("RenderPhaseOrder");
- assertTextPresent("[BEGIN-TRACER-MIXIN BEGIN-ABSTRACT-TRACER BEGIN-TRACER BODY AFTER-TRACER AFTER-ABSTRACT-TRACER AFTER-TRACER-MIXIN]");
+ assertTextPresent(
+ "[BEGIN-TRACER-MIXIN BEGIN-ABSTRACT-TRACER BEGIN-TRACER BODY AFTER-TRACER AFTER-ABSTRACT-TRACER AFTER-TRACER-MIXIN]");
}
@Test
@@ -444,7 +446,9 @@
test_loop_inside_form("ToDo List (Volatile)");
}
- /** also verifies the use of meta data to set the default strategy. */
+ /**
+ * also verifies the use of meta data to set the default strategy.
+ */
@Test
public void flash_persistence()
{
@@ -848,21 +852,25 @@
clickAndWait(clear);
clickAndWait("wilma");
- assertTextPresent("[parent.eventHandlerZero(), parent.onAction(), child.eventHandlerZeroChild(), child.onAction()]");
+ assertTextPresent(
+ "[parent.eventHandlerZero(), parent.onAction(), child.eventHandlerZeroChild(), child.onAction()]");
clickAndWait(clear);
clickAndWait("barney");
- assertTextPresent("[parent.eventHandlerOne(String), parent.eventHandlerZero(), parent.onAction(String), parent.onAction(), child.eventHandlerOneChild(), child.eventHandlerZeroChild(), child.onAction(String), child.onAction()]");
+ assertTextPresent(
+ "[parent.eventHandlerOne(String), parent.eventHandlerZero(), parent.onAction(String), parent.onAction(), child.eventHandlerOneChild(), child.eventHandlerZeroChild(), child.onAction(String), child.onAction()]");
clickAndWait(clear);
clickAndWait("betty");
- assertTextPresent("[parent.eventHandlerOne(String), parent.eventHandlerZero(), parent.onAction(String), parent.onAction(), child.eventHandlerOneChild(), child.eventHandlerZeroChild(), child.onAction(String), child.onAction()]");
+ assertTextPresent(
+ "[parent.eventHandlerOne(String), parent.eventHandlerZero(), parent.onAction(String), parent.onAction(), child.eventHandlerOneChild(), child.eventHandlerZeroChild(), child.onAction(String), child.onAction()]");
clickAndWait(clear);
clickAndWait("fred");
- assertTextPresent("[parent.eventHandlerOne(String), parent.eventHandlerZero(), parent.onAction(String), parent.onAction(), child.eventHandlerForFred(), child.eventHandlerOneChild(), child.eventHandlerZeroChild(), child.onAction(String), child.onAction(), child.onActionFromFred(String), child.onActionFromFred(), child.onAnyEventFromFred(String), child.onAnyEventFromFred()]");
+ assertTextPresent(
+ "[parent.eventHandlerOne(String), parent.eventHandlerZero(), parent.onAction(String), parent.onAction(), child.eventHandlerForFred(), child.eventHandlerOneChild(), child.eventHandlerZeroChild(), child.onAction(String), child.onAction(), child.onActionFromFred(String), child.onActionFromFred(), child.onAnyEventFromFred(String), child.onAnyEventFromFred()]");
}
@Test
@@ -1119,7 +1127,8 @@
{
start("Missing Template Demo");
- assertTextPresent("Page MissingTemplate did not generate any markup when rendered. This could be because its template file could not be located, or because a render phase method in the page prevented rendering.");
+ assertTextPresent(
+ "Page MissingTemplate did not generate any markup when rendered. This could be because its template file could not be located, or because a render phase method in the page prevented rendering.");
}
/**
@@ -1159,7 +1168,9 @@
assertTextPresent("Howard Lewis Ship", "Dec 24, 1966");
}
- /** This basically checks that the services status page does not error. */
+ /**
+ * This basically checks that the services status page does not error.
+ */
@Test
public void services_status()
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/NewIntegrationTests.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/NewIntegrationTests.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/NewIntegrationTests.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/NewIntegrationTests.java Mon Nov 12 14:22:31 2007
@@ -24,7 +24,7 @@
* totally ready, it is moved up to IntegrationTests.
*/
@Test(timeOut = 50000, sequential = true, enabled = false, groups =
-{ "integration" })
+ {"integration"})
public class NewIntegrationTests extends AbstractIntegrationTestSuite
{
public NewIntegrationTests()
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/base/BaseEventHandlerDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/base/BaseEventHandlerDemo.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/base/BaseEventHandlerDemo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/base/BaseEventHandlerDemo.java Mon Nov 12 14:22:31 2007
@@ -14,11 +14,11 @@
package org.apache.tapestry.integration.app1.base;
-import java.util.List;
-
import org.apache.tapestry.annotations.OnEvent;
import org.apache.tapestry.annotations.Persist;
import org.apache.tapestry.ioc.internal.util.CollectionFactory;
+
+import java.util.List;
public abstract class BaseEventHandlerDemo
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/Count.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/Count.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/Count.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/Count.java Mon Nov 12 14:22:31 2007
@@ -21,7 +21,7 @@
/**
* A component that can count up or count down.
- * <p>
+ * <p/>
* This is useful as a demonstration; now that the prop binding supports
* {@link IntegerRange integer ranges}, it's much less necessary.
*/
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/Outer.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/Outer.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/Outer.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/Outer.java Mon Nov 12 14:22:31 2007
@@ -15,7 +15,6 @@
package org.apache.tapestry.integration.app1.components;
import static org.apache.tapestry.TapestryConstants.LITERAL_BINDING_PREFIX;
-
import org.apache.tapestry.annotations.Parameter;
public class Outer
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/Output.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/Output.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/Output.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/Output.java Mon Nov 12 14:22:31 2007
@@ -14,12 +14,14 @@
package org.apache.tapestry.integration.app1.components;
-import java.text.Format;
-
import org.apache.tapestry.MarkupWriter;
import org.apache.tapestry.annotations.Parameter;
-/** component that formats a value and outputs it. */
+import java.text.Format;
+
+/**
+ * component that formats a value and outputs it.
+ */
public class Output
{
@Parameter(required = true)
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/Render.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/Render.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/Render.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/Render.java Mon Nov 12 14:22:31 2007
@@ -24,7 +24,7 @@
/**
* Returns the value parameter, which allows another object (presumably, a component) to render
* first.
- *
+ *
* @return
*/
Object beginRender()
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/BirthdayReminder.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/BirthdayReminder.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/BirthdayReminder.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/BirthdayReminder.java Mon Nov 12 14:22:31 2007
@@ -14,9 +14,9 @@
package org.apache.tapestry.integration.app1.data;
-import java.util.Date;
-
import org.apache.tapestry.beaneditor.Validate;
+
+import java.util.Date;
public class BirthdayReminder
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/Department.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/Department.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/Department.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/Department.java Mon Nov 12 14:22:31 2007
@@ -14,7 +14,8 @@
package org.apache.tapestry.integration.app1.data;
-public enum Department {
+public enum Department
+{
ACCOUNTING, RESEARCH_AND_DESIGN, IT, SALES_AND_MARKETING
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/IncidentData.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/IncidentData.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/IncidentData.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/IncidentData.java Mon Nov 12 14:22:31 2007
@@ -14,9 +14,9 @@
package org.apache.tapestry.integration.app1.data;
-import java.io.Serializable;
-
import org.apache.tapestry.beaneditor.Validate;
+
+import java.io.Serializable;
public class IncidentData implements Serializable
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/Sex.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/Sex.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/Sex.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/Sex.java Mon Nov 12 14:22:31 2007
@@ -14,6 +14,7 @@
package org.apache.tapestry.integration.app1.data;
-public enum Sex {
+public enum Sex
+{
MALE, FEMALE, TRANSGENDERED, MARTIAN
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/ToDoItem.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/ToDoItem.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/ToDoItem.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/ToDoItem.java Mon Nov 12 14:22:31 2007
@@ -14,10 +14,10 @@
package org.apache.tapestry.integration.app1.data;
-import java.io.Serializable;
-
import org.apache.tapestry.beaneditor.NonVisual;
import org.apache.tapestry.beaneditor.Validate;
+
+import java.io.Serializable;
public class ToDoItem implements Serializable, Cloneable
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/Track.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/Track.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/Track.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/Track.java Mon Nov 12 14:22:31 2007
@@ -14,7 +14,9 @@
package org.apache.tapestry.integration.app1.data;
-/** One track from a music library. */
+/**
+ * One track from a music library.
+ */
public class Track implements SimpleTrack
{
private String _album;
@@ -54,7 +56,9 @@
return _playCount;
}
- /** Rating as a value between 0 and 100. */
+ /**
+ * Rating as a value between 0 and 100.
+ */
public int getRating()
{
return _rating;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/Urgency.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/Urgency.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/Urgency.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/Urgency.java Mon Nov 12 14:22:31 2007
@@ -14,6 +14,7 @@
package org.apache.tapestry.integration.app1.data;
-public enum Urgency {
+public enum Urgency
+{
LOW, MEDIUM, HIGH
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/BeanEditDateDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/BeanEditDateDemo.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/BeanEditDateDemo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/BeanEditDateDemo.java Mon Nov 12 14:22:31 2007
@@ -14,9 +14,8 @@
package org.apache.tapestry.integration.app1.pages;
-import org.apache.tapestry.integration.app1.data.BirthdayReminder;
-
import org.apache.tapestry.annotations.ApplicationState;
+import org.apache.tapestry.integration.app1.data.BirthdayReminder;
public class BeanEditDateDemo
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/BeanEditorDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/BeanEditorDemo.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/BeanEditorDemo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/BeanEditorDemo.java Mon Nov 12 14:22:31 2007
@@ -22,7 +22,7 @@
public class BeanEditorDemo
{
@Component(id = "registrationData", parameters =
- { "clientValidation=clientValidation" })
+ {"clientValidation=clientValidation"})
private BeanEditForm _form;
@ApplicationState
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/BlockDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/BlockDemo.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/BlockDemo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/BlockDemo.java Mon Nov 12 14:22:31 2007
@@ -14,13 +14,13 @@
package org.apache.tapestry.integration.app1.pages;
-import java.util.Map;
-
import org.apache.tapestry.Block;
import org.apache.tapestry.annotations.Persist;
import org.apache.tapestry.annotations.Retain;
import org.apache.tapestry.ioc.annotations.Inject;
import org.apache.tapestry.ioc.internal.util.CollectionFactory;
+
+import java.util.Map;
public class BlockDemo
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ClassLoaderInspect.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ClassLoaderInspect.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ClassLoaderInspect.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ClassLoaderInspect.java Mon Nov 12 14:22:31 2007
@@ -14,6 +14,12 @@
package org.apache.tapestry.integration.app1.pages;
+import org.apache.tapestry.annotations.Component;
+import org.apache.tapestry.annotations.Persist;
+import org.apache.tapestry.corelib.components.Form;
+import org.apache.tapestry.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry.ioc.internal.util.InternalUtils;
+
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
@@ -23,12 +29,6 @@
import java.util.Enumeration;
import java.util.List;
import java.util.jar.JarEntry;
-
-import org.apache.tapestry.annotations.Component;
-import org.apache.tapestry.annotations.Persist;
-import org.apache.tapestry.corelib.components.Form;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
public class ClassLoaderInspect
{