diff --git a/org.springframework.context/src/main/java/org/springframework/ui/format/AnnotationFormatterFactory.java b/org.springframework.context/src/main/java/org/springframework/format/AnnotationFormatterFactory.java similarity index 98% rename from org.springframework.context/src/main/java/org/springframework/ui/format/AnnotationFormatterFactory.java rename to org.springframework.context/src/main/java/org/springframework/format/AnnotationFormatterFactory.java index 6c87d9741b..2a267d1e5a 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/format/AnnotationFormatterFactory.java +++ b/org.springframework.context/src/main/java/org/springframework/format/AnnotationFormatterFactory.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.format; +package org.springframework.format; import java.lang.annotation.Annotation; import java.util.Set; diff --git a/org.springframework.context/src/main/java/org/springframework/ui/format/Formatter.java b/org.springframework.context/src/main/java/org/springframework/format/Formatter.java similarity index 95% rename from org.springframework.context/src/main/java/org/springframework/ui/format/Formatter.java rename to org.springframework.context/src/main/java/org/springframework/format/Formatter.java index af50378137..67723c89dd 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/format/Formatter.java +++ b/org.springframework.context/src/main/java/org/springframework/format/Formatter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ui.format; +package org.springframework.format; /** * Formats objects of type T. diff --git a/org.springframework.context/src/main/java/org/springframework/ui/format/FormatterRegistry.java b/org.springframework.context/src/main/java/org/springframework/format/FormatterRegistry.java similarity index 98% rename from org.springframework.context/src/main/java/org/springframework/ui/format/FormatterRegistry.java rename to org.springframework.context/src/main/java/org/springframework/format/FormatterRegistry.java index 33a82ce67c..923d7448b4 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/format/FormatterRegistry.java +++ b/org.springframework.context/src/main/java/org/springframework/format/FormatterRegistry.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.format; +package org.springframework.format; import java.lang.annotation.Annotation; diff --git a/org.springframework.context/src/main/java/org/springframework/ui/format/Parser.java b/org.springframework.context/src/main/java/org/springframework/format/Parser.java similarity index 97% rename from org.springframework.context/src/main/java/org/springframework/ui/format/Parser.java rename to org.springframework.context/src/main/java/org/springframework/format/Parser.java index eccf7a5f00..3312c62835 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/format/Parser.java +++ b/org.springframework.context/src/main/java/org/springframework/format/Parser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ui.format; +package org.springframework.format; import java.text.ParseException; import java.util.Locale; diff --git a/org.springframework.context/src/main/java/org/springframework/ui/format/Printer.java b/org.springframework.context/src/main/java/org/springframework/format/Printer.java similarity index 96% rename from org.springframework.context/src/main/java/org/springframework/ui/format/Printer.java rename to org.springframework.context/src/main/java/org/springframework/format/Printer.java index f7c025a1d8..537d264f74 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/format/Printer.java +++ b/org.springframework.context/src/main/java/org/springframework/format/Printer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ui.format; +package org.springframework.format; import java.util.Locale; diff --git a/org.springframework.context/src/main/java/org/springframework/ui/format/annotation/DateTimeFormat.java b/org.springframework.context/src/main/java/org/springframework/format/annotation/DateTimeFormat.java similarity index 97% rename from org.springframework.context/src/main/java/org/springframework/ui/format/annotation/DateTimeFormat.java rename to org.springframework.context/src/main/java/org/springframework/format/annotation/DateTimeFormat.java index ef91c3eebc..d6100498da 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/format/annotation/DateTimeFormat.java +++ b/org.springframework.context/src/main/java/org/springframework/format/annotation/DateTimeFormat.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.format.annotation; +package org.springframework.format.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/org.springframework.context/src/main/java/org/springframework/ui/format/annotation/ISODateTimeFormat.java b/org.springframework.context/src/main/java/org/springframework/format/annotation/ISODateTimeFormat.java similarity index 95% rename from org.springframework.context/src/main/java/org/springframework/ui/format/annotation/ISODateTimeFormat.java rename to org.springframework.context/src/main/java/org/springframework/format/annotation/ISODateTimeFormat.java index f14d42d1d7..1e698068fb 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/format/annotation/ISODateTimeFormat.java +++ b/org.springframework.context/src/main/java/org/springframework/format/annotation/ISODateTimeFormat.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.format.annotation; +package org.springframework.format.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/org.springframework.context/src/main/java/org/springframework/ui/format/annotation/package-info.java b/org.springframework.context/src/main/java/org/springframework/format/annotation/package-info.java similarity index 60% rename from org.springframework.context/src/main/java/org/springframework/ui/format/annotation/package-info.java rename to org.springframework.context/src/main/java/org/springframework/format/annotation/package-info.java index 3806a5b7e7..3656baa169 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/format/annotation/package-info.java +++ b/org.springframework.context/src/main/java/org/springframework/format/annotation/package-info.java @@ -1,4 +1,4 @@ /** * Annotations for declaratively configuring field formatting rules. */ -package org.springframework.ui.format.annotation; +package org.springframework.format.annotation; diff --git a/org.springframework.context/src/main/java/org/springframework/ui/format/date/DateFormatter.java b/org.springframework.context/src/main/java/org/springframework/format/datetime/DateFormatter.java similarity index 97% rename from org.springframework.context/src/main/java/org/springframework/ui/format/date/DateFormatter.java rename to org.springframework.context/src/main/java/org/springframework/format/datetime/DateFormatter.java index 066600892e..d41cf7c235 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/format/date/DateFormatter.java +++ b/org.springframework.context/src/main/java/org/springframework/format/datetime/DateFormatter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ui.format.date; +package org.springframework.format.datetime; import java.text.DateFormat; import java.text.ParseException; @@ -23,7 +23,7 @@ import java.util.Date; import java.util.Locale; import java.util.TimeZone; -import org.springframework.ui.format.Formatter; +import org.springframework.format.Formatter; /** * A formatter for {@link java.util.Date} types. diff --git a/org.springframework.context/src/main/java/org/springframework/ui/format/jodatime/AbstractDateTimeAnnotationFormatterFactory.java b/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/AbstractDateTimeAnnotationFormatterFactory.java similarity index 94% rename from org.springframework.context/src/main/java/org/springframework/ui/format/jodatime/AbstractDateTimeAnnotationFormatterFactory.java rename to org.springframework.context/src/main/java/org/springframework/format/datetime/joda/AbstractDateTimeAnnotationFormatterFactory.java index 363b343fe7..bf21ce6102 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/format/jodatime/AbstractDateTimeAnnotationFormatterFactory.java +++ b/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/AbstractDateTimeAnnotationFormatterFactory.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.format.jodatime; +package org.springframework.format.datetime.joda; import java.lang.annotation.Annotation; import java.util.Calendar; @@ -30,9 +30,9 @@ import org.joda.time.LocalTime; import org.joda.time.ReadableInstant; import org.joda.time.ReadablePartial; import org.joda.time.format.DateTimeFormatter; -import org.springframework.ui.format.AnnotationFormatterFactory; -import org.springframework.ui.format.Parser; -import org.springframework.ui.format.Printer; +import org.springframework.format.AnnotationFormatterFactory; +import org.springframework.format.Parser; +import org.springframework.format.Printer; /** * Base class for annotation-based Joda DateTime formatters. diff --git a/org.springframework.context/src/main/java/org/springframework/ui/format/jodatime/DateTimeFormatAnnotationFormatterFactory.java b/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/DateTimeFormatAnnotationFormatterFactory.java similarity index 89% rename from org.springframework.context/src/main/java/org/springframework/ui/format/jodatime/DateTimeFormatAnnotationFormatterFactory.java rename to org.springframework.context/src/main/java/org/springframework/format/datetime/joda/DateTimeFormatAnnotationFormatterFactory.java index a2fbe7f971..d2771e069c 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/format/jodatime/DateTimeFormatAnnotationFormatterFactory.java +++ b/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/DateTimeFormatAnnotationFormatterFactory.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.format.jodatime; +package org.springframework.format.datetime.joda; import org.joda.time.format.DateTimeFormatter; -import org.springframework.ui.format.annotation.DateTimeFormat; -import org.springframework.ui.format.annotation.DateTimeFormat.Style; +import org.springframework.format.annotation.DateTimeFormat; +import org.springframework.format.annotation.DateTimeFormat.Style; /** * Formats properties annotated with the {@link DateTimeFormat} annotation. diff --git a/org.springframework.context/src/main/java/org/springframework/ui/format/jodatime/DateTimeParser.java b/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/DateTimeParser.java similarity index 93% rename from org.springframework.context/src/main/java/org/springframework/ui/format/jodatime/DateTimeParser.java rename to org.springframework.context/src/main/java/org/springframework/format/datetime/joda/DateTimeParser.java index 9d41cb5a09..b2bc74e447 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/format/jodatime/DateTimeParser.java +++ b/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/DateTimeParser.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.format.jodatime; +package org.springframework.format.datetime.joda; import java.text.ParseException; import java.util.Locale; import org.joda.time.DateTime; import org.joda.time.format.DateTimeFormatter; -import org.springframework.ui.format.Parser; +import org.springframework.format.Parser; /** * Parses Joda Time {@link DateTime} instances using a {@link DateTimeFormatter}. diff --git a/org.springframework.context/src/main/java/org/springframework/ui/format/jodatime/ISODateTimeFormatAnnotationFormatterFactory.java b/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/ISODateTimeFormatAnnotationFormatterFactory.java similarity index 87% rename from org.springframework.context/src/main/java/org/springframework/ui/format/jodatime/ISODateTimeFormatAnnotationFormatterFactory.java rename to org.springframework.context/src/main/java/org/springframework/format/datetime/joda/ISODateTimeFormatAnnotationFormatterFactory.java index 7aee52e64e..467aab3c8a 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/format/jodatime/ISODateTimeFormatAnnotationFormatterFactory.java +++ b/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/ISODateTimeFormatAnnotationFormatterFactory.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.format.jodatime; +package org.springframework.format.datetime.joda; import org.joda.time.format.DateTimeFormatter; -import org.springframework.ui.format.annotation.ISODateTimeFormat; -import org.springframework.ui.format.annotation.ISODateTimeFormat.Style; +import org.springframework.format.annotation.ISODateTimeFormat; +import org.springframework.format.annotation.ISODateTimeFormat.Style; /** * Formats properties annotated with the {@link ISODateTimeFormat} annotation. diff --git a/org.springframework.context/src/main/java/org/springframework/ui/format/jodatime/JodaTimeContext.java b/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/JodaTimeContext.java similarity index 97% rename from org.springframework.context/src/main/java/org/springframework/ui/format/jodatime/JodaTimeContext.java rename to org.springframework.context/src/main/java/org/springframework/format/datetime/joda/JodaTimeContext.java index f0f510dd09..01b8090e04 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/format/jodatime/JodaTimeContext.java +++ b/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/JodaTimeContext.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.format.jodatime; +package org.springframework.format.datetime.joda; import org.joda.time.Chronology; import org.joda.time.DateTimeZone; diff --git a/org.springframework.context/src/main/java/org/springframework/ui/format/jodatime/JodaTimeContextHolder.java b/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/JodaTimeContextHolder.java similarity index 97% rename from org.springframework.context/src/main/java/org/springframework/ui/format/jodatime/JodaTimeContextHolder.java rename to org.springframework.context/src/main/java/org/springframework/format/datetime/joda/JodaTimeContextHolder.java index 98e2199dcb..b33f99c1ec 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/format/jodatime/JodaTimeContextHolder.java +++ b/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/JodaTimeContextHolder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.format.jodatime; +package org.springframework.format.datetime.joda; import java.util.Locale; diff --git a/org.springframework.context/src/main/java/org/springframework/ui/format/jodatime/JodaTimeConverters.java b/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/JodaTimeConverters.java similarity index 98% rename from org.springframework.context/src/main/java/org/springframework/ui/format/jodatime/JodaTimeConverters.java rename to org.springframework.context/src/main/java/org/springframework/format/datetime/joda/JodaTimeConverters.java index e08ab33850..17854558c0 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/format/jodatime/JodaTimeConverters.java +++ b/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/JodaTimeConverters.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.format.jodatime; +package org.springframework.format.datetime.joda; import java.util.Calendar; import java.util.Date; diff --git a/org.springframework.context/src/main/java/org/springframework/ui/format/jodatime/JodaTimeFormattingConfigurer.java b/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/JodaTimeFormattingConfigurer.java similarity index 96% rename from org.springframework.context/src/main/java/org/springframework/ui/format/jodatime/JodaTimeFormattingConfigurer.java rename to org.springframework.context/src/main/java/org/springframework/format/datetime/joda/JodaTimeFormattingConfigurer.java index 3a8aef8de6..d1fe6bcbad 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/format/jodatime/JodaTimeFormattingConfigurer.java +++ b/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/JodaTimeFormattingConfigurer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.format.jodatime; +package org.springframework.format.datetime.joda; import java.util.Calendar; import java.util.Date; @@ -26,9 +26,9 @@ import org.joda.time.ReadableInstant; import org.joda.time.format.DateTimeFormat; import org.joda.time.format.DateTimeFormatter; import org.joda.time.format.ISODateTimeFormat; -import org.springframework.ui.format.FormatterRegistry; -import org.springframework.ui.format.Parser; -import org.springframework.ui.format.Printer; +import org.springframework.format.FormatterRegistry; +import org.springframework.format.Parser; +import org.springframework.format.Printer; /** * Configures Joda Time's Formatting system for use with Spring. diff --git a/org.springframework.context/src/main/java/org/springframework/ui/format/jodatime/MillisecondInstantPrinter.java b/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/MillisecondInstantPrinter.java similarity index 93% rename from org.springframework.context/src/main/java/org/springframework/ui/format/jodatime/MillisecondInstantPrinter.java rename to org.springframework.context/src/main/java/org/springframework/format/datetime/joda/MillisecondInstantPrinter.java index 8467cae785..d98da64dd4 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/format/jodatime/MillisecondInstantPrinter.java +++ b/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/MillisecondInstantPrinter.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.format.jodatime; +package org.springframework.format.datetime.joda; import java.util.Locale; import org.joda.time.format.DateTimeFormatter; -import org.springframework.ui.format.Printer; +import org.springframework.format.Printer; /** * Prints Long instances using a {@link DateTimeFormatter}. diff --git a/org.springframework.context/src/main/java/org/springframework/ui/format/jodatime/ReadableInstantPrinter.java b/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/ReadableInstantPrinter.java similarity index 93% rename from org.springframework.context/src/main/java/org/springframework/ui/format/jodatime/ReadableInstantPrinter.java rename to org.springframework.context/src/main/java/org/springframework/format/datetime/joda/ReadableInstantPrinter.java index 81a9617299..0e682d8c65 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/format/jodatime/ReadableInstantPrinter.java +++ b/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/ReadableInstantPrinter.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.format.jodatime; +package org.springframework.format.datetime.joda; import java.util.Locale; import org.joda.time.ReadableInstant; import org.joda.time.format.DateTimeFormatter; -import org.springframework.ui.format.Printer; +import org.springframework.format.Printer; /** * Prints Joda Time {@link ReadableInstant} instances using a {@link DateTimeFormatter}. diff --git a/org.springframework.context/src/main/java/org/springframework/ui/format/jodatime/ReadablePartialPrinter.java b/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/ReadablePartialPrinter.java similarity index 93% rename from org.springframework.context/src/main/java/org/springframework/ui/format/jodatime/ReadablePartialPrinter.java rename to org.springframework.context/src/main/java/org/springframework/format/datetime/joda/ReadablePartialPrinter.java index a10f00d180..2ba5058c81 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/format/jodatime/ReadablePartialPrinter.java +++ b/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/ReadablePartialPrinter.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.format.jodatime; +package org.springframework.format.datetime.joda; import java.util.Locale; import org.joda.time.ReadablePartial; import org.joda.time.format.DateTimeFormatter; -import org.springframework.ui.format.Printer; +import org.springframework.format.Printer; /** * Prints Joda Time {@link ReadablePartial} instances using a {@link DateTimeFormatter}. diff --git a/org.springframework.context/src/main/java/org/springframework/ui/format/jodatime/package-info.java b/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/package-info.java similarity index 67% rename from org.springframework.context/src/main/java/org/springframework/ui/format/jodatime/package-info.java rename to org.springframework.context/src/main/java/org/springframework/format/datetime/joda/package-info.java index fe97c983c0..29867fba1b 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/format/jodatime/package-info.java +++ b/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/package-info.java @@ -1,4 +1,4 @@ /** * Integration with the Joda Time for formatting Joda types as well as standard JDK Date types. */ -package org.springframework.ui.format.jodatime; +package org.springframework.format.datetime.joda; diff --git a/org.springframework.context/src/main/java/org/springframework/ui/format/date/package-info.java b/org.springframework.context/src/main/java/org/springframework/format/datetime/package-info.java similarity index 59% rename from org.springframework.context/src/main/java/org/springframework/ui/format/date/package-info.java rename to org.springframework.context/src/main/java/org/springframework/format/datetime/package-info.java index fb9cb1fe70..77c347658e 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/format/date/package-info.java +++ b/org.springframework.context/src/main/java/org/springframework/format/datetime/package-info.java @@ -1,4 +1,4 @@ /** * Formatters for java.util.Date properties. */ -package org.springframework.ui.format.date; +package org.springframework.format.datetime; diff --git a/org.springframework.context/src/main/java/org/springframework/ui/format/number/AbstractNumberFormatter.java b/org.springframework.context/src/main/java/org/springframework/format/number/AbstractNumberFormatter.java similarity index 93% rename from org.springframework.context/src/main/java/org/springframework/ui/format/number/AbstractNumberFormatter.java rename to org.springframework.context/src/main/java/org/springframework/format/number/AbstractNumberFormatter.java index e678188015..2b361ff996 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/format/number/AbstractNumberFormatter.java +++ b/org.springframework.context/src/main/java/org/springframework/format/number/AbstractNumberFormatter.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.ui.format.number; +package org.springframework.format.number; import java.text.NumberFormat; import java.text.ParseException; import java.text.ParsePosition; import java.util.Locale; -import org.springframework.ui.format.Formatter; +import org.springframework.format.Formatter; /** * Abstract formatter for Numbers, diff --git a/org.springframework.context/src/main/java/org/springframework/ui/format/number/CurrencyFormatter.java b/org.springframework.context/src/main/java/org/springframework/format/number/CurrencyFormatter.java similarity index 98% rename from org.springframework.context/src/main/java/org/springframework/ui/format/number/CurrencyFormatter.java rename to org.springframework.context/src/main/java/org/springframework/format/number/CurrencyFormatter.java index e51037f901..2c199c9f3e 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/format/number/CurrencyFormatter.java +++ b/org.springframework.context/src/main/java/org/springframework/format/number/CurrencyFormatter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ui.format.number; +package org.springframework.format.number; import java.math.BigDecimal; import java.math.RoundingMode; diff --git a/org.springframework.context/src/main/java/org/springframework/ui/format/number/DecimalFormatter.java b/org.springframework.context/src/main/java/org/springframework/format/number/DecimalFormatter.java similarity index 97% rename from org.springframework.context/src/main/java/org/springframework/ui/format/number/DecimalFormatter.java rename to org.springframework.context/src/main/java/org/springframework/format/number/DecimalFormatter.java index 2672d57d4d..cb3fd391e5 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/format/number/DecimalFormatter.java +++ b/org.springframework.context/src/main/java/org/springframework/format/number/DecimalFormatter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ui.format.number; +package org.springframework.format.number; import java.text.DecimalFormat; import java.text.NumberFormat; diff --git a/org.springframework.context/src/main/java/org/springframework/ui/format/number/IntegerFormatter.java b/org.springframework.context/src/main/java/org/springframework/format/number/IntegerFormatter.java similarity index 96% rename from org.springframework.context/src/main/java/org/springframework/ui/format/number/IntegerFormatter.java rename to org.springframework.context/src/main/java/org/springframework/format/number/IntegerFormatter.java index 5cda7225a2..d1840d7a16 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/format/number/IntegerFormatter.java +++ b/org.springframework.context/src/main/java/org/springframework/format/number/IntegerFormatter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ui.format.number; +package org.springframework.format.number; import java.text.NumberFormat; import java.util.Locale; diff --git a/org.springframework.context/src/main/java/org/springframework/ui/format/number/PercentFormatter.java b/org.springframework.context/src/main/java/org/springframework/format/number/PercentFormatter.java similarity index 96% rename from org.springframework.context/src/main/java/org/springframework/ui/format/number/PercentFormatter.java rename to org.springframework.context/src/main/java/org/springframework/format/number/PercentFormatter.java index 5d4da824a2..cfdf720f12 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/format/number/PercentFormatter.java +++ b/org.springframework.context/src/main/java/org/springframework/format/number/PercentFormatter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ui.format.number; +package org.springframework.format.number; import java.text.DecimalFormat; import java.text.NumberFormat; diff --git a/org.springframework.context/src/main/java/org/springframework/ui/format/number/package-info.java b/org.springframework.context/src/main/java/org/springframework/format/number/package-info.java similarity index 59% rename from org.springframework.context/src/main/java/org/springframework/ui/format/number/package-info.java rename to org.springframework.context/src/main/java/org/springframework/format/number/package-info.java index 9dc39b1147..d06b1325cc 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/format/number/package-info.java +++ b/org.springframework.context/src/main/java/org/springframework/format/number/package-info.java @@ -1,4 +1,4 @@ /** * Formatters for java.lang.Number properties. */ -package org.springframework.ui.format.number; +package org.springframework.format.number; diff --git a/org.springframework.context/src/main/java/org/springframework/ui/format/package-info.java b/org.springframework.context/src/main/java/org/springframework/format/package-info.java similarity index 70% rename from org.springframework.context/src/main/java/org/springframework/ui/format/package-info.java rename to org.springframework.context/src/main/java/org/springframework/format/package-info.java index d958208469..0f98f75c59 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/format/package-info.java +++ b/org.springframework.context/src/main/java/org/springframework/format/package-info.java @@ -1,4 +1,4 @@ /** * An API for defining Formatters to format field model values for display in a UI. */ -package org.springframework.ui.format; +package org.springframework.format; diff --git a/org.springframework.context/src/main/java/org/springframework/ui/format/support/FormattingConversionService.java b/org.springframework.context/src/main/java/org/springframework/format/support/FormattingConversionService.java similarity index 96% rename from org.springframework.context/src/main/java/org/springframework/ui/format/support/FormattingConversionService.java rename to org.springframework.context/src/main/java/org/springframework/format/support/FormattingConversionService.java index 0416b7f1e5..986e2c85bd 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/format/support/FormattingConversionService.java +++ b/org.springframework.context/src/main/java/org/springframework/format/support/FormattingConversionService.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.format.support; +package org.springframework.format.support; import java.lang.annotation.Annotation; import java.text.ParseException; @@ -29,11 +29,11 @@ import org.springframework.core.convert.support.ConditionalGenericConverter; import org.springframework.core.convert.support.DefaultConversionService; import org.springframework.core.convert.support.GenericConversionService; import org.springframework.core.convert.support.GenericConverter; -import org.springframework.ui.format.AnnotationFormatterFactory; -import org.springframework.ui.format.Formatter; -import org.springframework.ui.format.FormatterRegistry; -import org.springframework.ui.format.Parser; -import org.springframework.ui.format.Printer; +import org.springframework.format.AnnotationFormatterFactory; +import org.springframework.format.Formatter; +import org.springframework.format.FormatterRegistry; +import org.springframework.format.Parser; +import org.springframework.format.Printer; /** * A ConversionService implementation designed to be configured as a {@link FormatterRegistry}.. diff --git a/org.springframework.context/src/main/java/org/springframework/ui/format/support/FormattingPropertyEditorAdapter.java b/org.springframework.context/src/main/java/org/springframework/format/support/FormattingPropertyEditorAdapter.java similarity index 91% rename from org.springframework.context/src/main/java/org/springframework/ui/format/support/FormattingPropertyEditorAdapter.java rename to org.springframework.context/src/main/java/org/springframework/format/support/FormattingPropertyEditorAdapter.java index 4f4e10d5cc..30498ccc61 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/format/support/FormattingPropertyEditorAdapter.java +++ b/org.springframework.context/src/main/java/org/springframework/format/support/FormattingPropertyEditorAdapter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ui.format.support; +package org.springframework.format.support; import java.beans.PropertyEditorSupport; @@ -23,7 +23,7 @@ import org.springframework.util.Assert; /** * Adapter that exposes a {@link java.beans.PropertyEditor} for any given - * {@link org.springframework.ui.format.Formatter}, retrieving the current + * {@link org.springframework.format.Formatter}, retrieving the current * Locale from {@link org.springframework.context.i18n.LocaleContextHolder}. * * @author Juergen Hoeller diff --git a/org.springframework.context/src/main/java/org/springframework/ui/format/support/package-info.java b/org.springframework.context/src/main/java/org/springframework/format/support/package-info.java similarity index 70% rename from org.springframework.context/src/main/java/org/springframework/ui/format/support/package-info.java rename to org.springframework.context/src/main/java/org/springframework/format/support/package-info.java index 27bf9f4dc8..f653d54081 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/format/support/package-info.java +++ b/org.springframework.context/src/main/java/org/springframework/format/support/package-info.java @@ -2,4 +2,4 @@ * Support classes for the formatting package, * providing common implementations as well as adapters. */ -package org.springframework.ui.format.support; +package org.springframework.format.support; diff --git a/org.springframework.context/src/main/java/org/springframework/validation/AbstractPropertyBindingResult.java b/org.springframework.context/src/main/java/org/springframework/validation/AbstractPropertyBindingResult.java index fa9f46f66d..330cc40270 100644 --- a/org.springframework.context/src/main/java/org/springframework/validation/AbstractPropertyBindingResult.java +++ b/org.springframework.context/src/main/java/org/springframework/validation/AbstractPropertyBindingResult.java @@ -24,7 +24,7 @@ import org.springframework.beans.PropertyAccessorUtils; import org.springframework.beans.PropertyEditorRegistry; import org.springframework.core.convert.ConversionService; import org.springframework.core.convert.TypeDescriptor; -import org.springframework.ui.format.support.FormattingPropertyEditorAdapter; +import org.springframework.format.support.FormattingPropertyEditorAdapter; import org.springframework.util.Assert; /** diff --git a/org.springframework.context/src/test/java/org/springframework/ui/format/date/DateFormatterTests.java b/org.springframework.context/src/test/java/org/springframework/format/datetime/DateFormatterTests.java similarity index 93% rename from org.springframework.context/src/test/java/org/springframework/ui/format/date/DateFormatterTests.java rename to org.springframework.context/src/test/java/org/springframework/format/datetime/DateFormatterTests.java index 980e3e0b05..668f420aab 100644 --- a/org.springframework.context/src/test/java/org/springframework/ui/format/date/DateFormatterTests.java +++ b/org.springframework.context/src/test/java/org/springframework/format/datetime/DateFormatterTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ui.format.date; +package org.springframework.format.datetime; import java.text.ParseException; import java.util.Calendar; @@ -22,6 +22,7 @@ import java.util.Locale; import static org.junit.Assert.*; import org.junit.Test; +import org.springframework.format.datetime.DateFormatter; /** * @author Keith Donald diff --git a/org.springframework.context/src/test/java/org/springframework/ui/format/jodatime/JodaTimeFormattingTests.java b/org.springframework.context/src/test/java/org/springframework/format/datetime/joda/JodaTimeFormattingTests.java similarity index 96% rename from org.springframework.context/src/test/java/org/springframework/ui/format/jodatime/JodaTimeFormattingTests.java rename to org.springframework.context/src/test/java/org/springframework/format/datetime/joda/JodaTimeFormattingTests.java index 215e96302e..83edf6ab60 100644 --- a/org.springframework.context/src/test/java/org/springframework/ui/format/jodatime/JodaTimeFormattingTests.java +++ b/org.springframework.context/src/test/java/org/springframework/format/datetime/joda/JodaTimeFormattingTests.java @@ -1,4 +1,4 @@ -package org.springframework.ui.format.jodatime; +package org.springframework.format.datetime.joda; import static org.junit.Assert.assertEquals; @@ -15,9 +15,10 @@ import org.junit.Before; import org.junit.Test; import org.springframework.beans.MutablePropertyValues; import org.springframework.context.i18n.LocaleContextHolder; -import org.springframework.ui.format.annotation.DateTimeFormat; -import org.springframework.ui.format.annotation.DateTimeFormat.Style; -import org.springframework.ui.format.support.FormattingConversionService; +import org.springframework.format.annotation.DateTimeFormat; +import org.springframework.format.annotation.DateTimeFormat.Style; +import org.springframework.format.datetime.joda.JodaTimeFormattingConfigurer; +import org.springframework.format.support.FormattingConversionService; import org.springframework.validation.DataBinder; public class JodaTimeFormattingTests { diff --git a/org.springframework.context/src/test/java/org/springframework/ui/format/number/CurrencyFormatterTests.java b/org.springframework.context/src/test/java/org/springframework/format/number/CurrencyFormatterTests.java similarity index 94% rename from org.springframework.context/src/test/java/org/springframework/ui/format/number/CurrencyFormatterTests.java rename to org.springframework.context/src/test/java/org/springframework/format/number/CurrencyFormatterTests.java index 709a721b16..d10259b11b 100644 --- a/org.springframework.context/src/test/java/org/springframework/ui/format/number/CurrencyFormatterTests.java +++ b/org.springframework.context/src/test/java/org/springframework/format/number/CurrencyFormatterTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ui.format.number; +package org.springframework.format.number; import static org.junit.Assert.assertEquals; @@ -24,6 +24,7 @@ import java.text.ParseException; import java.util.Locale; import org.junit.Test; +import org.springframework.format.number.CurrencyFormatter; /** * @author Keith Donald diff --git a/org.springframework.context/src/test/java/org/springframework/ui/format/number/DecimalFormatterTests.java b/org.springframework.context/src/test/java/org/springframework/format/number/DecimalFormatterTests.java similarity index 93% rename from org.springframework.context/src/test/java/org/springframework/ui/format/number/DecimalFormatterTests.java rename to org.springframework.context/src/test/java/org/springframework/format/number/DecimalFormatterTests.java index 0c200ea950..de336c1b62 100644 --- a/org.springframework.context/src/test/java/org/springframework/ui/format/number/DecimalFormatterTests.java +++ b/org.springframework.context/src/test/java/org/springframework/format/number/DecimalFormatterTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ui.format.number; +package org.springframework.format.number; import static org.junit.Assert.assertEquals; @@ -23,7 +23,7 @@ import java.text.ParseException; import java.util.Locale; import org.junit.Test; -import org.springframework.ui.format.number.DecimalFormatter; +import org.springframework.format.number.DecimalFormatter; /** * @author Keith Donald diff --git a/org.springframework.context/src/test/java/org/springframework/ui/format/number/IntegerFormatterTests.java b/org.springframework.context/src/test/java/org/springframework/format/number/IntegerFormatterTests.java similarity index 92% rename from org.springframework.context/src/test/java/org/springframework/ui/format/number/IntegerFormatterTests.java rename to org.springframework.context/src/test/java/org/springframework/format/number/IntegerFormatterTests.java index ca277833ed..aec4d578e5 100644 --- a/org.springframework.context/src/test/java/org/springframework/ui/format/number/IntegerFormatterTests.java +++ b/org.springframework.context/src/test/java/org/springframework/format/number/IntegerFormatterTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ui.format.number; +package org.springframework.format.number; import static org.junit.Assert.assertEquals; @@ -22,7 +22,7 @@ import java.text.ParseException; import java.util.Locale; import org.junit.Test; -import org.springframework.ui.format.number.IntegerFormatter; +import org.springframework.format.number.IntegerFormatter; /** * @author Keith Donald diff --git a/org.springframework.context/src/test/java/org/springframework/ui/format/number/PercentFormatterTests.java b/org.springframework.context/src/test/java/org/springframework/format/number/PercentFormatterTests.java similarity index 93% rename from org.springframework.context/src/test/java/org/springframework/ui/format/number/PercentFormatterTests.java rename to org.springframework.context/src/test/java/org/springframework/format/number/PercentFormatterTests.java index d770a56e79..a69da954c8 100644 --- a/org.springframework.context/src/test/java/org/springframework/ui/format/number/PercentFormatterTests.java +++ b/org.springframework.context/src/test/java/org/springframework/format/number/PercentFormatterTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ui.format.number; +package org.springframework.format.number; import static org.junit.Assert.assertEquals; @@ -23,7 +23,7 @@ import java.text.ParseException; import java.util.Locale; import org.junit.Test; -import org.springframework.ui.format.number.PercentFormatter; +import org.springframework.format.number.PercentFormatter; /** * @author Keith Donald diff --git a/org.springframework.context/src/test/java/org/springframework/ui/format/support/FormattingConversionServiceTests.java b/org.springframework.context/src/test/java/org/springframework/format/support/FormattingConversionServiceTests.java similarity index 87% rename from org.springframework.context/src/test/java/org/springframework/ui/format/support/FormattingConversionServiceTests.java rename to org.springframework.context/src/test/java/org/springframework/format/support/FormattingConversionServiceTests.java index e610a82cbc..a2d2f974e6 100644 --- a/org.springframework.context/src/test/java/org/springframework/ui/format/support/FormattingConversionServiceTests.java +++ b/org.springframework.context/src/test/java/org/springframework/format/support/FormattingConversionServiceTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ui.format.support; +package org.springframework.format.support; import static org.junit.Assert.assertEquals; @@ -31,11 +31,12 @@ import org.junit.Test; import org.springframework.context.i18n.LocaleContextHolder; import org.springframework.core.convert.TypeDescriptor; import org.springframework.core.convert.converter.Converter; -import org.springframework.ui.format.annotation.DateTimeFormat.Style; -import org.springframework.ui.format.jodatime.DateTimeFormatAnnotationFormatterFactory; -import org.springframework.ui.format.jodatime.DateTimeParser; -import org.springframework.ui.format.jodatime.ReadablePartialPrinter; -import org.springframework.ui.format.number.IntegerFormatter; +import org.springframework.format.annotation.DateTimeFormat.Style; +import org.springframework.format.datetime.joda.DateTimeFormatAnnotationFormatterFactory; +import org.springframework.format.datetime.joda.DateTimeParser; +import org.springframework.format.datetime.joda.ReadablePartialPrinter; +import org.springframework.format.number.IntegerFormatter; +import org.springframework.format.support.FormattingConversionService; /** * @author Keith Donald @@ -105,7 +106,7 @@ public class FormattingConversionServiceTests { private static class Model { @SuppressWarnings("unused") - @org.springframework.ui.format.annotation.DateTimeFormat(dateStyle = Style.SHORT) + @org.springframework.format.annotation.DateTimeFormat(dateStyle = Style.SHORT) public Date date; } diff --git a/org.springframework.context/src/test/java/org/springframework/validation/DataBinderTests.java b/org.springframework.context/src/test/java/org/springframework/validation/DataBinderTests.java index 567c052444..dcae06a4ac 100644 --- a/org.springframework.context/src/test/java/org/springframework/validation/DataBinderTests.java +++ b/org.springframework.context/src/test/java/org/springframework/validation/DataBinderTests.java @@ -44,8 +44,8 @@ import org.springframework.context.i18n.LocaleContextHolder; import org.springframework.context.support.ResourceBundleMessageSource; import org.springframework.context.support.StaticMessageSource; import org.springframework.core.convert.support.DefaultConversionService; -import org.springframework.ui.format.number.DecimalFormatter; -import org.springframework.ui.format.support.FormattingConversionService; +import org.springframework.format.number.DecimalFormatter; +import org.springframework.format.support.FormattingConversionService; import org.springframework.util.StringUtils; /**