Changeset 5660

Timestamp:

09/19/14 08:37:53 (10 years ago)

Author:

Twan Goosen

Message:

Merged Oliver's fixes from trunk to 1.0 branch

Location:

VirtualCollectionRegistry/branches/VirtualCollectionRegistry-1.0

Files:

• . (modified) (1 prop)
• pom.xml (modified) (1 diff)
• src/main/java/eu/clarin/cmdi/virtualcollectionregistry/VirtualCollectionRegistryImpl.java (modified) (2 diffs)
• src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/Application.properties (modified) (1 diff)
• src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/DynamicProxyModel.java (modified) (1 diff)
• src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/HandleLinkModel.java (modified) (2 diffs)
• src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/TooltipBehavior.java (modified) (1 diff)
• src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/VolatileEntityModel.java (modified) (2 diffs)
• src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/AdminPage.java (modified) (1 diff)
• src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/BrowseEditableCollectionsPanel.java (modified) (2 diffs)
• src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/BrowsePrivateCollectionsPage.java (modified) (1 diff)
• src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/MenuItem.java (modified) (2 diffs)
• src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/ReferenceLinkPanel.java (modified) (2 diffs)
• src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/table/AdminCollectionsProvider.java (modified) (2 diffs)
• src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/table/FilterForm.java (modified) (1 diff)
• src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/table/PrivateCollectionsProvider.java (modified) (1 diff)
• src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/table/PublishedCollectionsProvider.java (modified) (1 diff)
• src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/wizard/CreateVirtualCollectionWizard.java (modified) (2 diffs)
• src/main/java/eu/clarin/cmdi/virtualcollectionregistry/pid/PersistentIdentifier.java (modified) (1 diff)
• src/main/java/eu/clarin/cmdi/virtualcollectionregistry/service/impl/ReferenceValidator.java (modified) (2 diffs)
• src/main/java/eu/clarin/cmdi/virtualcollectionregistry/service/impl/VirtualCollectionCMDICreatorImpl.java (modified) (3 diffs)

VirtualCollectionRegistry/branches/VirtualCollectionRegistry-1.0/pom.xml

@@ -260 +260 @@
             <artifactId>mpgaai-shhaa</artifactId>
             <version>1.0.5</version>
+            <exclusions>
+                <exclusion>
+                    <!-- replaced with jcl-over-slf4j -->
+                    <artifactId>commons-logging</artifactId>
+                    <groupId>commons-logging</groupId>
+                </exclusion>
+                <!-- a library should only depend on SLF4J but not import
+                     a specific logging backend. Therefore, get rid of
+                     those ... -->
+                <exclusion>
+                    <artifactId>slf4j-log4j12</artifactId>
+                    <groupId>org.slf4j</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>log4j</artifactId>
+                    <groupId>log4j</groupId>
+                </exclusion>
+                
+            </exclusions>
         </dependency>
 

VirtualCollectionRegistry/branches/VirtualCollectionRegistry-1.0/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/VirtualCollectionRegistryImpl.java

