You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2008/05/16 18:12:29 UTC
svn commit: r657123 [2/3] - in /tapestry/tapestry5/trunk/tapestry-core/src:
main/java/org/apache/tapestry/ main/java/org/apache/tapestry/corelib/base/
main/java/org/apache/tapestry/corelib/components/
main/java/org/apache/tapestry/corelib/mixins/ main/...
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/renderers/LocationRenderer.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/renderers/LocationRenderer.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/renderers/LocationRenderer.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/renderers/LocationRenderer.java Fri May 16 09:12:25 2008
@@ -19,7 +19,7 @@
import static org.apache.tapestry.ioc.IOCConstants.PERTHREAD_SCOPE;
import org.apache.tapestry.ioc.Location;
import org.apache.tapestry.ioc.Resource;
-import org.apache.tapestry.ioc.annotations.Scope;
+import org.apache.tapestry.ioc.annotation.Scope;
import org.apache.tapestry.ioc.internal.util.CollectionFactory;
import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.apache.tapestry.services.ObjectRenderer;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/renderers/ObjectArrayRenderer.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/renderers/ObjectArrayRenderer.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/renderers/ObjectArrayRenderer.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/renderers/ObjectArrayRenderer.java Fri May 16 09:12:25 2008
@@ -15,7 +15,7 @@
package org.apache.tapestry.internal.renderers;
import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.ioc.annotations.Primary;
+import org.apache.tapestry.ioc.annotation.Primary;
import org.apache.tapestry.services.ObjectRenderer;
import java.util.Arrays;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AjaxComponentEventRequestHandler.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AjaxComponentEventRequestHandler.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AjaxComponentEventRequestHandler.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AjaxComponentEventRequestHandler.java Fri May 16 09:12:25 2008
@@ -19,8 +19,8 @@
import org.apache.tapestry.internal.InternalConstants;
import org.apache.tapestry.internal.structure.ComponentPageElement;
import org.apache.tapestry.internal.structure.Page;
-import org.apache.tapestry.json.JSONObject;
import org.apache.tapestry.services.*;
+import org.apache.tapestry5.json.JSONObject;
import java.io.IOException;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AjaxPartialResponseRenderer.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AjaxPartialResponseRenderer.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AjaxPartialResponseRenderer.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AjaxPartialResponseRenderer.java Fri May 16 09:12:25 2008
@@ -19,7 +19,7 @@
/**
* Used to render portions of a page as part of an {@linkplain AjaxComponentEventRequestHandler Ajax request}. This
* encapsulates rendering of the partial response and then the construction of a {@linkplain
- * org.apache.tapestry.json.JSONObject JSON reply}. Works with the pipeline defined by the {@link
+ * org.apache.tapestry5.json.JSONObject JSON reply}. Works with the pipeline defined by the {@link
* org.apache.tapestry.services.PartialMarkupRenderer} service.
*
* @see org.apache.tapestry.internal.services.PageRenderQueue
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AjaxPartialResponseRendererImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AjaxPartialResponseRendererImpl.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AjaxPartialResponseRendererImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AjaxPartialResponseRendererImpl.java Fri May 16 09:12:25 2008
@@ -17,11 +17,11 @@
import org.apache.tapestry.ContentType;
import org.apache.tapestry.MarkupWriter;
import org.apache.tapestry.internal.InternalConstants;
-import org.apache.tapestry.json.JSONObject;
import org.apache.tapestry.services.MarkupWriterFactory;
import org.apache.tapestry.services.PartialMarkupRenderer;
import org.apache.tapestry.services.Request;
import org.apache.tapestry.services.Response;
+import org.apache.tapestry5.json.JSONObject;
import java.io.IOException;
import java.io.PrintWriter;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ApplicationGlobalsImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ApplicationGlobalsImpl.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ApplicationGlobalsImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ApplicationGlobalsImpl.java Fri May 16 09:12:25 2008
@@ -14,8 +14,8 @@
package org.apache.tapestry.internal.services;
-import org.apache.tapestry.services.ApplicationGlobals;
import org.apache.tapestry.services.Context;
+import org.apache.tapestry5.services.ApplicationGlobals;
import javax.servlet.ServletContext;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AssetInjectionProvider.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AssetInjectionProvider.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AssetInjectionProvider.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AssetInjectionProvider.java Fri May 16 09:12:25 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.internal.services;
-import org.apache.tapestry.annotations.Path;
+import org.apache.tapestry.annotation.Path;
import org.apache.tapestry.ioc.ObjectLocator;
import org.apache.tapestry.ioc.Resource;
import org.apache.tapestry.ioc.services.SymbolSource;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AssetObjectProvider.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AssetObjectProvider.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AssetObjectProvider.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AssetObjectProvider.java Fri May 16 09:12:25 2008
@@ -15,7 +15,7 @@
package org.apache.tapestry.internal.services;
import org.apache.tapestry.Asset;
-import org.apache.tapestry.annotations.Path;
+import org.apache.tapestry.annotation.Path;
import org.apache.tapestry.ioc.AnnotationProvider;
import org.apache.tapestry.ioc.ObjectLocator;
import org.apache.tapestry.ioc.ObjectProvider;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/BeanModelSourceImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/BeanModelSourceImpl.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/BeanModelSourceImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/BeanModelSourceImpl.java Fri May 16 09:12:25 2008
@@ -22,7 +22,7 @@
import org.apache.tapestry.ioc.LoggerSource;
import org.apache.tapestry.ioc.Messages;
import org.apache.tapestry.ioc.ObjectLocator;
-import org.apache.tapestry.ioc.annotations.Primary;
+import org.apache.tapestry.ioc.annotation.Primary;
import org.apache.tapestry.ioc.internal.util.CollectionFactory;
import org.apache.tapestry.ioc.internal.util.Defense;
import org.apache.tapestry.ioc.services.*;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/BlockInjectionProvider.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/BlockInjectionProvider.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/BlockInjectionProvider.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/BlockInjectionProvider.java Fri May 16 09:12:25 2008
@@ -15,9 +15,9 @@
package org.apache.tapestry.internal.services;
import org.apache.tapestry.Block;
-import org.apache.tapestry.annotations.Id;
+import org.apache.tapestry.annotation.Id;
import org.apache.tapestry.ioc.ObjectLocator;
-import org.apache.tapestry.ioc.annotations.Inject;
+import org.apache.tapestry.ioc.annotation.Inject;
import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.apache.tapestry.model.MutableComponentModel;
import org.apache.tapestry.services.ClassTransformation;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClientBehaviorSupportImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClientBehaviorSupportImpl.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClientBehaviorSupportImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClientBehaviorSupportImpl.java Fri May 16 09:12:25 2008
@@ -19,8 +19,8 @@
import org.apache.tapestry.RenderSupport;
import org.apache.tapestry.corelib.data.InsertPosition;
import org.apache.tapestry.ioc.internal.util.Defense;
-import org.apache.tapestry.json.JSONArray;
-import org.apache.tapestry.json.JSONObject;
+import org.apache.tapestry5.json.JSONArray;
+import org.apache.tapestry5.json.JSONObject;
public class ClientBehaviorSupportImpl implements ClientBehaviorSupport
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClientPersistentFieldStorageImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClientPersistentFieldStorageImpl.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClientPersistentFieldStorageImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClientPersistentFieldStorageImpl.java Fri May 16 09:12:25 2008
@@ -18,7 +18,7 @@
import org.apache.tapestry.internal.util.Base64ObjectInputStream;
import org.apache.tapestry.internal.util.Base64ObjectOutputStream;
import static org.apache.tapestry.ioc.IOCConstants.PERTHREAD_SCOPE;
-import org.apache.tapestry.ioc.annotations.Scope;
+import org.apache.tapestry.ioc.annotation.Scope;
import org.apache.tapestry.ioc.internal.util.CollectionFactory;
import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
import org.apache.tapestry.ioc.internal.util.InternalUtils;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentClassResolverImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentClassResolverImpl.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentClassResolverImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentClassResolverImpl.java Fri May 16 09:12:25 2008
@@ -16,8 +16,8 @@
import org.apache.tapestry.internal.InternalConstants;
import org.apache.tapestry.internal.events.InvalidationListener;
-import org.apache.tapestry.ioc.annotations.Inject;
-import org.apache.tapestry.ioc.annotations.Symbol;
+import org.apache.tapestry.ioc.annotation.Inject;
+import org.apache.tapestry.ioc.annotation.Symbol;
import org.apache.tapestry.ioc.internal.util.CollectionFactory;
import org.apache.tapestry.ioc.internal.util.ConcurrentBarrier;
import org.apache.tapestry.ioc.internal.util.InternalUtils;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentMessagesSourceImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentMessagesSourceImpl.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentMessagesSourceImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentMessagesSourceImpl.java Fri May 16 09:12:25 2008
@@ -20,7 +20,7 @@
import org.apache.tapestry.ioc.Messages;
import org.apache.tapestry.ioc.Resource;
import org.apache.tapestry.model.ComponentModel;
-import org.apache.tapestry.services.ComponentMessagesSource;
+import org.apache.tapestry5.services.ComponentMessagesSource;
import java.util.Locale;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/CookiesImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/CookiesImpl.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/CookiesImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/CookiesImpl.java Fri May 16 09:12:25 2008
@@ -14,8 +14,8 @@
package org.apache.tapestry.internal.services;
-import org.apache.tapestry.ioc.annotations.IntermediateType;
-import org.apache.tapestry.ioc.annotations.Symbol;
+import org.apache.tapestry.ioc.annotation.IntermediateType;
+import org.apache.tapestry.ioc.annotation.Symbol;
import org.apache.tapestry.ioc.util.TimeInterval;
import org.apache.tapestry.services.Cookies;
import org.apache.tapestry.services.Request;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/DefaultInjectionProvider.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/DefaultInjectionProvider.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/DefaultInjectionProvider.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/DefaultInjectionProvider.java Fri May 16 09:12:25 2008
@@ -24,7 +24,7 @@
import java.lang.annotation.Annotation;
/**
- * Worker for the {@link org.apache.tapestry.ioc.annotations.Inject} annotation that delegates out to the master {@link
+ * Worker for the {@link org.apache.tapestry.ioc.annotation.Inject} annotation that delegates out to the master {@link
* org.apache.tapestry.ioc.services.MasterObjectProvider} to access the value. This worker must be scheduled after
* certain other workers, such as {@link BlockInjectionProvider} (which is keyed off a combination of type and the
* Inject annotation).
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/EnvironmentImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/EnvironmentImpl.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/EnvironmentImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/EnvironmentImpl.java Fri May 16 09:12:25 2008
@@ -15,7 +15,7 @@
package org.apache.tapestry.internal.services;
import static org.apache.tapestry.ioc.IOCConstants.PERTHREAD_SCOPE;
-import org.apache.tapestry.ioc.annotations.Scope;
+import org.apache.tapestry.ioc.annotation.Scope;
import org.apache.tapestry.ioc.internal.util.CollectionFactory;
import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newLinkedList;
import org.apache.tapestry.services.Environment;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InternalClassTransformationImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InternalClassTransformationImpl.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InternalClassTransformationImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InternalClassTransformationImpl.java Fri May 16 09:12:25 2008
@@ -82,11 +82,11 @@
private Set<CtBehavior> addedMethods = newSet();
- // Cache of class annotations
+ // Cache of class annotation
private List<Annotation> classAnnotations;
- // Cache of method annotations
+ // Cache of method annotation
private Map<CtMethod, List<Annotation>> methodAnnotations = newMap();
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InternalModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InternalModule.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InternalModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InternalModule.java Fri May 16 09:12:25 2008
@@ -21,15 +21,17 @@
import org.apache.tapestry.ioc.ObjectLocator;
import org.apache.tapestry.ioc.ServiceBinder;
import org.apache.tapestry.ioc.ServiceResources;
-import org.apache.tapestry.ioc.annotations.Marker;
-import org.apache.tapestry.ioc.annotations.Scope;
-import org.apache.tapestry.ioc.annotations.Symbol;
+import org.apache.tapestry.ioc.annotation.Marker;
+import org.apache.tapestry.ioc.annotation.Scope;
+import org.apache.tapestry.ioc.annotation.Symbol;
import org.apache.tapestry.ioc.internal.services.CtClassSource;
import org.apache.tapestry.ioc.services.Builtin;
import org.apache.tapestry.ioc.services.ClassFactory;
import org.apache.tapestry.ioc.services.PerthreadManager;
import org.apache.tapestry.ioc.services.PropertyShadowBuilder;
import org.apache.tapestry.services.*;
+import org.apache.tapestry5.services.ComponentMessagesSource;
+import org.apache.tapestry5.services.RequestGlobals;
import org.slf4j.Logger;
import javax.servlet.http.Cookie;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InternalRequestGlobalsImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InternalRequestGlobalsImpl.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InternalRequestGlobalsImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InternalRequestGlobalsImpl.java Fri May 16 09:12:25 2008
@@ -15,7 +15,7 @@
package org.apache.tapestry.internal.services;
import static org.apache.tapestry.ioc.IOCConstants.PERTHREAD_SCOPE;
-import org.apache.tapestry.ioc.annotations.Scope;
+import org.apache.tapestry.ioc.annotation.Scope;
@Scope(PERTHREAD_SCOPE)
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/JSONObjectEventResultProcessor.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/JSONObjectEventResultProcessor.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/JSONObjectEventResultProcessor.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/JSONObjectEventResultProcessor.java Fri May 16 09:12:25 2008
@@ -15,16 +15,16 @@
package org.apache.tapestry.internal.services;
import org.apache.tapestry.internal.InternalConstants;
-import org.apache.tapestry.json.JSONObject;
import org.apache.tapestry.services.ComponentEventResultProcessor;
import org.apache.tapestry.services.Response;
+import org.apache.tapestry5.json.JSONObject;
import java.io.IOException;
import java.io.PrintWriter;
/**
- * Implemention of {@link ComponentEventResultProcessor} for {@link org.apache.tapestry.json.JSONObject}, allowing a
+ * Implemention of {@link ComponentEventResultProcessor} for {@link org.apache.tapestry5.json.JSONObject}, allowing a
* component event handler to return a JSONObject that will be sent directly to the client as the reply. This is often
* used with custom components that need a custom JSON response.
*/
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/LocalizationSetterImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/LocalizationSetterImpl.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/LocalizationSetterImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/LocalizationSetterImpl.java Fri May 16 09:12:25 2008
@@ -14,8 +14,8 @@
package org.apache.tapestry.internal.services;
-import org.apache.tapestry.ioc.annotations.Inject;
-import org.apache.tapestry.ioc.annotations.Symbol;
+import org.apache.tapestry.ioc.annotation.Inject;
+import org.apache.tapestry.ioc.annotation.Symbol;
import org.apache.tapestry.ioc.internal.util.CollectionFactory;
import org.apache.tapestry.ioc.services.ThreadLocale;
import org.apache.tapestry.services.PersistentLocale;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageElementFactory.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageElementFactory.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageElementFactory.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageElementFactory.java Fri May 16 09:12:25 2008
@@ -16,7 +16,7 @@
import org.apache.tapestry.Binding;
import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.annotations.Component;
+import org.apache.tapestry.annotation.Component;
import org.apache.tapestry.internal.parser.AttributeToken;
import org.apache.tapestry.internal.parser.ExpansionToken;
import org.apache.tapestry.internal.structure.ComponentPageElement;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageLoaderProcessor.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageLoaderProcessor.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageLoaderProcessor.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageLoaderProcessor.java Fri May 16 09:12:25 2008
@@ -199,7 +199,7 @@
/**
* @param model embededded model defining the new component, from an {@link
- * org.apache.tapestry.annotations.Component} annotation
+ * org.apache.tapestry.annotation.Component} annotation
* @param loadingComponent the currently loading container component
* @param newComponent the new child of the container whose parameters are being bound
* @param newComponentBindings map of bindings for the new component (used to handle inheriting of informal
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PagePoolImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PagePoolImpl.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PagePoolImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PagePoolImpl.java Fri May 16 09:12:25 2008
@@ -17,8 +17,8 @@
import org.apache.tapestry.internal.events.InvalidationListener;
import org.apache.tapestry.internal.events.UpdateListener;
import org.apache.tapestry.internal.structure.Page;
-import org.apache.tapestry.ioc.annotations.IntermediateType;
-import org.apache.tapestry.ioc.annotations.Symbol;
+import org.apache.tapestry.ioc.annotation.IntermediateType;
+import org.apache.tapestry.ioc.annotation.Symbol;
import org.apache.tapestry.ioc.internal.util.CollectionFactory;
import org.apache.tapestry.ioc.services.ThreadLocale;
import org.apache.tapestry.ioc.util.TimeInterval;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageRenderQueue.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageRenderQueue.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageRenderQueue.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageRenderQueue.java Fri May 16 09:12:25 2008
@@ -16,8 +16,8 @@
import org.apache.tapestry.MarkupWriter;
import org.apache.tapestry.internal.structure.Page;
-import org.apache.tapestry.json.JSONObject;
import org.apache.tapestry.runtime.RenderCommand;
+import org.apache.tapestry5.json.JSONObject;
/**
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageRenderQueueImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageRenderQueueImpl.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageRenderQueueImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageRenderQueueImpl.java Fri May 16 09:12:25 2008
@@ -18,10 +18,10 @@
import org.apache.tapestry.dom.Element;
import org.apache.tapestry.internal.structure.Page;
import static org.apache.tapestry.ioc.IOCConstants.PERTHREAD_SCOPE;
-import org.apache.tapestry.ioc.annotations.Scope;
+import org.apache.tapestry.ioc.annotation.Scope;
import org.apache.tapestry.ioc.internal.util.Defense;
-import org.apache.tapestry.json.JSONObject;
import org.apache.tapestry.runtime.RenderCommand;
+import org.apache.tapestry5.json.JSONObject;
/**
* This services keeps track of the page being rendered and the root command for the partial render, it is therefore
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RenderSupportImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RenderSupportImpl.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RenderSupportImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RenderSupportImpl.java Fri May 16 09:12:25 2008
@@ -21,9 +21,9 @@
import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
import org.apache.tapestry.ioc.internal.util.IdAllocator;
import org.apache.tapestry.ioc.services.SymbolSource;
-import org.apache.tapestry.json.JSONArray;
-import org.apache.tapestry.json.JSONObject;
import org.apache.tapestry.services.AssetSource;
+import org.apache.tapestry5.json.JSONArray;
+import org.apache.tapestry5.json.JSONObject;
import static java.lang.String.format;
import java.util.Arrays;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestGlobalsImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestGlobalsImpl.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestGlobalsImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestGlobalsImpl.java Fri May 16 09:12:25 2008
@@ -15,10 +15,10 @@
package org.apache.tapestry.internal.services;
import static org.apache.tapestry.ioc.IOCConstants.PERTHREAD_SCOPE;
-import org.apache.tapestry.ioc.annotations.Scope;
+import org.apache.tapestry.ioc.annotation.Scope;
import org.apache.tapestry.services.Request;
-import org.apache.tapestry.services.RequestGlobals;
import org.apache.tapestry.services.Response;
+import org.apache.tapestry5.services.RequestGlobals;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestPathOptimizerImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestPathOptimizerImpl.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestPathOptimizerImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestPathOptimizerImpl.java Fri May 16 09:12:25 2008
@@ -15,7 +15,7 @@
package org.apache.tapestry.internal.services;
import org.apache.tapestry.SymbolConstants;
-import org.apache.tapestry.ioc.annotations.Symbol;
+import org.apache.tapestry.ioc.annotation.Symbol;
import org.apache.tapestry.services.Request;
import java.util.regex.Pattern;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RootPathDispatcher.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RootPathDispatcher.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RootPathDispatcher.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RootPathDispatcher.java Fri May 16 09:12:25 2008
@@ -16,8 +16,8 @@
import org.apache.tapestry.EventContext;
import org.apache.tapestry.internal.EmptyEventContext;
-import org.apache.tapestry.ioc.annotations.Inject;
-import org.apache.tapestry.ioc.annotations.Symbol;
+import org.apache.tapestry.ioc.annotation.Inject;
+import org.apache.tapestry.ioc.annotation.Symbol;
import org.apache.tapestry.services.*;
import java.io.IOException;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ServiceAnnotationObjectProvider.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ServiceAnnotationObjectProvider.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ServiceAnnotationObjectProvider.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ServiceAnnotationObjectProvider.java Fri May 16 09:12:25 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.internal.services;
-import org.apache.tapestry.annotations.Service;
+import org.apache.tapestry.annotation.Service;
import org.apache.tapestry.ioc.AnnotationProvider;
import org.apache.tapestry.ioc.ObjectLocator;
import org.apache.tapestry.ioc.ObjectProvider;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ServiceInjectionProvider.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ServiceInjectionProvider.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ServiceInjectionProvider.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ServiceInjectionProvider.java Fri May 16 09:12:25 2008
@@ -15,7 +15,7 @@
package org.apache.tapestry.internal.services;
import org.apache.tapestry.ioc.ObjectLocator;
-import org.apache.tapestry.ioc.annotations.Inject;
+import org.apache.tapestry.ioc.annotation.Inject;
import org.apache.tapestry.model.MutableComponentModel;
import org.apache.tapestry.services.ClassTransformation;
import org.apache.tapestry.services.InjectionProvider;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/TemplateParserImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/TemplateParserImpl.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/TemplateParserImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/TemplateParserImpl.java Fri May 16 09:12:25 2008
@@ -19,8 +19,8 @@
import static org.apache.tapestry.ioc.IOCConstants.PERTHREAD_SCOPE;
import org.apache.tapestry.ioc.Location;
import org.apache.tapestry.ioc.Resource;
-import org.apache.tapestry.ioc.annotations.Scope;
-import org.apache.tapestry.ioc.annotations.Symbol;
+import org.apache.tapestry.ioc.annotation.Scope;
+import org.apache.tapestry.ioc.annotation.Symbol;
import org.apache.tapestry.ioc.internal.util.CollectionFactory;
import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
import org.apache.tapestry.ioc.internal.util.InternalUtils;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/PageResources.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/PageResources.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/PageResources.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/PageResources.java Fri May 16 09:12:25 2008
@@ -31,7 +31,7 @@
*
* @param componentModel
* @return the message catalog for the component, in the indicated locale
- * @see org.apache.tapestry.services.ComponentMessagesSource
+ * @see org.apache.tapestry5.services.ComponentMessagesSource
*/
Messages getMessages(ComponentModel componentModel);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/PageResourcesImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/PageResourcesImpl.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/PageResourcesImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/PageResourcesImpl.java Fri May 16 09:12:25 2008
@@ -18,8 +18,8 @@
import org.apache.tapestry.ioc.Messages;
import org.apache.tapestry.ioc.services.TypeCoercer;
import org.apache.tapestry.model.ComponentModel;
-import org.apache.tapestry.services.ComponentMessagesSource;
import org.apache.tapestry.services.ContextValueEncoder;
+import org.apache.tapestry5.services.ComponentMessagesSource;
import java.util.Locale;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/PageResourcesSourceImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/PageResourcesSourceImpl.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/PageResourcesSourceImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/PageResourcesSourceImpl.java Fri May 16 09:12:25 2008
@@ -18,8 +18,8 @@
import org.apache.tapestry.ioc.internal.util.CollectionFactory;
import org.apache.tapestry.ioc.internal.util.Defense;
import org.apache.tapestry.ioc.services.TypeCoercer;
-import org.apache.tapestry.services.ComponentMessagesSource;
import org.apache.tapestry.services.ContextValueEncoder;
+import org.apache.tapestry5.services.ComponentMessagesSource;
import java.util.Locale;
import java.util.Map;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/TestableMarkupWriterFactoryImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/TestableMarkupWriterFactoryImpl.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/TestableMarkupWriterFactoryImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/TestableMarkupWriterFactoryImpl.java Fri May 16 09:12:25 2008
@@ -17,7 +17,7 @@
import org.apache.tapestry.ContentType;
import org.apache.tapestry.MarkupWriter;
import static org.apache.tapestry.ioc.IOCConstants.PERTHREAD_SCOPE;
-import org.apache.tapestry.ioc.annotations.Scope;
+import org.apache.tapestry.ioc.annotation.Scope;
import org.apache.tapestry.services.Core;
import org.apache.tapestry.services.MarkupWriterFactory;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/ApplicationStateWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/ApplicationStateWorker.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/ApplicationStateWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/ApplicationStateWorker.java Fri May 16 09:12:25 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.internal.transform;
-import org.apache.tapestry.annotations.ApplicationState;
+import org.apache.tapestry.annotation.ApplicationState;
import org.apache.tapestry.internal.services.ComponentClassCache;
import org.apache.tapestry.model.MutableComponentModel;
import org.apache.tapestry.services.ApplicationStateManager;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/CachedWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/CachedWorker.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/CachedWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/CachedWorker.java Fri May 16 09:12:25 2008
@@ -16,7 +16,7 @@
import org.apache.tapestry.Binding;
import org.apache.tapestry.BindingConstants;
-import org.apache.tapestry.annotations.Cached;
+import org.apache.tapestry.annotation.Cached;
import org.apache.tapestry.ioc.util.BodyBuilder;
import org.apache.tapestry.model.MutableComponentModel;
import org.apache.tapestry.services.*;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/ComponentWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/ComponentWorker.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/ComponentWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/ComponentWorker.java Fri May 16 09:12:25 2008
@@ -14,9 +14,9 @@
package org.apache.tapestry.internal.transform;
-import org.apache.tapestry.annotations.Component;
-import org.apache.tapestry.annotations.MixinClasses;
-import org.apache.tapestry.annotations.Mixins;
+import org.apache.tapestry.annotation.Component;
+import org.apache.tapestry.annotation.MixinClasses;
+import org.apache.tapestry.annotation.Mixins;
import org.apache.tapestry.internal.KeyValue;
import org.apache.tapestry.internal.TapestryInternalUtils;
import org.apache.tapestry.ioc.Location;
@@ -31,7 +31,7 @@
import org.apache.tapestry.services.TransformConstants;
/**
- * Finds fields with the {@link org.apache.tapestry.annotations.Component} annotation and updates the model. Also checks
+ * Finds fields with the {@link org.apache.tapestry.annotation.Component} annotation and updates the model. Also checks
* for the {@link Mixins} and {@link MixinClasses} annotations and uses them to update the {@link ComponentModel}.
*/
public class ComponentWorker implements ComponentClassTransformWorker
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/ContentTypeWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/ContentTypeWorker.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/ContentTypeWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/ContentTypeWorker.java Fri May 16 09:12:25 2008
@@ -15,13 +15,13 @@
package org.apache.tapestry.internal.transform;
import org.apache.tapestry.MetaDataConstants;
-import org.apache.tapestry.annotations.ContentType;
+import org.apache.tapestry.annotation.ContentType;
import org.apache.tapestry.model.MutableComponentModel;
import org.apache.tapestry.services.ClassTransformation;
import org.apache.tapestry.services.ComponentClassTransformWorker;
/**
- * Checks for the {@link org.apache.tapestry.annotations.ContentType} annotation, adding a corresponding meta-data value
+ * Checks for the {@link org.apache.tapestry.annotation.ContentType} annotation, adding a corresponding meta-data value
* when found.
*/
public class ContentTypeWorker implements ComponentClassTransformWorker
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/EnvironmentalWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/EnvironmentalWorker.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/EnvironmentalWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/EnvironmentalWorker.java Fri May 16 09:12:25 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.internal.transform;
-import org.apache.tapestry.annotations.Environmental;
+import org.apache.tapestry.annotation.Environmental;
import org.apache.tapestry.model.MutableComponentModel;
import org.apache.tapestry.services.ClassTransformation;
import org.apache.tapestry.services.ComponentClassTransformWorker;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/IncludeJavaScriptLibraryWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/IncludeJavaScriptLibraryWorker.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/IncludeJavaScriptLibraryWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/IncludeJavaScriptLibraryWorker.java Fri May 16 09:12:25 2008
@@ -16,14 +16,14 @@
import org.apache.tapestry.Asset;
import org.apache.tapestry.RenderSupport;
-import org.apache.tapestry.annotations.IncludeJavaScriptLibrary;
+import org.apache.tapestry.annotation.IncludeJavaScriptLibrary;
import org.apache.tapestry.ioc.services.SymbolSource;
import org.apache.tapestry.model.MutableComponentModel;
import org.apache.tapestry.services.AssetSource;
import org.apache.tapestry.services.ClassTransformation;
/**
- * Recognizes the {@link org.apache.tapestry.annotations.IncludeJavaScriptLibrary} annotation, and ensures that {@link
+ * Recognizes the {@link org.apache.tapestry.annotation.IncludeJavaScriptLibrary} annotation, and ensures that {@link
* org.apache.tapestry.RenderSupport#addScriptLink(org.apache.tapestry.Asset[])} is invoked.
*/
public class IncludeJavaScriptLibraryWorker extends AbstractIncludeAssetWorker
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/IncludeStylesheetWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/IncludeStylesheetWorker.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/IncludeStylesheetWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/IncludeStylesheetWorker.java Fri May 16 09:12:25 2008
@@ -16,14 +16,14 @@
import org.apache.tapestry.Asset;
import org.apache.tapestry.RenderSupport;
-import org.apache.tapestry.annotations.IncludeStylesheet;
+import org.apache.tapestry.annotation.IncludeStylesheet;
import org.apache.tapestry.ioc.services.SymbolSource;
import org.apache.tapestry.model.MutableComponentModel;
import org.apache.tapestry.services.AssetSource;
import org.apache.tapestry.services.ClassTransformation;
/**
- * Recognizes the {@link org.apache.tapestry.annotations.IncludeStylesheet} annotation and ensures that {@link
+ * Recognizes the {@link org.apache.tapestry.annotation.IncludeStylesheet} annotation and ensures that {@link
* org.apache.tapestry.RenderSupport#addStylesheetLink(org.apache.tapestry.Asset, String)} is invoked.
*/
public class IncludeStylesheetWorker extends AbstractIncludeAssetWorker
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/InjectComponentWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/InjectComponentWorker.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/InjectComponentWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/InjectComponentWorker.java Fri May 16 09:12:25 2008
@@ -15,7 +15,7 @@
package org.apache.tapestry.internal.transform;
import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.annotations.InjectComponent;
+import org.apache.tapestry.annotation.InjectComponent;
import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.apache.tapestry.ioc.util.BodyBuilder;
import org.apache.tapestry.model.MutableComponentModel;
@@ -24,7 +24,7 @@
import org.apache.tapestry.services.TransformConstants;
/**
- * Recognizes the {@link org.apache.tapestry.annotations.InjectComponent} annotation, and converts the field into a
+ * Recognizes the {@link org.apache.tapestry.annotation.InjectComponent} annotation, and converts the field into a
* read-only field containing the component. The id of the component may be explicitly stated or will be determined
* from the field name.
*/
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/InjectContainerWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/InjectContainerWorker.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/InjectContainerWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/InjectContainerWorker.java Fri May 16 09:12:25 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.internal.transform;
-import org.apache.tapestry.annotations.InjectContainer;
+import org.apache.tapestry.annotation.InjectContainer;
import org.apache.tapestry.ioc.util.BodyBuilder;
import org.apache.tapestry.model.MutableComponentModel;
import org.apache.tapestry.runtime.Component;
@@ -25,7 +25,7 @@
import java.util.List;
/**
- * Identifies the {@link org.apache.tapestry.annotations.InjectContainer} annotation and adds code to initialize it to
+ * Identifies the {@link org.apache.tapestry.annotation.InjectContainer} annotation and adds code to initialize it to
* the core component.
*/
public class InjectContainerWorker implements ComponentClassTransformWorker
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/InjectPageWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/InjectPageWorker.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/InjectPageWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/InjectPageWorker.java Fri May 16 09:12:25 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.internal.transform;
-import org.apache.tapestry.annotations.InjectPage;
+import org.apache.tapestry.annotation.InjectPage;
import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.apache.tapestry.ioc.util.BodyBuilder;
import org.apache.tapestry.model.MutableComponentModel;
@@ -26,7 +26,7 @@
/**
* Peforms transformations that allow pages to be injected into components.
*
- * @see org.apache.tapestry.annotations.InjectPage
+ * @see org.apache.tapestry.annotation.InjectPage
*/
public class InjectPageWorker implements ComponentClassTransformWorker
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/InjectWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/InjectWorker.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/InjectWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/InjectWorker.java Fri May 16 09:12:25 2008
@@ -15,14 +15,14 @@
package org.apache.tapestry.internal.transform;
import org.apache.tapestry.ioc.ObjectLocator;
-import org.apache.tapestry.ioc.annotations.Inject;
+import org.apache.tapestry.ioc.annotation.Inject;
import org.apache.tapestry.model.MutableComponentModel;
import org.apache.tapestry.services.ClassTransformation;
import org.apache.tapestry.services.ComponentClassTransformWorker;
import org.apache.tapestry.services.InjectionProvider;
/**
- * Performs injection triggered by any field annotated with the {@link org.apache.tapestry.ioc.annotations.Inject}
+ * Performs injection triggered by any field annotated with the {@link org.apache.tapestry.ioc.annotation.Inject}
* annotation.
* <p/>
* The implementation of this worker mostly delegates to a chain of command of {@link
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/LogWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/LogWorker.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/LogWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/LogWorker.java Fri May 16 09:12:25 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.internal.transform;
-import org.apache.tapestry.annotations.Log;
+import org.apache.tapestry.annotation.Log;
import org.apache.tapestry.ioc.MethodAdvice;
import org.apache.tapestry.ioc.internal.services.LoggingAdvice;
import org.apache.tapestry.ioc.services.ExceptionTracker;
@@ -24,7 +24,7 @@
import java.util.List;
/**
- * Looks for the {@link org.apache.tapestry.annotations.Log} marker annotation and adds method advice to perform the
+ * Looks for the {@link org.apache.tapestry.annotation.Log} marker annotation and adds method advice to perform the
* logging. This is similar to what the {@link org.apache.tapestry.ioc.services.LoggingDecorator} does for service
* interface methods.
*/
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/MetaWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/MetaWorker.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/MetaWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/MetaWorker.java Fri May 16 09:12:25 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.internal.transform;
-import org.apache.tapestry.annotations.Meta;
+import org.apache.tapestry.annotation.Meta;
import org.apache.tapestry.internal.KeyValue;
import org.apache.tapestry.internal.TapestryInternalUtils;
import org.apache.tapestry.model.MutableComponentModel;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/MixinAfterWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/MixinAfterWorker.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/MixinAfterWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/MixinAfterWorker.java Fri May 16 09:12:25 2008
@@ -14,13 +14,13 @@
package org.apache.tapestry.internal.transform;
-import org.apache.tapestry.annotations.MixinAfter;
+import org.apache.tapestry.annotation.MixinAfter;
import org.apache.tapestry.model.MutableComponentModel;
import org.apache.tapestry.services.ClassTransformation;
import org.apache.tapestry.services.ComponentClassTransformWorker;
/**
- * Looks for the {@link org.apache.tapestry.annotations.MixinAfter} annotatation and sets the {@link
+ * Looks for the {@link org.apache.tapestry.annotation.MixinAfter} annotatation and sets the {@link
* org.apache.tapestry.model.ComponentModel#isMixinAfter() mixinAfter flag} is present.
*/
public class MixinAfterWorker implements ComponentClassTransformWorker
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/MixinWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/MixinWorker.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/MixinWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/MixinWorker.java Fri May 16 09:12:25 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.internal.transform;
-import org.apache.tapestry.annotations.Mixin;
+import org.apache.tapestry.annotation.Mixin;
import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.apache.tapestry.model.MutableComponentModel;
import org.apache.tapestry.services.ClassTransformation;
@@ -25,7 +25,7 @@
import java.util.List;
/**
- * Supports the {@link org.apache.tapestry.annotations.Mixin} annotation, which allows a mixin to be part of the
+ * Supports the {@link org.apache.tapestry.annotation.Mixin} annotation, which allows a mixin to be part of the
* implementation of a component. The annotation is applied to a field, which will become read-only, and contain a
* reference to the mixin instance.
*/
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/OnEventWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/OnEventWorker.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/OnEventWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/OnEventWorker.java Fri May 16 09:12:25 2008
@@ -15,7 +15,7 @@
package org.apache.tapestry.internal.transform;
import org.apache.tapestry.EventContext;
-import org.apache.tapestry.annotations.OnEvent;
+import org.apache.tapestry.annotation.OnEvent;
import org.apache.tapestry.ioc.util.BodyBuilder;
import org.apache.tapestry.model.MutableComponentModel;
import org.apache.tapestry.services.*;
@@ -25,7 +25,7 @@
/**
* Provides implementations of the {@link org.apache.tapestry.runtime.Component#dispatchComponentEvent(org.apache.tapestry.runtime.ComponentEvent)}
- * method, based on {@link org.apache.tapestry.annotations.OnEvent} annotations.
+ * method, based on {@link org.apache.tapestry.annotation.OnEvent} annotations.
*/
public class OnEventWorker implements ComponentClassTransformWorker
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/ParameterWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/ParameterWorker.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/ParameterWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/ParameterWorker.java Fri May 16 09:12:25 2008
@@ -15,7 +15,7 @@
package org.apache.tapestry.internal.transform;
import org.apache.tapestry.Binding;
-import org.apache.tapestry.annotations.Parameter;
+import org.apache.tapestry.annotation.Parameter;
import org.apache.tapestry.internal.InternalComponentResources;
import org.apache.tapestry.internal.bindings.LiteralBinding;
import org.apache.tapestry.ioc.internal.util.InternalUtils;
@@ -27,7 +27,7 @@
import java.util.List;
/**
- * Responsible for identifying parameters via the {@link org.apache.tapestry.annotations.Parameter} annotation on
+ * Responsible for identifying parameters via the {@link org.apache.tapestry.annotation.Parameter} annotation on
* component fields. This is one of the most complex of the transformations.
*/
public class ParameterWorker implements ComponentClassTransformWorker
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/PersistWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/PersistWorker.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/PersistWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/PersistWorker.java Fri May 16 09:12:25 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.internal.transform;
-import org.apache.tapestry.annotations.Persist;
+import org.apache.tapestry.annotation.Persist;
import org.apache.tapestry.ioc.util.BodyBuilder;
import org.apache.tapestry.model.MutableComponentModel;
import org.apache.tapestry.services.*;
@@ -23,7 +23,7 @@
import java.lang.reflect.Modifier;
/**
- * Converts fields with the {@link org.apache.tapestry.annotations.Persist} annotation into persistent fields.
+ * Converts fields with the {@link org.apache.tapestry.annotation.Persist} annotation into persistent fields.
*/
public class PersistWorker implements ComponentClassTransformWorker
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/PropertyWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/PropertyWorker.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/PropertyWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/PropertyWorker.java Fri May 16 09:12:25 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.internal.transform;
-import org.apache.tapestry.annotations.Property;
+import org.apache.tapestry.annotation.Property;
import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.apache.tapestry.model.MutableComponentModel;
import org.apache.tapestry.services.ClassTransformation;
@@ -28,7 +28,7 @@
* be transformed as necessary by other annotations. This worker needs to be scheduled before any worker that might
* delete a field.
*
- * @see org.apache.tapestry.annotations.Property
+ * @see org.apache.tapestry.annotation.Property
*/
public class PropertyWorker implements ComponentClassTransformWorker
{
@@ -61,7 +61,7 @@
transformation.addTransformedMethod(setter, fieldName + " = $1;");
}
- // The field is NOT claimed, because we want annotations for the fields to operate.
+ // The field is NOT claimed, because we want annotation for the fields to operate.
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/ResponseEncodingWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/ResponseEncodingWorker.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/ResponseEncodingWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/ResponseEncodingWorker.java Fri May 16 09:12:25 2008
@@ -15,7 +15,7 @@
package org.apache.tapestry.internal.transform;
import org.apache.tapestry.MetaDataConstants;
-import org.apache.tapestry.annotations.ResponseEncoding;
+import org.apache.tapestry.annotation.ResponseEncoding;
import org.apache.tapestry.model.MutableComponentModel;
import org.apache.tapestry.services.ClassTransformation;
import org.apache.tapestry.services.ComponentClassTransformWorker;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/RetainWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/RetainWorker.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/RetainWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/RetainWorker.java Fri May 16 09:12:25 2008
@@ -14,19 +14,19 @@
package org.apache.tapestry.internal.transform;
-import org.apache.tapestry.annotations.Retain;
+import org.apache.tapestry.annotation.Retain;
import org.apache.tapestry.model.MutableComponentModel;
import org.apache.tapestry.services.ClassTransformation;
import org.apache.tapestry.services.ComponentClassTransformWorker;
/**
- * Identifies fields with the {@link org.apache.tapestry.annotations.Retain} annotation, and "claims" them so that no
+ * Identifies fields with the {@link org.apache.tapestry.annotation.Retain} annotation, and "claims" them so that no
* special work will occur on them.
*/
public final class RetainWorker implements ComponentClassTransformWorker
{
/**
- * Claims each field with the {@link org.apache.tapestry.annotations.Retain} annotation, claiming it using the
+ * Claims each field with the {@link org.apache.tapestry.annotation.Retain} annotation, claiming it using the
* annotation as the tag.
*/
public void transform(ClassTransformation transformation, MutableComponentModel model)
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/SecureWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/SecureWorker.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/SecureWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/SecureWorker.java Fri May 16 09:12:25 2008
@@ -15,13 +15,13 @@
package org.apache.tapestry.internal.transform;
import org.apache.tapestry.MetaDataConstants;
-import org.apache.tapestry.annotations.Secure;
+import org.apache.tapestry.annotation.Secure;
import org.apache.tapestry.model.MutableComponentModel;
import org.apache.tapestry.services.ClassTransformation;
import org.apache.tapestry.services.ComponentClassTransformWorker;
/**
- * Recognizes the {@link org.apache.tapestry.annotations.Secure} annotation and sets the {@link
+ * Recognizes the {@link org.apache.tapestry.annotation.Secure} annotation and sets the {@link
* org.apache.tapestry.MetaDataConstants#SECURE_PAGE} meta data to "true".
*/
public class SecureWorker implements ComponentClassTransformWorker
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/SupportsInformalParametersWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/SupportsInformalParametersWorker.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/SupportsInformalParametersWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/SupportsInformalParametersWorker.java Fri May 16 09:12:25 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.internal.transform;
-import org.apache.tapestry.annotations.SupportsInformalParameters;
+import org.apache.tapestry.annotation.SupportsInformalParameters;
import org.apache.tapestry.model.MutableComponentModel;
import org.apache.tapestry.services.ClassTransformation;
import org.apache.tapestry.services.ComponentClassTransformWorker;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/model/ComponentModel.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/model/ComponentModel.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/model/ComponentModel.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/model/ComponentModel.java Fri May 16 09:12:25 2008
@@ -14,9 +14,9 @@
package org.apache.tapestry.model;
-import org.apache.tapestry.annotations.MixinAfter;
-import org.apache.tapestry.annotations.Persist;
-import org.apache.tapestry.annotations.SupportsInformalParameters;
+import org.apache.tapestry.annotation.MixinAfter;
+import org.apache.tapestry.annotation.Persist;
+import org.apache.tapestry.annotation.SupportsInformalParameters;
import org.apache.tapestry.ioc.Resource;
import org.slf4j.Logger;
@@ -44,7 +44,7 @@
/**
* Returns the ids of all embedded components defined within the component class (via the {@link
- * org.apache.tapestry.annotations.Component} annotation).
+ * org.apache.tapestry.annotation.Component} annotation).
*/
List<String> getEmbeddedComponentIds();
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/model/EmbeddedComponentModel.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/model/EmbeddedComponentModel.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/model/EmbeddedComponentModel.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/model/EmbeddedComponentModel.java Fri May 16 09:12:25 2008
@@ -14,14 +14,14 @@
package org.apache.tapestry.model;
-import org.apache.tapestry.annotations.Component;
+import org.apache.tapestry.annotation.Component;
import org.apache.tapestry.ioc.Locatable;
import java.util.List;
/**
* The model for a component embedded within another component, as defined by the {@link
- * org.apache.tapestry.annotations.Component} annotation.
+ * org.apache.tapestry.annotation.Component} annotation.
*/
public interface EmbeddedComponentModel extends Locatable
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/model/MutableComponentModel.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/model/MutableComponentModel.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/model/MutableComponentModel.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/model/MutableComponentModel.java Fri May 16 09:12:25 2008
@@ -14,8 +14,8 @@
package org.apache.tapestry.model;
-import org.apache.tapestry.annotations.Parameter;
-import org.apache.tapestry.annotations.Persist;
+import org.apache.tapestry.annotation.Parameter;
+import org.apache.tapestry.annotation.Persist;
import org.apache.tapestry.internal.InternalComponentResources;
import org.apache.tapestry.ioc.Location;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/model/ParameterModel.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/model/ParameterModel.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/model/ParameterModel.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/model/ParameterModel.java Fri May 16 09:12:25 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.model;
-import org.apache.tapestry.annotations.Parameter;
+import org.apache.tapestry.annotation.Parameter;
/**
* Model for a <em>formal</em> parameter of a component.
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/runtime/Component.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/runtime/Component.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/runtime/Component.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/runtime/Component.java Fri May 16 09:12:25 2008
@@ -15,7 +15,7 @@
package org.apache.tapestry.runtime;
import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.annotations.OnEvent;
+import org.apache.tapestry.annotation.OnEvent;
/**
* Interface that defines the lifecycle of a component, within a page, allowing for callbacks into the component for
@@ -32,7 +32,7 @@
{
/**
- * Lifecycle method invoked at the end of the {@link org.apache.tapestry.annotations.CleanupRender} render phase.
+ * Lifecycle method invoked at the end of the {@link org.apache.tapestry.annotation.CleanupRender} render phase.
* There is no annotation for this method, it is part of CleanupRender, but is always invoked. Its specific use is
* to allow components to clean up cached parameter values.
*/
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/Environment.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/Environment.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/Environment.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/Environment.java Fri May 16 09:12:25 2008
@@ -24,7 +24,7 @@
* type. Most often, a stack has zero or one elements, but on occasion, a particular component will push an override
* onto the stack for the benefit of the components it encloses.
*
- * @see org.apache.tapestry.annotations.Environmental
+ * @see org.apache.tapestry.annotation.Environmental
* @see org.apache.tapestry.services.EnvironmentalShadowBuilder
*/
public interface Environment
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/EnvironmentalShadowBuilder.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/EnvironmentalShadowBuilder.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/EnvironmentalShadowBuilder.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/EnvironmentalShadowBuilder.java Fri May 16 09:12:25 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.services;
-import org.apache.tapestry.annotations.Environmental;
+import org.apache.tapestry.annotation.Environmental;
import org.apache.tapestry.ioc.services.PropertyShadowBuilder;
/**
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/Heartbeat.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/Heartbeat.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/Heartbeat.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/Heartbeat.java Fri May 16 09:12:25 2008
@@ -20,7 +20,7 @@
* is a Label and the field it labels; since we don't know which order the two will render, we can't tell if the field's
* id is correct until after both have rendered.
* <p/>
- * The Heartbeat is injected into components via the {@link org.apache.tapestry.annotations.Environmental} annotation.
+ * The Heartbeat is injected into components via the {@link org.apache.tapestry.annotation.Environmental} annotation.
*/
public interface Heartbeat
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/InjectionProvider.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/InjectionProvider.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/InjectionProvider.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/InjectionProvider.java Fri May 16 09:12:25 2008
@@ -18,9 +18,9 @@
import org.apache.tapestry.model.MutableComponentModel;
/**
- * Provides some form of injection when the value for an {@link org.apache.tapestry.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.
+ * Provides some form of injection when the value for an {@link org.apache.tapestry.ioc.annotation.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.tapestry.ioc.services.ChainBuilder chain of command}.
*/
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/MarkupRenderer.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/MarkupRenderer.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/MarkupRenderer.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/MarkupRenderer.java Fri May 16 09:12:25 2008
@@ -23,7 +23,7 @@
* The MarkupRenderer service takes an ordered configuration of {@link org.apache.tapestry.services.MarkupRendererFilter}s,
* which are used for ordinary page rendering (as opposed to {@linkplain org.apache.tapestry.services.PartialMarkupRenderer
* partial page rendering} for Ajax requests). The MarkupRenderer service may be selected using the {@link
- * org.apache.tapestry.ioc.annotations.Primary} marker annotation.
+ * org.apache.tapestry.ioc.annotation.Primary} marker annotation.
*/
public interface MarkupRenderer
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/PartialMarkupRenderer.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/PartialMarkupRenderer.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/PartialMarkupRenderer.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/PartialMarkupRenderer.java Fri May 16 09:12:25 2008
@@ -15,16 +15,16 @@
package org.apache.tapestry.services;
import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.json.JSONObject;
+import org.apache.tapestry5.json.JSONObject;
/**
* Defines an Ajax-oriented partial page render, wherein a render of a portion of a page occurs, and the content is
- * stored into a key ("content") of a {@link org.apache.tapestry.json.JSONObject}, which is sent to the client side as
+ * stored into a key ("content") of a {@link org.apache.tapestry5.json.JSONObject}, which is sent to the client side as
* the final response. Client-side JavaScript receives this reply and uses it to update a portion of the page.
* <p/>
* <p/>
* The PartialMarkupRenderer service takes an ordered configuration of {@link PartialMarkupRendererFilter}s. It can be
- * selected using the {@link org.apache.tapestry.ioc.annotations.Primary} marker annotation.
+ * selected using the {@link org.apache.tapestry.ioc.annotation.Primary} marker annotation.
*/
public interface PartialMarkupRenderer
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/PartialMarkupRendererFilter.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/PartialMarkupRendererFilter.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/PartialMarkupRendererFilter.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/PartialMarkupRendererFilter.java Fri May 16 09:12:25 2008
@@ -15,12 +15,12 @@
package org.apache.tapestry.services;
import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.json.JSONObject;
+import org.apache.tapestry5.json.JSONObject;
/**
* A filter (the main interface being {@link PartialMarkupRenderer}) applied when performing a partial page render as
* part of an Ajax-oriented request. This is similar to {@link org.apache.tapestry.services.MarkupRendererFilter} and
- * filters are often in place so as to contribute {@link org.apache.tapestry.annotations.Environmental} services to the
+ * filters are often in place so as to contribute {@link org.apache.tapestry.annotation.Environmental} services to the
* pages and components that render.
*
* @see org.apache.tapestry.services.TapestryModule#contributePartialMarkupRenderer(org.apache.tapestry.ioc.OrderedConfiguration,