Changes in VirtualCollectionRegistry/trunk/VirtualCollectionRegistry [5398:5406]

Location:

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry

Files:

• README.txt (modified) (1 diff)
• pom.xml (modified) (1 diff)
• src/main/java/eu/clarin/cmdi/virtualcollectionregistry/model/VirtualCollection.java (modified) (1 diff)
• src/main/java/eu/clarin/cmdi/virtualcollectionregistry/pid/EPIC2PersistentIdentifierProvider.java (deleted)
• src/main/java/eu/clarin/cmdi/virtualcollectionregistry/pid/EPICPersistentIdentifierConfiguration.java (added)
• src/main/java/eu/clarin/cmdi/virtualcollectionregistry/pid/EPICPersistentIdentifierProvider.java (added)
• src/main/java/eu/clarin/cmdi/virtualcollectionregistry/pid/GWDGPersistentIdentifierProvider.java (modified) (2 diffs)
• src/main/java/eu/clarin/cmdi/virtualcollectionregistry/pid/PersistentIdentifier.java (modified) (2 diffs)
• src/main/java/eu/clarin/cmdi/virtualcollectionregistry/pid/PersistentIdentifierProvider.java (modified) (2 diffs)
• src/main/webapp/WEB-INF/applicationContext.xml (modified) (1 diff)
• src/test/java/eu/clarin/cmdi/virtualcollectionregistry/pid (added)
• src/test/java/eu/clarin/cmdi/virtualcollectionregistry/pid/EPICPersistentIdentifierProviderTest.java (added)

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/README.txt

@@ -44 +44 @@
   <Parameter name="pid_provider.username" value="$gwdg_user" override="false"/>
   <Parameter name="pid_provider.password" value="$gwdg_password" override="false"/>
+
+  c) For using the EPIC API v2 handle provider add following and customize the
+     base URI for the virtual collection registry and
 TODO
+
+  <Parameter name="spring.profiles.active"
+             value="vcr.pid.epic”
+             override="false"/>   
+  <Parameter name="pid_provider.base_uri"
+             value="http://127.0.0.1:8080/VirtualCollectionRegistry"
+             override="false"/>
+

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/pom.xml

@@ -473 +473 @@
 
     <dependency>
+      <groupId>org.jmock</groupId>
+      <artifactId>jmock-junit4</artifactId>
+      <version>2.6.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
-        <version>4.8.1</version>
+        <version>4.11</version>
         <type>jar</type>
         <scope>test</scope>

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/model/VirtualCollection.java

@@ -181 +181 @@
         return id;
     }
+    
+    public void setId(Long id) {
+        this.id = id;
+    }
 
     public User getOwner() {

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/pid/GWDGPersistentIdentifierProvider.java

@@ -40 +40 @@
         PersistentIdentifierProvider {
 
+    public static final String BASE_URI = "pid_provider.base_uri";
+    
     private static enum Attribute {
 
@@ -135 +137 @@
             logger.info("created handle \"{}\" for virtual collection \"{}\"",
                     pid, vc.getId());
-            return new PersistentIdentifier(vc, PersistentIdentifier.Type.GWDG, pid);
+            return new PersistentIdentifier(vc, PersistentIdentifier.Type.HANDLE, pid);
         } catch (VirtualCollectionRegistryException e) {
             throw new RuntimeException("failed to create handle", e);

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/pid/PersistentIdentifier.java

@@ -27 +27 @@
 
     public static enum Type {
-        DUMMY, GWDG;
-    } // public enum Type
-
+        DUMMY, HANDLE;
+    } 
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
@@ -95 +94 @@
         case DUMMY:
             return "dummy:identifier-" + vc.getId();
-        case GWDG:
+        case HANDLE:
             return "http://hdl.handle.net/" + identifier;
         default:

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/pid/PersistentIdentifierProvider.java

@@ -7 +7 @@
 
 public abstract interface PersistentIdentifierProvider {
-    public static final String BASE_URI       = "pid_provider.base_uri";
-    public static final String PROVIDER_CLASS = "pid_provider.class";
 
     PersistentIdentifier createIdentifier(VirtualCollection vc)
@@ -19 +17 @@
             throws VirtualCollectionRegistryException;
 
-} 
+}

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/webapp/WEB-INF/applicationContext.xml

@@ -16 +16 @@
     -->
     <context:component-scan base-package="eu.clarin.cmdi.virtualcollectionregistry" />
+    
+    <!--
+    Will enable reading properties from the servlet context (with fallback to a
+    packaged properties file). Used by EPIC persistent identifier provider.
+    -->
+    <bean class="org.springframework.web.context.support.ServletContextPropertyPlaceholderConfigurer">
+        <!--<property name="location" value="classpath:vcr-defaults.properties"/>-->
+    </bean>
 
     <!--