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:27:12 UTC
svn commit: r657127 [1/2] - in /tapestry/tapestry5/trunk: src/site/apt/
src/site/xdoc/ tapestry-annotations/ tapestry-annotations/src/site/apt/
tapestry-hibernate/
tapestry-hibernate/src/main/java/org/apache/tapestry/hibernate/
tapestry-hibernate/src/t...
Author: hlship
Date: Fri May 16 09:27:11 2008
New Revision: 657127
URL: http://svn.apache.org/viewvc?rev=657127&view=rev
Log:
TAPESTR-2421: Allow Tapestry4/Tapestry5 to be deployed in the same WAR
Modified:
tapestry/tapestry5/trunk/src/site/apt/index.apt
tapestry/tapestry5/trunk/src/site/xdoc/release-notes.xml
tapestry/tapestry5/trunk/tapestry-annotations/pom.xml
tapestry/tapestry5/trunk/tapestry-annotations/src/site/apt/index.apt
tapestry/tapestry5/trunk/tapestry-hibernate/pom.xml
tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry/hibernate/HibernateModule.java
tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/CachedForm.java
tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/EncodeEntities.java
tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/PersistEntity.java
tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/Start.java
tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/services/AppModule.java
tapestry/tapestry5/trunk/tapestry-ioc/pom.xml
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/IOCUtilities.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/Registry.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/RegistryBuilder.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/ServiceBinder.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/ServiceBindingOptions.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/def/ServiceDef.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/DefaultModuleDefImpl.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/Module.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/ServiceBinderImpl.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/ExceptionTrackerImpl.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/SymbolObjectProvider.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/ThreadLocaleImpl.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/ValueObjectProvider.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/util/InternalUtils.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/SymbolSource.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/TapestryIOCModule.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/test/IOCTestCase.java
tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/service.apt
tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/upgrade.apt
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/BarneyModule.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/EagerLoadModule.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/FredModule.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/GreeterModule.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/HelterModule.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/IntegrationTest.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/MarkerModule.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/MasterModule.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/PerThreadModule.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/RecursiveConstructorModule.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/RedGreeterImpl.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/SkelterModule.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/UnknownScopeModule.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ContributionDefImplTest.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/DefaultModuleDefImplTest.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/EagerLoadViaAnnotationServiceImpl.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ExtraPublicConstructorsModule.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ModuleImplTestModule.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/MultipleConstructorsAutobuildService.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/NoUsableContributionParameterModule.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ServiceBuilderMethodFixture.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/SimpleModule.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/AnnotatedBean.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/PropertyAccessImplTest.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/SymbolObjectProviderTest.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/ValueObjectProviderTest.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/InjectoBean.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/InternalUtilsTest.java
tapestry/tapestry5/trunk/tapestry-spring/src/test/java/org/example/testapp/pages/Start.java
tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/pages/GameOver.java
tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/pages/Guess.java
tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/pages/Index.java
tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/pages/address/CreateAddress.java
tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/services/AppModule.java
tapestry/tapestry5/trunk/tapestry-tutorial1/src/site/apt/forms2.apt
tapestry/tapestry5/trunk/tapestry-tutorial1/src/site/apt/hilo.apt
tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/components/Upload.java
tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/MultipartDecoderImpl.java
tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/UploadModule.java
tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/example/upload/pages/Start.java
tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/example/upload/services/AppModule.java
Modified: tapestry/tapestry5/trunk/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/src/site/apt/index.apt?rev=657127&r1=657126&r2=657127&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/src/site/apt/index.apt (original)
+++ tapestry/tapestry5/trunk/src/site/apt/index.apt Fri May 16 09:27:11 2008
@@ -129,6 +129,12 @@
New and Noteworthy
+ * In order to support Tapestry 4 applications co-existing with Tapestry 5 applications within the same WAR,
+ a small number of Tapestry 5 classes and packages have been renamed or refactored. For more information,
+ see the upgrade notes for
+ {{{tapestry-ioc/upgrade.html}tapestry-ioc}} and
+ {{{tapestry-core/upgrade.html}tapestry-core}}.
+
* A {{{faq/general.html}FAQ (Frequently Asked Questions) page}} has been added.
* An {{{tapestry-ioc/overview.html}overview}} and {{{tapestry-ioc/cookbook/}cookbook}} for Tapestry IoC has been written.
Modified: tapestry/tapestry5/trunk/src/site/xdoc/release-notes.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/src/site/xdoc/release-notes.xml?rev=657127&r1=657126&r2=657127&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/src/site/xdoc/release-notes.xml (original)
+++ tapestry/tapestry5/trunk/src/site/xdoc/release-notes.xml Fri May 16 09:27:11 2008
@@ -1100,7 +1100,7 @@
</li>
<li>
[<a href="https://issues.apache.org/jira/browse/TAPESTRY-1443">TAPESTRY-1443</a>] -
- org.apache.tapestry.annotations.Service annotation is
+ org.apache.tapestry.annotation.Service annotation is
ignored
</li>
<li>
Modified: tapestry/tapestry5/trunk/tapestry-annotations/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-annotations/pom.xml?rev=657127&r1=657126&r2=657127&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-annotations/pom.xml (original)
+++ tapestry/tapestry5/trunk/tapestry-annotations/pom.xml Fri May 16 09:27:11 2008
@@ -2,7 +2,8 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.tapestry</groupId>
- <artifactId>tapestry-annotations</artifactId>
+ <!-- We've been lucky on T4/T5 name mismatches elsewhere, but T4 has a tapestry-annotation artifact. -->
+ <artifactId>tapestry5-annotations</artifactId>
<packaging>jar</packaging>
<!-- This should change to tapestry-project -->
<parent>
Modified: tapestry/tapestry5/trunk/tapestry-annotations/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-annotations/src/site/apt/index.apt?rev=657127&r1=657126&r2=657127&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-annotations/src/site/apt/index.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-annotations/src/site/apt/index.apt Fri May 16 09:27:11 2008
@@ -13,4 +13,11 @@
By separating out those annotations from the rest of Tapestry, it is reasonable to includes such annotations inside your
data tier classes <without> having to bring all of Tapestry into your classpath. This is very useful in multi-tier applications
- where data objects may originate in an application tier (such as a JEE application server) and travel to the presentation tier (a Tapestry application).
\ No newline at end of file
+ where data objects may originate in an application tier (such as a JEE application server) and travel to the presentation tier (a Tapestry application).
+
+Upgrade Nodes
+
+* Release 5.0.12
+
+ The artifact id for this module has changed to tapestry<<5>>-annotations. This is necessary to
+ support Tapestry 4 and Tapestry 5 applications co-existing within a single WAR.
Modified: tapestry/tapestry5/trunk/tapestry-hibernate/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-hibernate/pom.xml?rev=657127&r1=657126&r2=657127&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-hibernate/pom.xml (original)
+++ tapestry/tapestry5/trunk/tapestry-hibernate/pom.xml Fri May 16 09:27:11 2008
@@ -1,4 +1,5 @@
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.tapestry</groupId>
<artifactId>tapestry-hibernate</artifactId>
@@ -78,7 +79,7 @@
<scope>test</scope>
</dependency>
- <!-- The annotations should be compatible with the 3.2.2.ga release of the
+ <!-- The annotation should be compatible with the 3.2.2.ga release of the
core package. -->
<dependency>
<groupId>org.hibernate</groupId>
Modified: tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry/hibernate/HibernateModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry/hibernate/HibernateModule.java?rev=657127&r1=657126&r2=657127&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry/hibernate/HibernateModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry/hibernate/HibernateModule.java Fri May 16 09:27:11 2008
@@ -19,10 +19,10 @@
import org.apache.tapestry.internal.hibernate.*;
import org.apache.tapestry.ioc.*;
import static org.apache.tapestry.ioc.IOCConstants.PERTHREAD_SCOPE;
-import org.apache.tapestry.ioc.annotations.Inject;
-import org.apache.tapestry.ioc.annotations.InjectService;
-import org.apache.tapestry.ioc.annotations.Scope;
-import org.apache.tapestry.ioc.annotations.Symbol;
+import org.apache.tapestry.ioc.annotation.Inject;
+import org.apache.tapestry.ioc.annotation.InjectService;
+import org.apache.tapestry.ioc.annotation.Scope;
+import org.apache.tapestry.ioc.annotation.Symbol;
import org.apache.tapestry.ioc.services.*;
import org.apache.tapestry.services.AliasContribution;
import org.apache.tapestry.services.ComponentClassTransformWorker;
Modified: tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/CachedForm.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/CachedForm.java?rev=657127&r1=657126&r2=657127&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/CachedForm.java (original)
+++ tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/CachedForm.java Fri May 16 09:27:11 2008
@@ -14,10 +14,10 @@
package org.example.app0.pages;
-import org.apache.tapestry.annotations.Cached;
-import org.apache.tapestry.annotations.Property;
+import org.apache.tapestry.annotation.Cached;
+import org.apache.tapestry.annotation.Property;
import org.apache.tapestry.hibernate.HibernateSessionManager;
-import org.apache.tapestry.ioc.annotations.Inject;
+import org.apache.tapestry.ioc.annotation.Inject;
import org.example.app0.entities.User;
import org.hibernate.Session;
Modified: tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/EncodeEntities.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/EncodeEntities.java?rev=657127&r1=657126&r2=657127&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/EncodeEntities.java (original)
+++ tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/EncodeEntities.java Fri May 16 09:27:11 2008
@@ -14,9 +14,9 @@
package org.example.app0.pages;
-import org.apache.tapestry.annotations.Property;
+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.example.app0.entities.User;
import org.hibernate.Session;
Modified: tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/PersistEntity.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/PersistEntity.java?rev=657127&r1=657126&r2=657127&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/PersistEntity.java (original)
+++ tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/PersistEntity.java Fri May 16 09:27:11 2008
@@ -14,10 +14,10 @@
package org.example.app0.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;
import org.apache.tapestry.hibernate.HibernateSessionManager;
-import org.apache.tapestry.ioc.annotations.Inject;
+import org.apache.tapestry.ioc.annotation.Inject;
import org.example.app0.entities.User;
import org.example.app0.services.UserDAO;
import org.hibernate.Session;
Modified: tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/Start.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/Start.java?rev=657127&r1=657126&r2=657127&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/Start.java (original)
+++ tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/Start.java Fri May 16 09:27:11 2008
@@ -14,8 +14,8 @@
package org.example.app0.pages;
-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.example.app0.entities.User;
import org.example.app0.services.UserDAO;
Modified: tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/services/AppModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/services/AppModule.java?rev=657127&r1=657126&r2=657127&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/services/AppModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/services/AppModule.java Fri May 16 09:27:11 2008
@@ -19,8 +19,8 @@
import org.apache.tapestry.hibernate.HibernateTransactionDecorator;
import org.apache.tapestry.ioc.MappedConfiguration;
import org.apache.tapestry.ioc.ServiceBinder;
-import org.apache.tapestry.ioc.annotations.Match;
-import org.apache.tapestry.ioc.annotations.SubModule;
+import org.apache.tapestry.ioc.annotation.Match;
+import org.apache.tapestry.ioc.annotation.SubModule;
@SubModule(HibernateModule.class)
public class AppModule
Modified: tapestry/tapestry5/trunk/tapestry-ioc/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/pom.xml?rev=657127&r1=657126&r2=657127&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/pom.xml (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/pom.xml Fri May 16 09:27:11 2008
@@ -20,7 +20,7 @@
<dependencies>
<dependency>
<groupId>org.apache.tapestry</groupId>
- <artifactId>tapestry-annotations</artifactId>
+ <artifactId>tapestry5-annotations</artifactId>
<version>${project.version}</version>
</dependency>
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/IOCUtilities.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/IOCUtilities.java?rev=657127&r1=657126&r2=657127&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/IOCUtilities.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/IOCUtilities.java Fri May 16 09:27:11 2008
@@ -15,7 +15,7 @@
package org.apache.tapestry.ioc;
import static org.apache.tapestry.ioc.IOCConstants.MODULE_BUILDER_MANIFEST_ENTRY_NAME;
-import org.apache.tapestry.ioc.annotations.SubModule;
+import org.apache.tapestry.ioc.annotation.SubModule;
import java.io.Closeable;
import java.io.IOException;
@@ -25,8 +25,8 @@
import java.util.jar.Manifest;
/**
- * A collection of utility methods for a couple of different areas, including creating the initial
- * {@link org.apache.tapestry.ioc.Registry}.
+ * A collection of utility methods for a couple of different areas, including creating the initial {@link
+ * org.apache.tapestry.ioc.Registry}.
*/
public final class IOCUtilities
{
@@ -35,9 +35,8 @@
}
/**
- * Construct a default Registry, including modules identifed via the Tapestry-Module-Classes
- * Manifest entry. The registry will have been
- * {@linkplain Registry#performRegistryStartup() started up} before it is returned.
+ * Construct a default Registry, including modules identifed via the Tapestry-Module-Classes Manifest entry. The
+ * registry will have been {@linkplain Registry#performRegistryStartup() started up} before it is returned.
*
* @return constructed Registry, after startup
* @see #addDefaultModules(RegistryBuilder)
@@ -56,10 +55,9 @@
}
/**
- * Scans the classpath for JAR Manifests that contain the Tapestry-Module-Classes attribute and
- * adds each corresponding class to the RegistryBuilder. In addition, looks for a system
- * property named "tapestry.modules" and adds all of those modules as well. The tapestry.modules
- * approach is intended for development.
+ * Scans the classpath for JAR Manifests that contain the Tapestry-Module-Classes attribute and adds each
+ * corresponding class to the RegistryBuilder. In addition, looks for a system property named "tapestry.modules" and
+ * adds all of those modules as well. The tapestry.modules approach is intended for development.
*
* @param builder the builder to which modules will be added
* @see SubModule
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/Registry.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/Registry.java?rev=657127&r1=657126&r2=657127&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/Registry.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/Registry.java Fri May 16 09:27:11 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.ioc;
-import org.apache.tapestry.ioc.annotations.EagerLoad;
+import org.apache.tapestry.ioc.annotation.EagerLoad;
/**
* Public access to the IoC service registry.
@@ -22,8 +22,8 @@
public interface Registry extends ObjectLocator
{
/**
- * Invoked at the end of a request to discard any thread-specific information accumulated during
- * the current request.
+ * Invoked at the end of a request to discard any thread-specific information accumulated during the current
+ * request.
*
* @see org.apache.tapestry.ioc.services.PerthreadManager
* @see org.apache.tapestry.ioc.services.ThreadCleanupListener
@@ -31,9 +31,8 @@
void cleanupThread();
/**
- * Shuts down a Registry instance. Notifies all listeners that the registry has shutdown.
- * Further method invocations on the Registry are no longer allowed, and the Registry instance
- * should be discarded.
+ * Shuts down a Registry instance. Notifies all listeners that the registry has shutdown. Further method invocations
+ * on the Registry are no longer allowed, and the Registry instance should be discarded.
*
* @see org.apache.tapestry.ioc.services.RegistryShutdownHub
* @see org.apache.tapestry.ioc.services.RegistryShutdownListener
@@ -41,8 +40,8 @@
void shutdown();
/**
- * Invoked to eagerly load services marked with the {@link EagerLoad} annotation, and to execute
- * all contributions to the Startup service.
+ * Invoked to eagerly load services marked with the {@link EagerLoad} annotation, and to execute all contributions
+ * to the Startup service.
*/
void performRegistryStartup();
}
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/RegistryBuilder.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/RegistryBuilder.java?rev=657127&r1=657126&r2=657127&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/RegistryBuilder.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/RegistryBuilder.java Fri May 16 09:27:11 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.ioc;
-import org.apache.tapestry.ioc.annotations.SubModule;
+import org.apache.tapestry.ioc.annotation.SubModule;
import org.apache.tapestry.ioc.def.ModuleDef;
import org.apache.tapestry.ioc.internal.DefaultModuleDefImpl;
import org.apache.tapestry.ioc.internal.LoggerSourceImpl;
@@ -100,7 +100,7 @@
/**
* Adds a number of modules (as module classes) to the registry, returning the builder for further configuration.
*
- * @see org.apache.tapestry.ioc.annotations.SubModule
+ * @see org.apache.tapestry.ioc.annotation.SubModule
*/
public RegistryBuilder add(Class... moduleBuilderClasses)
{
@@ -135,7 +135,7 @@
* Adds a number of module classes (specified by fully qualified class name) to the registry, returning the builder
* for further configuration.
*
- * @see org.apache.tapestry.ioc.annotations.SubModule
+ * @see org.apache.tapestry.ioc.annotation.SubModule
*/
public RegistryBuilder add(String classname)
{
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/ServiceBinder.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/ServiceBinder.java?rev=657127&r1=657126&r2=657127&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/ServiceBinder.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/ServiceBinder.java Fri May 16 09:27:11 2008
@@ -14,23 +14,21 @@
package org.apache.tapestry.ioc;
-import org.apache.tapestry.ioc.annotations.Scope;
+import org.apache.tapestry.ioc.annotation.Scope;
import org.apache.tapestry.ioc.def.ServiceDef;
/**
- * Allows a module to bind service interfaces to service implementation classes in support of
- * autobuilding services. A ServiceBinder is passed to to a method with the following signature:
- * <code>public static void bind(ServiceBinder binder)</code>. This is an adaptation of ideas
- * from <a href="http://code.google.com/p/google-guice/">Guice</a>.
+ * Allows a module to bind service interfaces to service implementation classes in support of autobuilding services. A
+ * ServiceBinder is passed to to a method with the following signature: <code>public static void bind(ServiceBinder
+ * binder)</code>. This is an adaptation of ideas from <a href="http://code.google.com/p/google-guice/">Guice</a>.
*/
public interface ServiceBinder
{
/**
- * Defines a service in terms of an implementation class, without a service interface. In this
- * case, the service will not be proxiable (proxying requires a service interface) and
- * {@link ServiceDef#getServiceInterface()} will return the implementation class. In this
- * situation, the service will not be proxied; it will be instantiated fully on first reference
- * (ignoring its scope, if any) and will not be decorated.
+ * Defines a service in terms of an implementation class, without a service interface. In this case, the service
+ * will not be proxiable (proxying requires a service interface) and {@link ServiceDef#getServiceInterface()} will
+ * return the implementation class. In this situation, the service will not be proxied; it will be instantiated
+ * fully on first reference (ignoring its scope, if any) and will not be decorated.
*
* @param <T>
* @param implementationClass
@@ -39,9 +37,9 @@
<T> ServiceBindingOptions bind(Class<T> implementationClass);
/**
- * Binds the service interface to a service implementation class. The default service name is
- * the unqualified name of the service interface. The default service scope is "singleton",
- * unless the service implementation class includes the {@link Scope} annotation.
+ * Binds the service interface to a service implementation class. The default service name is the unqualified name
+ * of the service interface. The default service scope is "singleton", unless the service implementation class
+ * includes the {@link Scope} annotation.
*
* @param <T>
* @param serviceInterface service interface (used when locating services, and when building proxies)
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/ServiceBindingOptions.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/ServiceBindingOptions.java?rev=657127&r1=657126&r2=657127&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/ServiceBindingOptions.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/ServiceBindingOptions.java Fri May 16 09:27:11 2008
@@ -14,24 +14,24 @@
package org.apache.tapestry.ioc;
-import org.apache.tapestry.ioc.annotations.EagerLoad;
-import org.apache.tapestry.ioc.annotations.Scope;
+import org.apache.tapestry.ioc.annotation.EagerLoad;
+import org.apache.tapestry.ioc.annotation.Scope;
import org.apache.tapestry.ioc.def.ServiceDef;
import java.lang.annotation.Annotation;
/**
- * Allows additional options for a service to be specified, overriding hard coded defaults or
- * defaults from annotations on the service.
+ * Allows additional options for a service to be specified, overriding hard coded defaults or defaults from annotations
+ * on the service.
*
* @see ServiceDef
*/
public interface ServiceBindingOptions
{
/**
- * Allows a specific service id for the service to be provided, rather than the default (from
- * the service interface). This is useful when multiple services implement the same interface,
- * since service ids must be unique.
+ * Allows a specific service id for the service to be provided, rather than the default (from the service
+ * interface). This is useful when multiple services implement the same interface, since service ids must be
+ * unique.
*
* @param id
* @return this binding options, for further configuration
@@ -39,8 +39,7 @@
ServiceBindingOptions withId(String id);
/**
- * Sets the scope of the service, overriding the {@link Scope} annotation on the service
- * implementation class.
+ * Sets the scope of the service, overriding the {@link Scope} annotation on the service implementation class.
*
* @param scope
* @return this binding options, for further configuration
@@ -48,19 +47,18 @@
ServiceBindingOptions scope(String scope);
/**
- * Turns eager loading on for this service. This may also be accomplished using the
- * {@link EagerLoad} annotation on the service implementation class.
+ * Turns eager loading on for this service. This may also be accomplished using the {@link EagerLoad} annotation on
+ * the service implementation class.
*
* @return this binding options, for further configuration
*/
ServiceBindingOptions eagerLoad();
/**
- * Defines the marker interface(s) for the service, used to connect injections by type at the
- * point of injection with a particular service implementation, based on the intersection of
- * type and marker interface. The containing module will sometimes provide a set of default
- * marker annotations for all services within the module, this method allows that default to be
- * extended.
+ * Defines the marker interface(s) for the service, used to connect injections by type at the point of injection
+ * with a particular service implementation, based on the intersection of type and marker interface. The containing
+ * module will sometimes provide a set of default marker annotations for all services within the module, this method
+ * allows that default to be extended.
*
* @param <T>
* @param marker one or more markers to add
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/def/ServiceDef.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/def/ServiceDef.java?rev=657127&r1=657126&r2=657127&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/def/ServiceDef.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/def/ServiceDef.java Fri May 16 09:27:11 2008
@@ -33,45 +33,42 @@
ObjectCreator createServiceCreator(ServiceBuilderResources resources);
/**
- * Returns the service id, derived from the method name or the unqualified service interface
- * name. Service ids must be unique among <em>all</em> services in all modules. Service ids
- * are used in a heavy handed way to support ultimate disambiguation, but their primary purpose
- * is to support service contribution methods.
+ * Returns the service id, derived from the method name or the unqualified service interface name. Service ids must
+ * be unique among <em>all</em> services in all modules. Service ids are used in a heavy handed way to support
+ * ultimate disambiguation, but their primary purpose is to support service contribution methods.
*/
String getServiceId();
/**
- * Returns an optional <em>marker annotation</em>. Marker annotations are used to
- * disambiguate services; the combination of a marker annotation and a service type is expected
- * to be unique. The annotation is placed on the field or method/constructor parameter and the
- * service is located by combining the marker with service type (the parameter or field type).
+ * Returns an optional <em>marker annotation</em>. Marker annotations are used to disambiguate services; the
+ * combination of a marker annotation and a service type is expected to be unique. The annotation is placed on the
+ * field or method/constructor parameter and the service is located by combining the marker with service type (the
+ * parameter or field type).
*
* @return the annotation, or null if the service has no annotation
*/
Set<Class> getMarkers();
/**
- * Returns the service interface associated with this service. This is the interface exposed to
- * the outside world, as well as the one used to build proxies. In cases where the service is
- * <em>not</em> defined in terms of an interface, this will return the actual implementation
- * class of the service. Services without a true service interfaced are <strong>not proxied</strong>.
+ * Returns the service interface associated with this service. This is the interface exposed to the outside world,
+ * as well as the one used to build proxies. In cases where the service is <em>not</em> defined in terms of an
+ * interface, this will return the actual implementation class of the service. Services without a true service
+ * interfaced are <strong>not proxied</strong>.
*/
Class getServiceInterface();
/**
- * Returns the lifecycle defined for the service. This is indicated by adding a
- * {@link org.apache.tapestry.ioc.annotations.Scope} annotation to the service builder method
- * for the service.
+ * Returns the lifecycle defined for the service. This is indicated by adding a {@link
+ * org.apache.tapestry.ioc.annotation.Scope} annotation to the service builder method for the service.
* <p/>
- * Services that are not proxied will ignore their scope; such services are always treated as
- * singletons.
+ * Services that are not proxied will ignore their scope; such services are always treated as singletons.
*/
String getServiceScope();
/**
* Returns true if the service should be eagerly loaded at Registry startup.
*
- * @see org.apache.tapestry.ioc.annotations.EagerLoad
+ * @see org.apache.tapestry.ioc.annotation.EagerLoad
*/
boolean isEagerLoad();
}
\ No newline at end of file
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/DefaultModuleDefImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/DefaultModuleDefImpl.java?rev=657127&r1=657126&r2=657127&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/DefaultModuleDefImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/DefaultModuleDefImpl.java Fri May 16 09:27:11 2008
@@ -15,7 +15,7 @@
package org.apache.tapestry.ioc.internal;
import org.apache.tapestry.ioc.*;
-import org.apache.tapestry.ioc.annotations.*;
+import org.apache.tapestry.ioc.annotation.*;
import org.apache.tapestry.ioc.def.ContributionDef;
import org.apache.tapestry.ioc.def.DecoratorDef;
import org.apache.tapestry.ioc.def.ModuleDef;
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/Module.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/Module.java?rev=657127&r1=657126&r2=657127&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/Module.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/Module.java Fri May 16 09:27:11 2008
@@ -76,7 +76,7 @@
Set<ContributionDef> getContributorDefsForService(String serviceId);
/**
- * Locates services with the {@link org.apache.tapestry.ioc.annotations.EagerLoad} annotation and generates proxies
+ * Locates services with the {@link org.apache.tapestry.ioc.annotation.EagerLoad} annotation and generates proxies
* for them, then adds them to the proxies list for instantiation.
*
* @param proxies collection of proxies to which any eager load services in the module should be added
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/ServiceBinderImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/ServiceBinderImpl.java?rev=657127&r1=657126&r2=657127&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/ServiceBinderImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/ServiceBinderImpl.java Fri May 16 09:27:11 2008
@@ -15,9 +15,9 @@
package org.apache.tapestry.ioc.internal;
import org.apache.tapestry.ioc.*;
-import org.apache.tapestry.ioc.annotations.EagerLoad;
-import org.apache.tapestry.ioc.annotations.Marker;
-import org.apache.tapestry.ioc.annotations.Scope;
+import org.apache.tapestry.ioc.annotation.EagerLoad;
+import org.apache.tapestry.ioc.annotation.Marker;
+import org.apache.tapestry.ioc.annotation.Scope;
import org.apache.tapestry.ioc.def.ServiceDef;
import org.apache.tapestry.ioc.internal.util.CollectionFactory;
import static org.apache.tapestry.ioc.internal.util.Defense.notBlank;
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/ExceptionTrackerImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/ExceptionTrackerImpl.java?rev=657127&r1=657126&r2=657127&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/ExceptionTrackerImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/ExceptionTrackerImpl.java Fri May 16 09:27:11 2008
@@ -15,7 +15,7 @@
package org.apache.tapestry.ioc.internal.services;
import static org.apache.tapestry.ioc.IOCConstants.PERTHREAD_SCOPE;
-import org.apache.tapestry.ioc.annotations.Scope;
+import org.apache.tapestry.ioc.annotation.Scope;
import org.apache.tapestry.ioc.internal.util.CollectionFactory;
import org.apache.tapestry.ioc.services.ExceptionTracker;
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/SymbolObjectProvider.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/SymbolObjectProvider.java?rev=657127&r1=657126&r2=657127&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/SymbolObjectProvider.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/SymbolObjectProvider.java Fri May 16 09:27:11 2008
@@ -17,8 +17,8 @@
import org.apache.tapestry.ioc.AnnotationProvider;
import org.apache.tapestry.ioc.ObjectLocator;
import org.apache.tapestry.ioc.ObjectProvider;
-import org.apache.tapestry.ioc.annotations.IntermediateType;
-import org.apache.tapestry.ioc.annotations.Symbol;
+import org.apache.tapestry.ioc.annotation.IntermediateType;
+import org.apache.tapestry.ioc.annotation.Symbol;
import org.apache.tapestry.ioc.services.Builtin;
import org.apache.tapestry.ioc.services.SymbolSource;
import org.apache.tapestry.ioc.services.TypeCoercer;
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/ThreadLocaleImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/ThreadLocaleImpl.java?rev=657127&r1=657126&r2=657127&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/ThreadLocaleImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/ThreadLocaleImpl.java Fri May 16 09:27:11 2008
@@ -15,7 +15,7 @@
package org.apache.tapestry.ioc.internal.services;
import static org.apache.tapestry.ioc.IOCConstants.PERTHREAD_SCOPE;
-import org.apache.tapestry.ioc.annotations.Scope;
+import org.apache.tapestry.ioc.annotation.Scope;
import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
import org.apache.tapestry.ioc.services.ThreadLocale;
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/ValueObjectProvider.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/ValueObjectProvider.java?rev=657127&r1=657126&r2=657127&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/ValueObjectProvider.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/ValueObjectProvider.java Fri May 16 09:27:11 2008
@@ -17,8 +17,8 @@
import org.apache.tapestry.ioc.AnnotationProvider;
import org.apache.tapestry.ioc.ObjectLocator;
import org.apache.tapestry.ioc.ObjectProvider;
-import org.apache.tapestry.ioc.annotations.IntermediateType;
-import org.apache.tapestry.ioc.annotations.Value;
+import org.apache.tapestry.ioc.annotation.IntermediateType;
+import org.apache.tapestry.ioc.annotation.Value;
import org.apache.tapestry.ioc.services.Builtin;
import org.apache.tapestry.ioc.services.SymbolSource;
import org.apache.tapestry.ioc.services.TypeCoercer;
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/util/InternalUtils.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/util/InternalUtils.java?rev=657127&r1=657126&r2=657127&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/util/InternalUtils.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/util/InternalUtils.java Fri May 16 09:27:11 2008
@@ -18,8 +18,8 @@
import org.apache.tapestry.ioc.Locatable;
import org.apache.tapestry.ioc.Location;
import org.apache.tapestry.ioc.ObjectLocator;
-import org.apache.tapestry.ioc.annotations.Inject;
-import org.apache.tapestry.ioc.annotations.InjectService;
+import org.apache.tapestry.ioc.annotation.Inject;
+import org.apache.tapestry.ioc.annotation.InjectService;
import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
import static org.apache.tapestry.ioc.internal.util.Defense.notBlank;
import org.apache.tapestry.ioc.services.ClassFactory;
@@ -204,7 +204,7 @@
}
// Otherwise, make use of the MasterObjectProvider service to resolve this type (plus
- // any other information gleaned from additional annotations) into the correct object.
+ // any other information gleaned from additional annotation) into the correct object.
return locator.getObject(parameterType, provider);
}
@@ -450,7 +450,7 @@
* Searches a class for the "best" constructor, the public constructor with the most parameters. Returns null if
* there are no public constructors. If there is more than one constructor with the maximum number of parameters, it
* is not determined which will be returned (don't build a class like that!). In addition, if a constructor is
- * annotated with {@link org.apache.tapestry.ioc.annotations.Inject}, it will be used (no check for multiple such
+ * annotated with {@link org.apache.tapestry.ioc.annotation.Inject}, it will be used (no check for multiple such
* constructors is made, only at most a single constructor should have the annotation).
*
* @param clazz to search for a constructor for
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/SymbolSource.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/SymbolSource.java?rev=657127&r1=657126&r2=657127&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/SymbolSource.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/SymbolSource.java Fri May 16 09:27:11 2008
@@ -14,19 +14,18 @@
package org.apache.tapestry.ioc.services;
-import org.apache.tapestry.ioc.annotations.Value;
+import org.apache.tapestry.ioc.annotation.Value;
/**
- * Used to manage <em>symbols</em>, configuration properties whose value is evaluated at runtime.
- * Symbols use the Ant syntax: <code>${foo.bar.baz}</code> where <code>foo.bar.baz</code> is the
- * name of the symbol. The symbol may appear inside annotation, such as {@link Value}. Values for
- * symbols are provided by {@link SymbolProvider}.
+ * Used to manage <em>symbols</em>, configuration properties whose value is evaluated at runtime. Symbols use the Ant
+ * syntax: <code>${foo.bar.baz}</code> where <code>foo.bar.baz</code> is the name of the symbol. The symbol may appear
+ * inside annotation, such as {@link Value}. Values for symbols are provided by {@link SymbolProvider}.
*/
public interface SymbolSource
{
/**
- * Expands the value for a particular symbol. This may involve recursive expansion, if the
- * immediate value for the symbol itself contains symbols.
+ * Expands the value for a particular symbol. This may involve recursive expansion, if the immediate value for the
+ * symbol itself contains symbols.
*
* @param symbolName
* @return the expanded string
@@ -36,8 +35,8 @@
String valueForSymbol(String symbolName);
/**
- * Given an input string that <em>may</em> contain symbols, returns the string with any and
- * all symbols fully expanded.
+ * Given an input string that <em>may</em> contain symbols, returns the string with any and all symbols fully
+ * expanded.
*
* @param input
* @return expanded input
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/TapestryIOCModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/TapestryIOCModule.java?rev=657127&r1=657126&r2=657127&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/TapestryIOCModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/TapestryIOCModule.java Fri May 16 09:27:11 2008
@@ -16,8 +16,8 @@
import org.apache.tapestry.ioc.*;
import static org.apache.tapestry.ioc.IOCConstants.PERTHREAD_SCOPE;
-import org.apache.tapestry.ioc.annotations.Marker;
-import org.apache.tapestry.ioc.annotations.Value;
+import org.apache.tapestry.ioc.annotation.Marker;
+import org.apache.tapestry.ioc.annotation.Value;
import org.apache.tapestry.ioc.internal.services.*;
import org.apache.tapestry.ioc.util.TimeInterval;
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/test/IOCTestCase.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/test/IOCTestCase.java?rev=657127&r1=657126&r2=657127&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/test/IOCTestCase.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/test/IOCTestCase.java Fri May 16 09:27:11 2008
@@ -15,7 +15,7 @@
package org.apache.tapestry.ioc.test;
import org.apache.tapestry.ioc.*;
-import org.apache.tapestry.ioc.annotations.IntermediateType;
+import org.apache.tapestry.ioc.annotation.IntermediateType;
import org.apache.tapestry.ioc.def.ContributionDef;
import org.apache.tapestry.ioc.def.DecoratorDef;
import org.apache.tapestry.ioc.def.ModuleDef;
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/service.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/service.apt?rev=657127&r1=657126&r2=657127&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/service.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/service.apt Fri May 16 09:27:11 2008
@@ -300,7 +300,7 @@
+---+
package org.example.myapp.services;
-import org.apache.tapestry.ioc.annotations.InjectService;
+import org.apache.tapestry.ioc.annotation.InjectService;
public class IndexerImpl implements Indexer
{
@@ -330,7 +330,7 @@
+---+
package org.example.myapp.services;
-import org.apache.tapestry.ioc.annotations.InjectService;
+import org.apache.tapestry.ioc.annotation.InjectService;
public class IndexerImpl implements Indexer
{
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/upgrade.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/upgrade.apt?rev=657127&r1=657126&r2=657127&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/upgrade.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/upgrade.apt Fri May 16 09:27:11 2008
@@ -17,4 +17,8 @@
Several methods of {{{../apidocs/org/apache/tapestry/ioc/services/ClassFabUtils.html}ClassFabUtils}}
have been removed. The new method {{{castReference()}}} is an improved replacement for the removed
methods. These methods were largely used when decorating services, and the new
- {{{../apidocs/org/apache/tapestry/ioc/services/AspectDecorator.html}AspectDecorator}} is even easier.
\ No newline at end of file
+ {{{../apidocs/org/apache/tapestry/ioc/services/AspectDecorator.html}AspectDecorator}} is even easier.
+
+ For {{{https://issues.apache.org/jira/browse/TAPESTRY-2421}TAPESTRY-2421}} (compatibility between
+ Tapestry 4 and Tapestry 5), the org.apache.tapestry.ioc.annotations package was renamed
+ to org.apache.tapestry.ioc.annotation.
\ No newline at end of file
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/BarneyModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/BarneyModule.java?rev=657127&r1=657126&r2=657127&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/BarneyModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/BarneyModule.java Fri May 16 09:27:11 2008
@@ -14,8 +14,8 @@
package org.apache.tapestry.ioc;
-import org.apache.tapestry.ioc.annotations.Match;
-import org.apache.tapestry.ioc.annotations.Order;
+import org.apache.tapestry.ioc.annotation.Match;
+import org.apache.tapestry.ioc.annotation.Order;
import org.apache.tapestry.ioc.internal.util.CollectionFactory;
import java.util.ArrayList;
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/EagerLoadModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/EagerLoadModule.java?rev=657127&r1=657126&r2=657127&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/EagerLoadModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/EagerLoadModule.java Fri May 16 09:27:11 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.ioc;
-import org.apache.tapestry.ioc.annotations.EagerLoad;
+import org.apache.tapestry.ioc.annotation.EagerLoad;
/**
* Used to test service eager loading.
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/FredModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/FredModule.java?rev=657127&r1=657126&r2=657127&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/FredModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/FredModule.java Fri May 16 09:27:11 2008
@@ -14,8 +14,8 @@
package org.apache.tapestry.ioc;
-import org.apache.tapestry.ioc.annotations.Match;
-import org.apache.tapestry.ioc.annotations.Order;
+import org.apache.tapestry.ioc.annotation.Match;
+import org.apache.tapestry.ioc.annotation.Order;
import org.apache.tapestry.ioc.internal.util.CollectionFactory;
import java.util.Collection;
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/GreeterModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/GreeterModule.java?rev=657127&r1=657126&r2=657127&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/GreeterModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/GreeterModule.java Fri May 16 09:27:11 2008
@@ -14,8 +14,8 @@
package org.apache.tapestry.ioc;
-import org.apache.tapestry.ioc.annotations.InjectService;
-import org.apache.tapestry.ioc.annotations.Marker;
+import org.apache.tapestry.ioc.annotation.InjectService;
+import org.apache.tapestry.ioc.annotation.Marker;
public class GreeterModule
{
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/HelterModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/HelterModule.java?rev=657127&r1=657126&r2=657127&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/HelterModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/HelterModule.java Fri May 16 09:27:11 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.ioc;
-import org.apache.tapestry.ioc.annotations.SubModule;
+import org.apache.tapestry.ioc.annotation.SubModule;
@SubModule(SkelterModule.class)
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/IntegrationTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/IntegrationTest.java?rev=657127&r1=657126&r2=657127&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/IntegrationTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/IntegrationTest.java Fri May 16 09:27:11 2008
@@ -681,7 +681,7 @@
train_getAnnotation(ap, Builtin.class, annotation);
// On the build server, the order of keys inside the RegistryImpl's _markerToServiceDef
- // is different, and so it *may* query ofr a number of other annotations
+ // is different, and so it *may* query ofr a number of other annotation
// besides Builtin.
expect(ap.getAnnotation(EasyMock.isA(Class.class))).andStubReturn(null);
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/MarkerModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/MarkerModule.java?rev=657127&r1=657126&r2=657127&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/MarkerModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/MarkerModule.java Fri May 16 09:27:11 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.ioc;
-import org.apache.tapestry.ioc.annotations.Marker;
+import org.apache.tapestry.ioc.annotation.Marker;
public class MarkerModule
{
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/MasterModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/MasterModule.java?rev=657127&r1=657126&r2=657127&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/MasterModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/MasterModule.java Fri May 16 09:27:11 2008
@@ -14,13 +14,13 @@
package org.apache.tapestry.ioc;
-import org.apache.tapestry.ioc.annotations.SubModule;
+import org.apache.tapestry.ioc.annotation.SubModule;
/**
* Used by {@link org.apache.tapestry.ioc.RegistryBuilderTest}.
*/
@SubModule(
- {FredModule.class, BarneyModule.class})
+ { FredModule.class, BarneyModule.class })
public final class MasterModule
{
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/PerThreadModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/PerThreadModule.java?rev=657127&r1=657126&r2=657127&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/PerThreadModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/PerThreadModule.java Fri May 16 09:27:11 2008
@@ -15,7 +15,7 @@
package org.apache.tapestry.ioc;
import static org.apache.tapestry.ioc.IOCConstants.PERTHREAD_SCOPE;
-import org.apache.tapestry.ioc.annotations.Scope;
+import org.apache.tapestry.ioc.annotation.Scope;
public class PerThreadModule
{
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/RecursiveConstructorModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/RecursiveConstructorModule.java?rev=657127&r1=657126&r2=657127&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/RecursiveConstructorModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/RecursiveConstructorModule.java Fri May 16 09:27:11 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.ioc;
-import org.apache.tapestry.ioc.annotations.InjectService;
+import org.apache.tapestry.ioc.annotation.InjectService;
/**
* Used by {@link org.apache.tapestry.ioc.IntegrationTest}.
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/RedGreeterImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/RedGreeterImpl.java?rev=657127&r1=657126&r2=657127&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/RedGreeterImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/RedGreeterImpl.java Fri May 16 09:27:11 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.ioc;
-import org.apache.tapestry.ioc.annotations.Marker;
+import org.apache.tapestry.ioc.annotation.Marker;
@Marker(RedMarker.class)
public class RedGreeterImpl implements Greeter
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/SkelterModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/SkelterModule.java?rev=657127&r1=657126&r2=657127&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/SkelterModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/SkelterModule.java Fri May 16 09:27:11 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.ioc;
-import org.apache.tapestry.ioc.annotations.SubModule;
+import org.apache.tapestry.ioc.annotation.SubModule;
@SubModule(HelterModule.class)
public class SkelterModule
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/UnknownScopeModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/UnknownScopeModule.java?rev=657127&r1=657126&r2=657127&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/UnknownScopeModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/UnknownScopeModule.java Fri May 16 09:27:11 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.ioc;
-import org.apache.tapestry.ioc.annotations.Scope;
+import org.apache.tapestry.ioc.annotation.Scope;
public class UnknownScopeModule
{
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ContributionDefImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ContributionDefImplTest.java?rev=657127&r1=657126&r2=657127&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ContributionDefImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ContributionDefImplTest.java Fri May 16 09:27:11 2008
@@ -15,7 +15,7 @@
package org.apache.tapestry.ioc.internal;
import org.apache.tapestry.ioc.*;
-import org.apache.tapestry.ioc.annotations.InjectService;
+import org.apache.tapestry.ioc.annotation.InjectService;
import org.apache.tapestry.ioc.def.ContributionDef;
import org.apache.tapestry.ioc.test.IOCTestCase;
import static org.easymock.EasyMock.eq;
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/DefaultModuleDefImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/DefaultModuleDefImplTest.java?rev=657127&r1=657126&r2=657127&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/DefaultModuleDefImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/DefaultModuleDefImplTest.java Fri May 16 09:27:11 2008
@@ -557,7 +557,7 @@
verify();
}
- // TODO: We're short on tests that ensure that marker annotations are additive (i.e., module
- // marker annotations are
+ // TODO: We're short on tests that ensure that marker annotation are additive (i.e., module
+ // marker annotation are
// merged into the set specific to the service).
}
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/EagerLoadViaAnnotationServiceImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/EagerLoadViaAnnotationServiceImpl.java?rev=657127&r1=657126&r2=657127&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/EagerLoadViaAnnotationServiceImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/EagerLoadViaAnnotationServiceImpl.java Fri May 16 09:27:11 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.ioc.internal;
-import org.apache.tapestry.ioc.annotations.EagerLoad;
+import org.apache.tapestry.ioc.annotation.EagerLoad;
@EagerLoad
public class EagerLoadViaAnnotationServiceImpl implements Runnable
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ExtraPublicConstructorsModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ExtraPublicConstructorsModule.java?rev=657127&r1=657126&r2=657127&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ExtraPublicConstructorsModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ExtraPublicConstructorsModule.java Fri May 16 09:27:11 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.ioc.internal;
-import org.apache.tapestry.ioc.annotations.InjectService;
+import org.apache.tapestry.ioc.annotation.InjectService;
import org.apache.tapestry.ioc.services.ClassFactory;
/**
@@ -29,8 +29,8 @@
}
/**
- * Should be the first constructor, the one that gets invoked. I'm worried that different
- * compilers or JVMs will order the constructors differently.
+ * Should be the first constructor, the one that gets invoked. I'm worried that different compilers or JVMs will
+ * order the constructors differently.
*/
public ExtraPublicConstructorsModule(@InjectService("ClassFactory")
ClassFactory factory)
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ModuleImplTestModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ModuleImplTestModule.java?rev=657127&r1=657126&r2=657127&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ModuleImplTestModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ModuleImplTestModule.java Fri May 16 09:27:11 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.ioc.internal;
-import org.apache.tapestry.ioc.annotations.InjectService;
+import org.apache.tapestry.ioc.annotation.InjectService;
/**
* Module builder used by {@link ModuleImplTest}.
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/MultipleConstructorsAutobuildService.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/MultipleConstructorsAutobuildService.java?rev=657127&r1=657126&r2=657127&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/MultipleConstructorsAutobuildService.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/MultipleConstructorsAutobuildService.java Fri May 16 09:27:11 2008
@@ -15,7 +15,7 @@
package org.apache.tapestry.ioc.internal;
import org.apache.tapestry.ioc.StringHolder;
-import org.apache.tapestry.ioc.annotations.InjectService;
+import org.apache.tapestry.ioc.annotation.InjectService;
public class MultipleConstructorsAutobuildService implements StringHolder
{
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/NoUsableContributionParameterModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/NoUsableContributionParameterModule.java?rev=657127&r1=657126&r2=657127&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/NoUsableContributionParameterModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/NoUsableContributionParameterModule.java Fri May 16 09:27:11 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.ioc.internal;
-import org.apache.tapestry.ioc.annotations.InjectService;
+import org.apache.tapestry.ioc.annotation.InjectService;
/**
* Used by {@link org.apache.tapestry.ioc.internal.DefaultModuleDefImpl}.
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ServiceBuilderMethodFixture.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ServiceBuilderMethodFixture.java?rev=657127&r1=657126&r2=657127&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ServiceBuilderMethodFixture.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ServiceBuilderMethodFixture.java Fri May 16 09:27:11 2008
@@ -15,9 +15,9 @@
package org.apache.tapestry.ioc.internal;
import org.apache.tapestry.ioc.ServiceResources;
-import org.apache.tapestry.ioc.annotations.Inject;
-import org.apache.tapestry.ioc.annotations.InjectService;
-import org.apache.tapestry.ioc.annotations.Value;
+import org.apache.tapestry.ioc.annotation.Inject;
+import org.apache.tapestry.ioc.annotation.InjectService;
+import org.apache.tapestry.ioc.annotation.Value;
import org.slf4j.Logger;
import org.testng.Assert;
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/SimpleModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/SimpleModule.java?rev=657127&r1=657126&r2=657127&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/SimpleModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/SimpleModule.java Fri May 16 09:27:11 2008
@@ -15,8 +15,8 @@
package org.apache.tapestry.ioc.internal;
import org.apache.tapestry.ioc.Configuration;
-import org.apache.tapestry.ioc.annotations.EagerLoad;
-import org.apache.tapestry.ioc.annotations.Scope;
+import org.apache.tapestry.ioc.annotation.EagerLoad;
+import org.apache.tapestry.ioc.annotation.Scope;
/**
* Used by {@link org.apache.tapestry.ioc.internal.DefaultModuleDefImplTest}.
@@ -45,8 +45,7 @@
}
/**
- * Minimal decorator method that uses generics to qualify the delegate passed in and the object
- * returned.
+ * Minimal decorator method that uses generics to qualify the delegate passed in and the object returned.
*/
public <T> T decorateLogging(Class<T> serviceInterace, T delegate)
{
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/AnnotatedBean.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/AnnotatedBean.java?rev=657127&r1=657126&r2=657127&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/AnnotatedBean.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/AnnotatedBean.java Fri May 16 09:27:11 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.ioc.internal.services;
-import org.apache.tapestry.ioc.annotations.Scope;
+import org.apache.tapestry.ioc.annotation.Scope;
public class AnnotatedBean
{
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/PropertyAccessImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/PropertyAccessImplTest.java?rev=657127&r1=657126&r2=657127&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/PropertyAccessImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/PropertyAccessImplTest.java Fri May 16 09:27:11 2008
@@ -15,7 +15,7 @@
package org.apache.tapestry.ioc.internal.services;
import org.apache.tapestry.ioc.Registry;
-import org.apache.tapestry.ioc.annotations.Scope;
+import org.apache.tapestry.ioc.annotation.Scope;
import org.apache.tapestry.ioc.internal.IOCInternalTestCase;
import org.apache.tapestry.ioc.internal.util.Pair;
import org.apache.tapestry.ioc.internal.util.StringLongPair;
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/SymbolObjectProviderTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/SymbolObjectProviderTest.java?rev=657127&r1=657126&r2=657127&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/SymbolObjectProviderTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/SymbolObjectProviderTest.java Fri May 16 09:27:11 2008
@@ -17,8 +17,8 @@
import org.apache.tapestry.ioc.AnnotationProvider;
import org.apache.tapestry.ioc.ObjectLocator;
import org.apache.tapestry.ioc.ObjectProvider;
-import org.apache.tapestry.ioc.annotations.IntermediateType;
-import org.apache.tapestry.ioc.annotations.Symbol;
+import org.apache.tapestry.ioc.annotation.IntermediateType;
+import org.apache.tapestry.ioc.annotation.Symbol;
import org.apache.tapestry.ioc.services.SymbolSource;
import org.apache.tapestry.ioc.services.TypeCoercer;
import org.apache.tapestry.ioc.test.IOCTestCase;
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/ValueObjectProviderTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/ValueObjectProviderTest.java?rev=657127&r1=657126&r2=657127&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/ValueObjectProviderTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/ValueObjectProviderTest.java Fri May 16 09:27:11 2008
@@ -16,8 +16,8 @@
import org.apache.tapestry.ioc.AnnotationProvider;
import org.apache.tapestry.ioc.ObjectLocator;
-import org.apache.tapestry.ioc.annotations.IntermediateType;
-import org.apache.tapestry.ioc.annotations.Value;
+import org.apache.tapestry.ioc.annotation.IntermediateType;
+import org.apache.tapestry.ioc.annotation.Value;
import org.apache.tapestry.ioc.services.SymbolSource;
import org.apache.tapestry.ioc.services.TypeCoercer;
import org.apache.tapestry.ioc.test.IOCTestCase;
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/InjectoBean.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/InjectoBean.java?rev=657127&r1=657126&r2=657127&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/InjectoBean.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/InjectoBean.java Fri May 16 09:27:11 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.ioc.internal.util;
-import org.apache.tapestry.ioc.annotations.Inject;
+import org.apache.tapestry.ioc.annotation.Inject;
public class InjectoBean
{
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/InternalUtilsTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/InternalUtilsTest.java?rev=657127&r1=657126&r2=657127&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/InternalUtilsTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/InternalUtilsTest.java Fri May 16 09:27:11 2008
@@ -16,7 +16,7 @@
import org.apache.tapestry.ioc.Locatable;
import org.apache.tapestry.ioc.Location;
-import org.apache.tapestry.ioc.annotations.Inject;
+import org.apache.tapestry.ioc.annotation.Inject;
import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
import static org.apache.tapestry.ioc.internal.util.InternalUtils.toList;
import org.apache.tapestry.ioc.test.IOCTestCase;
@@ -306,7 +306,7 @@
assertEquals(map.get("fred"), Arrays.asList(1, 2));
}
- // Test the check for runtime annotations. This is all well and good, we actually don't have a proper test
+ // Test the check for runtime annotation. This is all well and good, we actually don't have a proper test
// that this code is used (ideally we should have tests for @Marker on a module, on a service impl, and passed
// to ServiceBindingOptions.withMarker(), to prove that those are wired for checks.
Modified: tapestry/tapestry5/trunk/tapestry-spring/src/test/java/org/example/testapp/pages/Start.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-spring/src/test/java/org/example/testapp/pages/Start.java?rev=657127&r1=657126&r2=657127&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-spring/src/test/java/org/example/testapp/pages/Start.java (original)
+++ tapestry/tapestry5/trunk/tapestry-spring/src/test/java/org/example/testapp/pages/Start.java Fri May 16 09:27:11 2008
@@ -14,8 +14,8 @@
package org.example.testapp.pages;
-import org.apache.tapestry.annotations.Retain;
-import org.apache.tapestry.ioc.annotations.Inject;
+import org.apache.tapestry.annotation.Retain;
+import org.apache.tapestry.ioc.annotation.Inject;
import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.example.testapp.services.Upcase;
import org.springframework.web.context.WebApplicationContext;
Modified: tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/pages/GameOver.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/pages/GameOver.java?rev=657127&r1=657126&r2=657127&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/pages/GameOver.java (original)
+++ tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/pages/GameOver.java Fri May 16 09:27:11 2008
@@ -27,8 +27,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-tutorial1/src/main/java/org/apache/tapestry/tutorial/pages/Guess.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/pages/Guess.java?rev=657127&r1=657126&r2=657127&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/pages/Guess.java (original)
+++ tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/pages/Guess.java Fri May 16 09:27:11 2008
@@ -14,9 +14,9 @@
package org.apache.tapestry.tutorial.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 Guess
{
Modified: tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/pages/Index.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/pages/Index.java?rev=657127&r1=657126&r2=657127&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/pages/Index.java (original)
+++ tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/pages/Index.java Fri May 16 09:27:11 2008
@@ -14,8 +14,8 @@
package org.apache.tapestry.tutorial.pages;
-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.tutorial.entities.Address;
import org.hibernate.Session;
Modified: tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/pages/address/CreateAddress.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/pages/address/CreateAddress.java?rev=657127&r1=657126&r2=657127&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/pages/address/CreateAddress.java (original)
+++ tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/pages/address/CreateAddress.java Fri May 16 09:27:11 2008
@@ -14,10 +14,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/main/java/org/apache/tapestry/tutorial/services/AppModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/services/AppModule.java?rev=657127&r1=657126&r2=657127&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/services/AppModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/services/AppModule.java Fri May 16 09:27:11 2008
@@ -17,7 +17,7 @@
import org.apache.tapestry.SymbolConstants;
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.services.Request;
import org.apache.tapestry.services.RequestFilter;
import org.apache.tapestry.services.RequestHandler;