Changeset 5522

Timestamp:

08/05/14 14:47:37 (10 years ago)

Author:

Twan Goosen

Message:

Added a 'creator provider' interface and SAML + chaining implementations. Added an 'add me' action link to add the current user as a creator.
Refs #595

Location:

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry

Files:

• pom.xml (modified) (1 diff)
• src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/ApplicationSession.java (modified) (2 diffs)
• src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/dialog/ModalEditDialogBase.java (modified) (1 diff)
• src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/wizard/CreateVirtualCollectionWizard$CreatorsStep.html (modified) (1 diff)
• src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/wizard/CreateVirtualCollectionWizard.java (modified) (5 diffs)
• src/main/java/eu/clarin/cmdi/virtualcollectionregistry/service/CreatorProvider.java (added)
• src/main/java/eu/clarin/cmdi/virtualcollectionregistry/service/impl/ChaningCreatorProvider.java (added)
• src/main/java/eu/clarin/cmdi/virtualcollectionregistry/service/impl/SAMLCreatorProvider.java (added)
• src/main/java/eu/clarin/cmdi/virtualcollectionregistry/service/impl/SAMLCreatorProviderConfiguration.java (added)
• src/main/java/eu/clarin/cmdi/virtualcollectionregistry/service/impl/VirtualCollectionValidatorConfiguration.java (deleted)
• src/test/java/eu/clarin/cmdi/virtualcollectionregistry/service/impl/ChaningCreatorProviderTest.java (added)

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/pom.xml

@@ -197 +197 @@
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>4.0.1</version>
+            <version>4.3.4</version>
             <type>jar</type>
         </dependency>

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/ApplicationSession.java

@@ -6 +6 @@
 import java.security.Principal;
 import java.util.regex.Pattern;
+import org.apache.http.auth.BasicUserPrincipal;
 import org.apache.wicket.Request;
 import org.apache.wicket.authentication.AuthenticatedWebSession;
@@ -62 +63 @@
 
     public Principal getPrincipal() {
-        return new Principal() {
-            @Override
-            public String getName() {
-                return user;
-            }
-        };
+        return new BasicUserPrincipal(getUser());
     }
 

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/dialog/ModalEditDialogBase.java

@@ -112 +112 @@
         this.show(target, null);
     }
-
+    
     public final void show(AjaxRequestTarget target, IModel<T> model) {
         if (model == null) {

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/wizard/CreateVirtualCollectionWizard$CreatorsStep.html

@@ -10 +10 @@
 <div style="display: none" wicket:id="deleteCreatorDialog"></div>
 <div class="fieldset">
-  <label>Creators<br /><a href="#" wicket:id="add" class="add"><span>[add]</span></a></label>
+  <label>Creators<br />
+    <a href="#" wicket:id="add" class="add"><span>[add]</span></a><br />
+    <a href="#" wicket:id="addme" class="add"><span>[add me]</span></a>
+  </label>
   <table wicket:id="creatorsTable" class="creatorsTable"></table>
 </div>

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/wizard/CreateVirtualCollectionWizard.java

@@ -1 +1 @@
 package eu.clarin.cmdi.virtualcollectionregistry.gui.wizard;
 
+import eu.clarin.cmdi.virtualcollectionregistry.gui.ApplicationSession;
 import eu.clarin.cmdi.virtualcollectionregistry.gui.VolatileEntityModel;
 import eu.clarin.cmdi.virtualcollectionregistry.gui.dialog.ConfirmationDialog;
@@ -7 +8 @@
 import eu.clarin.cmdi.virtualcollectionregistry.model.Resource;
 import eu.clarin.cmdi.virtualcollectionregistry.model.VirtualCollection;
+import eu.clarin.cmdi.virtualcollectionregistry.service.CreatorProvider;
 import java.util.Arrays;
 import java.util.Iterator;
@@ -49 +51 @@
 import org.apache.wicket.model.PropertyModel;
 import org.apache.wicket.model.StringResourceModel;
+import org.apache.wicket.spring.injection.annot.SpringBean;
 import org.apache.wicket.validation.validator.StringValidator;
 import org.apache.wicket.validation.validator.UrlValidator;
@@ -54 +57 @@
 @SuppressWarnings("serial")
 public abstract class CreateVirtualCollectionWizard extends WizardBase {
+
+    @SpringBean
+    private CreatorProvider creatorProvider;
 
     private final class GeneralStep extends DynamicWizardStep {
@@ -310 +316 @@
                 }
             });
+            add(new AjaxLink("addme") {
+
+                @Override
+                public void onClick(AjaxRequestTarget target) {
+                    final Creator creator = creatorProvider.getCreator(ApplicationSession.get().getPrincipal());
+                    if (creator.getPerson() == null) {
+                        Session.get().error("Could not retrieve required user information");
+                        setResponsePage(getPage());
+                    } else {
+                        vc.getObject().getCreators().add(creator);
+                        target.addComponent(creatorsTable);
+                    }
+                }
+            });
         }