moved model binding and validation related code into model module-level package; separated out ui concerns into ui subpackage

org.springframework.context/src/main/java/org/springframework/model/alert/Alert.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ui.alert;
+package org.springframework.model.alert;
 
 /**
  * Communicates an event of interest to the user.

org.springframework.context/src/main/java/org/springframework/model/alert/AlertContext.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ui.alert;
+package org.springframework.model.alert;
 
 import java.util.List;
 import java.util.Map;

org.springframework.context/src/main/java/org/springframework/model/alert/Alerts.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ui.alert;
+package org.springframework.model.alert;
 
 /**
  * A static factory for conveniently constructing Alerts.

org.springframework.context/src/main/java/org/springframework/model/alert/Severity.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ui.alert;
+package org.springframework.model.alert;
 
 /**
  * The set of alert severities.

org.springframework.context/src/main/java/org/springframework/model/alert/package-info.java

@@ -0,0 +1,5 @@
+/**
+ * A general-purpose Alerting API to communicate events of interest.
+ */
+package org.springframework.model.alert;
+

org.springframework.context/src/main/java/org/springframework/model/alert/support/DefaultAlertContext.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ui.alert.support;
+package org.springframework.model.alert.support;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -22,8 +22,8 @@ import java.util.List;
 import java.util.Map;
 
 import org.springframework.core.style.ToStringCreator;
-import org.springframework.ui.alert.Alert;
-import org.springframework.ui.alert.AlertContext;
+import org.springframework.model.alert.Alert;
+import org.springframework.model.alert.AlertContext;
 import org.springframework.util.CachingMapDecorator;
 
 /**

org.springframework.context/src/main/java/org/springframework/model/alert/support/package-info.java

@@ -0,0 +1,5 @@
+/**
+ * AlertContext implementation suitable for use in most environments.
+ */
+package org.springframework.model.alert.support;
+

org.springframework.context/src/main/java/org/springframework/model/binder/Binder.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ui.binding.binder;
+package org.springframework.model.binder;
 
 import java.util.Map;
 

org.springframework.context/src/main/java/org/springframework/model/binder/BindingResult.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ui.binding.binder;
+package org.springframework.model.binder;
 
-import org.springframework.ui.alert.Alert;
+import org.springframework.model.alert.Alert;
 
 /**
  * The result of a bind operation.

org.springframework.context/src/main/java/org/springframework/model/binder/BindingResults.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ui.binding.binder;
+package org.springframework.model.binder;
 
 import java.util.List;
 

org.springframework.context/src/main/java/org/springframework/model/binder/MissingFieldException.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ui.binding.binder;
+package org.springframework.model.binder;
 
 import java.util.List;
 import java.util.Map;

org.springframework.context/src/main/java/org/springframework/model/binder/package-info.java

@@ -0,0 +1,5 @@
+/**
+ * API for binding submitted field values in a single batch operation.
+ */
+package org.springframework.model.binder;
+

org.springframework.context/src/main/java/org/springframework/model/message/DefaultMessageResolver.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ui.message;
+package org.springframework.model.message;
 
 import java.util.Locale;
 import java.util.Map;

org.springframework.context/src/main/java/org/springframework/model/message/MessageBuilder.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ui.message;
+package org.springframework.model.message;
 
 import java.util.Locale;
 

org.springframework.context/src/main/java/org/springframework/model/message/MessageResolutionException.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ui.message;
+package org.springframework.model.message;
 
 /**
  * Runtime exception thrown by a {@link MessageResolver} if a message resolution fails.

org.springframework.context/src/main/java/org/springframework/model/message/MessageResolver.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ui.message;
+package org.springframework.model.message;
 
 import java.util.Locale;
 

org.springframework.context/src/main/java/org/springframework/model/message/MessageResolverBuilder.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ui.message;
+package org.springframework.model.message;
 
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;

org.springframework.context/src/main/java/org/springframework/model/message/ResolvableArgument.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ui.message;
+package org.springframework.model.message;
 
 import org.springframework.context.MessageSource;
 import org.springframework.context.MessageSourceResolvable;

org.springframework.context/src/main/java/org/springframework/model/message/package-info.java

@@ -0,0 +1,5 @@
+/**
+ * An API for creating localized messages.
+ */
+package org.springframework.model.message;
+

