Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/ValidatingMappedConfigurationWrapperTest.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/ValidatingMappedConfigurationWrapperTest.java?view=diff&rev=477483&r1=477482&r2=477483 ============================================================================== --- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/ValidatingMappedConfigurationWrapperTest.java (original) +++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/ValidatingMappedConfigurationWrapperTest.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.util.List; import java.util.Map;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/MasterObjectProvideTest.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/MasterObjectProvideTest.java?view=diff&rev=477483&r1=477482&r2=477483 ============================================================================== --- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/MasterObjectProvideTest.java (original) +++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/MasterObjectProvideTest.java Mon Nov 20 19:17:37 2006 @@ -20,7 +20,7 @@ import org.apache.tapestry.internal.test.InternalBaseTestCase; import org.apache.tapestry.ioc.ObjectProvider; import org.apache.tapestry.ioc.ServiceLocator; -import org.apache.tapestry.util.CollectionFactory; +import org.apache.tapestry.ioc.internal.util.CollectionFactory; import org.testng.annotations.Test; /** Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/PipelineBuilderImplTest.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/PipelineBuilderImplTest.java?view=diff&rev=477483&r1=477482&r2=477483 ============================================================================== --- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/PipelineBuilderImplTest.java (original) +++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/PipelineBuilderImplTest.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.Arrays; import java.util.List; Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/StrategyBuilderImplTest.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/StrategyBuilderImplTest.java?view=diff&rev=477483&r1=477482&r2=477483 ============================================================================== --- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/StrategyBuilderImplTest.java (original) +++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/StrategyBuilderImplTest.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.Collections; import java.util.List; @@ -22,7 +22,7 @@ import org.apache.tapestry.internal.test.InternalBaseTestCase; import org.apache.tapestry.ioc.services.StrategyBuilder; -import org.apache.tapestry.util.StrategyRegistry; +import org.apache.tapestry.ioc.util.StrategyRegistry; import org.testng.annotations.Test; public class StrategyBuilderImplTest extends InternalBaseTestCase Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/ConcurrentBarrierTest.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/ConcurrentBarrierTest.java?view=diff&rev=477483&r1=477482&r2=477483 ============================================================================== --- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/ConcurrentBarrierTest.java (original) +++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/ConcurrentBarrierTest.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.util.List; Copied: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/util/BodyBuilderTest.java (from r477478, tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/BodyBuilderTest.java) URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/util/BodyBuilderTest.java?view=diff&rev=477483&p1=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/BodyBuilderTest.java&r1=477478&p2=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/util/BodyBuilderTest.java&r2=477483 ============================================================================== --- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/BodyBuilderTest.java (original) +++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/util/BodyBuilderTest.java Mon Nov 20 19:17:37 2006 @@ -12,8 +12,9 @@ // 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 org.apache.tapestry.ioc.util.BodyBuilder; import org.apache.tapestry.test.TapestryTestCase; import org.testng.annotations.Test; Copied: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/util/StrategyRegistryTest.java (from r477464, tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/StrategyRegistryTest.java) URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/util/StrategyRegistryTest.java?view=diff&rev=477483&p1=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/StrategyRegistryTest.java&r1=477464&p2=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/util/StrategyRegistryTest.java&r2=477483 ============================================================================== --- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/StrategyRegistryTest.java (original) +++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/util/StrategyRegistryTest.java Mon Nov 20 19:17:37 2006 @@ -12,9 +12,9 @@ // 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.newMap; +import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap; import java.util.ArrayList; import java.util.List; @@ -22,7 +22,7 @@ import java.util.Set; import org.apache.tapestry.internal.test.InternalBaseTestCase; -import org.apache.tapestry.util.StrategyRegistry; +import org.apache.tapestry.ioc.util.StrategyRegistry; import org.testng.annotations.Test; /** Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/services/MethodSignatureTest.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/services/MethodSignatureTest.java?view=diff&rev=477483&r1=477482&r2=477483 ============================================================================== --- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/services/MethodSignatureTest.java (original) +++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/services/MethodSignatureTest.java Mon Nov 20 19:17:37 2006 @@ -22,7 +22,7 @@ import java.util.Collections; import java.util.List; -import org.apache.tapestry.util.CollectionFactory; +import org.apache.tapestry.ioc.internal.util.CollectionFactory; import org.testng.annotations.Test; /** Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/CollectionFactoryTest.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/CollectionFactoryTest.java?view=diff&rev=477483&r1=477482&r2=477483 ============================================================================== --- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/CollectionFactoryTest.java (original) +++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/CollectionFactoryTest.java Mon Nov 20 19:17:37 2006 @@ -15,9 +15,9 @@ package org.apache.tapestry.util; import static java.util.Arrays.asList; -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 static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertNotSame; @@ -31,6 +31,7 @@ import java.util.Map; import java.util.Set; +import org.apache.tapestry.ioc.internal.util.CollectionFactory; import org.testng.annotations.Test; /** Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/DefenseTest.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/DefenseTest.java?view=diff&rev=477483&r1=477482&r2=477483 ============================================================================== --- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/DefenseTest.java (original) +++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/DefenseTest.java Mon Nov 20 19:17:37 2006 @@ -14,10 +14,11 @@ package org.apache.tapestry.util; -import static org.apache.tapestry.util.Defense.cast; -import static org.apache.tapestry.util.Defense.notBlank; -import static org.apache.tapestry.util.Defense.notNull; +import static org.apache.tapestry.ioc.internal.util.Defense.cast; +import static org.apache.tapestry.ioc.internal.util.Defense.notBlank; +import static org.apache.tapestry.ioc.internal.util.Defense.notNull; +import org.apache.tapestry.ioc.internal.util.Defense; import org.apache.tapestry.ioc.test.TestBase; import org.testng.annotations.Test; Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/IdAllocatorTest.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/IdAllocatorTest.java?view=diff&rev=477483&r1=477482&r2=477483 ============================================================================== --- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/IdAllocatorTest.java (original) +++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/IdAllocatorTest.java Mon Nov 20 19:17:37 2006 @@ -14,10 +14,11 @@ package org.apache.tapestry.util; -import static org.apache.tapestry.util.CollectionFactory.newList; +import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList; import java.util.List; +import org.apache.tapestry.ioc.internal.util.IdAllocator; import org.testng.Assert; import org.testng.annotations.Test;
