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 2007/02/22 05:30:13 UTC
svn commit: r510391 - in
/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry:
internal/services/InternalModule.java services/TapestryModule.java
test/pagelevel/ActionLinkInvoker.java
Author: hlship
Date: Wed Feb 21 20:30:12 2007
New Revision: 510391
URL: http://svn.apache.org/viewvc?view=rev&rev=510391
Log:
Move ActionLinkHandler and PageLinkHandler services to the tapestry.internal module.
Modified:
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/InternalModule.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/TapestryModule.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/test/pagelevel/ActionLinkInvoker.java
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/InternalModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/InternalModule.java?view=diff&rev=510391&r1=510390&r2=510391
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/InternalModule.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/InternalModule.java Wed Feb 21 20:30:12 2007
@@ -56,6 +56,7 @@
import org.apache.tapestry.services.ClasspathAssetAliasManager;
import org.apache.tapestry.services.ComponentClassResolver;
import org.apache.tapestry.services.ComponentClassTransformWorker;
+import org.apache.tapestry.services.ComponentEventResultProcessor;
import org.apache.tapestry.services.ComponentMessagesSource;
import org.apache.tapestry.services.Context;
import org.apache.tapestry.services.InfrastructureContribution;
@@ -96,6 +97,8 @@
private final RequestPageCache _pageCache;
+ private final LinkFactory _linkFactory;
+
public InternalModule(@InjectService("ComponentInstantiatorSource")
ComponentInstantiatorSource componentInstantiatorSource,
@@ -120,6 +123,9 @@
@Inject("infrastructure:Response")
Response response,
+ @InjectService("LinkFactory")
+ LinkFactory linkFactory,
+
@InjectService("tapestry.ioc.ThreadLocale")
ThreadLocale threadLocale,
@@ -140,6 +146,7 @@
_threadLocale = threadLocale;
_requestGlobals = requestGlobals;
_pageCache = pageCache;
+ _linkFactory = linkFactory;
}
public ComponentClassTransformer buildComponentClassTransformer(
@@ -186,8 +193,12 @@
}
public PageElementFactory buildPageElementFactory(@Inject("infrastructure:TypeCoercer")
- TypeCoercer typeCoercer, @Inject("infrastructure:BindingSource")
- BindingSource bindingSource, @Inject("infrastructure:ComponentMessagesSource")
+ TypeCoercer typeCoercer,
+
+ @Inject("infrastructure:BindingSource")
+ BindingSource bindingSource,
+
+ @Inject("infrastructure:ComponentMessagesSource")
ComponentMessagesSource componentMessagesSource)
{
return new PageElementFactoryImpl(_componentInstantiatorSource, _componentClassResolver,
@@ -195,13 +206,16 @@
}
public PageLoader buildPageLoader(@InjectService("PageElementFactory")
- PageElementFactory pageElementFactory, @InjectService("tapestry.BindingSource")
- BindingSource bindingSource, @InjectService("LinkFactory")
- LinkFactory linkFactory, @Inject("infrastructure:PersistentFieldManager")
+ PageElementFactory pageElementFactory,
+
+ @InjectService("tapestry.BindingSource")
+ BindingSource bindingSource,
+
+ @Inject("infrastructure:PersistentFieldManager")
PersistentFieldManager persistentFieldManager)
{
PageLoaderImpl service = new PageLoaderImpl(_componentTemplateSource, pageElementFactory,
- bindingSource, linkFactory, persistentFieldManager);
+ bindingSource, _linkFactory, persistentFieldManager);
// Recieve invalidations when the class loader is discarded (due to a component class
// change).
@@ -646,5 +660,19 @@
{
configuration.add(new InfrastructureContribution("RequestExceptionHandler",
defaultRequestExceptionHandler));
+ }
+
+ public ActionLinkHandler buildActionLinkHandler(
+ @Inject("infrastructure:ComponentEventResultProcessor")
+ ComponentEventResultProcessor resultProcessor)
+ {
+ return new ActionLinkHandlerImpl(resultProcessor, _pageCache, _linkFactory);
+ }
+
+ public PageLinkHandler buildPageLinkHandler(
+ @Inject("infrastructure:ComponentEventResultProcessor")
+ ComponentEventResultProcessor resultProcessor)
+ {
+ return new PageLinkHandlerImpl(_pageCache, resultProcessor);
}
}
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/TapestryModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/TapestryModule.java?view=diff&rev=510391&r1=510390&r2=510391
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/TapestryModule.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/TapestryModule.java Wed Feb 21 20:30:12 2007
@@ -62,7 +62,6 @@
import org.apache.tapestry.internal.grid.ListGridDataSource;
import org.apache.tapestry.internal.grid.NullDataSource;
import org.apache.tapestry.internal.services.ActionLinkHandler;
-import org.apache.tapestry.internal.services.ActionLinkHandlerImpl;
import org.apache.tapestry.internal.services.ApplicationGlobalsImpl;
import org.apache.tapestry.internal.services.ApplicationStateManagerImpl;
import org.apache.tapestry.internal.services.ApplicationStatePersistenceStrategySourceImpl;
@@ -73,9 +72,9 @@
import org.apache.tapestry.internal.services.BindingSourceImpl;
import org.apache.tapestry.internal.services.ClasspathAssetAliasManagerImpl;
import org.apache.tapestry.internal.services.CommonResourcesInjectionProvider;
+import org.apache.tapestry.internal.services.ComponentActionDispatcher;
import org.apache.tapestry.internal.services.ComponentClassLocatorImpl;
import org.apache.tapestry.internal.services.ComponentClassResolverImpl;
-import org.apache.tapestry.internal.services.ComponentActionDispatcher;
import org.apache.tapestry.internal.services.ComponentInstanceResultProcessor;
import org.apache.tapestry.internal.services.ComponentInstantiatorSource;
import org.apache.tapestry.internal.services.ComponentInvocationMap;
@@ -118,7 +117,6 @@
import org.apache.tapestry.internal.services.OnEventWorker;
import org.apache.tapestry.internal.services.PageLifecycleAnnotationWorker;
import org.apache.tapestry.internal.services.PageLinkHandler;
-import org.apache.tapestry.internal.services.PageLinkHandlerImpl;
import org.apache.tapestry.internal.services.PageRenderDispatcher;
import org.apache.tapestry.internal.services.PageRenderSupportImpl;
import org.apache.tapestry.internal.services.PageResponseRenderer;
@@ -625,10 +623,10 @@
@InjectService("tapestry.internal.ResourceStreamer")
ResourceStreamer streamer,
- @InjectService("PageLinkHandler")
+ @InjectService("tapestry.internal.PageLinkHandler")
PageLinkHandler pageLinkHandler,
- @InjectService("ActionLinkHandler")
+ @InjectService("tapestry.internal.ActionLinkHandler")
ActionLinkHandler actionLinkHandler,
@InjectService("tapestry.ComponentClassResolver")
@@ -657,20 +655,6 @@
"ComponentAction",
new ComponentActionDispatcher(actionLinkHandler),
"after:PageRender");
- }
-
- public PageLinkHandler buildPageLinkHandler(
- @Inject("infrastructure:ComponentEventResultProcessor")
- ComponentEventResultProcessor resultProcessor)
- {
- return new PageLinkHandlerImpl(_requestPageCache, resultProcessor);
- }
-
- public ActionLinkHandler buildActionLinkHandler(
- @Inject("infrastructure:ComponentEventResultProcessor")
- ComponentEventResultProcessor resultProcessor)
- {
- return new ActionLinkHandlerImpl(resultProcessor, _requestPageCache, _linkFactory);
}
public ComponentClassResolver buildComponentClassResolver(
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/test/pagelevel/ActionLinkInvoker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/test/pagelevel/ActionLinkInvoker.java?view=diff&rev=510391&r1=510390&r2=510391
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/test/pagelevel/ActionLinkInvoker.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/test/pagelevel/ActionLinkInvoker.java Wed Feb 21 20:30:12 2007
@@ -1,4 +1,4 @@
-// Copyright 2006 The Apache Software Foundation
+// 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.
@@ -42,7 +42,7 @@
_registry = registry;
_followupInvoker = followupInvoker;
_actionLinkHandler = _registry.getService(
- "tapestry.ActionLinkHandler",
+ "tapestry.internal.ActionLinkHandler",
ActionLinkHandler.class);
_componentInvocationMap = componentInvocationMap;