org.springframework.context/src/main/java/org/springframework/model/ui/BindingStatus.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ui.binding;
+package org.springframework.model.ui;
 
 /**
  * FieldModel binding states.

org.springframework.context/src/main/java/org/springframework/model/ui/FieldModel.java

@@ -13,10 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ui.binding;
+package org.springframework.model.ui;
 
-import org.springframework.ui.alert.Alert;
-import org.springframework.ui.alert.Severity;
+import org.springframework.model.alert.Alert;
 
 /**
  * A model for a single data field containing dynamic information to display in the view.

org.springframework.context/src/main/java/org/springframework/model/ui/FieldNotFoundException.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ui.binding;
+package org.springframework.model.ui;
 
 /**
  * Thrown when a PresentationModel field cannot be found.

org.springframework.context/src/main/java/org/springframework/model/ui/PresentationModel.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ui.binding;
+package org.springframework.model.ui;
 
 /**
  * Represents the state and behavior of a presentation independently of the GUI controls used in the interface.

org.springframework.context/src/main/java/org/springframework/model/ui/PresentationModelFactory.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ui.binding;
+package org.springframework.model.ui;
 
 /**
  * A factory for domain object PresentationModels.

org.springframework.context/src/main/java/org/springframework/model/ui/ValidationStatus.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ui.binding;
+package org.springframework.model.ui;
 
 /**
  * FieldModel Validation states.

org.springframework.context/src/main/java/org/springframework/model/ui/binder/ArrayListBindingResults.java

@@ -13,12 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ui.binding.binder;
+package org.springframework.model.ui.binder;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
+import org.springframework.model.binder.BindingResult;
+import org.springframework.model.binder.BindingResults;
+
 class ArrayListBindingResults implements BindingResults {
 
 	private List<BindingResult> results;

org.springframework.context/src/main/java/org/springframework/model/ui/binder/BinderExecutor.java

@@ -13,9 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ui.binding.binder;
+package org.springframework.model.ui.binder;
 
-import org.springframework.ui.binding.config.FieldModelConfiguration;
+import org.springframework.model.binder.Binder;
+import org.springframework.model.binder.BindingResults;
+import org.springframework.model.ui.config.FieldModelConfiguration;
 
 /**
  * A SPI interface that lets you configure a {@link Binder}, then execute it.

org.springframework.context/src/main/java/org/springframework/model/ui/binder/BindingStatusResult.java

@@ -13,10 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ui.binding.binder;
+package org.springframework.model.ui.binder;
 
-import org.springframework.ui.alert.Alert;
-import org.springframework.ui.alert.Severity;
+import org.springframework.model.alert.Alert;
+import org.springframework.model.alert.Severity;
+import org.springframework.model.binder.BindingResult;
 
 class BindingStatusResult implements BindingResult {
 

org.springframework.context/src/main/java/org/springframework/model/ui/binder/FieldNotEditableResult.java

@@ -13,14 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ui.binding.binder;
+package org.springframework.model.ui.binder;
 
 import org.springframework.context.MessageSource;
 import org.springframework.core.style.StylerUtils;
-import org.springframework.ui.alert.Alert;
-import org.springframework.ui.alert.Severity;
-import org.springframework.ui.message.MessageBuilder;
-import org.springframework.ui.message.ResolvableArgument;
+import org.springframework.model.alert.Alert;
+import org.springframework.model.alert.Severity;
+import org.springframework.model.binder.BindingResult;
+import org.springframework.model.message.MessageBuilder;
+import org.springframework.model.message.ResolvableArgument;
 
 class FieldNotEditableResult implements BindingResult {
 

org.springframework.context/src/main/java/org/springframework/model/ui/binder/FieldNotFoundResult.java

@@ -13,14 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ui.binding.binder;
+package org.springframework.model.ui.binder;
 
 import org.springframework.context.MessageSource;
 import org.springframework.core.style.StylerUtils;
-import org.springframework.ui.alert.Alert;
-import org.springframework.ui.alert.Severity;
-import org.springframework.ui.message.MessageBuilder;
-import org.springframework.ui.message.ResolvableArgument;
+import org.springframework.model.alert.Alert;
+import org.springframework.model.alert.Severity;
+import org.springframework.model.binder.BindingResult;
+import org.springframework.model.message.MessageBuilder;
+import org.springframework.model.message.ResolvableArgument;
 
 class FieldNotFoundResult implements BindingResult {
 

org.springframework.context/src/main/java/org/springframework/model/ui/binder/PresentationModelBinder.java

@@ -13,17 +13,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ui.binding.binder;
+package org.springframework.model.ui.binder;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
 import org.springframework.context.MessageSource;
-import org.springframework.ui.binding.BindingStatus;
-import org.springframework.ui.binding.FieldModel;
-import org.springframework.ui.binding.FieldNotFoundException;
-import org.springframework.ui.binding.PresentationModel;
+import org.springframework.model.binder.Binder;
+import org.springframework.model.binder.BindingResult;
+import org.springframework.model.binder.BindingResults;
+import org.springframework.model.binder.MissingFieldException;
+import org.springframework.model.ui.BindingStatus;
+import org.springframework.model.ui.FieldModel;
+import org.springframework.model.ui.FieldNotFoundException;
+import org.springframework.model.ui.PresentationModel;
 import org.springframework.util.Assert;
 
 /**

org.springframework.context/src/main/java/org/springframework/model/ui/binder/WebBinder.java

@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ui.binding.binder;
+package org.springframework.model.ui.binder;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.springframework.ui.binding.FieldModel;
-import org.springframework.ui.binding.PresentationModel;
+import org.springframework.model.ui.FieldModel;
+import org.springframework.model.ui.PresentationModel;
 
 /**
  * A binder designed for use in HTTP (web) environments.

org.springframework.context/src/main/java/org/springframework/model/ui/binder/package-info.java

@@ -0,0 +1,5 @@
+/**
+ * Binder implementation that binds to PresentationModels.
+ */
+package org.springframework.model.ui.binder;
+

