You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2012/12/16 02:17:32 UTC

[4/50] git commit: Merge branch '5.4-js-rewrite'

Merge branch '5.4-js-rewrite'

Conflicts:
	build.gradle
	tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Alerts.java
	tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java
	tapestry-core/src/main/java/org/apache/tapestry5/test/PageTester.java
	tapestry-core/src/main/resources/org/apache/tapestry5/t5-alerts.css
	tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/AlertsTests.groovy
	tapestry-core/src/test/resources/org/apache/tapestry5/integration/app1/pages/AlertsDemo.tml
	tapestry-json/build.gradle
	tapestry-yuicompressor/build.gradle
	tapestry-yuicompressor/src/main/java/org/apache/tapestry5/internal/yuicompressor/JavaScriptResourceMinimizer.java


Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/3805b934
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/3805b934
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/3805b934

Branch: refs/heads/master
Commit: 3805b93435d9a05f984fdc3a07d83f006c4af1ce
Parents: b108e06 2f49183
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Sat Dec 15 16:23:02 2012 -0800
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Sat Dec 15 16:23:02 2012 -0800

----------------------------------------------------------------------
 54_RELEASE_NOTES.txt                               |  164 +
 54_TODO.txt                                        |   22 +
 build.gradle                                       |  566 +-
 buildSrc/build.gradle                              |   11 +
 .../main/groovy/t5build/CompileCoffeeScript.groovy |   67 +
 .../internal/plastic/MethodAdviceManager.java      |    9 +-
 .../tapestry5/plastic/MethodAdviceTests.groovy     |   34 +
 .../AdviceAndImplementationSubject.java            |    5 +
 tapestry-beanvalidator/LICENSE.txt                 |  202 +
 tapestry-beanvalidator/NOTICE.txt                  |    6 +
 tapestry-beanvalidator/build.gradle                |   27 +-
 .../modules/beanvalidator/validation.coffee        |   67 +
 .../beanvalidator/BeanValidatorModule.java         |  118 +-
 .../beanvalidator/ClientConstraintDescriptor.java  |   80 +-
 .../ClientConstraintDescriptorSource.java          |   21 +-
 .../tapestry5/internal/beanvalidator/BaseCCD.java  |   66 +
 .../internal/beanvalidator/BeanFieldValidator.java |  312 +-
 .../ClientConstraintDescriptorImpl.java            |   50 +-
 .../beanvalidator/tapestry-beanvalidator.js        |   64 -
 .../TapestryBeanValidationIntegrationTests.java    |   62 +-
 .../org/example/testapp/entities/TestEntity.java   |  164 +-
 .../testapp/pages/BeanEditFormValidationDemo.java  |    2 +
 .../testapp/pages/ClientValidationDemo.java        |   22 +-
 .../testapp/pages/FormClientValidationDemo.java    |   11 +-
 .../example/testapp/pages/FormValidationDemo.java  |    9 +
 .../test/java/org/example/testapp/pages/Index.java |    3 +
 .../example/testapp/pages/InjectValidatorDemo.java |    2 +
 .../org/example/testapp/pages/OnPrepareDemo.java   |    2 +
 .../src/test/webapp/BeanEditFormValidationDemo.tml |    2 +-
 .../src/test/webapp/ClientValidationDemo.tml       |    2 +-
 .../src/test/webapp/FormClientValidationDemo.tml   |   56 +-
 .../src/test/webapp/FormValidationDemo.tml         |   64 +-
 .../src/test/webapp/InjectValidatorDemo.tml        |    2 +-
 .../src/test/webapp/OnPrepareDemo.tml              |    2 +-
 tapestry-core/.gitignore                           |    1 +
 tapestry-core/LICENSE-bootstrap.txt                |  176 +
 tapestry-core/LICENSE-requirejs.txt                |   58 +
 tapestry-core/NOTICE.txt                           |    9 +-
 tapestry-core/build.gradle                         |   51 +-
 tapestry-core/compile-coffeescript                 |   13 +
 tapestry-core/compile-test-coffeescript            |   11 +
 .../coffeescript/META-INF/modules/core/ajax.coffee |   60 +
 .../META-INF/modules/core/ajaxformloop.coffee      |   82 +
 .../META-INF/modules/core/alert.coffee             |  125 +
 .../META-INF/modules/core/autocomplete.coffee      |   40 +
 .../META-INF/modules/core/builder.coffee           |  128 +
 .../META-INF/modules/core/console.coffee           |   98 +
 .../META-INF/modules/core/datefield.coffee         |  165 +
 .../coffeescript/META-INF/modules/core/dom.coffee  |  538 +
 .../META-INF/modules/core/events.coffee            |  158 +
 .../META-INF/modules/core/exception-display.coffee |   30 +
 .../META-INF/modules/core/exceptionframe.coffee    |   61 +
 .../META-INF/modules/core/fields.coffee            |  164 +
 .../META-INF/modules/core/form-fragment.coffee     |   80 +
 .../META-INF/modules/core/forms.coffee             |  167 +
 .../coffeescript/META-INF/modules/core/grid.coffee |   38 +
 .../coffeescript/META-INF/modules/core/init.coffee |   34 +
 .../META-INF/modules/core/messages.coffee          |   53 +
 .../META-INF/modules/core/pageinit.coffee          |  218 +
 .../META-INF/modules/core/palette.coffee           |  228 +
 .../META-INF/modules/core/pubsub.coffee            |  158 +
 .../META-INF/modules/core/select.coffee            |   30 +
 .../coffeescript/META-INF/modules/core/tree.coffee |  113 +
 .../META-INF/modules/core/utils.coffee             |   40 +
 .../META-INF/modules/core/validation.coffee        |  151 +
 .../META-INF/modules/core/zone-refresh.coffee      |   56 +
 .../coffeescript/META-INF/modules/core/zone.coffee |  120 +
 .../org/apache/tapestry5/CSSClassConstants.java    |   27 +-
 .../tapestry5/ComponentParameterConstants.java     |    7 +-
 .../java/org/apache/tapestry5/MarkupConstants.java |    5 +-
 .../java/org/apache/tapestry5/RenderSupport.java   |  200 -
 .../java/org/apache/tapestry5/SymbolConstants.java |   73 +-
 .../java/org/apache/tapestry5/TapestryFilter.java  |   27 +-
 .../org/apache/tapestry5/ValidationDecorator.java  |   15 +-
 .../java/org/apache/tapestry5/alerts/Alert.java    |    3 +-
 .../java/org/apache/tapestry5/alerts/Severity.java |    4 +-
 .../org/apache/tapestry5/annotations/Import.java   |   17 +-
 .../apache/tapestry5/corelib/ClientValidation.java |   14 +-
 .../corelib/base/AbstractComponentEventLink.java   |   19 +-
 .../tapestry5/corelib/base/AbstractField.java      |   50 +-
 .../tapestry5/corelib/base/AbstractTextField.java  |   33 +-
 .../tapestry5/corelib/base/BaseClientElement.java  |   78 +
 .../tapestry5/corelib/components/AddRowLink.java   |   18 +-
 .../tapestry5/corelib/components/AjaxFormLoop.java |  138 +-
 .../tapestry5/corelib/components/Alerts.java       |   46 +-
 .../tapestry5/corelib/components/BeanEditForm.java |    7 +
 .../tapestry5/corelib/components/Checkbox.java     |   24 +-
 .../tapestry5/corelib/components/Checklist.java    |   31 +-
 .../tapestry5/corelib/components/DateField.java    |   90 +-
 .../corelib/components/ExceptionDisplay.java       |   36 +-
 .../apache/tapestry5/corelib/components/Form.java  |   84 +-
 .../tapestry5/corelib/components/FormFragment.java |   79 +-
 .../tapestry5/corelib/components/FormInjector.java |    4 +-
 .../apache/tapestry5/corelib/components/Grid.java  |   67 +-
 .../tapestry5/corelib/components/GridColumns.java  |   48 +-
 .../tapestry5/corelib/components/GridPager.java    |   85 +-
 .../apache/tapestry5/corelib/components/Label.java |   15 +-
 .../tapestry5/corelib/components/LinkSubmit.java   |   24 +-
 .../tapestry5/corelib/components/Palette.java      |  307 +-
 .../corelib/components/ProgressiveDisplay.java     |   36 +-
 .../corelib/components/RemoveRowLink.java          |   16 +-
 .../tapestry5/corelib/components/RenderObject.java |    4 +-
 .../tapestry5/corelib/components/Select.java       |   17 +-
 .../tapestry5/corelib/components/Submit.java       |   28 +-
 .../apache/tapestry5/corelib/components/Tree.java  |  148 +-
 .../apache/tapestry5/corelib/components/Zone.java  |  116 +-
 .../corelib/internal/AjaxFormLoopContext.java      |   20 +-
 .../corelib/internal/FormSupportImpl.java          |   18 +-
 .../tapestry5/corelib/mixins/Autocomplete.java     |  181 +-
 .../corelib/mixins/RenderNotification.java         |    2 +
 .../tapestry5/corelib/mixins/TriggerFragment.java  |   13 +-
 .../tapestry5/corelib/mixins/ZoneRefresh.java      |  119 +-
 .../tapestry5/corelib/pages/ExceptionReport.java   |    4 +-
 .../tapestry5/corelib/pages/PageCatalog.java       |    9 +-
 .../java/org/apache/tapestry5/dom/Element.java     |  151 +-
 .../org/apache/tapestry5/grid/GridConstants.java   |    5 +-
 .../internal/DefaultValidationDecorator.java       |  109 -
 .../tapestry5/internal/InternalConstants.java      |   12 +-
 .../tapestry5/internal/TapestryAppInitializer.java |   67 +-
 .../internal/alerts/AlertManagerImpl.java          |    2 +-
 .../internal/bindings/AssetBindingFactory.java     |    7 +-
 .../internal/event/InvalidationEventHubImpl.java   |   59 +-
 .../internal/model/MutableComponentModelImpl.java  |   13 +-
 .../pageload/DefaultComponentResourceLocator.java  |   13 +-
 .../internal/pageload/PageLoaderImpl.java          |   46 +-
 .../internal/renderers/RequestRenderer.java        |  115 +-
 .../services/AjaxComponentEventRequestHandler.java |    9 +-
 .../AjaxLinkComponentEventResultProcessor.java     |    5 +-
 .../services/AjaxPartialResponseRenderer.java      |   16 +-
 .../services/AjaxPartialResponseRendererImpl.java  |   14 +-
 .../ApplicationMessageCatalogObjectProvider.java   |    8 +-
 .../internal/services/AssetDispatcher.java         |   18 +-
 .../internal/services/AssetInjectionProvider.java  |   17 +-
 .../internal/services/AssetSourceImpl.java         |  202 +-
 .../internal/services/BaseURLSourceImpl.java       |   57 +-
 .../services/ClientBehaviorSupportImpl.java        |  108 +-
 .../internal/services/ClientDataEncoderImpl.java   |   90 +-
 .../internal/services/ClientDataSinkImpl.java      |   19 +-
 .../internal/services/ComponentClassCacheImpl.java |   12 +-
 .../services/ComponentClassResolverImpl.java       |  106 +-
 .../services/ComponentEventLinkEncoderImpl.java    |   22 +-
 .../services/ComponentInstantiatorSourceImpl.java  |   10 +-
 .../tapestry5/internal/services/CookiesImpl.java   |   19 +-
 .../internal/services/DefaultDataTypeAnalyzer.java |    6 +-
 .../services/DefaultRequestExceptionHandler.java   |  468 +-
 .../internal/services/DelegatingMessagesImpl.java  |   61 -
 .../internal/services/DocumentLinker.java          |   47 +-
 .../internal/services/DocumentLinkerImpl.java      |  175 +-
 .../internal/services/InternalModule.java          |   95 +-
 .../services/JSONObjectEventResultProcessor.java   |   38 +-
 .../tapestry5/internal/services/MapMessages.java   |    9 +-
 .../internal/services/MetaDataLocatorImpl.java     |   22 +-
 .../internal/services/ModuleInitsManager.java      |   88 +
 .../services/NonPoolingRequestPageCacheImpl.java   |   98 -
 .../PageActivationContextCollectorImpl.java        |   13 +-
 .../internal/services/PageSourceImpl.java          |   25 +-
 .../services/PartialMarkupDocumentLinker.java      |   44 +-
 .../services/PropertyConduitSourceImpl.java        |   62 +-
 .../internal/services/RenderSupportImpl.java       |  144 -
 .../tapestry5/internal/services/RequestImpl.java   |    7 +
 .../internal/services/RequestPageCacheImpl.java    |   98 +
 .../internal/services/ResourceDigestManager.java   |    9 +-
 .../services/ResourceDigestManagerImpl.java        |   25 +-
 .../internal/services/StringInternerImpl.java      |   13 +-
 .../internal/services/TranslatorSourceImpl.java    |   16 +-
 .../services/ValidationDecoratorFactoryImpl.java   |   18 +-
 .../internal/services/ValueEncoderSourceImpl.java  |   16 +-
 .../internal/services/XMLTokenStream.java          |   13 +-
 .../services/ajax/JavaScriptSupportImpl.java       |  226 +-
 .../ajax/SingleZonePartialRendererFilter.java      |   15 +-
 .../services/assets/AssetPathConstructorImpl.java  |   33 +-
 .../internal/services/assets/DelegatingSRS.java    |   51 +
 .../services/assets/ResourceChangeTracker.java     |   15 +-
 .../services/assets/ResourceChangeTrackerImpl.java |   14 +-
 .../services/assets/SRSCachingInterceptor.java     |   26 +-
 .../assets/SRSCompressedCachingInterceptor.java    |   15 +-
 .../services/assets/SRSCompressingInterceptor.java |   10 +-
 .../services/assets/SRSMinimizingInterceptor.java  |    8 +-
 .../services/assets/StackAssetRequestHandler.java  |   21 +-
 .../assets/StreamableResourceSourceImpl.java       |   22 +-
 .../services/compatibility/CompatibilityImpl.java  |   41 +
 .../compatibility/DeprecationWarningImpl.java      |  195 +
 .../javascript/ConfigureHTMLElementFilter.java     |   65 +
 .../services/javascript/CoreJavaScriptStack.java   |  167 -
 .../services/javascript/DateFieldStack.java        |  122 -
 .../JavaScriptWrapperResourceTransformer.java      |  101 +
 .../javascript/ModuleAssetRequestHandler.java      |   89 +
 .../services/javascript/ModuleManagerImpl.java     |  223 +
 .../ClientLocalizationMessageResource.java         |  123 +
 .../apache/tapestry5/internal/structure/Page.java  |    7 +-
 .../t5internal/components/InternalLayout.java      |    2 -
 .../internal/test/TestableRequestImpl.java         |   14 +-
 .../tapestry5/internal/transform/ImportWorker.java |   80 +-
 .../internal/transform/OnEventWorker.java          |   23 +-
 .../internal/translator/NumericTranslator.java     |    9 +-
 .../translator/NumericTranslatorSupport.java       |    9 +-
 .../translator/NumericTranslatorSupportImpl.java   |   88 +-
 .../internal/util/DelegatingSymbolProvider.java    |   46 +
 .../org/apache/tapestry5/internal/util/Holder.java |    8 +
 .../tapestry5/internal/util/MacOutputStream.java   |   86 +
 .../internal/util/MessageCatalogResource.java      |  132 +
 .../tapestry5/internal/util/TeeOutputStream.java   |   73 +
 .../tapestry5/internal/util/VirtualResource.java   |  103 +
 .../org/apache/tapestry5/model/ComponentModel.java |   37 +-
 .../tapestry5/services/AssetRequestDispatcher.java |   38 +
 .../org/apache/tapestry5/services/AssetSource.java |   74 +-
 .../tapestry5/services/ClientBehaviorSupport.java  |   89 +-
 .../tapestry5/services/ClientDataEncoder.java      |   17 +-
 .../tapestry5/services/ComponentClassResolver.java |   72 +-
 .../java/org/apache/tapestry5/services/Core.java   |    9 +-
 .../tapestry5/services/DelegatingRequest.java      |    5 +
 .../org/apache/tapestry5/services/FormSupport.java |   36 +-
 .../tapestry5/services/InvalidationEventHub.java   |   24 +-
 .../tapestry5/services/InvalidationListener.java   |    3 +-
 .../apache/tapestry5/services/LibraryMapping.java  |   52 +-
 .../org/apache/tapestry5/services/Request.java     |   28 +-
 .../services/ResourceDigestGenerator.java          |    2 +
 .../apache/tapestry5/services/TapestryModule.java  |  382 +-
 .../services/ValidationDecoratorFactory.java       |    3 +-
 .../services/assets/AssetPathConstructor.java      |    9 +-
 .../services/assets/AssetRequestHandler.java       |   37 +-
 .../tapestry5/services/assets/AssetsModule.java    |   28 +-
 .../services/assets/ResourceTransformer.java       |   17 +-
 .../services/assets/StreamableResourceSource.java  |   34 +-
 .../services/compatibility/Compatibility.java      |   36 +
 .../compatibility/CompatibilityModule.java         |   45 +
 .../services/compatibility/DeprecationWarning.java |   71 +
 .../tapestry5/services/compatibility/Trait.java    |   29 +
 .../services/compatibility/package-info.java       |   20 +
 .../services/javascript/DataConstants.java         |   30 +
 .../javascript/ExtensibleJavaScriptStack.java      |   31 +-
 .../services/javascript/Initialization.java        |   57 +
 .../javascript/InitializationPriority.java         |   27 +-
 .../services/javascript/JavaScriptModule.java      |  265 +
 .../javascript/JavaScriptModuleConfiguration.java  |  145 +
 .../services/javascript/JavaScriptStack.java       |   19 +-
 .../services/javascript/JavaScriptSupport.java     |  144 +-
 .../services/javascript/ModuleManager.java         |   68 +
 .../services/javascript/StackExtensionType.java    |   30 +-
 .../pageload/ComponentResourceLocator.java         |   19 +-
 .../templates/ComponentTemplateLocator.java        |   16 +-
 .../java/org/apache/tapestry5/test/PageTester.java |   81 +-
 .../tapestry5/validator/AbstractValidator.java     |    8 +-
 .../java/org/apache/tapestry5/validator/Email.java |   36 +-
 .../java/org/apache/tapestry5/validator/Max.java   |   17 +-
 .../org/apache/tapestry5/validator/MaxLength.java  |   21 +-
 .../java/org/apache/tapestry5/validator/Min.java   |   16 +-
 .../org/apache/tapestry5/validator/MinLength.java  |   15 +-
 .../java/org/apache/tapestry5/validator/None.java  |   22 +-
 .../org/apache/tapestry5/validator/Regexp.java     |   21 +-
 .../org/apache/tapestry5/validator/Required.java   |   19 +-
 .../META-INF/assets/core/ExceptionDisplay.css      |   21 +
 .../META-INF/assets/core/ExceptionReport.css       |    3 +
 .../resources/META-INF/assets/core/Palette.css     |   44 +
 .../META-INF/assets/core/RenderObject.css          |   29 +
 .../META-INF/assets/tapestry5/ajax-loader.gif      |  Bin 0 -> 1849 bytes
 .../bootstrap_2_1_1/css/bootstrap-responsive.css   | 1058 ++
 .../tapestry5/bootstrap_2_1_1/css/bootstrap.css    | 5774 +++++++++
 .../img/glyphicons-halflings-white.png             |  Bin 0 -> 8777 bytes
 .../bootstrap_2_1_1/img/glyphicons-halflings.png   |  Bin 0 -> 12799 bytes
 .../tapestry5/bootstrap_2_1_1/js/bootstrap.js      | 2027 +++
 .../tapestry5/datepicker_106/css/datepicker.css    |  142 +
 .../tapestry5/datepicker_106/images/arrow.left.png |  Bin 0 -> 181 bytes
 .../datepicker_106/images/arrow.right.png          |  Bin 0 -> 181 bytes
 .../tapestry5/datepicker_106/js/datepicker.js      |  736 ++
 .../META-INF/assets/tapestry5/default.css          |  498 +
 .../META-INF/assets/tapestry5/deselect.png         |  Bin 0 -> 304 bytes
 .../META-INF/assets/tapestry5/exception-frame.css  |   22 +
 .../META-INF/assets/tapestry5/jquery-1.8.3.js      | 9472 +++++++++++++++
 .../META-INF/assets/tapestry5/jquery-shim.js       |   17 +
 .../META-INF/assets/tapestry5/require-2.1.1.js     | 1981 +++
 .../tapestry5/scriptaculous_1_9_0/builder.js       |  136 +
 .../tapestry5/scriptaculous_1_9_0/controls.js      |  965 ++
 .../tapestry5/scriptaculous_1_9_0/dragdrop.js      |  974 ++
 .../tapestry5/scriptaculous_1_9_0/effects.js       | 1123 ++
 .../tapestry5/scriptaculous_1_9_0/prototype.js     | 6082 +++++++++
 .../tapestry5/scriptaculous_1_9_0/scriptaculous.js |   59 +
 .../assets/tapestry5/scriptaculous_1_9_0/slider.js |  275 +
 .../assets/tapestry5/scriptaculous_1_9_0/sound.js  |   59 +
 .../tapestry5/scriptaculous_1_9_0/unittest.js      |  568 +
 .../META-INF/assets/tapestry5/t53-compatibility.js |   48 +
 .../META-INF/assets/tapestry5/tapestry-console.css |   42 +
 .../META-INF/assets/tapestry5/tapestry.css         |   14 +
 .../META-INF/assets/tapestry5/tapestry.js          |  954 ++
 .../META-INF/assets/tapestry5/tree-branch.png      |  Bin 0 -> 141 bytes
 .../META-INF/assets/tapestry5/tree-branchend.png   |  Bin 0 -> 137 bytes
 .../META-INF/assets/tapestry5/tree-sprites.png     |  Bin 0 -> 1109 bytes
 .../META-INF/assets/tapestry5/tree-vpipe.png       |  Bin 0 -> 107 bytes
 .../resources/META-INF/assets/tapestry5/tree.css   |   83 +
 .../META-INF/assets/tapestry5/underscore_1_4_2.js  | 1200 ++
 .../resources/org/apache/tapestry5/ajax-loader.gif |  Bin 1849 -> 0 bytes
 .../resources/org/apache/tapestry5/core.properties |   21 +-
 .../org/apache/tapestry5/core_fr.properties        |   45 +
 .../org/apache/tapestry5/core_fr_FR.properties     |   42 -
 .../tapestry5/corelib/components/AjaxFormLoop.tml  |   31 +-
 .../tapestry5/corelib/components/BeanDisplay.tml   |    3 +-
 .../tapestry5/corelib/components/BeanEditForm.tml  |   19 +-
 .../tapestry5/corelib/components/BeanEditor.tml    |   11 +-
 .../corelib/components/ExceptionDisplay.tml        |   56 +-
 .../apache/tapestry5/corelib/components/Grid.tml   |    4 +-
 .../tapestry5/corelib/components/GridColumns.tml   |    2 +-
 .../tapestry5/corelib/components/Palette.tml       |   47 +-
 .../corelib/components/ProgressiveDisplay.js       |   20 -
 .../corelib/components/ProgressiveDisplay.tml      |    3 +-
 .../apache/tapestry5/corelib/components/Tree.tml   |   17 +-
 .../tapestry5/corelib/components/datefield.gif     |  Bin 127 -> 0 bytes
 .../tapestry5/corelib/components/datefield.js      |  202 -
 .../corelib/components/exceptiondisplay.js         |   29 -
 .../apache/tapestry5/corelib/components/palette.js |  240 -
 .../tapestry5/corelib/mixins/zone-refresh.js       |   57 -
 .../tapestry5/corelib/pages/ExceptionReport.tml    |  129 +-
 .../tapestry5/corelib/pages/PageCatalog.properties |    2 +-
 .../apache/tapestry5/corelib/pages/PageCatalog.tml |   11 +-
 .../tapestry5/corelib/pages/PropertyEditBlocks.tml |   57 +-
 .../tapestry5/corelib/pages/ServiceStatus.css      |    4 -
 .../tapestry5/datepicker_106/css/datepicker.css    |  143 -
 .../tapestry5/datepicker_106/images/arrow.left.png |  Bin 181 -> 0 bytes
 .../datepicker_106/images/arrow.right.png          |  Bin 181 -> 0 bytes
 .../tapestry5/datepicker_106/js/datepicker.js      |  738 --
 .../resources/org/apache/tapestry5/default.css     |  518 -
 .../resources/org/apache/tapestry5/deselect.png    |  Bin 304 -> 0 bytes
 .../org/apache/tapestry5/dialog-background.gif     |  Bin 1526 -> 0 bytes
 .../org/apache/tapestry5/error-bevel-left.gif      |  Bin 1727 -> 0 bytes
 .../org/apache/tapestry5/error-bevel-left.png      |  Bin 5459 -> 0 bytes
 .../org/apache/tapestry5/error-bevel-right.gif     |  Bin 1318 -> 0 bytes
 .../org/apache/tapestry5/error-bevel-right.png     |  Bin 1674 -> 0 bytes
 .../org/apache/tapestry5/field-error-marker.gif    |  Bin 1067 -> 0 bytes
 .../t5internal/components/InternalLayout.tml       |   36 +-
 .../t5internal/components/bluerobot-layout.css     |   90 -
 .../t5internal/components/internal-layout.css      |   39 -
 .../tapestry5/scriptaculous_1_9_0/builder.js       |  136 -
 .../tapestry5/scriptaculous_1_9_0/controls.js      |  965 --
 .../tapestry5/scriptaculous_1_9_0/dragdrop.js      |  974 --
 .../tapestry5/scriptaculous_1_9_0/effects.js       | 1123 --
 .../tapestry5/scriptaculous_1_9_0/prototype.js     | 6082 ---------
 .../tapestry5/scriptaculous_1_9_0/scriptaculous.js |   70 -
 .../apache/tapestry5/scriptaculous_1_9_0/slider.js |  275 -
 .../apache/tapestry5/scriptaculous_1_9_0/sound.js  |   59 -
 .../tapestry5/scriptaculous_1_9_0/unittest.js      |  568 -
 .../main/resources/org/apache/tapestry5/spacer.gif |  Bin 43 -> 0 bytes
 .../main/resources/org/apache/tapestry5/t5-ajax.js |  151 -
 .../resources/org/apache/tapestry5/t5-alerts.css   |   12 +-
 .../resources/org/apache/tapestry5/t5-alerts.js    |  117 -
 .../resources/org/apache/tapestry5/t5-console.js   |   74 -
 .../main/resources/org/apache/tapestry5/t5-core.js |   69 -
 .../main/resources/org/apache/tapestry5/t5-dom.js  |  157 -
 .../resources/org/apache/tapestry5/t5-events.js    |   43 -
 .../org/apache/tapestry5/t5-formfragment.js        |   84 -
 .../main/resources/org/apache/tapestry5/t5-init.js |   36 -
 .../resources/org/apache/tapestry5/t5-prototype.js |   59 -
 .../resources/org/apache/tapestry5/t5-pubsub.js    |  248 -
 .../main/resources/org/apache/tapestry5/t5-spi.js  |   79 -
 .../org/apache/tapestry5/tapestry-console.css      |   42 -
 .../org/apache/tapestry5/tapestry-console.js       |   27 -
 .../org/apache/tapestry5/tapestry-messages.js      |   40 -
 .../org/apache/tapestry5/tapestry-messages_de.js   |   40 -
 .../apache/tapestry5/tapestry-messages_fi_FI.js    |   38 -
 .../resources/org/apache/tapestry5/tapestry.js     | 2111 ----
 .../resources/org/apache/tapestry5/tree-branch.png |  Bin 141 -> 0 bytes
 .../org/apache/tapestry5/tree-branchend.png        |  Bin 137 -> 0 bytes
 .../org/apache/tapestry5/tree-sprites.png          |  Bin 1109 -> 0 bytes
 .../resources/org/apache/tapestry5/tree-vpipe.png  |  Bin 107 -> 0 bytes
 .../main/resources/org/apache/tapestry5/tree.css   |   92 -
 .../main/resources/org/apache/tapestry5/tree.js    |  194 -
 .../org/apache/tapestry5/underscore_1_3_3.js       | 1059 --
 tapestry-core/src/test/app1/AutocompleteDemo.tml   |   16 +-
 tapestry-core/src/test/app1/BeanEditorDemo.tml     |   77 +-
 tapestry-core/src/test/app1/ChecklistDemo.tml      |    2 +-
 .../src/test/app1/ClientNumericValidationDemo.tml  |    9 +-
 .../src/test/app1/DateFieldAjaxFormLoop.tml        |   21 +-
 tapestry-core/src/test/app1/DateFieldDemo.tml      |   77 +-
 tapestry-core/src/test/app1/DiscardAfterDemo.tml   |    2 +-
 .../src/test/app1/EventMethodTranslate.tml         |    2 +-
 .../src/test/app1/ExpressionInJsFunction.tml       |   13 +-
 tapestry-core/src/test/app1/FlashDemo.tml          |    4 -
 tapestry-core/src/test/app1/FormFragmentDemo.tml   |   88 +-
 tapestry-core/src/test/app1/FormInjectorDemo.tml   |   39 +-
 tapestry-core/src/test/app1/FormZoneDemo.tml       |    7 +-
 tapestry-core/src/test/app1/ImageSubmitDemo.tml    |    4 +-
 tapestry-core/src/test/app1/Index.tml              |   20 +-
 tapestry-core/src/test/app1/JavaScriptTests.tml    |   38 +
 tapestry-core/src/test/app1/ModuleInitDemo.tml     |    5 +
 .../src/test/app1/MultiZoneUpdateDemo.tml          |   73 +-
 .../src/test/app1/MultiZoneUpdateInsideForm.tml    |    4 +-
 tapestry-core/src/test/app1/NestedFormFragment.tml |   44 +-
 tapestry-core/src/test/app1/PaletteDemo.tml        |   43 +-
 .../src/test/app1/PerFormValidationMessageDemo.tml |    4 +-
 .../src/test/app1/RenderNotificationDemo.tml       |    6 +-
 tapestry-core/src/test/app1/SelectDemo.tml         |    2 +-
 .../SelectModelFromObjectsAndPropertyNameDemo.tml  |    2 +-
 tapestry-core/src/test/app1/SimpleForm.tml         |    2 +-
 tapestry-core/src/test/app1/SingleErrorDemo.tml    |    2 +-
 tapestry-core/src/test/app1/SlowAjaxDemo.tml       |   29 -
 tapestry-core/src/test/app1/ToDoList.tml           |    8 +-
 tapestry-core/src/test/app1/ValidatorMacroDemo.tml |    2 +-
 tapestry-core/src/test/app1/WEB-INF/app.properties |    7 +-
 tapestry-core/src/test/app1/css/app.css            |    6 +-
 tapestry-core/src/test/app1/layout/images/bg.gif   |  Bin 131 -> 0 bytes
 .../src/test/app1/layout/images/bottom.gif         |  Bin 811 -> 0 bytes
 .../src/test/app1/layout/images/footer.gif         |  Bin 717 -> 0 bytes
 .../src/test/app1/layout/images/header.gif         |  Bin 8564 -> 0 bytes
 .../src/test/app1/layout/images/rightbig.gif       |  Bin 678 -> 0 bytes
 .../src/test/app1/layout/images/rightsmall.gif     |  Bin 316 -> 0 bytes
 tapestry-core/src/test/app1/layout/index.html      |  108 -
 tapestry-core/src/test/app1/layout/style.css       |    1 -
 tapestry-core/src/test/app1/nested/ZoneDemo.tml    |  234 +-
 tapestry-core/src/test/app1/qunit/qunit-1.9.0.css  |  231 +
 tapestry-core/src/test/app1/qunit/qunit-1.9.0.js   | 1932 +++
 .../integration/app1/pages/qunit-config.coffee     |    2 +
 .../integration/app1/pages/qunit-driver.coffee     |    1 +
 .../integration/app1/pages/test-dom.coffee         |   72 +
 .../integration/app1/pages/test-messages.coffee    |   22 +
 .../integration/app1/pages/test-pubsub.coffee      |   84 +
 .../integration/app1/pages/test-validation.coffee  |   35 +
 .../integration/app1/pages/zonedemo.coffee         |    5 +
 tapestry-core/src/test/conf/testng.xml             |    2 -
 .../tapestry5/integration/app1/AlertsTests.groovy  |   71 +-
 .../integration/app1/CanceledEventTests.groovy     |    8 +-
 .../tapestry5/integration/app1/DynamicTest.groovy  |   10 +-
 .../integration/app1/FormFieldFocusTest.groovy     |    6 +-
 .../app1/SubmitUnconditionalTests.groovy           |   28 +-
 .../app1/TapestryJavaScriptTests.groovy            |   20 -
 .../tapestry5/integration/app1/TreeTests.groovy    |   24 +-
 .../integration/app3/PageCatalogTests.groovy       |    7 +-
 .../integration/app5/SkinningTests.groovy          |    4 +-
 .../integration/appfolder/AppFolderTests.groovy    |    6 +-
 .../services/ClientDataEncoderImplTest.groovy      |  136 +
 .../services/ComponentClassResolverImplTest.groovy |  778 ++
 .../services/DocumentLinkerImplTest.groovy         |  382 +
 .../PartialMarkupDocumentLinkerTest.groovy         |   68 +
 .../ajax/JavaScriptSupportAutofocusTests.groovy    |   65 +-
 .../services/ajax/JavaScriptSupportImplTest.groovy |  398 +
 .../assets/AssetPathConstructorImplTest.groovy     |   82 +
 .../util/AutofocusValidationDecoratorTest.groovy   |  108 +
 .../ExtensibleJavaScriptStackTest.groovy           |   41 +-
 .../ModuleAssetRequestHandlerTest.groovy           |   45 +
 .../corelib/internal/FormSupportImplTest.java      |   22 +-
 .../tapestry5/corelib/mixins/ZoneRefreshTest.java  |   70 -
 .../java/org/apache/tapestry5/dom/DOMTest.java     |   70 +-
 .../integration/TapestryCoreTestCase.java          |   32 +-
 .../tapestry5/integration/app1/AjaxTests.java      |  103 +-
 .../tapestry5/integration/app1/AssetTests.java     |   25 +-
 .../integration/app1/BeanEditorTests.java          |    7 +-
 .../integration/app1/CoreBehaviorsTests.java       |   74 +-
 .../tapestry5/integration/app1/FormTests.java      |  199 +-
 .../tapestry5/integration/app1/GridTests.java      |    2 +
 .../tapestry5/integration/app1/PaletteTests.java   |   81 +-
 .../integration/app1/ZoneRefreshTest.java          |   67 +-
 .../tapestry5/integration/app1/ZoneTests.java      |   81 +-
 .../integration/app1/components/Border.java        |   13 +-
 .../integration/app1/data/IncidentData.java        |    3 +-
 .../integration/app1/data/RegistrationData.java    |   11 +-
 .../integration/app1/pages/AutocompleteDemo.java   |   16 +-
 .../app1/pages/BeanEditRemoveReorder.java          |    4 +-
 .../app1/pages/ClientNumericValidationDemo.java    |    4 +-
 .../integration/app1/pages/DisabledFields.java     |    9 +
 .../app1/pages/ExpressionInJsFunction.java         |    6 +-
 .../integration/app1/pages/FormFragmentDemo.java   |    2 +-
 .../tapestry5/integration/app1/pages/Index.java    |   11 +-
 .../integration/app1/pages/JavaScriptTests.java    |   14 +-
 .../integration/app1/pages/ModuleInitDemo.java     |   16 +
 .../app1/pages/MultiZoneStringBodyDemo.java        |   43 +-
 .../integration/app1/pages/PaletteDemo.java        |   33 +-
 .../integration/app1/pages/SlowAjaxDemo.java       |   69 -
 .../integration/app1/pages/TriggerDemo.java        |    5 -
 .../integration/app1/pages/nested/AssetDemo.java   |    5 +
 .../integration/app1/pages/nested/ZoneDemo.java    |    5 +-
 .../integration/app1/services/AppModule.java       |    2 +
 .../integration/app2/pages/TestPageForSubmit.java  |    4 +-
 .../integration/linktrans/services/AppModule.java  |    1 -
 .../integration/pagelevel/SubmitTest.java          |   12 +-
 .../internal/DefaultValidationDecoratorTest.java   |  157 -
 .../model/MutableComponentModelImplTest.java       |  115 +-
 .../internal/services/AssetSourceImplTest.java     |   22 +-
 .../internal/services/BaseURLSourceImplTest.java   |  186 +-
 .../ClasspathAssetAliasManagerImplTest.java        |    6 +-
 .../services/ClientBehaviorSupportImplTest.java    |  143 -
 .../internal/services/ClientDataEncoderTest.java   |   99 -
 .../services/ComponentClassResolverImplTest.java   |  822 --
 .../services/ComponentEventDispatcherTest.java     |   22 +-
 .../ComponentEventLinkEncoderImplTest.java         |   36 +-
 .../ComponentInstantiatorSourceImplTest.java       |   15 +-
 .../internal/services/ContextAssetFactoryTest.java |   45 +-
 .../internal/services/CookiesImplTest.java         |    6 +-
 .../internal/services/DocumentLinkerImplTest.java  |  406 -
 .../services/ForceDevelopmentModeModule.java       |    3 +-
 .../internal/services/MetaDataLocatorImplTest.java |   46 -
 .../services/PartialMarkupDocumentLinkerTest.java  |   90 -
 .../internal/services/RenderSupportImplTest.java   |  195 -
 .../internal/services/TemplateParserImplTest.java  |   37 +-
 .../services/ajax/JavaScriptSupportImplTest.java   |  539 -
 .../internal/t5internal/pages/BasicComponent.java  |   48 +
 .../internal/test/InternalBaseTestCase.java        |    7 +-
 .../internal/transform/pages/BasicComponent.java   |   48 -
 .../transform/pages/BasicSubComponent.java         |    2 +
 .../util/AutofocusValidationDecoratorTest.java     |  130 -
 .../tapestry5/services/LibraryMappingTest.java     |    4 +-
 .../org/apache/tapestry5/validator/EmailTest.java  |   26 +-
 .../apache/tapestry5/validator/MaxLengthTest.java  |    6 +-
 .../org/apache/tapestry5/validator/MaxTest.java    |    6 +-
 .../apache/tapestry5/validator/MinLengthTest.java  |    6 +-
 .../org/apache/tapestry5/validator/MinTest.java    |    6 +-
 .../org/apache/tapestry5/validator/RegexpTest.java |    6 +-
 .../apache/tapestry5/validator/RequiredTest.java   |   16 +-
 .../META-INF/assets/ExpressionInJsFunction.js      |    7 +
 .../src/test/resources/META-INF/assets/plugin.png  |  Bin 0 -> 1919 bytes
 .../resources/META-INF/assets/sub/accepted.png     |  Bin 0 -> 1807 bytes
 .../test/resources/META-INF/assets/tapestry.png    |  Bin 0 -> 34547 bytes
 .../test/resources/META-INF/modules/app/alert.js   |   11 +
 .../integration/app1/components/Border.tml         |   92 +-
 .../integration/app1/pages/AlertsDemo.tml          |    6 +-
 .../integration/app1/pages/JavaScriptTests.tml     |  147 -
 .../app1/pages/MultiZoneStringBodyDemo.tml         |   11 +-
 .../tapestry5/integration/app1/pages/TreeDemo.tml  |   16 +-
 .../integration/app1/pages/TreeSelectionDemo.tml   |   14 +-
 .../tapestry5/integration/app1/pages/ValidForm.tml |    4 +-
 .../integration/app1/pages/js-testing.css          |   30 -
 .../tapestry5/integration/app1/pages/js-testing.js |  122 -
 .../integration/app1/pages/nested/AssetDemo.tml    |   68 +-
 .../tapestry5/internal/services/add_script.txt     |    3 -
 .../internal/services/add_script_links.txt         |    5 -
 .../internal/services/add_script_links_at_top.txt  |    5 -
 .../internal/services/add_style_links.txt          |    2 -
 .../added_scripts_go_before_existing_script.txt    |    1 -
 .../services/default_attributes_not_included.tml   |    1 +
 .../empty_document_with_scripts_at_top.txt         |    3 -
 .../services/existing_head_used_if_present.txt     |    2 -
 .../services/ie_conditional_stylesheet.txt         |    5 -
 .../internal/services/immediate_initialization.txt |    2 -
 .../internal/services/include_generator_meta.txt   |    2 -
 .../internal/services/no_body_element.txt          |    2 -
 .../omit_generator_meta_on_no_html_root.txt        |    2 -
 .../internal/services/other_initialization.txt     |    4 -
 .../services/pretty_print_initialization.txt       |    8 -
 .../internal/services/script_written_raw.txt       |    2 -
 .../services/stylesheet_insertion_point.txt        |    1 -
 tapestry-func/LICENSE.txt                          |  202 +
 tapestry-func/NOTICE.txt                           |    2 +
 .../org/apache/tapestry5/func/AbstractFlow.java    |   14 +-
 .../src/main/java/org/apache/tapestry5/func/F.java |   59 +-
 .../org/apache/tapestry5/func/FlowOperations.java  |   35 +-
 .../org/apache/tapestry5/func/ZippedFlowImpl.java  |   13 +-
 .../tapestry5/func/StringPredicateTests.java       |   12 +-
 .../hibernate/HibernateSessionSourceImplTest.java  |   11 +-
 tapestry-ioc/build.gradle                          |    1 +
 .../java/org/apache/tapestry5/ioc/Messages.java    |   15 +-
 .../java/org/apache/tapestry5/ioc/Resource.java    |   13 +-
 .../tapestry5/ioc/internal/RegistryImpl.java       |   43 +-
 .../internal/services/ClassNameLocatorImpl.java    |  318 +-
 .../internal/services/ClasspathScannerImpl.java    |  339 +
 .../internal/services/PerthreadManagerImpl.java    |   29 +-
 .../ioc/internal/util/MessageFormatterImpl.java    |   10 +
 .../tapestry5/ioc/internal/util/MessagesImpl.java  |   12 +-
 .../tapestry5/ioc/services/ClassNameLocator.java   |    3 +-
 .../tapestry5/ioc/services/ClasspathMatcher.java   |   38 +
 .../tapestry5/ioc/services/ClasspathScanner.java   |   38 +
 .../tapestry5/ioc/services/TapestryIOCModule.java  |    1 +
 .../ioc/specs/ClassNameLocatorImplSpec.groovy      |   82 +-
 .../ioc/specs/MessageFormatterImplSpec.groovy      |   37 +-
 tapestry-javadoc/LICENSE.txt                       |  202 +
 tapestry-javadoc/NOTICE.txt                        |    2 +
 tapestry-jmx/LICENSE.txt                           |  202 +
 tapestry-jmx/NOTICE.txt                            |    2 +
 tapestry-jpa/LICENSE.txt                           |  202 +
 tapestry-jpa/NOTICE.txt                            |   12 +
 tapestry-json/LICENSE.txt                          |  202 +
 tapestry-json/NOTICE.txt                           |    2 +
 tapestry-json/build.gradle                         |    7 +-
 .../java/org/apache/tapestry5/json/JSONArray.java  |  185 +-
 .../java/org/apache/tapestry5/json/JSONObject.java |  199 +-
 .../test/groovy/json/specs/CoercionsSpec.groovy    |   29 +
 .../test/groovy/json/specs/JSONArraySpec.groovy    |  345 +
 .../test/groovy/json/specs/JSONObjectSpec.groovy   |  844 ++
 .../org/apache/tapestry/json/CoercionTests.groovy  |   43 -
 .../org/apache/tapestry5/json/JSONObjectTest.java  |  964 --
 tapestry-kaptcha/LICENSE.txt                       |  202 +
 tapestry-kaptcha/NOTICE.txt                        |    6 +
 .../tapestry5/kaptcha/components/KaptchaField.java |   15 +-
 tapestry-test/build.gradle                         |    2 +-
 .../org/apache/tapestry5/test/ErrorReporter.java   |    6 +-
 .../apache/tapestry5/test/ErrorReporterImpl.java   |   39 +-
 .../test/ErrorReportingCommandProcessor.java       |   54 +-
 .../apache/tapestry5/test/SeleniumTestCase.java    |  176 +-
 .../apache/tapestry5/upload/components/Upload.java |   33 +-
 .../java/org/example/upload/pages/Ajaxified.java   |    6 +-
 tapestry-yuicompressor/build.gradle                |   21 +-
 .../internal/yuicompressor/AbstractMinimizer.java  |   27 +-
 .../yuicompressor/JavaScriptResourceMinimizer.java |   22 +-
 .../itest/YUICompressorIntegrationTests.groovy     |   18 +-
 .../src/test/resources/log4j.properties            |    2 +-
 590 files changed, 55277 insertions(+), 28504 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/3805b934/build.gradle
