Author: hlship
Date: Mon Sep 8 12:01:39 2008
New Revision: 693196
URL: http://svn.apache.org/viewvc?rev=693196&view=rev
Log:
TAPESTRY-2486: Refactor the non-trivial BindingFactory implementations into
services
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java?rev=693196&r1=693195&r2=693196&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java
Mon Sep 8 12:01:39 2008
@@ -189,6 +189,12 @@
binder.bind(PageDocumentGenerator.class,
PageDocumentGeneratorImpl.class);
binder.bind(ResponseRenderer.class, ResponseRendererImpl.class);
binder.bind(FieldTranslatorSource.class,
FieldTranslatorSourceImpl.class);
+ binder.bind(BindingFactory.class,
MessageBindingFactory.class).withId("MessageBindingFactory");
+ binder.bind(BindingFactory.class,
ValidateBindingFactory.class).withId("ValidateBindingFactory");
+ binder.bind(BindingFactory.class,
TranslateBindingFactory.class).withId("TranslateBindingFactory");
+ binder.bind(BindingFactory.class,
AssetBindingFactory.class).withId("AssetBindingFactory");
+ binder.bind(BindingFactory.class,
NullFieldStrategyBindingFactory.class).withId(
+ "NullFieldStrategyBindingFactory");
}
// ========================================================================
@@ -228,20 +234,32 @@
@InjectService("PropBindingFactory")
BindingFactory
propBindingFactory,
- ObjectLocator locator)
+
@InjectService("MessageBindingFactory")
+ BindingFactory
messageBindingFactory,
+
+
@InjectService("ValidateBindingFactory")
+ BindingFactory
validateBindingFactory,
+
+
@InjectService("TranslateBindingFactory")
+ BindingFactory
translateBindingFactory,
+
+
@InjectService("AssetBindingFactory")
+ BindingFactory
assetBindingFactory,
+
+
@InjectService("NullFieldStrategyBindingFactory")
+ BindingFactory
nullFieldStrategyBindingFactory)
{
configuration.add(BindingConstants.LITERAL, new
LiteralBindingFactory());
- configuration.add(BindingConstants.PROP, propBindingFactory);
-
configuration.add(BindingConstants.COMPONENT, new
ComponentBindingFactory());
- configuration.add(BindingConstants.MESSAGE, new
MessageBindingFactory());
- configuration.add(BindingConstants.VALIDATE,
locator.autobuild(ValidateBindingFactory.class));
- configuration.add(BindingConstants.TRANSLATE,
locator.autobuild(TranslateBindingFactory.class));
- configuration.add(BindingConstants.BLOCK, new BlockBindingFactory());
- configuration.add(BindingConstants.ASSET,
locator.autobuild(AssetBindingFactory.class));
configuration.add(BindingConstants.VAR, new
RenderVariableBindingFactory());
- configuration.add(BindingConstants.NULLFIELDSTRATEGY,
-
locator.autobuild(NullFieldStrategyBindingFactory.class));
+ configuration.add(BindingConstants.BLOCK, new BlockBindingFactory());
+
+ configuration.add(BindingConstants.PROP, propBindingFactory);
+ configuration.add(BindingConstants.MESSAGE, messageBindingFactory);
+ configuration.add(BindingConstants.VALIDATE, validateBindingFactory);
+ configuration.add(BindingConstants.TRANSLATE, translateBindingFactory);
+ configuration.add(BindingConstants.ASSET, assetBindingFactory);
+ configuration.add(BindingConstants.NULLFIELDSTRATEGY,
nullFieldStrategyBindingFactory);
}
public static void
contributeClasspathAssetAliasManager(MappedConfiguration<String, String>
configuration,