org.springframework.context/src/main/java/org/springframework/model/ui/config/Condition.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ui.binding.config;
+package org.springframework.model.ui.config;
 
-import org.springframework.ui.binding.FieldModel;
+import org.springframework.model.ui.FieldModel;
 
 /**
  * A FieldModel condition.

org.springframework.context/src/main/java/org/springframework/model/ui/config/FieldModelConfiguration.java

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ui.binding.config;
+package org.springframework.model.ui.config;
 
-import org.springframework.ui.binding.FieldModel;
-import org.springframework.ui.format.Formatter;
+import org.springframework.model.ui.FieldModel;
+import org.springframework.model.ui.format.Formatter;
 
 /**
  * A fluent interface for configuring a {@link FieldModel}.

org.springframework.context/src/main/java/org/springframework/model/ui/config/package-info.java

@@ -0,0 +1,5 @@
+/**
+ * PresentationModel configuration SPI.
+ */
+package org.springframework.model.ui.config;
+

org.springframework.context/src/main/java/org/springframework/model/ui/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.model.ui.format;
 
 import java.lang.annotation.Annotation;
 

org.springframework.context/src/main/java/org/springframework/model/ui/format/Formatted.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.model.ui.format;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

org.springframework.context/src/main/java/org/springframework/model/ui/format/Formatter.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.model.ui.format;
 
 import java.text.ParseException;
 import java.util.Locale;

org.springframework.context/src/main/java/org/springframework/model/ui/format/date/DateFormatter.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ui.format.date;
+package org.springframework.model.ui.format.date;
 
 import java.text.DateFormat;
 import java.text.ParseException;
@@ -23,7 +23,7 @@ import java.util.Locale;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.ui.format.Formatter;
+import org.springframework.model.ui.format.Formatter;
 
 /**
  * A formatter for {@link Date} types.

org.springframework.context/src/main/java/org/springframework/model/ui/format/date/package-info.java

@@ -0,0 +1,5 @@
+/**
+ * Formatters for <code>java.util.Date</code> fields.
+ */
+package org.springframework.model.ui.format.date;
+

org.springframework.context/src/main/java/org/springframework/model/ui/format/number/CurrencyFormat.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ui.format.number;
+package org.springframework.model.ui.format.number;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

org.springframework.context/src/main/java/org/springframework/model/ui/format/number/CurrencyFormatter.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ui.format.number;
+package org.springframework.model.ui.format.number;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -22,7 +22,7 @@ import java.text.ParseException;
 import java.text.ParsePosition;
 import java.util.Locale;
 