----------------------------------------------------------------------
diff --cc build.gradle
index c698f3c,0a474ac..7fe27d6
--- a/build.gradle
+++ b/build.gradle
@@@ -7,18 -7,17 +7,19 @@@ apply from: "ssh.gradle
  apply from: "md5.gradle"
  
  project.ext.versions = [
 -    // Remember that when generating a release, this should be incremented. Also don"t forget to
 -    // tag the release in Subversion.
 -    tapestry: "5.4-alpha-1",
 -    jetty: "7.0.0.v20091005",
 -    tomcat: "6.0.30",
 -    testng: "5.14.10",
 -    easymock: "3.0",
 -    servletapi: "2.5",
 -    spock: "0.7-groovy-2.0",
 -    hibernate: "4.1.2.Final",
 -    groovy: "2.0.5"
 +  // Remember that when generating a release, this should be incremented. Also don"t forget to
 +  // tag the release in Subversion.
 +  // Version number is always "5.x(.y)?-SNAPSHOT" and only gets fixed, e.g. to 5.4-alpha-1
 +  // during a release
 +  tapestry: "5.4-SNAPSHOT",
 +  jetty: "7.0.0.v20091005",
 +  tomcat: "6.0.30",
 +  testng: "6.5.2",
 +  easymock: "3.0",
 +  servletapi: "2.5",
-   spock: "0.6-groovy-1.8",
-   hibernate: "4.1.2.Final"
++  spock: "0.7-groovy-2.0",
++  hibernate: "4.1.2.Final",
++  groovy: "2.0.5"
  ]
  
  // Provided so that the CI server can override the normal version number for nightly builds.

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/3805b934/tapestry-core/src/main/java/org/apache/tapestry5/alerts/Severity.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/3805b934/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Alerts.java
----------------------------------------------------------------------
diff --cc tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Alerts.java
index af201ec,885e772..b577a89
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Alerts.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Alerts.java
@@@ -66,16 -71,14 +71,9 @@@ public class Alerts extends BaseClientE
          resources.renderInformalParameters(writer);
          writer.end();
  