@@ -644 +644 @@
             for (VirtualCollection vc : q.getResultList()) {
                 if (vc.getPersistentIdentifier() == null) {
+                    /*
+                     * TODO: if an error occurred while minting PID, the VCR
+                     * should handle this more gracefully and not stubbornly
+                     * re-try ... 
+                     */
                     PersistentIdentifier pid = pid_provider.createIdentifier(vc);
                     vc.setPersistentIdentifier(pid);
@@ -671 +676 @@
         } catch (VirtualCollectionRegistryException e) {
             logger.error("error while doing maintenance", e);
+        } catch (RuntimeException e) {
+            logger.error("unexpected error while doing maintenance", e);
         } finally {
             datastore.closeEntityManager();

VirtualCollectionRegistry/branches/VirtualCollectionRegistry-1.0/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/Application.properties

@@ -18 +18 @@
   virtual collection will then be publicly available and you will not be able \
   to delete the collection. Users may expect the collection to be stable even \
-  though you will be able to make changes after publication.
+  though you will be able to make changes after publication.\n\
+  Notice that it can take up to several minutes for the collection to get \
+  published.
 collections.deleteconfirm: Do you really want to delete "${name}"?\nThis \
   operation is permanent and cannot be undone.

VirtualCollectionRegistry/branches/VirtualCollectionRegistry-1.0/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/DynamicProxyModel.java

@@ -11 +11 @@
  * @param <T> type of model object
  */
+@SuppressWarnings("serial")
 public abstract class DynamicProxyModel<T> implements IModel<T> {
 

VirtualCollectionRegistry/branches/VirtualCollectionRegistry-1.0/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/HandleLinkModel.java

@@ -19 +19 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+
 import org.apache.wicket.model.IModel;
 
@@ -27 +28 @@
  * @author twagoo
  */
+@SuppressWarnings("serial")
 public class HandleLinkModel implements IModel<String> {
 

VirtualCollectionRegistry/branches/VirtualCollectionRegistry-1.0/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/TooltipBehavior.java

@@ -16 +16 @@
  * @author twagoo
  */
+@SuppressWarnings("serial")
 public class TooltipBehavior extends WiQueryAbstractBehavior {
 

VirtualCollectionRegistry/branches/VirtualCollectionRegistry-1.0/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/VolatileEntityModel.java

@@ -2 +2 @@
 
 import eu.clarin.cmdi.virtualcollectionregistry.model.IdentifiedEntity;
+
 import java.io.Serializable;
+
 import javax.persistence.EntityManager;
+
 import org.apache.wicket.model.IModel;
 import org.slf4j.Logger;
@@ -18 +21 @@
  * @see EntityManager#merge(java.lang.Object)
  */
+@SuppressWarnings("serial")
 public class VolatileEntityModel<T extends IdentifiedEntity & Serializable> implements IModel<T> {
 

VirtualCollectionRegistry/branches/VirtualCollectionRegistry-1.0/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/AdminPage.java

@@ -66 +66 @@
             public Object getDisplayValue(User user) {
                 if (user == null) {
-                    return "Published profiles";
+                    return "Published collections";
                 } else {
                     final String displayName = user.getDisplayName();

VirtualCollectionRegistry/branches/VirtualCollectionRegistry-1.0/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/BrowseEditableCollectionsPanel.java

@@ -12 +12 @@
 import eu.clarin.cmdi.virtualcollectionregistry.model.VirtualCollection;
 import eu.clarin.cmdi.virtualcollectionregistry.service.VirtualCollectionValidator;
+
 import java.security.Principal;
 import java.util.Collections;
 import java.util.List;
+
 import org.apache.wicket.Component;
 import org.apache.wicket.PageParameters;
@@ -34 +36 @@
  * @author twagoo
  */
+@SuppressWarnings("serial")
 public class BrowseEditableCollectionsPanel extends Panel {
 

VirtualCollectionRegistry/branches/VirtualCollectionRegistry-1.0/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/BrowsePrivateCollectionsPage.java

@@ -6 +6 @@
 
 @AuthorizeInstantiation(Roles.USER)
-@SuppressWarnings("serial")
 public class BrowsePrivateCollectionsPage extends BasePage {
 

VirtualCollectionRegistry/branches/VirtualCollectionRegistry-1.0/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/MenuItem.java

@@ -1 +1 @@
 package eu.clarin.cmdi.virtualcollectionregistry.gui.pages;
 
-import eu.clarin.cmdi.virtualcollectionregistry.gui.Application;
 import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.authorization.IAuthorizationStrategy;
@@ -12 +11 @@
 import org.apache.wicket.model.AbstractReadOnlyModel;
 import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
 import org.apache.wicket.util.lang.Classes;
+
+import eu.clarin.cmdi.virtualcollectionregistry.gui.Application;
 
 @SuppressWarnings("serial")

VirtualCollectionRegistry/branches/VirtualCollectionRegistry-1.0/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/ReferenceLinkPanel.java

@@ -3 +3 @@
 import eu.clarin.cmdi.virtualcollectionregistry.gui.HandleLinkModel;
 import eu.clarin.cmdi.virtualcollectionregistry.model.Resource;
+
 import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.markup.html.basic.Label;
@@ -16 +17 @@
  * @author twagoo
  */
+@SuppressWarnings("serial")
 public class ReferenceLinkPanel extends Panel {
 

VirtualCollectionRegistry/branches/VirtualCollectionRegistry-1.0/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/table/AdminCollectionsProvider.java

@@ -4 +4 @@
 import eu.clarin.cmdi.virtualcollectionregistry.model.User;
 import eu.clarin.cmdi.virtualcollectionregistry.model.VirtualCollection;
+
 import org.apache.wicket.model.IModel;
 
@@ -14 +15 @@
  * @author twagoo
  */
+@SuppressWarnings("serial")
 public class AdminCollectionsProvider extends CollectionsProvider {
 

VirtualCollectionRegistry/branches/VirtualCollectionRegistry-1.0/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/table/FilterForm.java

@@ -14 +14 @@
 import org.apache.wicket.markup.html.form.Form;
 import org.apache.wicket.markup.html.form.TextField;
-import org.apache.wicket.markup.html.panel.FeedbackPanel;
 import org.apache.wicket.markup.html.panel.Panel;
 import org.apache.wicket.model.CompoundPropertyModel;

VirtualCollectionRegistry/branches/VirtualCollectionRegistry-1.0/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/table/PrivateCollectionsProvider.java

@@ -8 +8 @@
  * @author twagoo
  */
+@SuppressWarnings("serial")
 public class PrivateCollectionsProvider extends CollectionsProvider {
 

VirtualCollectionRegistry/branches/VirtualCollectionRegistry-1.0/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/table/PublishedCollectionsProvider.java

@@ -8 +8 @@
  * @author twagoo
  */
+@SuppressWarnings("serial")
 public class PublishedCollectionsProvider extends CollectionsProvider {
 

VirtualCollectionRegistry/branches/VirtualCollectionRegistry-1.0/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/wizard/CreateVirtualCollectionWizard.java

@@ -10 +10 @@
 import eu.clarin.cmdi.virtualcollectionregistry.model.VirtualCollection;
 import eu.clarin.cmdi.virtualcollectionregistry.service.CreatorProvider;
+
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
+
 import org.apache.wicket.Component;
 import org.apache.wicket.ResourceReference;
@@ -335 +337 @@
                 }
             });
-            add(new AjaxLink("addme") {
+            add(new AjaxLink<Object>("addme") {
 
                 @Override

VirtualCollectionRegistry/branches/VirtualCollectionRegistry-1.0/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/pid/PersistentIdentifier.java

@@ -114 +114 @@
      * <em>Actionable URI</em> is defined as follows: "URI (3.2.2) that has a
      * resource-associated identifier (3.2.1) that is suitably encoded, such
-     * that when the URI is embedded in a web document and “clicked” on, the
+     * that when the URI is embedded in a web document and 'clicked' on, the
      * browser will be redirected to the resource (3.1.1), and possibly
      * supplementary services related to the resource" (ISO 24619:2011 (PISA),

VirtualCollectionRegistry/branches/VirtualCollectionRegistry-1.0/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/service/impl/ReferenceValidator.java

@@ -18 +18 @@
 
 import java.util.regex.Pattern;
+
 import org.apache.wicket.validation.IValidatable;
 import org.apache.wicket.validation.IValidator;
@@ -32 +33 @@
  * @author twagoo
  */
+@SuppressWarnings("serial")
 public class ReferenceValidator extends AbstractValidator<String> {
 

VirtualCollectionRegistry/branches/VirtualCollectionRegistry-1.0/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/service/impl/VirtualCollectionCMDICreatorImpl.java

@@ -1 +1 @@
 package eu.clarin.cmdi.virtualcollectionregistry.service.impl;
+
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
+import javax.xml.datatype.DatatypeConfigurationException;
+import javax.xml.datatype.DatatypeFactory;
+import javax.xml.datatype.XMLGregorianCalendar;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.time.FastDateFormat;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
 
 import eu.clarin.cmdi.virtualcollectionregistry.model.Creator;
@@ -5 +20 @@
 import eu.clarin.cmdi.virtualcollectionregistry.model.Resource;
 import eu.clarin.cmdi.virtualcollectionregistry.model.VirtualCollection;
-import static eu.clarin.cmdi.virtualcollectionregistry.model.VirtualCollection.State.DEAD;
-import static eu.clarin.cmdi.virtualcollectionregistry.model.VirtualCollection.State.DELETED;
-import static eu.clarin.cmdi.virtualcollectionregistry.model.VirtualCollection.State.PUBLIC;
 import eu.clarin.cmdi.virtualcollectionregistry.model.cmdi.CMD;
 import eu.clarin.cmdi.virtualcollectionregistry.model.cmdi.CMD.Components.VirtualCollection.Creator.Email;
@@ -26 +38 @@
 import eu.clarin.cmdi.virtualcollectionregistry.model.cmdi.SimpletypeStatus1;
 import eu.clarin.cmdi.virtualcollectionregistry.service.VirtualCollectionCMDICreator;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
-import javax.xml.datatype.DatatypeConfigurationException;
-import javax.xml.datatype.DatatypeFactory;
-import javax.xml.datatype.XMLGregorianCalendar;
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang3.time.FastDateFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
 
 /**