svn commit: r657113 [1/2] - in /tapestry/tapestry5/trunk: tapestry-annotations/src/main/java/org/apache/tapestry/ioc/annotation/ tapestry-annotations/src/main/java/org/apache/tapestry/ioc/annotations/ tapestry-core/src/main/java/org/apache/tapestry/ann...

[hl...@apache.org]

Author: hlship
Date: Fri May 16 09:01:55 2008
New Revision: 657113

URL: http://svn.apache.org/viewvc?rev=657113&view=rev
Log:
TAPESTR-2421: Allow Tapestry4/Tapestry5 to be deployed in the same WAR

Added:
    tapestry/tapestry5/trunk/tapestry-annotations/src/main/java/org/apache/tapestry/ioc/annotation/
      - copied from r647587, tapestry/tapestry5/trunk/tapestry-annotations/src/main/java/org/apache/tapestry/ioc/annotations/
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/
      - copied from r647587, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Cached.java
      - copied, changed from r648355, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Cached.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/ContentType.java
      - copied, changed from r656921, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/ContentType.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/IncludeStylesheet.java
      - copied, changed from r656921, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/IncludeStylesheet.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Log.java
      - copied, changed from r653256, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Log.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/OnEvent.java
      - copied, changed from r656921, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/OnEvent.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Parameter.java
      - copied, changed from r656921, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Parameter.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/ResponseEncoding.java
      - copied, changed from r656921, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/ResponseEncoding.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Secure.java
      - copied, changed from r656921, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Secure.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/json/
      - copied from r647587, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/json/
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/json/JSONArray.java
      - copied, changed from r654427, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/json/JSONArray.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/json/JSONObject.java
      - copied, changed from r654427, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/json/JSONObject.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/json/JSONTokener.java
      - copied, changed from r654427, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/json/JSONTokener.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/ApplicationGlobals.java
      - copied, changed from r647587, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ApplicationGlobals.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/ApplicationInitializer.java
      - copied, changed from r647587, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ApplicationInitializer.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/ApplicationInitializerFilter.java
      - copied, changed from r647587, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ApplicationInitializerFilter.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/ComponentMessagesSource.java
      - copied, changed from r647587, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ComponentMessagesSource.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/RequestGlobals.java
      - copied, changed from r647587, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/RequestGlobals.java
    tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/
    tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/json/
    tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/json/JSONObjectTest.java
      - copied, changed from r647587, tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/json/JSONObjectTest.java
    tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/annotation/
      - copied from r647587, tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/annotations/
Removed:
    tapestry/tapestry5/trunk/tapestry-annotations/src/main/java/org/apache/tapestry/ioc/annotations/InjectService.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/AfterRenderTemplate.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/BeforeRenderBody.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/BeginRender.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/CleanupRender.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/ContentType.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/IncludeJavaScriptLibrary.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/InjectPage.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Meta.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Mixin.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/MixinAfter.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/PageAttached.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Parameter.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Path.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Persist.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Property.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Retain.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Secure.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/json/JSONArray.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/json/JSONObject.java
    tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/annotations/EagerLoad.java
    tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/annotations/Marker.java
    tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/annotations/Match.java
    tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/annotations/Order.java
    tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/annotations/Scope.java
    tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/annotations/SubModule.java
Modified:
    tapestry/tapestry5/trunk/tapestry-annotations/src/main/java/org/apache/tapestry/ioc/annotation/Inject.java
    tapestry/tapestry5/trunk/tapestry-annotations/src/main/java/org/apache/tapestry/ioc/annotation/InjectService.java
    tapestry/tapestry5/trunk/tapestry-annotations/src/main/java/org/apache/tapestry/ioc/annotation/IntermediateType.java
    tapestry/tapestry5/trunk/tapestry-annotations/src/main/java/org/apache/tapestry/ioc/annotation/Primary.java
    tapestry/tapestry5/trunk/tapestry-annotations/src/main/java/org/apache/tapestry/ioc/annotation/Symbol.java
    tapestry/tapestry5/trunk/tapestry-annotations/src/main/java/org/apache/tapestry/ioc/annotation/Value.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/AfterRender.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/AfterRenderBody.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/AfterRenderTemplate.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/ApplicationState.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/BeforeRenderBody.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/BeforeRenderTemplate.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/BeginRender.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/CleanupRender.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Component.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Environmental.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Id.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/IncludeJavaScriptLibrary.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/InjectComponent.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/InjectContainer.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/InjectPage.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Meta.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Mixin.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/MixinAfter.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/MixinClasses.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Mixins.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/PageAttached.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/PageDetached.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/PageLoaded.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Path.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Persist.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Property.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Retain.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Service.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/SetupRender.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/SupportsInformalParameters.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/json/JSONString.java
    tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/annotation/EagerLoad.java
    tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/annotation/Marker.java
    tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/annotation/Match.java
    tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/annotation/Order.java
    tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/annotation/Scope.java
    tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/annotation/SubModule.java

