Changeset 1864 for ComponentRegistry/tags/ComponentRegistry-1.11.1/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/rest/MDValidator.java

Timestamp:

04/05/12 15:38:51 (12 years ago)

Author:

twagoo

Message:

Created ComponentRegistry-1.11.1. Copied from 1.11.0 and merged a number two fixes from trunk:

• caching of w3c xml.xsd schema in validator (CMDValidate -> 1.1)
• issue with user settings page users without user entry in database

Location:

ComponentRegistry/tags/ComponentRegistry-1.11.1

Files:

• . (copied) (copied from ComponentRegistry/tags/ComponentRegistry-1.11.0) (1 prop)
• ComponentRegistry (modified) (1 prop)
• ComponentRegistry/src/main/java (modified) (1 prop)
• ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/rest/MDValidator.java (modified) (7 diffs)

ComponentRegistry/tags/ComponentRegistry-1.11.1/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/rest/MDValidator.java

@@ -3 +3 @@
 import clarin.cmdi.componentregistry.ComponentRegistry;
 import clarin.cmdi.componentregistry.ComponentRegistryException;
+import clarin.cmdi.componentregistry.ComponentRegistryResourceResolver;
 import clarin.cmdi.componentregistry.Configuration;
 import clarin.cmdi.componentregistry.MDMarshaller;
@@ -28 +29 @@
 
 public class MDValidator implements Validator {
-
+    
     private final static Logger LOG = LoggerFactory.getLogger(MDValidator.class);
     static final String MISMATCH_ERROR = "Cannot register component as a profile or vica versa.";
@@ -49 +50 @@
 
     /**
-     * 
-     * @param input In order to validate the input is consumed. So use @see getCMDComponentSpec to get the parsed CMDComponentSpec.
+     *
+     * @param input In order to validate the input is consumed. So use
+     * @see getCMDComponentSpec to get the parsed CMDComponentSpec.
      * @param desc
-     * @param registry (registry you currently used) 
-     * @param userRegistry can be null, We get user registry as well so we can give nice error messages if needed. Can be the same as @param registry
+     * @param registry (registry you currently used)
+     * @param userRegistry can be null, We get user registry as well so we can give nice error messages if needed. Can be the same as
+     * @param registry
      */
     public MDValidator(InputStream input, AbstractDescription description, ComponentRegistry registry, ComponentRegistry userRegistry, ComponentRegistry publicRegistry) {
@@ -62 +65 @@
         this.publicRegistry = publicRegistry;
     }
-
+    
     @Override
     public List<String> getErrorMessages() {
         return errorMessages;
     }
-
+    
     @Override
     public boolean validate() {
         try {
             clarin.cmdi.schema.cmd.Validator validator = new clarin.cmdi.schema.cmd.Validator(new URL(Configuration.getInstance().getGeneralComponentSchema()));
+            validator.setResourceResolver(new ComponentRegistryResourceResolver());
             // We may need to reuse the input stream, so save it to a byte array first
             byte[] inputBytes = getBytesFromInputStream();
@@ -109 +113 @@
         return errorMessages.isEmpty();
     }
-
+    
     private byte[] getBytesFromInputStream() throws IOException {
         int len;
         byte[] b = new byte[4096];
         final ByteArrayOutputStream bOS = new ByteArrayOutputStream();
-
+        
         while ((len = input.read(b)) > 0) {
             bOS.write(b, 0, len);
         }
-
+        
         return bOS.toByteArray();
     }
-
+    
     private void validateComponents(List<CMDComponentType> cmdComponents) throws ComponentRegistryException {
         for (CMDComponentType cmdComponentType : cmdComponents) {
@@ -128 +132 @@
         }
     }
-
+    
     private void validateDescribedComponents(CMDComponentType cmdComponentType) throws ComponentRegistryException {
         checkPublicComponents(cmdComponentType);
     }
-
+    
     private void checkPublicComponents(CMDComponentType cmdComponentType) throws ComponentRegistryException {
         if (isDefinedInSeparateFile(cmdComponentType)) {
@@ -157 +161 @@
                     }
                 }
-
+                
             }
         }
     }
-
+    
     private boolean isDefinedInSeparateFile(CMDComponentType cmdComponentType) {
         return cmdComponentType.getName() == null;
     }
-
+    
     public CMDComponentSpec getCMDComponentSpec() {
         return spec;