-         JSONObject spec = new JSONObject("id", clientId,
-                 "dismissURL", resources.createEventLink("dismiss").toURI(),
-                 "dismissText", dismissText);
- 
-         javaScriptSupport.addInitializerCall(InitializationPriority.EARLY, "alertManager", spec);
- 
          if (storage != null)
          {
 -            for (Alert alert : storage.getAlerts())
 -            {
 -                javaScriptSupport.require("core/alert").with(alert.toJSON());
 -            }
 -
 -            storage.dismissNonPersistent();
 +            addAlertsFromStorage();
          }
  
  

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/3805b934/tapestry-core/src/main/java/org/apache/tapestry5/internal/alerts/AlertManagerImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/3805b934/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/3805b934/tapestry-core/src/main/java/org/apache/tapestry5/test/PageTester.java
----------------------------------------------------------------------
diff --cc tapestry-core/src/main/java/org/apache/tapestry5/test/PageTester.java
index 3258825,5771a7f..18b8715
--- a/tapestry-core/src/main/java/org/apache/tapestry5/test/PageTester.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/test/PageTester.java
@@@ -1,4 -1,4 +1,4 @@@
- // Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012 The Apache Software Foundation
 -// Copyright 2006=-2012 The Apache Software Foundation
++// Copyright 2006, 2007, 2008, 2009, 2010, 2011 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.

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/3805b934/tapestry-core/src/main/resources/org/apache/tapestry5/t5-alerts.css
----------------------------------------------------------------------
diff --cc tapestry-core/src/main/resources/org/apache/tapestry5/t5-alerts.css
index b8ae6b0,0000000..50c3b54
mode 100644,000000..100644
--- a/tapestry-core/src/main/resources/org/apache/tapestry5/t5-alerts.css
+++ b/tapestry-core/src/main/resources/org/apache/tapestry5/t5-alerts.css
@@@ -1,71 -1,0 +1,61 @@@
 +DIV.t-alert-container {
 +
 +}
 +
 +DIV.t-alert-controls {
 +    display: inline-block;
 +    cursor: pointer;
 +    background: #e8e8e8 url("silk/delete.png") no-repeat;
 +    border-radius: 5px;
 +    -moz-border-radius: 5px;
 +    -webkit-border-radius: 5px;
 +    margin-bottom: 5px;
 +    padding-left: 22px;
 +    padding-right: 5px;
 +}
 +
 +DIV.t-alert-control A:hover {
 +    text-decoration: underline;
 +}
 +
 +DIV.t-alert-container DIV.t-error {
 +    background: red url("silk/cancel.png") no-repeat;
 +    font-weight: bold;
 +    color: white;
 +    border-radius: 5px;
 +    -moz-border-radius: 5px;
 +    -webkit-border-radius: 5px;
 +    margin-bottom: 5px;
 +    padding-left: 22px;
 +}
 +
 +DIV.t-alert-container DIV.t-warn {
 +    background: #f4da5b url("silk/error.png") no-repeat;
 +    font-weight: bold;
 +    border-radius: 5px;
 +    -moz-border-radius: 5px;
 +    -webkit-border-radius: 5px;
 +    margin-bottom: 5px;
 +    padding-left: 22px;
 +}
 +
 +DIV.t-alert-container DIV.t-info {
-     background: #08f url("silk/information.png") no-repeat;
-     border-radius: 5px;
-     -moz-border-radius: 5px;
-     -webkit-border-radius: 5px;
-     margin-bottom: 5px;
-     padding-left: 22px;
-     color: white;
- }
- 
- DIV.t-alert-container DIV.t-success {
-     background: green url("silk/accept.png") no-repeat;
++    background: green url("silk/information.png") no-repeat;
 +    border-radius: 5px;
 +    -moz-border-radius: 5px;
 +    -webkit-border-radius: 5px;
 +    margin-bottom: 5px;
 +    padding-left: 22px;
 +    color: white;
 +}
 +
 +DIV.t-dismiss {
 +    float: right;
 +    margin-left: 3px;
 +    margin-bottom: 3px;
 +    cursor: pointer;
 +    width: 16px;
 +    height: 16px;
 +    background: url("silk/delete.png")
 +}
 +

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/3805b934/tapestry-core/src/test/conf/testng.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/3805b934/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/AlertsTests.groovy
----------------------------------------------------------------------
diff --cc tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/AlertsTests.groovy
index 3fa1580,d89bb94..26582b4
--- a/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/AlertsTests.groovy
+++ b/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/AlertsTests.groovy
@@@ -1,4 -1,4 +1,4 @@@
- // Copyright  2011, 2012 The Apache Software Foundation
 -// Copyright 2011, 2012 The Apache Software Foundation