Modified: tapestry/tapestry5/trunk/tapestry-annotations/src/main/java/org/apache/tapestry/ioc/annotation/Inject.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-annotations/src/main/java/org/apache/tapestry/ioc/annotation/Inject.java?rev=657113&r1=647587&r2=657113&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-annotations/src/main/java/org/apache/tapestry/ioc/annotation/Inject.java (original)
+++ tapestry/tapestry5/trunk/tapestry-annotations/src/main/java/org/apache/tapestry/ioc/annotation/Inject.java Fri May 16 09:01:55 2008
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.ioc.annotations;
+package org.apache.tapestry.ioc.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -32,7 +32,7 @@
  * In terms of the IoC container; normally, resources take precedence over annotations when injecting. The Inject
  * annotation overrides this default, forcing the resolution of the parameters value via the master {@link
  * org.apache.tapestry.ioc.ObjectProvider}, even when the parameter's type matches a type that is normally a resource.
- * This is most often used in conjunction with {@link org.apache.tapestry.ioc.annotations.Value} annotation when
+ * This is most often used in conjunction with {@link org.apache.tapestry.ioc.annotation.Value} annotation when
  * injecting a string, as normally, the String would be matched as the service id.
  * <p/>
  * In terms of the IoC container, the Inject annotation is only used on parameters to service builder methods (and

Modified: tapestry/tapestry5/trunk/tapestry-annotations/src/main/java/org/apache/tapestry/ioc/annotation/InjectService.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-annotations/src/main/java/org/apache/tapestry/ioc/annotation/InjectService.java?rev=657113&r1=647587&r2=657113&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-annotations/src/main/java/org/apache/tapestry/ioc/annotation/InjectService.java (original)
+++ tapestry/tapestry5/trunk/tapestry-annotations/src/main/java/org/apache/tapestry/ioc/annotation/InjectService.java Fri May 16 09:01:55 2008
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.ioc.annotations;
+package org.apache.tapestry.ioc.annotation;
 
 import java.lang.annotation.Documented;
 import static java.lang.annotation.ElementType.PARAMETER;
@@ -26,7 +26,7 @@
 /**
  * Annotation used with parameters of service builder methods to identify the service to be injected
  * into the service builder method via the parameter. In many cases the
- * {@link org.apache.tapestry.ioc.annotations.Inject} annotation is more flexible or appropriate.
+ * {@link org.apache.tapestry.ioc.annotation.Inject} annotation is more flexible or appropriate.
  *
  *
  */

Modified: tapestry/tapestry5/trunk/tapestry-annotations/src/main/java/org/apache/tapestry/ioc/annotation/IntermediateType.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-annotations/src/main/java/org/apache/tapestry/ioc/annotation/IntermediateType.java?rev=657113&r1=647587&r2=657113&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-annotations/src/main/java/org/apache/tapestry/ioc/annotation/IntermediateType.java (original)
+++ tapestry/tapestry5/trunk/tapestry-annotations/src/main/java/org/apache/tapestry/ioc/annotation/IntermediateType.java Fri May 16 09:01:55 2008
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.ioc.annotations;
+package org.apache.tapestry.ioc.annotation;
 
 import java.lang.annotation.*;
 
@@ -22,8 +22,8 @@
  * the intermediate type.  This was introduced to allow coercion from string to a time period (in milliseconds) via
  * {@link org.apache.tapestry.ioc.util.TimeInterval}.
  *
- * @see org.apache.tapestry.ioc.annotations.Value
- * @see org.apache.tapestry.ioc.annotations.Symbol
+ * @see org.apache.tapestry.ioc.annotation.Value
+ * @see org.apache.tapestry.ioc.annotation.Symbol
  */
 @Target({ ElementType.PARAMETER, ElementType.FIELD })
 @Retention(RetentionPolicy.RUNTIME)

Modified: tapestry/tapestry5/trunk/tapestry-annotations/src/main/java/org/apache/tapestry/ioc/annotation/Primary.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-annotations/src/main/java/org/apache/tapestry/ioc/annotation/Primary.java?rev=657113&r1=647587&r2=657113&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-annotations/src/main/java/org/apache/tapestry/ioc/annotation/Primary.java (original)
+++ tapestry/tapestry5/trunk/tapestry-annotations/src/main/java/org/apache/tapestry/ioc/annotation/Primary.java Fri May 16 09:01:55 2008
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.ioc.annotations;
+package org.apache.tapestry.ioc.annotation;
 
 import java.lang.annotation.Documented;
 import static java.lang.annotation.ElementType.FIELD;

Modified: tapestry/tapestry5/trunk/tapestry-annotations/src/main/java/org/apache/tapestry/ioc/annotation/Symbol.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-annotations/src/main/java/org/apache/tapestry/ioc/annotation/Symbol.java?rev=657113&r1=647587&r2=657113&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-annotations/src/main/java/org/apache/tapestry/ioc/annotation/Symbol.java (original)
+++ tapestry/tapestry5/trunk/tapestry-annotations/src/main/java/org/apache/tapestry/ioc/annotation/Symbol.java Fri May 16 09:01:55 2008
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.ioc.annotations;
+package org.apache.tapestry.ioc.annotation;
 
 import java.lang.annotation.Documented;
 import static java.lang.annotation.ElementType.FIELD;
@@ -23,7 +23,7 @@
 
 /**
  * Used to inject a symbol value, via a symbol name. This is used much like {@link
- * org.apache.tapestry.ioc.annotations.Value} annotation, except that symbols are not expanded ... the entire value is a
+ * org.apache.tapestry.ioc.annotation.Value} annotation, except that symbols are not expanded ... the entire value is a
  * symbol name. This allows the annotation to reference a public constant variable.
  */
 @Target(

Modified: tapestry/tapestry5/trunk/tapestry-annotations/src/main/java/org/apache/tapestry/ioc/annotation/Value.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-annotations/src/main/java/org/apache/tapestry/ioc/annotation/Value.java?rev=657113&r1=647587&r2=657113&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-annotations/src/main/java/org/apache/tapestry/ioc/annotation/Value.java (original)
+++ tapestry/tapestry5/trunk/tapestry-annotations/src/main/java/org/apache/tapestry/ioc/annotation/Value.java Fri May 16 09:01:55 2008
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.ioc.annotations;
+package org.apache.tapestry.ioc.annotation;
 
 import java.lang.annotation.Documented;
 import static java.lang.annotation.ElementType.FIELD;
@@ -22,7 +22,7 @@
 import java.lang.annotation.Target;
 
 /**
- * Used in conjunction with {@link org.apache.tapestry.ioc.annotations.Inject} to inject a literal value, rather than a
+ * Used in conjunction with {@link org.apache.tapestry.ioc.annotation.Inject} to inject a literal value, rather than a
  * service. Symbols in the value are expanded and the resulting string is coerced to the desired type. For IoC, this
  * annotation is only applied to parameters (on service builder methods, and on service constructors); for components,
  * it may also be applied to field.

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/AfterRender.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/AfterRender.java?rev=657113&r1=647587&r2=657113&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/AfterRender.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/AfterRender.java Fri May 16 09:01:55 2008
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.annotations;
+package org.apache.tapestry.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -22,10 +22,10 @@
 
 /**
  * Marker annotation for methods associated with the AfterRender phase. This corresponds closely to {@link
- * org.apache.tapestry.annotations.BeginRender}, but occurs after the template and body of the component have been
+ * org.apache.tapestry.annotation.BeginRender}, but occurs after the template and body of the component have been
  * rendered. Often, this is used to render a close tag. Return void or true (the default) to advance to the {@link
- * org.apache.tapestry.annotations.CleanupRender} phase. Return false to return to the {@link
- * org.apache.tapestry.annotations.BeginRender} phase.
+ * org.apache.tapestry.annotation.CleanupRender} phase. Return false to return to the {@link
+ * org.apache.tapestry.annotation.BeginRender} phase.
  */
 @Target(ElementType.METHOD)
 @Retention(RUNTIME)

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/AfterRenderBody.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/AfterRenderBody.java?rev=657113&r1=647587&r2=657113&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/AfterRenderBody.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/AfterRenderBody.java Fri May 16 09:01:55 2008
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.annotations;
+package org.apache.tapestry.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/AfterRenderTemplate.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/AfterRenderTemplate.java?rev=657113&r1=647587&r2=657113&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/AfterRenderTemplate.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/AfterRenderTemplate.java Fri May 16 09:01:55 2008
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.annotations;
+package org.apache.tapestry.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/ApplicationState.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/ApplicationState.java?rev=657113&r1=647587&r2=657113&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/ApplicationState.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/ApplicationState.java Fri May 16 09:01:55 2008
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.annotations;
+package org.apache.tapestry.annotation;
 
 import org.apache.tapestry.services.ApplicationStateManager;
 

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/BeforeRenderBody.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/BeforeRenderBody.java?rev=657113&r1=647587&r2=657113&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/BeforeRenderBody.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/BeforeRenderBody.java Fri May 16 09:01:55 2008
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.annotations;
+package org.apache.tapestry.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -28,7 +28,7 @@
  * Returning true (or void) will queue up the component's body for rendering.
  * <p/>
  * Returning false will skip the component's body, but continue rendering the template. The {@link
- * org.apache.tapestry.annotations.AfterRenderBody} phase will still execute after the template finishes rendering.
+ * org.apache.tapestry.annotation.AfterRenderBody} phase will still execute after the template finishes rendering.
  * <p/>
  * This phase is skipped for components which do not have a body.
  */

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/BeforeRenderTemplate.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/BeforeRenderTemplate.java?rev=657113&r1=647587&r2=657113&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/BeforeRenderTemplate.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/BeforeRenderTemplate.java Fri May 16 09:01:55 2008
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.annotations;
+package org.apache.tapestry.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/BeginRender.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/BeginRender.java?rev=657113&r1=647587&r2=657113&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/BeginRender.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/BeginRender.java Fri May 16 09:01:55 2008
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.annotations;
+package org.apache.tapestry.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -26,13 +26,13 @@
  * <p/>
  * Such methods may optionally take a {@link org.apache.tapestry.MarkupWriter} parameter, and may return void or
  * boolean. Returning true or void will allow the component to advance into the render template / render body phase. If