-import org.springframework.ui.format.Formatter;
+import org.springframework.model.ui.format.Formatter;
 
 /**
  * A BigDecimal formatter for currency values.

org.springframework.context/src/main/java/org/springframework/model/ui/format/number/CurrencyNumberFormatFactory.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ui.format.number;
+package org.springframework.model.ui.format.number;
 
 import java.math.RoundingMode;
 import java.text.DecimalFormat;

org.springframework.context/src/main/java/org/springframework/model/ui/format/number/DecimalFormatter.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ui.format.number;
+package org.springframework.model.ui.format.number;
 
 import java.math.BigDecimal;
 import java.text.NumberFormat;
@@ -21,7 +21,7 @@ import java.text.ParseException;
 import java.text.ParsePosition;
 import java.util.Locale;
 
-import org.springframework.ui.format.Formatter;
+import org.springframework.model.ui.format.Formatter;
 
 /**
  * A BigDecimal formatter for decimal values.

org.springframework.context/src/main/java/org/springframework/model/ui/format/number/DefaultNumberFormatFactory.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ui.format.number;
+package org.springframework.model.ui.format.number;
 
 import java.text.DecimalFormat;
 import java.text.NumberFormat;

org.springframework.context/src/main/java/org/springframework/model/ui/format/number/IntegerFormatter.java

@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ui.format.number;
+package org.springframework.model.ui.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.model.ui.format.Formatter;
 
 /**
  * A Long formatter for whole integer values.

org.springframework.context/src/main/java/org/springframework/model/ui/format/number/IntegerNumberFormatFactory.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ui.format.number;
+package org.springframework.model.ui.format.number;
 
 import java.text.NumberFormat;
 import java.util.Locale;

org.springframework.context/src/main/java/org/springframework/model/ui/format/number/NumberFormatFactory.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ui.format.number;
+package org.springframework.model.ui.format.number;
 
 import java.text.NumberFormat;
 import java.util.Locale;

org.springframework.context/src/main/java/org/springframework/model/ui/format/number/PercentFormatter.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ui.format.number;
+package org.springframework.model.ui.format.number;
 
 import java.math.BigDecimal;
 import java.text.NumberFormat;
@@ -21,7 +21,7 @@ import java.text.ParseException;
 import java.text.ParsePosition;
 import java.util.Locale;
 
-import org.springframework.ui.format.Formatter;
+import org.springframework.model.ui.format.Formatter;
 
 /**
  * A BigDecimal formatter for percent values.

org.springframework.context/src/main/java/org/springframework/model/ui/format/number/PercentNumberFormatFactory.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ui.format.number;
+package org.springframework.model.ui.format.number;
 
 import java.text.DecimalFormat;
 import java.text.NumberFormat;

org.springframework.context/src/main/java/org/springframework/model/ui/format/number/package-info.java

@@ -0,0 +1,5 @@
+/**
+ * Formatters for <code>java.lang.Number</code> properties.
+ */
+package org.springframework.model.ui.format.number;
+

org.springframework.context/src/main/java/org/springframework/model/ui/format/package-info.java

@@ -0,0 +1,5 @@
+/**
+ * A SPI for defining Formatters to format field model values for display in a UI.
+ */
+package org.springframework.model.ui.format;
+

org.springframework.context/src/main/java/org/springframework/model/ui/package-info.java

@@ -0,0 +1,5 @@
+/**
+ * Spring's PresentationModel public API.
+ */
+package org.springframework.model.ui;
+

org.springframework.context/src/main/java/org/springframework/model/ui/support/CollectionTypeDescriptor.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ui.binding.support;
+package org.springframework.model.ui.support;
 
 import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;

org.springframework.context/src/main/java/org/springframework/model/ui/support/DefaultFieldModel.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ui.binding.support;
+package org.springframework.model.ui.support;
 
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
@@ -32,14 +32,14 @@ import org.springframework.core.convert.ConversionFailedException;
 import org.springframework.core.convert.TypeConverter;
 import org.springframework.core.convert.TypeDescriptor;
 import org.springframework.core.style.StylerUtils;
