Modified: tapestry/tapestry5/trunk/tapestry-tutorial1/src/site/apt/forms2.apt URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-tutorial1/src/site/apt/forms2.apt?rev=657127&r1=657126&r2=657127&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-tutorial1/src/site/apt/forms2.apt (original) +++ tapestry/tapestry5/trunk/tapestry-tutorial1/src/site/apt/forms2.apt Fri May 16 09:27:11 2008 @@ -350,10 +350,10 @@ ---- package org.apache.tapestry.tutorial.pages.address; -import org.apache.tapestry.annotations.InjectPage; -import org.apache.tapestry.annotations.Property; +import org.apache.tapestry.annotation.InjectPage; +import org.apache.tapestry.annotation.Property; import org.apache.tapestry.hibernate.annotations.CommitAfter; -import org.apache.tapestry.ioc.annotations.Inject; +import org.apache.tapestry.ioc.annotation.Inject; import org.apache.tapestry.tutorial.entities.Address; import org.apache.tapestry.tutorial.pages.Index; import org.hibernate.Session;
Modified: tapestry/tapestry5/trunk/tapestry-tutorial1/src/site/apt/hilo.apt URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-tutorial1/src/site/apt/hilo.apt?rev=657127&r1=657126&r2=657127&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-tutorial1/src/site/apt/hilo.apt (original) +++ tapestry/tapestry5/trunk/tapestry-tutorial1/src/site/apt/hilo.apt Fri May 16 09:27:11 2008 @@ -108,7 +108,7 @@ import java.util.Random; -import org.apache.tapestry.annotations.InjectPage; +import org.apache.tapestry.annotation.InjectPage; public class Start { @@ -464,8 +464,8 @@ --- package org.apache.tapestry.tutorial.pages; -import org.apache.tapestry.annotations.Persist; -import org.apache.tapestry.annotations.Property; +import org.apache.tapestry.annotation.Persist; +import org.apache.tapestry.annotation.Property; public class GameOver { Modified: tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/components/Upload.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/components/Upload.java?rev=657127&r1=657126&r2=657127&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/components/Upload.java (original) +++ tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/components/Upload.java Fri May 16 09:27:11 2008 @@ -15,12 +15,12 @@ package org.apache.tapestry.upload.components; import org.apache.tapestry.*; -import org.apache.tapestry.annotations.Environmental; -import org.apache.tapestry.annotations.Mixin; -import org.apache.tapestry.annotations.Parameter; +import org.apache.tapestry.annotation.Environmental; +import org.apache.tapestry.annotation.Mixin; +import org.apache.tapestry.annotation.Parameter; import org.apache.tapestry.corelib.base.AbstractField; import org.apache.tapestry.corelib.mixins.RenderDisabled; -import org.apache.tapestry.ioc.annotations.Inject; +import org.apache.tapestry.ioc.annotation.Inject; import org.apache.tapestry.services.FieldValidatorDefaultSource; import org.apache.tapestry.services.FormSupport; import org.apache.tapestry.upload.services.MultipartDecoder; Modified: tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/MultipartDecoderImpl.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/MultipartDecoderImpl.java?rev=657127&r1=657126&r2=657127&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/MultipartDecoderImpl.java (original) +++ tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/MultipartDecoderImpl.java Fri May 16 09:27:11 2008 @@ -19,8 +19,8 @@ import org.apache.commons.fileupload.FileUploadException; import org.apache.commons.fileupload.disk.DiskFileItemFactory; import org.apache.commons.fileupload.servlet.ServletFileUpload; -import org.apache.tapestry.ioc.annotations.Inject; -import org.apache.tapestry.ioc.annotations.Symbol; +import org.apache.tapestry.ioc.annotation.Inject; +import org.apache.tapestry.ioc.annotation.Symbol; import org.apache.tapestry.ioc.internal.util.CollectionFactory; import org.apache.tapestry.ioc.services.ThreadCleanupListener; import org.apache.tapestry.upload.services.MultipartDecoder; Modified: tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/UploadModule.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/UploadModule.java?rev=657127&r1=657126&r2=657127&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/UploadModule.java (original) +++ tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/UploadModule.java Fri May 16 09:27:11 2008 @@ -17,7 +17,7 @@ import org.apache.commons.fileupload.disk.DiskFileItemFactory; import org.apache.commons.io.FileCleaner; import org.apache.tapestry.ioc.*; -import org.apache.tapestry.ioc.annotations.Scope; +import org.apache.tapestry.ioc.annotation.Scope; import org.apache.tapestry.ioc.services.PerthreadManager; import org.apache.tapestry.ioc.services.RegistryShutdownHub; import org.apache.tapestry.ioc.services.RegistryShutdownListener; Modified: tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/example/upload/pages/Start.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/example/upload/pages/Start.java?rev=657127&r1=657126&r2=657127&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/example/upload/pages/Start.java (original) +++ tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/example/upload/pages/Start.java Fri May 16 09:27:11 2008 @@ -14,7 +14,7 @@ package org.example.upload.pages; -import org.apache.tapestry.annotations.Persist; +import org.apache.tapestry.annotation.Persist; import org.apache.tapestry.upload.services.UploadedFile; import java.io.File; Modified: tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/example/upload/services/AppModule.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/example/upload/services/AppModule.java?rev=657127&r1=657126&r2=657127&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/example/upload/services/AppModule.java (original) +++ tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/example/upload/services/AppModule.java Fri May 16 09:27:11 2008 @@ -1,26 +1,25 @@ -// Copyright 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. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - +// Copyright 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. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + package org.example.upload.services; -import org.apache.tapestry.ioc.annotations.SubModule; +import org.apache.tapestry.ioc.annotation.SubModule; import org.apache.tapestry.upload.services.UploadModule; /** - * The SubModule is not normally needed, except that during tests of tapestry-upload, the necessary - * JAR Manifest does not yet exist, so we force the tapestry.upload module into the registry - * explicitly. + * The SubModule is not normally needed, except that during tests of tapestry-upload, the necessary JAR Manifest does + * not yet exist, so we force the tapestry.upload module into the registry explicitly. */ @SubModule(UploadModule.class) public class AppModule