- * a body is present, the {@link org.apache.tapestry.annotations.BeforeRenderBody} phase will execute. If a component
- * has a template, the {@link BeforeRenderTemplate} phase will execute (and the render body will only occur if the
- * template directs so).
+ * a body is present, the {@link org.apache.tapestry.annotation.BeforeRenderBody} phase will execute. If a component has
+ * a template, the {@link BeforeRenderTemplate} phase will execute (and the render body will only occur if the template
+ * directs so).
  * <p/>
- * Either way, the {@link org.apache.tapestry.annotations.AfterRender} phase will execute after the template and/or body
+ * Either way, the {@link org.apache.tapestry.annotation.AfterRender} phase will execute after the template and/or body
  * have rendered. A component with a body but without a template will still see the {@link
- * org.apache.tapestry.annotations.BeforeRenderBody} phase execute.
+ * org.apache.tapestry.annotation.BeforeRenderBody} phase execute.
  * <p/>
  * Returning false will skip rendering of the template and/or body, and jump directly to the {@link AfterRender} phase.
  */

Copied: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Cached.java (from r648355, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Cached.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Cached.java?p2=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Cached.java&p1=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Cached.java&r1=648355&r2=657113&rev=657113&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Cached.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Cached.java Fri May 16 09:01:55 2008
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.annotations;
+package org.apache.tapestry.annotation;
 
 import java.lang.annotation.*;
 

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/CleanupRender.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/CleanupRender.java?rev=657113&r1=647587&r2=657113&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/CleanupRender.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/CleanupRender.java Fri May 16 09:01:55 2008
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.annotations;
+package org.apache.tapestry.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -24,7 +24,7 @@
  * Marker annotation for component methods associated with the terminal phase for the component rendering state machine.
  * Methods may optionally take a {@link org.apache.tapestry.MarkupWriter} annotation. Generally, methods marked with
  * this annotation are used to perform post-render cleanup. In addition, a method may return false to return to the
- * {@link org.apache.tapestry.annotations.SetupRender} phase. Returning void or true (the default), is the normal
+ * {@link org.apache.tapestry.annotation.SetupRender} phase. Returning void or true (the default), is the normal
  * course.
  */
 @Target(ElementType.METHOD)

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Component.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Component.java?rev=657113&r1=647587&r2=657113&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Component.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Component.java Fri May 16 09:01:55 2008
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.annotations;
+package org.apache.tapestry.annotation;
 
 import java.lang.annotation.Documented;
 import static java.lang.annotation.ElementType.FIELD;

Copied: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/ContentType.java (from r656921, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/ContentType.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/ContentType.java?p2=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/ContentType.java&p1=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/ContentType.java&r1=656921&r2=657113&rev=657113&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/ContentType.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/ContentType.java Fri May 16 09:01:55 2008
@@ -12,17 +12,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.annotations;
+package org.apache.tapestry.annotation;
 
 import java.lang.annotation.*;
 
 
 /**
  * An annotation on a page component used to identify the content type the page returns. An alternative to the {@link
- * org.apache.tapestry.annotations.Meta} annotation with the {@link org.apache.tapestry.MetaDataConstants#RESPONSE_CONTENT_TYPE}
+ * org.apache.tapestry.annotation.Meta} annotation with the {@link org.apache.tapestry.MetaDataConstants#RESPONSE_CONTENT_TYPE}
  * key.
  *
- * @see org.apache.tapestry.annotations.ResponseEncoding
+ * @see org.apache.tapestry.annotation.ResponseEncoding
  */
 @Target({ ElementType.TYPE })
 @Retention(RetentionPolicy.RUNTIME)

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Environmental.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Environmental.java?rev=657113&r1=647587&r2=657113&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Environmental.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Environmental.java Fri May 16 09:01:55 2008
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.annotations;
+package org.apache.tapestry.annotation;
 
 import org.apache.tapestry.services.Environment;
 

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Id.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Id.java?rev=657113&r1=647587&r2=657113&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Id.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Id.java Fri May 16 09:01:55 2008
@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.annotations;
+package org.apache.tapestry.annotation;
 
 import org.apache.tapestry.Block;
-import org.apache.tapestry.ioc.annotations.Inject;
+import org.apache.tapestry.ioc.annotation.Inject;
 
 import java.lang.annotation.Documented;
 import static java.lang.annotation.ElementType.FIELD;

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/IncludeJavaScriptLibrary.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/IncludeJavaScriptLibrary.java?rev=657113&r1=647587&r2=657113&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/IncludeJavaScriptLibrary.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/IncludeJavaScriptLibrary.java Fri May 16 09:01:55 2008
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.annotations;
+package org.apache.tapestry.annotation;
 
 import java.lang.annotation.*;
 
@@ -21,8 +21,8 @@
  * Allows for the inclusion of one or more JavaScript libraries.  The libraries are assets, usually (but not always)
  * stored on the classpath with the component.
  *
- * @see org.apache.tapestry.annotations.IncludeStylesheet
- * @see org.apache.tapestry.annotations.Path
+ * @see org.apache.tapestry.annotation.IncludeStylesheet
+ * @see org.apache.tapestry.annotation.Path
  */
 @Target({ ElementType.TYPE })
 @Retention(RetentionPolicy.RUNTIME)

Copied: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/IncludeStylesheet.java (from r656921, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/IncludeStylesheet.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/IncludeStylesheet.java?p2=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/IncludeStylesheet.java&p1=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/IncludeStylesheet.java&r1=656921&r2=657113&rev=657113&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/IncludeStylesheet.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/IncludeStylesheet.java Fri May 16 09:01:55 2008
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.annotations;
+package org.apache.tapestry.annotation;
 
 import java.lang.annotation.*;
 
@@ -28,8 +28,8 @@
  * Does not support setting a media type; if that is required. use {@link org.apache.tapestry.RenderSupport#addStylesheetLink(org.apache.tapestry.Asset,
  * String)} directly.
  *
- * @see org.apache.tapestry.annotations.Path
- * @see org.apache.tapestry.annotations.IncludeJavaScriptLibrary
+ * @see org.apache.tapestry.annotation.Path
+ * @see org.apache.tapestry.annotation.IncludeJavaScriptLibrary
  */
 @Target({ ElementType.TYPE })
 @Retention(RetentionPolicy.RUNTIME)

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/InjectComponent.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/InjectComponent.java?rev=657113&r1=647587&r2=657113&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/InjectComponent.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/InjectComponent.java Fri May 16 09:01:55 2008
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.annotations;
+package org.apache.tapestry.annotation;
 
 import java.lang.annotation.Documented;
 import static java.lang.annotation.ElementType.FIELD;

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/InjectContainer.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/InjectContainer.java?rev=657113&r1=647587&r2=657113&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/InjectContainer.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/InjectContainer.java Fri May 16 09:01:55 2008
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.annotations;
+package org.apache.tapestry.annotation;
 
 import java.lang.annotation.Documented;
 import static java.lang.annotation.ElementType.FIELD;

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/InjectPage.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/InjectPage.java?rev=657113&r1=647587&r2=657113&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/InjectPage.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/InjectPage.java Fri May 16 09:01:55 2008
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.annotations;
+package org.apache.tapestry.annotation;
 
 import java.lang.annotation.Documented;
 import static java.lang.annotation.ElementType.FIELD;

Copied: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Log.java (from r653256, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Log.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Log.java?p2=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Log.java&p1=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Log.java&r1=653256&r2=657113&rev=657113&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Log.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Log.java Fri May 16 09:01:55 2008
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.annotations;
+package org.apache.tapestry.annotation;
 
 import java.lang.annotation.*;
 

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Meta.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Meta.java?rev=657113&r1=647587&r2=657113&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Meta.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Meta.java Fri May 16 09:01:55 2008
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.annotations;
+package org.apache.tapestry.annotation;
 
 import org.apache.tapestry.model.ComponentModel;
 

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Mixin.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Mixin.java?rev=657113&r1=647587&r2=657113&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Mixin.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Mixin.java Fri May 16 09:01:55 2008
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.annotations;
+package org.apache.tapestry.annotation;
 
 import java.lang.annotation.Documented;
 import static java.lang.annotation.ElementType.FIELD;

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/MixinAfter.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/MixinAfter.java?rev=657113&r1=647587&r2=657113&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/MixinAfter.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/MixinAfter.java Fri May 16 09:01:55 2008
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.annotations;
+package org.apache.tapestry.annotation;
 
 import java.lang.annotation.Documented;
 import static java.lang.annotation.ElementType.TYPE;

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/MixinClasses.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/MixinClasses.java?rev=657113&r1=647587&r2=657113&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/MixinClasses.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/MixinClasses.java Fri May 16 09:01:55 2008
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.annotations;
+package org.apache.tapestry.annotation;
 
 import java.lang.annotation.Documented;
 import static java.lang.annotation.ElementType.FIELD;

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Mixins.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Mixins.java?rev=657113&r1=647587&r2=657113&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Mixins.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Mixins.java Fri May 16 09:01:55 2008
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.annotations;
+package org.apache.tapestry.annotation;
 
 import java.lang.annotation.Documented;
 import static java.lang.annotation.ElementType.FIELD;

Copied: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/OnEvent.java (from r656921, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/OnEvent.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/OnEvent.java?p2=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/OnEvent.java&p1=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/OnEvent.java&r1=656921&r2=657113&rev=657113&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/OnEvent.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/OnEvent.java Fri May 16 09:01:55 2008
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.annotations;
+package org.apache.tapestry.annotation;
 
 import org.apache.tapestry.EventConstants;
 

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/PageAttached.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/PageAttached.java?rev=657113&r1=647587&r2=657113&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/PageAttached.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/PageAttached.java Fri May 16 09:01:55 2008
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.annotations;
+package org.apache.tapestry.annotation;
 
 import java.lang.annotation.Documented;
 import static java.lang.annotation.ElementType.METHOD;

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/PageDetached.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/PageDetached.java?rev=657113&r1=647587&r2=657113&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/PageDetached.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/PageDetached.java Fri May 16 09:01:55 2008
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.annotations;
+package org.apache.tapestry.annotation;
 
 import java.lang.annotation.Documented;
 import static java.lang.annotation.ElementType.METHOD;

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/PageLoaded.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/PageLoaded.java?rev=657113&r1=647587&r2=657113&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/PageLoaded.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/PageLoaded.java Fri May 16 09:01:55 2008
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.annotations;
+package org.apache.tapestry.annotation;
 
 import java.lang.annotation.Documented;
 import static java.lang.annotation.ElementType.METHOD;

Copied: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Parameter.java (from r656921, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Parameter.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Parameter.java?p2=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Parameter.java&p1=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Parameter.java&r1=656921&r2=657113&rev=657113&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Parameter.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Parameter.java Fri May 16 09:01:55 2008
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.annotations;
+package org.apache.tapestry.annotation;
 
 import org.apache.tapestry.BindingConstants;
 import org.apache.tapestry.services.BindingFactory;

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Path.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Path.java?rev=657113&r1=647587&r2=657113&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Path.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Path.java Fri May 16 09:01:55 2008
@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.annotations;
+package org.apache.tapestry.annotation;
 
 import org.apache.tapestry.Asset;
-import org.apache.tapestry.ioc.annotations.Inject;
+import org.apache.tapestry.ioc.annotation.Inject;
 
 import java.lang.annotation.Documented;
 import static java.lang.annotation.ElementType.FIELD;

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Persist.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Persist.java?rev=657113&r1=647587&r2=657113&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Persist.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Persist.java Fri May 16 09:01:55 2008
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.annotations;
+package org.apache.tapestry.annotation;
 
 import org.apache.tapestry.services.MetaDataLocator;
 import org.apache.tapestry.services.Session;

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Property.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Property.java?rev=657113&r1=647587&r2=657113&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Property.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Property.java Fri May 16 09:01:55 2008
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.annotations;
+package org.apache.tapestry.annotation;
 
 import java.lang.annotation.Documented;
 import static java.lang.annotation.ElementType.FIELD;
@@ -30,9 +30,13 @@
 @Retention(RUNTIME)
 public @interface Property
 {
-    /** Whether to create a readable property (i.e., generate a getter method). */
+    /**
+     * Whether to create a readable property (i.e., generate a getter method).
+     */
     boolean read() default true;
 
-    /** Whether to create a writeable property (i.e., generate a setter method). */
+    /**
+     * Whether to create a writeable property (i.e., generate a setter method).
+     */
     boolean write() default true;
 }

Copied: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/ResponseEncoding.java (from r656921, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/ResponseEncoding.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/ResponseEncoding.java?p2=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/ResponseEncoding.java&p1=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/ResponseEncoding.java&r1=656921&r2=657113&rev=657113&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/ResponseEncoding.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/ResponseEncoding.java Fri May 16 09:01:55 2008
@@ -12,17 +12,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.annotations;
+package org.apache.tapestry.annotation;
 
 import java.lang.annotation.*;
 
 
 /**
  * An annotation on a page component used to identify the respones encoding (the character set of the text sent in the
- * response). An alternative to the {@link org.apache.tapestry.annotations.Meta} annotation with the {@link
+ * response). An alternative to the {@link org.apache.tapestry.annotation.Meta} annotation with the {@link
  * org.apache.tapestry.MetaDataConstants#RESPONSE_ENCODING} key.
  *
- * @see org.apache.tapestry.annotations.ContentType
+ * @see org.apache.tapestry.annotation.ContentType
  */
 @Target({ ElementType.TYPE })
 @Retention(RetentionPolicy.RUNTIME)

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Retain.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Retain.java?rev=657113&r1=647587&r2=657113&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Retain.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Retain.java Fri May 16 09:01:55 2008
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.annotations;
+package org.apache.tapestry.annotation;
 
 import java.lang.annotation.Documented;
 import static java.lang.annotation.ElementType.FIELD;

Copied: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Secure.java (from r656921, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Secure.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Secure.java?p2=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Secure.java&p1=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Secure.java&r1=656921&r2=657113&rev=657113&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Secure.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Secure.java Fri May 16 09:01:55 2008
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.annotations;
+package org.apache.tapestry.annotation;
 
 import java.lang.annotation.Documented;
 import static java.lang.annotation.ElementType.TYPE;

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Service.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Service.java?rev=657113&r1=647587&r2=657113&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Service.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/Service.java Fri May 16 09:01:55 2008
@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.annotations;
+package org.apache.tapestry.annotation;
 
-import org.apache.tapestry.ioc.annotations.Inject;
+import org.apache.tapestry.ioc.annotation.Inject;
 
 import java.lang.annotation.Documented;
 import static java.lang.annotation.ElementType.FIELD;

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/SetupRender.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/SetupRender.java?rev=657113&r1=647587&r2=657113&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/SetupRender.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/SetupRender.java Fri May 16 09:01:55 2008
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.annotations;
+package org.apache.tapestry.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -23,8 +23,8 @@
 /**
  * Marker annotation for methods that should be executed during the SetupRender phase. Such methods may optionally take
  * a {@link org.apache.tapestry.MarkupWriter} parameter, and may return void or boolean. Returning true or void will
- * advance to the {@link org.apache.tapestry.annotations.BeginRender} phase. Return false to skip the BeginRender phase
- * and procede directly to the {@link org.apache.tapestry.annotations.CleanupRender} phase.
+ * advance to the {@link org.apache.tapestry.annotation.BeginRender} phase. Return false to skip the BeginRender phase
+ * and procede directly to the {@link org.apache.tapestry.annotation.CleanupRender} phase.
  */
 @Target(ElementType.METHOD)
 @Retention(RUNTIME)

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/SupportsInformalParameters.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/SupportsInformalParameters.java?rev=657113&r1=647587&r2=657113&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/SupportsInformalParameters.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotation/SupportsInformalParameters.java Fri May 16 09:01:55 2008
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.annotations;
+package org.apache.tapestry.annotation;
 
 import org.apache.tapestry.model.ComponentModel;
 

Copied: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/json/JSONArray.java (from r654427, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/json/JSONArray.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/json/JSONArray.java?p2=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/json/JSONArray.java&p1=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/json/JSONArray.java&r1=654427&r2=657113&rev=657113&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/json/JSONArray.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/json/JSONArray.java Fri May 16 09:01:55 2008
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.json;
+package org.apache.tapestry5.json;
 
 /*
  Copyright (c) 2002 JSON.org

Copied: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/json/JSONObject.java (from r654427, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/json/JSONObject.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/json/JSONObject.java?p2=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/json/JSONObject.java&p1=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/json/JSONObject.java&r1=654427&r2=657113&rev=657113&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/json/JSONObject.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/json/JSONObject.java Fri May 16 09:01:55 2008
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.json;
+package org.apache.tapestry5.json;
 
 /*
  Copyright (c) 2002 JSON.org

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/json/JSONString.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/json/JSONString.java?rev=657113&r1=647587&r2=657113&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/json/JSONString.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/json/JSONString.java Fri May 16 09:01:55 2008
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.json;
+package org.apache.tapestry5.json;
 
 /**
  * The <code>JSONString</code> interface allows a <code>toJSONString()</code> method so that a class can change the

Copied: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/json/JSONTokener.java (from r654427, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/json/JSONTokener.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/json/JSONTokener.java?p2=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/json/JSONTokener.java&p1=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/json/JSONTokener.java&r1=654427&r2=657113&rev=657113&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/json/JSONTokener.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/json/JSONTokener.java Fri May 16 09:01:55 2008
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.json;
+package org.apache.tapestry5.json;
 
 /*
  Copyright (c) 2002 JSON.org

Copied: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/ApplicationGlobals.java (from r647587, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ApplicationGlobals.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/ApplicationGlobals.java?p2=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/ApplicationGlobals.java&p1=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ApplicationGlobals.java&r1=647587&r2=657113&rev=657113&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ApplicationGlobals.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/ApplicationGlobals.java Fri May 16 09:01:55 2008
@@ -12,7 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
+
+import org.apache.tapestry.services.Context;
 
 import javax.servlet.ServletContext;
 

Copied: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/ApplicationInitializer.java (from r647587, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ApplicationInitializer.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/ApplicationInitializer.java?p2=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/ApplicationInitializer.java&p1=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ApplicationInitializer.java&r1=647587&r2=657113&rev=657113&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ApplicationInitializer.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/ApplicationInitializer.java Fri May 16 09:01:55 2008
@@ -1,23 +1,25 @@
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package org.apache.tapestry.services;
+// 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
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package org.apache.tapestry5.services;
+
+import org.apache.tapestry.services.Context;
 
 /**
  * Service interface for initializing Tapestry for the application.
  *
- * @see org.apache.tapestry.services.ApplicationInitializerFilter
+ * @see ApplicationInitializerFilter
  */
 public interface ApplicationInitializer
 {

Copied: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/ApplicationInitializerFilter.java (from r647587, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ApplicationInitializerFilter.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/ApplicationInitializerFilter.java?p2=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/ApplicationInitializerFilter.java&p1=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ApplicationInitializerFilter.java&r1=647587&r2=657113&rev=657113&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ApplicationInitializerFilter.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/ApplicationInitializerFilter.java Fri May 16 09:01:55 2008
@@ -1,21 +1,23 @@
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package org.apache.tapestry.services;
+// 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
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package org.apache.tapestry5.services;
+
+import org.apache.tapestry.services.Context;
 
 /**
- * Filter interface for {@link org.apache.tapestry.services.ApplicationInitializer}.
+ * Filter interface for {@link ApplicationInitializer}.
  */
 public interface ApplicationInitializerFilter
 {

Copied: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/ComponentMessagesSource.java (from r647587, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ComponentMessagesSource.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/ComponentMessagesSource.java?p2=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/ComponentMessagesSource.java&p1=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ComponentMessagesSource.java&r1=647587&r2=657113&rev=657113&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ComponentMessagesSource.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/ComponentMessagesSource.java Fri May 16 09:01:55 2008
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
 
 import org.apache.tapestry.internal.event.InvalidationEventHub;
 import org.apache.tapestry.ioc.Messages;

Copied: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/RequestGlobals.java (from r647587, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/RequestGlobals.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/RequestGlobals.java?p2=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/RequestGlobals.java&p1=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/RequestGlobals.java&r1=647587&r2=657113&rev=657113&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/RequestGlobals.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/RequestGlobals.java Fri May 16 09:01:55 2008
@@ -12,7 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
+
+import org.apache.tapestry.services.Request;
+import org.apache.tapestry.services.Response;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

Copied: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/json/JSONObjectTest.java (from r647587, tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/json/JSONObjectTest.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/json/JSONObjectTest.java?p2=tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/json/JSONObjectTest.java&p1=tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/json/JSONObjectTest.java&r1=647587&r2=657113&rev=657113&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/json/JSONObjectTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/json/JSONObjectTest.java Fri May 16 09:01:55 2008
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.json;
+package org.apache.tapestry5.json;
 
 import org.testng.Assert;
 import org.testng.annotations.DataProvider;
@@ -92,8 +92,9 @@
     @DataProvider(name = "boolean_inputs")
     public Object[][] boolean_inputs()
     {
-        return new Object[][]{{"true", true}, {"TRUE", true}, {"false", false}, {"FALSE", false}, {Boolean.TRUE, true},
-                              {Boolean.FALSE, false}};
+        return new Object[][] { { "true", true }, { "TRUE", true }, { "false", false }, { "FALSE", false },
+                { Boolean.TRUE, true },
+                { Boolean.FALSE, false } };
     }
 
     @Test
@@ -208,8 +209,8 @@
     @DataProvider(name = "double_inputs")
     public Object[][] double_inputs()
     {
-        return new Object[][]{{3d, "3"}, {-22.5d, "-22.5"}, {0d, "0"}, {Double.NEGATIVE_INFINITY, "null"},
-                              {Double.POSITIVE_INFINITY, "null"}, {Double.NaN, "null"},};
+        return new Object[][] { { 3d, "3" }, { -22.5d, "-22.5" }, { 0d, "0" }, { Double.NEGATIVE_INFINITY, "null" },
+                { Double.POSITIVE_INFINITY, "null" }, { Double.NaN, "null" }, };
     }
 
     @Test(dataProvider = "get_double_inputs")
@@ -225,7 +226,7 @@
     @DataProvider(name = "get_double_inputs")
     public Object[][] getDoubleInputs()
     {
-        return new Object[][]{{new Double(3.5), 3.5d}, {new Long(1000), 1000d}, {"-101.7", -101.7d}};
+        return new Object[][] { { new Double(3.5), 3.5d }, { new Long(1000), 1000d }, { "-101.7", -101.7d } };
     }
 
     @Test
@@ -277,7 +278,7 @@
     @DataProvider(name = "get_int_inputs")
     public Object[][] get_int_inputs()
     {
-        return new Object[][]{{"3", 3}, {new Long(97), 97}, {"-8.76", -8}};
+        return new Object[][] { { "3", 3 }, { new Long(97), 97 }, { "-8.76", -8 } };
     }
 
     @Test
@@ -380,7 +381,7 @@
 
         Arrays.sort(names);
 
-        assertEquals(names, new String[]{"barney", "fred"});
+        assertEquals(names, new String[] { "barney", "fred" });
 
     }
 }

Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/annotation/EagerLoad.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/annotation/EagerLoad.java?rev=657113&r1=647587&r2=657113&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/annotation/EagerLoad.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/annotation/EagerLoad.java Fri May 16 09:01:55 2008
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.ioc.annotations;
+package org.apache.tapestry.ioc.annotation;
 
 import org.apache.tapestry.ioc.ServiceBinder;
 
@@ -24,15 +24,15 @@
 import java.lang.annotation.Target;
 
 /**
- * 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.
+ * 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 ServiceBinder}.
+ * This annotation may also be placed directly on a service implementation class, when using autobuilding via the {@link
+ * ServiceBinder}.
  */
 @Target(
-        {TYPE, METHOD})
+        { TYPE, METHOD })
 @Retention(RUNTIME)
 @Documented
 public @interface EagerLoad

Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/annotation/Marker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/annotation/Marker.java?rev=657113&r1=647587&r2=657113&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/annotation/Marker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/annotation/Marker.java Fri May 16 09:01:55 2008
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.ioc.annotations;
+package org.apache.tapestry.ioc.annotation;
 
 import org.apache.tapestry.ioc.def.ServiceDef;
 
@@ -24,18 +24,17 @@
 import java.lang.annotation.Target;
 
 /**
- * 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.
+ * 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.tapestry.ioc.ServiceBindingOptions#withMarker(Class[])} will accumulate; a service may
- * have any number of markers.  Generally one or two is enough.
+ * 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.tapestry.ioc.ServiceBindingOptions#withMarker(Class[])} will accumulate; a service may have any number of
+ * markers.  Generally one or two is enough.
  */
 @Target(
-        {TYPE, METHOD})
+        { TYPE, METHOD })
 @Retention(RUNTIME)
 @Documented
 public @interface Marker