tapestry-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hls...@apache.org
Subject svn commit: r594319 [31/40] - in /tapestry/tapestry5/trunk: ./ tapestry-annotations/ tapestry-annotations/src/main/java/org/apache/tapestry/beaneditor/ tapestry-annotations/src/site/ tapestry-component-report/ tapestry-component-report/src/main/java/or...
Date Mon, 12 Nov 2007 22:23:28 GMT
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/services/TransformUtilsTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/services/TransformUtilsTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/services/TransformUtilsTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/services/TransformUtilsTest.java Mon Nov 12 14:22:31 2007
@@ -1,32 +1,27 @@
-// Copyright 2006 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 2006 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.apache.tapestry.services;
 
-import static org.apache.tapestry.services.TransformUtils.getDefaultValue;
-import static org.apache.tapestry.services.TransformUtils.getUnwrapperMethodName;
-import static org.apache.tapestry.services.TransformUtils.getWrapperType;
-import static org.apache.tapestry.services.TransformUtils.getWrapperTypeName;
-import static org.apache.tapestry.services.TransformUtils.isPrimitive;
-
-import java.util.Map;
-
-import org.testng.Assert;
-import org.testng.annotations.Test;
+import static org.apache.tapestry.services.TransformUtils.*;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import java.util.Map;
 
 /**
- * 
+ *
  */
 public class TransformUtilsTest extends Assert
 {

Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/util/DefaultPrimaryKeyEncoderTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/util/DefaultPrimaryKeyEncoderTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/util/DefaultPrimaryKeyEncoderTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/util/DefaultPrimaryKeyEncoderTest.java Mon Nov 12 14:22:31 2007
@@ -14,17 +14,19 @@
 
 package org.apache.tapestry.util;
 
-import java.util.Arrays;
-
 import org.apache.tapestry.internal.test.InternalBaseTestCase;
 import org.testng.annotations.Test;
 
+import java.util.Arrays;
+
 public class DefaultPrimaryKeyEncoderTest extends InternalBaseTestCase
 {
     static class IntStringEncoder extends DefaultPrimaryKeyEncoder<Integer, String>
     {
 
-    };
+    }
+
+    ;
 
     private final int FRED_ID = 1;
 

Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/util/EnumSelectModelTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/util/EnumSelectModelTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/util/EnumSelectModelTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/util/EnumSelectModelTest.java Mon Nov 12 14:22:31 2007
@@ -14,14 +14,14 @@
 
 package org.apache.tapestry.util;
 
-import java.util.List;
-
 import org.apache.tapestry.OptionModel;
 import org.apache.tapestry.SelectModel;
 import org.apache.tapestry.Stooge;
 import org.apache.tapestry.ioc.Messages;
 import org.apache.tapestry.test.TapestryTestCase;
 import org.testng.annotations.Test;
+
+import java.util.List;
 
 public class EnumSelectModelTest extends TapestryTestCase
 {

Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/util/FindTheParameterizedType.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/util/FindTheParameterizedType.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/util/FindTheParameterizedType.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/util/FindTheParameterizedType.java Mon Nov 12 14:22:31 2007
@@ -1,28 +1,27 @@
-// Copyright 2006 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 2006 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.apache.tapestry.util;
 
-import static java.lang.System.out;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.tapestry.ioc.internal.util.Orderer;
+import org.apache.tapestry.ioc.internal.util.Orderer;
+
+import static java.lang.System.out;
+import java.lang.reflect.Method;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.List;
+import java.util.Map;
 
 public class FindTheParameterizedType
 {

Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/util/StringToEnumCoercionTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/util/StringToEnumCoercionTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/util/StringToEnumCoercionTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/util/StringToEnumCoercionTest.java Mon Nov 12 14:22:31 2007
@@ -15,7 +15,6 @@
 package org.apache.tapestry.util;
 
 import junit.framework.AssertionFailedError;
-
 import org.apache.tapestry.Stooge;
 import org.testng.Assert;
 import org.testng.annotations.Test;

Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/validator/RegexpTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/validator/RegexpTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/validator/RegexpTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/validator/RegexpTest.java Mon Nov 12 14:22:31 2007
@@ -14,15 +14,17 @@
 
 package org.apache.tapestry.validator;
 
-import java.util.regex.Pattern;
-
 import org.apache.tapestry.Field;
 import org.apache.tapestry.ValidationException;
 import org.apache.tapestry.internal.test.InternalBaseTestCase;
 import org.apache.tapestry.ioc.MessageFormatter;
 import org.testng.annotations.Test;
 
-/** These are getting tedious; I'd rather do it via integration tests. */
+import java.util.regex.Pattern;
+
+/**
+ * These are getting tedious; I'd rather do it via integration tests.
+ */
 public class RegexpTest extends InternalBaseTestCase
 {
     @Test

Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/resources/org/apache/tapestry/internal/services/test.css
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/resources/org/apache/tapestry/internal/services/test.css?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/resources/org/apache/tapestry/internal/services/test.css (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/resources/org/apache/tapestry/internal/services/test.css Mon Nov 12 14:22:31 2007
@@ -1,4 +1,4 @@
 body {
-	margin: 0;
-	padding: 0;
+    margin: 0;
+    padding: 0;
 }

Modified: tapestry/tapestry5/trunk/tapestry-ioc/.classpath
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/.classpath?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/.classpath (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/.classpath Mon Nov 12 14:22:31 2007
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-  <classpathentry kind="src" output="bin"  path="src/main/java"/>
-  <classpathentry kind="src" output="bin-test"  path="src/test/java"/>
-  <classpathentry kind="lib" path="src/main/resources"/> 
-  <classpathentry kind="lib" path="src/test/resources"/> 
-  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-  <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER/noworkspace"/>
-  <classpathentry kind="output" path="bin"/>
+    <classpathentry kind="src" output="bin" path="src/main/java"/>
+    <classpathentry kind="src" output="bin-test" path="src/test/java"/>
+    <classpathentry kind="lib" path="src/main/resources"/>
+    <classpathentry kind="lib" path="src/test/resources"/>
+    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+    <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER/noworkspace"/>
+    <classpathentry kind="output" path="bin"/>
 </classpath>

Modified: tapestry/tapestry5/trunk/tapestry-ioc/.project
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/.project?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/.project (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/.project Mon Nov 12 14:22:31 2007
@@ -1,22 +1,22 @@
 <projectDescription>
-  <name>tapestry-ioc</name>
-  <comment></comment>
-  <projects>
-  </projects>
-  <buildSpec>
-    <buildCommand>
-      <name>org.eclipse.jdt.core.javabuilder</name>
-      <arguments>
-      </arguments>
-    </buildCommand>
-    <buildCommand>
-      <name>org.maven.ide.eclipse.maven2Builder</name>
-      <arguments>
-      </arguments>
-     </buildCommand>
-  </buildSpec>
-  <natures>
-    <nature>org.eclipse.jdt.core.javanature</nature>
-    <nature>org.maven.ide.eclipse.maven2Nature</nature>
-  </natures>
+    <name>tapestry-ioc</name>
+    <comment></comment>
+    <projects>
+    </projects>
+    <buildSpec>
+        <buildCommand>
+            <name>org.eclipse.jdt.core.javabuilder</name>
+            <arguments>
+            </arguments>
+        </buildCommand>
+        <buildCommand>
+            <name>org.maven.ide.eclipse.maven2Builder</name>
+            <arguments>
+            </arguments>
+        </buildCommand>
+    </buildSpec>
+    <natures>
+        <nature>org.eclipse.jdt.core.javanature</nature>
+        <nature>org.maven.ide.eclipse.maven2Nature</nature>
+    </natures>
 </projectDescription>

Modified: tapestry/tapestry5/trunk/tapestry-ioc/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/pom.xml?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/pom.xml (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/pom.xml Mon Nov 12 14:22:31 2007
@@ -1,127 +1,128 @@
-<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-ioc</artifactId>
-  <packaging>jar</packaging>
-  <!-- This should change to tapestry-project -->
-  <parent>
+<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-project</artifactId>
-    <version>5.0.7-SNAPSHOT</version>
-  </parent>
-  <name>Tapestry Inversion of Control Container</name>
-  <description>
-    A code-centric, high-performance, simple Inversion of Control
-    container.
-  </description>
-  <inceptionYear>2006</inceptionYear>
-
-  <dependencies>
-    <dependency>
-      <groupId>jboss</groupId>
-      <artifactId>javassist</artifactId>
-    </dependency>
-
-
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <version>1.4.3</version>
-    </dependency>
-
-    <!-- 0.00001% of applications will need to override this dependency to not use Log4J. -->
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <version>1.4.3</version>
-      <exclusions>
-        <!-- Exclude log4j to make sure we use the latest Log4J version. -->
-        <exclusion>
-          <artifactId>log4j</artifactId>
-          <groupId>log4j</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>1.2.14</version>
-    </dependency>
-
-
-    <!-- Override parent pom: needed at compile time. -->
-    <dependency>
-      <groupId>org.easymock</groupId>
-      <artifactId>easymock</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <!-- Override parent pom: needed at compile time. -->
-    <dependency>
-      <groupId>org.testng</groupId>
-      <artifactId>testng</artifactId>
-      <!-- Looks like if you override scope, you have to provide version (and classifier) as well.
-        Or perhaps this has something to do with classifier. -->
-      <version>5.1</version>
-      <classifier>jdk15</classifier>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-source-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-assembly-plugin</artifactId>
-      </plugin>
-      <!-- This gets the plugin to clean up the cobertura.ser file left
+    <artifactId>tapestry-ioc</artifactId>
+    <packaging>jar</packaging>
+    <!-- This should change to tapestry-project -->
+    <parent>
+        <groupId>org.apache.tapestry</groupId>
+        <artifactId>tapestry-project</artifactId>
+        <version>5.0.7-SNAPSHOT</version>
+    </parent>
+    <name>Tapestry Inversion of Control Container</name>
+    <description>
+        A code-centric, high-performance, simple Inversion of Control
+        container.
+    </description>
+    <inceptionYear>2006</inceptionYear>
+
+    <dependencies>
+        <dependency>
+            <groupId>jboss</groupId>
+            <artifactId>javassist</artifactId>
+        </dependency>
+
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.4.3</version>
+        </dependency>
+
+        <!-- 0.00001% of applications will need to override this dependency to not use Log4J. -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>1.4.3</version>
+            <exclusions>
+                <!-- Exclude log4j to make sure we use the latest Log4J version. -->
+                <exclusion>
+                    <artifactId>log4j</artifactId>
+                    <groupId>log4j</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.14</version>
+        </dependency>
+
+
+        <!-- Override parent pom: needed at compile time. -->
+        <dependency>
+            <groupId>org.easymock</groupId>
+            <artifactId>easymock</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <!-- Override parent pom: needed at compile time. -->
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <!-- Looks like if you override scope, you have to provide version (and classifier) as well.
+   Or perhaps this has something to do with classifier. -->
+            <version>5.1</version>
+            <classifier>jdk15</classifier>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+            </plugin>
+            <!-- This gets the plugin to clean up the cobertura.ser file left
         in the root directory. -->
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>cobertura-maven-plugin</artifactId>
-        <version>${cobertura-plugin-version}</version>
-        <executions>
-          <execution>
-            <id>clean</id>
-            <goals>
-              <goal>clean</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-        <reportSets>
-          <reportSet>
-            <reports>
-              <report>summary</report>
-              <report>dependencies</report>
-            </reports>
-          </reportSet>
-        </reportSets>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>cobertura-maven-plugin</artifactId>
-        <!-- Version 2.1 is broken. -->
-        <version>${cobertura-plugin-version}</version>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-report-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>cobertura-maven-plugin</artifactId>
+                <version>${cobertura-plugin-version}</version>
+                <executions>
+                    <execution>
+                        <id>clean</id>
+                        <goals>
+                            <goal>clean</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    <reporting>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-project-info-reports-plugin</artifactId>
+                <reportSets>
+                    <reportSet>
+                        <reports>
+                            <report>summary</report>
+                            <report>dependencies</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>cobertura-maven-plugin</artifactId>
+                <!-- Version 2.1 is broken. -->
+                <version>${cobertura-plugin-version}</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-report-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </reporting>
 </project>

Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/AnnotationProvider.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/AnnotationProvider.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/AnnotationProvider.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/AnnotationProvider.java Mon Nov 12 14:22:31 2007
@@ -24,10 +24,9 @@
 {
     /**
      * Searches for the specified annotation, returning the matching annotation instance.
-     * 
+     *
      * @param <T>
-     * @param annotationClass
-     *            used to select the annotation to returnĀ«
+     * @param annotationClass used to select the annotation to returnĀ«
      * @return the annotation, or null if not found
      */
     <T extends Annotation> T getAnnotation(Class<T> annotationClass);

Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/BaseLocatable.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/BaseLocatable.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/BaseLocatable.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/BaseLocatable.java Mon Nov 12 14:22:31 2007
@@ -1,17 +1,17 @@
-// Copyright 2006 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 2006 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.apache.tapestry.ioc;
 
 /**

Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/Configuration.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/Configuration.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/Configuration.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/Configuration.java Mon Nov 12 14:22:31 2007
@@ -1,23 +1,23 @@
-// Copyright 2006 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 2006 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.apache.tapestry.ioc;
 
 /**
  * Object passed into a service contributor method that allows the method provide contributed values
  * to the service's configuration.
- * <p>
+ * <p/>
  * A service can <em>collect</em> contributions in three different ways:
  * <ul>
  * <li>As an un-ordered collection of values</li>
@@ -25,21 +25,18 @@
  * post-requisites)</li>
  * <li>As a map of keys and values
  * </ul>
- * <p>
+ * <p/>
  * This implementation is used for un-ordered configuration data.
- * <p>
+ * <p/>
  * The service defines the <em>type</em> of contribution, in terms of a base class or service
  * interface. Contributions must be compatible with the type.
- * 
- * 
  */
 public interface Configuration<T>
 {
     /**
      * Adds an object to the service's contribution.
-     * 
-     * @param object
-     *            to add to the service's configuration
+     *
+     * @param object to add to the service's configuration
      */
     void add(T object);
 }

Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/IOCConstants.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/IOCConstants.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/IOCConstants.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/IOCConstants.java Mon Nov 12 14:22:31 2007
@@ -17,7 +17,7 @@
 public class IOCConstants
 {
     public static final String DEFAULT_SCOPE = "singleton";
-    
+
     public static final String PERTHREAD_SCOPE = "perthread";
 
     public static final String MODULE_BUILDER_MANIFEST_ENTRY_NAME = "Tapestry-Module-Classes";

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=594319&r1=594318&r2=594319&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 Mon Nov 12 14:22:31 2007
@@ -15,6 +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 java.io.Closeable;
 import java.io.IOException;
@@ -23,8 +24,6 @@
 import java.util.Enumeration;
 import java.util.jar.Manifest;
 
-import org.apache.tapestry.ioc.annotations.SubModule;
-
 /**
  * A collection of utility methods for a couple of different areas, including creating the initial
  * {@link org.apache.tapestry.ioc.Registry}.
@@ -39,7 +38,7 @@
      * 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)
      */
@@ -61,9 +60,8 @@
      * 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
+     *
+     * @param builder the builder to which modules will be added
      * @see SubModule
      * @see RegistryBuilder#add(String)
      */
@@ -127,9 +125,8 @@
 
     /**
      * Closes an input stream (or other Closeable), ignoring any exception.
-     * 
-     * @param closeable
-     *            the thing to close, or null to close nothing
+     *
+     * @param closeable the thing to close, or null to close nothing
      */
     private static void close(Closeable closeable)
     {

Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/IdMatcher.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/IdMatcher.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/IdMatcher.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/IdMatcher.java Mon Nov 12 14:22:31 2007
@@ -1,31 +1,28 @@
-// Copyright 2006 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 2006 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.apache.tapestry.ioc;
 
 /**
  * A matcher of <em>fully qualified<em> ids.
- * 
- * 
  */
 public interface IdMatcher
 {
     /**
      * Returns true if the provided input id matches the pattern defined by this matcher instance.
-     * 
-     * @param id
-     *            the fully qualfied id
+     *
+     * @param id the fully qualfied id
      * @return true on match, false otherwise
      */
     boolean matches(String id);

Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/Locatable.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/Locatable.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/Locatable.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/Locatable.java Mon Nov 12 14:22:31 2007
@@ -1,27 +1,27 @@
-// Copyright 2006 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 2006 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.apache.tapestry.ioc;
 
 /**
  * Interface implemented by objects which carry a location tag. Defines a readable property,
  * location.
- * 
- * 
  */
 public interface Locatable
 {
-    /** Returns the location associated with this object for error reporting purposes. */
+    /**
+     * Returns the location associated with this object for error reporting purposes.
+     */
     Location getLocation();
 }

Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/Location.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/Location.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/Location.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/Location.java Mon Nov 12 14:22:31 2007
@@ -1,17 +1,17 @@
-// Copyright 2006 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 2006 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.apache.tapestry.ioc;
 
 /**
@@ -19,12 +19,12 @@
  * resource), a line number, and a column number. This is part of "line precise exception
  * reporting", whereby errors at runtime can be tracked backwards to the files from which they were
  * parsed or otherwise constructed.
- * 
- * 
  */
 public interface Location
 {
-    /** The resource from which the object tagged with a location was derived. */
+    /**
+     * The resource from which the object tagged with a location was derived.
+     */
     Resource getResource();
 
     /**

Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/LoggerSource.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/LoggerSource.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/LoggerSource.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/LoggerSource.java Mon Nov 12 14:22:31 2007
@@ -22,9 +22,13 @@
  */
 public interface LoggerSource
 {
-    /** Creates or retrieves a log based on Class. This is rarely used in Tapestry IOC. */
+    /**
+     * Creates or retrieves a log based on Class. This is rarely used in Tapestry IOC.
+     */
     Logger getLogger(Class clazz);
 
-    /** Creates or retrieves a log based on name. Typically, the name will be a service id. */
+    /**
+     * Creates or retrieves a log based on name. Typically, the name will be a service id.
+     */
     Logger getLogger(String name);
 }

Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/MappedConfiguration.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/MappedConfiguration.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/MappedConfiguration.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/MappedConfiguration.java Mon Nov 12 14:22:31 2007
@@ -1,23 +1,23 @@
-// Copyright 2006 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 2006 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.apache.tapestry.ioc;
 
 /**
  * Object passed into a service contributor method that allows the method provide contributed values
  * to the service's configuration.
- * <p>
+ * <p/>
  * A service can <em>collect</em> contributions in three different ways:
  * <ul>
  * <li>As an un-ordered collection of values</li>
@@ -25,24 +25,19 @@
  * post-requisites)</li>
  * <li>As a map of keys and values
  * </ul>
- * <p>
+ * <p/>
  * The service defines the <em>type</em> of contribution, in terms of a base class or service
  * interface. Contributions must be compatible with the type.
- * 
- * 
  */
 public interface MappedConfiguration<K, V>
 {
 
     /**
      * Adds a keyed object to the service's contribution.
-     * 
-     * @param key
-     *            unique id for the value
-     * @param value
-     *            to contribute
-     * @throws IllegalArgumentException
-     *             if key is not unique
+     *
+     * @param key   unique id for the value
+     * @param value to contribute
+     * @throws IllegalArgumentException if key is not unique
      */
 
     void add(K key, V value);

Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/MessageFormatter.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/MessageFormatter.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/MessageFormatter.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/MessageFormatter.java Mon Nov 12 14:22:31 2007
@@ -1,24 +1,22 @@
-// Copyright 2006 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 2006 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.apache.tapestry.ioc;
 
 /**
  * Obtained from a {@link org.apache.tapestry.ioc.Messages}, used to format messages for a specific
  * localized message key.
- * 
- * 
  */
 public interface MessageFormatter
 {
@@ -26,7 +24,7 @@
      * Formats the message. The arguments are passed to {@link java.util.Formatter} as is with one
      * exception: Object of type {@link Throwable} are converted to their
      * {@link Throwable#getMessage()} (or, if that is null, to the name of the class).
-     * 
+     *
      * @param args
      * @return formatted string
      */

Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/Messages.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/Messages.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/Messages.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/Messages.java Mon Nov 12 14:22:31 2007
@@ -21,13 +21,15 @@
  */
 public interface Messages
 {
-    /** Returns true if the bundle contains the named key. */
+    /**
+     * Returns true if the bundle contains the named key.
+     */
     boolean contains(String key);
 
     /**
      * Returns the localized message for the given key. If catalog does not contain such a key, then
      * a modified version of the key is returned (converted to upper case and enclosed in brackets).
-     * 
+     *
      * @param key
      * @return localized message for key, or placeholder
      */
@@ -36,7 +38,7 @@
     /**
      * Returns a formatter for the message, which can be used to substitute arguments (as per
      * {@link java.util.Formatter}).
-     * 
+     *
      * @param key
      * @return formattable object
      */

Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/ModuleBuilderSource.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/ModuleBuilderSource.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/ModuleBuilderSource.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/ModuleBuilderSource.java Mon Nov 12 14:22:31 2007
@@ -1,17 +1,17 @@
-// Copyright 2006 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 2006 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.apache.tapestry.ioc;
 
 /**
@@ -22,8 +22,6 @@
  * needed. This allows Tapestry IOC to work around a tricky chicken-and-the-egg problem, whereby the
  * constructor of a module builder instance requires contributions that originate in the same
  * module.
- * 
- * 
  */
 public interface ModuleBuilderSource
 {

Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/ObjectCreator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/ObjectCreator.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/ObjectCreator.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/ObjectCreator.java Mon Nov 12 14:22:31 2007
@@ -1,27 +1,27 @@
-// Copyright 2006 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 2006 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.apache.tapestry.ioc;
 
 /**
  * Interface used to encapsulate any strategy used defer the creation of some object until just as
  * needed.
- * 
- * 
  */
 public interface ObjectCreator
 {
-    /** Create and return the object. */
+    /**
+     * Create and return the object.
+     */
     Object createObject();
 }

Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/ObjectLocator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/ObjectLocator.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/ObjectLocator.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/ObjectLocator.java Mon Nov 12 14:22:31 2007
@@ -30,17 +30,14 @@
      * Obtains a service via its unique service id. Returns the service's proxy. The service proxy
      * implements the same interface as the actual service, and is used to instantiate the actual
      * service only as needed (this is transparent to the application).
-     * 
+     *
      * @param <T>
-     * @param serviceId
-     *            unique Service id used to locate the service object (may contain <em>symbols</em>,
-     *            which will be expanded), case is ignored
-     * @param serviceInterface
-     *            the interface implemented by the service (or an interface extended by the service
-     *            interface)
+     * @param serviceId        unique Service id used to locate the service object (may contain <em>symbols</em>,
+     *                         which will be expanded), case is ignored
+     * @param serviceInterface the interface implemented by the service (or an interface extended by the service
+     *                         interface)
      * @return the service instance
-     * @throws RuntimeException
-     *             if the service is not defined, or if an error occurs instantiating it
+     * @throws RuntimeException if the service is not defined, or if an error occurs instantiating it
      */
     <T> T getService(String serviceId, Class<T> serviceInterface);
 
@@ -49,28 +46,24 @@
      * interface (which can be hard to guarantee). The search takes into account inheritance of the
      * service interface (not the service <em>implementation</em>), which may result in a failure
      * due to extra matches.
-     * 
+     *
      * @param <T>
-     * @param serviceInterface
-     *            the interface the service implements
+     * @param serviceInterface the interface the service implements
      * @return the service's proxy
-     * @throws RuntimeException
-     *             if the service does not exist (this is considered programmer error), or multiple
-     *             services directly implement, or extend from, the service interface
+     * @throws RuntimeException if the service does not exist (this is considered programmer error), or multiple
+     *                          services directly implement, or extend from, the service interface
      */
     <T> T getService(Class<T> serviceInterface);
 
     /**
      * Obtains an object indirectly, using an {@link ObjectProvider} identified by the prefix of the
      * reference.
-     * 
-     * @param objectType
-     *            the type of object to be returned
-     * @param annotationProvider
-     *            provides access to annotations on the field or parameter for which a value is to
-     *            be obtained, which may be utilized in selecting an appropriate object, use
-     *            <strong>null</strong> when annotations are not available (in which case,
-     *            selection will be based only on the object type)
+     *
+     * @param objectType         the type of object to be returned
+     * @param annotationProvider provides access to annotations on the field or parameter for which a value is to
+     *                           be obtained, which may be utilized in selecting an appropriate object, use
+     *                           <strong>null</strong> when annotations are not available (in which case,
+     *                           selection will be based only on the object type)
      * @param <T>
      * @return the requested object
      * @see ObjectProvider
@@ -80,14 +73,12 @@
     /**
      * Autobuilds a class by finding the public constructor with the most parameters. Services and
      * resources will be injected into the parameters of the constructor.
-     * 
+     *
      * @param <T>
-     * @param clazz
-     *            the type of object to instantiate
+     * @param clazz the type of object to instantiate
      * @return the instantiated instance
-     * @throws RuntimeException
-     *             if the autobuild fails
-     *             @see MasterObjectProvider
+     * @throws RuntimeException if the autobuild fails
+     * @see MasterObjectProvider
      */
     <T> T autobuild(Class<T> clazz);
 
@@ -97,12 +88,10 @@
      * necessary to use such a proxy to prevent service construction cycles, particularly when
      * contributing (directly or indirectly) to the {@link MasterObjectProvider} (which is itself at
      * the heart of autobuilding).
-     * 
+     *
      * @param <T>
-     * @param interfaceClass
-     *            the interface implemented by the proxy
-     * @param implementationClass
-     *            a concrete class that implements the interface
+     * @param interfaceClass      the interface implemented by the proxy
+     * @param implementationClass a concrete class that implements the interface
      * @return a proxy
      */
     <T> T proxy(Class<T> interfaceClass, Class<? extends T> implementationClass);

Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/ObjectProvider.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/ObjectProvider.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/ObjectProvider.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/ObjectProvider.java Mon Nov 12 14:22:31 2007
@@ -19,9 +19,9 @@
  * {@link org.apache.tapestry.ioc.Registry}. Instead of using a just the service id to gain access
  * to a service within the Registry, object providers in different flavors are capable of vending,
  * or even creating, objects of disparate types from disparate sources.
- * <p>
+ * <p/>
  * Object providers are consulted in a strict order, and the first non-null result is taken.
- * <p>
+ * <p/>
  * In many cases, an object provider searches for additional annotations on the element (usually a
  * parameter, or perhaps a field) for which a value is required.
  */
@@ -32,20 +32,16 @@
      * particular <em>context</em>, which will typically be a service builder method, service
      * contributor method, or service decorator method. The locator parameter provides access to the
      * services visible <em>to that context</em>.
-     * 
-     * @param objectType
-     *            the expected object type
-     * @param annotationProvider
-     *            provides access to annotations (typically, the field or parameter to which an
-     *            injection-related annotation is attached); annotations on the field or parameter
-     *            may also be used when resolving the desired object
-     * @param locator
-     *            locator for the <em>context</em> in which the provider is being used
+     *
+     * @param objectType         the expected object type
+     * @param annotationProvider provides access to annotations (typically, the field or parameter to which an
+     *                           injection-related annotation is attached); annotations on the field or parameter
+     *                           may also be used when resolving the desired object
+     * @param locator            locator for the <em>context</em> in which the provider is being used
      * @param <T>
      * @return the requested object, or null if this object provider can not supply an object
-     * @throws RuntimeException
-     *             if the expression can not be evaluated, or the type of object identified is not
-     *             assignable to the type specified by the objectType parameter
+     * @throws RuntimeException if the expression can not be evaluated, or the type of object identified is not
+     *                          assignable to the type specified by the objectType parameter
      */
     <T> T provide(Class<T> objectType, AnnotationProvider annotationProvider, ObjectLocator locator);
 }

Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/Orderable.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/Orderable.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/Orderable.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/Orderable.java Mon Nov 12 14:22:31 2007
@@ -1,26 +1,26 @@
-// Copyright 2006 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 2006 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.apache.tapestry.ioc;
 
-import static org.apache.tapestry.ioc.internal.util.Defense.notBlank;
+import static org.apache.tapestry.ioc.internal.util.Defense.notBlank;
 
 /**
  * A wrapper that allows objects of a target type to be ordered. Each Orderable object is given a
  * unique id and a set of pre-requisites (objects which should be ordered earlier) and
  * post-requisites (objects which should be ordered later).
- * 
+ *
  * @param <T>
  */
 public class Orderable<T>
@@ -32,11 +32,9 @@
     private final String[] _constraints;
 
     /**
-     * @param id
-     *            unique identifier for the target object
-     * @param target
-     *            the object to be ordered; this may also be null (in which case the id represents a
-     *            placeholder)
+     * @param id     unique identifier for the target object
+     * @param target the object to be ordered; this may also be null (in which case the id represents a
+     *               placeholder)
      */
 
     public Orderable(String id, T target, String... constraints)

Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/OrderedConfiguration.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/OrderedConfiguration.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/OrderedConfiguration.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/OrderedConfiguration.java Mon Nov 12 14:22:31 2007
@@ -1,23 +1,23 @@
-// Copyright 2006 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 2006 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.apache.tapestry.ioc;
 
 /**
  * Object passed into a service contributor method that allows the method provide contributed values
  * to the service's configuration.
- * <p>
+ * <p/>
  * A service can <em>collect</em> contributions in three different ways:
  * <ul>
  * <li>As an un-ordered collection of values</li>
@@ -25,11 +25,9 @@
  * post-requisites)</li>
  * <li>As a map of keys and values
  * </ul>
- * <p>
+ * <p/>
  * The service defines the <em>type</em> of contribution, in terms of a base class or service
  * interface. Contributions must be compatible with the type.
- * 
- * 
  */
 public interface OrderedConfiguration<T>
 {
@@ -37,13 +35,11 @@
      * Adds an ordered object to a service's contribution. Each object has an id (which must be
      * unique). Optionally, pre-requisites (a list of ids that must precede this object) and
      * post-requisites (ids that must follow) can be provided.
-     * 
-     * @param id
-     *            a unique id for the object; the id will be fully qualified with the contributing
-     *            module's id
+     *
+     * @param id          a unique id for the object; the id will be fully qualified with the contributing
+     *                    module's id
+     * @param constraints used to order the object relative to other contributed objects
      * @parm object to add to the service's configuration
-     * @param constraints
-     *            used to order the object relative to other contributed objects
      */
     void add(String id, T object, String... constraints);
 }

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=594319&r1=594318&r2=594319&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 Mon Nov 12 14:22:31 2007
@@ -24,7 +24,7 @@
     /**
      * Invoked at the end of a request to discard any thread-specific information accumulated during
      * the current request.
-     * 
+     *
      * @see org.apache.tapestry.ioc.services.ThreadCleanupHub
      * @see org.apache.tapestry.ioc.services.ThreadCleanupListener
      */
@@ -34,7 +34,7 @@
      * 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
      */

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=594319&r1=594318&r2=594319&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 Mon Nov 12 14:22:31 2007
@@ -14,12 +14,6 @@
 
 package org.apache.tapestry.ioc;
 
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
-
-import java.lang.reflect.AnnotatedElement;
-import java.util.Arrays;
-import java.util.List;
-
 import org.apache.tapestry.ioc.annotations.SubModule;
 import org.apache.tapestry.ioc.def.ModuleDef;
 import org.apache.tapestry.ioc.internal.DefaultModuleDefImpl;
@@ -27,11 +21,16 @@
 import org.apache.tapestry.ioc.internal.RegistryImpl;
 import org.apache.tapestry.ioc.internal.RegistryWrapper;
 import org.apache.tapestry.ioc.internal.services.ClassFactoryImpl;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
 import org.apache.tapestry.ioc.internal.util.OneShotLock;
 import org.apache.tapestry.ioc.services.ClassFactory;
 import org.apache.tapestry.ioc.services.TapestryIOCModule;
 import org.slf4j.Logger;
 
+import java.lang.reflect.AnnotatedElement;
+import java.util.Arrays;
+import java.util.List;
+
 /**
  * Used to construct the IoC {@link org.apache.tapestry.ioc.Registry}. This class is <em>not</em>
  * thread-safe. The Registry, once created, <em>is</em> thread-safe.
@@ -40,7 +39,9 @@
 {
     private final OneShotLock _lock = new OneShotLock();
 
-    /** Module defs, keyed on module id. */
+    /**
+     * Module defs, keyed on module id.
+     */
     final List<ModuleDef> _modules = newList();
 
     private final ClassLoader _classLoader;

Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/Resource.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/Resource.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/Resource.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/Resource.java Mon Nov 12 14:22:31 2007
@@ -21,16 +21,20 @@
  * Represents a resource on the server that may be used for server side processing, or may be
  * exposed to the client side. Generally, this represents an abstraction on top of files on the
  * class path and files stored in the web application context.
- * <p>
+ * <p/>
  * Resources are often used as map keys; they should be immutable and should implement hashCode()
  * and equals().
  */
 public interface Resource
 {
-    /** Returns the URL for the resource, or null if it does not exist. */
+    /**
+     * Returns the URL for the resource, or null if it does not exist.
+     */
     URL toURL();
 
-    /** Returns a localized version of the resource. May return null if no such resource exists. */
+    /**
+     * Returns a localized version of the resource. May return null if no such resource exists.
+     */
     Resource forLocale(Locale locale);
 
     /**
@@ -44,9 +48,8 @@
      * Returns a new Resource with the extension changed (or, if the resource does not have an
      * extension, the extension is added). The new Resource may not exist (that is, {@link #toURL()}
      * may return null.
-     * 
-     * @param extension
-     *            to apply to the resource, such as "html" or "properties"
+     *
+     * @param extension to apply to the resource, such as "html" or "properties"
      * @return the new resource
      */
     Resource withExtension(String extension);
@@ -63,6 +66,8 @@
      */
     String getFile();
 
-    /** Return the path (the combination of folder and file). */
+    /**
+     * Return the path (the combination of folder and file).
+     */
     String getPath();
 }

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=594319&r1=594318&r2=594319&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 Mon Nov 12 14:22:31 2007
@@ -31,7 +31,7 @@
      * {@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
      * @return
@@ -42,14 +42,12 @@
      * 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)
-     * @param serviceImplementation
-     *            implementation class that implements the service interface
+     * @param serviceInterface      service interface (used when locating services, and when building proxies)
+     * @param serviceImplementation implementation class that implements the service interface
      * @return binding options, used to specify additional details about the service.
      */
     <T> ServiceBindingOptions bind(Class<T> serviceInterface,
-            Class<? extends T> serviceImplementation);
+                                   Class<? extends T> serviceImplementation);
 }

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=594319&r1=594318&r2=594319&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 Mon Nov 12 14:22:31 2007
@@ -14,16 +14,16 @@
 
 package org.apache.tapestry.ioc;
 
-import java.lang.annotation.Annotation;
-
 import org.apache.tapestry.ioc.annotations.EagerLoad;
 import org.apache.tapestry.ioc.annotations.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.
- * 
+ *
  * @see ServiceDef
  */
 public interface ServiceBindingOptions
@@ -32,7 +32,7 @@
      * 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
      */
@@ -41,7 +41,7 @@
     /**
      * 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
      */
@@ -50,7 +50,7 @@
     /**
      * 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();
@@ -61,10 +61,9 @@
      * 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
+     * @param marker one or more markers to add
      * @return this binding options, for further configuration
      */
     <T extends Annotation> ServiceBindingOptions withMarker(Class<T>... marker);

Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/ServiceDecorator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/ServiceDecorator.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/ServiceDecorator.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/ServiceDecorator.java Mon Nov 12 14:22:31 2007
@@ -1,34 +1,31 @@
-// Copyright 2006 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 2006 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.apache.tapestry.ioc;
 
 /**
  * A service decorator is derived from a {@link org.apache.tapestry.ioc.def.DecoratorDef} and is
  * responsible for building an interceptor around an existing implementation (called the
  * "delegate").
- * 
- * 
  */
 public interface ServiceDecorator
 {
     /**
      * Creates a new interceptor object implementing the same service interface as the delegate
      * object.
-     * 
-     * @param delegate
-     *            an existing object implementing the service interface.
+     *
+     * @param delegate an existing object implementing the service interface.
      * @return a new object implementing the same service interface, or delegate or null if the
      *         decorator chooses not to create a new interceptor.
      */

Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/ServiceLifecycle.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/ServiceLifecycle.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/ServiceLifecycle.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/ServiceLifecycle.java Mon Nov 12 14:22:31 2007
@@ -1,37 +1,33 @@
-// Copyright 2006 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 2006 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.apache.tapestry.ioc;
 
 /**
  * Allows certain types of lifecycles to control exactly how services are instantiated.
- * 
- * 
  */
 public interface ServiceLifecycle
 {
     /**
      * Returns the same creator, or a new one, that encapsulates the creation of the core service
      * implementation.
-     * 
-     * @param resources
-     *            source of information about the service to be created, and source of additional
-     *            services or other resources that may be needed when constructing the core service
-     *            implementation
-     * @param creator
-     *            object capable of creating the service implementation on demand. This is a wrapper
-     *            around the service's builder method.
+     *
+     * @param resources source of information about the service to be created, and source of additional
+     *                  services or other resources that may be needed when constructing the core service
+     *                  implementation
+     * @param creator   object capable of creating the service implementation on demand. This is a wrapper
+     *                  around the service's builder method.
      * @return the service or equivalent service proxy
      */
     Object createService(ServiceResources resources, ObjectCreator creator);

Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/ServiceResources.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/ServiceResources.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/ServiceResources.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/ServiceResources.java Mon Nov 12 14:22:31 2007
@@ -23,10 +23,14 @@
  */
 public interface ServiceResources extends ObjectLocator
 {
-    /** Returns the fully qualified id of the service. */
+    /**
+     * Returns the fully qualified id of the service.
+     */
     String getServiceId();
 
-    /** Returns the service interface implemented by the service. */
+    /**
+     * Returns the service interface implemented by the service.
+     */
     Class getServiceInterface();
 
     /**

Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/annotations/EagerLoad.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/annotations/EagerLoad.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/annotations/EagerLoad.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/annotations/EagerLoad.java Mon Nov 12 14:22:31 2007
@@ -14,26 +14,25 @@
 
 package org.apache.tapestry.ioc.annotations;
 
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import org.apache.tapestry.ioc.ServiceBinder;
 
 import java.lang.annotation.Documented;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
 import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import java.lang.annotation.Target;
 
-import org.apache.tapestry.ioc.ServiceBinder;
-
 /**
  * Marker annotation placed on a service builder method to indicate that the service should be
  * eagerly loaded: realized as if a service method had been invoked. Service realization invokes the
  * service builder method and applys any decorators to the service.
- * <p>
+ * <p/>
  * This annotation may also be placed directly on a service implementation class, when using
  * autobuilding via the {@link ServiceBinder}.
  */
 @Target(
-{ TYPE, METHOD })
+        {TYPE, METHOD})
 @Retention(RUNTIME)
 @Documented
 public @interface EagerLoad

Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/annotations/Inject.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/annotations/Inject.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/annotations/Inject.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/annotations/Inject.java Mon Nov 12 14:22:31 2007
@@ -14,35 +14,34 @@
 
 package org.apache.tapestry.ioc.annotations;
 
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import org.apache.tapestry.ioc.ObjectProvider;
 
 import java.lang.annotation.Documented;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.PARAMETER;
 import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import java.lang.annotation.Target;
 
-import org.apache.tapestry.ioc.ObjectProvider;
-
 /**
  * This annotation serves two similar purposes: it marks parameters that should be injected in the
  * IoC container, and it marks fields that should be injected inside Tapestry components.
- * <p>
+ * <p/>
  * In terms of the IoC container; normally, resources take precedence over annotations when
  * injecting. The Inject annotation overrides this default, forcing the resolution of the parameters
  * value via the master {@link ObjectProvider}, even when the parameter's type matches a type that
  * is normally a resource. This is most often used in conjunction with {@link Value} annotation when
  * injecting a string, as normally, the String would be matched as the service id.
- * <p>
+ * <p/>
  * In terms of the IoC container, the Inject annotation is only used on parameters to service
  * builder methods and constructors. However, inside Tapestry components (<em>and only inside components</em>),
  * it may be applied to fields. On fields that require injection, the Inject annotation is
  * <em>required</em>.
- * 
+ *
  * @see ObjectProvider
  */
 @Target(
-{ PARAMETER, FIELD })
+        {PARAMETER, FIELD})
 @Retention(RUNTIME)
 @Documented
 public @interface Inject



Mime
View raw message