You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by th...@apache.org on 2014/06/22 00:25:10 UTC
[3/3] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/tapestry-5
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tapestry-5
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/2c336111
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/2c336111
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/2c336111
Branch: refs/heads/master
Commit: 2c3361119b7e15f48d384f679d34875d1c7c2235
Parents: 2acc22b 4821e2b
Author: Thiago H. de Paula Figueiredo <th...@apache.org>
Authored: Sat Jun 21 19:24:39 2014 -0300
Committer: Thiago H. de Paula Figueiredo <th...@apache.org>
Committed: Sat Jun 21 19:24:39 2014 -0300
----------------------------------------------------------------------
build.gradle | 2 +-
settings.gradle | 2 +-
.../DefaultRequestExceptionHandler.java | 4 +-
.../internal/services/ResourceStreamerImpl.java | 14 +-
.../services/assets/CSSURLRewriter.java | 4 +-
.../assets/CompressedStreamableResource.java | 4 +-
.../assets/JavaScriptStackAssemblerImpl.java | 4 +-
.../services/assets/StreamableResourceImpl.java | 41 ++-
.../assets/StreamableResourceSourceImpl.java | 4 +-
.../exceptions/ExceptionReporterImpl.java | 3 +-
.../tapestry5/modules/TapestryModule.java | 2 +-
.../tapestry5/services/ExceptionReporter.java | 13 +-
.../services/assets/AssetRequestHandler.java | 3 -
.../services/assets/ResponseCustomizer.java | 33 +++
.../services/assets/StreamableResource.java | 20 +-
.../services/exceptions/ExceptionReporter.java | 33 ---
.../services/javascript/AMDWrapper.java | 255 +++++++++++++++++++
.../JavaScriptModuleConfiguration.java | 1 +
.../services/javascript/ModuleManager.java | 1 +
tapestry-core/src/test/app5/tapestry_banner.gif | Bin 0 -> 3205 bytes
.../app5/ResourceCustomizerTests.groovy | 34 +++
.../integration/app5/services/AppModule.groovy | 36 ++-
.../services/javascript/AMDWrapperTest.groovy | 64 +++++
.../DefaultRequestExceptionHandlerTest.java | 2 +-
.../apache/tapestry5/validator/EmailTest.java | 10 +
.../integration/app5/components/Layout.tml | 66 ++---
.../tapestry5/integration/app5/pages/Index.tml | 2 +
tapestry-ioc-junit/build.gradle | 10 +
.../apache/tapestry5/ioc/junit/ModuleDef.java | 33 +++
.../apache/tapestry5/ioc/junit/Registry.java | 41 +++
.../ioc/junit/RegistryShutdownType.java | 30 +++
.../ioc/junit/TapestryIOCJUnit4ClassRunner.java | 152 +++++++++++
.../ioc/junit/TestRegistryManager.java | 131 ++++++++++
.../tapestry5/ioc/junit/MapModuleDef.java | 116 +++++++++
...estryIOCJUnit4ClassRunnerAfterClassTest.java | 63 +++++
...stryIOCJUnit4ClassRunnerAfterMethodTest.java | 65 +++++
...pestryIOCJUnit4ClassRunnerModuleDefTest.java | 69 +++++
tapestry-ioc-test/build.gradle | 10 -
.../apache/tapestry5/ioc/test/ModuleDef.java | 33 ---
.../org/apache/tapestry5/ioc/test/Registry.java | 41 ---
.../ioc/test/RegistryShutdownType.java | 30 ---
.../ioc/test/TapestryIOCJUnit4ClassRunner.java | 153 -----------
.../tapestry5/ioc/test/TestRegistryManager.java | 131 ----------
.../apache/tapestry5/ioc/test/MapModuleDef.java | 116 ---------
...estryIOCJUnit4ClassRunnerAfterClassTest.java | 61 -----
...stryIOCJUnit4ClassRunnerAfterMethodTest.java | 63 -----
...pestryIOCJUnit4ClassRunnerModuleDefTest.java | 66 -----
.../webresources/AbstractMinimizer.java | 4 +-
48 files changed, 1265 insertions(+), 810 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/2c336111/settings.gradle
----------------------------------------------------------------------
diff --cc settings.gradle
index 146b1e9,bf87d6f..6397777
--- a/settings.gradle
+++ b/settings.gradle
@@@ -2,7 -2,6 +2,7 @@@ include "plastic", "tapestry5-annotatio
include "tapestry-hibernate-core", "tapestry-hibernate", "tapestry-jmx", "tapestry-upload", "tapestry-spring"
include "tapestry-beanvalidator", "tapestry-jpa", "tapestry-kaptcha"
include "tapestry-javadoc", "quickstart", "tapestry-clojure", "tapestry-mongodb"
- include "tapestry-test-data", 'tapestry-internal-test', "tapestry-ioc-test"
+ include "tapestry-test-data", 'tapestry-internal-test', "tapestry-ioc-junit"
include "tapestry-webresources", "tapestry-runner", "tapestry-test-constants"
+include "tapestry-ioc-jcache"
// include "tapestry-cdi"