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 2007/02/12 20:58:39 UTC
svn commit: r506610 [2/2] - in /tapestry/tapestry5/tapestry-core/trunk/src:
main/java/org/apache/tapestry/annotations/
main/java/org/apache/tapestry/corelib/base/
main/java/org/apache/tapestry/corelib/components/
main/java/org/apache/tapestry/corelib/m...
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/mixins/Emphasis.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/mixins/Emphasis.java?view=diff&rev=506610&r1=506609&r2=506610
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/mixins/Emphasis.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/mixins/Emphasis.java Mon Feb 12 11:58:34 2007
@@ -1,4 +1,4 @@
-// Copyright 2006 The Apache Software Foundation
+// Copyright 2006, 2007 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -12,34 +12,32 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.mixins;
-
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.annotations.AfterRender;
-import org.apache.tapestry.annotations.BeginRender;
-import org.apache.tapestry.annotations.ComponentClass;
-import org.apache.tapestry.annotations.Parameter;
-
-@ComponentClass
-/**
- * Mixin that adds emphasis to a component if a test is true.
- */
-public class Emphasis
-{
- @Parameter(required = true)
- private boolean _test;
-
- @BeginRender
- void begin(MarkupWriter writer)
- {
- if (_test)
- writer.element("em");
- }
-
- @AfterRender
- void after(MarkupWriter writer)
- {
- if (_test)
- writer.end();
- }
-}
+package org.apache.tapestry.integration.app1.mixins;
+
+import org.apache.tapestry.MarkupWriter;
+import org.apache.tapestry.annotations.AfterRender;
+import org.apache.tapestry.annotations.BeginRender;
+import org.apache.tapestry.annotations.Parameter;
+
+/**
+ * Mixin that adds emphasis to a component if a test is true.
+ */
+public class Emphasis
+{
+ @Parameter(required = true)
+ private boolean _test;
+
+ @BeginRender
+ void begin(MarkupWriter writer)
+ {
+ if (_test)
+ writer.element("em");
+ }
+
+ @AfterRender
+ void after(MarkupWriter writer)
+ {
+ if (_test)
+ writer.end();
+ }
+}
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/mixins/TracerMixin.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/mixins/TracerMixin.java?view=diff&rev=506610&r1=506609&r2=506610
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/mixins/TracerMixin.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/mixins/TracerMixin.java Mon Feb 12 11:58:34 2007
@@ -1,4 +1,4 @@
-// Copyright 2006 The Apache Software Foundation
+// Copyright 2006, 2007 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -14,12 +14,10 @@
package org.apache.tapestry.integration.app1.mixins;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.annotations.AfterRender;
-import org.apache.tapestry.annotations.BeginRender;
-import org.apache.tapestry.annotations.ComponentClass;
+import org.apache.tapestry.MarkupWriter;
+import org.apache.tapestry.annotations.AfterRender;
+import org.apache.tapestry.annotations.BeginRender;
-@ComponentClass
public class TracerMixin
{
@BeginRender
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/ActionPage.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/ActionPage.java?view=diff&rev=506610&r1=506609&r2=506610
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/ActionPage.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/ActionPage.java Mon Feb 12 11:58:34 2007
@@ -1,4 +1,4 @@
-// Copyright 2006 The Apache Software Foundation
+// Copyright 2006, 2007 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -14,10 +14,8 @@
package org.apache.tapestry.integration.app1.pages;
-import org.apache.tapestry.annotations.ComponentClass;
import org.apache.tapestry.annotations.Persist;
-@ComponentClass
public class ActionPage
{
private int _index;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/AnyDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/AnyDemo.java?view=diff&rev=506610&r1=506609&r2=506610
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/AnyDemo.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/AnyDemo.java Mon Feb 12 11:58:34 2007
@@ -15,10 +15,8 @@
package org.apache.tapestry.integration.app1.pages;
import org.apache.tapestry.annotations.Component;
-import org.apache.tapestry.annotations.ComponentClass;
import org.apache.tapestry.corelib.components.Any;
-@ComponentClass
public class AnyDemo
{
@Component
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/AssetDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/AssetDemo.java?view=diff&rev=506610&r1=506609&r2=506610
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/AssetDemo.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/AssetDemo.java Mon Feb 12 11:58:34 2007
@@ -1,4 +1,4 @@
-// Copyright 2006 The Apache Software Foundation
+// Copyright 2006, 2007 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -15,10 +15,8 @@
package org.apache.tapestry.integration.app1.pages;
import org.apache.tapestry.Asset;
-import org.apache.tapestry.annotations.ComponentClass;
import org.apache.tapestry.annotations.Inject;
-@ComponentClass
public class AssetDemo
{
@Inject("context:images/tapestry_banner.gif")
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/BadTemplate.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/BadTemplate.java?view=diff&rev=506610&r1=506609&r2=506610
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/BadTemplate.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/BadTemplate.java Mon Feb 12 11:58:34 2007
@@ -1,4 +1,4 @@
-// Copyright 2006 The Apache Software Foundation
+// Copyright 2006, 2007 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -12,15 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
-
-import org.apache.tapestry.annotations.ComponentClass;
-
-/**
- *
- */
-@ComponentClass
-public class BadTemplate
-{
-
-}
+package org.apache.tapestry.integration.app1.pages;
+
+public class BadTemplate
+{
+
+}
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/Barney.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/Barney.java?view=diff&rev=506610&r1=506609&r2=506610
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/Barney.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/Barney.java Mon Feb 12 11:58:34 2007
@@ -1,4 +1,4 @@
-// Copyright 2006 The Apache Software Foundation
+// Copyright 2006, 2007 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -14,9 +14,6 @@
package org.apache.tapestry.integration.app1.pages;
-import org.apache.tapestry.annotations.ComponentClass;
-
-@ComponentClass
public class Barney implements Runnable
{
public void run()
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/BeanEditorDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/BeanEditorDemo.java?view=diff&rev=506610&r1=506609&r2=506610
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/BeanEditorDemo.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/BeanEditorDemo.java Mon Feb 12 11:58:34 2007
@@ -16,11 +16,9 @@
import org.apache.tapestry.annotations.ApplicationState;
import org.apache.tapestry.annotations.Component;
-import org.apache.tapestry.annotations.ComponentClass;
import org.apache.tapestry.corelib.components.BeanEditForm;
import org.apache.tapestry.integration.app1.data.RegistrationData;
-@ComponentClass
public class BeanEditorDemo
{
@Component
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/BlockDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/BlockDemo.java?view=diff&rev=506610&r1=506609&r2=506610
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/BlockDemo.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/BlockDemo.java Mon Feb 12 11:58:34 2007
@@ -17,13 +17,11 @@
import java.util.Map;
import org.apache.tapestry.Block;
-import org.apache.tapestry.annotations.ComponentClass;
import org.apache.tapestry.annotations.Inject;
import org.apache.tapestry.annotations.Persist;
import org.apache.tapestry.annotations.Retain;
import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-@ComponentClass
public class BlockDemo
{
@Inject
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/ClassLoaderInspect.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/ClassLoaderInspect.java?view=diff&rev=506610&r1=506609&r2=506610
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/ClassLoaderInspect.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/ClassLoaderInspect.java Mon Feb 12 11:58:34 2007
@@ -25,13 +25,11 @@
import java.util.jar.JarEntry;
import org.apache.tapestry.annotations.Component;
-import org.apache.tapestry.annotations.ComponentClass;
import org.apache.tapestry.annotations.Persist;
import org.apache.tapestry.corelib.components.Form;
import org.apache.tapestry.ioc.internal.util.CollectionFactory;
import org.apache.tapestry.ioc.internal.util.InternalUtils;
-@ComponentClass
public class ClassLoaderInspect
{
private static final ClassLoader _classLoader = Thread.currentThread().getContextClassLoader();
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/Countdown.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/Countdown.java?view=diff&rev=506610&r1=506609&r2=506610
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/Countdown.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/Countdown.java Mon Feb 12 11:58:34 2007
@@ -1,4 +1,4 @@
-// Copyright 2006 The Apache Software Foundation
+// Copyright 2006, 2007 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -15,10 +15,8 @@
package org.apache.tapestry.integration.app1.pages;
import org.apache.tapestry.annotations.Component;
-import org.apache.tapestry.annotations.ComponentClass;
import org.apache.tapestry.integration.app1.components.Count;
-@ComponentClass
public class Countdown
{
@SuppressWarnings("unused")
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/EnvironmentalDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/EnvironmentalDemo.java?view=diff&rev=506610&r1=506609&r2=506610
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/EnvironmentalDemo.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/EnvironmentalDemo.java Mon Feb 12 11:58:34 2007
@@ -1,4 +1,4 @@
-// Copyright 2006 The Apache Software Foundation
+// Copyright 2006, 2007 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -12,12 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
-
-import org.apache.tapestry.annotations.ComponentClass;
-
-@ComponentClass
-public class EnvironmentalDemo
-{
-
-}
+package org.apache.tapestry.integration.app1.pages;
+
+public class EnvironmentalDemo
+{
+
+}
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/Expansion.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/Expansion.java?view=diff&rev=506610&r1=506609&r2=506610
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/Expansion.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/Expansion.java Mon Feb 12 11:58:34 2007
@@ -1,4 +1,4 @@
-// Copyright 2006 The Apache Software Foundation
+// Copyright 2006, 2007 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -12,18 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
-
-import org.apache.tapestry.annotations.ComponentClass;
-
-/**
- *
- */
-@ComponentClass
-public class Expansion
-{
- public String getExpansionValue()
- {
- return "value provided by a template expansion";
- }
-}
+package org.apache.tapestry.integration.app1.pages;
+
+public class Expansion
+{
+ public String getExpansionValue()
+ {
+ return "value provided by a template expansion";
+ }
+}
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/FlashDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/FlashDemo.java?view=diff&rev=506610&r1=506609&r2=506610
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/FlashDemo.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/FlashDemo.java Mon Feb 12 11:58:34 2007
@@ -14,11 +14,11 @@
package org.apache.tapestry.integration.app1.pages;
-import org.apache.tapestry.annotations.ComponentClass;
+import org.apache.tapestry.annotations.Meta;
import org.apache.tapestry.annotations.Persist;
import org.apache.tapestry.integration.app1.base.BaseComponent;
-@ComponentClass(meta = "tapestry.persistence-strategy=flash")
+@Meta("tapestry.persistence-strategy=flash")
public class FlashDemo extends BaseComponent
{
@Persist
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/Fred.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/Fred.java?view=diff&rev=506610&r1=506609&r2=506610
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/Fred.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/Fred.java Mon Feb 12 11:58:34 2007
@@ -1,4 +1,4 @@
-// Copyright 2006 The Apache Software Foundation
+// Copyright 2006, 2007 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -14,9 +14,6 @@
package org.apache.tapestry.integration.app1.pages;
-import org.apache.tapestry.annotations.ComponentClass;
-
-@ComponentClass
public class Fred
{
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/GridDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/GridDemo.java?view=diff&rev=506610&r1=506609&r2=506610
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/GridDemo.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/GridDemo.java Mon Feb 12 11:58:34 2007
@@ -16,12 +16,10 @@
import java.util.List;
-import org.apache.tapestry.annotations.ComponentClass;
import org.apache.tapestry.annotations.Inject;
import org.apache.tapestry.integration.app1.data.Track;
import org.apache.tapestry.integration.app1.services.MusicLibrary;
-@ComponentClass
public class GridDemo
{
@Inject
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/InjectComponentMismatch.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/InjectComponentMismatch.java?view=diff&rev=506610&r1=506609&r2=506610
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/InjectComponentMismatch.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/InjectComponentMismatch.java Mon Feb 12 11:58:34 2007
@@ -1,4 +1,4 @@
-// Copyright 2006 The Apache Software Foundation
+// Copyright 2006, 2007 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -15,11 +15,10 @@
package org.apache.tapestry.integration.app1.pages;
import org.apache.tapestry.Field;
-import org.apache.tapestry.annotations.ComponentClass;
import org.apache.tapestry.annotations.Mixin;
+
import org.apache.tapestry.corelib.mixins.RenderDisabled;
-@ComponentClass
public class InjectComponentMismatch
{
/**
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/InjectDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/InjectDemo.java?view=diff&rev=506610&r1=506609&r2=506610
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/InjectDemo.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/InjectDemo.java Mon Feb 12 11:58:34 2007
@@ -15,14 +15,12 @@
package org.apache.tapestry.integration.app1.pages;
import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.annotations.ComponentClass;
import org.apache.tapestry.annotations.Inject;
import org.apache.tapestry.annotations.InjectPage;
import org.apache.tapestry.annotations.OnEvent;
import org.apache.tapestry.services.BindingSource;
import org.apache.tapestry.services.Request;
-@ComponentClass
public class InjectDemo
{
// Named --- now demonstrating case insensitivity
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/InstanceMixin.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/InstanceMixin.java?view=diff&rev=506610&r1=506609&r2=506610
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/InstanceMixin.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/InstanceMixin.java Mon Feb 12 11:58:34 2007
@@ -1,4 +1,4 @@
-// Copyright 2006 The Apache Software Foundation
+// Copyright 2006, 2007 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -22,7 +22,6 @@
import java.util.Locale;
import org.apache.tapestry.annotations.Component;
-import org.apache.tapestry.annotations.ComponentClass;
import org.apache.tapestry.annotations.MixinClasses;
import org.apache.tapestry.annotations.Mixins;
import org.apache.tapestry.annotations.OnEvent;
@@ -31,7 +30,6 @@
import org.apache.tapestry.integration.app1.components.Output;
import org.apache.tapestry.integration.app1.mixins.Emphasis;
-@ComponentClass
public class InstanceMixin
{
@SuppressWarnings("unused")
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/Localization.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/Localization.java?view=diff&rev=506610&r1=506609&r2=506610
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/Localization.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/Localization.java Mon Feb 12 11:58:34 2007
@@ -1,4 +1,4 @@
-// Copyright 2006 The Apache Software Foundation
+// Copyright 2006, 2007 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
import java.util.Locale;
-import org.apache.tapestry.annotations.ComponentClass;
import org.apache.tapestry.annotations.Inject;
import org.apache.tapestry.annotations.OnEvent;
import org.apache.tapestry.ioc.Messages;
@@ -24,7 +23,6 @@
import org.apache.tapestry.services.PersistentLocale;
import org.apache.tapestry.services.Request;
-@ComponentClass
public class Localization
{
@Inject
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/MerryChristmas.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/MerryChristmas.java?view=diff&rev=506610&r1=506609&r2=506610
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/MerryChristmas.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/MerryChristmas.java Mon Feb 12 11:58:34 2007
@@ -1,4 +1,4 @@
-// Copyright 2006 The Apache Software Foundation
+// Copyright 2006, 2007 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -12,11 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
-
-import org.apache.tapestry.annotations.ComponentClass;
-
-@ComponentClass
-public class MerryChristmas
-{
-}
+package org.apache.tapestry.integration.app1.pages;
+
+public class MerryChristmas
+{
+}
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/NullGrid.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/NullGrid.java?view=diff&rev=506610&r1=506609&r2=506610
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/NullGrid.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/NullGrid.java Mon Feb 12 11:58:34 2007
@@ -14,9 +14,6 @@
package org.apache.tapestry.integration.app1.pages;
-import org.apache.tapestry.annotations.ComponentClass;
-
-@ComponentClass
public class NullGrid
{
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/NumberSelect.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/NumberSelect.java?view=diff&rev=506610&r1=506609&r2=506610
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/NumberSelect.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/NumberSelect.java Mon Feb 12 11:58:34 2007
@@ -1,4 +1,4 @@
-// Copyright 2006 The Apache Software Foundation
+// Copyright 2006, 2007 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -14,10 +14,8 @@
package org.apache.tapestry.integration.app1.pages;
-import org.apache.tapestry.annotations.ComponentClass;
import org.apache.tapestry.annotations.InjectPage;
-@ComponentClass
public class NumberSelect
{
private int _index;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/PageLoadedDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/PageLoadedDemo.java?view=diff&rev=506610&r1=506609&r2=506610
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/PageLoadedDemo.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/PageLoadedDemo.java Mon Feb 12 11:58:34 2007
@@ -14,10 +14,8 @@
package org.apache.tapestry.integration.app1.pages;
-import org.apache.tapestry.annotations.ComponentClass;
import org.apache.tapestry.annotations.Retain;
-@ComponentClass
public class PageLoadedDemo
{
@Retain
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/ParameterConflict.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/ParameterConflict.java?view=diff&rev=506610&r1=506609&r2=506610
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/ParameterConflict.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/ParameterConflict.java Mon Feb 12 11:58:34 2007
@@ -1,4 +1,4 @@
-// Copyright 2006 The Apache Software Foundation
+// Copyright 2006, 2007 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -14,14 +14,9 @@
package org.apache.tapestry.integration.app1.pages;
-import org.apache.tapestry.annotations.Component;
-import org.apache.tapestry.annotations.ComponentClass;
-import org.apache.tapestry.integration.app1.components.Echo;
+import org.apache.tapestry.annotations.Component;
+import org.apache.tapestry.integration.app1.components.Echo;
-/**
- *
- */
-@ComponentClass
public class ParameterConflict
{
@SuppressWarnings("unused")
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/ParameterDefault.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/ParameterDefault.java?view=diff&rev=506610&r1=506609&r2=506610
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/ParameterDefault.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/ParameterDefault.java Mon Feb 12 11:58:34 2007
@@ -1,4 +1,4 @@
-// Copyright 2006 The Apache Software Foundation
+// Copyright 2006, 2007 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -14,9 +14,6 @@
package org.apache.tapestry.integration.app1.pages;
-import org.apache.tapestry.annotations.ComponentClass;
-
-@ComponentClass
public class ParameterDefault
{
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/PasswordFieldDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/PasswordFieldDemo.java?view=diff&rev=506610&r1=506609&r2=506610
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/PasswordFieldDemo.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/PasswordFieldDemo.java Mon Feb 12 11:58:34 2007
@@ -15,14 +15,12 @@
package org.apache.tapestry.integration.app1.pages;
import org.apache.tapestry.annotations.Component;
-import org.apache.tapestry.annotations.ComponentClass;
import org.apache.tapestry.annotations.Inject;
import org.apache.tapestry.annotations.Retain;
import org.apache.tapestry.corelib.components.Form;
import org.apache.tapestry.corelib.components.PasswordField;
import org.apache.tapestry.integration.app1.services.UserAuthenticator;
-@ComponentClass
public class PasswordFieldDemo
{
@Retain
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/PostLogin.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/PostLogin.java?view=diff&rev=506610&r1=506609&r2=506610
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/PostLogin.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/PostLogin.java Mon Feb 12 11:58:34 2007
@@ -14,9 +14,6 @@
package org.apache.tapestry.integration.app1.pages;
-import org.apache.tapestry.annotations.ComponentClass;
-
-@ComponentClass
public class PostLogin
{
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/RenderComponentDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/RenderComponentDemo.java?view=diff&rev=506610&r1=506609&r2=506610
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/RenderComponentDemo.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/RenderComponentDemo.java Mon Feb 12 11:58:34 2007
@@ -15,11 +15,9 @@
package org.apache.tapestry.integration.app1.pages;
import org.apache.tapestry.annotations.Component;
-import org.apache.tapestry.annotations.ComponentClass;
import org.apache.tapestry.annotations.Persist;
import org.apache.tapestry.corelib.components.Any;
-@ComponentClass
public class RenderComponentDemo
{
@Persist
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/RenderPhaseOrder.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/RenderPhaseOrder.java?view=diff&rev=506610&r1=506609&r2=506610
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/RenderPhaseOrder.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/RenderPhaseOrder.java Mon Feb 12 11:58:34 2007
@@ -1,4 +1,4 @@
-// Copyright 2006 The Apache Software Foundation
+// Copyright 2006, 2007 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -12,12 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
-
-import org.apache.tapestry.annotations.ComponentClass;
-
-@ComponentClass
-public class RenderPhaseOrder
-{
-
-}
+package org.apache.tapestry.integration.app1.pages;
+
+public class RenderPhaseOrder
+{
+
+}
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/ShowSelection.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/ShowSelection.java?view=diff&rev=506610&r1=506609&r2=506610
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/ShowSelection.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/ShowSelection.java Mon Feb 12 11:58:34 2007
@@ -1,4 +1,4 @@
-// Copyright 2006 The Apache Software Foundation
+// Copyright 2006, 2007 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -14,10 +14,8 @@
package org.apache.tapestry.integration.app1.pages;
-import org.apache.tapestry.annotations.ComponentClass;
import org.apache.tapestry.annotations.OnEvent;
-@ComponentClass
public class ShowSelection
{
private int _selected;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/SimpleForm.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/SimpleForm.java?view=diff&rev=506610&r1=506609&r2=506610
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/SimpleForm.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/SimpleForm.java Mon Feb 12 11:58:34 2007
@@ -14,11 +14,9 @@
package org.apache.tapestry.integration.app1.pages;
-import org.apache.tapestry.annotations.ComponentClass;
import org.apache.tapestry.annotations.Persist;
import org.apache.tapestry.integration.app1.data.IncidentData;
-@ComponentClass
public class SimpleForm
{
@Persist
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/Start.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/Start.java?view=diff&rev=506610&r1=506609&r2=506610
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/Start.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/Start.java Mon Feb 12 11:58:34 2007
@@ -1,4 +1,4 @@
-// Copyright 2006 The Apache Software Foundation
+// Copyright 2006, 2007 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -12,16 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
-
-import org.apache.tapestry.annotations.ComponentClass;
-
-/**
- * Have to start somewhere!
- *
- *
- */
-@ComponentClass
-public class Start
-{
-}
+package org.apache.tapestry.integration.app1.pages;
+
+/**
+ * Have to start somewhere!
+ */
+public class Start
+{
+}
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/ToDoList.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/ToDoList.java?view=diff&rev=506610&r1=506609&r2=506610
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/ToDoList.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/ToDoList.java Mon Feb 12 11:58:34 2007
@@ -19,13 +19,11 @@
import org.apache.tapestry.DefaultPrimaryKeyEncoder;
import org.apache.tapestry.PrimaryKeyEncoder;
import org.apache.tapestry.annotations.Component;
-import org.apache.tapestry.annotations.ComponentClass;
import org.apache.tapestry.annotations.Inject;
import org.apache.tapestry.corelib.components.Form;
import org.apache.tapestry.integration.app1.data.ToDoItem;
import org.apache.tapestry.integration.app1.services.ToDoDatabase;
-@ComponentClass
public class ToDoList
{
@Inject
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/ToDoListVolatile.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/ToDoListVolatile.java?view=diff&rev=506610&r1=506609&r2=506610
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/ToDoListVolatile.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/ToDoListVolatile.java Mon Feb 12 11:58:34 2007
@@ -17,13 +17,11 @@
import java.util.List;
import org.apache.tapestry.annotations.Component;
-import org.apache.tapestry.annotations.ComponentClass;
import org.apache.tapestry.annotations.Inject;
import org.apache.tapestry.corelib.components.Form;
import org.apache.tapestry.integration.app1.data.ToDoItem;
import org.apache.tapestry.integration.app1.services.ToDoDatabase;
-@ComponentClass
public class ToDoListVolatile
{
@Inject
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/ValidForm.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/ValidForm.java?view=diff&rev=506610&r1=506609&r2=506610
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/ValidForm.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/ValidForm.java Mon Feb 12 11:58:34 2007
@@ -1,4 +1,4 @@
-// Copyright 2006 The Apache Software Foundation
+// Copyright 2006, 2007 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -14,11 +14,9 @@
package org.apache.tapestry.integration.app1.pages;
-import org.apache.tapestry.annotations.ComponentClass;
import org.apache.tapestry.annotations.Persist;
import org.apache.tapestry.integration.app1.data.IncidentData;
-@ComponentClass
public class ValidForm
{
@Persist
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/ViewRegistration.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/ViewRegistration.java?view=diff&rev=506610&r1=506609&r2=506610
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/ViewRegistration.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/ViewRegistration.java Mon Feb 12 11:58:34 2007
@@ -15,10 +15,8 @@
package org.apache.tapestry.integration.app1.pages;
import org.apache.tapestry.annotations.ApplicationState;
-import org.apache.tapestry.annotations.ComponentClass;
import org.apache.tapestry.integration.app1.data.RegistrationData;
-@ComponentClass
public class ViewRegistration
{
@ApplicationState
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/Wilma.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/Wilma.java?view=diff&rev=506610&r1=506609&r2=506610
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/Wilma.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/Wilma.java Mon Feb 12 11:58:34 2007
@@ -1,4 +1,4 @@
-// Copyright 2006 The Apache Software Foundation
+// Copyright 2006, 2007 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -14,9 +14,6 @@
package org.apache.tapestry.integration.app1.pages;
-import org.apache.tapestry.annotations.ComponentClass;
-
-@ComponentClass
public class Wilma
{
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app2/pages/ResultPageForActionLink.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app2/pages/ResultPageForActionLink.java?view=diff&rev=506610&r1=506609&r2=506610
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app2/pages/ResultPageForActionLink.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app2/pages/ResultPageForActionLink.java Mon Feb 12 11:58:34 2007
@@ -1,4 +1,4 @@
-// Copyright 2006 The Apache Software Foundation
+// Copyright 2006, 2007 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -12,24 +12,23 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app2.pages;
-
-import org.apache.tapestry.annotations.ComponentClass;
-import org.apache.tapestry.annotations.OnEvent;
-
-@ComponentClass
-public class ResultPageForActionLink
-{
- private int number;
-
- @OnEvent("passivate")
- public int getNumber()
- {
- return number;
- }
- @OnEvent("activate")
- public void setNumber(int number)
- {
- this.number = number;
- }
-}
+package org.apache.tapestry.integration.app2.pages;
+
+import org.apache.tapestry.annotations.OnEvent;
+
+public class ResultPageForActionLink
+{
+ private int number;
+
+ @OnEvent("passivate")
+ public int getNumber()
+ {
+ return number;
+ }
+
+ @OnEvent("activate")
+ public void setNumber(int number)
+ {
+ this.number = number;
+ }
+}
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app2/pages/TestPageForActionLink.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app2/pages/TestPageForActionLink.java?view=diff&rev=506610&r1=506609&r2=506610
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app2/pages/TestPageForActionLink.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app2/pages/TestPageForActionLink.java Mon Feb 12 11:58:34 2007
@@ -1,4 +1,4 @@
-// Copyright 2006 The Apache Software Foundation
+// Copyright 2006, 2007 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -12,22 +12,20 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app2.pages;
-
-import org.apache.tapestry.annotations.ComponentClass;
-import org.apache.tapestry.annotations.InjectPage;
-import org.apache.tapestry.annotations.OnEvent;
-
-@ComponentClass
-public class TestPageForActionLink
-{
- @InjectPage("ResultPageForActionLink")
- private ResultPageForActionLink resultPage;
-
- @OnEvent(component = "link1")
- public ResultPageForActionLink onClick(int number)
- {
- resultPage.setNumber(number);
- return resultPage;
- }
-}
+package org.apache.tapestry.integration.app2.pages;
+
+import org.apache.tapestry.annotations.InjectPage;
+import org.apache.tapestry.annotations.OnEvent;
+
+public class TestPageForActionLink
+{
+ @InjectPage("ResultPageForActionLink")
+ private ResultPageForActionLink resultPage;
+
+ @OnEvent(component = "link1")
+ public ResultPageForActionLink onClick(int number)
+ {
+ resultPage.setNumber(number);
+ return resultPage;
+ }
+}
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app2/pages/TestPageForForm.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app2/pages/TestPageForForm.java?view=diff&rev=506610&r1=506609&r2=506610
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app2/pages/TestPageForForm.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app2/pages/TestPageForForm.java Mon Feb 12 11:58:34 2007
@@ -1,4 +1,4 @@
-// Copyright 2006 The Apache Software Foundation
+// Copyright 2006, 2007 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -14,10 +14,8 @@
package org.apache.tapestry.integration.app2.pages;
-import org.apache.tapestry.annotations.ComponentClass;
import org.apache.tapestry.annotations.Persist;
-@ComponentClass
public class TestPageForForm
{
@Persist
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app2/pages/TestPageForIf.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app2/pages/TestPageForIf.java?view=diff&rev=506610&r1=506609&r2=506610
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app2/pages/TestPageForIf.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app2/pages/TestPageForIf.java Mon Feb 12 11:58:34 2007
@@ -1,4 +1,4 @@
-// Copyright 2006 The Apache Software Foundation
+// Copyright 200, 2007 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -12,25 +12,22 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app2.pages;
-
-import org.apache.tapestry.annotations.ComponentClass;
-
-@ComponentClass
-public class TestPageForIf
-{
- private boolean property1 = true;
-
- private boolean property2 = false;
-
- public boolean isProperty1()
- {
- return property1;
- }
-
- public boolean isProperty2()
- {
- return property2;
- }
-
-}
+package org.apache.tapestry.integration.app2.pages;
+
+public class TestPageForIf
+{
+ private boolean property1 = true;
+
+ private boolean property2 = false;
+
+ public boolean isProperty1()
+ {
+ return property1;
+ }
+
+ public boolean isProperty2()
+ {
+ return property2;
+ }
+
+}
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app2/pages/TestPageForLocale.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app2/pages/TestPageForLocale.java?view=diff&rev=506610&r1=506609&r2=506610
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app2/pages/TestPageForLocale.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app2/pages/TestPageForLocale.java Mon Feb 12 11:58:34 2007
@@ -1,4 +1,4 @@
-// Copyright 2006 The Apache Software Foundation
+// Copyright 2006, 2007 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -12,25 +12,23 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app2.pages;
-
+package org.apache.tapestry.integration.app2.pages;
+
import java.util.Locale;
-import org.apache.tapestry.annotations.ComponentClass;
import org.apache.tapestry.annotations.Inject;
import org.apache.tapestry.annotations.OnEvent;
import org.apache.tapestry.services.PersistentLocale;
-
-@ComponentClass
-public class TestPageForLocale
+
+public class TestPageForLocale
{
@Inject
private PersistentLocale persistentLocale;
-
- @OnEvent(component="changeLocale")
+
+ @OnEvent(component = "changeLocale")
public void changeLocaleToFrench()
{
persistentLocale.set(Locale.FRENCH);
}
-
-}
+
+}
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app2/pages/TestPageForLoop.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app2/pages/TestPageForLoop.java?view=diff&rev=506610&r1=506609&r2=506610
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app2/pages/TestPageForLoop.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app2/pages/TestPageForLoop.java Mon Feb 12 11:58:34 2007
@@ -1,4 +1,4 @@
-// Copyright 2006 The Apache Software Foundation
+// Copyright 2006, 2007 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -12,30 +12,27 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app2.pages;
-
-import org.apache.tapestry.annotations.ComponentClass;
-
-@ComponentClass
-public class TestPageForLoop
-{
- private String[] _array =
- { "x", "y", "z" };
-
- private String _value;
-
- public String[] getArray()
- {
- return _array;
- }
-
- public String getValue()
- {
- return _value;
- }
-
- public void setValue(String value)
- {
- this._value = value;
- }
-}
+package org.apache.tapestry.integration.app2.pages;
+
+public class TestPageForLoop
+{
+ private String[] _array =
+ { "x", "y", "z" };
+
+ private String _value;
+
+ public String[] getArray()
+ {
+ return _array;
+ }
+
+ public String getValue()
+ {
+ return _value;
+ }
+
+ public void setValue(String value)
+ {
+ this._value = value;
+ }
+}
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app2/pages/TestPageForSubmit.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app2/pages/TestPageForSubmit.java?view=diff&rev=506610&r1=506609&r2=506610
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app2/pages/TestPageForSubmit.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app2/pages/TestPageForSubmit.java Mon Feb 12 11:58:34 2007
@@ -15,14 +15,12 @@
package org.apache.tapestry.integration.app2.pages;
import org.apache.tapestry.annotations.Component;
-import org.apache.tapestry.annotations.ComponentClass;
import org.apache.tapestry.annotations.OnEvent;
import org.apache.tapestry.annotations.Persist;
import org.apache.tapestry.corelib.components.Form;
import org.apache.tapestry.corelib.components.Submit;
import org.apache.tapestry.corelib.components.TextField;
-@ComponentClass
public class TestPageForSubmit
{
@SuppressWarnings("unused")
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app2/pages/TestPageForTemplateInWEBINF.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app2/pages/TestPageForTemplateInWEBINF.java?view=diff&rev=506610&r1=506609&r2=506610
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app2/pages/TestPageForTemplateInWEBINF.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app2/pages/TestPageForTemplateInWEBINF.java Mon Feb 12 11:58:34 2007
@@ -12,16 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app2.pages;
-
-import org.apache.tapestry.annotations.ComponentClass;
-
-@ComponentClass
-public class TestPageForTemplateInWEBINF
-{
+package org.apache.tapestry.integration.app2.pages;
+
+public class TestPageForTemplateInWEBINF
+{
public String getMsg()
{
return "How are you?";
}
-}
+}
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/AnnotatedPage.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/AnnotatedPage.java?view=diff&rev=506610&r1=506609&r2=506610
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/AnnotatedPage.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/AnnotatedPage.java Mon Feb 12 11:58:34 2007
@@ -1,4 +1,4 @@
-// Copyright 2006 The Apache Software Foundation
+// Copyright 2006, 2007 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -12,31 +12,26 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
-
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.annotations.ComponentClass;
-import org.apache.tapestry.annotations.SetupRender;
-
-/**
- *
- */
-@ComponentClass
-public class AnnotatedPage
-{
-
- @SetupRender
- void beforeRender()
- {
- }
-
- @SetupRender
- boolean earlyRender(MarkupWriter writer)
- {
- return true;
- }
-
- void methodWithoutAnnotation()
- {
- }
-}
+package org.apache.tapestry.internal.services;
+
+import org.apache.tapestry.MarkupWriter;
+import org.apache.tapestry.annotations.SetupRender;
+
+public class AnnotatedPage
+{
+
+ @SetupRender
+ void beforeRender()
+ {
+ }
+
+ @SetupRender
+ boolean earlyRender(MarkupWriter writer)
+ {
+ return true;
+ }
+
+ void methodWithoutAnnotation()
+ {
+ }
+}
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/DefaultParameterBindingMethodComponent.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/DefaultParameterBindingMethodComponent.java?view=diff&rev=506610&r1=506609&r2=506610
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/DefaultParameterBindingMethodComponent.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/DefaultParameterBindingMethodComponent.java Mon Feb 12 11:58:34 2007
@@ -15,10 +15,8 @@
package org.apache.tapestry.internal.services;
import org.apache.tapestry.Binding;
-import org.apache.tapestry.annotations.ComponentClass;
import org.apache.tapestry.annotations.Parameter;
-@ComponentClass
public class DefaultParameterBindingMethodComponent
{
@Parameter
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/DefaultParameterComponent.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/DefaultParameterComponent.java?view=diff&rev=506610&r1=506609&r2=506610
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/DefaultParameterComponent.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/DefaultParameterComponent.java Mon Feb 12 11:58:34 2007
@@ -1,4 +1,4 @@
-// Copyright 2006 The Apache Software Foundation
+// Copyright 2006, 2007 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -14,13 +14,11 @@
package org.apache.tapestry.internal.services;
-import org.apache.tapestry.annotations.ComponentClass;
import org.apache.tapestry.annotations.Parameter;
/**
* Used by {@link org.apache.tapestry.internal.services.ParameterWorkerTest}.
*/
-@ComponentClass
public class DefaultParameterComponent
{
@Parameter("literal:greeting")
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/FieldRemoval.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/FieldRemoval.java?view=diff&rev=506610&r1=506609&r2=506610
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/FieldRemoval.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/FieldRemoval.java Mon Feb 12 11:58:34 2007
@@ -1,4 +1,4 @@
-// Copyright 2006 The Apache Software Foundation
+// Copyright 2006, 2007 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -14,9 +14,6 @@
package org.apache.tapestry.internal.services;
-import org.apache.tapestry.annotations.ComponentClass;
-
-@ComponentClass
public class FieldRemoval
{
@SuppressWarnings("unused")
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/InternalClassTransformationImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/InternalClassTransformationImplTest.java?view=diff&rev=506610&r1=506609&r2=506610
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/InternalClassTransformationImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/InternalClassTransformationImplTest.java Mon Feb 12 11:58:34 2007
@@ -33,7 +33,7 @@
import javassist.NotFoundException;
import org.apache.commons.logging.Log;
-import org.apache.tapestry.annotations.ComponentClass;
+import org.apache.tapestry.annotations.Meta;
import org.apache.tapestry.annotations.OnEvent;
import org.apache.tapestry.annotations.Retain;
import org.apache.tapestry.annotations.SetupRender;
@@ -399,9 +399,9 @@
ClassTransformation ct = createClassTransformation(ParentClass.class, log);
- ComponentClass cc = ct.getAnnotation(ComponentClass.class);
+ Meta meta = ct.getAnnotation(Meta.class);
- assertNotNull(cc);
+ assertNotNull(meta);
// Try again (the annotations will be cached). Use an annotation
// that will not be present.
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/MetaWorkerTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/MetaWorkerTest.java?view=diff&rev=506610&r1=506609&r2=506610
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/MetaWorkerTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/MetaWorkerTest.java Mon Feb 12 11:58:34 2007
@@ -14,7 +14,7 @@
package org.apache.tapestry.internal.services;
-import org.apache.tapestry.annotations.ComponentClass;
+import org.apache.tapestry.annotations.Meta;
import org.apache.tapestry.internal.test.InternalBaseTestCase;
import org.apache.tapestry.model.MutableComponentModel;
import org.apache.tapestry.services.ClassTransformation;
@@ -28,7 +28,7 @@
ClassTransformation ct = newClassTransformation();
MutableComponentModel model = newMutableComponentModel();
- train_getAnnotation(ct, ComponentClass.class, null);
+ train_getAnnotation(ct, Meta.class, null);
replay();
@@ -42,11 +42,11 @@
{
ClassTransformation ct = newClassTransformation();
MutableComponentModel model = newMutableComponentModel();
- ComponentClass annotation = newMock(ComponentClass.class);
+ Meta annotation = newMock(Meta.class);
- train_getAnnotation(ct, ComponentClass.class, annotation);
+ train_getAnnotation(ct, Meta.class, annotation);
- expect(annotation.meta()).andReturn(new String[]
+ expect(annotation.value()).andReturn(new String[]
{ "foo=bar", "baz=biff" });
model.setMeta("foo", "bar");
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ParameterComponent.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ParameterComponent.java?view=diff&rev=506610&r1=506609&r2=506610
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ParameterComponent.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ParameterComponent.java Mon Feb 12 11:58:34 2007
@@ -1,4 +1,4 @@
-// Copyright 2006 The Apache Software Foundation
+// Copyright 2006, 2007 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -14,13 +14,11 @@
package org.apache.tapestry.internal.services;
-import org.apache.tapestry.annotations.ComponentClass;
-import org.apache.tapestry.annotations.Parameter;
+import org.apache.tapestry.annotations.Parameter;
/**
* Used by {@link org.apache.tapestry.internal.services.ParameterWorkerTest}.
*/
-@ComponentClass
public class ParameterComponent
{
@Parameter
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/StateHolder.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/StateHolder.java?view=diff&rev=506610&r1=506609&r2=506610
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/StateHolder.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/StateHolder.java Mon Feb 12 11:58:34 2007
@@ -15,9 +15,7 @@
package org.apache.tapestry.internal.services;
import org.apache.tapestry.annotations.ApplicationState;
-import org.apache.tapestry.annotations.ComponentClass;
-@ComponentClass
public class StateHolder
{
@ApplicationState
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/pages/BasicComponent.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/pages/BasicComponent.java?view=diff&rev=506610&r1=506609&r2=506610
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/pages/BasicComponent.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/pages/BasicComponent.java Mon Feb 12 11:58:34 2007
@@ -1,4 +1,4 @@
-// Copyright 2006 The Apache Software Foundation
+// Copyright 2006, 2007 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -12,41 +12,37 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.transform.pages;
-
-import org.apache.tapestry.annotations.ComponentClass;
-import org.apache.tapestry.annotations.Retain;
-
-/**
- * Used to test retained vs. discard properties.
- *
- *
- */
-@ComponentClass
-public class BasicComponent
-{
- private String _value;
-
- @Retain
- private String _retainedValue;
-
- public final String getRetainedValue()
- {
- return _retainedValue;
- }
-
- public final void setRetainedValue(String retainedValue)
- {
- _retainedValue = retainedValue;
- }
-
- public final String getValue()
- {
- return _value;
- }
-
- public final void setValue(String value)
- {
- _value = value;
- }
-}
+package org.apache.tapestry.internal.transform.pages;
+
+import org.apache.tapestry.annotations.Retain;
+
+/**
+ * Used to test retained vs. discard properties.
+ */
+public class BasicComponent
+{
+ private String _value;
+
+ @Retain
+ private String _retainedValue;
+
+ public final String getRetainedValue()
+ {
+ return _retainedValue;
+ }
+
+ public final void setRetainedValue(String retainedValue)
+ {
+ _retainedValue = retainedValue;
+ }
+
+ public final String getValue()
+ {
+ return _value;
+ }
+
+ public final void setValue(String value)
+ {
+ _value = value;
+ }
+}
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/pages/FindFieldClass.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/pages/FindFieldClass.java?view=diff&rev=506610&r1=506609&r2=506610
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/pages/FindFieldClass.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/pages/FindFieldClass.java Mon Feb 12 11:58:34 2007
@@ -1,4 +1,4 @@
-// Copyright 2006 The Apache Software Foundation
+// Copyright 2006, 2007 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -16,9 +16,6 @@
import java.util.Date;
-import org.apache.tapestry.annotations.ComponentClass;
-
-@ComponentClass
public class FindFieldClass
{
private boolean _booleanValue;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/pages/ParentClass.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/pages/ParentClass.java?view=diff&rev=506610&r1=506609&r2=506610
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/pages/ParentClass.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/pages/ParentClass.java Mon Feb 12 11:58:34 2007
@@ -1,4 +1,4 @@
-// Copyright 2006 The Apache Software Foundation
+// Copyright 2006, 2007 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -12,69 +12,67 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.transform.pages;
-
-import org.apache.tapestry.annotations.ComponentClass;
-import org.apache.tapestry.annotations.Retain;
+package org.apache.tapestry.internal.transform.pages;
+
+import org.apache.tapestry.annotations.Meta;
+import org.apache.tapestry.annotations.Retain;
import org.apache.tapestry.internal.transform.InheritedAnnotation;
-
-/**
- * Test class used with
- * {@link org.apache.tapestry.internal.services.InternalClassTransformationImplTest}
- *
- *
- */
-@ComponentClass
-@InheritedAnnotation
-public class ParentClass
-{
- private int _parentField;
-
- // Named so that we can force a name conflict
-
- private String _$conflictField;
-
- @Retain
- private boolean _annotatedField;
-
- public void doNothingParentMethod()
- {
-
- }
-
- public void _$conflictMethod()
- {
-
- }
-
- public String get$conflictField()
- {
- return _$conflictField;
- }
-
- public void set$conflictField(String field)
- {
- _$conflictField = field;
- }
-
- public boolean isAnnotatedField()
- {
- return _annotatedField;
- }
-
- public void setAnnotatedField(boolean annotatedField)
- {
- _annotatedField = annotatedField;
- }
-
- public int getParentField()
- {
- return _parentField;
- }
-
- public void setParentField(int parentField)
- {
- _parentField = parentField;
- }
-
-}
+
+/**
+ * Test class used with
+ * {@link org.apache.tapestry.internal.services.InternalClassTransformationImplTest}
+ */
+@Meta("foo=bar")
+@InheritedAnnotation
+public class ParentClass
+{
+ private int _parentField;
+
+ // Named so that we can force a name conflict
+
+ private String _$conflictField;
+
+ @Retain
+ private boolean _annotatedField;
+
+ public void doNothingParentMethod()
+ {
+
+ }
+
+ public void _$conflictMethod()
+ {
+
+ }
+
+ public String get$conflictField()
+ {
+ return _$conflictField;
+ }
+
+ public void set$conflictField(String field)
+ {
+ _$conflictField = field;
+ }
+
+ public boolean isAnnotatedField()
+ {
+ return _annotatedField;
+ }
+
+ public void setAnnotatedField(boolean annotatedField)
+ {
+ _annotatedField = annotatedField;
+ }
+
+ public int getParentField()
+ {
+ return _parentField;
+ }
+
+ public void setParentField(int parentField)
+ {
+ _parentField = parentField;
+ }
+
+}