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 03:31:37 UTC
svn commit: r477473 [1/2] - in /tapestry/tapestry5/tapestry-core/trunk/src:
main/java/org/apache/tapestry/
main/java/org/apache/tapestry/corelib/components/
main/java/org/apache/tapestry/internal/
main/java/org/apache/tapestry/internal/model/ main/java...
Author: hlship
Date: Mon Nov 20 18:31:34 2006
New Revision: 477473
URL: http://svn.apache.org/viewvc?view=rev&rev=477473
Log:
Reorganize IOC internal classes under org.apache.tapestry.ioc.internal
Added:
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/ConcurrentBarrier.java
- copied, changed from r477464, tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/util/ConcurrentBarrier.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/DependencyNode.java
- copied, changed from r477469, tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/util/DependencyNode.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/InternalUtils.java
- copied, changed from r477464, tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/util/InternalUtils.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/Invokable.java
- copied, changed from r477464, tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/util/Invokable.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/LocalizedNameGenerator.java (contents, props changed)
- copied, changed from r477464, tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/util/LocalizedNameGenerator.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/OneShotLock.java
- copied, changed from r477469, tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/util/OneShotLock.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/Orderer.java (contents, props changed)
- copied, changed from r477471, tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/util/Orderer.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/UtilMessages.java
tapestry/tapestry5/tapestry-core/trunk/src/main/resources/org/apache/tapestry/ioc/internal/util/
tapestry/tapestry5/tapestry-core/trunk/src/main/resources/org/apache/tapestry/ioc/internal/util/UtilStrings.properties
- copied, changed from r477464, tapestry/tapestry5/tapestry-core/trunk/src/main/resources/org/apache/tapestry/internal/util/UtilStrings.properties
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/ConcurrentBarrierTest.java
- copied, changed from r477464, tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/ConcurrentBarrierTest.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/ConcurrentTarget.java
- copied, changed from r477464, tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/ConcurrentTarget.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/ConcurrentTargetWrapper.java
- copied, changed from r477464, tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/ConcurrentTargetWrapper.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/LocalizedNameGeneratorTest.java
- copied, changed from r477469, tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/LocalizedNameGeneratorTest.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/OneShotLockSubject.java
- copied, changed from r477469, tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/OneShotLockSubject.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/OneShotLockTest.java
- copied, changed from r477469, tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/OneShotLockTest.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/OrdererTest.java
- copied, changed from r477464, tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/OrdererTest.java
Removed:
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/util/ConcurrentBarrier.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/util/DependencyNode.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/util/InternalUtils.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/util/Invokable.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/util/LocalizedNameGenerator.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/util/OneShotLock.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/util/Orderer.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/ConcurrentBarrierTest.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/ConcurrentTarget.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/ConcurrentTargetWrapper.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/LocalizedNameGeneratorTest.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/OneShotLockSubject.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/OneShotLockTest.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/OrdererTest.java
Modified:
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ComponentResourcesCommon.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/TapestryFilter.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/corelib/components/AbstractField.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/ClasspathResource.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/TapestryException.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/model/MutableComponentModelImpl.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/model/MutableEmbeddedComponentModelImpl.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/CheckForUpdatesFilter.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/ComponentLifecycleMethodWorker.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/ComponentWorker.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/EnvironmentalWorker.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/InjectPageWorker.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/InjectWorker.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/InternalClassTransformationImpl.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/LinkImpl.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/MixinWorker.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/PageElementFactoryImpl.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/PageLoaderImpl.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/ParameterWorker.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/PersistWorker.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/PersistentFieldManagerImpl.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/ServicesMessages.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/TemplateParserImpl.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/WebRequestImpl.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/WebSessionImpl.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/structure/ComponentPageElementImpl.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/structure/StructureMessages.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/util/UtilMessages.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/RegistryBuilder.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/ContributionDefImpl.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/DecoratorDefImpl.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/IOCMessages.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/ModuleImpl.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/RegistryImpl.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/ServiceBuilderMethodInvoker.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/ServiceDecoratorImpl.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/ServiceDefImpl.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/ValidatingOrderedConfigurationWrapper.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/AbstractFab.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/ClassFabImpl.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/ClassPropertyAdapterImpl.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/ExceptionInfoImpl.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/RegistryShutdownHubImpl.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/TypeCoercerImpl.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/services/MethodSignature.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/InfrastructureContribution.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/TapestryModule.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/util/IdAllocator.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/util/StrategyRegistry.java
tapestry/tapestry5/tapestry-core/trunk/src/main/resources/org/apache/tapestry/internal/util/UtilStrings.properties
tapestry/tapestry5/tapestry-core/trunk/src/test/conf/testng.xml
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/bindings/BindingFactoryTest.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/bindings/PropBindingFactoryTest.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/InternalUtilsTest.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/DefaultModuleDefImplTest.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/services/SyncCostBench.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/FindTheParameterizedType.java
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ComponentResourcesCommon.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ComponentResourcesCommon.java?view=diff&rev=477473&r1=477472&r2=477473
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ComponentResourcesCommon.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ComponentResourcesCommon.java Mon Nov 20 18:31:34 2006
@@ -74,7 +74,7 @@
* @param context
* the context (as extracted from the request, or provided by the triggering
* component); these values may be provided to event handler methods via their
- * parameters
+ * parameters (may be null)
* @param handler
* the handler to be informed of the result, or null if the event is a notification
* that does not support return values from event handler methods
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/TapestryFilter.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/TapestryFilter.java?view=diff&rev=477473&r1=477472&r2=477473
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/TapestryFilter.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/TapestryFilter.java Mon Nov 20 18:31:34 2006
@@ -30,10 +30,10 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.tapestry.internal.InternalConstants;
-import org.apache.tapestry.internal.util.InternalUtils;
import org.apache.tapestry.ioc.IOCUtilities;
import org.apache.tapestry.ioc.Registry;
import org.apache.tapestry.ioc.RegistryBuilder;
+import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.apache.tapestry.services.ComponentClassResolver;
import org.apache.tapestry.services.HttpServletRequestHandler;
import org.apache.tapestry.services.Infrastructure;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/corelib/components/AbstractField.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/corelib/components/AbstractField.java?view=diff&rev=477473&r1=477472&r2=477473
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/corelib/components/AbstractField.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/corelib/components/AbstractField.java Mon Nov 20 18:31:34 2006
@@ -26,7 +26,7 @@
import org.apache.tapestry.annotations.Parameter;
import org.apache.tapestry.annotations.SetupRender;
import org.apache.tapestry.corelib.mixins.RenderInformals;
-import org.apache.tapestry.internal.util.InternalUtils;
+import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.apache.tapestry.services.FormSupport;
import org.apache.tapestry.services.PageRenderSupport;
import org.apache.tapestry.services.WebRequest;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/ClasspathResource.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/ClasspathResource.java?view=diff&rev=477473&r1=477472&r2=477473
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/ClasspathResource.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/ClasspathResource.java Mon Nov 20 18:31:34 2006
@@ -17,8 +17,8 @@
import java.net.URL;
import java.util.Locale;
-import org.apache.tapestry.internal.util.LocalizedNameGenerator;
import org.apache.tapestry.ioc.Resource;
+import org.apache.tapestry.ioc.internal.util.LocalizedNameGenerator;
/**
* Bare-bones, temporary implementation.
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/TapestryException.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/TapestryException.java?view=diff&rev=477473&r1=477472&r2=477473
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/TapestryException.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/TapestryException.java Mon Nov 20 18:31:34 2006
@@ -14,9 +14,9 @@
package org.apache.tapestry.internal;
-import org.apache.tapestry.internal.util.InternalUtils;
import org.apache.tapestry.ioc.Locatable;
import org.apache.tapestry.ioc.Location;
+import org.apache.tapestry.ioc.internal.util.InternalUtils;
/**
* Exception class used as a replacement for {@link java.lang.RuntimeException} when the exception
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/model/MutableComponentModelImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/model/MutableComponentModelImpl.java?view=diff&rev=477473&r1=477472&r2=477473
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/model/MutableComponentModelImpl.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/model/MutableComponentModelImpl.java Mon Nov 20 18:31:34 2006
@@ -22,8 +22,8 @@
import java.util.Map;
import org.apache.commons.logging.Log;
-import org.apache.tapestry.internal.util.InternalUtils;
import org.apache.tapestry.ioc.Resource;
+import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.apache.tapestry.model.ComponentModel;
import org.apache.tapestry.model.EmbeddedComponentModel;
import org.apache.tapestry.model.MutableComponentModel;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/model/MutableEmbeddedComponentModelImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/model/MutableEmbeddedComponentModelImpl.java?view=diff&rev=477473&r1=477472&r2=477473
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/model/MutableEmbeddedComponentModelImpl.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/model/MutableEmbeddedComponentModelImpl.java Mon Nov 20 18:31:34 2006
@@ -20,7 +20,7 @@
import java.util.List;
import java.util.Map;
-import org.apache.tapestry.internal.util.InternalUtils;
+import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.apache.tapestry.model.MutableEmbeddedComponentModel;
import org.apache.tapestry.util.CollectionFactory;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/CheckForUpdatesFilter.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/CheckForUpdatesFilter.java?view=diff&rev=477473&r1=477472&r2=477473
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/CheckForUpdatesFilter.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/CheckForUpdatesFilter.java Mon Nov 20 18:31:34 2006
@@ -16,9 +16,9 @@
import java.io.IOException;
-import org.apache.tapestry.internal.util.ConcurrentBarrier;
import org.apache.tapestry.internal.util.Holder;
-import org.apache.tapestry.internal.util.Invokable;
+import org.apache.tapestry.ioc.internal.util.ConcurrentBarrier;
+import org.apache.tapestry.ioc.internal.util.Invokable;
import org.apache.tapestry.services.WebRequest;
import org.apache.tapestry.services.WebRequestFilter;
import org.apache.tapestry.services.WebRequestHandler;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/ComponentLifecycleMethodWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/ComponentLifecycleMethodWorker.java?view=diff&rev=477473&r1=477472&r2=477473
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/ComponentLifecycleMethodWorker.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/ComponentLifecycleMethodWorker.java Mon Nov 20 18:31:34 2006
@@ -19,7 +19,7 @@
import java.util.List;
import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.internal.util.InternalUtils;
+import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.apache.tapestry.model.MutableComponentModel;
import org.apache.tapestry.services.ClassTransformation;
import org.apache.tapestry.services.ComponentClassTransformWorker;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/ComponentWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/ComponentWorker.java?view=diff&rev=477473&r1=477472&r2=477473
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/ComponentWorker.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/ComponentWorker.java Mon Nov 20 18:31:34 2006
@@ -17,7 +17,7 @@
import org.apache.tapestry.annotations.Component;
import org.apache.tapestry.annotations.MixinClasses;
import org.apache.tapestry.annotations.Mixins;
-import org.apache.tapestry.internal.util.InternalUtils;
+import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.apache.tapestry.model.ComponentModel;
import org.apache.tapestry.model.MutableComponentModel;
import org.apache.tapestry.model.MutableEmbeddedComponentModel;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/EnvironmentalWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/EnvironmentalWorker.java?view=diff&rev=477473&r1=477472&r2=477473
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/EnvironmentalWorker.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/EnvironmentalWorker.java Mon Nov 20 18:31:34 2006
@@ -18,7 +18,7 @@
import java.util.List;
import org.apache.tapestry.annotations.Environmental;
-import org.apache.tapestry.internal.util.InternalUtils;
+import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.apache.tapestry.model.MutableComponentModel;
import org.apache.tapestry.services.ClassTransformation;
import org.apache.tapestry.services.ComponentClassTransformWorker;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/InjectPageWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/InjectPageWorker.java?view=diff&rev=477473&r1=477472&r2=477473
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/InjectPageWorker.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/InjectPageWorker.java Mon Nov 20 18:31:34 2006
@@ -19,7 +19,7 @@
import org.apache.tapestry.annotations.InjectPage;
import org.apache.tapestry.internal.structure.Page;
-import org.apache.tapestry.internal.util.InternalUtils;
+import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.apache.tapestry.model.MutableComponentModel;
import org.apache.tapestry.services.ClassTransformation;
import org.apache.tapestry.services.ComponentClassTransformWorker;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/InjectWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/InjectWorker.java?view=diff&rev=477473&r1=477472&r2=477473
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/InjectWorker.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/InjectWorker.java Mon Nov 20 18:31:34 2006
@@ -15,9 +15,9 @@
package org.apache.tapestry.internal.services;
import org.apache.tapestry.annotations.Inject;
-import org.apache.tapestry.internal.util.InternalUtils;
import org.apache.tapestry.ioc.ObjectProvider;
import org.apache.tapestry.ioc.ServiceLocator;
+import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.apache.tapestry.model.MutableComponentModel;
import org.apache.tapestry.services.ClassTransformation;
import org.apache.tapestry.services.ComponentClassTransformWorker;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/InternalClassTransformationImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/InternalClassTransformationImpl.java?view=diff&rev=477473&r1=477472&r2=477473
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/InternalClassTransformationImpl.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/InternalClassTransformationImpl.java Mon Nov 20 18:31:34 2006
@@ -46,7 +46,7 @@
import org.apache.commons.logging.Log;
import org.apache.tapestry.ComponentResources;
import org.apache.tapestry.internal.InternalComponentResources;
-import org.apache.tapestry.internal.util.InternalUtils;
+import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.apache.tapestry.model.ComponentModel;
import org.apache.tapestry.runtime.Component;
import org.apache.tapestry.services.MethodSignature;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/LinkImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/LinkImpl.java?view=diff&rev=477473&r1=477472&r2=477473
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/LinkImpl.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/LinkImpl.java Mon Nov 20 18:31:34 2006
@@ -22,7 +22,7 @@
import org.apache.commons.codec.EncoderException;
import org.apache.commons.codec.net.URLCodec;
import org.apache.tapestry.Link;
-import org.apache.tapestry.internal.util.InternalUtils;
+import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.apache.tapestry.services.WebResponse;
/**
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/MixinWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/MixinWorker.java?view=diff&rev=477473&r1=477472&r2=477473
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/MixinWorker.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/MixinWorker.java Mon Nov 20 18:31:34 2006
@@ -17,7 +17,7 @@
import java.util.List;
import org.apache.tapestry.annotations.Mixin;
-import org.apache.tapestry.internal.util.InternalUtils;
+import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.apache.tapestry.model.MutableComponentModel;
import org.apache.tapestry.services.ClassTransformation;
import org.apache.tapestry.services.ComponentClassResolver;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/PageElementFactoryImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/PageElementFactoryImpl.java?view=diff&rev=477473&r1=477472&r2=477473
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/PageElementFactoryImpl.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/PageElementFactoryImpl.java Mon Nov 20 18:31:34 2006
@@ -31,8 +31,8 @@
import org.apache.tapestry.internal.structure.PageElement;
import org.apache.tapestry.internal.structure.StartElementPageElement;
import org.apache.tapestry.internal.structure.TextPageElement;
-import org.apache.tapestry.internal.util.InternalUtils;
import org.apache.tapestry.ioc.Location;
+import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.apache.tapestry.ioc.services.TypeCoercer;
import org.apache.tapestry.model.ComponentModel;
import org.apache.tapestry.runtime.RenderQueue;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/PageLoaderImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/PageLoaderImpl.java?view=diff&rev=477473&r1=477472&r2=477473
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/PageLoaderImpl.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/PageLoaderImpl.java Mon Nov 20 18:31:34 2006
@@ -38,7 +38,7 @@
import org.apache.tapestry.internal.structure.Page;
import org.apache.tapestry.internal.structure.PageElement;
import org.apache.tapestry.internal.structure.PageImpl;
-import org.apache.tapestry.internal.util.InternalUtils;
+import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.apache.tapestry.model.ComponentModel;
import org.apache.tapestry.model.EmbeddedComponentModel;
import org.apache.tapestry.services.BindingSource;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/ParameterWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/ParameterWorker.java?view=diff&rev=477473&r1=477472&r2=477473
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/ParameterWorker.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/ParameterWorker.java Mon Nov 20 18:31:34 2006
@@ -18,7 +18,7 @@
import java.util.List;
import org.apache.tapestry.annotations.Parameter;
-import org.apache.tapestry.internal.util.InternalUtils;
+import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.apache.tapestry.model.MutableComponentModel;
import org.apache.tapestry.services.ClassTransformation;
import org.apache.tapestry.services.ComponentClassTransformWorker;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/PersistWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/PersistWorker.java?view=diff&rev=477473&r1=477472&r2=477473
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/PersistWorker.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/PersistWorker.java Mon Nov 20 18:31:34 2006
@@ -19,7 +19,7 @@
import java.lang.reflect.Modifier;
import org.apache.tapestry.annotations.Persist;
-import org.apache.tapestry.internal.util.InternalUtils;
+import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.apache.tapestry.model.MutableComponentModel;
import org.apache.tapestry.services.ClassTransformation;
import org.apache.tapestry.services.ComponentClassTransformWorker;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/PersistentFieldManagerImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/PersistentFieldManagerImpl.java?view=diff&rev=477473&r1=477472&r2=477473
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/PersistentFieldManagerImpl.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/PersistentFieldManagerImpl.java Mon Nov 20 18:31:34 2006
@@ -17,7 +17,7 @@
import java.util.Collection;
import java.util.Map;
-import org.apache.tapestry.internal.util.InternalUtils;
+import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.apache.tapestry.services.PersistentFieldBundle;
import org.apache.tapestry.services.PersistentFieldChange;
import org.apache.tapestry.services.PersistentFieldManager;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/ServicesMessages.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/ServicesMessages.java?view=diff&rev=477473&r1=477472&r2=477473
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/ServicesMessages.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/ServicesMessages.java Mon Nov 20 18:31:34 2006
@@ -20,10 +20,10 @@
import javassist.CtClass;
import org.apache.tapestry.internal.MessagesImpl;
-import org.apache.tapestry.internal.util.InternalUtils;
import org.apache.tapestry.ioc.Location;
import org.apache.tapestry.ioc.Messages;
import org.apache.tapestry.ioc.Resource;
+import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.apache.tapestry.runtime.Component;
import org.apache.tapestry.runtime.RenderCommand;
import org.apache.tapestry.services.MethodSignature;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/TemplateParserImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/TemplateParserImpl.java?view=diff&rev=477473&r1=477472&r2=477473
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/TemplateParserImpl.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/TemplateParserImpl.java Mon Nov 20 18:31:34 2006
@@ -43,9 +43,9 @@
import org.apache.tapestry.internal.parser.StartElementToken;
import org.apache.tapestry.internal.parser.TemplateToken;
import org.apache.tapestry.internal.parser.TextToken;
-import org.apache.tapestry.internal.util.InternalUtils;
import org.apache.tapestry.ioc.Location;
import org.apache.tapestry.ioc.Resource;
+import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.xml.sax.Attributes;
import org.xml.sax.InputSource;
import org.xml.sax.Locator;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/WebRequestImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/WebRequestImpl.java?view=diff&rev=477473&r1=477472&r2=477473
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/WebRequestImpl.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/WebRequestImpl.java Mon Nov 20 18:31:34 2006
@@ -19,7 +19,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
-import org.apache.tapestry.internal.util.InternalUtils;
+import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.apache.tapestry.services.WebRequest;
import org.apache.tapestry.services.WebSession;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/WebSessionImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/WebSessionImpl.java?view=diff&rev=477473&r1=477472&r2=477473
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/WebSessionImpl.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/WebSessionImpl.java Mon Nov 20 18:31:34 2006
@@ -22,7 +22,7 @@
import javax.servlet.http.HttpSession;
-import org.apache.tapestry.internal.util.InternalUtils;
+import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.apache.tapestry.services.WebSession;
/**
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/structure/ComponentPageElementImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/structure/ComponentPageElementImpl.java?view=diff&rev=477473&r1=477472&r2=477473
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/structure/ComponentPageElementImpl.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/structure/ComponentPageElementImpl.java Mon Nov 20 18:31:34 2006
@@ -31,10 +31,10 @@
import org.apache.tapestry.internal.services.ComponentEventImpl;
import org.apache.tapestry.internal.services.Instantiator;
import org.apache.tapestry.internal.util.AcceptVoidEventHandler;
-import org.apache.tapestry.internal.util.InternalUtils;
import org.apache.tapestry.ioc.BaseLocatable;
import org.apache.tapestry.ioc.IOCUtilities;
import org.apache.tapestry.ioc.Location;
+import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.apache.tapestry.ioc.services.TypeCoercer;
import org.apache.tapestry.model.ComponentModel;
import org.apache.tapestry.model.ParameterModel;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/structure/StructureMessages.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/structure/StructureMessages.java?view=diff&rev=477473&r1=477472&r2=477473
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/structure/StructureMessages.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/structure/StructureMessages.java Mon Nov 20 18:31:34 2006
@@ -17,8 +17,8 @@
import java.util.List;
import org.apache.tapestry.internal.MessagesImpl;
-import org.apache.tapestry.internal.util.InternalUtils;
import org.apache.tapestry.ioc.Messages;
+import org.apache.tapestry.ioc.internal.util.InternalUtils;
class StructureMessages
{
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/util/UtilMessages.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/util/UtilMessages.java?view=diff&rev=477473&r1=477472&r2=477473
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/util/UtilMessages.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/util/UtilMessages.java Mon Nov 20 18:31:34 2006
@@ -12,50 +12,30 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.util;
-
-import java.net.URL;
-
-import org.apache.tapestry.internal.MessagesImpl;
+package org.apache.tapestry.internal.util;
+
+import java.net.URL;
+
+import org.apache.tapestry.internal.MessagesImpl;
import org.apache.tapestry.ioc.Messages;
-
-class UtilMessages
-{
- private static final Messages MESSAGES = MessagesImpl.forClass(UtilMessages.class);
-
- private UtilMessages()
- {
- }
-
- static String unableToReadLastModified(URL url, Throwable cause)
- {
- return MESSAGES.format("unable-to-read-last-modified", url, cause);
- }
-
- static String dependencyCycle(DependencyNode dependency, DependencyNode node)
- {
- return MESSAGES.format("dependency-cycle", dependency.getId(), node.getId());
- }
-
- static String duplicateOrderer(String id)
- {
- return MESSAGES.format("duplicate-orderer", id);
- }
-
- static String constraintFormat(String constraint, String id)
- {
- return MESSAGES.format("constraint-format", constraint, id);
- }
-
- static String oneShotLock(StackTraceElement element)
- {
- return MESSAGES.format("one-shot-lock", element);
- }
-
- static String noReturnValueAccepted(String eventType, String componentId, Object returnValue,
- String methodDescription)
- {
- return MESSAGES.format("no-return-value-accepted", eventType, componentId, String
- .valueOf(returnValue), methodDescription);
- }
-}
+
+class UtilMessages
+{
+ private static final Messages MESSAGES = MessagesImpl.forClass(UtilMessages.class);
+
+ private UtilMessages()
+ {
+ }
+
+ static String unableToReadLastModified(URL url, Throwable cause)
+ {
+ return MESSAGES.format("unable-to-read-last-modified", url, cause);
+ }
+
+ static String noReturnValueAccepted(String eventType, String componentId, Object returnValue,
+ String methodDescription)
+ {
+ return MESSAGES.format("no-return-value-accepted", eventType, componentId, String
+ .valueOf(returnValue), methodDescription);
+ }
+}
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/RegistryBuilder.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/RegistryBuilder.java?view=diff&rev=477473&r1=477472&r2=477473
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/RegistryBuilder.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/RegistryBuilder.java Mon Nov 20 18:31:34 2006
@@ -23,13 +23,13 @@
import java.util.Map;
import org.apache.commons.logging.Log;
-import org.apache.tapestry.internal.util.OneShotLock;
import org.apache.tapestry.ioc.annotations.SubModule;
import org.apache.tapestry.ioc.def.ModuleDef;
import org.apache.tapestry.ioc.internal.DefaultModuleDefImpl;
import org.apache.tapestry.ioc.internal.IOCMessages;
import org.apache.tapestry.ioc.internal.LogSourceImpl;
import org.apache.tapestry.ioc.internal.RegistryImpl;
+import org.apache.tapestry.ioc.internal.util.OneShotLock;
import org.apache.tapestry.ioc.services.TapestryIOCModule;
/**
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/ContributionDefImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/ContributionDefImpl.java?view=diff&rev=477473&r1=477472&r2=477473
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/ContributionDefImpl.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/ContributionDefImpl.java Mon Nov 20 18:31:34 2006
@@ -20,13 +20,13 @@
import java.lang.reflect.Method;
import java.util.Map;
-import org.apache.tapestry.internal.util.InternalUtils;
import org.apache.tapestry.ioc.Configuration;
import org.apache.tapestry.ioc.MappedConfiguration;
import org.apache.tapestry.ioc.ModuleBuilderSource;
import org.apache.tapestry.ioc.OrderedConfiguration;
import org.apache.tapestry.ioc.ServiceLocator;
import org.apache.tapestry.ioc.def.ContributionDef;
+import org.apache.tapestry.ioc.internal.util.InternalUtils;
/**
*
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/DecoratorDefImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/DecoratorDefImpl.java?view=diff&rev=477473&r1=477472&r2=477473
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/DecoratorDefImpl.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/DecoratorDefImpl.java Mon Nov 20 18:31:34 2006
@@ -20,7 +20,6 @@
import java.lang.reflect.Method;
import java.util.List;
-import org.apache.tapestry.internal.util.InternalUtils;
import org.apache.tapestry.ioc.IdMatcher;
import org.apache.tapestry.ioc.ModuleBuilderSource;
import org.apache.tapestry.ioc.OrIdMatcher;
@@ -28,6 +27,7 @@
import org.apache.tapestry.ioc.ServiceResources;
import org.apache.tapestry.ioc.def.DecoratorDef;
import org.apache.tapestry.ioc.def.ServiceDef;
+import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.apache.tapestry.util.CollectionFactory;
/**
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/IOCMessages.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/IOCMessages.java?view=diff&rev=477473&r1=477472&r2=477473
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/IOCMessages.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/IOCMessages.java Mon Nov 20 18:31:34 2006
@@ -14,7 +14,7 @@
package org.apache.tapestry.ioc.internal;
-import static org.apache.tapestry.internal.util.InternalUtils.asString;
+import static org.apache.tapestry.ioc.internal.util.InternalUtils.asString;
import static org.apache.tapestry.ioc.services.ClassFabUtils.getJavaClassName;
import java.lang.reflect.Constructor;
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=477473&r1=477472&r2=477473
==============================================================================
--- 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 18:31:34 2006
@@ -32,7 +32,6 @@
import java.util.Set;
import org.apache.commons.logging.Log;
-import org.apache.tapestry.internal.util.InternalUtils;
import org.apache.tapestry.ioc.ObjectCreator;
import org.apache.tapestry.ioc.ServiceBuilderResources;
import org.apache.tapestry.ioc.ServiceDecorator;
@@ -43,6 +42,7 @@
import org.apache.tapestry.ioc.def.DecoratorDef;
import org.apache.tapestry.ioc.def.ModuleDef;
import org.apache.tapestry.ioc.def.ServiceDef;
+import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.apache.tapestry.ioc.services.ClassFab;
import org.apache.tapestry.ioc.services.MethodSignature;
import org.apache.tapestry.ioc.services.RegistryShutdownListener;
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=477473&r1=477472&r2=477473
==============================================================================
--- 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 18:31:34 2006
@@ -25,8 +25,6 @@
import java.util.Set;
import org.apache.commons.logging.Log;
-import org.apache.tapestry.internal.util.OneShotLock;
-import org.apache.tapestry.internal.util.Orderer;
import org.apache.tapestry.ioc.Configuration;
import org.apache.tapestry.ioc.IOCConstants;
import org.apache.tapestry.ioc.IOCUtilities;
@@ -46,6 +44,8 @@
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.OneShotLock;
+import org.apache.tapestry.ioc.internal.util.Orderer;
import org.apache.tapestry.ioc.services.ClassFab;
import org.apache.tapestry.ioc.services.ClassFactory;
import org.apache.tapestry.ioc.services.RegistryShutdownHub;
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=477473&r1=477472&r2=477473
==============================================================================
--- 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 18:31:34 2006
@@ -28,10 +28,10 @@
import java.util.Map;
import org.apache.commons.logging.Log;
-import org.apache.tapestry.internal.util.InternalUtils;
import org.apache.tapestry.ioc.ObjectCreator;
import org.apache.tapestry.ioc.ServiceBuilderResources;
import org.apache.tapestry.ioc.ServiceResources;
+import org.apache.tapestry.ioc.internal.util.InternalUtils;
/**
* Basic implementation of {@link org.apache.tapestry.ioc.ObjectCreator} that handles invoking a
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=477473&r1=477472&r2=477473
==============================================================================
--- 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 18:31:34 2006
@@ -21,10 +21,10 @@
import java.util.Map;
import org.apache.commons.logging.Log;
-import org.apache.tapestry.internal.util.InternalUtils;
import org.apache.tapestry.ioc.ModuleBuilderSource;
import org.apache.tapestry.ioc.ServiceDecorator;
import org.apache.tapestry.ioc.ServiceResources;
+import org.apache.tapestry.ioc.internal.util.InternalUtils;
/**
* A wrapper around a decorator method.
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/ServiceDefImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/ServiceDefImpl.java?view=diff&rev=477473&r1=477472&r2=477473
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/ServiceDefImpl.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/ServiceDefImpl.java Mon Nov 20 18:31:34 2006
@@ -16,10 +16,10 @@
import java.lang.reflect.Method;
-import org.apache.tapestry.internal.util.InternalUtils;
import org.apache.tapestry.ioc.ObjectCreator;
import org.apache.tapestry.ioc.ServiceBuilderResources;
import org.apache.tapestry.ioc.def.ServiceDef;
+import org.apache.tapestry.ioc.internal.util.InternalUtils;
/**
*
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/ValidatingOrderedConfigurationWrapper.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/ValidatingOrderedConfigurationWrapper.java?view=diff&rev=477473&r1=477472&r2=477473
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/ValidatingOrderedConfigurationWrapper.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/ValidatingOrderedConfigurationWrapper.java Mon Nov 20 18:31:34 2006
@@ -25,7 +25,7 @@
* {@link org.apache.tapestry.ioc.OrderedConfiguration}. It also takes care of qualifying any ids.
* If you provide an incorrect value type, the value is converted to null but added anyway. This
* ensures that incorrect values contributed in don't screw up the
- * {@link org.apache.tapestry.internal.util.Orderer} (and generate a bunch of error messages there).
+ * {@link org.apache.tapestry.ioc.internal.util.Orderer} (and generate a bunch of error messages there).
*
* @param <T>
*/
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=477473&r1=477472&r2=477473
==============================================================================
--- 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 18:31:34 2006
@@ -21,7 +21,7 @@
import javassist.CtClass;
import org.apache.commons.logging.Log;
-import org.apache.tapestry.internal.util.OneShotLock;
+import org.apache.tapestry.ioc.internal.util.OneShotLock;
/**
* Base class for {@link org.apache.tapestry.ioc.internal.services.ClassFabImpl}. This code is a
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=477473&r1=477472&r2=477473
==============================================================================
--- 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 18:31:34 2006
@@ -31,7 +31,7 @@
import javassist.NotFoundException;
import org.apache.commons.logging.Log;
-import org.apache.tapestry.internal.util.InternalUtils;
+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;
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=477473&r1=477472&r2=477473
==============================================================================
--- 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 18:31:34 2006
@@ -20,7 +20,7 @@
import java.util.List;
import java.util.Map;
-import org.apache.tapestry.internal.util.InternalUtils;
+import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.apache.tapestry.ioc.services.ClassPropertyAdapter;
import org.apache.tapestry.ioc.services.PropertyAdapter;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/ExceptionInfoImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/ExceptionInfoImpl.java?view=diff&rev=477473&r1=477472&r2=477473
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/ExceptionInfoImpl.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/ExceptionInfoImpl.java Mon Nov 20 18:31:34 2006
@@ -19,7 +19,7 @@
import java.util.List;
import java.util.Map;
-import org.apache.tapestry.internal.util.InternalUtils;
+import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.apache.tapestry.ioc.services.ExceptionInfo;
public class ExceptionInfoImpl implements ExceptionInfo
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=477473&r1=477472&r2=477473
==============================================================================
--- 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 18:31:34 2006
@@ -19,7 +19,7 @@
import java.util.List;
import org.apache.commons.logging.Log;
-import org.apache.tapestry.internal.util.OneShotLock;
+import org.apache.tapestry.ioc.internal.util.OneShotLock;
import org.apache.tapestry.ioc.services.RegistryShutdownHub;
import org.apache.tapestry.ioc.services.RegistryShutdownListener;
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=477473&r1=477472&r2=477473
==============================================================================
--- 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 18:31:34 2006
@@ -28,7 +28,7 @@
import org.apache.tapestry.internal.services.CompoundCoercion;
import org.apache.tapestry.internal.util.InheritanceSearch;
-import org.apache.tapestry.internal.util.InternalUtils;
+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;
Copied: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/ConcurrentBarrier.java (from r477464, tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/util/ConcurrentBarrier.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/ConcurrentBarrier.java?view=diff&rev=477473&p1=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/util/ConcurrentBarrier.java&r1=477464&p2=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/ConcurrentBarrier.java&r2=477473
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/util/ConcurrentBarrier.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/ConcurrentBarrier.java Mon Nov 20 18:31:34 2006
@@ -12,10 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.util;
+package org.apache.tapestry.ioc.internal.util;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
+
/**
* A barrier used to execute code in a context where it is guarded by read/write locks. In addition,
Copied: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/DependencyNode.java (from r477469, tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/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=477473&p1=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/util/DependencyNode.java&r1=477469&p2=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/DependencyNode.java&r2=477473
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/util/DependencyNode.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/DependencyNode.java Mon Nov 20 18:31:34 2006
@@ -15,17 +15,17 @@
/**
*
*/
-package org.apache.tapestry.internal.util;
+package org.apache.tapestry.ioc.internal.util;
import static org.apache.tapestry.util.CollectionFactory.newList;
import java.util.List;
-import org.apache.commons.logging.Log;
+import org.apache.commons.logging.Log;
import org.apache.tapestry.ioc.Orderable;
/**
- * Used by {@link org.apache.tapestry.internal.util.Orderer} to establish backward dependencies for
+ * Used by {@link org.apache.tapestry.ioc.internal.util.Orderer} to establish backward dependencies for
* {@link org.apache.tapestry.ioc.Orderable} objects.
*
* @param <T>
Copied: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/InternalUtils.java (from r477464, tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/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=477473&p1=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/util/InternalUtils.java&r1=477464&p2=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/InternalUtils.java&r2=477473
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/util/InternalUtils.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/InternalUtils.java Mon Nov 20 18:31:34 2006
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.util;
+package org.apache.tapestry.ioc.internal.util;
import static org.apache.tapestry.util.CollectionFactory.newList;
Copied: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/Invokable.java (from r477464, tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/util/Invokable.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/Invokable.java?view=diff&rev=477473&p1=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/util/Invokable.java&r1=477464&p2=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/Invokable.java&r2=477473
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/util/Invokable.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/Invokable.java Mon Nov 20 18:31:34 2006
@@ -12,7 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.util;
+package org.apache.tapestry.ioc.internal.util;
+
/**
* Similiar to {@link Runnable} execpt that it returns a value. Used by {@link ConcurrentBarrier} to
Copied: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/LocalizedNameGenerator.java (from r477464, tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/util/LocalizedNameGenerator.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/LocalizedNameGenerator.java?view=diff&rev=477473&p1=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/util/LocalizedNameGenerator.java&r1=477464&p2=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/LocalizedNameGenerator.java&r2=477473
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/util/LocalizedNameGenerator.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/LocalizedNameGenerator.java Mon Nov 20 18:31:34 2006
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.util;
+package org.apache.tapestry.ioc.internal.util;
import java.util.Iterator;
import java.util.Locale;
Propchange: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/LocalizedNameGenerator.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.4
Propchange: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/LocalizedNameGenerator.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/LocalizedNameGenerator.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/OneShotLock.java (from r477469, tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/util/OneShotLock.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/OneShotLock.java?view=diff&rev=477473&p1=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/util/OneShotLock.java&r1=477469&p2=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/OneShotLock.java&r2=477473
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/util/OneShotLock.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/OneShotLock.java Mon Nov 20 18:31:34 2006
@@ -12,47 +12,47 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.util;
-
-/**
- * Logic for handling one shot semantics for classes; classes that include a method (or methods)
- * that "locks down" the instance, to prevent it from being used again in the future.
- */
-public class OneShotLock
-{
- private boolean _lock;
-
- /**
- * Checks to see if the lock has been set (via {@link #lock()}).
- *
- * @throws IllegalStateException
- * if the lock is set
- */
- public void check()
- {
- innerCheck();
- }
-
- private void innerCheck()
- {
- if (_lock)
- {
- // [0] is getStackTrace()
- // [1] is innerCheck()
- // [2] is check() or lock()
- // [3] is caller of check() or lock()
-
- StackTraceElement element = Thread.currentThread().getStackTrace()[4];
-
- throw new IllegalStateException(UtilMessages.oneShotLock(element));
- }
- }
-
- /** Checks the lock, then sets it. */
- public void lock()
- {
- innerCheck();
-
- _lock = true;
- }
-}
+package org.apache.tapestry.ioc.internal.util;
+
+/**
+ * Logic for handling one shot semantics for classes; classes that include a method (or methods)
+ * that "locks down" the instance, to prevent it from being used again in the future.
+ */
+public class OneShotLock
+{
+ private boolean _lock;
+
+ /**
+ * Checks to see if the lock has been set (via {@link #lock()}).
+ *
+ * @throws IllegalStateException
+ * if the lock is set
+ */
+ public void check()
+ {
+ innerCheck();
+ }
+
+ private void innerCheck()
+ {
+ if (_lock)
+ {
+ // [0] is getStackTrace()
+ // [1] is innerCheck()
+ // [2] is check() or lock()
+ // [3] is caller of check() or lock()
+
+ StackTraceElement element = Thread.currentThread().getStackTrace()[4];
+
+ throw new IllegalStateException(UtilMessages.oneShotLock(element));
+ }
+ }
+
+ /** Checks the lock, then sets it. */
+ public void lock()
+ {
+ innerCheck();
+
+ _lock = true;
+ }
+}
Copied: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/Orderer.java (from r477471, tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/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=477473&p1=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/util/Orderer.java&r1=477471&p2=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/Orderer.java&r2=477473
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/util/Orderer.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/Orderer.java Mon Nov 20 18:31:34 2006
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.util;
+package org.apache.tapestry.ioc.internal.util;
import static org.apache.tapestry.util.CollectionFactory.newList;
import static org.apache.tapestry.util.CollectionFactory.newMap;
Propchange: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/Orderer.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.15
Propchange: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/Orderer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/Orderer.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: 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=auto&rev=477473
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/UtilMessages.java (added)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/UtilMessages.java Mon Nov 20 18:31:34 2006
@@ -0,0 +1,47 @@
+// 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.internal.util;
+
+import org.apache.tapestry.internal.MessagesImpl;
+import org.apache.tapestry.ioc.Messages;
+
+class UtilMessages
+{
+ private static final Messages MESSAGES = MessagesImpl.forClass(UtilMessages.class);
+
+ private UtilMessages()
+ {
+ }
+
+ static String dependencyCycle(DependencyNode dependency, DependencyNode node)
+ {
+ return MESSAGES.format("dependency-cycle", dependency.getId(), node.getId());
+ }
+
+ static String duplicateOrderer(String id)
+ {
+ return MESSAGES.format("duplicate-orderer", id);
+ }
+
+ static String constraintFormat(String constraint, String id)
+ {
+ return MESSAGES.format("constraint-format", constraint, id);
+ }
+
+ static String oneShotLock(StackTraceElement element)
+ {
+ return MESSAGES.format("one-shot-lock", element);
+ }
+}
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=477473&r1=477472&r2=477473
==============================================================================
--- 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 18:31:34 2006
@@ -14,7 +14,7 @@
package org.apache.tapestry.ioc.services;
-import static org.apache.tapestry.internal.util.InternalUtils.size;
+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;
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=477473&r1=477472&r2=477473
==============================================================================
--- 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 18:31:34 2006
@@ -18,7 +18,7 @@
import java.util.Formatter;
-import org.apache.tapestry.internal.util.InternalUtils;
+import org.apache.tapestry.ioc.internal.util.InternalUtils;
/**
* A contribution into the infrastructure configuration.
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=477473&r1=477472&r2=477473
==============================================================================
--- 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 18:31:34 2006
@@ -83,7 +83,6 @@
import org.apache.tapestry.internal.services.WebContextImpl;
import org.apache.tapestry.internal.services.WebRequestImpl;
import org.apache.tapestry.internal.services.WebResponseImpl;
-import org.apache.tapestry.internal.util.InternalUtils;
import org.apache.tapestry.ioc.Configuration;
import org.apache.tapestry.ioc.IOCUtilities;
import org.apache.tapestry.ioc.MappedConfiguration;
@@ -96,6 +95,7 @@
import org.apache.tapestry.ioc.annotations.InjectService;
import org.apache.tapestry.ioc.annotations.Lifecycle;
import org.apache.tapestry.ioc.annotations.SubModule;
+import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.apache.tapestry.ioc.services.ChainBuilder;
import org.apache.tapestry.ioc.services.ClassFactory;
import org.apache.tapestry.ioc.services.PipelineBuilder;
Modified: 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/util/IdAllocator.java?view=diff&rev=477473&r1=477472&r2=477473
==============================================================================
--- 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/util/IdAllocator.java Mon Nov 20 18:31:34 2006
@@ -21,7 +21,7 @@
import java.util.List;
import java.util.Map;
-import org.apache.tapestry.internal.util.InternalUtils;
+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/util/StrategyRegistry.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/util/StrategyRegistry.java?view=diff&rev=477473&r1=477472&r2=477473
==============================================================================
--- 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/util/StrategyRegistry.java Mon Nov 20 18:31:34 2006
@@ -22,7 +22,7 @@
import java.util.Map;
import org.apache.tapestry.internal.util.InheritanceSearch;
-import org.apache.tapestry.internal.util.InternalUtils;
+import org.apache.tapestry.ioc.internal.util.InternalUtils;
/**
* A key component in implementing the "Gang of Four" Strategy pattern. A StrategyRegistry will
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/resources/org/apache/tapestry/internal/util/UtilStrings.properties
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/resources/org/apache/tapestry/internal/util/UtilStrings.properties?view=diff&rev=477473&r1=477472&r2=477473
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/resources/org/apache/tapestry/internal/util/UtilStrings.properties (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/resources/org/apache/tapestry/internal/util/UtilStrings.properties Mon Nov 20 18:31:34 2006
@@ -13,9 +13,5 @@
# limitations under the License.
unable-to-read-last-modified=Unable to read last modified time stamp of resource %s: %s
-dependency-cycle=Unable to add '%s' as a dependency of '%s', as that forms a dependency cycle ('%<s' depends on itself via '%1$s'). The dependency has been ignored.
-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.
no-return-value-accepted=Event '%s' from %s received an event handler method return value of %s from %s. \
This type of event does not support return values from event handler methods.
Copied: tapestry/tapestry5/tapestry-core/trunk/src/main/resources/org/apache/tapestry/ioc/internal/util/UtilStrings.properties (from r477464, tapestry/tapestry5/tapestry-core/trunk/src/main/resources/org/apache/tapestry/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=477473&p1=tapestry/tapestry5/tapestry-core/trunk/src/main/resources/org/apache/tapestry/internal/util/UtilStrings.properties&r1=477464&p2=tapestry/tapestry5/tapestry-core/trunk/src/main/resources/org/apache/tapestry/ioc/internal/util/UtilStrings.properties&r2=477473
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/resources/org/apache/tapestry/internal/util/UtilStrings.properties (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/resources/org/apache/tapestry/ioc/internal/util/UtilStrings.properties Mon Nov 20 18:31:34 2006
@@ -12,10 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-unable-to-read-last-modified=Unable to read last modified time stamp of resource %s: %s
dependency-cycle=Unable to add '%s' as a dependency of '%s', as that forms a dependency cycle ('%<s' depends on itself via '%1$s'). The dependency has been ignored.
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.
-no-return-value-accepted=Event '%s' from %s received an event handler method return value of %s from %s. \
- This type of event does not support return values from event handler methods.
\ No newline at end of file
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=477473&r1=477472&r2=477473
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/conf/testng.xml (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/conf/testng.xml Mon Nov 20 18:31:34 2006
@@ -32,6 +32,7 @@
<package name="org.apache.tapestry.ioc.services"/>
<package name="org.apache.tapestry.ioc.internal"/>
<package name="org.apache.tapestry.ioc.internal.services"/>
+ <package name="org.apache.tapestry.ioc.internal.util"/>
<package name="org.apache.tapestry.services"/>
<package name="org.apache.tapestry.util"/>
<package name="org.apache.tapestry.runtime"/>
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/bindings/BindingFactoryTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/bindings/BindingFactoryTest.java?view=diff&rev=477473&r1=477472&r2=477473
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/bindings/BindingFactoryTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/bindings/BindingFactoryTest.java Mon Nov 20 18:31:34 2006
@@ -18,8 +18,8 @@
import org.apache.tapestry.ComponentResources;
import org.apache.tapestry.internal.TapestryException;
import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.internal.util.InternalUtils;
import org.apache.tapestry.ioc.Location;
+import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.apache.tapestry.services.BindingFactory;
import org.testng.annotations.Test;