You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by ml...@apache.org on 2013/08/03 14:08:54 UTC
[07/10] git commit: TAP5-2070 hook the services into our IoC
TAP5-2070 hook the services into our IoC
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/6d702284
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/6d702284
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/6d702284
Branch: refs/heads/master
Commit: 6d70228460b0229aa106da356e98ba31ca0ecb36
Parents: 2db059c
Author: Massimo Lusetti <ml...@apache.org>
Authored: Sat Aug 3 14:04:45 2013 +0200
Committer: Massimo Lusetti <ml...@apache.org>
Committed: Sat Aug 3 14:04:45 2013 +0200
----------------------------------------------------------------------
.../main/java/org/apache/tapestry5/modules/InternalModule.java | 1 +
.../main/java/org/apache/tapestry5/modules/TapestryModule.java | 6 ++++++
2 files changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/6d702284/tapestry-core/src/main/java/org/apache/tapestry5/modules/InternalModule.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/modules/InternalModule.java b/tapestry-core/src/main/java/org/apache/tapestry5/modules/InternalModule.java
index b78a4ff..f5e190b 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/modules/InternalModule.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/modules/InternalModule.java
@@ -69,6 +69,7 @@ public class InternalModule
binder.bind(InternalComponentInvalidationEventHub.class);
binder.bind(PageSource.class, PageSourceImpl.class);
binder.bind(PageLoader.class, PageLoaderImpl.class).preventReloading();
+ binder.bind(UnknownActivationContextHandler.class, UnknownActivationContextHandlerImpl.class);
}
public static CookieSource buildCookieSource(final RequestGlobals requestGlobals)
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/6d702284/tapestry-core/src/main/java/org/apache/tapestry5/modules/TapestryModule.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/modules/TapestryModule.java b/tapestry-core/src/main/java/org/apache/tapestry5/modules/TapestryModule.java
index 1620d02..17ddbeb 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/modules/TapestryModule.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/modules/TapestryModule.java
@@ -45,6 +45,7 @@ import org.apache.tapestry5.internal.services.messages.PropertiesFileParserImpl;
import org.apache.tapestry5.internal.services.meta.ContentTypeExtractor;
import org.apache.tapestry5.internal.services.meta.MetaAnnotationExtractor;
import org.apache.tapestry5.internal.services.meta.MetaWorkerImpl;
+import org.apache.tapestry5.internal.services.meta.UnknownActivationContextExtractor;
import org.apache.tapestry5.internal.services.security.ClientWhitelistImpl;
import org.apache.tapestry5.internal.services.security.LocalhostOnly;
import org.apache.tapestry5.internal.services.templates.DefaultTemplateLocator;
@@ -2084,6 +2085,10 @@ public final class TapestryModule
configuration.add(SymbolConstants.BOOTSTRAP_ROOT, "${tapestry.asset.root}/bootstrap_2_3_2");
configuration.add(SymbolConstants.SESSION_LOCKING_ENABLED, true);
+
+ // TAP5-2070 keep the old behavior, defaults to false
+ configuration.add(MetaDataConstants.UNKNOWN_ACTIVATION_CONTEXT_CHECK, false);
+
}
/**
@@ -2464,6 +2469,7 @@ public final class TapestryModule
configuration.add(Secure.class, new FixedExtractor(MetaDataConstants.SECURE_PAGE));
configuration.addInstance(ContentType.class, ContentTypeExtractor.class);
configuration.add(WhitelistAccessOnly.class, new FixedExtractor(MetaDataConstants.WHITELIST_ONLY_PAGE));
+ configuration.addInstance(UnknownActivationContextCheck.class, UnknownActivationContextExtractor.class);
}
/**