Changeset 30099

Timestamp:

02/12/08 19:33:51 (9 months ago)

Author:

bstefanescu

Message:

merged 29988 and 29978 from branch

Files:

• org.nuxeo.ecm.core/trunk/nuxeo-core-schema/src/main/java/org/nuxeo/ecm/core/schema/XSDLoader.java (modified) (1 diff)
• org.nuxeo.ecm.core/trunk/nuxeo-core-schema/src/test/java/org/nuxeo/ecm/core/schema/TestSchemaLoader.java (modified) (1 diff)

org.nuxeo.ecm.core/trunk/nuxeo-core-schema/src/main/java/org/nuxeo/ecm/core/schema/XSDLoader.java

@@ -275 +275 @@
-            XSAttributeDecl at = attr.getDecl();
-            Type fieldType = loadType(schema, at.getType());
+            if (fieldType == null) {
+                throw new TypeBindingException("Cannot add type for '" + at.getName() + "'");
+            }
-            createField(ct, at, fieldType);
-        }

org.nuxeo.ecm.core/trunk/nuxeo-core-schema/src/test/java/org/nuxeo/ecm/core/schema/TestSchemaLoader.java

@@ -62 +62 @@
-    }
-
-
+
+
-        URL url = getResource("schema/schema.xsd");
-