You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2007/03/11 02:19:58 UTC

svn commit: r516824 - in /tapestry/tapestry5/tapestry-core/branches/hlship-20070309-simplifyioc/src: main/java/org/apache/tapestry/internal/ main/java/org/apache/tapestry/internal/test/ main/java/org/apache/tapestry/services/ site/apt/guide/

Author: hlship
Date: Sat Mar 10 17:19:57 2007
New Revision: 516824

URL: http://svn.apache.org/viewvc?view=rev&rev=516824
Log:
TAPESTRY-1339: Update tapestry-core documentation to remove references to module ids.

Modified:
    tapestry/tapestry5/tapestry-core/branches/hlship-20070309-simplifyioc/src/main/java/org/apache/tapestry/internal/TapestryAppInitializer.java
    tapestry/tapestry5/tapestry-core/branches/hlship-20070309-simplifyioc/src/main/java/org/apache/tapestry/internal/test/InternalBaseTestCase.java
    tapestry/tapestry5/tapestry-core/branches/hlship-20070309-simplifyioc/src/main/java/org/apache/tapestry/services/TapestryModule.java
    tapestry/tapestry5/tapestry-core/branches/hlship-20070309-simplifyioc/src/site/apt/guide/appstate.apt
    tapestry/tapestry5/tapestry-core/branches/hlship-20070309-simplifyioc/src/site/apt/guide/assets.apt
    tapestry/tapestry5/tapestry-core/branches/hlship-20070309-simplifyioc/src/site/apt/guide/coercion.apt
    tapestry/tapestry5/tapestry-core/branches/hlship-20070309-simplifyioc/src/site/apt/guide/infrastructure.apt
    tapestry/tapestry5/tapestry-core/branches/hlship-20070309-simplifyioc/src/site/apt/guide/inject.apt
    tapestry/tapestry5/tapestry-core/branches/hlship-20070309-simplifyioc/src/site/apt/guide/request.apt
    tapestry/tapestry5/tapestry-core/branches/hlship-20070309-simplifyioc/src/site/apt/guide/templates.apt
    tapestry/tapestry5/tapestry-core/branches/hlship-20070309-simplifyioc/src/site/apt/guide/unit-testing-pages.apt

Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20070309-simplifyioc/src/main/java/org/apache/tapestry/internal/TapestryAppInitializer.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20070309-simplifyioc/src/main/java/org/apache/tapestry/internal/TapestryAppInitializer.java?view=diff&rev=516824&r1=516823&r2=516824
==============================================================================
--- tapestry/tapestry5/tapestry-core/branches/hlship-20070309-simplifyioc/src/main/java/org/apache/tapestry/internal/TapestryAppInitializer.java (original)
+++ tapestry/tapestry5/tapestry-core/branches/hlship-20070309-simplifyioc/src/main/java/org/apache/tapestry/internal/TapestryAppInitializer.java Sat Mar 10 17:19:57 2007
@@ -21,12 +21,11 @@
 import org.apache.tapestry.ioc.Registry;
 import org.apache.tapestry.ioc.RegistryBuilder;
 import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.services.ComponentClassResolver;
 import org.apache.tapestry.services.Infrastructure;
 import org.apache.tapestry.services.TapestryModule;
 
 /**
- * This class is used to build the {@link Registry}. The registry contains
+ * This class is used to build the {@link Registry}. The Registry contains
  * {@link org.apache.tapestry.ioc.services.TapestryIOCModule} and {@link TapestryModule}, any
  * modules identified by {@link #addModules(RegistryBuilder)}, plus the application module.
  * <p>
@@ -63,9 +62,13 @@
         _appName = appName;
         _infrastructureMode = infrastructureMode;
         _serviceOverrides = serviceOverrides;
+
         _startTime = System.currentTimeMillis();
+
         createRegistry();
+
         _registryCreatedTime = System.currentTimeMillis();
+
         setupServices();
     }
 
@@ -115,14 +118,6 @@
     {
         Infrastructure infra = _registry.getService("Infrastructure", Infrastructure.class);
         infra.setMode(_infrastructureMode);
-
-        // This should not be needed ... it's handled inside the container now.
-
-        ComponentClassResolver resolver = _registry.getService(
-                "ComponentClassResolver",
-                ComponentClassResolver.class);
-
-        resolver.setApplicationPackage(_appPackage);
     }
 
     /**

Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20070309-simplifyioc/src/main/java/org/apache/tapestry/internal/test/InternalBaseTestCase.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20070309-simplifyioc/src/main/java/org/apache/tapestry/internal/test/InternalBaseTestCase.java?view=diff&rev=516824&r1=516823&r2=516824
==============================================================================
--- tapestry/tapestry5/tapestry-core/branches/hlship-20070309-simplifyioc/src/main/java/org/apache/tapestry/internal/test/InternalBaseTestCase.java (original)
+++ tapestry/tapestry5/tapestry-core/branches/hlship-20070309-simplifyioc/src/main/java/org/apache/tapestry/internal/test/InternalBaseTestCase.java Sat Mar 10 17:19:57 2007
@@ -62,7 +62,6 @@
 import org.apache.tapestry.ioc.RegistryBuilder;
 import org.apache.tapestry.ioc.Resource;
 import org.apache.tapestry.ioc.internal.InternalRegistry;
-import org.apache.tapestry.ioc.internal.Module;
 import org.apache.tapestry.ioc.internal.util.MessagesImpl;
 import org.apache.tapestry.model.ComponentModel;
 import org.apache.tapestry.model.EmbeddedComponentModel;
@@ -144,9 +143,9 @@
     }
 
     protected final <T> void train_getService(InternalRegistry registry, String serviceId,
-            Class<T> serviceInterface, Module module, T service)
+            Class<T> serviceInterface, T service)
     {
-        expect(registry.getService(serviceId, serviceInterface, module)).andReturn(service);
+        expect(registry.getService(serviceId, serviceInterface)).andReturn(service);
 
     }
 
@@ -407,7 +406,8 @@
         return newMock(InvalidationListener.class);
     }
 
-    protected final void train_getTimeModified(ResourceCache cache, Resource resource, long timeModified)
+    protected final void train_getTimeModified(ResourceCache cache, Resource resource,
+            long timeModified)
     {
         expect(cache.getTimeModified(resource)).andReturn(timeModified).atLeastOnce();
     }
@@ -519,16 +519,13 @@
         {
             String line = in.readLine();
 
-            if (line == null)
-                break;
+            if (line == null) break;
 
-            if (trim)
-                line = line.trim();
+            if (trim) line = line.trim();
 
             buffer.append(line);
 
-            if (!trim)
-                buffer.append("\n");
+            if (!trim) buffer.append("\n");
         }
 
         in.close();

Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20070309-simplifyioc/src/main/java/org/apache/tapestry/services/TapestryModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20070309-simplifyioc/src/main/java/org/apache/tapestry/services/TapestryModule.java?view=diff&rev=516824&r1=516823&r2=516824
==============================================================================
--- tapestry/tapestry5/tapestry-core/branches/hlship-20070309-simplifyioc/src/main/java/org/apache/tapestry/services/TapestryModule.java (original)
+++ tapestry/tapestry5/tapestry-core/branches/hlship-20070309-simplifyioc/src/main/java/org/apache/tapestry/services/TapestryModule.java Sat Mar 10 17:19:57 2007
@@ -506,9 +506,9 @@
     }
 
     /**
-     * Contributes filter "StaticFilesFilter" that identifies requests for static resources
-     * and terminates the pipeline by returning false. Generally, most filters should be ordered
-     * after this filter.
+     * Contributes filter "StaticFilesFilter" that identifies requests for static resources and
+     * terminates the pipeline by returning false. Generally, most filters should be ordered after
+     * this filter.
      */
     public static void contributeRequestHandler(OrderedConfiguration<RequestFilter> configuration,
             @InjectService("Context")
@@ -1261,6 +1261,7 @@
 
         add(configuration, Map.class, SelectModel.class, new Coercion<Map, SelectModel>()
         {
+            @SuppressWarnings("unchecked")
             public SelectModel coerce(Map input)
             {
                 return TapestryInternalUtils.toSelectModel(input);

Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20070309-simplifyioc/src/site/apt/guide/appstate.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20070309-simplifyioc/src/site/apt/guide/appstate.apt?view=diff&rev=516824&r1=516823&r2=516824
==============================================================================
--- tapestry/tapestry5/tapestry-core/branches/hlship-20070309-simplifyioc/src/site/apt/guide/appstate.apt (original)
+++ tapestry/tapestry5/tapestry-core/branches/hlship-20070309-simplifyioc/src/site/apt/guide/appstate.apt Sat Mar 10 17:19:57 2007
@@ -59,8 +59,7 @@
   Contributions to the tapestry.ApplicationStateManager are used to configure an ASO.  From you application's module:
   
 +----+
-  @Contribute("tapestry.ApplicationStateManager")
-  public void contributeASOs(MappedConfiguration<Class, ApplicationStateConfiguration> configuration)
+  public void contributeApplicationStateManager(MappedConfiguration<Class, ApplicationStateConfiguration> configuration)
   {
     ApplicationStateCreator<MyState> creator = new ApplicationStateCreator<MyState>()
     {
@@ -75,8 +74,7 @@
 +---+
 
   Here, we have an ASO type of MyState, and we're providing a creator for it.  We've dolled the creator up with some generic types, but
-  that isn't essential.  The Tapestry IOC annotation @Contribute identifies what we're contributing into, and the MappedConfiguration
-  parameter is the configuration we can add to.
+  that isn't essential. 
   
   Our creator creates a new MyState instance using an alternate constructor that takes the current date and time.  Again, just an
   example.

Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20070309-simplifyioc/src/site/apt/guide/assets.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20070309-simplifyioc/src/site/apt/guide/assets.apt?view=diff&rev=516824&r1=516823&r2=516824
==============================================================================
--- tapestry/tapestry5/tapestry-core/branches/hlship-20070309-simplifyioc/src/site/apt/guide/assets.apt (original)
+++ tapestry/tapestry5/tapestry-core/branches/hlship-20070309-simplifyioc/src/site/apt/guide/assets.apt Sat Mar 10 17:19:57 2007
@@ -77,7 +77,7 @@
   Private assets (assets on the classpath) normally have the form: <<</assets/foo/bar/Baz.css>>> where <<<Baz.css>>> is a file inside the <<<foo.bar>>> Java package.
   In other words, the package name is converted into a path underneath the virtual folder, <<</assets/>>>.  
   
-  You are given some control over this, allowing for shorter paths.  The tapestry.ClasspathAssetAliasManager service has a mapped configuration. The map keys
+  You are given some control over this, allowing for shorter paths.  The ClasspathAssetAliasManager service has a mapped configuration. The map keys
   are logical folder names, and the map values are the complete classpath.  For example, Tapestry itself makes this contribution:
   
 +----+

Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20070309-simplifyioc/src/site/apt/guide/coercion.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20070309-simplifyioc/src/site/apt/guide/coercion.apt?view=diff&rev=516824&r1=516823&r2=516824
==============================================================================
--- tapestry/tapestry5/tapestry-core/branches/hlship-20070309-simplifyioc/src/site/apt/guide/coercion.apt (original)
+++ tapestry/tapestry5/tapestry-core/branches/hlship-20070309-simplifyioc/src/site/apt/guide/coercion.apt Sat Mar 10 17:19:57 2007
@@ -41,10 +41,10 @@
   
 TypeCoercer Service
 
-  The tapestry.ioc.TypeCoercer service
-  is responsible for this type coercion. This service is part of the tapestry-ioc module, and 
+  The TypeCoercer service is responsible for this type coercion. This service is part of the tapestry-ioc module, and 
   is {{{http://tapestry.apache.org/tapestry5/tapestry-ioc/coerce.html}documented there}}.  The service
-  is quite extensible, allowing for new types and coercions to be added easily.
+  is quite extensible, allowing for new types and coercions to be added easily.  The TapestryModule contributes a few additional
+  coercions into the TypeCoercer service.
   
   
                 

Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20070309-simplifyioc/src/site/apt/guide/infrastructure.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20070309-simplifyioc/src/site/apt/guide/infrastructure.apt?view=diff&rev=516824&r1=516823&r2=516824
==============================================================================
--- tapestry/tapestry5/tapestry-core/branches/hlship-20070309-simplifyioc/src/site/apt/guide/infrastructure.apt (original)
+++ tapestry/tapestry5/tapestry-core/branches/hlship-20070309-simplifyioc/src/site/apt/guide/infrastructure.apt Sat Mar 10 17:19:57 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/branches/hlship-20070309-simplifyioc/src/site/apt/guide/inject.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20070309-simplifyioc/src/site/apt/guide/inject.apt?view=diff&rev=516824&r1=516823&r2=516824
==============================================================================
--- tapestry/tapestry5/tapestry-core/branches/hlship-20070309-simplifyioc/src/site/apt/guide/inject.apt (original)
+++ tapestry/tapestry5/tapestry-core/branches/hlship-20070309-simplifyioc/src/site/apt/guide/inject.apt Sat Mar 10 17:19:57 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/branches/hlship-20070309-simplifyioc/src/site/apt/guide/request.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20070309-simplifyioc/src/site/apt/guide/request.apt?view=diff&rev=516824&r1=516823&r2=516824
==============================================================================
--- tapestry/tapestry5/tapestry-core/branches/hlship-20070309-simplifyioc/src/site/apt/guide/request.apt (original)
+++ tapestry/tapestry5/tapestry-core/branches/hlship-20070309-simplifyioc/src/site/apt/guide/request.apt Sat Mar 10 17:19:57 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/branches/hlship-20070309-simplifyioc/src/site/apt/guide/templates.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20070309-simplifyioc/src/site/apt/guide/templates.apt?view=diff&rev=516824&r1=516823&r2=516824
==============================================================================
--- tapestry/tapestry5/tapestry-core/branches/hlship-20070309-simplifyioc/src/site/apt/guide/templates.apt (original)
+++ tapestry/tapestry5/tapestry-core/branches/hlship-20070309-simplifyioc/src/site/apt/guide/templates.apt Sat Mar 10 17:19:57 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/branches/hlship-20070309-simplifyioc/src/site/apt/guide/unit-testing-pages.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20070309-simplifyioc/src/site/apt/guide/unit-testing-pages.apt?view=diff&rev=516824&r1=516823&r2=516824
==============================================================================
--- tapestry/tapestry5/tapestry-core/branches/hlship-20070309-simplifyioc/src/site/apt/guide/unit-testing-pages.apt (original)
+++ tapestry/tapestry5/tapestry-core/branches/hlship-20070309-simplifyioc/src/site/apt/guide/unit-testing-pages.apt Sat Mar 10 17:19:57 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);
     }
 }