You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2006/11/21 04:17:43 UTC
svn commit: r477483 [2/3] - in /tapestry/tapestry5/tapestry-core/trunk/src:
main/java/org/apache/tapestry/corelib/components/
main/java/org/apache/tapestry/dom/ main/java/org/apache/tapestry/internal/
main/java/org/apache/tapestry/internal/bindings/ ma...
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/DefaultModuleDefImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/DefaultModuleDefImpl.java?view=diff&rev=477483&r1=477482&r2=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/DefaultModuleDefImpl.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/DefaultModuleDefImpl.java Mon Nov 20 19:17:37 2006
@@ -21,8 +21,8 @@
import static org.apache.tapestry.ioc.internal.IOCMessages.buildMethodConflict;
import static org.apache.tapestry.ioc.internal.IOCMessages.buildMethodWrongReturnType;
import static org.apache.tapestry.ioc.internal.IOCMessages.decoratorMethodWrongReturnType;
-import static org.apache.tapestry.util.CollectionFactory.newMap;
-import static org.apache.tapestry.util.CollectionFactory.newSet;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newSet;
import java.lang.annotation.Annotation;
import java.lang.reflect.AnnotatedElement;
Copied: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/GlobPatternMatcher.java (from r477469, tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/GlobPatternMatcher.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/GlobPatternMatcher.java?view=diff&rev=477483&p1=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/GlobPatternMatcher.java&r1=477469&p2=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/GlobPatternMatcher.java&r2=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/GlobPatternMatcher.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/GlobPatternMatcher.java Mon Nov 20 19:17:37 2006
@@ -12,85 +12,82 @@
// 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.MatchType.ANY;
-import static org.apache.tapestry.ioc.MatchType.INFIX;
-import static org.apache.tapestry.ioc.MatchType.PREFIX;
-import static org.apache.tapestry.ioc.MatchType.SUFFIX;
-
-/**
- *
- */
-public class GlobPatternMatcher
-{
- private String _substring;
-
- private MatchType _type;
-
- public GlobPatternMatcher(String pattern)
- {
- analyze(pattern);
- }
-
- private void analyze(String pattern)
- {
- if (pattern.equals("*"))
- {
- _type = ANY;
- return;
- }
-
- boolean globPrefix = pattern.startsWith("*");
- boolean globSuffix = pattern.endsWith("*");
-
- if (globPrefix && globSuffix)
- {
- _substring = pattern.substring(1, pattern.length() - 1);
- _type = INFIX;
- return;
- }
-
- if (globPrefix)
- {
- _substring = pattern.substring(1);
- _type = SUFFIX;
- return;
- }
-
- if (globSuffix)
- {
- _substring = pattern.substring(0, pattern.length() - 1);
- _type = PREFIX;
- return;
- }
-
- _type = MatchType.EXACT;
- _substring = pattern;
- }
-
- public boolean matches(String input)
- {
- switch (_type)
- {
- case ANY:
- return true;
-
- case EXACT:
-
- return input.equals(_substring);
-
- case INFIX:
-
- return input.contains(_substring);
-
- case PREFIX:
-
- return input.startsWith(_substring);
-
- default:
-
- return input.endsWith(_substring);
- }
- }
-}
+package org.apache.tapestry.ioc.internal;
+
+import static org.apache.tapestry.ioc.internal.MatchType.ANY;
+import static org.apache.tapestry.ioc.internal.MatchType.INFIX;
+import static org.apache.tapestry.ioc.internal.MatchType.PREFIX;
+import static org.apache.tapestry.ioc.internal.MatchType.SUFFIX;
+
+public class GlobPatternMatcher
+{
+ private String _substring;
+
+ private MatchType _type;
+
+ public GlobPatternMatcher(String pattern)
+ {
+ analyze(pattern);
+ }
+
+ private void analyze(String pattern)
+ {
+ if (pattern.equals("*"))
+ {
+ _type = ANY;
+ return;
+ }
+
+ boolean globPrefix = pattern.startsWith("*");
+ boolean globSuffix = pattern.endsWith("*");
+
+ if (globPrefix && globSuffix)
+ {
+ _substring = pattern.substring(1, pattern.length() - 1);
+ _type = INFIX;
+ return;
+ }
+
+ if (globPrefix)
+ {
+ _substring = pattern.substring(1);
+ _type = SUFFIX;
+ return;
+ }
+
+ if (globSuffix)
+ {
+ _substring = pattern.substring(0, pattern.length() - 1);
+ _type = PREFIX;
+ return;
+ }
+
+ _type = MatchType.EXACT;
+ _substring = pattern;
+ }
+
+ public boolean matches(String input)
+ {
+ switch (_type)
+ {
+ case ANY:
+ return true;
+
+ case EXACT:
+
+ return input.equals(_substring);
+
+ case INFIX:
+
+ return input.contains(_substring);
+
+ case PREFIX:
+
+ return input.startsWith(_substring);
+
+ default:
+
+ return input.endsWith(_substring);
+ }
+ }
+}
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/IdMatcherImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/IdMatcherImpl.java?view=diff&rev=477483&r1=477482&r2=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/IdMatcherImpl.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/IdMatcherImpl.java Mon Nov 20 19:17:37 2006
@@ -14,7 +14,6 @@
package org.apache.tapestry.ioc.internal;
-import org.apache.tapestry.ioc.GlobPatternMatcher;
import org.apache.tapestry.ioc.IdMatcher;
/**
Copied: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/MatchType.java (from r477469, tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/MatchType.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/MatchType.java?view=diff&rev=477483&p1=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/MatchType.java&r1=477469&p2=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/MatchType.java&r2=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/MatchType.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/MatchType.java Mon Nov 20 19:17:37 2006
@@ -15,7 +15,7 @@
/**
*
*/
-package org.apache.tapestry.ioc;
+package org.apache.tapestry.ioc.internal;
enum MatchType {
EXACT, PREFIX, SUFFIX, INFIX, ANY
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/ModuleImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/ModuleImpl.java?view=diff&rev=477483&r1=477482&r2=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/ModuleImpl.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/ModuleImpl.java Mon Nov 20 19:17:37 2006
@@ -15,11 +15,11 @@
package org.apache.tapestry.ioc.internal;
import static java.lang.String.format;
-import static org.apache.tapestry.util.CollectionFactory.newList;
-import static org.apache.tapestry.util.CollectionFactory.newMap;
-import static org.apache.tapestry.util.CollectionFactory.newSet;
-import static org.apache.tapestry.util.Defense.notBlank;
-import static org.apache.tapestry.util.Defense.notNull;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newSet;
+import static org.apache.tapestry.ioc.internal.util.Defense.notBlank;
+import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
@@ -46,7 +46,7 @@
import org.apache.tapestry.ioc.services.ClassFab;
import org.apache.tapestry.ioc.services.MethodSignature;
import org.apache.tapestry.ioc.services.RegistryShutdownListener;
-import org.apache.tapestry.util.BodyBuilder;
+import org.apache.tapestry.ioc.util.BodyBuilder;
/**
*
Copied: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/OrIdMatcher.java (from r477469, tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/OrIdMatcher.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/OrIdMatcher.java?view=diff&rev=477483&p1=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/OrIdMatcher.java&r1=477469&p2=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/OrIdMatcher.java&r2=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/OrIdMatcher.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/OrIdMatcher.java Mon Nov 20 19:17:37 2006
@@ -12,9 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc;
+package org.apache.tapestry.ioc.internal;
import java.util.Collection;
+
+import org.apache.tapestry.ioc.IdMatcher;
/**
* A wrapper around a collection of IdMatchers. A match occurs if <em>any</em> matcher matches.
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/RegistryImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/RegistryImpl.java?view=diff&rev=477483&r1=477482&r2=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/RegistryImpl.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/RegistryImpl.java Mon Nov 20 19:17:37 2006
@@ -14,8 +14,8 @@
package org.apache.tapestry.ioc.internal;
-import static org.apache.tapestry.util.CollectionFactory.newList;
-import static org.apache.tapestry.util.CollectionFactory.newMap;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
import java.util.Arrays;
import java.util.Collection;
@@ -44,6 +44,7 @@
import org.apache.tapestry.ioc.internal.services.ClassFactoryImpl;
import org.apache.tapestry.ioc.internal.services.RegistryShutdownHubImpl;
import org.apache.tapestry.ioc.internal.services.ThreadCleanupHubImpl;
+import org.apache.tapestry.ioc.internal.util.CollectionFactory;
import org.apache.tapestry.ioc.internal.util.OneShotLock;
import org.apache.tapestry.ioc.internal.util.Orderer;
import org.apache.tapestry.ioc.services.ClassFab;
@@ -52,7 +53,6 @@
import org.apache.tapestry.ioc.services.RegistryShutdownListener;
import org.apache.tapestry.ioc.services.ServiceLifecycleSource;
import org.apache.tapestry.ioc.services.ThreadCleanupHub;
-import org.apache.tapestry.util.CollectionFactory;
public class RegistryImpl implements Registry, InternalRegistry
{
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/ServiceBuilderMethodInvoker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/ServiceBuilderMethodInvoker.java?view=diff&rev=477483&r1=477482&r2=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/ServiceBuilderMethodInvoker.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/ServiceBuilderMethodInvoker.java Mon Nov 20 19:17:37 2006
@@ -17,7 +17,7 @@
import static org.apache.tapestry.ioc.internal.ConfigurationType.MAPPED;
import static org.apache.tapestry.ioc.internal.ConfigurationType.ORDERED;
import static org.apache.tapestry.ioc.internal.ConfigurationType.UNORDERED;
-import static org.apache.tapestry.util.CollectionFactory.newMap;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/ServiceDecoratorImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/ServiceDecoratorImpl.java?view=diff&rev=477483&r1=477482&r2=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/ServiceDecoratorImpl.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/ServiceDecoratorImpl.java Mon Nov 20 19:17:37 2006
@@ -14,7 +14,7 @@
package org.apache.tapestry.ioc.internal;
-import static org.apache.tapestry.util.CollectionFactory.newMap;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/AbstractFab.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/AbstractFab.java?view=diff&rev=477483&r1=477482&r2=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/AbstractFab.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/AbstractFab.java Mon Nov 20 19:17:37 2006
@@ -14,7 +14,7 @@
package org.apache.tapestry.ioc.internal.services;
-import static org.apache.tapestry.util.CollectionFactory.newMap;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
import java.util.Map;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/BridgeBuilder.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/BridgeBuilder.java?view=diff&rev=477483&r1=477482&r2=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/BridgeBuilder.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/BridgeBuilder.java Mon Nov 20 19:17:37 2006
@@ -15,7 +15,7 @@
package org.apache.tapestry.ioc.internal.services;
import static java.lang.String.format;
-import static org.apache.tapestry.util.CollectionFactory.newList;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
import java.lang.reflect.Constructor;
import java.lang.reflect.Modifier;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/ChainBuilderImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/ChainBuilderImpl.java?view=diff&rev=477483&r1=477482&r2=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/ChainBuilderImpl.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/ChainBuilderImpl.java Mon Nov 20 19:17:37 2006
@@ -15,7 +15,7 @@
package org.apache.tapestry.ioc.internal.services;
import static java.lang.String.format;
-import static org.apache.tapestry.util.CollectionFactory.newThreadSafeMap;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newThreadSafeMap;
import java.lang.reflect.Constructor;
import java.lang.reflect.Modifier;
@@ -28,7 +28,7 @@
import org.apache.tapestry.ioc.services.ClassFactory;
import org.apache.tapestry.ioc.services.MethodIterator;
import org.apache.tapestry.ioc.services.MethodSignature;
-import org.apache.tapestry.util.BodyBuilder;
+import org.apache.tapestry.ioc.util.BodyBuilder;
/**
*
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/ClassFabImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/ClassFabImpl.java?view=diff&rev=477483&r1=477482&r2=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/ClassFabImpl.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/ClassFabImpl.java Mon Nov 20 19:17:37 2006
@@ -15,8 +15,8 @@
package org.apache.tapestry.ioc.internal.services;
import static java.lang.String.format;
-import static org.apache.tapestry.util.CollectionFactory.newMap;
-import static org.apache.tapestry.util.CollectionFactory.newSet;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newSet;
import java.lang.reflect.Modifier;
import java.util.Formatter;
@@ -31,12 +31,12 @@
import javassist.NotFoundException;
import org.apache.commons.logging.Log;
+import org.apache.tapestry.ioc.internal.util.Defense;
import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.apache.tapestry.ioc.services.ClassFab;
import org.apache.tapestry.ioc.services.ClassFabUtils;
import org.apache.tapestry.ioc.services.MethodIterator;
import org.apache.tapestry.ioc.services.MethodSignature;
-import org.apache.tapestry.util.Defense;
/**
* Implementation of {@link org.apache.tapestry.ioc.services.ClassFab}. Hides, as much as possible,
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/ClassFactoryClassPool.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/ClassFactoryClassPool.java?view=diff&rev=477483&r1=477482&r2=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/ClassFactoryClassPool.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/ClassFactoryClassPool.java Mon Nov 20 19:17:37 2006
@@ -14,7 +14,7 @@
package org.apache.tapestry.ioc.internal.services;
-import static org.apache.tapestry.util.CollectionFactory.newSet;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newSet;
import java.util.Set;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/ClassPropertyAdapterImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/ClassPropertyAdapterImpl.java?view=diff&rev=477483&r1=477482&r2=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/ClassPropertyAdapterImpl.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/ClassPropertyAdapterImpl.java Mon Nov 20 19:17:37 2006
@@ -14,7 +14,7 @@
package org.apache.tapestry.ioc.internal.services;
-import static org.apache.tapestry.util.CollectionFactory.newMap;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
import java.beans.PropertyDescriptor;
import java.util.List;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/DefaultImplementationBuilderImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/DefaultImplementationBuilderImpl.java?view=diff&rev=477483&r1=477482&r2=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/DefaultImplementationBuilderImpl.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/DefaultImplementationBuilderImpl.java Mon Nov 20 19:17:37 2006
@@ -15,7 +15,7 @@
package org.apache.tapestry.ioc.internal.services;
import static java.lang.String.format;
-import static org.apache.tapestry.util.CollectionFactory.newThreadSafeMap;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newThreadSafeMap;
import java.util.Map;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/ExceptionAnalyzerImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/ExceptionAnalyzerImpl.java?view=diff&rev=477483&r1=477482&r2=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/ExceptionAnalyzerImpl.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/ExceptionAnalyzerImpl.java Mon Nov 20 19:17:37 2006
@@ -14,21 +14,21 @@
package org.apache.tapestry.ioc.internal.services;
-import static org.apache.tapestry.util.CollectionFactory.newList;
-import static org.apache.tapestry.util.CollectionFactory.newMap;
-import static org.apache.tapestry.util.CollectionFactory.newSet;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newSet;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import org.apache.tapestry.ioc.internal.util.CollectionFactory;
import org.apache.tapestry.ioc.services.ClassPropertyAdapter;
import org.apache.tapestry.ioc.services.ExceptionAnalysis;
import org.apache.tapestry.ioc.services.ExceptionAnalyzer;
import org.apache.tapestry.ioc.services.ExceptionInfo;
import org.apache.tapestry.ioc.services.PropertyAccess;
-import org.apache.tapestry.util.CollectionFactory;
/**
*
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/ExceptionTrackerImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/ExceptionTrackerImpl.java?view=diff&rev=477483&r1=477482&r2=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/ExceptionTrackerImpl.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/ExceptionTrackerImpl.java Mon Nov 20 19:17:37 2006
@@ -14,7 +14,7 @@
package org.apache.tapestry.ioc.internal.services;
-import static org.apache.tapestry.util.CollectionFactory.newSet;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newSet;
import java.util.Set;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/LoggingDecoratorImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/LoggingDecoratorImpl.java?view=diff&rev=477483&r1=477482&r2=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/LoggingDecoratorImpl.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/LoggingDecoratorImpl.java Mon Nov 20 19:17:37 2006
@@ -28,7 +28,7 @@
import org.apache.tapestry.ioc.services.LoggingDecorator;
import org.apache.tapestry.ioc.services.MethodIterator;
import org.apache.tapestry.ioc.services.MethodSignature;
-import org.apache.tapestry.util.BodyBuilder;
+import org.apache.tapestry.ioc.util.BodyBuilder;
/**
*
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/PropertyAccessImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/PropertyAccessImpl.java?view=diff&rev=477483&r1=477482&r2=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/PropertyAccessImpl.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/PropertyAccessImpl.java Mon Nov 20 19:17:37 2006
@@ -14,7 +14,7 @@
package org.apache.tapestry.ioc.internal.services;
-import static org.apache.tapestry.util.CollectionFactory.newThreadSafeMap;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newThreadSafeMap;
import java.beans.BeanInfo;
import java.beans.Introspector;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/PropertyAdapterImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/PropertyAdapterImpl.java?view=diff&rev=477483&r1=477482&r2=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/PropertyAdapterImpl.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/PropertyAdapterImpl.java Mon Nov 20 19:17:37 2006
@@ -18,8 +18,8 @@
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
+import org.apache.tapestry.ioc.internal.util.Defense;
import org.apache.tapestry.ioc.services.PropertyAdapter;
-import org.apache.tapestry.util.Defense;
public class PropertyAdapterImpl implements PropertyAdapter
{
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/RegistryShutdownHubImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/RegistryShutdownHubImpl.java?view=diff&rev=477483&r1=477482&r2=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/RegistryShutdownHubImpl.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/RegistryShutdownHubImpl.java Mon Nov 20 19:17:37 2006
@@ -14,7 +14,7 @@
package org.apache.tapestry.ioc.internal.services;
-import static org.apache.tapestry.util.CollectionFactory.newThreadSafeList;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newThreadSafeList;
import java.util.List;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/ServiceLogger.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/ServiceLogger.java?view=diff&rev=477483&r1=477482&r2=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/ServiceLogger.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/ServiceLogger.java Mon Nov 20 19:17:37 2006
@@ -19,8 +19,8 @@
import java.util.Iterator;
import org.apache.commons.logging.Log;
+import org.apache.tapestry.ioc.internal.util.Defense;
import org.apache.tapestry.ioc.services.ExceptionTracker;
-import org.apache.tapestry.util.Defense;
/**
* Used by {@link org.apache.tapestry.ioc.internal.services.LoggingDecoratorImpl} to delegate out
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/StrategyBuilderImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/StrategyBuilderImpl.java?view=diff&rev=477483&r1=477482&r2=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/StrategyBuilderImpl.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/StrategyBuilderImpl.java Mon Nov 20 19:17:37 2006
@@ -21,8 +21,8 @@
import org.apache.tapestry.ioc.services.MethodIterator;
import org.apache.tapestry.ioc.services.MethodSignature;
import org.apache.tapestry.ioc.services.StrategyBuilder;
-import org.apache.tapestry.util.BodyBuilder;
-import org.apache.tapestry.util.StrategyRegistry;
+import org.apache.tapestry.ioc.util.BodyBuilder;
+import org.apache.tapestry.ioc.util.StrategyRegistry;
public class StrategyBuilderImpl implements StrategyBuilder
{
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/ThreadCleanupHubImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/ThreadCleanupHubImpl.java?view=diff&rev=477483&r1=477482&r2=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/ThreadCleanupHubImpl.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/ThreadCleanupHubImpl.java Mon Nov 20 19:17:37 2006
@@ -14,7 +14,7 @@
package org.apache.tapestry.ioc.internal.services;
-import static org.apache.tapestry.util.CollectionFactory.newList;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
import java.util.List;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/TypeCoercerImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/TypeCoercerImpl.java?view=diff&rev=477483&r1=477482&r2=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/TypeCoercerImpl.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/TypeCoercerImpl.java Mon Nov 20 19:17:37 2006
@@ -14,11 +14,11 @@
package org.apache.tapestry.ioc.internal.services;
-import static org.apache.tapestry.util.CollectionFactory.newLinkedList;
-import static org.apache.tapestry.util.CollectionFactory.newList;
-import static org.apache.tapestry.util.CollectionFactory.newMap;
-import static org.apache.tapestry.util.CollectionFactory.newSet;
-import static org.apache.tapestry.util.CollectionFactory.newThreadSafeMap;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newLinkedList;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newSet;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newThreadSafeMap;
import java.util.Collection;
import java.util.LinkedList;
@@ -28,12 +28,12 @@
import org.apache.tapestry.internal.services.CompoundCoercion;
import org.apache.tapestry.internal.util.InheritanceSearch;
+import org.apache.tapestry.ioc.internal.util.Defense;
import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.apache.tapestry.ioc.services.Coercion;
import org.apache.tapestry.ioc.services.CoercionTuple;
import org.apache.tapestry.ioc.services.TypeCoercer;
import org.apache.tapestry.services.TransformUtils;
-import org.apache.tapestry.util.Defense;
/**
*
Copied: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/CollectionFactory.java (from r477469, tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/util/CollectionFactory.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/CollectionFactory.java?view=diff&rev=477483&p1=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/util/CollectionFactory.java&r1=477469&p2=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/CollectionFactory.java&r2=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/util/CollectionFactory.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/CollectionFactory.java Mon Nov 20 19:17:37 2006
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.util;
+package org.apache.tapestry.ioc.internal.util;
import java.util.ArrayList;
import java.util.Arrays;
Copied: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/Defense.java (from r477469, tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/util/Defense.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/Defense.java?view=diff&rev=477483&p1=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/util/Defense.java&r1=477469&p2=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/Defense.java&r2=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/util/Defense.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/Defense.java Mon Nov 20 19:17:37 2006
@@ -12,86 +12,86 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.util;
-
-/**
- * Static utility methods for defensive programming.
- */
-public final class Defense
-{
- private Defense()
- {
- }
-
- /**
- * Checks that a method parameter value is not null, and returns it. This method is used in
- * situations where some of the parameters to a method are allowed to be null and other's arent.
- * In that situation, the method will be annotated with {@link SuppressNullCheck}, and the
- * relevent null checks will occur inside the method implementation.
- *
- * @param <T>
- * the value type
- * @param value
- * the value (which is checked to ensure non-nullness)
- * @param parameterName
- * the name of the parameter, used for exception messages
- * @return the value
- * @throws IllegalArgumentException
- * if the value is null
- */
- public static <T> T notNull(T value, String parameterName)
- {
- if (value == null)
- throw new IllegalArgumentException(UtilMessages.parameterWasNull(parameterName));
-
- return value;
- }
-
- /**
- * Checks that a parameter value is not null and not empty.
- *
- * @param value
- * value to check (which is returned)
- * @param parameterName
- * the name of the parameter, used for exception messages
- * @return the value, trimmed, if non-blank
- * @throws IllegalArgumentException
- * if the value is null or empty
- */
- public static String notBlank(String value, String parameterName)
- {
- if (value != null)
- {
- String trimmedValue = value.trim();
-
- if (!trimmedValue.equals(""))
- return trimmedValue;
- }
-
- throw new IllegalArgumentException(UtilMessages.parameterWasBlank(parameterName));
- }
-
- /**
- * Checks that the provided value is not null, and may be cast to the desired type.
- *
- * @param <T>
- * @param parameterValue
- * @param type
- * @param parameterName
- * @throws IllegalArgumentException
- * if the value is null, or is not assignable to the indicated type
- * @return the casted value
- */
- public static <T> T cast(Object parameterValue, Class<T> type, String parameterName)
- {
- notNull(parameterValue, parameterName);
-
- if (!type.isInstance(parameterValue))
- throw new IllegalArgumentException(UtilMessages.badCast(
- parameterName,
- parameterValue,
- type));
-
- return type.cast(parameterValue);
- }
-}
+package org.apache.tapestry.ioc.internal.util;
+
+/**
+ * Static utility methods for defensive programming.
+ */
+public final class Defense
+{
+ private Defense()
+ {
+ }
+
+ /**
+ * Checks that a method parameter value is not null, and returns it. This method is used in
+ * situations where some of the parameters to a method are allowed to be null and other's arent.
+ * In that situation, the method will be annotated with {@link SuppressNullCheck}, and the
+ * relevent null checks will occur inside the method implementation.
+ *
+ * @param <T>
+ * the value type
+ * @param value
+ * the value (which is checked to ensure non-nullness)
+ * @param parameterName
+ * the name of the parameter, used for exception messages
+ * @return the value
+ * @throws IllegalArgumentException
+ * if the value is null
+ */
+ public static <T> T notNull(T value, String parameterName)
+ {
+ if (value == null)
+ throw new IllegalArgumentException(UtilMessages.parameterWasNull(parameterName));
+
+ return value;
+ }
+
+ /**
+ * Checks that a parameter value is not null and not empty.
+ *
+ * @param value
+ * value to check (which is returned)
+ * @param parameterName
+ * the name of the parameter, used for exception messages
+ * @return the value, trimmed, if non-blank
+ * @throws IllegalArgumentException
+ * if the value is null or empty
+ */
+ public static String notBlank(String value, String parameterName)
+ {
+ if (value != null)
+ {
+ String trimmedValue = value.trim();
+
+ if (!trimmedValue.equals(""))
+ return trimmedValue;
+ }
+
+ throw new IllegalArgumentException(UtilMessages.parameterWasBlank(parameterName));
+ }
+
+ /**
+ * Checks that the provided value is not null, and may be cast to the desired type.
+ *
+ * @param <T>
+ * @param parameterValue
+ * @param type
+ * @param parameterName
+ * @throws IllegalArgumentException
+ * if the value is null, or is not assignable to the indicated type
+ * @return the casted value
+ */
+ public static <T> T cast(Object parameterValue, Class<T> type, String parameterName)
+ {
+ notNull(parameterValue, parameterName);
+
+ if (!type.isInstance(parameterValue))
+ throw new IllegalArgumentException(UtilMessages.badCast(
+ parameterName,
+ parameterValue,
+ type));
+
+ return type.cast(parameterValue);
+ }
+}
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/DependencyNode.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/DependencyNode.java?view=diff&rev=477483&r1=477482&r2=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/DependencyNode.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/DependencyNode.java Mon Nov 20 19:17:37 2006
@@ -17,7 +17,7 @@
*/
package org.apache.tapestry.ioc.internal.util;
-import static org.apache.tapestry.util.CollectionFactory.newList;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
import java.util.List;
Copied: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/IdAllocator.java (from r477473, tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/util/IdAllocator.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/IdAllocator.java?view=diff&rev=477483&p1=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/util/IdAllocator.java&r1=477473&p2=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/IdAllocator.java&r2=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/util/IdAllocator.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/IdAllocator.java Mon Nov 20 19:17:37 2006
@@ -12,16 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.util;
+package org.apache.tapestry.ioc.internal.util;
-import static org.apache.tapestry.util.CollectionFactory.newMap;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
import java.util.HashMap;
import java.util.IdentityHashMap;
import java.util.List;
import java.util.Map;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
/**
* Used to "uniquify" names within a given context. A base name is passed in, and the return value
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/InternalUtils.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/InternalUtils.java?view=diff&rev=477483&r1=477482&r2=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/InternalUtils.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/InternalUtils.java Mon Nov 20 19:17:37 2006
@@ -14,7 +14,7 @@
package org.apache.tapestry.ioc.internal.util;
-import static org.apache.tapestry.util.CollectionFactory.newList;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/Orderer.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/Orderer.java?view=diff&rev=477483&r1=477482&r2=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/Orderer.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/Orderer.java Mon Nov 20 19:17:37 2006
@@ -14,8 +14,8 @@
package org.apache.tapestry.ioc.internal.util;
-import static org.apache.tapestry.util.CollectionFactory.newList;
-import static org.apache.tapestry.util.CollectionFactory.newMap;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
import java.util.Collection;
import java.util.List;
@@ -24,9 +24,9 @@
import org.apache.commons.logging.Log;
import org.apache.tapestry.ioc.IOCUtilities;
import org.apache.tapestry.ioc.IdMatcher;
-import org.apache.tapestry.ioc.OrIdMatcher;
import org.apache.tapestry.ioc.Orderable;
import org.apache.tapestry.ioc.internal.IdMatcherImpl;
+import org.apache.tapestry.ioc.internal.OrIdMatcher;
/**
* Used to order objects into an "execution" order. Each object must have a unique id. It may
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/UtilMessages.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/UtilMessages.java?view=diff&rev=477483&r1=477482&r2=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/UtilMessages.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/UtilMessages.java Mon Nov 20 19:17:37 2006
@@ -44,4 +44,19 @@
{
return MESSAGES.format("one-shot-lock", element);
}
+
+ static String parameterWasNull(String parameterName)
+ {
+ return MESSAGES.format("parameter-was-null", parameterName);
+ }
+
+ static String parameterWasBlank(String parameterName)
+ {
+ return MESSAGES.format("parameter-was-blank", parameterName);
+ }
+
+ static String badCast(String parameterName, Object parameterValue, Class type)
+ {
+ return MESSAGES.format("bad-cast", parameterName, parameterValue, type.getName());
+ }
}
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/services/ClassFabUtils.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/services/ClassFabUtils.java?view=diff&rev=477483&r1=477482&r2=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/services/ClassFabUtils.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/services/ClassFabUtils.java Mon Nov 20 19:17:37 2006
@@ -14,7 +14,7 @@
package org.apache.tapestry.ioc.services;
-import static org.apache.tapestry.util.CollectionFactory.newMap;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
import java.lang.reflect.Method;
import java.util.Map;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/services/MethodIterator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/services/MethodIterator.java?view=diff&rev=477483&r1=477482&r2=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/services/MethodIterator.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/services/MethodIterator.java Mon Nov 20 19:17:37 2006
@@ -14,8 +14,8 @@
package org.apache.tapestry.ioc.services;
-import static org.apache.tapestry.util.CollectionFactory.newList;
-import static org.apache.tapestry.util.CollectionFactory.newMap;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
import java.lang.reflect.Method;
import java.util.List;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/services/MethodSignature.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/services/MethodSignature.java?view=diff&rev=477483&r1=477482&r2=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/services/MethodSignature.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/services/MethodSignature.java Mon Nov 20 19:17:37 2006
@@ -14,9 +14,9 @@
package org.apache.tapestry.ioc.services;
+import static org.apache.tapestry.ioc.internal.util.Defense.notBlank;
+import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
import static org.apache.tapestry.ioc.internal.util.InternalUtils.size;
-import static org.apache.tapestry.util.Defense.notBlank;
-import static org.apache.tapestry.util.Defense.notNull;
import java.lang.reflect.Method;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/services/StrategyBuilder.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/services/StrategyBuilder.java?view=diff&rev=477483&r1=477482&r2=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/services/StrategyBuilder.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/services/StrategyBuilder.java Mon Nov 20 19:17:37 2006
@@ -14,7 +14,7 @@
package org.apache.tapestry.ioc.services;
-import org.apache.tapestry.util.StrategyRegistry;
+import org.apache.tapestry.ioc.util.StrategyRegistry;
/**
* A service implementation builder that operates around a {@link StrategyRegistry}, implementing a
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/services/TapestryIOCModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/services/TapestryIOCModule.java?view=diff&rev=477483&r1=477482&r2=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/services/TapestryIOCModule.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/services/TapestryIOCModule.java Mon Nov 20 19:17:37 2006
@@ -42,7 +42,7 @@
import org.apache.tapestry.ioc.internal.services.ServiceObjectProvider;
import org.apache.tapestry.ioc.internal.services.StrategyBuilderImpl;
import org.apache.tapestry.ioc.internal.services.TypeCoercerImpl;
-import org.apache.tapestry.util.StrategyRegistry;
+import org.apache.tapestry.ioc.util.StrategyRegistry;
/**
* Defines the base set of services for the Tapestry IOC container.
Copied: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/util/BodyBuilder.java (from r477469, tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/util/BodyBuilder.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/util/BodyBuilder.java?view=diff&rev=477483&p1=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/util/BodyBuilder.java&r1=477469&p2=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/util/BodyBuilder.java&r2=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/util/BodyBuilder.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/util/BodyBuilder.java Mon Nov 20 19:17:37 2006
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.util;
+package org.apache.tapestry.ioc.util;
import java.util.Formatter;
Propchange: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/util/BodyBuilder.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.5
Propchange: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/util/BodyBuilder.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/util/BodyBuilder.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/util/StrategyRegistry.java (from r477473, tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/util/StrategyRegistry.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/util/StrategyRegistry.java?view=diff&rev=477483&p1=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/util/StrategyRegistry.java&r1=477473&p2=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/util/StrategyRegistry.java&r2=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/util/StrategyRegistry.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/util/StrategyRegistry.java Mon Nov 20 19:17:37 2006
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.util;
+package org.apache.tapestry.ioc.util;
-import static org.apache.tapestry.util.CollectionFactory.newList;
-import static org.apache.tapestry.util.CollectionFactory.newMap;
-import static org.apache.tapestry.util.CollectionFactory.newThreadSafeMap;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newThreadSafeMap;
import java.util.List;
import java.util.Map;
Added: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/util/UtilMessages.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/util/UtilMessages.java?view=auto&rev=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/util/UtilMessages.java (added)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/util/UtilMessages.java Mon Nov 20 19:17:37 2006
@@ -0,0 +1,41 @@
+// 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.util;
+
+import org.apache.tapestry.internal.MessagesImpl;
+import org.apache.tapestry.ioc.Messages;
+
+/**
+ * Static messages
+ */
+class UtilMessages
+{
+ private static final Messages MESSAGES = MessagesImpl.forClass(UtilMessages.class);
+
+ private UtilMessages()
+ {
+ }
+
+
+
+ static String noStrategyAdapter(Class inputType, Class adapterType, String catalog)
+ {
+ return MESSAGES.format(
+ "no-strategy-adapter",
+ inputType.getName(),
+ adapterType.getName(),
+ catalog);
+ }
+}
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/InfrastructureContribution.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/InfrastructureContribution.java?view=diff&rev=477483&r1=477482&r2=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/InfrastructureContribution.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/InfrastructureContribution.java Mon Nov 20 19:17:37 2006
@@ -14,7 +14,7 @@
package org.apache.tapestry.services;
-import static org.apache.tapestry.util.Defense.notBlank;
+import static org.apache.tapestry.ioc.internal.util.Defense.notBlank;
import java.util.Formatter;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/MethodSignature.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/MethodSignature.java?view=diff&rev=477483&r1=477482&r2=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/MethodSignature.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/MethodSignature.java Mon Nov 20 19:17:37 2006
@@ -14,7 +14,7 @@
package org.apache.tapestry.services;
-import static org.apache.tapestry.util.Defense.notBlank;
+import static org.apache.tapestry.ioc.internal.util.Defense.notBlank;
import java.lang.reflect.Modifier;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/PageRenderSupport.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/PageRenderSupport.java?view=diff&rev=477483&r1=477482&r2=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/PageRenderSupport.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/PageRenderSupport.java Mon Nov 20 19:17:37 2006
@@ -14,7 +14,7 @@
package org.apache.tapestry.services;
-import org.apache.tapestry.util.IdAllocator;
+import org.apache.tapestry.ioc.internal.util.IdAllocator;
/**
* Provides support to all components that render. This is primarily about generating unique
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/TapestryModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/TapestryModule.java?view=diff&rev=477483&r1=477482&r2=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/TapestryModule.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/TapestryModule.java Mon Nov 20 19:17:37 2006
@@ -102,8 +102,8 @@
import org.apache.tapestry.ioc.services.PropertyShadowBuilder;
import org.apache.tapestry.ioc.services.StrategyBuilder;
import org.apache.tapestry.ioc.services.TypeCoercer;
+import org.apache.tapestry.ioc.util.StrategyRegistry;
import org.apache.tapestry.runtime.Component;
-import org.apache.tapestry.util.StrategyRegistry;
/**
* The root module for Tapestry.
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/TransformUtils.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/TransformUtils.java?view=diff&rev=477483&r1=477482&r2=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/TransformUtils.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/TransformUtils.java Mon Nov 20 19:17:37 2006
@@ -14,7 +14,7 @@
package org.apache.tapestry.services;
-import static org.apache.tapestry.util.CollectionFactory.newMap;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
import java.util.Map;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/resources/org/apache/tapestry/ioc/internal/util/UtilStrings.properties
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/resources/org/apache/tapestry/ioc/internal/util/UtilStrings.properties?view=diff&rev=477483&r1=477482&r2=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/resources/org/apache/tapestry/ioc/internal/util/UtilStrings.properties (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/resources/org/apache/tapestry/ioc/internal/util/UtilStrings.properties Mon Nov 20 19:17:37 2006
@@ -16,3 +16,6 @@
duplicate-orderer=Could not add object with duplicate id '%s'. The duplicate object has been ignored.
constraint-format=Could not parse ordering constraint '%s' (for '%s'). The constraint has been ignored.
one-shot-lock=Method %s may no longer be invoked.
+parameter-was-null=Parameter %s was null.
+parameter-was-blank=Parameter %s was null or contained only whitespace.
+bad-cast=Parameter %s (%s) is not assignable to type %s.
Copied: tapestry/tapestry5/tapestry-core/trunk/src/main/resources/org/apache/tapestry/ioc/util/UtilStrings.properties (from r477464, tapestry/tapestry5/tapestry-core/trunk/src/main/resources/org/apache/tapestry/util/UtilStrings.properties)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/resources/org/apache/tapestry/ioc/util/UtilStrings.properties?view=diff&rev=477483&p1=tapestry/tapestry5/tapestry-core/trunk/src/main/resources/org/apache/tapestry/util/UtilStrings.properties&r1=477464&p2=tapestry/tapestry5/tapestry-core/trunk/src/main/resources/org/apache/tapestry/ioc/util/UtilStrings.properties&r2=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/resources/org/apache/tapestry/util/UtilStrings.properties (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/resources/org/apache/tapestry/ioc/util/UtilStrings.properties Mon Nov 20 19:17:37 2006
@@ -12,7 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-parameter-was-null=Parameter %s was null.
-parameter-was-blank=Parameter %s was null or contained only whitespace.
-bad-cast=Parameter %s (%s) is not assignable to type %s.
+
no-strategy-adapter=No adapter from type %s to type %s is available (registered types are %s).
+
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/conf/testng.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/conf/testng.xml?view=diff&rev=477483&r1=477482&r2=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/conf/testng.xml (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/conf/testng.xml Mon Nov 20 19:17:37 2006
@@ -30,6 +30,7 @@
<package name="org.apache.tapestry.internal.util"/>
<package name="org.apache.tapestry.ioc"/>
<package name="org.apache.tapestry.ioc.services"/>
+ <package name="org.apache.tapestry.ioc.util"/>
<package name="org.apache.tapestry.ioc.internal"/>
<package name="org.apache.tapestry.ioc.internal.services"/>
<package name="org.apache.tapestry.ioc.internal.util"/>
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/components/Count.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/components/Count.java?view=diff&rev=477483&r1=477482&r2=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/components/Count.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/components/Count.java Mon Nov 20 19:17:37 2006
@@ -18,7 +18,7 @@
import org.apache.tapestry.annotations.ComponentClass;
import org.apache.tapestry.annotations.Parameter;
import org.apache.tapestry.annotations.SetupRender;
-import org.apache.tapestry.util.IntegerRange;
+import org.apache.tapestry.internal.util.IntegerRange;
/**
* A component that can count up or count down.
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/bindings/PropBindingFactoryTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/bindings/PropBindingFactoryTest.java?view=diff&rev=477483&r1=477482&r2=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/bindings/PropBindingFactoryTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/bindings/PropBindingFactoryTest.java Mon Nov 20 19:17:37 2006
@@ -18,6 +18,7 @@
import org.apache.tapestry.ComponentResources;
import org.apache.tapestry.internal.TapestryException;
import org.apache.tapestry.internal.test.InternalBaseTestCase;
+import org.apache.tapestry.internal.util.IntegerRange;
import org.apache.tapestry.ioc.Location;
import org.apache.tapestry.ioc.StringHolder;
import org.apache.tapestry.ioc.internal.util.InternalUtils;
@@ -25,7 +26,6 @@
import org.apache.tapestry.ioc.services.PropertyAccess;
import org.apache.tapestry.runtime.Component;
import org.apache.tapestry.services.BindingFactory;
-import org.apache.tapestry.util.IntegerRange;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/BindingSourceImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/BindingSourceImplTest.java?view=diff&rev=477483&r1=477482&r2=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/BindingSourceImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/BindingSourceImplTest.java Mon Nov 20 19:17:37 2006
@@ -14,7 +14,7 @@
package org.apache.tapestry.internal.services;
-import static org.apache.tapestry.util.CollectionFactory.newMap;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
import java.util.Map;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ComponentLifecycleMethodWorkerTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ComponentLifecycleMethodWorkerTest.java?view=diff&rev=477483&r1=477482&r2=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ComponentLifecycleMethodWorkerTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ComponentLifecycleMethodWorkerTest.java Mon Nov 20 19:17:37 2006
@@ -14,7 +14,7 @@
package org.apache.tapestry.internal.services;
-import static org.apache.tapestry.util.CollectionFactory.newList;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
import java.lang.reflect.Modifier;
import java.util.List;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/InfrastructureImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/InfrastructureImplTest.java?view=diff&rev=477483&r1=477482&r2=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/InfrastructureImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/InfrastructureImplTest.java Mon Nov 20 19:17:37 2006
@@ -14,7 +14,7 @@
package org.apache.tapestry.internal.services;
-import static org.apache.tapestry.util.CollectionFactory.newMap;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
import java.util.Map;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/InfrastructureManagerImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/InfrastructureManagerImplTest.java?view=diff&rev=477483&r1=477482&r2=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/InfrastructureManagerImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/InfrastructureManagerImplTest.java Mon Nov 20 19:17:37 2006
@@ -14,7 +14,7 @@
package org.apache.tapestry.internal.services;
-import static org.apache.tapestry.util.CollectionFactory.newList;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
import java.util.Collection;
import java.util.Map;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/OnEventWorkerTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/OnEventWorkerTest.java?view=diff&rev=477483&r1=477482&r2=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/OnEventWorkerTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/OnEventWorkerTest.java Mon Nov 20 19:17:37 2006
@@ -21,11 +21,11 @@
import org.apache.tapestry.annotations.OnEvent;
import org.apache.tapestry.internal.test.InternalBaseTestCase;
+import org.apache.tapestry.ioc.internal.util.CollectionFactory;
import org.apache.tapestry.model.MutableComponentModel;
import org.apache.tapestry.services.ClassTransformation;
import org.apache.tapestry.services.MethodSignature;
import org.apache.tapestry.services.TransformConstants;
-import org.apache.tapestry.util.CollectionFactory;
import org.testng.annotations.Test;
/**
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/PersistentFieldManagerImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/PersistentFieldManagerImplTest.java?view=diff&rev=477483&r1=477482&r2=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/PersistentFieldManagerImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/PersistentFieldManagerImplTest.java Mon Nov 20 19:17:37 2006
@@ -14,18 +14,18 @@
package org.apache.tapestry.internal.services;
-import static org.apache.tapestry.util.CollectionFactory.newList;
-import static org.apache.tapestry.util.CollectionFactory.newMap;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
import java.util.Collection;
import java.util.Map;
import org.apache.tapestry.internal.test.InternalBaseTestCase;
+import org.apache.tapestry.ioc.internal.util.CollectionFactory;
import org.apache.tapestry.services.PersistentFieldBundle;
import org.apache.tapestry.services.PersistentFieldChange;
import org.apache.tapestry.services.PersistentFieldManager;
import org.apache.tapestry.services.PersistentFieldStrategy;
-import org.apache.tapestry.util.CollectionFactory;
import org.testng.annotations.Test;
public class PersistentFieldManagerImplTest extends InternalBaseTestCase
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/TemplateParserImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/TemplateParserImplTest.java?view=diff&rev=477483&r1=477482&r2=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/TemplateParserImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/TemplateParserImplTest.java Mon Nov 20 19:17:37 2006
@@ -14,7 +14,7 @@
package org.apache.tapestry.internal.services;
-import static org.apache.tapestry.util.CollectionFactory.newSet;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newSet;
import static org.easymock.EasyMock.contains;
import java.util.Arrays;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/Base64Tests.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/Base64Tests.java?view=diff&rev=477483&r1=477482&r2=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/Base64Tests.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/Base64Tests.java Mon Nov 20 19:17:37 2006
@@ -14,7 +14,7 @@
package org.apache.tapestry.internal.util;
-import static org.apache.tapestry.util.CollectionFactory.newMap;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
import java.io.EOFException;
import java.io.InputStream;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/InheritanceSearchTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/InheritanceSearchTest.java?view=diff&rev=477483&r1=477482&r2=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/InheritanceSearchTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/InheritanceSearchTest.java Mon Nov 20 19:17:37 2006
@@ -17,8 +17,8 @@
import java.io.Serializable;
import java.util.List;
+import org.apache.tapestry.ioc.internal.util.CollectionFactory;
import org.apache.tapestry.ioc.test.TestBase;
-import org.apache.tapestry.util.CollectionFactory;
import org.testng.annotations.Test;
/**
Copied: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/IntegerRangeTest.java (from r477478, tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/IntegerRangeTest.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/IntegerRangeTest.java?view=diff&rev=477483&p1=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/IntegerRangeTest.java&r1=477478&p2=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/IntegerRangeTest.java&r2=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/IntegerRangeTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/IntegerRangeTest.java Mon Nov 20 19:17:37 2006
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.util;
+package org.apache.tapestry.internal.util;
import java.util.Iterator;
+import org.apache.tapestry.internal.util.IntegerRange;
import org.apache.tapestry.test.TapestryTestCase;
-import org.apache.tapestry.util.IntegerRange;
import org.testng.annotations.Test;
public class IntegerRangeTest extends TapestryTestCase
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/InternalUtilsTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/InternalUtilsTest.java?view=diff&rev=477483&r1=477482&r2=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/InternalUtilsTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/InternalUtilsTest.java Mon Nov 20 19:17:37 2006
@@ -14,8 +14,8 @@
package org.apache.tapestry.internal.util;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
import static org.apache.tapestry.ioc.internal.util.InternalUtils.toList;
-import static org.apache.tapestry.util.CollectionFactory.newMap;
import java.lang.reflect.Method;
import java.util.Arrays;
@@ -29,8 +29,8 @@
import org.apache.tapestry.internal.test.InternalBaseTestCase;
import org.apache.tapestry.ioc.Locatable;
import org.apache.tapestry.ioc.Location;
+import org.apache.tapestry.ioc.internal.util.CollectionFactory;
import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.util.CollectionFactory;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
Copied: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/MethodInvocationBuilderTest.java (from r477478, tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/MethodInvocationBuilderTest.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/MethodInvocationBuilderTest.java?view=diff&rev=477483&p1=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/MethodInvocationBuilderTest.java&r1=477478&p2=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/MethodInvocationBuilderTest.java&r2=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/MethodInvocationBuilderTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/MethodInvocationBuilderTest.java Mon Nov 20 19:17:37 2006
@@ -12,11 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.util;
+package org.apache.tapestry.internal.util;
import java.lang.reflect.Modifier;
import org.apache.tapestry.MarkupWriter;
+import org.apache.tapestry.internal.util.MethodInvocationBuilder;
import org.apache.tapestry.services.ClassTransformation;
import org.apache.tapestry.services.MethodSignature;
import org.apache.tapestry.test.TapestryTestCase;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/BarneyModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/BarneyModule.java?view=diff&rev=477483&r1=477482&r2=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/BarneyModule.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/BarneyModule.java Mon Nov 20 19:17:37 2006
@@ -14,7 +14,7 @@
package org.apache.tapestry.ioc;
-import static org.apache.tapestry.util.CollectionFactory.newList;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
import java.util.ArrayList;
import java.util.HashMap;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/FredModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/FredModule.java?view=diff&rev=477483&r1=477482&r2=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/FredModule.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/FredModule.java Mon Nov 20 19:17:37 2006
@@ -14,7 +14,7 @@
package org.apache.tapestry.ioc;
-import static org.apache.tapestry.util.CollectionFactory.newList;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
import java.util.Collection;
import java.util.Collections;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/StaticModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/StaticModule.java?view=diff&rev=477483&r1=477482&r2=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/StaticModule.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/StaticModule.java Mon Nov 20 19:17:37 2006
@@ -19,7 +19,7 @@
import java.util.List;
import org.apache.tapestry.ioc.annotations.Id;
-import org.apache.tapestry.util.CollectionFactory;
+import org.apache.tapestry.ioc.internal.util.CollectionFactory;
/**
*
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/GlobPatternMatcherTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/GlobPatternMatcherTest.java?view=diff&rev=477483&r1=477482&r2=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/GlobPatternMatcherTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/GlobPatternMatcherTest.java Mon Nov 20 19:17:37 2006
@@ -17,7 +17,6 @@
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
-import org.apache.tapestry.ioc.GlobPatternMatcher;
import org.testng.annotations.Test;
/**
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/InterceptorStackBuilderTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/InterceptorStackBuilderTest.java?view=diff&rev=477483&r1=477482&r2=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/InterceptorStackBuilderTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/InterceptorStackBuilderTest.java Mon Nov 20 19:17:37 2006
@@ -15,7 +15,7 @@
package org.apache.tapestry.ioc.internal;
import static java.util.Arrays.asList;
-import static org.apache.tapestry.util.CollectionFactory.newList;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
import java.util.List;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/ReadManifest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/ReadManifest.java?view=diff&rev=477483&r1=477482&r2=477483
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/ReadManifest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/ReadManifest.java Mon Nov 20 19:17:37 2006
@@ -15,7 +15,7 @@
package org.apache.tapestry.ioc.internal;
import static java.lang.String.format;
-import static org.apache.tapestry.util.CollectionFactory.newList;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
import java.io.InputStream;
import java.net.URL;