http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JavaScriptStack.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JavaScriptStack.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JavaScriptStack.java index b9f55d9..777c7a1 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JavaScriptStack.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JavaScriptStack.java @@ -26,17 +26,17 @@ import java.util.List; * and the may be no libraries in the core stack by Tapestry 5.5). Other component libraries may * define additional stacks for related sets of resources, for example, to bundle together some portion * of the ExtJS or YUI libraries. - * <p/> + * * The JavaScript assets of a stack may (when {@linkplain SymbolConstants#COMBINE_SCRIPTS enabled}) be exposed to the * client as a single URL (identifying the stack by name). The individual JavaScript assets are combined into a single virtual * asset, which is then streamed to the client. The individual JavaScript libraries, or the combined virtual library, * may be {@linkplain SymbolConstants#MINIFICATION_ENABLED minimized} and the content (both compressed and * uncompressed) cached. - * <p/> + * * Implementations may need to inject the {@link ThreadLocale} service in order to determine the current locale (if any * of the JavaScript library or stylesheet assets are localized). They will generally need to inject the * {@link AssetSource} service as well. - * <p/> + * * The {@link ExtensibleJavaScriptStack} is the best way to create new stacks. * * @see ThreadLocale
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JavaScriptSupport.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JavaScriptSupport.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JavaScriptSupport.java index 3ea1bee..526144d 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JavaScriptSupport.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JavaScriptSupport.java @@ -1,5 +1,3 @@ -// Copyright 2010-2013 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. // You may obtain a copy of the License at @@ -28,17 +26,17 @@ import org.apache.tapestry5.services.EnvironmentalShadowBuilder; * The JavaScriptSupport environmental is very stateful, accumulating JavaScript stacks, libraries and initialization * code until the end of the main page render; it then updates the rendered DOM (adding <script> tags to the * <head> and <body>) before the document is streamed to the client. - * <p/> + * * JavaScriptSupport is normally accessed within a component by using the {@link Environmental} annotation on a * component field. In addition, JavaScriptSupport may also be accessed as a service (the service * {@linkplain EnvironmentalShadowBuilder internally delegates to the current environmental instance}), which is useful * for service-layer objects. - * <p/> + * * The term "import" is used on many methods to indicate that the indicated resource (stack, library or stylesheet) will * only be added to the final cocument once, even when there are repeated calls. - * <p/> + * * The name is slightly a misnomer, since there's a side-line of {@linkplain #importStylesheet(StylesheetLink)} as well. - * <p/> + * * JavaScriptSupport works equally well inside an Ajax request that produces a JSON-formatted partial page update response. * * @see org.apache.tapestry5.internal.services.DocumentLinker @@ -213,7 +211,7 @@ public interface JavaScriptSupport * {@linkplain SymbolConstants#COMBINE_SCRIPTS JavaScript aggregation} in enabled, the stack will be represented by * a single virtual URL; otherwise the individual asset URLs of the stack * will be added to the document. - * <p/> + * * Please refer to the {@linkplain #importJavaScriptLibrary(Asset) notes about libraries vs. modules}. * * @param stackName @@ -224,7 +222,7 @@ public interface JavaScriptSupport /** * Import a Javascript library with an arbitrary URL. - * <p/> + * * Please refer to the {@linkplain #importJavaScriptLibrary(Asset) notes about libraries vs. modules}. */ JavaScriptSupport importJavaScriptLibrary(String libraryURL); @@ -248,11 +246,11 @@ public interface JavaScriptSupport * (optionally) de-reference a function exported by the module (or, treat the module as exporting a single * implicit function). The function will be invoked. Use the returned {@link Initialization} to specify the function name * to invoke, and the parameters to pass to the function. - * <p/> + * * In some cases, a module exports no functions, but performs some initialization (typically, adding document-level * event handlers), in which case a call to require() is sufficient. In cases where the module, or a function * within the module, are invoked with no parameters, the calls will be collapsed into a single invocation. - * <p/> + * * If the module is part of a {@linkplain org.apache.tapestry5.services.javascript.JavaScriptStack#getModules() JavaScript stack}, * then the stack will be imported; this is important when {@linkplain SymbolConstants#COMBINE_SCRIPTS JavaScript aggregation is enabled}, * but also ensures that libraries in the stack are loaded before the module (for cases where the http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/ModuleConfigurationCallback.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/ModuleConfigurationCallback.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/ModuleConfigurationCallback.java index 5bc60cb..79c5d00 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/ModuleConfigurationCallback.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/ModuleConfigurationCallback.java @@ -1,5 +1,3 @@ -// Copyright 2013 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. // You may obtain a copy of the License at @@ -24,10 +22,10 @@ import org.apache.tapestry5.json.JSONObject; * This allows components, pages, mixins and services to configure Require.JS dynamically in a * per-request basis by using the * {@link JavaScriptSupport#addModuleConfigurationCallback(ModuleConfigurationCallback)} method. - * <p/> + * * Note that RequireJS is only configured during a full page render; on Ajax requests, RequireJS * will already be loaded and configured. - * <p/> + * * * @see JavaScriptSupport#addModuleConfigurationCallback(ModuleConfigurationCallback) * @since 5.4 http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/ModuleManager.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/ModuleManager.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/ModuleManager.java index 5496133..fa23295 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/ModuleManager.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/ModuleManager.java @@ -1,5 +1,3 @@ -// Copyright 2012-2013 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. // You may obtain a copy of the License at @@ -22,7 +20,7 @@ import java.util.List; /** * Responsible for managing access to the JavaScript modules. - * <p/> + * * The configuration of the service allows overrides of the default search path; the configuration keys * are module names, and the configuration values are the {@link JavaScriptModuleConfiguration} definitions for those module names. * This is primarily used to wrap non-AMD compliant libraries for use with RequireJS (via contributed {@link JavaScriptModuleConfiguration}s). http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/StackExtensionType.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/StackExtensionType.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/StackExtensionType.java index b6232f8..a4f0d7b 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/StackExtensionType.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/StackExtensionType.java @@ -57,11 +57,11 @@ public enum StackExtensionType * In development mode (with aggregation disabled), the library will be included individually. * Unlike the RequireJS {@code r.js} tool, this does not process * dependencies and is based on a simple regular expression parser. - * <p/> + * * Note that this only loads the module's <em>code</em> and defines the module as available; * the module's function will not be invoked unless {@link JavaScriptSupport#require(String)} is invoked to establish * a dependency. - * <p/> + * * Note that at this time, {@linkplain JavaScriptModuleConfiguration#exports(String) shimmed modules} can not * be aggregated into stacks properly; the shimmed module will be aggregated, but then will still be loaded via * a subsequent HTTP request. http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/services/linktransform/ComponentEventLinkTransformer.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/linktransform/ComponentEventLinkTransformer.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/linktransform/ComponentEventLinkTransformer.java index 356d58f..08556e3 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/services/linktransform/ComponentEventLinkTransformer.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/linktransform/ComponentEventLinkTransformer.java @@ -1,5 +1,3 @@ -// Copyright 2010 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. // You may obtain a copy of the License at @@ -24,7 +22,7 @@ import org.apache.tapestry5.services.Request; /** * Allows for selective replacement of the default {@link Link} used to represent a component event request. * This is a service, but also the contribution to the service, as a chain of command. - * <p> + * * This transformer follows the same pattern as {@link PageRenderLinkTransformer}. * * @since 5.2.0 @@ -48,7 +46,7 @@ public interface ComponentEventLinkTransformer * {@link #transformComponentEventLink(Link, ComponentEventRequestParameters)}. The transformer * is also responsible for identifying the locale in the request (as part of the path, or as a * query parameter or cookie) and setting the locale for the request. - * <p> + * * This method will be invoked from the {@link ComponentEventDispatcher} and a non-null value returned from this * method will prevent the default * {@link org.apache.tapestry5.services.ComponentEventLinkEncoder#decodeComponentEventRequest(Request)} method http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/services/linktransform/PageRenderLinkTransformer.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/linktransform/PageRenderLinkTransformer.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/linktransform/PageRenderLinkTransformer.java index 0f90d6b..03b8133 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/services/linktransform/PageRenderLinkTransformer.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/linktransform/PageRenderLinkTransformer.java @@ -1,5 +1,3 @@ -// Copyright 2010 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. // You may obtain a copy of the License at @@ -25,7 +23,7 @@ import org.apache.tapestry5.services.Request; /** * Allows the default {@link Link} for a page render request to be replaced. * This is a service, but also the contribution to the service, as a chain of command. - * <p> + * * A contributed implementation of this interface is expected to identify which requests it wants to transform. The * {@link #transformPageRenderLink(Link, PageRenderRequestParameters)} method can return a {@link Link} that is allowed * to differ from Tapestry normal default. Later, when that request is triggered, @@ -53,7 +51,7 @@ public interface PageRenderLinkTransformer * {@link #transformPageRenderLink(Link, PageRenderRequestParameters)}. The transformer * is also responsible for identifying the locale in the request (as part of the path, or as a * query parameter or cookie) and setting the locale for the request. - * <p> + * * This method will be invoked from the {@link PageRenderDispatcher} and a non-null value returned from this method * will prevent the default {@link ComponentEventLinkEncoder#decodePageRenderRequest(Request)} method from being * invoked. http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/services/pageload/PagePreloader.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/pageload/PagePreloader.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/pageload/PagePreloader.java index 1312b23..328ed6f 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/services/pageload/PagePreloader.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/pageload/PagePreloader.java @@ -17,9 +17,9 @@ import org.apache.tapestry5.ioc.annotations.UsesConfiguration; /** * Used to perform a pre-load of pages, at startup time. This helps ensure that the first actual * request is processed promptly. - * <p/> + * * The configuration is simply the logical names of pages to load initially. - * <p/> + * * Pages are loaded in the default locale (the first locale listed in * {@link org.apache.tapestry5.SymbolConstants#SUPPORTED_LOCALES}). This ensures that the majority * of class loading and transformation, template parsing, and so forth occurs immediately (loading http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/services/templates/ComponentTemplateLocator.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/templates/ComponentTemplateLocator.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/templates/ComponentTemplateLocator.java index c3f4e8f..d7a4335 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/services/templates/ComponentTemplateLocator.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/templates/ComponentTemplateLocator.java @@ -1,5 +1,3 @@ -// Copyright 2010, 2011 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. // You may obtain a copy of the License at @@ -25,7 +23,7 @@ import java.util.Locale; /** * Chain-of-command interface used to locate page and component templates. Contributions to this service support * alternate naming schemes for template files, or alternate locations in which to search for template files. - * <p/> + * * This service was introduced in Tapestry 5.2, but deprecated in Tapestry 5.3. It is utilized by the default * implementation of {@link org.apache.tapestry5.services.pageload.ComponentResourceLocator}. * http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/services/transform/ComponentClassTransformWorker2.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/transform/ComponentClassTransformWorker2.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/transform/ComponentClassTransformWorker2.java index 31563c6..e8fe500 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/services/transform/ComponentClassTransformWorker2.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/transform/ComponentClassTransformWorker2.java @@ -1,5 +1,3 @@ -// Copyright 2011 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. // You may obtain a copy of the License at @@ -22,7 +20,7 @@ import org.apache.tapestry5.plastic.PlasticClass; /** * Interface for a set of objects that can perform transformation of component classes. Implementations should * be thread safe and ideally stateless (all necessary state can be stored inside the {@link PlasticClass}). - * <p/> + * * The ComponentClassTransformWorker service uses an ordered configuration of these works as a {@linkplain ChainBuilder * chain of command}. * http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/services/transform/InjectionProvider2.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/transform/InjectionProvider2.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/transform/InjectionProvider2.java index 13a3c1a..00de768 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/services/transform/InjectionProvider2.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/transform/InjectionProvider2.java @@ -1,5 +1,3 @@ -// Copyright 2011 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. // You may obtain a copy of the License at @@ -23,7 +21,7 @@ import org.apache.tapestry5.plastic.PlasticField; * Provides some form of injection when the value for an {@link org.apache.tapestry5.ioc.annotations.Inject} annotation is * present. In this case, the provider is responsible for determining the value to be injected from the field name and * field type. - * <p/> + * * This interface will be used as part of a {@link org.apache.tapestry5.ioc.services.ChainBuilder chain of command}. */ @UsesOrderedConfiguration(InjectionProvider2.class) http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/test/PageTester.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/test/PageTester.java b/tapestry-core/src/main/java/org/apache/tapestry5/test/PageTester.java index 686d762..86c84ba 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/test/PageTester.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/test/PageTester.java @@ -1,5 +1,3 @@ -// Copyright 2006-2014 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. // You may obtain a copy of the License at @@ -42,7 +40,7 @@ import java.util.Map; * You can ask it to render a certain page and check the DOM object created. You can also ask it to click on a link * element in the DOM object to get the next page. Because no servlet container is required, it is very fast and you * can directly debug into your code in your IDE. - * <p/> + * * When using the PageTester in your tests, you should add the {@code org.apache.tapestry:tapestry-test-constants} * module as a dependency. */ http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/tree/DefaultTreeModel.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/tree/DefaultTreeModel.java b/tapestry-core/src/main/java/org/apache/tapestry5/tree/DefaultTreeModel.java index 8d59724..a9f696b 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/tree/DefaultTreeModel.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/tree/DefaultTreeModel.java @@ -1,5 +1,3 @@ -// Copyright 2011 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. // You may obtain a copy of the License at @@ -27,7 +25,7 @@ import java.util.Map; /** * A default implementation of TreeModel that starts with a {@link ValueEncoder} (for the element to string conversion), * a {@link TreeModelAdapter}, and a list of root nodes. - * <p/> + * * This implementation is <em>not</em> thread safe. * * @param <T> http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/tree/TreeSelectionModel.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/tree/TreeSelectionModel.java b/tapestry-core/src/main/java/org/apache/tapestry5/tree/TreeSelectionModel.java index 466bc9f..7f158d8 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/tree/TreeSelectionModel.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/tree/TreeSelectionModel.java @@ -1,5 +1,3 @@ -// Copyright 2011 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. // You may obtain a copy of the License at @@ -18,7 +16,7 @@ package org.apache.tapestry5.tree; * Tracks which <em>leaf</em> nodes of a {@link TreeModel} are currently selected. The {@linkplain DefaultTreeSelectionModel default * implementation} simply stores a set of {@linkplain TreeNode#getId() unique node * ids} to identify selected nodes. The selection model is updated whenever the user clicks on the label for a leaf node. - * <p/> + * * In the future, new methods may be added that will support selection of folders as well as leafs, and define the rules for * how selections and de-selections propagate down to children or up to parents. * http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/validator/Email.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/validator/Email.java b/tapestry-core/src/main/java/org/apache/tapestry5/validator/Email.java index f7b3de0..9307592 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/validator/Email.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/validator/Email.java @@ -25,7 +25,7 @@ import java.util.regex.Pattern; /** * A validator that checks if a given string is well-formed email address. This validator is not configurable. - * <p/> + * * Starting with release 5.4, this validator also performs client-side validation. */ public class Email extends AbstractValidator<Void, String> http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/validator/Regexp.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/validator/Regexp.java b/tapestry-core/src/main/java/org/apache/tapestry5/validator/Regexp.java index b30c08e..88debab 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/validator/Regexp.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/validator/Regexp.java @@ -25,7 +25,7 @@ import java.util.regex.Pattern; /** * Enforces that the input matches a provided regular expression. - * <p/> + * * Starting in 5.4, this always writes the pattern and title attribute, even when client validation is not enabled. * The title attribute is used specially by modern browsers, in concert with pattern. */ http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/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 bbae36a..2f24c18 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 @@ -965,7 +965,7 @@ public class CoreBehaviorsTests extends App1TestCase /** * TAPESTRY-2078 - * <p/> + * * Update 4/29/11: Not sure this is necessary as exceptions seem to be reported properly without the old heroics. */ @Test http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/Count.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/Count.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/Count.java index e337d1b..fbaa53d 100644 --- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/Count.java +++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/Count.java @@ -1,5 +1,3 @@ -// 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. // You may obtain a copy of the License at @@ -21,7 +19,7 @@ import org.apache.tapestry5.internal.util.IntegerRange; /** * A component that can count up or count down. - * <p/> + * * This is useful as a demonstration; now that the prop binding supports {@link IntegerRange integer ranges}, it's much * less necessary. */ http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/test/java/org/apache/tapestry5/services/SyncCostBench.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/services/SyncCostBench.java b/tapestry-core/src/test/java/org/apache/tapestry5/services/SyncCostBench.java index 738b67f..bca8bf6 100644 --- a/tapestry-core/src/test/java/org/apache/tapestry5/services/SyncCostBench.java +++ b/tapestry-core/src/test/java/org/apache/tapestry5/services/SyncCostBench.java @@ -1,5 +1,3 @@ -// Copyright 2006 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. // You may obtain a copy of the License at @@ -16,23 +14,24 @@ package org.apache.tapestry5.services; import org.apache.tapestry5.ioc.internal.util.ConcurrentBarrier; -import static java.lang.String.format; -import static java.lang.System.out; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; +import static java.lang.String.format; +import static java.lang.System.out; + /** * Tests single-thread synchronization overhead using different techniques. Note that we're fudging things a bit by * getting a read lock for a write operation .... it's just that I'm more concerned about read locks (which will be very * common) than about write locks (very rare). Another concern is that hotspot is going to mess up our synchronization * when it see we're not really doing anything multi-threaded. - * <p/> + * * The results show that using the {@link org.apache.tapestry5.internal.annotations.Concurrent} aspect (which used a * {@link java.util.concurrent.locks.ReentrantReadWriteLock} under the covers) is about 4x as expensive as just using * the synchronized keyword. There are some anomolous results ... for example, ReadWriteLockRunner is consistently * slower than ReadWriteLockAspectRunner (one would expect it to be the other way around ... must be something about how * AspectJ weaves the code ... and it's use of static methods in many cases). - * <p/> + * * Well, the Concurrent aspect is gone, replaced with the {@link ConcurrentBarrier} utility. */ public class SyncCostBench http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-func/src/main/java/org/apache/tapestry5/func/F.java ---------------------------------------------------------------------- diff --git a/tapestry-func/src/main/java/org/apache/tapestry5/func/F.java b/tapestry-func/src/main/java/org/apache/tapestry5/func/F.java index 060d23e..3f368fc 100644 --- a/tapestry-func/src/main/java/org/apache/tapestry5/func/F.java +++ b/tapestry-func/src/main/java/org/apache/tapestry5/func/F.java @@ -1,5 +1,3 @@ -// Copyright 2010, 2011, 2012 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. // You may obtain a copy of the License at @@ -28,7 +26,7 @@ import java.util.Map.Entry; * are initially * created * using {@link #flow(Collection)} and {@link #flow(Object...)}. - * <p/> + * * F will be used a bit, thus it has a short name (for those who don't like static imports). It provides a base set of * Predicate, Mapper and Reducer factories. A good development pattern for applications is to provide a similar, * application-specific, set of such factories. @@ -466,7 +464,7 @@ public class F /** * Creates an <em>infinite</em> series of numbers. - * <p/> + * * Attempting to get the {@linkplain Flow#count()} of the series will form an infinite loop. */ public static Flow<Integer> series(int start, final int delta) http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-func/src/main/java/org/apache/tapestry5/func/Flow.java ---------------------------------------------------------------------- diff --git a/tapestry-func/src/main/java/org/apache/tapestry5/func/Flow.java b/tapestry-func/src/main/java/org/apache/tapestry5/func/Flow.java index 2eb7b3d..7b5eec1 100644 --- a/tapestry-func/src/main/java/org/apache/tapestry5/func/Flow.java +++ b/tapestry-func/src/main/java/org/apache/tapestry5/func/Flow.java @@ -1,5 +1,3 @@ -// Copyright 2010 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. // You may obtain a copy of the License at @@ -25,12 +23,12 @@ import java.util.List; * Flows are <em>lazy</em>: filtering, mapping, and concatenating flows will do so with no, or a * minimum, of evaluation. However, converting a Flow into a {@link List} (or other collection) will * force a realization of the entire flow. - * <p> + * * In some cases, a flow may be an infinite, lazily evaluated sequence. Operations that iterate over all elements (such * as {@link #count()} or {@link #reduce(Reducer, Object)}) may become infinite loops. - * <p> + * * Using flows allows for a very fluid interface. - * <p> + * * Flows are initially created using {@link F#flow(java.util.Collection)}, {@link F#flow(Object...)} or * {@link F#flow(Iterable)}. * @@ -51,8 +49,8 @@ public interface Flow<T> extends FlowOperations<T, Flow<T>> <X, Y> Flow<Y> map(Mapper2<T, X, Y> mapper, Flow<? extends X> flow); /** - * Given a {@link Mapper} that maps a T to a Flow<X>, this method will lazily concatenate - * all the output flows into a single Flow<X>. + * Given a {@link Mapper} that maps a T to a {@code Flow<X>}, this method will lazily concatenate + * all the output flows into a single {@code Flow<X>}. */ <X> Flow<X> mapcat(Mapper<T, Flow<X>> mapper); @@ -79,7 +77,7 @@ public interface Flow<T> extends FlowOperations<T, Flow<T>> * values of the Flow. * * @throws ClassCastException - * if type <T> does not extend {@link Comparable} + * if type T does not extend {@link Comparable} */ Flow<T> sort(); @@ -87,7 +85,7 @@ public interface Flow<T> extends FlowOperations<T, Flow<T>> * Zips this Flow together with another flow to form a Flow of {@link Tuple}s. The resulting * flow is the length of the shorter of the two input flows. Zipping flows together is a lazy * operation. - * <p> + * * The elements of this flow become the {@linkplain Tuple#first} value in each Tuple, the elements of the other flow * become the {@linkplain Tuple#second} value in each Tuple. * http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-func/src/main/java/org/apache/tapestry5/func/FlowOperations.java ---------------------------------------------------------------------- diff --git a/tapestry-func/src/main/java/org/apache/tapestry5/func/FlowOperations.java b/tapestry-func/src/main/java/org/apache/tapestry5/func/FlowOperations.java index d04e433..d4dec34 100644 --- a/tapestry-func/src/main/java/org/apache/tapestry5/func/FlowOperations.java +++ b/tapestry-func/src/main/java/org/apache/tapestry5/func/FlowOperations.java @@ -1,5 +1,3 @@ -// Copyright 2011, 2012 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. // You may obtain a copy of the License at @@ -20,10 +18,10 @@ import java.util.List; import java.util.Set; /** - * @param <T> + * @param T * the type of data in the flow - * @param <FT> - * the type of flow (either Flow<T> or ZippedFlow<Tuple<T, ?>) + * @param FT + * the type of flow (either {@code Flow<T>} or {@code ZippedFlow<Tuple<T, ?>}) * @since 5.3 */ public interface FlowOperations<T, FT> extends Iterable<T> @@ -42,7 +40,7 @@ public interface FlowOperations<T, FT> extends Iterable<T> /** * Applies the worker to each element in the Flow, then returns the flow for further behaviors. - * <p/> + * * Each is a non-lazy operation; it will fully realize the values of the Flow. */ FT each(Worker<? super T> worker); @@ -114,7 +112,7 @@ public interface FlowOperations<T, FT> extends Iterable<T> /** * Returns a new Flow with the elements in the collection appended to this Flow. This is a lazy * operation. - * <p/> + * * Note that the type of this method changed from {@code List} to {@link Collection} in Tapestry 5.4. This * is considered a compatible change. * @@ -128,7 +126,7 @@ public interface FlowOperations<T, FT> extends Iterable<T> * and the first element from the Flow. The result is captured as the accumulator and passed * to the Reducer with the next value from the Flow, and so on. The final accumulator * value is returned. If the flow is empty, the initial value is returned. - * <p/> + * * Reducing is a non-lazy operation; it will fully realize the values of the Flow. */ <A> A reduce(Reducer<A, T> reducer, A initial); http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-func/src/main/java/org/apache/tapestry5/func/Mapper.java ---------------------------------------------------------------------- diff --git a/tapestry-func/src/main/java/org/apache/tapestry5/func/Mapper.java b/tapestry-func/src/main/java/org/apache/tapestry5/func/Mapper.java index 1348582..9a9722e 100644 --- a/tapestry-func/src/main/java/org/apache/tapestry5/func/Mapper.java +++ b/tapestry-func/src/main/java/org/apache/tapestry5/func/Mapper.java @@ -1,5 +1,3 @@ -// Copyright 2010, 2011 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. // You may obtain a copy of the License at @@ -17,7 +15,7 @@ package org.apache.tapestry5.func; /** * Interface for operation {@link Flow#map(Mapper)} to define how Flow elements are mapped from one type * to another (or otherwise transformed). - * <p> + * * This changed in 5.3 from an abstract base class to an interface. * * @since 5.2.0 http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-func/src/main/java/org/apache/tapestry5/func/Mapper2.java ---------------------------------------------------------------------- diff --git a/tapestry-func/src/main/java/org/apache/tapestry5/func/Mapper2.java b/tapestry-func/src/main/java/org/apache/tapestry5/func/Mapper2.java index 0fb687e..9e226d9 100644 --- a/tapestry-func/src/main/java/org/apache/tapestry5/func/Mapper2.java +++ b/tapestry-func/src/main/java/org/apache/tapestry5/func/Mapper2.java @@ -1,5 +1,3 @@ -// Copyright 2010, 2011 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. // You may obtain a copy of the License at @@ -16,7 +14,7 @@ package org.apache.tapestry5.func; /** * A generalization of {@link Mapper} for a two-input function. - * <p> + * * This was converted from to an interface from an abstract base class in 5.3. */ public interface Mapper2<A, B, C> http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-func/src/main/java/org/apache/tapestry5/func/Predicate.java ---------------------------------------------------------------------- diff --git a/tapestry-func/src/main/java/org/apache/tapestry5/func/Predicate.java b/tapestry-func/src/main/java/org/apache/tapestry5/func/Predicate.java index f141b70..94f9677 100644 --- a/tapestry-func/src/main/java/org/apache/tapestry5/func/Predicate.java +++ b/tapestry-func/src/main/java/org/apache/tapestry5/func/Predicate.java @@ -1,5 +1,3 @@ -// Copyright 2010, 2011 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. // You may obtain a copy of the License at @@ -17,9 +15,9 @@ package org.apache.tapestry5.func; /** * Used when filtering a collection of objects of a given type; the predicate is passed * each object in turn, and returns true to include the object in the result collection. - * <p> + * * The {@link F} class includes a number of Predicate factory methods. - * <p> + * * This was converted from a abstract base class to an interface in 5.3. * * @since 5.2.0 http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-func/src/main/java/org/apache/tapestry5/func/Reducer.java ---------------------------------------------------------------------- diff --git a/tapestry-func/src/main/java/org/apache/tapestry5/func/Reducer.java b/tapestry-func/src/main/java/org/apache/tapestry5/func/Reducer.java index 90693a5..866b7e0 100644 --- a/tapestry-func/src/main/java/org/apache/tapestry5/func/Reducer.java +++ b/tapestry-func/src/main/java/org/apache/tapestry5/func/Reducer.java @@ -1,5 +1,3 @@ -// Copyright 2010 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. // You may obtain a copy of the License at @@ -17,8 +15,9 @@ package org.apache.tapestry5.func; /** * A reducer takes an accumulator value and a single value from a collection and computes a new * accumulator value. - * <A> type of accumulator - * <T> type of collection value + * + * @param A type of accumulator + * @param T type of collection value * * @since 5.2.0 */ http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/hibernate/HibernateEntityPackageManager.java ---------------------------------------------------------------------- diff --git a/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/hibernate/HibernateEntityPackageManager.java b/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/hibernate/HibernateEntityPackageManager.java index f70d8b4..5323418 100644 --- a/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/hibernate/HibernateEntityPackageManager.java +++ b/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/hibernate/HibernateEntityPackageManager.java @@ -1,5 +1,3 @@ -// Copyright 2007, 2008 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. // You may obtain a copy of the License at @@ -20,7 +18,7 @@ import java.util.Collection; /** * Contains a set of contributed package names from which to load entities. - * <p/> + * * The service's configuration is the names of Java packages to search for Hibernate entities. */ @UsesConfiguration(String.class) http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/hibernate/HibernateSessionManager.java ---------------------------------------------------------------------- diff --git a/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/hibernate/HibernateSessionManager.java b/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/hibernate/HibernateSessionManager.java index 9c95d0c..5c3a965 100644 --- a/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/hibernate/HibernateSessionManager.java +++ b/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/hibernate/HibernateSessionManager.java @@ -1,5 +1,3 @@ -// Copyright 2007, 2008 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. // You may obtain a copy of the License at @@ -20,12 +18,12 @@ import org.hibernate.Session; * Manages the Hibernate session for the current thread. This includes creating the session as needed, allowing the * session to checkpoint (commit the current transaction and continue) and commit the transaction automatically at the * end of the request. - * <p/> + * * Remember that in Tapestry, action requests and render requests are entirely separate, and you will see a separate * request and a separate transaction for each. Care should be taken to ensure that entity objects that are retained (in * the session, as persistent field values) between requests are handled correctly (they tend to become detached * instances). - * <p/> + * * This implementation of this service is per-thread. */ public interface HibernateSessionManager http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/hibernate/HibernateSessionSource.java ---------------------------------------------------------------------- diff --git a/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/hibernate/HibernateSessionSource.java b/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/hibernate/HibernateSessionSource.java index 70d8e99..136d70d 100644 --- a/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/hibernate/HibernateSessionSource.java +++ b/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/hibernate/HibernateSessionSource.java @@ -1,5 +1,3 @@ -// Copyright 2007, 2008 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. // You may obtain a copy of the License at @@ -22,7 +20,7 @@ import org.hibernate.cfg.Configuration; /** * Responsible for creating a Hibernate session as needed. Internally, is responsible for Hibernate {@link * Configuration}, resulting in a {@link SessionFactory}. - * <p/> + * * The service's configuration is a {@linkplain org.apache.tapestry5.ioc.services.ChainBuilder chain of command} of * configurator objects. */ http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/hibernate/HibernateTransactionDecorator.java ---------------------------------------------------------------------- diff --git a/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/hibernate/HibernateTransactionDecorator.java b/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/hibernate/HibernateTransactionDecorator.java index 73b5d9b..4e0c7bb 100644 --- a/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/hibernate/HibernateTransactionDecorator.java +++ b/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/hibernate/HibernateTransactionDecorator.java @@ -1,5 +1,3 @@ -// Copyright 2008, 2009 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. // You may obtain a copy of the License at @@ -20,7 +18,7 @@ package org.apache.tapestry5.hibernate; * Declared exceptions will also {@linkplain org.apache.tapestry5.hibernate.HibernateSessionManager#commit() commit the * transaction}; runtime exceptions will {@linkplain org.apache.tapestry5.hibernate.HibernateSessionManager#abort() the * transaction}. - * <p/> + * * It is recommended that you switch from the use of decoration to the use of advice; use the {@link * org.apache.tapestry5.hibernate.HibernateTransactionAdvisor} (from a service advisor method) instead. */ http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-hibernate/src/main/java/org/apache/tapestry5/hibernate/HibernateGridDataSource.java ---------------------------------------------------------------------- diff --git a/tapestry-hibernate/src/main/java/org/apache/tapestry5/hibernate/HibernateGridDataSource.java b/tapestry-hibernate/src/main/java/org/apache/tapestry5/hibernate/HibernateGridDataSource.java index 14aafab..5aa4b7f 100644 --- a/tapestry-hibernate/src/main/java/org/apache/tapestry5/hibernate/HibernateGridDataSource.java +++ b/tapestry-hibernate/src/main/java/org/apache/tapestry5/hibernate/HibernateGridDataSource.java @@ -1,5 +1,3 @@ -// Copyright 2008, 2010 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. // You may obtain a copy of the License at @@ -14,8 +12,6 @@ package org.apache.tapestry5.hibernate; -import java.util.List; - import org.apache.tapestry5.grid.GridDataSource; import org.apache.tapestry5.grid.SortConstraint; import org.hibernate.Criteria; @@ -23,13 +19,15 @@ import org.hibernate.Session; import org.hibernate.criterion.Order; import org.hibernate.criterion.Projections; +import java.util.List; + /** * A simple implementation of {@link org.apache.tapestry5.grid.GridDataSource} based on a Hibernate Session and a known * entity class. This implementation does support multiple {@link org.apache.tapestry5.grid.SortConstraint sort * constraints}; however it assumes a direct mapping from sort constraint property to Hibernate property. - * <p/> + * * This class is <em>not</em> thread-safe; it maintains internal state. - * <p/> + * * Typically, an instance of this object is created fresh as needed (that is, it is not stored between requests). */ public class HibernateGridDataSource implements GridDataSource http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-ioc-jcache/src/test/java/org/apache/tapestry5/jcache/internal/AbstractTestExcluder.java ---------------------------------------------------------------------- diff --git a/tapestry-ioc-jcache/src/test/java/org/apache/tapestry5/jcache/internal/AbstractTestExcluder.java b/tapestry-ioc-jcache/src/test/java/org/apache/tapestry5/jcache/internal/AbstractTestExcluder.java index d8e5267..2dbeb25 100644 --- a/tapestry-ioc-jcache/src/test/java/org/apache/tapestry5/jcache/internal/AbstractTestExcluder.java +++ b/tapestry-ioc-jcache/src/test/java/org/apache/tapestry5/jcache/internal/AbstractTestExcluder.java @@ -22,9 +22,9 @@ import java.util.logging.Logger; /** * For the TCK we need to have an exclude list of bad tests so that disabling tests * can be done without changing code. - * <p/> + * * This class creates a rule for the class provided - * <p/> + * * The exclude list is created by {@link ExcludeList} by creating a file in the root of your * classpath called "ExcludeList". There is an example in the testRI module for testing the RI. * http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-ioc-junit/src/main/java/org/apache/tapestry5/ioc/junit/TapestryIOCJUnit4ClassRunner.java ---------------------------------------------------------------------- diff --git a/tapestry-ioc-junit/src/main/java/org/apache/tapestry5/ioc/junit/TapestryIOCJUnit4ClassRunner.java b/tapestry-ioc-junit/src/main/java/org/apache/tapestry5/ioc/junit/TapestryIOCJUnit4ClassRunner.java index 5b47317..d127419 100644 --- a/tapestry-ioc-junit/src/main/java/org/apache/tapestry5/ioc/junit/TapestryIOCJUnit4ClassRunner.java +++ b/tapestry-ioc-junit/src/main/java/org/apache/tapestry5/ioc/junit/TapestryIOCJUnit4ClassRunner.java @@ -1,5 +1,3 @@ -// Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012 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. // You may obtain a copy of the License at @@ -27,14 +25,14 @@ import org.junit.runners.model.InitializationError; import org.junit.runners.model.Statement; /** - * <p> + * * A JUnit4ClassRunner to help with Tapestry IOC integration tests. The test * runner requires a registry configuration to be defined in a {@link Registry} * annotation. A {@link RegistryShutdownType} can be specified to configure the * lifecycle of the test registry and it's services - * </p> + * * - * <p> + * * {@link org.apache.tapestry5.ioc.junit.ModuleDef}s can be added to the * {@link org.apache.tapestry5.ioc.Registry} by annotating a factory method(s) * with {@link ModuleDef}. These {@link ModuleDef} factory methods must be @@ -44,12 +42,12 @@ import org.junit.runners.model.Statement; * <li>take zero arguments</li> * <li>return a subclass of {@link org.apache.tapestry5.ioc.junit.ModuleDef}</li> * </ul> - * </p> + * * - * <p> + * * Any services defined in the registry can be {@link Inject}ed into the test * class to be used during testing. - * </p> + * */ public class TapestryIOCJUnit4ClassRunner extends BlockJUnit4ClassRunner { private final TestRegistryManager registryManager; http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/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 ef71125..aea1d1b 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 @@ -1,5 +1,3 @@ -// Copyright 2009 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. // You may obtain a copy of the License at @@ -21,7 +19,7 @@ import org.apache.tapestry5.ioc.def.ServiceDef; * 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. - * <p/> + * * Note: service decorators (via {@link org.apache.tapestry5.ioc.def.DecoratorDef} are applied <em>around</em> the * interceptor generated via service advisors, (for compatibility with Tapestry 5.0). In general, you should use service * decoration or service advice, not both. http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/IOCSymbols.java ---------------------------------------------------------------------- diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/IOCSymbols.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/IOCSymbols.java index 12aa82f..f3607c6 100644 --- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/IOCSymbols.java +++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/IOCSymbols.java @@ -1,5 +1,3 @@ -// Copyright 2010, 2011 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. // You may obtain a copy of the License at @@ -32,7 +30,7 @@ public class IOCSymbols * threads in the pool, tasks will be placed in the queue. If the queue is empty, more threads * may be created (up to the {@linkplain #THREAD_POOL_MAX_SIZE maximum pool size}). If the queue is full and * all threads have been created, the task is rejected. - * <p> + * * The default is 100. * * @since 5.3 http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/IdMatcher.java ---------------------------------------------------------------------- diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/IdMatcher.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/IdMatcher.java index 4e5acc0..29ee941 100644 --- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/IdMatcher.java +++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/IdMatcher.java @@ -1,5 +1,3 @@ -// Copyright 2006 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. // You may obtain a copy of the License at @@ -15,14 +13,14 @@ package org.apache.tapestry5.ioc; /** - * A matcher of <em>fully qualified<em> ids. + * A matcher of <em>fully qualified</em> ids. */ public interface IdMatcher { /** * Returns true if the provided input id matches the pattern defined by this matcher instance. * - * @param id the fully qualfied id + * @param id the fully qualified id * @return true on match, false otherwise */ boolean matches(String id); http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ModuleBuilderSource.java ---------------------------------------------------------------------- diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ModuleBuilderSource.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ModuleBuilderSource.java index a914a4f..16582a4 100644 --- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ModuleBuilderSource.java +++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ModuleBuilderSource.java @@ -1,5 +1,3 @@ -// Copyright 2006, 2008, 2009 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. // You may obtain a copy of the License at @@ -17,12 +15,12 @@ package org.apache.tapestry5.ioc; /** * The source for the module instance needed by any service builders, service contributors and service decorators that * are mapped to instance methods. - * <p/> + * * Allows the creation of the module instance to be deferred until actually needed; in practical terms, when the * builder/decorator/contributor is a <em>static</em> method on the module builder class, then a module instance is not * needed. This allows Tapestry IOC to work around a tricky chicken-and-the-egg problem, whereby the constructor of a * module instance requires contributions that originate in the same module. - * <p/> + * * The term "module builder" has been deprecated; the current term is "module class", but this interface is left as-is * for backwards compatibility. */ http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ObjectProvider.java ---------------------------------------------------------------------- diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ObjectProvider.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ObjectProvider.java index c0e80bc..6673e0d 100644 --- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ObjectProvider.java +++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ObjectProvider.java @@ -1,5 +1,3 @@ -// 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. // You may obtain a copy of the License at @@ -19,9 +17,9 @@ package org.apache.tapestry5.ioc; * org.apache.tapestry5.ioc.Registry}. Instead of using a just the service id to gain access to a service within the * Registry, object providers in different flavors are capable of vending, or even creating, objects of disparate types * from disparate sources. - * <p/> + * * Object providers are consulted in a strict order, and the first non-null result is taken. - * <p/> + * * In many cases, an object provider searches for additional annotations on the element (usually a parameter, or perhaps * a field) for which a value is required. */ http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ReloadAware.java ---------------------------------------------------------------------- diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ReloadAware.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ReloadAware.java index e6f6a60..4493a38 100644 --- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ReloadAware.java +++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ReloadAware.java @@ -1,5 +1,3 @@ -// Copyright 2010 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. // You may obtain a copy of the License at @@ -31,7 +29,7 @@ public interface ReloadAware * that the implementation class has changed}. The existing instance is notified, so that * it can cleanly shutdown now, before being re-instantiated. This is necessary when the * service implementation retains some form of external resources. - * <p> + * * In addition, the implementation may request an immediate reload. Normally, reloading of the service is deferred * until a method of the proxy object is invoked (this causes the normal just-in-time instantiation of the * implementation). When this method returns true, the implementation is re-created immediately. This is most often http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ScopeConstants.java ---------------------------------------------------------------------- diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ScopeConstants.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ScopeConstants.java index 88951f7..7da3714 100644 --- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ScopeConstants.java +++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ScopeConstants.java @@ -1,5 +1,3 @@ -// Copyright 2008 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. // You may obtain a copy of the License at @@ -23,7 +21,7 @@ public class ScopeConstants /** * The default scope is a singleton within the {@link org.apache.tapestry5.ioc.Registry}. A single instance will be * created on demand. The lifespan of the instance lasts until the registry is {@linkplain Registry#shutdown() shut - * down}. <p/>Some implementations will want to know when the Registry is shutdown; they should register for + * down}. Some implementations will want to know when the Registry is shutdown; they should register for * notifications via the {@link org.apache.tapestry5.ioc.services.RegistryShutdownHub} service. */ public static final String DEFAULT = "singleton"; @@ -32,7 +30,7 @@ public class ScopeConstants * An alternate scope provided with Tapestry; a per-thread instance is created on demand, behind a shared proxy. * Method invocations on the shared proxy are forwarded to the per-thread instance. Each per-thread instance lasts * until the {@linkplain Registry#cleanupThread() thread is cleaned up} (at the end of a request for a web - * application). <p>Some implementations will want to be notified before being discarded and should register with + * application). Some implementations will want to be notified before being discarded and should register with * the {@link org.apache.tapestry5.ioc.services.PerthreadManager} to receive notifications. * * @see org.apache.tapestry5.ioc.internal.services.PerThreadServiceLifecycle http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ServiceBindingOptions.java ---------------------------------------------------------------------- diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ServiceBindingOptions.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ServiceBindingOptions.java index 12123a9..68a4d38 100644 --- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ServiceBindingOptions.java +++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ServiceBindingOptions.java @@ -1,5 +1,3 @@ -// Copyright 2007, 2009, 2011 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. // You may obtain a copy of the License at @@ -87,7 +85,6 @@ public interface ServiceBindingOptions * module will sometimes provide a set of default marker annotations for all services within the module, this method * allows that default to be extended. * - * @param <T> * @param marker one or more markers to add * @return this binding options, for further configuration */ http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/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 f67c67d..74e3d02 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 @@ -1,5 +1,3 @@ -// Copyright 2006, 2007, 2009, 2013 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. // You may obtain a copy of the License at @@ -26,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. 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 * org.apache.tapestry5.ioc.ServiceBinder}. * http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/Marker.java ---------------------------------------------------------------------- diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/Marker.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/Marker.java index 459c968..01c9a54 100644 --- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/Marker.java +++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/Marker.java @@ -1,5 +1,3 @@ -// Copyright 2007, 2009, 2011 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. // You may obtain a copy of the License at @@ -28,7 +26,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; * Used to define one or more {@linkplain ServiceDef#getMarkers() marker annotations} for a service implementation. This * allows for injection based on the combination of type and marker interface. These marker interfaces should not have * any values. The mere presence of the marker annotation is all that is needed. - * <p/> + * * When applied to a module class, this sets the default markers for all services within the module. Markers are * additive, so a Marker annotation on the implementation class and/or specified with {@link * org.apache.tapestry5.ioc.ServiceBindingOptions#withMarker(Class[])} will accumulate; a service may have any number of http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/Match.java ---------------------------------------------------------------------- diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/Match.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/Match.java index 5dd18c8..fb77e37 100644 --- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/Match.java +++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/Match.java @@ -1,5 +1,3 @@ -// Copyright 2006, 2009 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. // You may obtain a copy of the License at @@ -15,18 +13,19 @@ package org.apache.tapestry5.ioc.annotations; import java.lang.annotation.Documented; -import static java.lang.annotation.ElementType.METHOD; import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + /** * Optional, but typically used, annotation for service decorator methods, used to define which services the decorator * applies to. This annotation defines a number of <em>patterns</em> that allow services across multiple modules to be * selected. A decorator is applied to a service if any of its patterns match the service. - * <p/> + * * TODO: Describe pattern glob-match syntax - * <p/> + * * When the Match annotation is not supplied, then the decorator only applies to a single service: the service whose id * matches the decorators id; that is, method <code>decorateMyService()</code> would decorate only the service provided * by the <code>buildMyService()</code> method, within the same module. http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/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 6c78cb7..5ead434 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 @@ -1,5 +1,3 @@ -// Copyright 2009, 2012 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. // You may obtain a copy of the License at @@ -20,15 +18,15 @@ import java.lang.annotation.*; * Marks a service as not eligible for decoration. This is useful for services that, if decorated, can cause cycle * dependency errors; for example, {@link org.apache.tapestry5.ioc.services.MasterObjectProvider}, or services * <em>contributed to</em> MasterObjectProvider, are good candidates for this annotation. - * <p/> + * * The annotation can be applied to service implementation class or to a service builder method in a module class. - * <p/> + * * The annotation may also be placed on a module class, to indicate that all services defined for the module should not * allow decoration. - * <p/> + * * 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} * or {@link org.apache.tapestry5.ioc.services.OperationAdvisor}) should include this annotation, to prevent a recursive service build * when they attempt to advise themselves. http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/Scope.java ---------------------------------------------------------------------- diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/Scope.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/Scope.java index 64333ee..933b91d 100644 --- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/Scope.java +++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/Scope.java @@ -1,5 +1,3 @@ -// Copyright 2006, 2007, 2008, 2009 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. // You may obtain a copy of the License at @@ -19,11 +17,12 @@ import org.apache.tapestry5.ioc.ServiceLifecycle; import org.apache.tapestry5.ioc.services.ServiceLifecycleSource; import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; -import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import java.lang.annotation.Target; /** * An optional annotation that may be placed on a service building method of a module, or on the implementation class @@ -32,7 +31,7 @@ import java.lang.annotation.Target; * a service implementation to a single thread or request. Modules may define new scopes. Each scope should have a * corresponding {@link ServiceLifecycle} implementation. The linkage from scope name to service lifecycle occurs via a * contribution to the {@link ServiceLifecycleSource} service configuration. - * <p/> + * * The annotation may also be placed directly on a service implementation class, when using service binding (via * the {@link ServiceBinder}). * http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/def/ContributionDef.java ---------------------------------------------------------------------- diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/def/ContributionDef.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/def/ContributionDef.java index eb964e6..5d35491 100644 --- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/def/ContributionDef.java +++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/def/ContributionDef.java @@ -1,5 +1,3 @@ -// Copyright 2006, 2007, 2008, 2009 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. // You may obtain a copy of the License at @@ -18,7 +16,7 @@ import org.apache.tapestry5.ioc.*; /** * Contribution to a service configuration. - * <p/> + * * The toString() method of the ContributionDef will be used for some exception reporting and should clearly identify * where the contribution comes from; the normal behavior is to identify the class and method of the contribution * method. http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/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 7c3c663..e1ce01f 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 @@ -1,5 +1,3 @@ -// Copyright 2006, 2007, 2009 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. // You may obtain a copy of the License at @@ -20,13 +18,13 @@ import org.apache.tapestry5.ioc.ServiceResources; /** * Definition of a service decorator, which (by default) is derived from a service decorator method. - * <p/> + * * A note on decorator scheduling. The scheduling is based on the desired order of <em>behavior</em>. Thus, if logging * should occur before security checks, and security checks should occur before transaction management, then the desired * decorator order is Logging, Security, Transactions. This might be specified as having Security occur after Logging, * and Transactions occur after Security. It might also be specified by having Logging ordered "before:*", and * Transactions ordered "after:*" with no specified scheduling for Security. - * <p/> + * * Once this order is established, decorators are <em>applied</em> in reverse order. Each decorator's job is to create * an <em>interceptor</em> for the service, that delegates to the next implementation. This implies that the decorators * are executed last to first. In the above example, the core service implementation would be passed to the Transaction @@ -35,11 +33,11 @@ import org.apache.tapestry5.ioc.ServiceResources; * resulting in the Logging interceptor. Thus at runtime, the Logging interceptor will execute first, then delegate to * the Security interceptor, which would delegate to the Transaction interceptor, which would finally delegate to the * core service implementation. - * <p/> + * * 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/> + * * Note: service decorators are applied <em>around</em> the interceptor generated via any {@link * org.apache.tapestry5.ioc.AdvisorDef}s (for compatibility with Tapestry 5.0). In general, you should use service * decoration or service advice, not both. http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/def/ModuleDef.java ---------------------------------------------------------------------- diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/def/ModuleDef.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/def/ModuleDef.java index b69a728..1d6c9ca 100644 --- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/def/ModuleDef.java +++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/def/ModuleDef.java @@ -1,5 +1,3 @@ -// Copyright 2006, 2007, 2009 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. // You may obtain a copy of the License at @@ -51,7 +49,7 @@ public interface ModuleDef /** * Returns the class that will be instantiated. Annotated instance methods of this class are invoked to build * services, to decorate/intercept services, and make contributions to other services. - * <p/> + * * Note: this name is maintained for compatibilty; the term "module builder" is now just "module class". */ Class getBuilderClass(); http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/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 7b31f8a..a4fc546 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 @@ -1,5 +1,3 @@ -// Copyright 2006, 2007, 2009, 2010 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. // You may obtain a copy of the License at @@ -66,7 +64,7 @@ public interface ServiceDef /** * Returns the lifecycle defined for the service. This is indicated by adding a * {@link org.apache.tapestry5.ioc.annotations.Scope} annotation to the service builder method for the service. - * <p/> + * * Services that are not proxied will ignore their scope; such services are always treated as singletons. * * @see ServiceLifecycle http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ValidatingMappedConfigurationWrapper.java ---------------------------------------------------------------------- diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ValidatingMappedConfigurationWrapper.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ValidatingMappedConfigurationWrapper.java index 096dcda..18e5d1c 100644 --- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ValidatingMappedConfigurationWrapper.java +++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ValidatingMappedConfigurationWrapper.java @@ -1,5 +1,3 @@ -// Copyright 2006, 2007, 2008, 2009, 2010, 2011 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. // You may obtain a copy of the License at @@ -14,12 +12,12 @@ package org.apache.tapestry5.ioc.internal; -import java.util.Map; - import org.apache.tapestry5.ioc.MappedConfiguration; import org.apache.tapestry5.ioc.ObjectLocator; import org.apache.tapestry5.ioc.def.ContributionDef; +import java.util.Map; + /** * A wrapper around a Map that provides the {@link org.apache.tapestry5.ioc.MappedConfiguration} interface, and provides * two forms of validation for mapped configurations: @@ -28,9 +26,9 @@ import org.apache.tapestry5.ioc.def.ContributionDef; * <li>If the key has previously been stored (by some other {@link org.apache.tapestry5.ioc.def.ContributionDef}, then a * warning is logged</li> * </ul> - * <p/> + * * When a warning is logged, the key/value pair is not added to the delegate. - * <p/> + * * Handles instantiation of instances. * * @param <K> http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/BridgeBuilder.java ---------------------------------------------------------------------- diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/BridgeBuilder.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/BridgeBuilder.java index 64dc84b..ca15784 100644 --- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/BridgeBuilder.java +++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/BridgeBuilder.java @@ -1,5 +1,3 @@ -// Copyright 2006, 2007, 2011, 2012 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. // You may obtain a copy of the License at @@ -132,7 +130,7 @@ public class BridgeBuilder<S, F> /** * Finds a matching method in filterMethods for the given service method. A matching method has the same signature * as the service interface method, but with an additional parameter matching the service interface itself. - * <p/> + * * The matching method signature from the list of filterMethods is removed and code generation strategies for making * the two methods call each other are added. */ http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MethodSignature.java ---------------------------------------------------------------------- diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MethodSignature.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MethodSignature.java index 4f5917f..101abea 100644 --- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MethodSignature.java +++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MethodSignature.java @@ -1,5 +1,3 @@ -// Copyright 2006, 2007, 2008, 2010, 2011, 2012 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. // You may obtain a copy of the License at @@ -24,7 +22,7 @@ import java.util.Arrays; * A representation of a {@link java.lang.reflect.Method}, identifying the name, return type, parameter types and * exception types. Actual Method objects are tied to a particular class, and don't compare well with other otherwise * identical Methods from other classes or interface; MethodSignatures are distinct from classes and compare well. - * <p/> + * * Because the intended purpose is to compare methods from interfaces (which are always public and abstract) we don't * bother to actually track the modifiers. In addition, at this time, MethodSignature <em>does not distinguish between * instance and static methods</em>. http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/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 cbf7b49..e95c807 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 @@ -21,7 +21,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: Service Proxy --> * Interceptor(s) (from Decorators) --> Advise Proxy (from Advisiors) --> PerThread Proxy --> (per thread)