You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by th...@apache.org on 2014/02/13 16:10:21 UTC
[1/2] git commit: TAP5-2029: fixing some text replacements done by
mistake
Updated Branches:
refs/heads/master 52c6f6c25 -> 76982d56f
TAP5-2029: fixing some text replacements done by mistake
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/85da163a
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/85da163a
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/85da163a
Branch: refs/heads/master
Commit: 85da163adbd1b8bd831c49d144ddcaffb16e6c63
Parents: bf71497
Author: Thiago H. de Paula Figueiredo <th...@apache.org>
Authored: Thu Feb 13 09:47:16 2014 -0200
Committer: Thiago H. de Paula Figueiredo <th...@apache.org>
Committed: Thu Feb 13 09:47:16 2014 -0200
----------------------------------------------------------------------
.../services/ComponentTemplateSourceImpl.java | 2 +-
.../internal/services/PageMarkupRenderer.java | 2 +-
.../internal/services/PageResponseRenderer.java | 2 +-
.../services/ServiceAnnotationObjectProvider.java | 2 +-
.../apache/tapestry5/modules/TapestryModule.java | 18 +++++++++---------
.../services/ApplicationInitializer.java | 2 +-
.../services/ClasspathAssetAliasManager.java | 2 +-
.../services/RequestExceptionHandler.java | 2 +-
.../apache/tapestry5/services/RequestGlobals.java | 2 +-
.../apache/tapestry5/services/RequestHandler.java | 2 +-
.../services/ServletApplicationInitializer.java | 2 +-
.../org/apache/tapestry5/services/URLEncoder.java | 2 +-
.../services/assets/StreamableResourceSource.java | 2 +-
.../tapestry5/services/meta/MetaWorker.java | 2 +-
.../integration/app1/CoreBehaviorsTests.java | 4 ++--
.../tapestry5/integration/app1/pages/Index.java | 6 +++---
.../java/org/apache/tapestry5/ioc/AdvisorDef.java | 2 +-
.../org/apache/tapestry5/ioc/ObjectLocator.java | 2 +-
.../tapestry5/ioc/annotations/EagerLoad.java | 2 +-
.../ioc/annotations/PreventServiceDecoration.java | 2 +-
.../apache/tapestry5/ioc/def/DecoratorDef.java | 2 +-
.../org/apache/tapestry5/ioc/def/ServiceDef.java | 6 +++---
.../ioc/internal/EagerLoadServiceProxy.java | 2 +-
.../apache/tapestry5/ioc/internal/ModuleImpl.java | 2 +-
.../tapestry5/ioc/internal/RegistryImpl.java | 2 +-
...oadableServiceImplementationObjectCreator.java | 2 +-
.../services/PerThreadServiceLifecycle.java | 2 +-
.../util/WrongConfigurationTypeGuard.java | 2 +-
.../tapestry5/ioc/services/LoggingDecorator.java | 2 +-
.../ioc/services/RegistryShutdownListener.java | 2 +-
.../groovy/ioc/specs/BridgeBuilderSpec.groovy | 2 +-
.../ioc/specs/ContributionDefImplSpec.groovy | 2 +-
.../ioc/specs/DefaultModuleDefImplSpec.groovy | 2 +-
.../groovy/ioc/specs/PerThreadScopeSpec.groovy | 2 +-
...egistryConstructionAndRuntimeErrorsSpec.groovy | 2 +-
.../src/test/groovy/ioc/specs/ReloadSpec.groovy | 2 +-
.../groovy/ioc/specs/ServiceLookupSpec.groovy | 4 ++--
.../ValidatingConfigurationWrapperSpec.groovy | 2 +-
...alidatingMappedConfigurationWrapperSpec.groovy | 4 ++--
.../services/ServiceProxySerializationSpec.groovy | 2 +-
40 files changed, 55 insertions(+), 55 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/85da163a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentTemplateSourceImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentTemplateSourceImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentTemplateSourceImpl.java
index 87b9b23..d651625 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentTemplateSourceImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentTemplateSourceImpl.java
@@ -42,7 +42,7 @@ import java.util.Locale;
import java.util.Map;
/**
- * NonAnnotatedServiceInterface implementation that manages a cache of parsed component templates.
+ * Service implementation that manages a cache of parsed component templates.
*/
public final class ComponentTemplateSourceImpl extends InvalidationEventHubImpl implements ComponentTemplateSource,
UpdateListener
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/85da163a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageMarkupRenderer.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageMarkupRenderer.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageMarkupRenderer.java
index ad6750f..2ddee2a 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageMarkupRenderer.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageMarkupRenderer.java
@@ -18,7 +18,7 @@ import org.apache.tapestry5.MarkupWriter;
import org.apache.tapestry5.internal.structure.Page;
/**
- * NonAnnotatedServiceInterface used to render page markup using a MarkupWriter. This is used when rendering a complete page as part of a
+ * Service used to render page markup using a MarkupWriter. This is used when rendering a complete page as part of a
* {@linkplain org.apache.tapestry5.internal.services.PageRenderRequestHandlerImpl page render request},
*/
public interface PageMarkupRenderer
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/85da163a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageResponseRenderer.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageResponseRenderer.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageResponseRenderer.java
index 97c30b7..62b5282 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageResponseRenderer.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageResponseRenderer.java
@@ -19,7 +19,7 @@ import org.apache.tapestry5.internal.structure.Page;
import java.io.IOException;
/**
- * NonAnnotatedServiceInterface responsible for writing a full page markup response.
+ * Service responsible for writing a full page markup response.
*/
public interface PageResponseRenderer
{
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/85da163a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ServiceAnnotationObjectProvider.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ServiceAnnotationObjectProvider.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ServiceAnnotationObjectProvider.java
index de68a77..da0b26f 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ServiceAnnotationObjectProvider.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ServiceAnnotationObjectProvider.java
@@ -20,7 +20,7 @@ import org.apache.tapestry5.ioc.ObjectLocator;
import org.apache.tapestry5.ioc.ObjectProvider;
/**
- * Adds support for the {@link NonAnnotatedServiceInterface} annotation (which can be applied to fields or parameters), which is used to
+ * Adds support for the {@link Service} annotation (which can be applied to fields or parameters), which is used to
* disambiguate injection when multiple services implement the same service interface.
*/
public class ServiceAnnotationObjectProvider implements ObjectProvider
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/85da163a/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 0939811..05b9925 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
@@ -376,13 +376,13 @@ public final class TapestryModule
// ========================================================================
//
- // NonAnnotatedServiceInterface Builder Methods (static)
+ // Service Builder Methods (static)
//
// ========================================================================
// ========================================================================
//
- // NonAnnotatedServiceInterface Contribution Methods (static)
+ // Service Contribution Methods (static)
//
// ========================================================================
@@ -710,7 +710,7 @@ public final class TapestryModule
* <dd>Access to properties of resources (log, messages, etc.)</dd>
* <dt>Asset</dt>
* <dd>injection of assets (triggered via {@link Path} annotation), with the path relative to the component class</dd>
- * <dt>NonAnnotatedServiceInterface</dt>
+ * <dt>Service</dt>
* <dd>Ordered last, for use when Inject is present and nothing else works, matches field type against Tapestry IoC
* services</dd>
* </dl>
@@ -730,7 +730,7 @@ public final class TapestryModule
// This needs to be the last one, since it matches against services
// and might blow up if there is no match.
- configuration.addInstance("NonAnnotatedServiceInterface", ServiceInjectionProvider.class, "after:*");
+ configuration.addInstance("Service", ServiceInjectionProvider.class, "after:*");
}
/**
@@ -739,8 +739,8 @@ public final class TapestryModule
* <dt>Asset
* <dt>
* <dd>Checks for the {@link Path} annotation, and injects an {@link Asset}</dd>
- * <dt>NonAnnotatedServiceInterface</dt>
- * <dd>Injects based on the {@link NonAnnotatedServiceInterface} annotation, if present</dd>
+ * <dt>Service</dt>
+ * <dd>Injects based on the {@link Service} annotation, if present</dd>
* <dt>ApplicationMessages</dt>
* <dd>Injects the global application messages</dd>
* </dl>
@@ -754,7 +754,7 @@ public final class TapestryModule
{
configuration.add("Asset", assetObjectProvider, "before:AnnotationBasedContributions");
- configuration.add("NonAnnotatedServiceInterface", new ServiceAnnotationObjectProvider(), "before:AnnotationBasedContributions");
+ configuration.add("Service", new ServiceAnnotationObjectProvider(), "before:AnnotationBasedContributions");
configuration.add("ApplicationMessages", new ApplicationMessageCatalogObjectProvider(locator),
"before:AnnotationBasedContributions");
@@ -1133,7 +1133,7 @@ public final class TapestryModule
// ========================================================================
//
- // NonAnnotatedServiceInterface Builder Methods (instance)
+ // Service Builder Methods (instance)
//
// ========================================================================
@@ -1508,7 +1508,7 @@ public final class TapestryModule
// ========================================================================
//
- // NonAnnotatedServiceInterface Contribution Methods (instance)
+ // Service Contribution Methods (instance)
//
// ========================================================================
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/85da163a/tapestry-core/src/main/java/org/apache/tapestry5/services/ApplicationInitializer.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/ApplicationInitializer.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/ApplicationInitializer.java
index 1ce486a..4674192 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/ApplicationInitializer.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/ApplicationInitializer.java
@@ -17,7 +17,7 @@ package org.apache.tapestry5.services;
import org.apache.tapestry5.ioc.annotations.UsesOrderedConfiguration;
/**
- * NonAnnotatedServiceInterface interface for initializing Tapestry for the application. The service is a {@linkplain
+ * Service interface for initializing Tapestry for the application. The service is a {@linkplain
* org.apache.tapestry5.ioc.services.PipelineBuilder pipeline}, into which {@linkplain
* org.apache.tapestry5.services.ApplicationInitializerFilter filters} may be contributed.
*/
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/85da163a/tapestry-core/src/main/java/org/apache/tapestry5/services/ClasspathAssetAliasManager.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/ClasspathAssetAliasManager.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/ClasspathAssetAliasManager.java
index 5548586..b540780 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/ClasspathAssetAliasManager.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/ClasspathAssetAliasManager.java
@@ -27,7 +27,7 @@ import java.util.Map;
* classpath, is converted into a shorter virtual path. The term "alias" here is generally referred to as
* "virtual folder" elsewhere.
* <p/>
- * NonAnnotatedServiceInterface configuration is a map from folder aliases (short names) to complete paths. Names should not start or end end
+ * Service configuration is a map from folder aliases (short names) to complete paths. Names should not start or end end
* with a slash. Generally, an alias should be a single name (not contain a slash). Paths should also not start or end
* with a slash. An example mapping would be <code>mylib</code> to <code>com/example/mylib</code>.
* <p/>
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/85da163a/tapestry-core/src/main/java/org/apache/tapestry5/services/RequestExceptionHandler.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/RequestExceptionHandler.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/RequestExceptionHandler.java
index 676deec..3d63bf8 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/RequestExceptionHandler.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/RequestExceptionHandler.java
@@ -17,7 +17,7 @@ package org.apache.tapestry5.services;
import java.io.IOException;
/**
- * NonAnnotatedServiceInterface invoked when an uncaught exception occurs. The error handler is responsible for providing a response to the
+ * Service invoked when an uncaught exception occurs. The error handler is responsible for providing a response to the
* user to describe the error.
*/
public interface RequestExceptionHandler
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/85da163a/tapestry-core/src/main/java/org/apache/tapestry5/services/RequestGlobals.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/RequestGlobals.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/RequestGlobals.java
index 7004b10..65f53b1 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/RequestGlobals.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/RequestGlobals.java
@@ -21,7 +21,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
/**
- * NonAnnotatedServiceInterface used to store the current request objects, both the Servlet API versions, and the
+ * Service used to store the current request objects, both the Servlet API versions, and the
* Tapestry generic versions.
* The service has a per-thread scope.
*/
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/85da163a/tapestry-core/src/main/java/org/apache/tapestry5/services/RequestHandler.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/RequestHandler.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/RequestHandler.java
index 8aa33db..9a012c0 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/RequestHandler.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/RequestHandler.java
@@ -19,7 +19,7 @@ import org.apache.tapestry5.ioc.annotations.UsesOrderedConfiguration;
import java.io.IOException;
/**
- * NonAnnotatedServiceInterface interface for the RequestHandler {@linkplain org.apache.tapestry5.ioc.services.PipelineBuilder pipeline}
+ * Service interface for the RequestHandler {@linkplain org.apache.tapestry5.ioc.services.PipelineBuilder pipeline}
* service. At the end of the pipeline, the service hands off to the {@linkplain org.apache.tapestry5.services.Dispatcher
* master dispatcher service}.
*/
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/85da163a/tapestry-core/src/main/java/org/apache/tapestry5/services/ServletApplicationInitializer.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/ServletApplicationInitializer.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/ServletApplicationInitializer.java
index 48eb50d..af3b65d 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/ServletApplicationInitializer.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/ServletApplicationInitializer.java
@@ -19,7 +19,7 @@ import org.apache.tapestry5.ioc.annotations.UsesOrderedConfiguration;
import javax.servlet.ServletContext;
/**
- * NonAnnotatedServiceInterface interface for initializing a servlet application, as a {@linkplain org.apache.tapestry5.ioc.services.PipelineBuilder
+ * Service interface for initializing a servlet application, as a {@linkplain org.apache.tapestry5.ioc.services.PipelineBuilder
* pipeline}. The terminator hands off to the {@link org.apache.tapestry5.services.ApplicationInitializer} service.
*/
@UsesOrderedConfiguration(ServletApplicationInitializerFilter.class)
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/85da163a/tapestry-core/src/main/java/org/apache/tapestry5/services/URLEncoder.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/URLEncoder.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/URLEncoder.java
index 10e7ab6..2bc0e63 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/URLEncoder.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/URLEncoder.java
@@ -15,7 +15,7 @@
package org.apache.tapestry5.services;
/**
- * NonAnnotatedServiceInterface used to encode or decode strings that are placed into URLs. This is used as an alternative to UUEncoding.
+ * Service used to encode or decode strings that are placed into URLs. This is used as an alternative to UUEncoding.
* Alphabetics, numbers and some punctuation ("-", "_", ".", ":") are passed through as is, the "$" character is an
* escape, followed by either another "$", or by a four digit hex unicode number. A null input (not a blank input, but
* actual null) has a special encoding, "$N". Likewise, the blank string has the special encoding "$B".
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/85da163a/tapestry-core/src/main/java/org/apache/tapestry5/services/assets/StreamableResourceSource.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/assets/StreamableResourceSource.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/assets/StreamableResourceSource.java
index ac885c6..4a35499 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/assets/StreamableResourceSource.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/assets/StreamableResourceSource.java
@@ -24,7 +24,7 @@ import java.util.Set;
* Converts {@link Resource}s into {@link StreamableResource}s, and may be responsible for
* {@linkplain ResourceTransformer transforming} resources based on file extension. Contributions map a file extension
* (such as "coffee") to a transformer for that file extension.
- * NonAnnotatedServiceInterface decorators added to this service may provide additional processing (compression, minimization, and caching).
+ * Service decorators added to this service may provide additional processing (compression, minimization, and caching).
*
* @since 5.3
*/
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/85da163a/tapestry-core/src/main/java/org/apache/tapestry5/services/meta/MetaWorker.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/meta/MetaWorker.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/meta/MetaWorker.java
index 0e80540..5edf83c 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/meta/MetaWorker.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/meta/MetaWorker.java
@@ -18,7 +18,7 @@ import org.apache.tapestry5.ioc.annotations.UsesMappedConfiguration;
import org.apache.tapestry5.services.transform.ComponentClassTransformWorker2;
/**
- * NonAnnotatedServiceInterface that makes it easy to identify a class annotation and use its presence, or the value of an attribute,
+ * Service that makes it easy to identify a class annotation and use its presence, or the value of an attribute,
* to set a meta-data key. The configuration map class annotation types to corresponding extractors who will be invoked
* when the annotation is present. Most commonly, a {@link FixedExtractor} is used to set a fixed value to a fixed key,
* triggered by the presence of the corresponding annotation.
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/85da163a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/CoreBehaviorsTests.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/CoreBehaviorsTests.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/CoreBehaviorsTests.java
index 388ec13..1655716 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/CoreBehaviorsTests.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/CoreBehaviorsTests.java
@@ -1541,7 +1541,7 @@ public class CoreBehaviorsTests extends App1TestCase
@Test
public void module_loading()
{
- openLinks("Test Only NonAnnotatedServiceInterface Demo");
+ openLinks("Test Only Service Demo");
assertText("message", "TestOnly service message");
}
@@ -1593,7 +1593,7 @@ public class CoreBehaviorsTests extends App1TestCase
@Test
public void injection_of_application_message_catalog_into_service()
{
- openLinks("Inject Global Messages into NonAnnotatedServiceInterface Demo");
+ openLinks("Inject Global Messages into Service Demo");
assertText("status", "Application Catalog Working");
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/85da163a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Index.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Index.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Index.java
index 32afdf3..4df619a 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Index.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Index.java
@@ -128,10 +128,10 @@ public class Index
new Item("RenderNotificationDemo", "RenderNotification Demo", "Use of RenderNotification mixin"),
- new Item("InjectMessagesDemo", "Inject Global Messages into NonAnnotatedServiceInterface Demo",
+ new Item("InjectMessagesDemo", "Inject Global Messages into Service Demo",
"Ensure that it is possible to inject the application global message catalog into a service"),
- new Item("ReloadDemo", "Reloadable NonAnnotatedServiceInterface Implementation Demo",
+ new Item("ReloadDemo", "Reloadable Service Implementation Demo",
"Used when manually testing service reloads"),
new Item("RequestParameterDemo", "RequestParameter Annotation Demo",
@@ -144,7 +144,7 @@ public class Index
new Item("PageResetDemo", "PageReset Annotation Demo",
"Use of PageReset annotation to re-initialize page state"),
- new Item("TestOnlyServiceDemo", "Test Only NonAnnotatedServiceInterface Demo",
+ new Item("TestOnlyServiceDemo", "Test Only Service Demo",
"IoC module available via web.xml configuration"),
new Item("RenderObjectExceptionDemo", "RenderObject Exception Demo",
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/85da163a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/AdvisorDef.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/AdvisorDef.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/AdvisorDef.java
index 30687e3..ef71125 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/AdvisorDef.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/AdvisorDef.java
@@ -17,7 +17,7 @@ package org.apache.tapestry5.ioc;
import org.apache.tapestry5.ioc.def.ServiceDef;
/**
- * Definition of a service advisor, which (by default) is derived from a service advisor method. NonAnnotatedServiceInterface advisor methods
+ * Definition of a service advisor, which (by default) is derived from a service advisor method. Service advisor methods
* are static or instance methods on module classes prefixed with "advise". When a service is realized, a list of
* matching AdvisorDefs is generated, then ordered, and from each a {@link org.apache.tapestry5.ioc.ServiceAdvisor} is
* obtained and invoked.
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/85da163a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ObjectLocator.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ObjectLocator.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ObjectLocator.java
index 64ea9b5..81d1f77 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ObjectLocator.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ObjectLocator.java
@@ -36,7 +36,7 @@ public interface ObjectLocator
* transparent to the application).
*
* @param <T>
- * @param serviceId unique NonAnnotatedServiceInterface id used to locate the service object (may contain <em>symbols</em>,
+ * @param serviceId unique Service id used to locate the service object (may contain <em>symbols</em>,
* which
* will be expanded), case is ignored
* @param serviceInterface the interface implemented by the service (or an interface extended by the service
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/85da163a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/EagerLoad.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/EagerLoad.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/EagerLoad.java
index 7bf7b1b..f67c67d 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/EagerLoad.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/EagerLoad.java
@@ -24,7 +24,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
/**
* Marker annotation placed on a service builder method to indicate that the service should be eagerly loaded: realized
- * as if a service method had been invoked. NonAnnotatedServiceInterface realization invokes the service builder method and applys any
+ * as if a service method had been invoked. Service realization invokes the service builder method and applys any
* decorators to the service.
* <p/>
* This annotation may also be placed directly on a service implementation class, when using autobuilding via the {@link
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/85da163a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/PreventServiceDecoration.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/PreventServiceDecoration.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/PreventServiceDecoration.java
index a97436f..6c78cb7 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/PreventServiceDecoration.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/PreventServiceDecoration.java
@@ -26,7 +26,7 @@ import java.lang.annotation.*;
* The annotation may also be placed on a module class, to indicate that all services defined for the module should not
* allow decoration.
* <p/>
- * NonAnnotatedServiceInterface decoration includes the decoration mechanism (from Tapestry 5.0) and the newer service advice mechanism (from
+ * Service decoration includes the decoration mechanism (from Tapestry 5.0) and the newer service advice mechanism (from
* Tapestry 5.1).
* <p/>
* Generally, services that are used to advise or decorate other services (such as {@link org.apache.tapestry5.ioc.services.LoggingAdvisor}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/85da163a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/def/DecoratorDef.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/def/DecoratorDef.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/def/DecoratorDef.java
index 61595a8..7c3c663 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/def/DecoratorDef.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/def/DecoratorDef.java
@@ -36,7 +36,7 @@ import org.apache.tapestry5.ioc.ServiceResources;
* the Security interceptor, which would delegate to the Transaction interceptor, which would finally delegate to the
* core service implementation.
* <p/>
- * NonAnnotatedServiceInterface decorators are part of the initial version of Tapestry IoC. Starting in release 5.1, their use has been
+ * Service decorators are part of the initial version of Tapestry IoC. Starting in release 5.1, their use has been
* deprecated, in favor of {@link org.apache.tapestry5.ioc.AdvisorDef}, which is based on {@link
* org.apache.tapestry5.ioc.services.AspectInterceptorBuilder}.
* <p/>
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/85da163a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/def/ServiceDef.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/def/ServiceDef.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/def/ServiceDef.java
index b04d4ff..7b31f8a 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/def/ServiceDef.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/def/ServiceDef.java
@@ -22,7 +22,7 @@ import org.apache.tapestry5.ioc.services.ServiceLifecycleSource;
import java.util.Set;
/**
- * NonAnnotatedServiceInterface definition derived, by default, from a service builder method. This has been extended in Tapestry 5.1 with
+ * Service definition derived, by default, from a service builder method. This has been extended in Tapestry 5.1 with
* {@link org.apache.tapestry5.ioc.def.ServiceDef2}, which adds additional methods. Tapestry 5.3 added {@link ServiceDef3}.
*/
@SuppressWarnings("rawtypes")
@@ -37,8 +37,8 @@ public interface ServiceDef
ObjectCreator createServiceCreator(ServiceBuilderResources resources);
/**
- * Returns the service id, derived from the method name or the unqualified service interface name. NonAnnotatedServiceInterface ids must
- * be unique among <em>all</em> services in all modules. NonAnnotatedServiceInterface ids are used in a heavy handed way to support
+ * Returns the service id, derived from the method name or the unqualified service interface name. Service ids must
+ * be unique among <em>all</em> services in all modules. Service ids are used in a heavy handed way to support
* ultimate disambiguation, but their primary purpose is to support service contribution methods.
*/
String getServiceId();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/85da163a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/EagerLoadServiceProxy.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/EagerLoadServiceProxy.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/EagerLoadServiceProxy.java
index 8b6c398..5ad53cd 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/EagerLoadServiceProxy.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/EagerLoadServiceProxy.java
@@ -15,7 +15,7 @@
package org.apache.tapestry5.ioc.internal;
/**
- * Interface implemented by all service proxies. NonAnnotatedServiceInterface proxies are always {@link
+ * Interface implemented by all service proxies. Service proxies are always {@link
* org.apache.tapestry5.ioc.services.RegistryShutdownListener}s, they also can be eager-load
*/
public interface EagerLoadServiceProxy
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/85da163a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ModuleImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ModuleImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ModuleImpl.java
index 3c291e3..69b8d4d 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ModuleImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ModuleImpl.java
@@ -280,7 +280,7 @@ public class ModuleImpl implements Module
if (lifecycle.requiresProxy())
throw new IllegalArgumentException(
String.format(
- "NonAnnotatedServiceInterface scope '%s' requires a proxy, but the service does not have a service interface (necessary to create a proxy). Provide a service interface or select a different service scope.",
+ "Service scope '%s' requires a proxy, but the service does not have a service interface (necessary to create a proxy). Provide a service interface or select a different service scope.",
def.getServiceScope()));
return creator.createObject();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/85da163a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/RegistryImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/RegistryImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/RegistryImpl.java
index aecbab9..628cde7 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/RegistryImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/RegistryImpl.java
@@ -445,7 +445,7 @@ public class RegistryImpl implements Registry, InternalRegistry, ServiceProxyPro
Module module = serviceIdToModule.get(serviceId);
if (module == null)
- throw new UnknownValueException(String.format("NonAnnotatedServiceInterface id '%s' is not defined by any module.", serviceId),
+ throw new UnknownValueException(String.format("Service id '%s' is not defined by any module.", serviceId),
new AvailableValues("Defined service ids", serviceIdToModule));
return module;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/85da163a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ReloadableServiceImplementationObjectCreator.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ReloadableServiceImplementationObjectCreator.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ReloadableServiceImplementationObjectCreator.java
index b1d0232..93baf33 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ReloadableServiceImplementationObjectCreator.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ReloadableServiceImplementationObjectCreator.java
@@ -45,7 +45,7 @@ public class ReloadableServiceImplementationObjectCreator extends AbstractReload
if (constructor == null)
throw new RuntimeException(String.format(
- "NonAnnotatedServiceInterface implementation class %s does not have a suitable public constructor.", clazz.getName()));
+ "Service implementation class %s does not have a suitable public constructor.", clazz.getName()));
ObjectCreator constructorServiceCreator = new ConstructorServiceCreator(resources, constructor.toString(),
constructor);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/85da163a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerThreadServiceLifecycle.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerThreadServiceLifecycle.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerThreadServiceLifecycle.java
index ae606d2..5b17ce0 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerThreadServiceLifecycle.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerThreadServiceLifecycle.java
@@ -25,7 +25,7 @@ import org.apache.tapestry5.ioc.services.PlasticProxyFactory;
* Allows a service to exist "per thread" (in each thread). Creates a proxy that delegates to a per-thread instance.
* <p/>
* This scheme ensures that, although the service builder method will be invoked many times over the life of the
- * application, the service decoration process occurs only once. The final calling chain is: NonAnnotatedServiceInterface Proxy -->
+ * application, the service decoration process occurs only once. The final calling chain is: Service Proxy -->
* Interceptor(s) (from Decorators) --> Advise Proxy (from Advisiors) --> PerThread Proxy --> (per thread)
* instance.
*/
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/85da163a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/WrongConfigurationTypeGuard.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/WrongConfigurationTypeGuard.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/WrongConfigurationTypeGuard.java
index db2de0e..b18cb0a 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/WrongConfigurationTypeGuard.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/WrongConfigurationTypeGuard.java
@@ -37,7 +37,7 @@ public class WrongConfigurationTypeGuard implements InjectionResources
public <T> T findResource(Class<T> type, Type genericType)
{
if (type == guardType)
- throw new IllegalArgumentException(String.format("NonAnnotatedServiceInterface '%s' is configured using %s, not %s.",
+ throw new IllegalArgumentException(String.format("Service '%s' is configured using %s, not %s.",
serviceId,
expectedType.getName(), guardType.getName()));
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/85da163a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/LoggingDecorator.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/LoggingDecorator.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/LoggingDecorator.java
index 2b79b0a..be0c43e 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/LoggingDecorator.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/LoggingDecorator.java
@@ -17,7 +17,7 @@ package org.apache.tapestry5.ioc.services;
import org.slf4j.Logger;
/**
- * NonAnnotatedServiceInterface that can create a logging interceptor that wraps around a service implementation (or interceptor). The
+ * Service that can create a logging interceptor that wraps around a service implementation (or interceptor). The
* interceptor works with the service's log to log, at debug level, method entry (with arguments), method exit (with
* return value, if any) as well as any thrown exceptions.
* <p/>
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/85da163a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/RegistryShutdownListener.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/RegistryShutdownListener.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/RegistryShutdownListener.java
index e7633c4..edf3b0b 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/RegistryShutdownListener.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/RegistryShutdownListener.java
@@ -25,7 +25,7 @@ import java.util.EventListener;
public interface RegistryShutdownListener extends EventListener
{
/**
- * Invoked when the registry shuts down, giving services a chance to perform any final operations. NonAnnotatedServiceInterface
+ * Invoked when the registry shuts down, giving services a chance to perform any final operations. Service
* implementations should not attempt to invoke methods on other services (via proxies) as the service proxies may
* themselves be shutdown.
*/
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/85da163a/tapestry-ioc/src/test/groovy/ioc/specs/BridgeBuilderSpec.groovy
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/groovy/ioc/specs/BridgeBuilderSpec.groovy b/tapestry-ioc/src/test/groovy/ioc/specs/BridgeBuilderSpec.groovy
index 204a584..402d3a9 100644
--- a/tapestry-ioc/src/test/groovy/ioc/specs/BridgeBuilderSpec.groovy
+++ b/tapestry-ioc/src/test/groovy/ioc/specs/BridgeBuilderSpec.groovy
@@ -60,7 +60,7 @@ class BridgeBuilderSpec extends AbstractSharedRegistrySpecification {
ToStringService service = new ToStringService() {
- String toString() { "NonAnnotatedServiceInterface" }
+ String toString() { "Service" }
}
ToStringFilter filter = new ToStringFilter() {
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/85da163a/tapestry-ioc/src/test/groovy/ioc/specs/ContributionDefImplSpec.groovy
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/groovy/ioc/specs/ContributionDefImplSpec.groovy b/tapestry-ioc/src/test/groovy/ioc/specs/ContributionDefImplSpec.groovy
index fe498c7..e85c516 100644
--- a/tapestry-ioc/src/test/groovy/ioc/specs/ContributionDefImplSpec.groovy
+++ b/tapestry-ioc/src/test/groovy/ioc/specs/ContributionDefImplSpec.groovy
@@ -159,7 +159,7 @@ class ContributionDefImplSpec extends Specification {
RuntimeException e = thrown()
- e.message.contains "NonAnnotatedServiceInterface 'Foo' is configured using org.apache.tapestry5.ioc.Configuration, not org.apache.tapestry5.ioc.MappedConfiguration."
+ e.message.contains "Service 'Foo' is configured using org.apache.tapestry5.ioc.Configuration, not org.apache.tapestry5.ioc.MappedConfiguration."
}
def "ordered configuration injects and contributes a service via @InjectService"() {
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/85da163a/tapestry-ioc/src/test/groovy/ioc/specs/DefaultModuleDefImplSpec.groovy
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/groovy/ioc/specs/DefaultModuleDefImplSpec.groovy b/tapestry-ioc/src/test/groovy/ioc/specs/DefaultModuleDefImplSpec.groovy
index 9682a4b..d017dfc 100644
--- a/tapestry-ioc/src/test/groovy/ioc/specs/DefaultModuleDefImplSpec.groovy
+++ b/tapestry-ioc/src/test/groovy/ioc/specs/DefaultModuleDefImplSpec.groovy
@@ -144,7 +144,7 @@ class DefaultModuleDefImplSpec extends Specification {
RuntimeException ex = thrown()
- ex.message.contains "NonAnnotatedServiceInterface Fred (defined by ${ServiceIdConflictMethodModule.name}.buildFred()"
+ ex.message.contains "Service Fred (defined by ${ServiceIdConflictMethodModule.name}.buildFred()"
ex.message.contains "conflicts with previously defined service defined by ${ServiceIdConflictMethodModule.name}.buildFred(Object)"
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/85da163a/tapestry-ioc/src/test/groovy/ioc/specs/PerThreadScopeSpec.groovy
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/groovy/ioc/specs/PerThreadScopeSpec.groovy b/tapestry-ioc/src/test/groovy/ioc/specs/PerThreadScopeSpec.groovy
index b771e4b..d79c6ce 100644
--- a/tapestry-ioc/src/test/groovy/ioc/specs/PerThreadScopeSpec.groovy
+++ b/tapestry-ioc/src/test/groovy/ioc/specs/PerThreadScopeSpec.groovy
@@ -57,7 +57,7 @@ class PerThreadScopeSpec extends AbstractRegistrySpecification {
Exception e = thrown()
e.message.contains "Error building service proxy for service 'ScopeRequiresAProxyAndNoInterfaceIsProvided'"
- e.message.contains "NonAnnotatedServiceInterface scope 'perthread' requires a proxy"
+ e.message.contains "Service scope 'perthread' requires a proxy"
}
def "ensure that perthread services are discarded by cleanupThread()"() {
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/85da163a/tapestry-ioc/src/test/groovy/ioc/specs/RegistryConstructionAndRuntimeErrorsSpec.groovy
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/groovy/ioc/specs/RegistryConstructionAndRuntimeErrorsSpec.groovy b/tapestry-ioc/src/test/groovy/ioc/specs/RegistryConstructionAndRuntimeErrorsSpec.groovy
index fc8ca85..a746d07 100644
--- a/tapestry-ioc/src/test/groovy/ioc/specs/RegistryConstructionAndRuntimeErrorsSpec.groovy
+++ b/tapestry-ioc/src/test/groovy/ioc/specs/RegistryConstructionAndRuntimeErrorsSpec.groovy
@@ -20,7 +20,7 @@ class RegistryConstructionAndRuntimeErrorsSpec extends AbstractRegistrySpecifica
RuntimeException ex = thrown()
- ex.message.startsWith "NonAnnotatedServiceInterface id 'Fred' has already been defined by"
+ ex.message.startsWith "Service id 'Fred' has already been defined by"
// Can't check entire message, can't guarantee what order modules will be processed in
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/85da163a/tapestry-ioc/src/test/groovy/ioc/specs/ReloadSpec.groovy
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/groovy/ioc/specs/ReloadSpec.groovy b/tapestry-ioc/src/test/groovy/ioc/specs/ReloadSpec.groovy
index 20f2bda..143f1b9 100644
--- a/tapestry-ioc/src/test/groovy/ioc/specs/ReloadSpec.groovy
+++ b/tapestry-ioc/src/test/groovy/ioc/specs/ReloadSpec.groovy
@@ -311,7 +311,7 @@ class ReloadSpec extends Specification {
Exception e = thrown()
- e.message == "NonAnnotatedServiceInterface implementation class com.example.ReloadableServiceImpl does not have a suitable public constructor."
+ e.message == "Service implementation class com.example.ReloadableServiceImpl does not have a suitable public constructor."
}
def "ensure ReloadAware services are notified when services are reloaded"() {
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/85da163a/tapestry-ioc/src/test/groovy/ioc/specs/ServiceLookupSpec.groovy
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/groovy/ioc/specs/ServiceLookupSpec.groovy b/tapestry-ioc/src/test/groovy/ioc/specs/ServiceLookupSpec.groovy
index 7bee080..c976a73 100644
--- a/tapestry-ioc/src/test/groovy/ioc/specs/ServiceLookupSpec.groovy
+++ b/tapestry-ioc/src/test/groovy/ioc/specs/ServiceLookupSpec.groovy
@@ -36,7 +36,7 @@ class ServiceLookupSpec extends AbstractRegistrySpecification {
RuntimeException e = thrown()
- e.message.contains "NonAnnotatedServiceInterface id 'PeekABoo' is not defined by any module."
+ e.message.contains "Service id 'PeekABoo' is not defined by any module."
}
def "verify exception when accessing a service by type and there are no matching services"() {
@@ -65,7 +65,7 @@ class ServiceLookupSpec extends AbstractRegistrySpecification {
RuntimeException e = thrown()
- e.message == "NonAnnotatedServiceInterface interface org.apache.tapestry5.ioc.Pingable is matched by 2 services: Barney, Fred. Automatic dependency resolution requires that exactly one service implement the interface."
+ e.message == "Service interface org.apache.tapestry5.ioc.Pingable is matched by 2 services: Barney, Fred. Automatic dependency resolution requires that exactly one service implement the interface."
}
def "access to builtin service via marker annotation"() {
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/85da163a/tapestry-ioc/src/test/groovy/ioc/specs/ValidatingConfigurationWrapperSpec.groovy
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/groovy/ioc/specs/ValidatingConfigurationWrapperSpec.groovy b/tapestry-ioc/src/test/groovy/ioc/specs/ValidatingConfigurationWrapperSpec.groovy
index 37899fb..c76cb3c 100644
--- a/tapestry-ioc/src/test/groovy/ioc/specs/ValidatingConfigurationWrapperSpec.groovy
+++ b/tapestry-ioc/src/test/groovy/ioc/specs/ValidatingConfigurationWrapperSpec.groovy
@@ -75,6 +75,6 @@ class ValidatingConfigurationWrapperSpec extends Specification {
NullPointerException e = thrown()
- e.message == "NonAnnotatedServiceInterface contribution (to service 'Baz') was null."
+ e.message == "Service contribution (to service 'Baz') was null."
}
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/85da163a/tapestry-ioc/src/test/groovy/ioc/specs/ValidatingMappedConfigurationWrapperSpec.groovy
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/groovy/ioc/specs/ValidatingMappedConfigurationWrapperSpec.groovy b/tapestry-ioc/src/test/groovy/ioc/specs/ValidatingMappedConfigurationWrapperSpec.groovy
index ea55ace..60241a7 100644
--- a/tapestry-ioc/src/test/groovy/ioc/specs/ValidatingMappedConfigurationWrapperSpec.groovy
+++ b/tapestry-ioc/src/test/groovy/ioc/specs/ValidatingMappedConfigurationWrapperSpec.groovy
@@ -97,7 +97,7 @@ class ValidatingMappedConfigurationWrapperSpec extends AbstractSharedRegistrySpe
IllegalArgumentException e = thrown()
- e.message.contains "NonAnnotatedServiceInterface contribution (to service 'Baz') conflicts with existing contribution"
+ e.message.contains "Service contribution (to service 'Baz') conflicts with existing contribution"
keyToContribution[Integer].is(def1)
map.isEmpty()
@@ -148,7 +148,7 @@ class ValidatingMappedConfigurationWrapperSpec extends AbstractSharedRegistrySpe
NullPointerException e = thrown()
- e.message == "NonAnnotatedServiceInterface contribution (to service 'Baz') was null."
+ e.message == "Service contribution (to service 'Baz') was null."
map.isEmpty()
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/85da163a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ServiceProxySerializationSpec.groovy
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ServiceProxySerializationSpec.groovy b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ServiceProxySerializationSpec.groovy
index 3acb289..a68ae6e 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ServiceProxySerializationSpec.groovy
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ServiceProxySerializationSpec.groovy
@@ -53,7 +53,7 @@ class ServiceProxySerializationSpec extends AbstractRegistrySpecification {
Exception e = thrown()
- e.message.contains "NonAnnotatedServiceInterface token for service 'TypeCoercer' can not be converted back into a proxy because no proxy provider has been registered"
+ e.message.contains "Service token for service 'TypeCoercer' can not be converted back into a proxy because no proxy provider has been registered"
}
def serialize(object) {
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/tapestry-5
Posted by th...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tapestry-5
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/76982d56
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/76982d56
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/76982d56
Branch: refs/heads/master
Commit: 76982d56fd3c58d24e318242fe6da90796747a07
Parents: 85da163 52c6f6c
Author: Thiago H. de Paula Figueiredo <th...@apache.org>
Authored: Thu Feb 13 13:09:41 2014 -0200
Committer: Thiago H. de Paula Figueiredo <th...@apache.org>
Committed: Thu Feb 13 13:09:41 2014 -0200
----------------------------------------------------------------------
plastic/build.gradle | 5 +++--
settings.gradle | 2 +-
.../webresources/internal/invoke-coffeescript.js | 12 ++++++------
3 files changed, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/tapestry-5
Posted by th...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tapestry-5
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/76982d56
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/76982d56
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/76982d56
Branch: refs/heads/master
Commit: 76982d56fd3c58d24e318242fe6da90796747a07
Parents: 85da163 52c6f6c
Author: Thiago H. de Paula Figueiredo <th...@apache.org>
Authored: Thu Feb 13 13:09:41 2014 -0200
Committer: Thiago H. de Paula Figueiredo <th...@apache.org>
Committed: Thu Feb 13 13:09:41 2014 -0200
----------------------------------------------------------------------
plastic/build.gradle | 5 +++--
settings.gradle | 2 +-
.../webresources/internal/invoke-coffeescript.js | 12 ++++++------
3 files changed, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------