You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2008/05/20 20:52:29 UTC
svn commit: r658390 [31/32] - in
/tapestry/tapestry5/branches/hlship-20080520: ./
quickstart/src/main/resources/META-INF/
quickstart/src/main/resources/archetype-resources/src/main/java/pages/
quickstart/src/main/resources/archetype-resources/src/main/...
Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/SampleService.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/SampleService.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/SampleService.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/SampleService.java Tue May 20 11:51:35 2008
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
/**
- * Used by {@link org.apache.tapestry.ioc.internal.services.FilterMethodAnalyzer}.
+ * Used by {@link org.apache.tapestry5.ioc.internal.services.FilterMethodAnalyzer}.
*/
public interface SampleService
{
Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/SimpleService.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/SimpleService.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/SimpleService.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/SimpleService.java Tue May 20 11:51:35 2008
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
/**
- * Used by {@link org.apache.tapestry.ioc.internal.services.ClassFabImplTest}.
+ * Used by {@link org.apache.tapestry5.ioc.internal.services.ClassFabImplTest}.
*/
public interface SimpleService
{
Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/StandardFilter.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/StandardFilter.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/StandardFilter.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/StandardFilter.java Tue May 20 11:51:35 2008
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
public interface StandardFilter
{
Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/StandardService.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/StandardService.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/StandardService.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/StandardService.java Tue May 20 11:51:35 2008
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
public interface StandardService
{
Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/StartupModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/StartupModule.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/StartupModule.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/StartupModule.java Tue May 20 11:51:35 2008
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import org.apache.tapestry.ioc.OrderedConfiguration;
+import org.apache.tapestry5.ioc.OrderedConfiguration;
public class StartupModule
{
Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/StrategyBuilderImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/StrategyBuilderImplTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/StrategyBuilderImplTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/StrategyBuilderImplTest.java Tue May 20 11:51:35 2008
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import org.apache.tapestry.ioc.internal.IOCInternalTestCase;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
-import org.apache.tapestry.ioc.services.StrategyBuilder;
-import org.apache.tapestry.ioc.util.StrategyRegistry;
+import org.apache.tapestry5.ioc.internal.IOCInternalTestCase;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newMap;
+import org.apache.tapestry5.ioc.services.StrategyBuilder;
+import org.apache.tapestry5.ioc.util.StrategyRegistry;
import org.testng.annotations.Test;
import java.util.Collections;
@@ -54,7 +54,7 @@
assertEquals(service.kindOf(Collections.EMPTY_MAP), "MAP");
assertEquals(service.kindOf(Collections.EMPTY_LIST), "LIST");
- assertEquals(service.toString(), "<Strategy for org.apache.tapestry.ioc.internal.services.KindOf>");
+ assertEquals(service.toString(), "<Strategy for org.apache.tapestry5.ioc.internal.services.KindOf>");
try
{
@@ -64,7 +64,7 @@
catch (RuntimeException ex)
{
assertEquals(ex.getMessage(),
- "No adapter from type void to type org.apache.tapestry.ioc.internal.services.KindOf is available (registered types are java.util.List, java.util.Map).");
+ "No adapter from type void to type org.apache.tapestry5.ioc.internal.services.KindOf is available (registered types are java.util.List, java.util.Map).");
}
}
Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/StringLocationTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/StringLocationTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/StringLocationTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/StringLocationTest.java Tue May 20 11:51:35 2008
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import org.apache.tapestry.ioc.Location;
+import org.apache.tapestry5.ioc.Location;
import org.testng.Assert;
import org.testng.annotations.Test;
Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/SubInterface.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/SubInterface.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/SubInterface.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/SubInterface.java Tue May 20 11:51:35 2008
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
public interface SubInterface extends ParentInterface
{
Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/SymbolObjectProviderTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/SymbolObjectProviderTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/SymbolObjectProviderTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/SymbolObjectProviderTest.java Tue May 20 11:51:35 2008
@@ -12,16 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import org.apache.tapestry.ioc.AnnotationProvider;
-import org.apache.tapestry.ioc.ObjectLocator;
-import org.apache.tapestry.ioc.ObjectProvider;
-import org.apache.tapestry.ioc.annotation.IntermediateType;
-import org.apache.tapestry.ioc.annotation.Symbol;
-import org.apache.tapestry.ioc.services.SymbolSource;
-import org.apache.tapestry.ioc.services.TypeCoercer;
-import org.apache.tapestry.ioc.test.IOCTestCase;
+import org.apache.tapestry5.ioc.AnnotationProvider;
+import org.apache.tapestry5.ioc.ObjectLocator;
+import org.apache.tapestry5.ioc.ObjectProvider;
+import org.apache.tapestry5.ioc.annotations.IntermediateType;
+import org.apache.tapestry5.ioc.annotations.Symbol;
+import org.apache.tapestry5.ioc.services.SymbolSource;
+import org.apache.tapestry5.ioc.services.TypeCoercer;
+import org.apache.tapestry5.ioc.test.IOCTestCase;
import org.testng.annotations.Test;
import java.math.BigInteger;
Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/SymbolSourceImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/SymbolSourceImplTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/SymbolSourceImplTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/SymbolSourceImplTest.java Tue May 20 11:51:35 2008
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import org.apache.tapestry.ioc.internal.IOCInternalTestCase;
-import org.apache.tapestry.ioc.services.SymbolProvider;
-import org.apache.tapestry.ioc.services.SymbolSource;
+import org.apache.tapestry5.ioc.internal.IOCInternalTestCase;
+import org.apache.tapestry5.ioc.services.SymbolProvider;
+import org.apache.tapestry5.ioc.services.SymbolSource;
import org.testng.annotations.Test;
import java.util.Arrays;
Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/TargetBean.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/TargetBean.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/TargetBean.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/TargetBean.java Tue May 20 11:51:35 2008
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
/**
* Used by {@link ClassFactoryImplTest}.
Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ThreadLocaleImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ThreadLocaleImplTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ThreadLocaleImplTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ThreadLocaleImplTest.java Tue May 20 11:51:35 2008
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import org.apache.tapestry.ioc.internal.IOCInternalTestCase;
-import org.apache.tapestry.ioc.services.ThreadLocale;
+import org.apache.tapestry5.ioc.internal.IOCInternalTestCase;
+import org.apache.tapestry5.ioc.services.ThreadLocale;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ToStringFilter.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ToStringFilter.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ToStringFilter.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ToStringFilter.java Tue May 20 11:51:35 2008
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
public interface ToStringFilter
{
Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ToStringService.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ToStringService.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ToStringService.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ToStringService.java Tue May 20 11:51:35 2008
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
public interface ToStringService
{
Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/TypeCoercerImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/TypeCoercerImplTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/TypeCoercerImplTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/TypeCoercerImplTest.java Tue May 20 11:51:35 2008
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import org.apache.tapestry.ioc.internal.IOCInternalTestCase;
-import org.apache.tapestry.ioc.services.TypeCoercer;
-import org.apache.tapestry.ioc.util.TimeInterval;
+import org.apache.tapestry5.ioc.internal.IOCInternalTestCase;
+import org.apache.tapestry5.ioc.services.TypeCoercer;
+import org.apache.tapestry5.ioc.util.TimeInterval;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;
Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ValueObjectProviderTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ValueObjectProviderTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ValueObjectProviderTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ValueObjectProviderTest.java Tue May 20 11:51:35 2008
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import org.apache.tapestry.ioc.AnnotationProvider;
-import org.apache.tapestry.ioc.ObjectLocator;
-import org.apache.tapestry.ioc.annotation.IntermediateType;
-import org.apache.tapestry.ioc.annotation.Value;
-import org.apache.tapestry.ioc.services.SymbolSource;
-import org.apache.tapestry.ioc.services.TypeCoercer;
-import org.apache.tapestry.ioc.test.IOCTestCase;
+import org.apache.tapestry5.ioc.AnnotationProvider;
+import org.apache.tapestry5.ioc.ObjectLocator;
+import org.apache.tapestry5.ioc.annotations.IntermediateType;
+import org.apache.tapestry5.ioc.annotations.Value;
+import org.apache.tapestry5.ioc.services.SymbolSource;
+import org.apache.tapestry5.ioc.services.TypeCoercer;
+import org.apache.tapestry5.ioc.test.IOCTestCase;
import org.testng.annotations.Test;
import java.math.BigDecimal;
Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/Bar.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/Bar.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/Bar.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/Bar.java Tue May 20 11:51:35 2008
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
/**
Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/BarImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/BarImpl.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/BarImpl.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/BarImpl.java Tue May 20 11:51:35 2008
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
/**
Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/BaseGenericBean.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/BaseGenericBean.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/BaseGenericBean.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/BaseGenericBean.java Tue May 20 11:51:35 2008
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
public class BaseGenericBean<T>
{
Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ClasspathResourceTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ClasspathResourceTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ClasspathResourceTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ClasspathResourceTest.java Tue May 20 11:51:35 2008
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
-import org.apache.tapestry.ioc.Resource;
+import org.apache.tapestry5.ioc.Resource;
import org.testng.Assert;
import org.testng.annotations.Test;
@@ -29,7 +29,7 @@
{
private static final String RESOURCE_TXT_CONTENT = "content from resource.txt";
- private static final String FOLDER = "org/apache/tapestry/ioc/internal/util";
+ private static final String FOLDER = "org/apache/tapestry5/ioc/internal/util";
private static final String PATH = FOLDER + "/resource.txt";
Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/CollectionFactoryTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/CollectionFactoryTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/CollectionFactoryTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/CollectionFactoryTest.java Tue May 20 11:51:35 2008
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.*;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.*;
import org.testng.Assert;
import org.testng.annotations.Test;
Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ConcurrentBarrierTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ConcurrentBarrierTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ConcurrentBarrierTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ConcurrentBarrierTest.java Tue May 20 11:51:35 2008
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
-import org.apache.tapestry.ioc.test.TestBase;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newList;
+import org.apache.tapestry5.ioc.test.TestBase;
import org.testng.annotations.Test;
import java.util.List;
Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ConcurrentTarget.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ConcurrentTarget.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ConcurrentTarget.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ConcurrentTarget.java Tue May 20 11:51:35 2008
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
import java.util.concurrent.TimeUnit;
Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ConcurrentTargetWrapper.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ConcurrentTargetWrapper.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ConcurrentTargetWrapper.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ConcurrentTargetWrapper.java Tue May 20 11:51:35 2008
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
public class ConcurrentTargetWrapper implements Runnable
Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/DefenseTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/DefenseTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/DefenseTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/DefenseTest.java Tue May 20 11:51:35 2008
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
-import static org.apache.tapestry.ioc.internal.util.Defense.*;
-import org.apache.tapestry.ioc.test.TestBase;
+import static org.apache.tapestry5.ioc.internal.util.Defense.*;
+import org.apache.tapestry5.ioc.test.TestBase;
import org.testng.annotations.Test;
public class DefenseTest extends TestBase
Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/Foo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/Foo.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/Foo.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/Foo.java Tue May 20 11:51:35 2008
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
/**
Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/FooBar.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/FooBar.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/FooBar.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/FooBar.java Tue May 20 11:51:35 2008
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
/**
Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/FooBarImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/FooBarImpl.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/FooBarImpl.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/FooBarImpl.java Tue May 20 11:51:35 2008
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
/**
Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/FooImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/FooImpl.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/FooImpl.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/FooImpl.java Tue May 20 11:51:35 2008
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
/**
Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/GenericUtilsTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/GenericUtilsTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/GenericUtilsTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/GenericUtilsTest.java Tue May 20 11:51:35 2008
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
import org.testng.Assert;
import org.testng.annotations.Test;
Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/IdAllocatorTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/IdAllocatorTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/IdAllocatorTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/IdAllocatorTest.java Tue May 20 11:51:35 2008
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newList;
import org.testng.Assert;
import org.testng.annotations.Test;
Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/InheritanceSearchTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/InheritanceSearchTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/InheritanceSearchTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/InheritanceSearchTest.java Tue May 20 11:51:35 2008
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
-import org.apache.tapestry.ioc.test.TestBase;
+import org.apache.tapestry5.ioc.test.TestBase;
import org.testng.annotations.Test;
import java.io.Serializable;
Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/InjectoBean.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/InjectoBean.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/InjectoBean.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/InjectoBean.java Tue May 20 11:51:35 2008
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
-import org.apache.tapestry.ioc.annotation.Inject;
+import org.apache.tapestry5.ioc.annotations.Inject;
public class InjectoBean
{
Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/InternalUtilsTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/InternalUtilsTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/InternalUtilsTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/InternalUtilsTest.java Tue May 20 11:51:35 2008
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
-import org.apache.tapestry.ioc.Locatable;
-import org.apache.tapestry.ioc.Location;
-import org.apache.tapestry.ioc.annotation.Inject;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
-import static org.apache.tapestry.ioc.internal.util.InternalUtils.toList;
-import org.apache.tapestry.ioc.test.IOCTestCase;
+import org.apache.tapestry5.ioc.Locatable;
+import org.apache.tapestry5.ioc.Location;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newMap;
+import static org.apache.tapestry5.ioc.internal.util.InternalUtils.toList;
+import org.apache.tapestry5.ioc.test.IOCTestCase;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
@@ -324,7 +324,7 @@
catch (IllegalArgumentException ex)
{
assertEquals(ex.getMessage(),
- "Marker annotation class org.apache.tapestry.ioc.internal.util.NotRetainedRuntime is not valid because it is not visible at runtime. Add a @RetentionPolicy(RUNTIME) to the class.");
+ "Marker annotation class org.apache.tapestry5.ioc.internal.util.NotRetainedRuntime is not valid because it is not visible at runtime. Add a @RetentionPolicy(RUNTIME) to the class.");
}
}
Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/LocalizedNameGeneratorTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/LocalizedNameGeneratorTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/LocalizedNameGeneratorTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/LocalizedNameGeneratorTest.java Tue May 20 11:51:35 2008
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
-import org.apache.tapestry.ioc.test.IOCTestCase;
+import org.apache.tapestry5.ioc.test.IOCTestCase;
import org.testng.annotations.Test;
import java.util.Locale;
Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/LocationImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/LocationImplTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/LocationImplTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/LocationImplTest.java Tue May 20 11:51:35 2008
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
-import org.apache.tapestry.ioc.Location;
-import org.apache.tapestry.ioc.Resource;
-import org.apache.tapestry.ioc.test.IOCTestCase;
+import org.apache.tapestry5.ioc.Location;
+import org.apache.tapestry5.ioc.Resource;
+import org.apache.tapestry5.ioc.test.IOCTestCase;
import org.testng.annotations.Test;
import java.util.Random;
Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/MessageFormatterImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/MessageFormatterImplTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/MessageFormatterImplTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/MessageFormatterImplTest.java Tue May 20 11:51:35 2008
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
import org.testng.Assert;
import org.testng.annotations.Test;
Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/MessagesImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/MessagesImplTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/MessagesImplTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/MessagesImplTest.java Tue May 20 11:51:35 2008
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
-import org.apache.tapestry.ioc.MessageFormatter;
-import org.apache.tapestry.ioc.Messages;
-import org.apache.tapestry.ioc.test.IOCTestCase;
+import org.apache.tapestry5.ioc.MessageFormatter;
+import org.apache.tapestry5.ioc.Messages;
+import org.apache.tapestry5.ioc.test.IOCTestCase;
import org.testng.annotations.Test;
public class MessagesImplTest extends IOCTestCase
Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/NonGenericBean.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/NonGenericBean.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/NonGenericBean.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/NonGenericBean.java Tue May 20 11:51:35 2008
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
public class NonGenericBean
{
Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/NotRetainedRuntime.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/NotRetainedRuntime.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/NotRetainedRuntime.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/NotRetainedRuntime.java Tue May 20 11:51:35 2008
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
import java.lang.annotation.ElementType;
import java.lang.annotation.Target;
@@ -21,7 +21,7 @@
/**
* Used for testing; this annotation is NOT retained at runtime.
*/
-@Target({ElementType.PARAMETER, ElementType.FIELD})
+@Target({ ElementType.PARAMETER, ElementType.FIELD })
public @interface NotRetainedRuntime
{
}
Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/OneShotLockSubject.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/OneShotLockSubject.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/OneShotLockSubject.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/OneShotLockSubject.java Tue May 20 11:51:35 2008
@@ -15,7 +15,7 @@
/**
*
*/
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
/**
@@ -34,4 +34,4 @@
{
lock.lock();
}
-}
\ No newline at end of file
+}
Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/OneShotLockTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/OneShotLockTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/OneShotLockTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/OneShotLockTest.java Tue May 20 11:51:35 2008
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
-import org.apache.tapestry.ioc.test.IOCTestCase;
+import org.apache.tapestry5.ioc.test.IOCTestCase;
import org.testng.annotations.Test;
public class OneShotLockTest extends IOCTestCase
Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/OrdererTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/OrdererTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/OrdererTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/OrdererTest.java Tue May 20 11:51:35 2008
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
-import org.apache.tapestry.ioc.Orderable;
-import org.apache.tapestry.ioc.internal.IOCInternalTestCase;
+import org.apache.tapestry5.ioc.Orderable;
+import org.apache.tapestry5.ioc.internal.IOCInternalTestCase;
import org.slf4j.Logger;
import org.testng.annotations.Test;
Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/Pair.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/Pair.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/Pair.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/Pair.java Tue May 20 11:51:35 2008
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
public class Pair<K, V>
{
Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/StringBean.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/StringBean.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/StringBean.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/StringBean.java Tue May 20 11:51:35 2008
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
public class StringBean extends BaseGenericBean<String>
{
Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/StringLongPair.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/StringLongPair.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/StringLongPair.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/StringLongPair.java Tue May 20 11:51:35 2008
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
public class StringLongPair extends Pair<String, Long>
{
Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/TargetMessages.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/TargetMessages.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/TargetMessages.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/TargetMessages.java Tue May 20 11:51:35 2008
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
/**
- * Used with {@link org.apache.tapestry.ioc.internal.util.MessagesImplTest}.
+ * Used with {@link org.apache.tapestry5.ioc.internal.util.MessagesImplTest}.
*/
public class TargetMessages
{
Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/services/ClassFabUtilsTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/services/ClassFabUtilsTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/services/ClassFabUtilsTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/services/ClassFabUtilsTest.java Tue May 20 11:51:35 2008
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.services;
+package org.apache.tapestry5.ioc.services;
-import org.apache.tapestry.ioc.test.IOCTestCase;
+import org.apache.tapestry5.ioc.test.IOCTestCase;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/services/MethodIteratorTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/services/MethodIteratorTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/services/MethodIteratorTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/services/MethodIteratorTest.java Tue May 20 11:51:35 2008
@@ -1,20 +1,20 @@
-// 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.services;
+// 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.
-import org.apache.tapestry.ioc.test.IOCTestCase;
+package org.apache.tapestry5.ioc.services;
+
+import org.apache.tapestry5.ioc.test.IOCTestCase;
import org.testng.annotations.Test;
import java.io.IOException;
@@ -139,7 +139,7 @@
MethodSignature actual = mi.next();
- assertEquals(new MethodSignature(void.class, "open", null, new Class[]{IOException.class}), actual);
+ assertEquals(new MethodSignature(void.class, "open", null, new Class[] { IOException.class }), actual);
assertEquals(false, mi.hasNext());
}
Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/services/MethodSignatureTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/services/MethodSignatureTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/services/MethodSignatureTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/services/MethodSignatureTest.java Tue May 20 11:51:35 2008
@@ -1,20 +1,20 @@
-// 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.services;
+// 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.
-import org.apache.tapestry.ioc.test.IOCTestCase;
+package org.apache.tapestry5.ioc.services;
+
+import org.apache.tapestry5.ioc.test.IOCTestCase;
import org.testng.annotations.Test;
import java.io.IOException;
@@ -86,8 +86,8 @@
@Test
public void equals_with_parameters_mismatch()
{
- MethodSignature m1 = new MethodSignature(void.class, "foo", new Class[]{String.class}, null);
- MethodSignature m2 = new MethodSignature(void.class, "foo", new Class[]{Boolean.class}, null);
+ MethodSignature m1 = new MethodSignature(void.class, "foo", new Class[] { String.class }, null);
+ MethodSignature m2 = new MethodSignature(void.class, "foo", new Class[] { Boolean.class }, null);
assertEquals(false, m1.equals(m2));
}
@@ -155,7 +155,7 @@
public void overriding_signature_parameters_mismatch()
{
MethodSignature m1 = new MethodSignature(void.class, "foo", null, null);
- MethodSignature m2 = new MethodSignature(void.class, "foo", new Class[]{String.class}, null);
+ MethodSignature m2 = new MethodSignature(void.class, "foo", new Class[] { String.class }, null);
assertEquals(m1.isOverridingSignatureOf(m2), false);
}
@@ -163,8 +163,8 @@
@Test
public void overriding_signature()
{
- MethodSignature m1 = new MethodSignature(void.class, "close", null, new Class[]{Exception.class});
- MethodSignature m2 = new MethodSignature(void.class, "close", null, new Class[]{RuntimeException.class});
+ MethodSignature m1 = new MethodSignature(void.class, "close", null, new Class[] { Exception.class });
+ MethodSignature m2 = new MethodSignature(void.class, "close", null, new Class[] { RuntimeException.class });
assertEquals(m1.isOverridingSignatureOf(m2), true);
assertEquals(m2.isOverridingSignatureOf(m1), false);
@@ -177,7 +177,7 @@
public void overriding_signature_with_no_exceptions()
{
MethodSignature m1 = new MethodSignature(void.class, "close", null, null);
- MethodSignature m2 = new MethodSignature(void.class, "close", null, new Class[]{RuntimeException.class});
+ MethodSignature m2 = new MethodSignature(void.class, "close", null, new Class[] { RuntimeException.class });
assertEquals(m1.isOverridingSignatureOf(m2), false);
assertEquals(m2.isOverridingSignatureOf(m1), true);
@@ -190,9 +190,9 @@
public void overriding_signature_with_multiple_matched_exceptions()
{
MethodSignature m1 = new MethodSignature(void.class, "close", null,
- new Class[]{SQLException.class, NumberFormatException.class});
+ new Class[] { SQLException.class, NumberFormatException.class });
MethodSignature m2 = new MethodSignature(void.class, "close", null,
- new Class[]{SQLException.class, IOException.class});
+ new Class[] { SQLException.class, IOException.class });
assertEquals(m1.isOverridingSignatureOf(m2), false);
assertEquals(m2.isOverridingSignatureOf(m1), false);
Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/services/PropertyShadowBuilderImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/services/PropertyShadowBuilderImplTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/services/PropertyShadowBuilderImplTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/services/PropertyShadowBuilderImplTest.java Tue May 20 11:51:35 2008
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.services;
+package org.apache.tapestry5.ioc.services;
-import org.apache.tapestry.ioc.Registry;
-import org.apache.tapestry.ioc.test.IOCTestCase;
+import org.apache.tapestry5.ioc.Registry;
+import org.apache.tapestry5.ioc.test.IOCTestCase;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/util/BodyBuilderTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/util/BodyBuilderTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/util/BodyBuilderTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/util/BodyBuilderTest.java Tue May 20 11:51:35 2008
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.util;
+package org.apache.tapestry5.ioc.util;
-import org.apache.tapestry.ioc.test.IOCTestCase;
+import org.apache.tapestry5.ioc.test.IOCTestCase;
import org.testng.annotations.Test;
public class BodyBuilderTest extends IOCTestCase
Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/util/CaseInsensitiveMapTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/util/CaseInsensitiveMapTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/util/CaseInsensitiveMapTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/util/CaseInsensitiveMapTest.java Tue May 20 11:51:35 2008
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.util;
+package org.apache.tapestry5.ioc.util;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newCaseInsensitiveMap;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newCaseInsensitiveMap;
import org.testng.Assert;
import org.testng.annotations.Test;
@@ -103,8 +103,7 @@
}
/**
- * Add a large number of keys which should stress the code that adds and expands values into the
- * map.
+ * Add a large number of keys which should stress the code that adds and expands values into the map.
*/
@Test
public void expansion_of_internal_entry_array()
@@ -150,7 +149,7 @@
}
@Test(expectedExceptions =
- {ConcurrentModificationException.class})
+ { ConcurrentModificationException.class })
public void iterator_fail_fast_after_remove()
{
Map<String, String> map = newCaseInsensitiveMap();
@@ -170,7 +169,7 @@
}
@Test(expectedExceptions =
- {ConcurrentModificationException.class})
+ { ConcurrentModificationException.class })
public void iterator_fail_fast_on_next()
{
Map<String, String> map = newCaseInsensitiveMap();
@@ -271,7 +270,7 @@
}
@Test(expectedExceptions =
- {NoSuchElementException.class})
+ { NoSuchElementException.class })
public void next_after_last_entry_is_failure()
{
Map<String, String> map = newCaseInsensitiveMap();
Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/util/ExceptionUtilsTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/util/ExceptionUtilsTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/util/ExceptionUtilsTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/util/ExceptionUtilsTest.java Tue May 20 11:51:35 2008
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.util;
+package org.apache.tapestry5.ioc.util;
-import org.apache.tapestry.ioc.internal.util.TapestryException;
+import org.apache.tapestry5.ioc.internal.util.TapestryException;
import org.testng.Assert;
import org.testng.annotations.Test;
Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/util/StackTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/util/StackTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/util/StackTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/util/StackTest.java Tue May 20 11:51:35 2008
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.util;
+package org.apache.tapestry5.ioc.util;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newStack;
-import org.apache.tapestry.ioc.test.TestBase;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newStack;
+import org.apache.tapestry5.ioc.test.TestBase;
import org.testng.annotations.Test;
public class StackTest extends TestBase
@@ -73,7 +73,7 @@
Object[] snapshot = stack.getSnapshot();
- assertArraysEqual(snapshot, new Object[]{fred, barney});
+ assertArraysEqual(snapshot, new Object[] { fred, barney });
assertEquals(stack.pop(), barney);
assertEquals(stack.peek(), fred);
Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/util/StrategyRegistryTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/util/StrategyRegistryTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/util/StrategyRegistryTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/util/StrategyRegistryTest.java Tue May 20 11:51:35 2008
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.util;
+package org.apache.tapestry5.ioc.util;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
-import org.apache.tapestry.ioc.test.IOCTestCase;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newMap;
+import org.apache.tapestry5.ioc.test.IOCTestCase;
import org.testng.annotations.Test;
import java.util.*;
Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/util/TimeIntervalTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/util/TimeIntervalTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/util/TimeIntervalTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/util/TimeIntervalTest.java Tue May 20 11:51:35 2008
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.util;
+package org.apache.tapestry5.ioc.util;
-import org.apache.tapestry.ioc.test.TestBase;
+import org.apache.tapestry5.ioc.test.TestBase;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/resources/org/apache/tapestry5/ioc/internal/util/TargetStrings.properties
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/resources/org/apache/tapestry5/ioc/internal/util/TargetStrings.properties?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/resources/org/apache/tapestry5/ioc/internal/util/TargetStrings.properties (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-ioc/src/test/resources/org/apache/tapestry5/ioc/internal/util/TargetStrings.properties Tue May 20 11:51:35 2008
@@ -14,4 +14,4 @@
no-args=No arguments.
something-failed=Something failed: %s
-result=The result is '%s'.
\ No newline at end of file
+result=The result is '%s'.
Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-spring/src/main/java/org/apache/tapestry5/internal/spring/SpringModuleDef.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-spring/src/main/java/org/apache/tapestry5/internal/spring/SpringModuleDef.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-spring/src/main/java/org/apache/tapestry5/internal/spring/SpringModuleDef.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-spring/src/main/java/org/apache/tapestry5/internal/spring/SpringModuleDef.java Tue May 20 11:51:35 2008
@@ -12,16 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.spring;
+package org.apache.tapestry5.internal.spring;
-import org.apache.tapestry.ioc.IOCConstants;
-import org.apache.tapestry.ioc.ObjectCreator;
-import org.apache.tapestry.ioc.ServiceBuilderResources;
-import org.apache.tapestry.ioc.def.ContributionDef;
-import org.apache.tapestry.ioc.def.DecoratorDef;
-import org.apache.tapestry.ioc.def.ModuleDef;
-import org.apache.tapestry.ioc.def.ServiceDef;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newCaseInsensitiveMap;
+import org.apache.tapestry5.ioc.IOCConstants;
+import org.apache.tapestry5.ioc.ObjectCreator;
+import org.apache.tapestry5.ioc.ServiceBuilderResources;
+import org.apache.tapestry5.ioc.def.ContributionDef;
+import org.apache.tapestry5.ioc.def.DecoratorDef;
+import org.apache.tapestry5.ioc.def.ModuleDef;
+import org.apache.tapestry5.ioc.def.ServiceDef;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newCaseInsensitiveMap;
import org.springframework.beans.factory.BeanFactoryUtils;
import org.springframework.context.ApplicationContext;
import org.springframework.web.context.WebApplicationContext;
Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-spring/src/main/java/org/apache/tapestry5/spring/SpringMessages.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-spring/src/main/java/org/apache/tapestry5/spring/SpringMessages.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-spring/src/main/java/org/apache/tapestry5/spring/SpringMessages.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-spring/src/main/java/org/apache/tapestry5/spring/SpringMessages.java Tue May 20 11:51:35 2008
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.spring;
+package org.apache.tapestry5.spring;
-import org.apache.tapestry.ioc.Messages;
-import org.apache.tapestry.ioc.internal.util.MessagesImpl;
+import org.apache.tapestry5.ioc.Messages;
+import org.apache.tapestry5.ioc.internal.util.MessagesImpl;
import org.springframework.web.context.ContextLoaderListener;
class SpringMessages
Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-spring/src/main/java/org/apache/tapestry5/spring/TapestrySpringFilter.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-spring/src/main/java/org/apache/tapestry5/spring/TapestrySpringFilter.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-spring/src/main/java/org/apache/tapestry5/spring/TapestrySpringFilter.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-spring/src/main/java/org/apache/tapestry5/spring/TapestrySpringFilter.java Tue May 20 11:51:35 2008
@@ -12,20 +12,20 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.spring;
+package org.apache.tapestry5.spring;
-import org.apache.tapestry.TapestryFilter;
-import org.apache.tapestry.internal.spring.SpringModuleDef;
-import org.apache.tapestry.ioc.def.ModuleDef;
+import org.apache.tapestry5.TapestryFilter;
+import org.apache.tapestry5.internal.spring.SpringModuleDef;
+import org.apache.tapestry5.ioc.def.ModuleDef;
import org.springframework.context.ApplicationContext;
import org.springframework.web.context.WebApplicationContext;
import javax.servlet.ServletContext;
/**
- * Adds a {@link ModuleDef} that contains all the beans defined by the Spring
- * {@link ApplicationContext}, as if they were Tapestry IoC services. This is done using a filter,
- * so that the Spring beans can be "mixed into" the Tapestry IoC Registry before it even starts up.
+ * Adds a {@link ModuleDef} that contains all the beans defined by the Spring {@link ApplicationContext}, as if they
+ * were Tapestry IoC services. This is done using a filter, so that the Spring beans can be "mixed into" the Tapestry
+ * IoC Registry before it even starts up.
*/
public class TapestrySpringFilter extends TapestryFilter
{
@@ -47,6 +47,6 @@
if (springContext == null) throw new RuntimeException(SpringMessages.missingContext());
return new ModuleDef[]
- {new SpringModuleDef(springContext)};
+ { new SpringModuleDef(springContext) };
}
}
Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-spring/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-spring/src/site/apt/index.apt?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-spring/src/site/apt/index.apt (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-spring/src/site/apt/index.apt Tue May 20 11:51:35 2008
@@ -42,7 +42,7 @@
<filter>
<filter-name>app</filter-name>
<!-- Special filter that adds in a T5 IoC module derived from the Spring WebApplicationContext. -->
- <filter-class>org.apache.tapestry.spring.TapestrySpringFilter</filter-class>
+ <filter-class>org.apache.tapestry5.spring.TapestrySpringFilter</filter-class>
</filter>
+---+
@@ -68,7 +68,7 @@
* Injecting beans
Inside your component classes, you may use the
- {{{http://tapestry.apache.org/tapestry5/tapestry-core/apidocs/org/apache/tapestry/ioc/annotations/Inject.html}Inject}} annotation. Typically, just the field
+ {{{http://tapestry.apache.org/tapestry5/tapestry-core/apidocs/org/apache/tapestry5/ioc/annotations/Inject.html}Inject}} annotation. Typically, just the field
type is sufficient to identify the Spring bean to inject:
+----+
@@ -78,7 +78,7 @@
If you have multiple beans that implement the same interface (for instance, if you have wrapped your bean using a transaction interceptor), you must disambiguate. The easiest way
to accomplish this is to add a
- {{{http://tapestry.apache.org/tapestry5/tapestry-core/apidocs/org/apache/tapestry/annotations/Service.html}Service}}
+ {{{http://tapestry.apache.org/tapestry5/tapestry-core/apidocs/org/apache/tapestry5/annotations/Service.html}Service}}
annotation to identify the name of the
Spring bean:
Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-spring/src/test/conf/testng.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-spring/src/test/conf/testng.xml?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-spring/src/test/conf/testng.xml (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-spring/src/test/conf/testng.xml Tue May 20 11:51:35 2008
@@ -18,7 +18,7 @@
<suite name="Tapesty Spring Integration" parallel="false" thread-count="10" annotations="1.5" verbose="2">
<test name="Tapestry Spring Integration">
<packages>
- <package name="org.apache.tapestry.spring"/>
+ <package name="org.apache.tapestry5.spring"/>
</packages>
</test>
</suite>
Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-spring/src/test/java/org/apache/tapestry5/spring/TapestrySpringFilterTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-spring/src/test/java/org/apache/tapestry5/spring/TapestrySpringFilterTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-spring/src/test/java/org/apache/tapestry5/spring/TapestrySpringFilterTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-spring/src/test/java/org/apache/tapestry5/spring/TapestrySpringFilterTest.java Tue May 20 11:51:35 2008
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.spring;
+package org.apache.tapestry5.spring;
-import org.apache.tapestry.test.TapestryTestCase;
+import org.apache.tapestry5.test.TapestryTestCase;
import org.springframework.web.context.WebApplicationContext;
import org.testng.annotations.Test;
Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-spring/src/test/java/org/apache/tapestry5/spring/TapestrySpringIntegrationTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-spring/src/test/java/org/apache/tapestry5/spring/TapestrySpringIntegrationTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-spring/src/test/java/org/apache/tapestry5/spring/TapestrySpringIntegrationTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-spring/src/test/java/org/apache/tapestry5/spring/TapestrySpringIntegrationTest.java Tue May 20 11:51:35 2008
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.spring;
+package org.apache.tapestry5.spring;
-import org.apache.tapestry.test.AbstractIntegrationTestSuite;
+import org.apache.tapestry5.test.AbstractIntegrationTestSuite;
import org.testng.annotations.Test;
public class TapestrySpringIntegrationTest extends AbstractIntegrationTestSuite
Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-spring/src/test/java/org/example/testapp/pages/Start.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-spring/src/test/java/org/example/testapp/pages/Start.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-spring/src/test/java/org/example/testapp/pages/Start.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-spring/src/test/java/org/example/testapp/pages/Start.java Tue May 20 11:51:35 2008
@@ -14,9 +14,9 @@
package org.example.testapp.pages;
-import org.apache.tapestry.annotation.Retain;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.annotations.Retain;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
import org.example.testapp.services.Upcase;
import org.springframework.web.context.WebApplicationContext;
Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-spring/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-spring/src/test/resources/log4j.properties?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-spring/src/test/resources/log4j.properties (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-spring/src/test/resources/log4j.properties Tue May 20 11:51:35 2008
@@ -21,11 +21,11 @@
log4j.appender.A1.layout=org.apache.log4j.PatternLayout
log4j.appender.A1.layout.ConversionPattern=[%p] %c{1} %m%n
-log4j.category.org.apache.tapestry.TapestryFilter=info
+log4j.category.org.apache.tapestry5.TapestryFilter=info
log4j.category.org.apache.tapestry=error
log4j.category.tapestry=error
log4j.category.tapestry.ioc.ClassFactory=error
log4j.category.app=info
-log4j.category.org.apache.tapestry.integration.app1=error
-log4j.category.org.apache.tapestry.corelib=error
+log4j.category.org.apache.tapestry5.integration.app1=error
+log4j.category.org.apache.tapestry5.corelib=error