-import org.springframework.ui.alert.Alert;
-import org.springframework.ui.alert.Severity;
-import org.springframework.ui.binding.BindingStatus;
-import org.springframework.ui.binding.FieldModel;
-import org.springframework.ui.binding.ValidationStatus;
-import org.springframework.ui.format.Formatter;
-import org.springframework.ui.message.MessageBuilder;
-import org.springframework.ui.message.ResolvableArgument;
+import org.springframework.model.alert.Alert;
+import org.springframework.model.alert.Severity;
+import org.springframework.model.message.MessageBuilder;
+import org.springframework.model.message.ResolvableArgument;
+import org.springframework.model.ui.BindingStatus;
+import org.springframework.model.ui.FieldModel;
+import org.springframework.model.ui.ValidationStatus;
+import org.springframework.model.ui.format.Formatter;
 
 /**
  * Default FieldModel implementation suitable for use in most environments.

org.springframework.context/src/main/java/org/springframework/model/ui/support/DefaultPresentationModel.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ui.binding.support;
+package org.springframework.model.ui.support;
 
 import java.beans.BeanInfo;
 import java.beans.IntrospectionException;
@@ -29,12 +29,12 @@ import org.springframework.context.MessageSource;
 import org.springframework.core.GenericCollectionTypeResolver;
 import org.springframework.core.convert.TypeConverter;
 import org.springframework.core.convert.support.DefaultTypeConverter;
-import org.springframework.ui.binding.FieldModel;
-import org.springframework.ui.binding.FieldNotFoundException;
-import org.springframework.ui.binding.PresentationModel;
-import org.springframework.ui.binding.config.Condition;
-import org.springframework.ui.binding.config.FieldModelConfiguration;
-import org.springframework.ui.format.Formatter;
+import org.springframework.model.ui.FieldModel;
+import org.springframework.model.ui.FieldNotFoundException;
+import org.springframework.model.ui.PresentationModel;
+import org.springframework.model.ui.config.Condition;
+import org.springframework.model.ui.config.FieldModelConfiguration;
+import org.springframework.model.ui.format.Formatter;
 import org.springframework.util.Assert;
 
 /**

org.springframework.context/src/main/java/org/springframework/model/ui/support/DefaultPresentationModelFactory.java

@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ui.binding.support;
+package org.springframework.model.ui.support;
 
 import java.util.IdentityHashMap;
 import java.util.Map;
 
-import org.springframework.ui.binding.PresentationModel;
-import org.springframework.ui.binding.PresentationModelFactory;
+import org.springframework.model.ui.PresentationModel;
+import org.springframework.model.ui.PresentationModelFactory;
 
 /**
  * Default PresentationModelFactory implementation that uses a {@link IdentityHashMap} to map domain models to PresentationModels.

org.springframework.context/src/main/java/org/springframework/model/ui/support/FieldModelContext.java

@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ui.binding.support;
+package org.springframework.model.ui.support;
 
 import org.springframework.context.MessageSource;
 import org.springframework.core.convert.TypeConverter;
-import org.springframework.ui.binding.FieldModel;
-import org.springframework.ui.binding.config.Condition;
-import org.springframework.ui.format.Formatter;
+import org.springframework.model.ui.FieldModel;
+import org.springframework.model.ui.config.Condition;
+import org.springframework.model.ui.format.Formatter;
 
 /**
  * A context that allows a FieldModel to access its external configuration.

org.springframework.context/src/main/java/org/springframework/model/ui/support/FieldPath.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ui.binding.support;
+package org.springframework.model.ui.support;
 
 import java.util.ArrayList;
 import java.util.Collections;

org.springframework.context/src/main/java/org/springframework/model/ui/support/FieldPathElement.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ui.binding.support;
+package org.springframework.model.ui.support;
 
 class FieldPathElement {
 

org.springframework.context/src/main/java/org/springframework/model/ui/support/FormatterRegistry.java

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ui.binding.support;
+package org.springframework.model.ui.support;
 
 import java.beans.PropertyDescriptor;
 
-import org.springframework.ui.format.AnnotationFormatterFactory;
-import org.springframework.ui.format.Formatter;
+import org.springframework.model.ui.format.AnnotationFormatterFactory;
+import org.springframework.model.ui.format.Formatter;
 
 /**
  * A centralized registry of Formatters indexed by property types.

org.springframework.context/src/main/java/org/springframework/model/ui/support/GenericFormatterRegistry.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ui.binding.support;
+package org.springframework.model.ui.support;
 
 import java.beans.PropertyDescriptor;
 import java.lang.annotation.Annotation;
@@ -37,9 +37,9 @@ import org.springframework.core.convert.TypeConverter;
 import org.springframework.core.convert.TypeDescriptor;
 import org.springframework.core.convert.support.ConversionUtils;
 import org.springframework.core.convert.support.DefaultTypeConverter;
-import org.springframework.ui.format.AnnotationFormatterFactory;
-import org.springframework.ui.format.Formatted;
-import org.springframework.ui.format.Formatter;
+import org.springframework.model.ui.format.AnnotationFormatterFactory;
+import org.springframework.model.ui.format.Formatted;
+import org.springframework.model.ui.format.Formatter;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 

org.springframework.context/src/main/java/org/springframework/model/ui/support/ListElementValueModel.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ui.binding.support;
+package org.springframework.model.ui.support;
 
 import java.util.List;
 

org.springframework.context/src/main/java/org/springframework/model/ui/support/MapValueValueModel.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ui.binding.support;
+package org.springframework.model.ui.support;
 
 import java.util.Map;
 

org.springframework.context/src/main/java/org/springframework/model/ui/support/PropertyValueModel.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ui.binding.support;
+package org.springframework.model.ui.support;
 
 import java.beans.PropertyDescriptor;
 

org.springframework.context/src/main/java/org/springframework/model/ui/support/ValueBuffer.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ui.binding.support;
+package org.springframework.model.ui.support;
 
 class ValueBuffer {
 

org.springframework.context/src/main/java/org/springframework/model/ui/support/ValueModel.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ui.binding.support;
+package org.springframework.model.ui.support;
 
 import org.springframework.core.convert.TypeDescriptor;
 

org.springframework.context/src/main/java/org/springframework/model/ui/support/package-info.java

@@ -0,0 +1,5 @@
+/**
+ * Default implementation of a PresentationModel usable in most environments.
+ */
+package org.springframework.model.ui.support;
+

