Changeset 5638

Timestamp:

09/16/14 08:07:15 (10 years ago)

Author:

Twan Goosen

Message:

Merged changes from trunk to 1.0 branch

Location:

VirtualCollectionRegistry/branches/VirtualCollectionRegistry-1.0

Files:

• . (modified) (1 prop)
• doc/README.txt (modified) (1 diff)
• pom.xml (modified) (1 diff)
• src/main/java/eu/clarin/cmdi/virtualcollectionregistry/pid/EPICPersistentIdentifierProvider.java (modified) (3 diffs)
• src/main/java/eu/clarin/cmdi/virtualcollectionregistry/rest/BaseResource.java (modified) (1 diff)
• src/test/java/eu/clarin/cmdi/virtualcollectionregistry/pid/EPICPersistentIdentifierProviderTest.java (modified) (2 diffs)

VirtualCollectionRegistry/branches/VirtualCollectionRegistry-1.0/doc/README.txt

@@ -89 +89 @@
              value="$epic_password"
              override="false"/>
-
+             
+  Add the following parameter to configure a custom PID 'infix'. The example below
+  configures the default behaviour, i.e. '{prefix}/VCR-{id}'.
+   
+  <Parameter name="pid_provider.epic.infix"
+             value="VCR-"/>
+             
 * AUTHENTICATION *
 

VirtualCollectionRegistry/branches/VirtualCollectionRegistry-1.0/pom.xml

@@ -653 +653 @@
                                     </action>
                                 </pluginExecution>
+                                <pluginExecution>
+                                    <pluginExecutionFilter>
+                                        <groupId>org.jasig.maven</groupId>
+                                        <artifactId>sass-maven-plugin</artifactId>
+                                        <versionRange>[1.1.1,)</versionRange>
+                                        <goals>
+                                            <goal>update-stylesheets</goal>
+                                        </goals>
+                                    </pluginExecutionFilter>
+                                    <action>
+                                        <execute />
+                                    </action>
+                                </pluginExecution>
                             </pluginExecutions>
                         </lifecycleMappingMetadata>

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

@@ -38 +38 @@
     private String baseUri;
 
+    @Value("${pid_provider.epic.infix:VCR-}")
+    private String infix;
+
     /**
      *
@@ -54 +57 @@
         final Map<HandleField, String> fieldMap = createPIDFieldMap(vc);
         try {
-            final String requestedPid = String.format("VCR-%d", vc.getId());
+            final String requestedPid = String.format("%s%d", infix, vc.getId());
             final String pid = pidWriter.registerNewPID(configuration, fieldMap, requestedPid);
             return new PersistentIdentifier(vc, PersistentIdentifier.Type.HANDLE, pid);
@@ -89 +92 @@
         this.baseUri = baseUri;
     }
+    
+    protected void setInfix(String infix) {
+        this.infix = infix;
+    }
 
 }

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

@@ -42 +42 @@
      */
     @GET
-    @Path("/")
     @Produces({MediaType.TEXT_XML})
     public Response getDescription() {

VirtualCollectionRegistry/branches/VirtualCollectionRegistry-1.0/src/test/java/eu/clarin/cmdi/virtualcollectionregistry/pid/EPICPersistentIdentifierProviderTest.java

@@ -31 +31 @@
         instance = new EPICPersistentIdentifierProvider(pidWriter, pidConfig);
         instance.setBaseUri("http://vcr");
+        instance.setInfix("VCR-test-");
     }
 
@@ -55 +56 @@
                                 hasEntry(HandleField.CREATOR, "Joe Unit")
                         ),
-                        equalTo("VCR-123")
+                        equalTo("VCR-test-123")
                 );
-                will(returnValue("9999/VCR-123"));
+                will(returnValue("9999/VCR-test-123"));
             }
         });
 
         PersistentIdentifier result = instance.createIdentifier(vc);
-        assertEquals("9999/VCR-123", result.getIdentifier());
+        assertEquals("9999/VCR-test-123", result.getIdentifier());
         assertEquals(Type.HANDLE, result.getType());
     }