++// Copyright  2011 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.

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/3805b934/tapestry-core/src/test/resources/org/apache/tapestry5/integration/app1/pages/AlertsDemo.tml
----------------------------------------------------------------------
diff --cc tapestry-core/src/test/resources/org/apache/tapestry5/integration/app1/pages/AlertsDemo.tml
index 7c652b0,3ba44b0..912b029
--- a/tapestry-core/src/test/resources/org/apache/tapestry5/integration/app1/pages/AlertsDemo.tml
+++ b/tapestry-core/src/test/resources/org/apache/tapestry5/integration/app1/pages/AlertsDemo.tml
@@@ -21,19 -20,6 +21,15 @@@
      </t:zone>
  </div>
  
- <p>
-     [
-     <t:actionlink t:id="reset">reset</t:actionlink>
-     ]
- </p>
+ <t:actionlink class="btn btn-warning" t:id="reset">Reset Alerts Storage</t:actionlink>
  
 +<t:alerts class='alert-class' dismissText="Zenbu Kesu"/>
 +
 +<t:if test="showerrorcomponent">
 +    <t:errorcomponent />
 +    <p:else>
 +        <t:eventlink event="showerrorcomponent">show error component</t:eventlink>
 +    </p:else>
 +</t:if>
 +
  </html>

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/3805b934/tapestry-ioc/build.gradle
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/3805b934/tapestry-yuicompressor/build.gradle
----------------------------------------------------------------------
diff --cc tapestry-yuicompressor/build.gradle
index ac76a5e,8b6917b..c744cb9
--- a/tapestry-yuicompressor/build.gradle
+++ b/tapestry-yuicompressor/build.gradle
@@@ -2,30 -2,15 +2,11 @@@ description = "Integrates YUI Compresso
  
  dependencies {
    compile project(':tapestry-core') 
-   compile "com.google.code.maven-play-plugin.com.yahoo.platform.yui:yuicompressor:2.4.7"
 -  compile "com.yahoo.platform.yui:yuicompressor:2.4.7"
++  compile "com.yahoo.platform.yui:yuicompressor:2.4.6"
      
    testCompile project(':tapestry-test')
  }
  
--repositories { 
--  mavenRepo name: "Maven Play Plugin", url: "http://maven-play-plugin.googlecode.com/svn/mavenrepo/releases"
--}
--
- install { 
-   repositories.mavenInstaller { 
-     pom.project { 
-       repositories { 
-         repository { 
-           id "maven-play-plugin"
-           name "Maven Play Plugin"
-           url "http://maven-play-plugin.googlecode.com/svn/mavenrepo/releases"
-         }
-       }
-     }
-   }
- }
- 
- 
  jar {
      manifest {
          attributes 'Tapestry-Module-Classes': 'org.apache.tapestry5.yuicompressor.services.YuiCompressorModule'

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/3805b934/tapestry-yuicompressor/src/main/java/org/apache/tapestry5/internal/yuicompressor/JavaScriptResourceMinimizer.java
----------------------------------------------------------------------