org.springframework.context/src/main/java/org/springframework/model/validation/Impact.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ui.validation;
+package org.springframework.model.validation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -21,7 +21,7 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import org.springframework.ui.alert.Severity;
+import org.springframework.model.alert.Severity;
 
 @Target({ElementType.TYPE})
 @Retention(RetentionPolicy.RUNTIME)

org.springframework.context/src/main/java/org/springframework/model/validation/Message.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ui.validation;
+package org.springframework.model.validation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

org.springframework.context/src/main/java/org/springframework/model/validation/ValidationConstraint.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ui.validation;
+package org.springframework.model.validation;
 
 public interface ValidationConstraint<T> {
 	boolean validate(T value);

org.springframework.context/src/main/java/org/springframework/model/validation/package-info.java

@@ -0,0 +1,5 @@
+/**
+ * Model ValidationConstraint SPI.
+ */
+package org.springframework.model.validation;
+

org.springframework.context/src/main/java/org/springframework/ui/alert/package.html

@@ -1,7 +0,0 @@
-<html>
-<body>
-<p>
-An API for alerts to display in a user interface.
-</p>
-</body>
-</html>

org.springframework.context/src/main/java/org/springframework/ui/alert/support/package.html

@@ -1,7 +0,0 @@
-<html>
-<body>
-<p>
-Support implementation of the Alert API.
-</p>
-</body>
-</html>

org.springframework.context/src/main/java/org/springframework/ui/binding/binder/package.html

@@ -1,7 +0,0 @@
-<html>
-<body>
-<p>
-A system for binding submitted values to a PresentationModel in a single batch operation.
-</p>
-</body>
-</html>

org.springframework.context/src/main/java/org/springframework/ui/binding/config/package.html

@@ -1,7 +0,0 @@
-<html>
-<body>
-<p>
-PresentationModel configuration SPI.
-</p>
-</body>
-</html>

org.springframework.context/src/main/java/org/springframework/ui/binding/package.html

@@ -1,7 +0,0 @@
-<html>
-<body>
-<p>
-Spring's PresentationModel public API.
-</p>
-</body>
-</html>

org.springframework.context/src/main/java/org/springframework/ui/binding/support/package.html

@@ -1,7 +0,0 @@
-<html>
-<body>
-<p>
-Default implementation of a PresentationModel usable in most environments.
-</p>
-</body>
-</html>

org.springframework.context/src/main/java/org/springframework/ui/format/date/package.html

@@ -1,7 +0,0 @@
-<html>
-<body>
-<p>
-Formatters for <code>java.util.Date</code>c properties.
-</p>
-</body>
-</html>

org.springframework.context/src/main/java/org/springframework/ui/format/number/package.html

@@ -1,7 +0,0 @@
-<html>
-<body>
-<p>
-Formatters for <code>java.lang.Number</code> properties.
-</p>
-</body>
-</html>

org.springframework.context/src/main/java/org/springframework/ui/format/package.html

@@ -1,7 +0,0 @@
-<html>
-<body>
-<p>
-A SPI for defining Formatters to format property values for display in a user interface.
-</p>
-</body>
-</html>

org.springframework.context/src/main/java/org/springframework/ui/message/package.html

@@ -1,7 +0,0 @@
-<html>
-<body>
-<p>
-An API for creating localized messages to display in a user interface.
-</p>
-</body>
-</html>