Modified: tapestry/tapestry5/tapestry-core/trunk/src/site/apt/guide/infrastructure.apt URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/site/apt/guide/infrastructure.apt?view=diff&rev=516841&r1=516840&r2=516841 ============================================================================== --- tapestry/tapestry5/tapestry-core/trunk/src/site/apt/guide/infrastructure.apt (original) +++ tapestry/tapestry5/tapestry-core/trunk/src/site/apt/guide/infrastructure.apt Sat Mar 10 18:10:20 2007 @@ -5,14 +5,8 @@ Introduction Tapestry includes an object provider, "infrastructure:", which is used to access - the key built-in services provided by Tapestry. This allows you to inject, - into your components or services, any of the services, using a shorter name, i.e., - "infrastructure:Request" vs. "service:tapestry.Request". - - As elsewhere in Tapestry, the name provided (i.e., "Request") is matched case insensitively - to the available names, contributed into the service. - - This functionality serves a separate, and ultimately more important, purpose. + the key built-in services provided by Tapestry. This is desirable, even though the resulting string + is usually longer than the service's normal id. In the vast majority of applications developed using Tapestry, the built in set of services does exactly what you need them to do. However, there are always outliers, @@ -33,92 +27,92 @@ The <expression> for the infrastructure provider is the name of a property. This property is mapped to a particular service via a <pair> of services. The - {{{../apidocs/org/apache/tapestry/services/Infrastructure.html}tapestry.Infrastructure}} service + {{{../apidocs/org/apache/tapestry/services/Infrastructure.html}Infrastructure}} service has a mapped configuration of {{{../apidocs/org/apache/tapestry/services/InfrastructureContribution.html}InfrastructureContribution}}s. Each contribution is keyed on the property it provides. - A second service (<<Caution:>> not yet implemented), tapestry.InfrastructureOverride, exists + A second service. InfrastructureOverrides, exists to support a second, identical configuration. Any properties contributed here override the normal Infrastructure properties. In order to override an individual Tapestry service, all that is necessary is to provide - a new implementation as a new service, and contribute that service into the configuration for - the tapestry.InfrastructureOverride service. + a new implementation as a new service (with a new service id), and contribute that service into the configuration for + the InfrastructureOverride service. In many cases, the original service can be injected into the new implementation; this must be done - using the original service's fully qualified service id. + using the original service's service id. The following table identifies the services that are available via the infrastructure provider by default: [AssetSource] - {{{../apidocs/org/apache/tapestry/services/AssetSource.html}AssetSource}} (tapestry.AssetSource) + {{{../apidocs/org/apache/tapestry/services/AssetSource.html}AssetSource}} Obtains assets from public and internal resources. [ClasspathAssetAliasManager] - {{{../apidocs/org/apache/tapestry/services/ClasspathAssetAliasManager.html}ClasspathAssetAliasManager}} (tapestry.ClasspathAssetAliasManager) + {{{../apidocs/org/apache/tapestry/services/ClasspathAssetAliasManager.html}ClasspathAssetAliasManager}} Used to convert resource paths for classpath resources into client URLs, which includes a configurable way of assigning path aliases (resulting in shorter, more readable URLs). [BindingSource] - {{{../apidocs/org/apache/tapestry/services/BindingSource.html}BindingSource}} (tapestry.BindingSource) + {{{../apidocs/org/apache/tapestry/services/BindingSource.html}BindingSource}} Central factory for creating all types of component Binding objects. [ComponentMessagesSource] - {{{../apidocs/org/apache/tapestry/services/ComponentMessagesSource.html}ComponentMessagesSource}} (tapestry.ComponentMessagesSource) + {{{../apidocs/org/apache/tapestry/services/ComponentMessagesSource.html}ComponentMessagesSource}} Access to message catalogs for components. [ComponentSource] - {{{../apidocs/org/apache/tapestry/services/ComponentSource.html}ComponentSource}} (tapestry.ComponentSource) + {{{../apidocs/org/apache/tapestry/services/ComponentSource.html}ComponentSource}} Used to retrieve component instances via their complete id. [Environment] - {{{../apidocs/org/apache/tapestry/services/Environment.html}Environment}} (tapestry.Environment) + {{{../apidocs/org/apache/tapestry/services/Environment.html}Environment}} Used to access environmental services (typically, to install a new environmental service). [MarkupWriterFactory] - {{{../apidocs/org/apache/tapestry/services/MarkupWriterFactory.html}MarkupWriterFactory}} (tapestry.MarkupWriterFactory) + {{{../apidocs/org/apache/tapestry/services/MarkupWriterFactory.html}MarkupWriterFactory}} Used as a source for MarkupWriter instances. [PersistentFieldManager] - {{{../apidocs/org/apache/tapestry/services/PersistentFieldManager.html}PersistentFieldManager}} (tapestry.PersistentFieldManager) + {{{../apidocs/org/apache/tapestry/services/PersistentFieldManager.html}PersistentFieldManager}} Main access point between components and persistent field storage. Delegates out most behavior to particular persistent strategies. [Request] - {{{../apidocs/org/apache/tapestry/services/Request.html}Request}} (tapestry.Request) + {{{../apidocs/org/apache/tapestry/services/Request.html}Request}} The current request object (for the current thread). [ResourceDigestGenerator] - {{{../apidocs/org/apache/tapestry/services/ResourceDigestGenerator.html}ResourceDigestGenerator}} (tapestry.ResourceDigestGenerator) + {{{../apidocs/org/apache/tapestry/services/ResourceDigestGenerator.html}ResourceDigestGenerator}} Responsible for identifying which classpath resources require a digest as part of thier URL, and generates the digest for files as needed. Digests are required for files which represent a security hazard, such as Java class files. [Response] - {{{../apidocs/org/apache/tapestry/services/Response.html}Response}} (tapestry.Response) + {{{../apidocs/org/apache/tapestry/services/Response.html}Response}} The current response object (for the current thread). [TypeCoercer] - {{{http://tapestry.apache.org/tapestry5/tapestry-ioc/org/apache/tapestry/ioc/services/TypeCoercer.html}TypeCoercer}} (tapestry.ioc.TypeCoercer) + {{{http://tapestry.apache.org/tapestry5/tapestry-ioc/org/apache/tapestry/ioc/services/TypeCoercer.html}TypeCoercer}} Used to coerce values from one type to another (such as string to integer). Used throughout Tapestry, especially including parameter type coercions. [ValidationMessagesSource] - {{{../apidocs/org/apache/tapestry/services/ValidationMessagesSource.html}ValidationMessagesSource}} (tapestry.ValidationMessagesSource) + {{{../apidocs/org/apache/tapestry/services/ValidationMessagesSource.html}ValidationMessagesSource}} Provides access to localized messages related to input validation. @@ -130,11 +124,10 @@ To contribute a new service to Infrastructure, you must first determine its logical name. - You can then contribute into the tapestry.Infrastructure service's configuration: + You can then contribute into the Infrastructure service's configuration: +---+ - @Contribute("tapestry.Infrastructure") - public static void contributeMyService(@InjectService("MyService") MyService myService, + public static void contributeInfrastructure(@InjectService("MyService") MyService myService, Configuration<InfrastructureContribution> configuration) { configuration.add(new InfrastructureContribution("MyName", myService)); @@ -148,7 +141,7 @@ To override a service, you need to know its logical name. - You can then make a contribution to the tapestry.InfrastructureOverrides service configuration, as described in the previous section. + You can then make a contribution to the InfrastructureOverrides service configuration, as described in the previous section. The object contributed as an override will mask the default contribution.
Modified: tapestry/tapestry5/tapestry-core/trunk/src/site/apt/guide/inject.apt URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/site/apt/guide/inject.apt?view=diff&rev=516841&r1=516840&r2=516841 ============================================================================== --- tapestry/tapestry5/tapestry-core/trunk/src/site/apt/guide/inject.apt (original) +++ tapestry/tapestry5/tapestry-core/trunk/src/site/apt/guide/inject.apt Sat Mar 10 18:10:20 2007 @@ -39,7 +39,7 @@ * Block Injection For field type {{{../apidoc/org/apache/tapestry/Block.html}Block}}, the value of the Inject annotation is the - id of the {{{templates.apt}\<block\> element}}. If the value is omitted, it is deduced from the field name + id of the {{{templates.apt}\<block\> element}} within the component's template. If the value is omitted, it is deduced from the field name (by stripping out leading "_" and "$" characters). * Named Injection @@ -113,7 +113,7 @@ ** Defining New Annonymous Injection Logic Annonymous injection is controlled by the - {{{../apidocs/org/apache/tapestry/services/InjectionProvider.html}tapestry.InjectionProvider}} + {{{../apidocs/org/apache/tapestry/services/InjectionProvider.html}InjectionProvider}} service. The configuration for this service is a {{{http://tapestry.apache.org/tapestry5/tapestry-ioc/command.html}chain of command}} for handling annonymous injections. Modified: tapestry/tapestry5/tapestry-core/trunk/src/site/apt/guide/request.apt URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/site/apt/guide/request.apt?view=diff&rev=516841&r1=516840&r2=516841 ============================================================================== --- tapestry/tapestry5/tapestry-core/trunk/src/site/apt/guide/request.apt (original) +++ tapestry/tapestry5/tapestry-core/trunk/src/site/apt/guide/request.apt Sat Mar 10 18:10:20 2007 @@ -19,27 +19,27 @@ functions. When it receives a request, the TapestryFilter obtains the - {{{../apidocs/org/apache/tapestry/services/HttpServletRequestHandler.html}tapestry.HttpServletRequestHandler}} + {{{../apidocs/org/apache/tapestry/services/HttpServletRequestHandler.html}HttpServletRequestHandler}} service, and invokes its service() method. HttpServletRequestHandler Pipeline This pipeline performs initial processing of the request. It can be extended by contributing a - {{{../apidocs/org/apache/tapestry/services/HttpServletRequestFilter.html}tapestry.HttpServletRequestFilter}} into - the tapestry.HttpServletRequestHandler service's configuration.' + {{{../apidocs/org/apache/tapestry/services/HttpServletRequestFilter.html}HttpServletRequestFilter}} into + the HttpServletRequestHandler service's configuration.' Tapestry does not contribute any filters into this pipeline of its own The terminator for the pipeline does two things: - * It stores the request and response into the {{{.../apidocs/org/apache/tapestry/services/RequestGlobals.html}tapestry.RequestGlobals}} + * It stores the request and response into the {{{.../apidocs/org/apache/tapestry/services/RequestGlobals.html}RequestGlobals}} service. This is a threaded service that stores per-thread/per-request information. * It wraps the request and response as a {{{../apidocs/org/apache/tapestry/services/Request.html}Request}} and {{{../apidocs/org/apache/tapestry/services/Response.html}Response}}, and passes them into the - {{{../apidocs/org/apache/tapestry/services/RequestHandler.html}tapestry.RequestHandler}} pipeline. + {{{../apidocs/org/apache/tapestry/services/RequestHandler.html}RequestHandler}} pipeline. [] @@ -52,14 +52,14 @@ The pipeline includes a number of built-in filters. - * tapestry.internal.CheckForUpdates is responsible for {{{reload.html}class and template reloading}}. + * CheckForUpdates is responsible for {{{reload.html}class and template reloading}}. - * tapestry.internal.Localization identifies the {{{localization.html}locale for the user}}. + * Localization identifies the {{{localization.html}locale for the user}}. - * tapestry.StaticFiles checks for URLs that are for static files (files that exist inside the web context) and aborts + * StaticFiles checks for URLs that are for static files (files that exist inside the web context) and aborts the request, so that the servlet container can handle the reuest normally. - * tapestry.ErrorFilter catches uncaught exceptions from the lower levels of Tapestry and presents the exception report page. + * ErrorFilter catches uncaught exceptions from the lower levels of Tapestry and presents the exception report page. This involves the {{{../apidocs/org/apache/tapestry/services/RequestExceptionHandler.html}infrastructure:RequestExceptionHandler}} service, which is responsible for initializing and rendering the {{{../apidocs/org/apache/tapestry/corelib/pages/ExceptionReport.html}core/ExceptionReport}} page. @@ -68,7 +68,7 @@ [] The terminator for this pipeline stores the Request and the Response into RequestGlobals, then requests that the - {{{../apidocs/org/apache/tapestry/services/Dispatcher.html}tapestry.MasterDispatcher}} service figure out how to + {{{../apidocs/org/apache/tapestry/services/Dispatcher.html}MasterDispatcher}} service figure out how to handle the request (if it is, indeed, a Tapestry request). Master Dispatcher Service @@ -76,17 +76,17 @@ The MasterDispatcher service is a chain-of-command, aggregating together (in a specific order), several Dispatcher objects. Each Dispatcher is built to recognize and process a particular kind of URL. -* tapestry.RootPath +* RootPath As discussed {{{conf.html}elsewhere}}, requests for the context root will instead be treated like render requests for the "start" page. -* tapestry.Asset +* Asset Requests that being with "/assets/" are references to {{{assets.html}asset resources}} that are stored on the classpath, inside the Tapestry JARs (or perhaps inside the JAR for a component library). The contents of the file will be pumped down to the client browser. -* tapestry.PageRender +* PageRender Page render requests are requests to render a particular page. Such requests may include additional elements on the path, which will be treated as {{{event.html}activation context}} (generally speaking, the primary key of some related entity object), allowing the page to @@ -101,7 +101,7 @@ a page name "mypage". Assuming the second search was succesful, the page would be activated with the context "27". If no logical page name can be identified, control passes to the next dispatcher. -* tapestry.ComponentAction +* ComponentAction The component action dispatcher is used to trigger events in components. @@ -123,13 +123,13 @@ RequestGlobals Service - The tapestry.RequestGlobals service + The RequestGlobals service has a lifecycle of perthread; this means that a seperate instance exists for every thread, and therefore, for every request. The terminators of the two handler pipelines store the request/response pairs into the RequestGlobals service. Request Service - The tapestry.Request service is a + The Request service is a {{{../ioc/shadow.html}shadow}} of the RequestGlobals services' request property. That is, any methods invoked on this service are delegated to the request object stored inside the RequestGlobals. Modified: tapestry/tapestry5/tapestry-core/trunk/src/site/apt/guide/templates.apt URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/site/apt/guide/templates.apt?view=diff&rev=516841&r1=516840&r2=516841 ============================================================================== --- tapestry/tapestry5/tapestry-core/trunk/src/site/apt/guide/templates.apt (original) +++ tapestry/tapestry5/tapestry-core/trunk/src/site/apt/guide/templates.apt Sat Mar 10 18:10:20 2007 @@ -184,8 +184,8 @@ <t:actionlink t:id="clear">Remove All</t:actionlink>. +---+ - The element name, "actionlink" is used to select the type of component, "ActionLink" (Tapestry is case insensitive about - cmponent types). + The element name, "actionlink" is used to select the type of component, "ActionLink" (Tapestry is case insensitive when + identifying component types). Embedded components may have two Tapestry-specific parameters: Modified: tapestry/tapestry5/tapestry-core/trunk/src/site/apt/guide/unit-testing-pages.apt URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/site/apt/guide/unit-testing-pages.apt?view=diff&rev=516841&r1=516840&r2=516841 ============================================================================== --- tapestry/tapestry5/tapestry-core/trunk/src/site/apt/guide/unit-testing-pages.apt (original) +++ tapestry/tapestry5/tapestry-core/trunk/src/site/apt/guide/unit-testing-pages.apt Sat Mar 10 18:10:20 2007 @@ -164,8 +164,8 @@ //assert against the cmd } } - serviceOverrides.put("org.example.app.service1", service1Mock); - serviceOverrides.put("org.example.app.service2", service2Mock); + serviceOverrides.put("Service1", service1Mock); + serviceOverrides.put("Service2", service2Mock); PageTester tester = new PageTester(appPackage, appName, "src/main/webapp", serviceOverrides); } } Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/IntegrationTests.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/IntegrationTests.java?view=diff&rev=516841&r1=516840&r2=516841 ============================================================================== --- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/IntegrationTests.java (original) +++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/IntegrationTests.java Sat Mar 10 18:10:20 2007 @@ -201,13 +201,13 @@ clickAndWait("link=Inject Demo"); // This is a test for a named @Inject: - assertTextPresent("<Proxy for tapestry.Request(org.apache.tapestry.services.Request)>"); + assertTextPresent("<Proxy for Request(org.apache.tapestry.services.Request)>"); // This is a test for an annonymous @Inject and ComponentResourcesInjectionProvider assertTextPresent("ComponentResources[org.apache.tapestry.integration.app1.pages.InjectDemo]"); // Another test, DefaultInjectionProvider - assertTextPresent("<Proxy for tapestry.BindingSource(org.apache.tapestry.services.BindingSource)>"); + assertTextPresent("<Proxy for BindingSource(org.apache.tapestry.services.BindingSource)>"); } @Test @@ -511,8 +511,7 @@ { int length = is.read(buffer); - if (length < 0) - break; + if (length < 0) break; os.write(buffer, 0, length); } Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app0/services/FooModule.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app0/services/FooModule.java?view=diff&rev=516841&r1=516840&r2=516841 ============================================================================== --- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app0/services/FooModule.java (original) +++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app0/services/FooModule.java Sat Mar 10 18:10:20 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. @@ -12,18 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.apache.tapestry.integration.app0.services; - -import org.apache.tapestry.ioc.annotations.Id; -import org.apache.tapestry.util.Transformer; -import org.apache.tapestry.util.UppercaseTransformer; - [EMAIL PROTECTED]("m1") -public class FooModule -{ - public static Transformer buildService1() - { - return new UppercaseTransformer(); - } - -} +package org.apache.tapestry.integration.app0.services; + +import org.apache.tapestry.util.Transformer; +import org.apache.tapestry.util.UppercaseTransformer; + +public class FooModule +{ + public static Transformer buildService1() + { + return new UppercaseTransformer(); + } + +} Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/components/RenderableProvider.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/components/RenderableProvider.java?view=diff&rev=516841&r1=516840&r2=516841 ============================================================================== --- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/components/RenderableProvider.java (original) +++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/components/RenderableProvider.java Sat Mar 10 18:10:20 2007 @@ -23,7 +23,7 @@ public class RenderableProvider { - @Inject("service:tapestry.Environment") + @Inject("service:Environment") private Environment _environment; @SetupRender Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/Localization.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/Localization.java?view=diff&rev=516841&r1=516840&r2=516841 ============================================================================== --- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/Localization.java (original) +++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/Localization.java Sat Mar 10 18:10:20 2007 @@ -28,10 +28,10 @@ @Inject private Messages _messages; - @Inject("service:tapestry.ioc.ClassFactory") + @Inject("service:ClassFactory") private ClassFactory _iocClassFactory; - @Inject("service:tapestry.ComponentClassFactory") + @Inject("service:ComponentClassFactory") private ClassFactory _componentClassFactory; @Inject Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/services/AppModule.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/services/AppModule.java?view=diff&rev=516841&r1=516840&r2=516841 ============================================================================== --- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/services/AppModule.java (original) +++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/services/AppModule.java Sat Mar 10 18:10:20 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. @@ -22,8 +22,6 @@ import org.apache.tapestry.integration.app1.data.Track; import org.apache.tapestry.ioc.MappedConfiguration; import org.apache.tapestry.ioc.OrderedConfiguration; -import org.apache.tapestry.ioc.annotations.Contribute; -import org.apache.tapestry.ioc.annotations.Id; import org.apache.tapestry.ioc.annotations.InjectService; import org.apache.tapestry.services.Request; import org.apache.tapestry.services.RequestFilter; @@ -33,7 +31,6 @@ /** * I was just dying to see how fast requests are! */ [EMAIL PROTECTED]("app") public class AppModule { public RequestFilter buildTimingFilter(final Log log) @@ -59,16 +56,15 @@ }; } - @Contribute("tapestry.RequestHandler") - public void contributeRequestFilters(OrderedConfiguration<RequestFilter> configuration, + public void contributeRequestHandler(OrderedConfiguration<RequestFilter> configuration, @InjectService("TimingFilter") RequestFilter filter) { configuration.add("Timing", filter); } - @Contribute("tapestry.ClasspathAssetAliasManager") - public void contributeAliases(MappedConfiguration<String, String> configuration) + public void contributeClasspathAssetAliasManager( + MappedConfiguration<String, String> configuration) { configuration.add("app1/", "org/apache/tapestry/integration/app1/"); } @@ -84,7 +80,6 @@ }; } - @Contribute("tapestry.ioc.ApplicationDefaults") public static void contributeApplicationDefaults( MappedConfiguration<String, String> configuration) { Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app2/services/LocaleAppModule.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app2/services/LocaleAppModule.java?view=diff&rev=516841&r1=516840&r2=516841 ============================================================================== --- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app2/services/LocaleAppModule.java (original) +++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app2/services/LocaleAppModule.java Sat Mar 10 18:10:20 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. @@ -15,15 +15,13 @@ package org.apache.tapestry.integration.app2.services; import org.apache.tapestry.ioc.MappedConfiguration; -import org.apache.tapestry.ioc.annotations.Contribute; public class LocaleAppModule { - @Contribute("tapestry.ioc.ApplicationDefaults") - public static void contributeApplicationDefaults( - MappedConfiguration<String, String> configuration) - { - configuration.add("tapestry.supported-locales", "en,fr,de"); - } + public static void contributeApplicationDefaults( + MappedConfiguration<String, String> configuration) + { + configuration.add("tapestry.supported-locales", "en,fr,de"); + } } Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/TapestryAppInitializerTest.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/TapestryAppInitializerTest.java?view=diff&rev=516841&r1=516840&r2=516841 ============================================================================== --- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/TapestryAppInitializerTest.java (original) +++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/TapestryAppInitializerTest.java Sat Mar 10 18:10:20 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. @@ -12,41 +12,33 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.apache.tapestry.internal; - -import org.apache.tapestry.ioc.Registry; -import org.apache.tapestry.util.Transformer; -import org.testng.Assert; -import org.testng.annotations.AfterMethod; -import org.testng.annotations.Test; - [EMAIL PROTECTED] -public class TapestryAppInitializerTest extends Assert -{ - private Registry registry; - - @Test - public void testLoadAppModule() - { - registry = new TapestryAppInitializer("org.apache.tapestry.integration.app0", "foo", "") - .getRegistry(); - @SuppressWarnings("unchecked") - Transformer<String> s1 = registry.getService("m1.Service1", Transformer.class); - assertEquals(s1.transform("a"), "A"); - } - - @Test - public void testNoAppModule() - { - registry = new TapestryAppInitializer("non_existing.package", "foo", "").getRegistry(); - } - - @AfterMethod - public void after() - { - if (registry != null) - { - registry.shutdown(); - } - } -} +package org.apache.tapestry.internal; + +import org.apache.tapestry.ioc.Registry; +import org.apache.tapestry.util.Transformer; +import org.testng.Assert; +import org.testng.annotations.Test; + [EMAIL PROTECTED] +public class TapestryAppInitializerTest extends Assert +{ + @SuppressWarnings("unchecked") + @Test + public void testLoadAppModule() + { + Registry registry = new TapestryAppInitializer("org.apache.tapestry.integration.app0", + "foo", "").getRegistry(); + + Transformer<String> s1 = registry.getService("Service1", Transformer.class); + assertEquals(s1.transform("a"), "A"); + } + + @Test + public void testNoAppModule() + { + // Apparently just checking to see that it doesn't fail. + + new TapestryAppInitializer("non_existing.package", "foo", "").getRegistry(); + } + +} Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/TapestryInternalUtilsTest.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/TapestryInternalUtilsTest.java?view=diff&rev=516841&r1=516840&r2=516841 ============================================================================== --- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/TapestryInternalUtilsTest.java (original) +++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/TapestryInternalUtilsTest.java Sat Mar 10 18:10:20 2007 @@ -47,8 +47,8 @@ @BeforeClass public void setup() { - _classFactory = getObject("service:tapestry.ioc.ClassFactory", ClassFactory.class); - _access = getObject("service:tapestry.ioc.PropertyAccess", PropertyAccess.class); + _classFactory = getService("ClassFactory", ClassFactory.class); + _access = getService("PropertyAccess", PropertyAccess.class); } @AfterClass @@ -91,24 +91,6 @@ TapestryInternalUtils.close(c); verify(); - } - - @Test(dataProvider = "decapitalize_inputs") - public void decapitalize(String input, String expected) - { - assertEquals(TapestryInternalUtils.decapitalize(input), expected); - } - - @DataProvider(name = "decapitalize_inputs") - public Object[][] decaptialize_inputs() - { - return new Object[][] - { - { "Alpha", "alpha" }, - { "beta", "beta" }, - { "A", "a" }, - { "z", "z" }, - { "0abc", "0abc" } }; } @Test(dataProvider = "to_user_presentable") Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/bindings/PropBindingFactoryTest.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/bindings/PropBindingFactoryTest.java?view=diff&rev=516841&r1=516840&r2=516841 ============================================================================== --- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/bindings/PropBindingFactoryTest.java (original) +++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/bindings/PropBindingFactoryTest.java Sat Mar 10 18:10:20 2007 @@ -36,7 +36,7 @@ @BeforeClass public void setup_factory() { - _factory = getService("tapestry.internal.PropBindingFactory", BindingFactory.class); + _factory = getService("PropBindingFactory", BindingFactory.class); } @AfterClass Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ComponentInstantiatorSourceImplTest.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ComponentInstantiatorSourceImplTest.java?view=diff&rev=516841&r1=516840&r2=516841 ============================================================================== --- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ComponentInstantiatorSourceImplTest.java (original) +++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ComponentInstantiatorSourceImplTest.java Sat Mar 10 18:10:20 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. @@ -177,8 +177,7 @@ while (true) { - if (readDTM(url) != dtm) - break; + if (readDTM(url) != dtm) break; // Keep re-writing the file until we see the DTM change. @@ -187,9 +186,7 @@ // Detect the change and clear out the internal caches - UpdateListenerHub hub = _registry.getService( - "tapestry.internal.UpdateListenerHub", - UpdateListenerHub.class); + UpdateListenerHub hub = _registry.getService("UpdateListenerHub", UpdateListenerHub.class); hub.fireUpdateEvent(); @@ -281,7 +278,7 @@ _registry = builder.build(); - _registry.getService("tapestry.Infrastructure", Infrastructure.class).setMode("servlet"); + _registry.getService("Infrastructure", Infrastructure.class).setMode("servlet"); _source = _registry.getService(ComponentInstantiatorSource.class); _access = _registry.getService(PropertyAccess.class); Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/InternalClassTransformationImplTest.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/InternalClassTransformationImplTest.java?view=diff&rev=516841&r1=516840&r2=516841 ============================================================================== --- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/InternalClassTransformationImplTest.java (original) +++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/InternalClassTransformationImplTest.java Sat Mar 10 18:10:20 2007 @@ -81,7 +81,7 @@ @BeforeClass public void setup_access() { - _access = getService("tapestry.ioc.PropertyAccess", PropertyAccess.class); + _access = getService("PropertyAccess", PropertyAccess.class); } @AfterClass Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/LinkFactoryImplTest.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/LinkFactoryImplTest.java?view=diff&rev=516841&r1=516840&r2=516841 ============================================================================== --- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/LinkFactoryImplTest.java (original) +++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/LinkFactoryImplTest.java Sat Mar 10 18:10:20 2007 @@ -49,7 +49,7 @@ @BeforeClass public void setup() { - _typeCoercer = getObject("service:tapestry.ioc.TypeCoercer", TypeCoercer.class); + _typeCoercer = getObject("service:TypeCoercer", TypeCoercer.class); } @AfterClass @@ -98,7 +98,7 @@ "fred", 5); } - + @Test public void page_level_event_always_includes_action() {
