Author: hlship
Date: Fri May 16 09:07:12 2008
New Revision: 657119
URL: http://svn.apache.org/viewvc?rev=657119&view=rev
Log:
TAPESTR-2421: Allow Tapestry4/Tapestry5 to be deployed in the same WAR
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/bindings/PropBindingFactoryTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/bindings/TargetBean.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/AnnotatedPage.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/AssetInjectionProviderTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/AssetObjectProviderTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/BlockInjectionProviderTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ClientBehaviorSupportImplTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentMessagesSourceImplTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/InheritedBindingTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/InternalClassTransformationImplTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PageElementFactoryImplTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ResourceStreamerImplTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ServiceAnnotationObjectProviderTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/VisibilityBean.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/ApplicationStateWorkerTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/CachedWorkerTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/ComponentLifecycleMethodWorkerTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/ContentTypeWorkerTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/InjectComponentWorkerTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/InjectWorkerTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/MetaWorkerTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/MixinAfterWorkerTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/MixinWorkerTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/ResponseEncodingWorkerTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/RetainWorkerTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/SupportsInformalParametersWorkerTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/components/DefaultParameterBindingMethodComponent.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/components/DefaultParameterComponent.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/components/ParameterComponent.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/BasicComponent.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/EventHandlerTarget.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/MaybeStateHolder.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/MethodIdentifier.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/ParentClass.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/StateHolder.java
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/bindings/PropBindingFactoryTest.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/bindings/PropBindingFactoryTest.java?rev=657119&r1=657118&r2=657119&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/bindings/PropBindingFactoryTest.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/bindings/PropBindingFactoryTest.java
Fri May 16 09:07:12 2008
@@ -16,7 +16,7 @@
import org.apache.tapestry.Binding;
import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.annotations.BeforeRenderBody;
+import org.apache.tapestry.annotation.BeforeRenderBody;
import org.apache.tapestry.beaneditor.OrderAfter;
import org.apache.tapestry.beaneditor.OrderBefore;
import org.apache.tapestry.internal.test.InternalBaseTestCase;
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/bindings/TargetBean.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/bindings/TargetBean.java?rev=657119&r1=657118&r2=657119&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/bindings/TargetBean.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/bindings/TargetBean.java
Fri May 16 09:07:12 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.internal.bindings;
-import org.apache.tapestry.annotations.BeforeRenderBody;
+import org.apache.tapestry.annotation.BeforeRenderBody;
import org.apache.tapestry.beaneditor.OrderAfter;
import org.apache.tapestry.beaneditor.OrderBefore;
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/AnnotatedPage.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/AnnotatedPage.java?rev=657119&r1=657118&r2=657119&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/AnnotatedPage.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/AnnotatedPage.java
Fri May 16 09:07:12 2008
@@ -15,7 +15,7 @@
package org.apache.tapestry.internal.services;
import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.annotations.SetupRender;
+import org.apache.tapestry.annotation.SetupRender;
public class AnnotatedPage
{
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/AssetInjectionProviderTest.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/AssetInjectionProviderTest.java?rev=657119&r1=657118&r2=657119&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/AssetInjectionProviderTest.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/AssetInjectionProviderTest.java
Fri May 16 09:07:12 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.internal.test.InternalBaseTestCase;
import org.apache.tapestry.ioc.ObjectLocator;
import org.apache.tapestry.ioc.Resource;
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/AssetObjectProviderTest.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/AssetObjectProviderTest.java?rev=657119&r1=657118&r2=657119&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/AssetObjectProviderTest.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/AssetObjectProviderTest.java
Fri May 16 09:07:12 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.internal.test.InternalBaseTestCase;
import org.apache.tapestry.ioc.AnnotationProvider;
import org.apache.tapestry.ioc.ObjectLocator;
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/BlockInjectionProviderTest.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/BlockInjectionProviderTest.java?rev=657119&r1=657118&r2=657119&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/BlockInjectionProviderTest.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/BlockInjectionProviderTest.java
Fri May 16 09:07:12 2008
@@ -15,7 +15,7 @@
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.model.MutableComponentModel;
import org.apache.tapestry.services.ClassTransformation;
@@ -48,8 +48,8 @@
}
/**
- * This doesn't prove anything; later there will be integration tests that
prove that the
- * generated code is valid and works.
+ * This doesn't prove anything; later there will be integration tests that
prove that the generated code is valid
+ * and works.
*/
@Test
public void explicit_block_id_provided_as_annotation()
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ClientBehaviorSupportImplTest.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ClientBehaviorSupportImplTest.java?rev=657119&r1=657118&r2=657119&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ClientBehaviorSupportImplTest.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ClientBehaviorSupportImplTest.java
Fri May 16 09:07:12 2008
@@ -15,9 +15,9 @@
package org.apache.tapestry.internal.services;
import org.apache.tapestry.RenderSupport;
-import org.apache.tapestry.json.JSONArray;
-import org.apache.tapestry.json.JSONObject;
import org.apache.tapestry.test.TapestryTestCase;
+import org.apache.tapestry5.json.JSONArray;
+import org.apache.tapestry5.json.JSONObject;
import org.testng.annotations.Test;
public class ClientBehaviorSupportImplTest extends TapestryTestCase
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentMessagesSourceImplTest.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentMessagesSourceImplTest.java?rev=657119&r1=657118&r2=657119&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentMessagesSourceImplTest.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentMessagesSourceImplTest.java
Fri May 16 09:07:12 2008
@@ -20,7 +20,7 @@
import org.apache.tapestry.ioc.Resource;
import org.apache.tapestry.ioc.internal.util.ClasspathResource;
import org.apache.tapestry.model.ComponentModel;
-import org.apache.tapestry.services.ComponentMessagesSource;
+import org.apache.tapestry5.services.ComponentMessagesSource;
import org.testng.annotations.Test;
import java.util.Locale;
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/InheritedBindingTest.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/InheritedBindingTest.java?rev=657119&r1=657118&r2=657119&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/InheritedBindingTest.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/InheritedBindingTest.java
Fri May 16 09:07:12 2008
@@ -16,7 +16,7 @@
import org.apache.tapestry.Binding;
import org.apache.tapestry.ioc.Location;
-import org.apache.tapestry.ioc.annotations.Inject;
+import org.apache.tapestry.ioc.annotation.Inject;
import org.apache.tapestry.ioc.internal.util.TapestryException;
import org.apache.tapestry.test.TapestryTestCase;
import org.testng.annotations.Test;
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/InternalClassTransformationImplTest.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/InternalClassTransformationImplTest.java?rev=657119&r1=657118&r2=657119&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/InternalClassTransformationImplTest.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/InternalClassTransformationImplTest.java
Fri May 16 09:07:12 2008
@@ -15,10 +15,10 @@
package org.apache.tapestry.internal.services;
import javassist.*;
-import org.apache.tapestry.annotations.Meta;
-import org.apache.tapestry.annotations.OnEvent;
-import org.apache.tapestry.annotations.Retain;
-import org.apache.tapestry.annotations.SetupRender;
+import org.apache.tapestry.annotation.Meta;
+import org.apache.tapestry.annotation.OnEvent;
+import org.apache.tapestry.annotation.Retain;
+import org.apache.tapestry.annotation.SetupRender;
import org.apache.tapestry.internal.InternalComponentResources;
import org.apache.tapestry.internal.model.MutableComponentModelImpl;
import org.apache.tapestry.internal.test.InternalBaseTestCase;
@@ -224,10 +224,10 @@
ClassTransformation ct = createClassTransformation(ParentClass.class,
logger);
- // Field with annotations, but not that annotation
+ // Field with annotation, but not that annotation
assertNull(ct.getFieldAnnotation("_annotatedField", Override.class));
- // Field with no annotations
+ // Field with no annotation
assertNull(ct.getFieldAnnotation("_parentField", Override.class));
verify();
@@ -376,7 +376,7 @@
assertNotNull(meta);
- // Try again (the annotations will be cached). Use an annotation
+ // Try again (the annotation will be cached). Use an annotation
// that will not be present.
Target t = ct.getAnnotation(Target.class);
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PageElementFactoryImplTest.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PageElementFactoryImplTest.java?rev=657119&r1=657118&r2=657119&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PageElementFactoryImplTest.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PageElementFactoryImplTest.java
Fri May 16 09:07:12 2008
@@ -27,7 +27,7 @@
import org.apache.tapestry.runtime.RenderQueue;
import org.apache.tapestry.services.BindingSource;
import org.apache.tapestry.services.ComponentClassResolver;
-import org.apache.tapestry.services.ComponentMessagesSource;
+import org.apache.tapestry5.services.ComponentMessagesSource;
import org.testng.annotations.Test;
public class PageElementFactoryImplTest extends InternalBaseTestCase
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ResourceStreamerImplTest.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ResourceStreamerImplTest.java?rev=657119&r1=657118&r2=657119&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ResourceStreamerImplTest.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ResourceStreamerImplTest.java
Fri May 16 09:07:12 2008
@@ -18,8 +18,8 @@
import org.apache.tapestry.ioc.Resource;
import org.apache.tapestry.ioc.internal.util.ClasspathResource;
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 static org.easymock.EasyMock.*;
import org.testng.annotations.Test;
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ServiceAnnotationObjectProviderTest.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ServiceAnnotationObjectProviderTest.java?rev=657119&r1=657118&r2=657119&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ServiceAnnotationObjectProviderTest.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ServiceAnnotationObjectProviderTest.java
Fri May 16 09:07:12 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/test/java/org/apache/tapestry/internal/services/VisibilityBean.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/VisibilityBean.java?rev=657119&r1=657118&r2=657119&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/VisibilityBean.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/VisibilityBean.java
Fri May 16 09:07:12 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.internal.services;
-import org.apache.tapestry.annotations.Retain;
+import org.apache.tapestry.annotation.Retain;
/**
* Used to test some issues related to visibility.
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/ApplicationStateWorkerTest.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/ApplicationStateWorkerTest.java?rev=657119&r1=657118&r2=657119&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/ApplicationStateWorkerTest.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/ApplicationStateWorkerTest.java
Fri May 16 09:07:12 2008
@@ -18,7 +18,7 @@
import javassist.Loader;
import javassist.LoaderClassPath;
import javassist.NotFoundException;
-import org.apache.tapestry.annotations.ApplicationState;
+import org.apache.tapestry.annotation.ApplicationState;
import org.apache.tapestry.internal.InternalComponentResources;
import org.apache.tapestry.internal.services.*;
import org.apache.tapestry.internal.test.InternalBaseTestCase;
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/CachedWorkerTest.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/CachedWorkerTest.java?rev=657119&r1=657118&r2=657119&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/CachedWorkerTest.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/CachedWorkerTest.java
Fri May 16 09:07:12 2008
@@ -14,44 +14,58 @@
package org.apache.tapestry.internal.transform;
-import java.lang.reflect.Modifier;
-import java.util.Arrays;
-
-import org.apache.tapestry.annotations.Cached;
+import org.apache.tapestry.annotation.Cached;
import org.apache.tapestry.services.ClassTransformation;
import org.apache.tapestry.services.TransformMethodSignature;
import org.apache.tapestry.test.TapestryTestCase;
import org.testng.annotations.Test;
-/** Mostly just testing error conditions here. Functionality testing in
integration tests. */
+import java.lang.reflect.Modifier;
+import java.util.Arrays;
+
+/**
+ * Mostly just testing error conditions here. Functionality testing in
integration tests.
+ */
@Test
public class CachedWorkerTest extends TapestryTestCase
{
- public void must_have_return_type() throws Exception {
+ public void must_have_return_type() throws Exception
+ {
ClassTransformation ct = mockClassTransformation();
- TransformMethodSignature sig = new
TransformMethodSignature(Modifier.PUBLIC, "void", "getFoo", new String[0], new
String[0]);
-
+ TransformMethodSignature sig = new
TransformMethodSignature(Modifier.PUBLIC, "void", "getFoo", new String[0],
+ new
String[0]);
+
expect(ct.findMethodsWithAnnotation(Cached.class)).andReturn(Arrays.asList(sig));
-
+
replay();
- try {
+ try
+ {
new CachedWorker(null).transform(ct, null);
fail("did not throw");
- } catch (IllegalArgumentException e) {}
+ }
+ catch (IllegalArgumentException e)
+ {
+ }
verify();
}
-
- public void must_not_have_parameters() throws Exception {
+
+ public void must_not_have_parameters() throws Exception
+ {
ClassTransformation ct = mockClassTransformation();
- TransformMethodSignature sig = new
TransformMethodSignature(Modifier.PUBLIC, "java.lang.Object", "getFoo", new
String[] { "boolean" }, new String[0]);
-
+ TransformMethodSignature sig = new
TransformMethodSignature(Modifier.PUBLIC, "java.lang.Object", "getFoo",
+ new
String[] { "boolean" }, new String[0]);
+
expect(ct.findMethodsWithAnnotation(Cached.class)).andReturn(Arrays.asList(sig));
-
+
replay();
- try {
+ try
+ {
new CachedWorker(null).transform(ct, null);
fail("did not throw");
- } catch (IllegalArgumentException e) {}
+ }
+ catch (IllegalArgumentException e)
+ {
+ }
verify();
}
}
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/ComponentLifecycleMethodWorkerTest.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/ComponentLifecycleMethodWorkerTest.java?rev=657119&r1=657118&r2=657119&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/ComponentLifecycleMethodWorkerTest.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/ComponentLifecycleMethodWorkerTest.java
Fri May 16 09:07:12 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.internal.transform;
-import org.apache.tapestry.annotations.SetupRender;
+import org.apache.tapestry.annotation.SetupRender;
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/test/java/org/apache/tapestry/internal/transform/ContentTypeWorkerTest.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/ContentTypeWorkerTest.java?rev=657119&r1=657118&r2=657119&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/ContentTypeWorkerTest.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/ContentTypeWorkerTest.java
Fri May 16 09:07:12 2008
@@ -15,7 +15,7 @@
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.test.TapestryTestCase;
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/InjectComponentWorkerTest.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/InjectComponentWorkerTest.java?rev=657119&r1=657118&r2=657119&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/InjectComponentWorkerTest.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/InjectComponentWorkerTest.java
Fri May 16 09:07:12 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.internal.transform;
-import org.apache.tapestry.annotations.InjectComponent;
+import org.apache.tapestry.annotation.InjectComponent;
import org.apache.tapestry.corelib.components.Grid;
import org.apache.tapestry.model.MutableComponentModel;
import org.apache.tapestry.services.ClassTransformation;
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/InjectWorkerTest.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/InjectWorkerTest.java?rev=657119&r1=657118&r2=657119&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/InjectWorkerTest.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/InjectWorkerTest.java
Fri May 16 09:07:12 2008
@@ -16,7 +16,7 @@
import org.apache.tapestry.internal.test.InternalBaseTestCase;
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;
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/MetaWorkerTest.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/MetaWorkerTest.java?rev=657119&r1=657118&r2=657119&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/MetaWorkerTest.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/MetaWorkerTest.java
Fri May 16 09:07:12 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.test.InternalBaseTestCase;
import org.apache.tapestry.model.MutableComponentModel;
import org.apache.tapestry.services.ClassTransformation;
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/MixinAfterWorkerTest.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/MixinAfterWorkerTest.java?rev=657119&r1=657118&r2=657119&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/MixinAfterWorkerTest.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/MixinAfterWorkerTest.java
Fri May 16 09:07:12 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.internal.transform;
-import org.apache.tapestry.annotations.MixinAfter;
+import org.apache.tapestry.annotation.MixinAfter;
import org.apache.tapestry.internal.test.InternalBaseTestCase;
import org.apache.tapestry.model.MutableComponentModel;
import org.apache.tapestry.services.ClassTransformation;
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/MixinWorkerTest.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/MixinWorkerTest.java?rev=657119&r1=657118&r2=657119&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/MixinWorkerTest.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/MixinWorkerTest.java
Fri May 16 09:07:12 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.internal.test.InternalBaseTestCase;
import org.apache.tapestry.model.MutableComponentModel;
import org.apache.tapestry.services.ClassTransformation;
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/ResponseEncodingWorkerTest.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/ResponseEncodingWorkerTest.java?rev=657119&r1=657118&r2=657119&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/ResponseEncodingWorkerTest.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/ResponseEncodingWorkerTest.java
Fri May 16 09:07:12 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.test.TapestryTestCase;
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/RetainWorkerTest.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/RetainWorkerTest.java?rev=657119&r1=657118&r2=657119&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/RetainWorkerTest.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/RetainWorkerTest.java
Fri May 16 09:07:12 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.internal.transform;
-import org.apache.tapestry.annotations.Retain;
+import org.apache.tapestry.annotation.Retain;
import org.apache.tapestry.internal.test.InternalBaseTestCase;
import org.apache.tapestry.model.MutableComponentModel;
import org.apache.tapestry.services.ClassTransformation;
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/SupportsInformalParametersWorkerTest.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/SupportsInformalParametersWorkerTest.java?rev=657119&r1=657118&r2=657119&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/SupportsInformalParametersWorkerTest.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/SupportsInformalParametersWorkerTest.java
Fri May 16 09:07:12 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.internal.test.InternalBaseTestCase;
import org.apache.tapestry.model.MutableComponentModel;
import org.apache.tapestry.services.ClassTransformation;
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/components/DefaultParameterBindingMethodComponent.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/components/DefaultParameterBindingMethodComponent.java?rev=657119&r1=657118&r2=657119&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/components/DefaultParameterBindingMethodComponent.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/components/DefaultParameterBindingMethodComponent.java
Fri May 16 09:07:12 2008
@@ -15,7 +15,7 @@
package org.apache.tapestry.internal.transform.components;
import org.apache.tapestry.Binding;
-import org.apache.tapestry.annotations.Parameter;
+import org.apache.tapestry.annotation.Parameter;
import org.apache.tapestry.internal.transform.ParameterWorkerTest;
public class DefaultParameterBindingMethodComponent
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/components/DefaultParameterComponent.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/components/DefaultParameterComponent.java?rev=657119&r1=657118&r2=657119&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/components/DefaultParameterComponent.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/components/DefaultParameterComponent.java
Fri May 16 09:07:12 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.internal.transform.components;
-import org.apache.tapestry.annotations.Parameter;
+import org.apache.tapestry.annotation.Parameter;
/**
* Used by [EMAIL PROTECTED]
org.apache.tapestry.internal.transform.ParameterWorkerTest}.
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/components/ParameterComponent.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/components/ParameterComponent.java?rev=657119&r1=657118&r2=657119&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/components/ParameterComponent.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/components/ParameterComponent.java
Fri May 16 09:07:12 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.internal.transform.components;
-import org.apache.tapestry.annotations.Parameter;
+import org.apache.tapestry.annotation.Parameter;
/**
* Used by [EMAIL PROTECTED]
org.apache.tapestry.internal.transform.ParameterWorkerTest}.
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/BasicComponent.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/BasicComponent.java?rev=657119&r1=657118&r2=657119&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/BasicComponent.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/BasicComponent.java
Fri May 16 09:07:12 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.internal.transform.pages;
-import org.apache.tapestry.annotations.Retain;
+import org.apache.tapestry.annotation.Retain;
/**
* Used to test retained vs. discard properties.
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/EventHandlerTarget.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/EventHandlerTarget.java?rev=657119&r1=657118&r2=657119&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/EventHandlerTarget.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/EventHandlerTarget.java
Fri May 16 09:07:12 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.internal.transform.pages;
-import org.apache.tapestry.annotations.OnEvent;
+import org.apache.tapestry.annotation.OnEvent;
public class EventHandlerTarget
{
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/MaybeStateHolder.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/MaybeStateHolder.java?rev=657119&r1=657118&r2=657119&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/MaybeStateHolder.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/MaybeStateHolder.java
Fri May 16 09:07:12 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.internal.transform.pages;
-import org.apache.tapestry.annotations.ApplicationState;
+import org.apache.tapestry.annotation.ApplicationState;
import org.apache.tapestry.internal.services.SimpleASO;
public class MaybeStateHolder
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/MethodIdentifier.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/MethodIdentifier.java?rev=657119&r1=657118&r2=657119&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/MethodIdentifier.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/MethodIdentifier.java
Fri May 16 09:07:12 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.internal.transform.pages;
-import org.apache.tapestry.annotations.OnEvent;
+import org.apache.tapestry.annotation.OnEvent;
public class MethodIdentifier
{
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/ParentClass.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/ParentClass.java?rev=657119&r1=657118&r2=657119&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/ParentClass.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/ParentClass.java
Fri May 16 09:07:12 2008
@@ -14,13 +14,12 @@
package org.apache.tapestry.internal.transform.pages;
-import org.apache.tapestry.annotations.Meta;
-import org.apache.tapestry.annotations.Retain;
+import org.apache.tapestry.annotation.Meta;
+import org.apache.tapestry.annotation.Retain;
import org.apache.tapestry.internal.transform.InheritedAnnotation;
/**
- * Test class used with
- * [EMAIL PROTECTED]
org.apache.tapestry.internal.services.InternalClassTransformationImplTest}
+ * Test class used with [EMAIL PROTECTED]
org.apache.tapestry.internal.services.InternalClassTransformationImplTest}
*/
@Meta("foo=bar")
@InheritedAnnotation
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/StateHolder.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/StateHolder.java?rev=657119&r1=657118&r2=657119&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/StateHolder.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/StateHolder.java
Fri May 16 09:07:12 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.internal.transform.pages;
-import org.apache.tapestry.annotations.ApplicationState;
+import org.apache.tapestry.annotation.ApplicationState;
import org.apache.tapestry.internal.services.SimpleASO;
public class StateHolder
