Changeset 1864 for ComponentRegistry/tags/ComponentRegistry-1.11.1/ComponentRegistry/src/main/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/ComponentRegistryResourceResolver.java (copied) (copied from ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/ComponentRegistryResourceResolver.java)
• ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/MDMarshaller.java (modified) (4 diffs)
• ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/frontend/UserSettingsPage.java (modified) (3 diffs)
• ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/impl/database/ComponentRegistryFactoryDbImpl.java (modified) (2 diffs)
• ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/rest/ComponentRegistryRestService.java (modified) (3 diffs)
• 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/MDMarshaller.java

@@ -41 +41 @@
     private final static Logger LOG = LoggerFactory.getLogger(MDMarshaller.class);
     /**
-     * I define W3C_XML_SCHEMA_NS_URI here cannot get it from @see XMLConstants there is a conflict between stax-api and java5.
+     * I define W3C_XML_SCHEMA_NS_URI here cannot get it from
+     *
+     * @see XMLConstants there is a conflict between stax-api and java5.
      */
     private static final String W3C_XML_SCHEMA_NS_URI = "http://www.w3.org/2001/XMLSchema";
@@ -65 +67 @@
 
     /**
-     * 
+     *
      * @param docClass
      * @param inputStream
@@ -102 +104 @@
     }
 
-    public static Schema getCMDComponentSchema() {
+    public static synchronized Schema getCMDComponentSchema() {
         if (generalComponentSchema == null) {
             try {
                 SchemaFactory schemaFactory = SchemaFactory.newInstance(W3C_XML_SCHEMA_NS_URI);
-                schemaFactory.setResourceResolver(new LSResourceResolver() {
-                    private CatalogResolver catRes = new CatalogResolver();
-
-                    @Override
-                    public LSInput resolveResource(String type, String namespaceURI, String publicId, String systemId, String baseURI) {
-                        InputSource resolveEntity = catRes.resolveEntity(publicId, systemId);
-                        resolveEntity.setEncoding("UTF-8");
-                        DOMImplementationLS domImplementation;
-                        try {
-                            domImplementation = (DOMImplementationLS) DOMImplementationRegistry.newInstance().getDOMImplementation("LS");
-                        } catch (ClassCastException e) {
-                            throw new RuntimeException(e);
-                        } catch (ClassNotFoundException e) {
-                            throw new RuntimeException(e);
-                        } catch (InstantiationException e) {
-                            throw new RuntimeException(e);
-                        } catch (IllegalAccessException e) {
-                            throw new RuntimeException(e);
-                        }
-                        LSInput lsInput = domImplementation.createLSInput();
-                        lsInput.setEncoding("UTF-8");
-                        lsInput.setByteStream(resolveEntity.getByteStream());
-                        lsInput.setCharacterStream(resolveEntity.getCharacterStream());
-                        return lsInput;
-                    }
-                });
+                schemaFactory.setResourceResolver(new ComponentRegistryResourceResolver());
                 generalComponentSchema = schemaFactory.newSchema(new URL(Configuration.getInstance().getGeneralComponentSchema()));
             } catch (MalformedURLException e) {
@@ -169 +146 @@
     }
 
-    
-    
     private static String getSpecId(CMDComponentSpec spec) {
         String result = "";

ComponentRegistry/tags/ComponentRegistry-1.11.1/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/frontend/UserSettingsPage.java

@@ -5 +5 @@
 package clarin.cmdi.componentregistry.frontend;
 
+import clarin.cmdi.componentregistry.ComponentRegistryFactory;
+import clarin.cmdi.componentregistry.UserCredentials;
 import clarin.cmdi.componentregistry.impl.database.UserDao;
 import clarin.cmdi.componentregistry.model.RegistryUser;
@@ -29 +31 @@
     @SpringBean
     private UserDao userDao;
+    @SpringBean(name = "componentRegistryFactory")
+    private ComponentRegistryFactory componentRegistryFactory;
     private RegistryUser registryUser;
 
@@ -35 +39 @@
 
         Principal userPrincipal = ((WebRequestCycle) (RequestCycle.get())).getWebRequest().getHttpServletRequest().getUserPrincipal();
-        registryUser = userDao.getByPrincipalName(userPrincipal.getName());
-        
+        registryUser = componentRegistryFactory.getOrCreateUser(new UserCredentials(userPrincipal));
+
         add(new Label("userName", registryUser.getPrincipalName()));
 

ComponentRegistry/tags/ComponentRegistry-1.11.1/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/impl/database/ComponentRegistryFactoryDbImpl.java

@@ -20 +20 @@
  * ComponentRegistryDbImpl implementation of ComponentRegistry for accessing the
  * registry
- * 
+ *
  * @author Twan Goosen <twan.goosen@mpi.nl>
  */
@@ -118 +118 @@
         RegistryUser user = userDao.getByPrincipalName(principalName);
         if (user == null) {
+            LOG.info("Request to create user with principal name {} and display name {}", new Object[]{principalName, displayName});
             // Create the new user
             user = new RegistryUser();

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

@@ -81 +81 @@
 
     /**
-     * 
+     *
      * @return Principal of current request
      * @throws IllegalArgumentException If no user principal found
@@ -281 +281 @@
 
     /**
-     * 
+     *
      * Purely helper method for my front-end (FLEX) which only does post/get requests. The query param is checked and the "proper" method is
      * called.
+     *
      * @param profileId
      * @param method
@@ -373 +374 @@
 
     /**
-     * 
+     *
      * Purely helper method for my front-end (FLEX) which van only do post/get requests. The query param is checked and the "proper" method
      * is called.
+     *
      * @param componentId
      * @param method

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;