Merge branch 'master' of github.com:grails/grails-core

Author: jeffscottbrown

src/java/org/codehaus/groovy/grails/commons/DefaultGrailsDomainClassProperty.java

@@ -539,25 +539,39 @@ public ComponentDomainClass(Class<?> type) {
             PropertyDescriptor[] descriptors = getPropertyDescriptors();
 
             List tmp = getPropertyValue(GrailsDomainClassProperty.TRANSIENT, List.class);
-            if (tmp!=null) transients = tmp;
-            properties = createDomainClassProperties(this,descriptors);
+            if (tmp != null) transients = tmp;
+            properties = createDomainClassProperties(descriptors);
             constraints = GrailsDomainConfigurationUtil.evaluateConstraints(getClazz(), properties);
             DomainClassGrailsPlugin.registerConstraintsProperty(getMetaClass(), this);
         }
 
-        private GrailsDomainClassProperty[] createDomainClassProperties(
-                @SuppressWarnings("hiding") ComponentDomainClass type, PropertyDescriptor[] descriptors) {
+        private GrailsDomainClassProperty[] createDomainClassProperties(PropertyDescriptor[] descriptors) {
 
             List<DefaultGrailsDomainClassProperty> props = new ArrayList<DefaultGrailsDomainClassProperty>();
+            Collection<String> embeddedNames = getEmbeddedList();
             for (int i = 0; i < descriptors.length; i++) {
                 PropertyDescriptor descriptor = descriptors[i];
                 if (isPersistentProperty(descriptor)) {
-                    props.add(new DefaultGrailsDomainClassProperty(type,descriptor));
+                    DefaultGrailsDomainClassProperty property = new DefaultGrailsDomainClassProperty(
+                            this, descriptor);
+                    props.add(property);
+                    if (embeddedNames.contains(property.getName())) {
+                        property.setEmbedded(true);
+                    }
                 }
             }
             return props.toArray(new GrailsDomainClassProperty[props.size()]);
         }
 
+        @SuppressWarnings("unchecked")
+        private Collection<String> getEmbeddedList() {
+            Object potentialList = GrailsClassUtils.getStaticPropertyValue(getClazz(), "embedded");
+            if (potentialList instanceof Collection) {
+                return (Collection<String>)potentialList;
+            }
+            return Collections.emptyList();
+        }
+
         private boolean isPersistentProperty(PropertyDescriptor descriptor) {
             String propertyName = descriptor.getName();
             return GrailsDomainConfigurationUtil.isNotConfigurational(descriptor) && !transients.contains(propertyName);

src/java/org/codehaus/groovy/grails/orm/hibernate/cfg/GrailsDomainBinder.java

@@ -743,7 +743,7 @@ private static void bindDependentKeyValue(GrailsDomainClassProperty property, De
         GrailsDomainClass refDomainClass = property.getDomainClass();
         final Mapping mapping = getMapping(refDomainClass.getClazz());
         if ((shouldCollectionBindWithJoinColumn(property) && hasCompositeIdentifier(mapping)) ||
-        	(hasCompositeIdentifier(mapping) && property.isManyToMany())) {
+                (hasCompositeIdentifier(mapping) && property.isManyToMany())) {
             CompositeIdentity ci = (CompositeIdentity) mapping.getIdentity();
             bindCompositeIdentifierToManyToOne(property, key, ci, refDomainClass, EMPTY_PATH);
         }
@@ -1663,7 +1663,7 @@ else if (!"ordinal".equalsIgnoreCase(enumType)) {
         Column column = new Column();
 
         if (property.getDomainClass().isRoot()) {
-        	column.setNullable(property.isOptional());
+            column.setNullable(property.isOptional());
         } else {
             Mapping mapping = getMapping(property.getDomainClass());
             if(mapping == null || mapping.getTablePerHierarchy()) {
@@ -1795,6 +1795,10 @@ else if (currentGrailsProp.isManyToOne()) {
                 bindManyToOne(currentGrailsProp, (ManyToOne) value, path, mappings);
             }
         }
+        else if (currentGrailsProp.isEmbedded()) {
+            value = new Component(persistentClass);
+            bindComponent((Component) value, currentGrailsProp, true, mappings);
+        }
         else {
             if (LOG.isDebugEnabled())
                 LOG.debug("[GrailsDomainBinder] Binding property [" + currentGrailsProp.getName() + "] as SimpleValue");