You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2008/05/16 18:08:12 UTC
svn commit: r657120 [2/2] - in
/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration:
app1/base/ app1/components/ app1/mixins/ app1/pages/ app1/pages/nested/
app1/services/ app2/mixins/ app2/pages/ app3/pages/ app4/pages/
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/NumberBeanEditorDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/NumberBeanEditorDemo.java?rev=657120&r1=657119&r2=657120&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/NumberBeanEditorDemo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/NumberBeanEditorDemo.java Fri May 16 09:08:09 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.integration.app1.pages;
-import org.apache.tapestry.annotations.InjectPage;
+import org.apache.tapestry.annotation.InjectPage;
import org.apache.tapestry.integration.app1.data.IntegerHolder;
public class NumberBeanEditorDemo
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/NumberSelect.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/NumberSelect.java?rev=657120&r1=657119&r2=657120&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/NumberSelect.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/NumberSelect.java Fri May 16 09:08:09 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.integration.app1.pages;
-import org.apache.tapestry.annotations.InjectPage;
+import org.apache.tapestry.annotation.InjectPage;
public class NumberSelect
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/OverrideValidationDecorator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/OverrideValidationDecorator.java?rev=657120&r1=657119&r2=657120&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/OverrideValidationDecorator.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/OverrideValidationDecorator.java Fri May 16 09:08:09 2008
@@ -18,7 +18,7 @@
import org.apache.tapestry.MarkupWriter;
import org.apache.tapestry.ValidationDecorator;
import org.apache.tapestry.integration.app1.ChattyValidationDecorator;
-import org.apache.tapestry.ioc.annotations.Inject;
+import org.apache.tapestry.ioc.annotation.Inject;
import org.apache.tapestry.services.Environment;
public class OverrideValidationDecorator
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/PageLinkContext.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/PageLinkContext.java?rev=657120&r1=657119&r2=657120&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/PageLinkContext.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/PageLinkContext.java Fri May 16 09:08:09 2008
@@ -15,7 +15,7 @@
package org.apache.tapestry.integration.app1.pages;
import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.ioc.annotations.Inject;
+import org.apache.tapestry.ioc.annotation.Inject;
public class PageLinkContext
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/PageLoadedDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/PageLoadedDemo.java?rev=657120&r1=657119&r2=657120&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/PageLoadedDemo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/PageLoadedDemo.java Fri May 16 09:08:09 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.integration.app1.pages;
-import org.apache.tapestry.annotations.Retain;
+import org.apache.tapestry.annotation.Retain;
public class PageLoadedDemo
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/PaletteDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/PaletteDemo.java?rev=657120&r1=657119&r2=657120&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/PaletteDemo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/PaletteDemo.java Fri May 16 09:08:09 2008
@@ -17,9 +17,9 @@
import org.apache.tapestry.ComponentResources;
import org.apache.tapestry.SelectModel;
import org.apache.tapestry.ValueEncoder;
-import org.apache.tapestry.annotations.Persist;
+import org.apache.tapestry.annotation.Persist;
import org.apache.tapestry.integration.app1.data.ProgrammingLanguage;
-import org.apache.tapestry.ioc.annotations.Inject;
+import org.apache.tapestry.ioc.annotation.Inject;
import org.apache.tapestry.util.EnumSelectModel;
import org.apache.tapestry.util.EnumValueEncoder;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ParameterConflict.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ParameterConflict.java?rev=657120&r1=657119&r2=657120&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ParameterConflict.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ParameterConflict.java Fri May 16 09:08:09 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.integration.app1.pages;
-import org.apache.tapestry.annotations.Component;
+import org.apache.tapestry.annotation.Component;
import org.apache.tapestry.integration.app1.components.Echo;
public class ParameterConflict
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/PasswordFieldDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/PasswordFieldDemo.java?rev=657120&r1=657119&r2=657120&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/PasswordFieldDemo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/PasswordFieldDemo.java Fri May 16 09:08:09 2008
@@ -14,12 +14,12 @@
package org.apache.tapestry.integration.app1.pages;
-import org.apache.tapestry.annotations.Component;
-import org.apache.tapestry.annotations.Retain;
+import org.apache.tapestry.annotation.Component;
+import org.apache.tapestry.annotation.Retain;
import org.apache.tapestry.corelib.components.Form;
import org.apache.tapestry.corelib.components.PasswordField;
import org.apache.tapestry.integration.app1.services.UserAuthenticator;
-import org.apache.tapestry.ioc.annotations.Inject;
+import org.apache.tapestry.ioc.annotation.Inject;
public class PasswordFieldDemo
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/PersistentDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/PersistentDemo.java?rev=657120&r1=657119&r2=657120&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/PersistentDemo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/PersistentDemo.java Fri May 16 09:08:09 2008
@@ -15,8 +15,8 @@
package org.apache.tapestry.integration.app1.pages;
import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.annotations.Persist;
-import org.apache.tapestry.ioc.annotations.Inject;
+import org.apache.tapestry.annotation.Persist;
+import org.apache.tapestry.ioc.annotation.Inject;
public class PersistentDemo
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/Protected.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/Protected.java?rev=657120&r1=657119&r2=657120&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/Protected.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/Protected.java Fri May 16 09:08:09 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.integration.app1.pages;
-import org.apache.tapestry.annotations.InjectPage;
+import org.apache.tapestry.annotation.InjectPage;
public class Protected
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/RadioDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/RadioDemo.java?rev=657120&r1=657119&r2=657120&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/RadioDemo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/RadioDemo.java Fri May 16 09:08:09 2008
@@ -14,11 +14,11 @@
package org.apache.tapestry.integration.app1.pages;
-import org.apache.tapestry.annotations.Persist;
+import org.apache.tapestry.annotation.Persist;
import org.apache.tapestry.integration.app1.data.Department;
import org.apache.tapestry.internal.TapestryInternalUtils;
import org.apache.tapestry.ioc.Messages;
-import org.apache.tapestry.ioc.annotations.Inject;
+import org.apache.tapestry.ioc.annotation.Inject;
public class RadioDemo
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/RegexpDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/RegexpDemo.java?rev=657120&r1=657119&r2=657120&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/RegexpDemo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/RegexpDemo.java Fri May 16 09:08:09 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.integration.app1.pages;
-import org.apache.tapestry.annotations.Persist;
+import org.apache.tapestry.annotation.Persist;
import org.apache.tapestry.beaneditor.Validate;
public class RegexpDemo
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/RenderComponentDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/RenderComponentDemo.java?rev=657120&r1=657119&r2=657120&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/RenderComponentDemo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/RenderComponentDemo.java Fri May 16 09:08:09 2008
@@ -15,8 +15,8 @@
package org.apache.tapestry.integration.app1.pages;
import org.apache.tapestry.Block;
-import org.apache.tapestry.annotations.Persist;
-import org.apache.tapestry.ioc.annotations.Inject;
+import org.apache.tapestry.annotation.Persist;
+import org.apache.tapestry.ioc.annotation.Inject;
public class RenderComponentDemo
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ReturnTypes.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ReturnTypes.java?rev=657120&r1=657119&r2=657120&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ReturnTypes.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ReturnTypes.java Fri May 16 09:08:09 2008
@@ -15,8 +15,8 @@
package org.apache.tapestry.integration.app1.pages;
import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.annotations.InjectPage;
-import org.apache.tapestry.ioc.annotations.Inject;
+import org.apache.tapestry.annotation.InjectPage;
+import org.apache.tapestry.ioc.annotation.Inject;
import org.apache.tapestry.services.ComponentEventResultProcessor;
import org.apache.tapestry.util.TextStreamResponse;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/SecurePage.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/SecurePage.java?rev=657120&r1=657119&r2=657120&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/SecurePage.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/SecurePage.java Fri May 16 09:08:09 2008
@@ -15,10 +15,10 @@
package org.apache.tapestry.integration.app1.pages;
import org.apache.tapestry.Asset;
-import org.apache.tapestry.annotations.Path;
-import org.apache.tapestry.annotations.Persist;
-import org.apache.tapestry.annotations.Secure;
-import org.apache.tapestry.ioc.annotations.Inject;
+import org.apache.tapestry.annotation.Path;
+import org.apache.tapestry.annotation.Persist;
+import org.apache.tapestry.annotation.Secure;
+import org.apache.tapestry.ioc.annotation.Inject;
import org.apache.tapestry.services.Request;
@Secure
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/SecurityAlert.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/SecurityAlert.java?rev=657120&r1=657119&r2=657120&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/SecurityAlert.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/SecurityAlert.java Fri May 16 09:08:09 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.integration.app1.pages;
-import org.apache.tapestry.annotations.Persist;
+import org.apache.tapestry.annotation.Persist;
public class SecurityAlert
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ShowBirthdayReminder.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ShowBirthdayReminder.java?rev=657120&r1=657119&r2=657120&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ShowBirthdayReminder.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ShowBirthdayReminder.java Fri May 16 09:08:09 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.integration.app1.pages;
-import org.apache.tapestry.annotations.ApplicationState;
+import org.apache.tapestry.annotation.ApplicationState;
import org.apache.tapestry.integration.app1.data.BirthdayReminder;
public class ShowBirthdayReminder
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ShowSelection.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ShowSelection.java?rev=657120&r1=657119&r2=657120&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ShowSelection.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ShowSelection.java Fri May 16 09:08:09 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.integration.app1.pages;
-import org.apache.tapestry.annotations.OnEvent;
+import org.apache.tapestry.annotation.OnEvent;
public class ShowSelection
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/SimpleForm.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/SimpleForm.java?rev=657120&r1=657119&r2=657120&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/SimpleForm.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/SimpleForm.java Fri May 16 09:08:09 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.integration.app1.pages;
-import org.apache.tapestry.annotations.Persist;
+import org.apache.tapestry.annotation.Persist;
import org.apache.tapestry.integration.app1.data.IncidentData;
public class SimpleForm
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/SimpleTrackGridDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/SimpleTrackGridDemo.java?rev=657120&r1=657119&r2=657120&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/SimpleTrackGridDemo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/SimpleTrackGridDemo.java Fri May 16 09:08:09 2008
@@ -19,7 +19,7 @@
import org.apache.tapestry.integration.app1.data.SimpleTrack;
import org.apache.tapestry.integration.app1.data.Track;
import org.apache.tapestry.integration.app1.services.MusicLibrary;
-import org.apache.tapestry.ioc.annotations.Inject;
+import org.apache.tapestry.ioc.annotation.Inject;
import org.apache.tapestry.services.BeanModelSource;
import java.util.List;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/Start.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/Start.java?rev=657120&r1=657119&r2=657120&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/Start.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/Start.java Fri May 16 09:08:09 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.integration.app1.pages;
-import org.apache.tapestry.annotations.InjectPage;
+import org.apache.tapestry.annotation.InjectPage;
import org.apache.tapestry.ioc.internal.util.CollectionFactory;
import java.util.Arrays;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/Target.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/Target.java?rev=657120&r1=657119&r2=657120&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/Target.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/Target.java Fri May 16 09:08:09 2008
@@ -14,8 +14,8 @@
package org.apache.tapestry.integration.app1.pages;
-import org.apache.tapestry.annotations.OnEvent;
-import org.apache.tapestry.annotations.Persist;
+import org.apache.tapestry.annotation.OnEvent;
+import org.apache.tapestry.annotation.Persist;
public class Target
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/TextFieldWrapperTypeDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/TextFieldWrapperTypeDemo.java?rev=657120&r1=657119&r2=657120&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/TextFieldWrapperTypeDemo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/TextFieldWrapperTypeDemo.java Fri May 16 09:08:09 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.integration.app1.pages;
-import org.apache.tapestry.annotations.Persist;
+import org.apache.tapestry.annotation.Persist;
public class TextFieldWrapperTypeDemo
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ToDoList.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ToDoList.java?rev=657120&r1=657119&r2=657120&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ToDoList.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ToDoList.java Fri May 16 09:08:09 2008
@@ -15,11 +15,11 @@
package org.apache.tapestry.integration.app1.pages;
import org.apache.tapestry.PrimaryKeyEncoder;
-import org.apache.tapestry.annotations.Component;
+import org.apache.tapestry.annotation.Component;
import org.apache.tapestry.corelib.components.Form;
import org.apache.tapestry.integration.app1.data.ToDoItem;
import org.apache.tapestry.integration.app1.services.ToDoDatabase;
-import org.apache.tapestry.ioc.annotations.Inject;
+import org.apache.tapestry.ioc.annotation.Inject;
import org.apache.tapestry.util.DefaultPrimaryKeyEncoder;
import java.util.List;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ToDoListVolatile.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ToDoListVolatile.java?rev=657120&r1=657119&r2=657120&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ToDoListVolatile.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ToDoListVolatile.java Fri May 16 09:08:09 2008
@@ -14,11 +14,11 @@
package org.apache.tapestry.integration.app1.pages;
-import org.apache.tapestry.annotations.Component;
+import org.apache.tapestry.annotation.Component;
import org.apache.tapestry.corelib.components.Form;
import org.apache.tapestry.integration.app1.data.ToDoItem;
import org.apache.tapestry.integration.app1.services.ToDoDatabase;
-import org.apache.tapestry.ioc.annotations.Inject;
+import org.apache.tapestry.ioc.annotation.Inject;
import java.util.List;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ValidForm.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ValidForm.java?rev=657120&r1=657119&r2=657120&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ValidForm.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ValidForm.java Fri May 16 09:08:09 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.integration.app1.pages;
-import org.apache.tapestry.annotations.Persist;
+import org.apache.tapestry.annotation.Persist;
import org.apache.tapestry.integration.app1.data.IncidentData;
public class ValidForm
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ViewRegistration.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ViewRegistration.java?rev=657120&r1=657119&r2=657120&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ViewRegistration.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ViewRegistration.java Fri May 16 09:08:09 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.integration.app1.pages;
-import org.apache.tapestry.annotations.ApplicationState;
+import org.apache.tapestry.annotation.ApplicationState;
import org.apache.tapestry.integration.app1.data.RegistrationData;
public class ViewRegistration
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/XMLContent.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/XMLContent.java?rev=657120&r1=657119&r2=657120&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/XMLContent.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/XMLContent.java Fri May 16 09:08:09 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.integration.app1.pages;
-import org.apache.tapestry.annotations.Meta;
+import org.apache.tapestry.annotation.Meta;
@Meta("tapestry.response-content-type=text/xml")
public class XMLContent
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ZoneDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ZoneDemo.java?rev=657120&r1=657119&r2=657120&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ZoneDemo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ZoneDemo.java Fri May 16 09:08:09 2008
@@ -15,13 +15,13 @@
package org.apache.tapestry.integration.app1.pages;
import org.apache.tapestry.Block;
-import org.apache.tapestry.annotations.ApplicationState;
-import org.apache.tapestry.annotations.Component;
-import org.apache.tapestry.annotations.Log;
+import org.apache.tapestry.annotation.ApplicationState;
+import org.apache.tapestry.annotation.Component;
+import org.apache.tapestry.annotation.Log;
import org.apache.tapestry.corelib.components.BeanEditForm;
import org.apache.tapestry.integration.app1.data.RegistrationData;
-import org.apache.tapestry.ioc.annotations.Inject;
-import org.apache.tapestry.json.JSONObject;
+import org.apache.tapestry.ioc.annotation.Inject;
+import org.apache.tapestry5.json.JSONObject;
public class ZoneDemo
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/nested/ActionDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/nested/ActionDemo.java?rev=657120&r1=657119&r2=657120&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/nested/ActionDemo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/nested/ActionDemo.java Fri May 16 09:08:09 2008
@@ -14,15 +14,15 @@
package org.apache.tapestry.integration.app1.pages.nested;
-import org.apache.tapestry.annotations.OnEvent;
-import org.apache.tapestry.annotations.Property;
+import org.apache.tapestry.annotation.OnEvent;
+import org.apache.tapestry.annotation.Property;
public class ActionDemo
{
@Property
private Long number;
- @OnEvent(component="actionlink", value="action")
+ @OnEvent(component = "actionlink", value = "action")
public void onAction(Long number)
{
this.number = number;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/nested/AssetDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/nested/AssetDemo.java?rev=657120&r1=657119&r2=657120&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/nested/AssetDemo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/nested/AssetDemo.java Fri May 16 09:08:09 2008
@@ -15,8 +15,8 @@
package org.apache.tapestry.integration.app1.pages.nested;
import org.apache.tapestry.Asset;
-import org.apache.tapestry.annotations.Path;
-import org.apache.tapestry.ioc.annotations.Inject;
+import org.apache.tapestry.annotation.Path;
+import org.apache.tapestry.ioc.annotation.Inject;
public class AssetDemo
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/services/AppModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/services/AppModule.java?rev=657120&r1=657119&r2=657120&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/services/AppModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/services/AppModule.java Fri May 16 09:08:09 2008
@@ -21,7 +21,7 @@
import org.apache.tapestry.ioc.Configuration;
import org.apache.tapestry.ioc.MappedConfiguration;
import org.apache.tapestry.ioc.OrderedConfiguration;
-import org.apache.tapestry.ioc.annotations.Marker;
+import org.apache.tapestry.ioc.annotation.Marker;
import org.apache.tapestry.ioc.internal.util.CollectionFactory;
import org.apache.tapestry.services.*;
import org.apache.tapestry.test.JettyRunner;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app2/mixins/ForceId.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app2/mixins/ForceId.java?rev=657120&r1=657119&r2=657120&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app2/mixins/ForceId.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app2/mixins/ForceId.java Fri May 16 09:08:09 2008
@@ -15,7 +15,7 @@
package org.apache.tapestry.integration.app2.mixins;
import org.apache.tapestry.ClientElement;
-import org.apache.tapestry.annotations.InjectContainer;
+import org.apache.tapestry.annotation.InjectContainer;
public class ForceId
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app2/pages/ResultPageForActionLink.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app2/pages/ResultPageForActionLink.java?rev=657120&r1=657119&r2=657120&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app2/pages/ResultPageForActionLink.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app2/pages/ResultPageForActionLink.java Fri May 16 09:08:09 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.integration.app2.pages;
-import org.apache.tapestry.annotations.OnEvent;
+import org.apache.tapestry.annotation.OnEvent;
public class ResultPageForActionLink
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app2/pages/TestPageForASO.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app2/pages/TestPageForASO.java?rev=657120&r1=657119&r2=657120&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app2/pages/TestPageForASO.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app2/pages/TestPageForASO.java Fri May 16 09:08:09 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.integration.app2.pages;
-import org.apache.tapestry.annotations.ApplicationState;
+import org.apache.tapestry.annotation.ApplicationState;
import org.apache.tapestry.integration.app2.SimpleASO;
public class TestPageForASO
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app2/pages/TestPageForActionLink.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app2/pages/TestPageForActionLink.java?rev=657120&r1=657119&r2=657120&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app2/pages/TestPageForActionLink.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app2/pages/TestPageForActionLink.java Fri May 16 09:08:09 2008
@@ -14,8 +14,8 @@
package org.apache.tapestry.integration.app2.pages;
-import org.apache.tapestry.annotations.InjectPage;
-import org.apache.tapestry.annotations.OnEvent;
+import org.apache.tapestry.annotation.InjectPage;
+import org.apache.tapestry.annotation.OnEvent;
public class TestPageForActionLink
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app2/pages/TestPageForAsset.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app2/pages/TestPageForAsset.java?rev=657120&r1=657119&r2=657120&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app2/pages/TestPageForAsset.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app2/pages/TestPageForAsset.java Fri May 16 09:08:09 2008
@@ -15,8 +15,8 @@
package org.apache.tapestry.integration.app2.pages;
import org.apache.tapestry.Asset;
-import org.apache.tapestry.annotations.Path;
-import org.apache.tapestry.ioc.annotations.Inject;
+import org.apache.tapestry.annotation.Path;
+import org.apache.tapestry.ioc.annotation.Inject;
public class TestPageForAsset
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app2/pages/TestPageForForm.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app2/pages/TestPageForForm.java?rev=657120&r1=657119&r2=657120&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app2/pages/TestPageForForm.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app2/pages/TestPageForForm.java Fri May 16 09:08:09 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.integration.app2.pages;
-import org.apache.tapestry.annotations.Persist;
+import org.apache.tapestry.annotation.Persist;
public class TestPageForForm
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app2/pages/TestPageForLocale.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app2/pages/TestPageForLocale.java?rev=657120&r1=657119&r2=657120&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app2/pages/TestPageForLocale.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app2/pages/TestPageForLocale.java Fri May 16 09:08:09 2008
@@ -14,8 +14,8 @@
package org.apache.tapestry.integration.app2.pages;
-import org.apache.tapestry.annotations.OnEvent;
-import org.apache.tapestry.ioc.annotations.Inject;
+import org.apache.tapestry.annotation.OnEvent;
+import org.apache.tapestry.ioc.annotation.Inject;
import org.apache.tapestry.services.PersistentLocale;
import java.util.Locale;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app2/pages/TestPageForSubmit.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app2/pages/TestPageForSubmit.java?rev=657120&r1=657119&r2=657120&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app2/pages/TestPageForSubmit.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app2/pages/TestPageForSubmit.java Fri May 16 09:08:09 2008
@@ -14,8 +14,8 @@
package org.apache.tapestry.integration.app2.pages;
-import org.apache.tapestry.annotations.Component;
-import org.apache.tapestry.annotations.Persist;
+import org.apache.tapestry.annotation.Component;
+import org.apache.tapestry.annotation.Persist;
import org.apache.tapestry.corelib.components.Form;
import org.apache.tapestry.corelib.components.Submit;
import org.apache.tapestry.corelib.components.TextField;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app2/pages/TestPrefixMethod.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app2/pages/TestPrefixMethod.java?rev=657120&r1=657119&r2=657120&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app2/pages/TestPrefixMethod.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app2/pages/TestPrefixMethod.java Fri May 16 09:08:09 2008
@@ -15,10 +15,10 @@
package org.apache.tapestry.integration.app2.pages;
import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.annotations.InjectPage;
+import org.apache.tapestry.annotation.InjectPage;
import org.apache.tapestry.integration.app2.FortyTwo;
import org.apache.tapestry.integration.app2.PlusOne;
-import org.apache.tapestry.ioc.annotations.Inject;
+import org.apache.tapestry.ioc.annotation.Inject;
import org.apache.tapestry.services.BeanModelSource;
public class TestPrefixMethod
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app3/pages/Index.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app3/pages/Index.java?rev=657120&r1=657119&r2=657120&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app3/pages/Index.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app3/pages/Index.java Fri May 16 09:08:09 2008
@@ -14,9 +14,9 @@
package org.apache.tapestry.integration.app3.pages;
-import org.apache.tapestry.annotations.InjectPage;
-import org.apache.tapestry.annotations.Persist;
-import org.apache.tapestry.annotations.Property;
+import org.apache.tapestry.annotation.InjectPage;
+import org.apache.tapestry.annotation.Persist;
+import org.apache.tapestry.annotation.Property;
public class Index
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app3/pages/PropertyDisplayBlockOverrides.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app3/pages/PropertyDisplayBlockOverrides.java?rev=657120&r1=657119&r2=657120&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app3/pages/PropertyDisplayBlockOverrides.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app3/pages/PropertyDisplayBlockOverrides.java Fri May 16 09:08:09 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.integration.app3.pages;
-import org.apache.tapestry.annotations.Environmental;
+import org.apache.tapestry.annotation.Environmental;
import org.apache.tapestry.services.PropertyOutputContext;
public class PropertyDisplayBlockOverrides
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app4/pages/Start.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app4/pages/Start.java?rev=657120&r1=657119&r2=657120&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app4/pages/Start.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app4/pages/Start.java Fri May 16 09:08:09 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.integration.app4.pages;
-import org.apache.tapestry.annotations.InjectPage;
+import org.apache.tapestry.annotation.InjectPage;
public class Start
{