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 6c87d9741b48f8255d2991e0ca86b39efdcb90f7..2a267d1e5ab183ef73860efec63fecdfb2100f87 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 af50378137b595970c277f5018807d7bcee3f15d..67723c89dd58f9b6b69eb949a34660e14a38816b 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 33a82ce67cc97ccec813f397a9b5d9f10a49c821..923d7448b4e19a9fa0c1df1f6e88cdb1afb5e34d 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 eccf7a5f0064ec5f0c63d82929832f79b70ffe34..3312c62835473a2716d2adfba9cfb565e589179d 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 f7c025a1d8e383f8826f6aa20269aa08b4259289..537d264f74d7e096e6ffa276e7f7e1a32099653d 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 ef91c3eebcf5168c1566b0236d9a1e685263edb2..d6100498da4b052aa6fa9e2f1141ed37a27aaddf 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 f14d42d1d76a19522f5f5f768ef17e871a355ba5..1e698068fb2ebab71c71daf2d76f1d390725de1b 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 3806a5b7e7620444e0aad3d19dda63909ff39371..3656baa1699cb539456c22922fa80a94324a19c3 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 066600892e751782b69a637323f8fa90aac7c171..d41cf7c2357fc06c2e8ae95e90283c22a3e7cce7 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 363b343fe7288923c923ace1f68aaaf2088c717f..bf21ce6102db941a6a69a3ec005ffb2786cf0408 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 a2fbe7f971553c9db7358e3e84e45ce3ff98c7bf..d2771e069cd715fa705d3920332d1594357b11f0 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 9d41cb5a09709ca144f15131f24b8201f86b3a4d..b2bc74e447a0ce507bda2d3c85d49af99e8ee767 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 7aee52e64ea220648206d4623955edbbfd542fab..467aab3c8ab7fed036926e17f430bd771421fda8 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 f0f510dd09df82d694cbf88c66970d029540fea0..01b8090e048eb3ce8a2a370064eeda6088ff4d48 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 98e2199dcb04cfe260683d8b9eeca13eaa7a1b8a..b33f99c1ec7e76d4d1f23956d0f9b25157c63d85 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 e08ab338506cb6cfa1ab7f1138ff79935071f9fb..17854558c0965aa19ba67f381496b0f0ba1e03b5 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 3a8aef8de6b06dcbc5e1c0b11a6c0d9b80e81f2f..d1fe6bcbaddcd85e8900591ec000d22240c52ab5 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 8467cae7857e4b3053240d24aac4cec9765b8819..d98da64dd4b7855c5ec3c0fcfedec6578f052c98 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 81a9617299af1a883c9abe8ab3845af2b55ad489..0e682d8c6581bf6e4a8ffd644b9d509230e86795 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 a10f00d1803a77890da1ac6effce38b82d4273ba..2ba5058c8109641cac5a843b781147770aff5341 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 fe97c983c0a81a86e4c67372de35a0452e66f6b6..29867fba1bdf302550c758967de85177a9cce45e 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 fb9cb1fe70d47800ac9c2fe40c13865e903bd921..77c347658efdbde540f17fb650dc5e7a15d6e3a6 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 e67818801594d5c94d39339ce11c1bca349329ac..2b361ff9967320b0c7bf3aa1013e15f0433b8673 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 e51037f90112490302e8f52fd1fb758410f52661..2c199c9f3ea2e4ccd66adbd4b59da5e7865c8f0b 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 2672d57d4d2876d27bc1dadb12f170fc9f3d2b6c..cb3fd391e56e7154de55e41598610630b084774b 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 5cda7225a2b6b7215a28f25900cc1a006edc93a1..d1840d7a161e66cc6cc593c82f059ee50bf12c9c 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 5d4da824a22ad8bf84dc9cc02d3be30d28f8651e..cfdf720f1203279945d6d0361f28cc4de968e639 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 9dc39b1147c33d6551c26aa3dff2a82931ad03bf..d06b1325ccfea9366bc8e86ae6d7ceca25a4b766 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 d9582084691958eb953236d9c348d95b973b4055..0f98f75c591af43f8ddee2f0df2e5f3f8c3f49eb 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 0416b7f1e59ea6be7a5ce877579354bae4c1b99b..986e2c85bde172feba67f077c4024e1afe787ee1 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 4f4e10d5ccc5694c3d85fcff65b59f0771f4c868..30498ccc612c0b438010d2688a38a390ab885565 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 27bf9f4dc8c8b2ea9bc4b1963dd5acae66f5d636..f653d540815a37388d67e5b37ee39e4c3552d092 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 fa9f46f66d69352cc61ff5db2e73d36dae74921d..330cc40270879ba5392b2604561168690fa7184f 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 980e3e0b054af5cada592a442a0f9e89e98cc779..668f420aab1449f781c6f6b97b92745a04ce8399 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 215e96302e66eaab7f6a30d536dbe9179f514dff..83edf6ab609fa5007e1a8356669cbc98f8b14ea6 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 709a721b1662afb675adcd8f3d3f05ba64aaed9b..d10259b11b0d16a873398bfbc2c800068b915740 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 0c200ea950a82c6e5afddaba22810cb6e1b55982..de336c1b62e2577887122ad97f6cf7524f2d1fcf 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 ca277833edcd389df51acd50147d890b7d110329..aec4d578e58ed061680150a5cc3963d10b1b1c67 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 d770a56e7968760abdfd93c8de8fdb1535070b65..a69da954c8bae22057eb4bb450e7210b760543ca 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 e610a82cbc8b2104646246ec9a8c7ece634a05a8..a2d2f974e6d44464d7cf7ba71080bc9f6122a783 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 567c0524444fdf44ac2d72cbb67d0264e97d286e..dcae06a4ac04c4b4fd2b95136b93f7a3bd31e8a6 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;
/**