Author: hlship
Date: Thu Feb 15 09:54:58 2007
New Revision: 508049
URL: http://svn.apache.org/viewvc?view=rev&rev=508049
Log:
Move a few top-level classes into the org.apache.tapestry.util package.
Added:
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/util/
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/util/DefaultPrimaryKeyEncoder.java
- copied, changed from r506764,
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/DefaultPrimaryKeyEncoder.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/util/EnumSelectModel.java
- copied, changed from r507297,
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/EnumSelectModel.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/util/EnumValueEncoder.java
- copied, changed from r506764,
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/EnumValueEncoder.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/util/StringToEnumCoercion.java
- copied, changed from r507989,
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/StringToEnumCoercion.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/util/TextStreamResponse.java
- copied, changed from r507781,
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/TextStreamResponse.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/util/UtilMessages.java
tapestry/tapestry5/tapestry-core/trunk/src/main/resources/org/apache/tapestry/util/UtilStrings.properties
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/DefaultPrimaryKeyEncoderTest.java
- copied, changed from r506764,
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/DefaultPrimaryKeyEncoderTest.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/EnumSelectModelTest.java
- copied, changed from r506764,
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/EnumSelectModelTest.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/StringToEnumCoercionTest.java
- copied, changed from r507989,
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/StringToEnumCoercionTest.java
Removed:
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/DefaultPrimaryKeyEncoder.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/EnumSelectModel.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/EnumValueEncoder.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/StringToEnumCoercion.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/TapestryMessages.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/TextStreamResponse.java
tapestry/tapestry5/tapestry-core/trunk/src/main/resources/org/apache/tapestry/TapestryStrings.properties
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/DefaultPrimaryKeyEncoderTest.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/EnumSelectModelTest.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/StringToEnumCoercionTest.java
Modified:
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/corelib/components/BeanEditForm.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/corelib/components/Select.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/TapestryModule.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/Start.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/ToDoList.java
Modified:
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/corelib/components/BeanEditForm.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/corelib/components/BeanEditForm.java?view=diff&rev=508049&r1=508048&r2=508049
==============================================================================
---
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/corelib/components/BeanEditForm.java
(original)
+++
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/corelib/components/BeanEditForm.java
Thu Feb 15 09:54:58 2007
@@ -18,8 +18,6 @@
import org.apache.tapestry.Block;
import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.EnumSelectModel;
-import org.apache.tapestry.EnumValueEncoder;
import org.apache.tapestry.Field;
import org.apache.tapestry.FieldValidator;
import org.apache.tapestry.SelectModel;
@@ -35,6 +33,8 @@
import org.apache.tapestry.services.BeanModelSource;
import org.apache.tapestry.services.FieldValidatorDefaultSource;
import org.apache.tapestry.services.TranslatorDefaultSource;
+import org.apache.tapestry.util.EnumSelectModel;
+import org.apache.tapestry.util.EnumValueEncoder;
/**
* A component that creates an entire form editting the properties of a
particular bean. Inspired by
Modified:
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/corelib/components/Select.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/corelib/components/Select.java?view=diff&rev=508049&r1=508048&r2=508049
==============================================================================
---
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/corelib/components/Select.java
(original)
+++
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/corelib/components/Select.java
Thu Feb 15 09:54:58 2007
@@ -20,8 +20,6 @@
import org.apache.tapestry.Binding;
import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.EnumSelectModel;
-import org.apache.tapestry.EnumValueEncoder;
import org.apache.tapestry.FieldValidator;
import org.apache.tapestry.MarkupWriter;
import org.apache.tapestry.OptionGroupModel;
@@ -38,6 +36,8 @@
import org.apache.tapestry.corelib.base.AbstractField;
import org.apache.tapestry.internal.services.FormParameterLookup;
import org.apache.tapestry.services.FieldValidatorDefaultSource;
+import org.apache.tapestry.util.EnumSelectModel;
+import org.apache.tapestry.util.EnumValueEncoder;
/**
* Select an item from a list of values, using an [X]HTML <select>
element on the client side.
Modified:
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/TapestryModule.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/TapestryModule.java?view=diff&rev=508049&r1=508048&r2=508049
==============================================================================
---
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/TapestryModule.java
(original)
+++
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/TapestryModule.java
Thu Feb 15 09:54:58 2007
@@ -30,7 +30,6 @@
import org.apache.tapestry.MarkupWriter;
import org.apache.tapestry.SelectModel;
import org.apache.tapestry.StreamResponse;
-import org.apache.tapestry.StringToEnumCoercion;
import org.apache.tapestry.Translator;
import org.apache.tapestry.Validator;
import org.apache.tapestry.annotations.AfterRender;
@@ -181,6 +180,7 @@
import org.apache.tapestry.translator.IntegerTranslator;
import org.apache.tapestry.translator.LongTranslator;
import org.apache.tapestry.translator.StringTranslator;
+import org.apache.tapestry.util.StringToEnumCoercion;
import org.apache.tapestry.validator.Max;
import org.apache.tapestry.validator.MaxLength;
import org.apache.tapestry.validator.Min;
Copied:
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/util/DefaultPrimaryKeyEncoder.java
(from r506764,
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/DefaultPrimaryKeyEncoder.java)
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/util/DefaultPrimaryKeyEncoder.java?view=diff&rev=508049&p1=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/DefaultPrimaryKeyEncoder.java&r1=506764&p2=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/util/DefaultPrimaryKeyEncoder.java&r2=508049
==============================================================================
---
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/DefaultPrimaryKeyEncoder.java
(original)
+++
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/util/DefaultPrimaryKeyEncoder.java
Thu Feb 15 09:54:58 2007
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry.util;
import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
@@ -24,6 +24,7 @@
import java.util.Map;
import java.util.Set;
+import org.apache.tapestry.PrimaryKeyEncoder;
import org.apache.tapestry.ioc.internal.util.Defense;
/**
@@ -56,7 +57,7 @@
V existing = _keyToValue.get(key);
if (existing != null)
- throw new
IllegalArgumentException(TapestryMessages.duplicateKey(key, value, existing));
+ throw new IllegalArgumentException(UtilMessages.duplicateKey(key,
value, existing));
_keyToValue.put(key, value);
@@ -126,7 +127,7 @@
_currentKey = _valueToKey.get(value);
if (_currentKey == null)
- throw new
IllegalArgumentException(TapestryMessages.missingValue(value, _valueToKey
+ throw new
IllegalArgumentException(UtilMessages.missingValue(value, _valueToKey
.keySet()));
return _currentKey;
Copied:
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/util/EnumSelectModel.java
(from r507297,
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/EnumSelectModel.java)
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/util/EnumSelectModel.java?view=diff&rev=508049&p1=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/EnumSelectModel.java&r1=507297&p2=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/util/EnumSelectModel.java&r2=508049
==============================================================================
---
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/EnumSelectModel.java
(original)
+++
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/util/EnumSelectModel.java
Thu Feb 15 09:54:58 2007
@@ -12,13 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry.util;
import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
import java.io.Serializable;
import java.util.List;
+import org.apache.tapestry.OptionGroupModel;
+import org.apache.tapestry.OptionModel;
+import org.apache.tapestry.SelectModel;
import org.apache.tapestry.internal.OptionModelImpl;
import org.apache.tapestry.internal.TapestryUtils;
import org.apache.tapestry.ioc.IOCUtilities;
Copied:
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/util/EnumValueEncoder.java
(from r506764,
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/EnumValueEncoder.java)
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/util/EnumValueEncoder.java?view=diff&rev=508049&p1=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/EnumValueEncoder.java&r1=506764&p2=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/util/EnumValueEncoder.java&r2=508049
==============================================================================
---
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/EnumValueEncoder.java
(original)
+++
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/util/EnumValueEncoder.java
Thu Feb 15 09:54:58 2007
@@ -12,8 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry.util;
+import org.apache.tapestry.ValueEncoder;
import org.apache.tapestry.ioc.internal.util.Defense;
/**
Copied:
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/util/StringToEnumCoercion.java
(from r507989,
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/StringToEnumCoercion.java)
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/util/StringToEnumCoercion.java?view=diff&rev=508049&p1=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/StringToEnumCoercion.java&r1=507989&p2=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/util/StringToEnumCoercion.java&r2=508049
==============================================================================
---
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/StringToEnumCoercion.java
(original)
+++
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/util/StringToEnumCoercion.java
Thu Feb 15 09:54:58 2007
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry.util;
import static
org.apache.tapestry.ioc.internal.util.CollectionFactory.newCaseInsensitiveMap;
@@ -56,7 +56,7 @@
T result = _stringToEnum.get(input);
if (result == null)
- throw new RuntimeException(TapestryMessages.missingEnumValue(
+ throw new RuntimeException(UtilMessages.missingEnumValue(
input,
_enumClass,
_stringToEnum.keySet()));
Copied:
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/util/TextStreamResponse.java
(from r507781,
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/TextStreamResponse.java)
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/util/TextStreamResponse.java?view=diff&rev=508049&p1=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/TextStreamResponse.java&r1=507781&p2=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/util/TextStreamResponse.java&r2=508049
==============================================================================
---
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/TextStreamResponse.java
(original)
+++
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/util/TextStreamResponse.java
Thu Feb 15 09:54:58 2007
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry.util;
import static org.apache.tapestry.ioc.internal.util.Defense.notBlank;
import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
@@ -20,6 +20,8 @@
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
+
+import org.apache.tapestry.StreamResponse;
public class TextStreamResponse implements StreamResponse
{
Added:
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/util/UtilMessages.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/util/UtilMessages.java?view=auto&rev=508049
==============================================================================
---
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/util/UtilMessages.java
(added)
+++
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/util/UtilMessages.java
Thu Feb 15 09:54:58 2007
@@ -0,0 +1,41 @@
+// Copyright 2007 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package org.apache.tapestry.util;
+
+import java.util.Collection;
+
+import org.apache.tapestry.ioc.Messages;
+import org.apache.tapestry.ioc.internal.util.InternalUtils;
+import org.apache.tapestry.ioc.internal.util.MessagesImpl;
+
+final class UtilMessages
+{
+ private static final Messages MESSAGES =
MessagesImpl.forClass(UtilMessages.class);
+
+ static String duplicateKey(Object key, Object newValue, Object
existingValue)
+ {
+ return MESSAGES.format("duplicate-key", key, newValue, existingValue);
+ }
+
+ static <V> String missingValue(V value, Collection<V> values)
+ {
+ return MESSAGES.format("missing-value", value,
InternalUtils.joinSorted(values));
+ }
+
+ static String missingEnumValue(String value, Class enumClass,
Collection<String> values)
+ {
+ return MESSAGES.format("missing-enum-value", value,
enumClass.getName(), InternalUtils.joinSorted(values));
+ }
+}
Added:
tapestry/tapestry5/tapestry-core/trunk/src/main/resources/org/apache/tapestry/util/UtilStrings.properties
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/resources/org/apache/tapestry/util/UtilStrings.properties?view=auto&rev=508049
==============================================================================
---
tapestry/tapestry5/tapestry-core/trunk/src/main/resources/org/apache/tapestry/util/UtilStrings.properties
(added)
+++
tapestry/tapestry5/tapestry-core/trunk/src/main/resources/org/apache/tapestry/util/UtilStrings.properties
Thu Feb 15 09:54:58 2007
@@ -0,0 +1,17 @@
+# Copyright 2007 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.
+
+duplicate-key=Key %s may not be added with value %s, as an existing value, %s,
is already present.
+missing-value=Key for value %s not found. Available values: %s
+missing-enum-value=Input '%s' does not identify a value from enumerated type
%s. Available values: %s.
\ No newline at end of file
Modified:
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/Start.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/Start.java?view=diff&rev=508049&r1=508048&r2=508049
==============================================================================
---
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/Start.java
(original)
+++
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/Start.java
Thu Feb 15 09:54:58 2007
@@ -14,7 +14,7 @@
package org.apache.tapestry.integration.app1.pages;
-import org.apache.tapestry.TextStreamResponse;
+import org.apache.tapestry.util.TextStreamResponse;
/**
* Have to start somewhere!
Modified:
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/ToDoList.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/ToDoList.java?view=diff&rev=508049&r1=508048&r2=508049
==============================================================================
---
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/ToDoList.java
(original)
+++
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/ToDoList.java
Thu Feb 15 09:54:58 2007
@@ -16,13 +16,13 @@
import java.util.List;
-import org.apache.tapestry.DefaultPrimaryKeyEncoder;
import org.apache.tapestry.PrimaryKeyEncoder;
import org.apache.tapestry.annotations.Component;
import org.apache.tapestry.annotations.Inject;
import org.apache.tapestry.corelib.components.Form;
import org.apache.tapestry.integration.app1.data.ToDoItem;
import org.apache.tapestry.integration.app1.services.ToDoDatabase;
+import org.apache.tapestry.util.DefaultPrimaryKeyEncoder;
public class ToDoList
{
Copied:
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/DefaultPrimaryKeyEncoderTest.java
(from r506764,
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/DefaultPrimaryKeyEncoderTest.java)
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/DefaultPrimaryKeyEncoderTest.java?view=diff&rev=508049&p1=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/DefaultPrimaryKeyEncoderTest.java&r1=506764&p2=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/DefaultPrimaryKeyEncoderTest.java&r2=508049
==============================================================================
---
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/DefaultPrimaryKeyEncoderTest.java
(original)
+++
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/DefaultPrimaryKeyEncoderTest.java
Thu Feb 15 09:54:58 2007
@@ -12,11 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry.util;
import java.util.Arrays;
import org.apache.tapestry.internal.test.InternalBaseTestCase;
+import org.apache.tapestry.util.DefaultPrimaryKeyEncoder;
import org.testng.annotations.Test;
public class DefaultPrimaryKeyEncoderTest extends InternalBaseTestCase
Copied:
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/EnumSelectModelTest.java
(from r506764,
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/EnumSelectModelTest.java)
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/EnumSelectModelTest.java?view=diff&rev=508049&p1=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/EnumSelectModelTest.java&r1=506764&p2=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/EnumSelectModelTest.java&r2=508049
==============================================================================
---
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/EnumSelectModelTest.java
(original)
+++
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/EnumSelectModelTest.java
Thu Feb 15 09:54:58 2007
@@ -12,10 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry.util;
import java.util.List;
+import org.apache.tapestry.OptionModel;
+import org.apache.tapestry.SelectModel;
+import org.apache.tapestry.Stooge;
import org.apache.tapestry.ioc.Messages;
import org.apache.tapestry.test.TapestryTestCase;
import org.testng.annotations.Test;
Copied:
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/StringToEnumCoercionTest.java
(from r507989,
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/StringToEnumCoercionTest.java)
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/StringToEnumCoercionTest.java?view=diff&rev=508049&p1=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/StringToEnumCoercionTest.java&r1=507989&p2=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/StringToEnumCoercionTest.java&r2=508049
==============================================================================
---
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/StringToEnumCoercionTest.java
(original)
+++
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/StringToEnumCoercionTest.java
Thu Feb 15 09:54:58 2007
@@ -12,10 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry.util;
import junit.framework.AssertionFailedError;
+import org.apache.tapestry.Stooge;
+import org.apache.tapestry.util.StringToEnumCoercion;
import org.testng.Assert;
import org.testng.annotations.Test;
