Fixed some errors in the LREC paper. Small changes.

TLA-FLAT · May 15, 2016 · f36f8b8 · f36f8b8
1 parent 1709d78
commit f36f8b8
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 22 deletions.
diff --git a/deposit/DoorKeeper/src/main/java/nl/mpi/tla/flat/deposit/action/EasyBag.java b/deposit/DoorKeeper/src/main/java/nl/mpi/tla/flat/deposit/action/EasyBag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 menzowi
+ * Copyright (C) 2016 menzowi
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/deposit/DoorKeeper/src/main/java/nl/mpi/tla/flat/deposit/action/PackageAssembly.java b/deposit/DoorKeeper/src/main/java/nl/mpi/tla/flat/deposit/action/PackageAssembly.java
@@ -39,7 +39,7 @@ public class PackageAssembly extends AbstractAction {
     @Override
     public boolean perform(Context context) throws DepositException {
         try {
-            File dir = new File(getParameter("dir","./resources"));
+            File dir = new File(getParameter("dir","./data"));
             if (!dir.exists())
                  FileUtils.forceMkdir(dir);
             int downloads = 0;

diff --git a/deposit/DoorKeeper/src/test/resources/flat-deposit.xml b/deposit/DoorKeeper/src/test/resources/flat-deposit.xml
@@ -11,11 +11,13 @@
         <property name="epicUser" value="test"/>
         <property name="epicPassword" value="test"/>
         <property name="epicServer" value="http://www.pidconsortium.eu/"/>
-        <!--<property name="tlaHandlePrefix" value="11142"/>
+        <!--
+        <property name="tlaHandlePrefix" value="11142"/>
         <property name="tlaHandleAdminKeyFilePath" value="/flat/resources/admpriv.bin"/>
         <property name="tlaHandleAdminUserHandleIndex" value="300"/>
         <property name="tlaHandleAdminUserHandle" value="0.NA/11142"/>
-        <property name="tlaHandleAdminPassword" value="null"/>-->
+        <property name="tlaHandleAdminPassword" value="null"/>
+        -->
         <property name="fedoraUser" value="fedoraAdmin"/>
         <property name="fedoraPassword" value="fedora"/>
         <property name="fedoraServer" value="https://192.168.99.100:8443/fedora"/>
@@ -31,29 +33,43 @@
         <action name="assemble package" class="nl.mpi.tla.flat.deposit.action.PackageAssembly">
             <parameter name="dir" value="{$work}/data"/>
             <parameter name="prefix" value="{$epicPrefix}"/>
- 			<!--<parameter name="prefix" value="{$tlaHandlePrefix}"/>-->
+ 			<!--
+ 		    <parameter name="prefix" value="{$tlaHandlePrefix}"/>
+ 			-->
         </action>
         <action name="validate metadata" class="nl.mpi.tla.flat.deposit.action.Validate">
             <parameter name="rules" value="{$param-base}/policies/rules.sch"/>
         </action>
-	<!--<action name="validate resources" class="nl.mpi.tla.flat.deposit.action.FITS" classpath="{$fits}/*.jar:{$fits}/droid/*.jar:{$fits}/jhove/*.jar:{$fits}/mediainfo/*.jar:{$fits}/nzmetool/*.jar:{$fits}/nzmetool/adapters/*.jar:{$fits}/xml/nlnz:../../../target/doorkeeper-fits.jar">
+        <!--
+        <action name="validate resources" class="nl.mpi.tla.flat.deposit.action.FITS" classpath="{$fits}/*.jar:{$fits}/droid/*.jar:{$fits}/jhove/*.jar:{$fits}/mediainfo/*.jar:{$fits}/nzmetool/*.jar:{$fits}/nzmetool/adapters/*.jar:{$fits}/xml/nlnz:../../../target/doorkeeper-fits.jar">
         	<parameter name="fits_home" value="{$fitsFolder}"/>
         	<parameter name="mimetypes" value="{$param-base}/policies/fits-mimetypes.xml"/>
-        </action>-->
-        <!--<action name="quality assessment" class="nl.mpi.tla.flat.deposit.action.QualityAssessment"/>
-        <action name="manual evaluation" class="nl.mpi.tla.flat.deposit.action.Evaluate"/>-->
+        </action>
+        -->
+        <!--
+        <action name="quality assessment" class="nl.mpi.tla.flat.deposit.action.QualityAssessment"/>
+        <action name="manual evaluation" class="nl.mpi.tla.flat.deposit.action.Evaluate"/>
+        -->
         <action name="persist resources" class="nl.mpi.tla.flat.deposit.action.Persist">
             <parameter name="resourcesDir" value="{$work}/data"/>
             <parameter name="policyFile" value="{$param-base}/policies/persistence-policy.xml"/>
             <parameter name="xpathDatasetName" value="replace(//*[name()='MdSelfLink'], 'hdl:{$epicPrefix}/','')"/>
-            <!--<parameter name="xpathDatasetName" value="replace(//*[name()='MdSelfLink'], 'hdl:{$tlaHandlePrefix}/','')"/>-->
+            <!--
+            <parameter name="xpathDatasetName" value="replace(//*[name()='MdSelfLink'], 'hdl:{$tlaHandlePrefix}/','')"/>
+            -->
         </action>
-        <!--<action class="nl.mpi.tla.flat.deposit.action.Versions"/>-->
+        <!--
+        <action class="nl.mpi.tla.flat.deposit.action.Versions"/>
+        -->
         <action class="nl.mpi.tla.flat.deposit.action.HandleAssignment">
             <parameter name="prefix" value="{$epicPrefix}"/>
-	 		<!--<parameter name="prefix" value="{$tlaHandlePrefix}"/>-->
+	 		<!--
+ 		    <parameter name="prefix" value="{$tlaHandlePrefix}"/>
+	 		-->
         </action>
-        <!--<action class="nl.mpi.tla.flat.deposit.action.Relate"/>-->
+        <!--
+        <action class="nl.mpi.tla.flat.deposit.action.Relate"/>
+        -->
         <action class="nl.mpi.tla.flat.deposit.action.CreateFOX">
             <parameter name="cmd2dc" value="{$param-base}/policies/cmd2dc.xsl"/>
             <parameter name="cmd2fox" value="{$param-base}/../../../../../docker/flat/flat/LAT2FOX/src/main/resources/cmd2fox.xsl"/>
@@ -62,40 +78,49 @@
         </action>
         <action class="nl.mpi.tla.flat.deposit.action.EasyBag">
             <parameter name="bags" value="{$bags}"/>
+            <!-- FOX (to get DC from) needs to be available -->
             <parameter name="foxes" value="{$work}/fox"/>
-            <parameter name="dataset" value="/Users/menzowi/Documents/Temp/bag/test-flat-easy/metadata/dataset.xml"/>
             <parameter name="creator" value="{$param-base}/policies/easy-bag-creator.xml"/>
-            <parameter name="files" value="/Users/menzowi/Documents/Temp/bag/test-flat-easy/metadata/files.xml"/>
+            <!-- 
+            <parameter name="audience" value="..."/>
+            <parameter name="accessRights" value="..."/>
+            -->
         </action>
         <action class="nl.mpi.tla.flat.deposit.action.Deposit">
             <parameter name="fedoraServer" value="{$fedoraServer}"/>
             <parameter name="fedoraUser" value="{$fedoraUser}"/>
             <parameter name="fedoraPassword" value="{$fedoraPassword}"/>
             <parameter name="dir" value="{$work}/fox"/>
         </action>
-        <!--<action class="nl.mpi.tla.flat.deposit.action.ACL"/>-->
+        <!--
+        <action class="nl.mpi.tla.flat.deposit.action.ACL"/>
+        -->
         <action class="nl.mpi.tla.flat.deposit.action.HandleCreation">
             <parameter name="fedoraServer" value="{$fedoraServer}"/>
             <parameter name="epicServer" value="{$epicServer}"/>
             <parameter name="epicPrefix" value="{$epicPrefix}"/>
             <parameter name="epicUser" value="{$epicUser}"/>
             <parameter name="epicPassword" value="{$epicPassword}"/>
         </action>
-        <!--<action class="nl.mpi.tla.flat.deposit.action.TLAHandleCreation">
+        <!--
+        <action class="nl.mpi.tla.flat.deposit.action.TLAHandleCreation">
         	<parameter name="fedoraServer" value="{$fedoraServer}"/>
         	<parameter name="handlePrefix" value="{$tlaHandlePrefix}"/>
         	<parameter name="handleAdminKeyFilePath" value="{$tlaHandleAdminKeyFilePath}"/>
         	<parameter name="handleAdminUserHandleIndex" value="{$tlaHandleAdminUserHandleIndex}"/>
         	<parameter name="handleAdminUserHandle" value="{$tlaHandleAdminUserHandle}"/>
         	<parameter name="handleAdminPassword" value="{$tlaHandleAdminPassword}"/>
-        </action>-->
-        <!--<action class="nl.mpi.tla.flat.deposit.action.Index"/>
-        <action class="nl.mpi.tla.flat.deposit.action.WorkspaceCleanup"/>-->        
+        </action>
+        -->
+        <!--
+        <action class="nl.mpi.tla.flat.deposit.action.Index"/>
+        <action class="nl.mpi.tla.flat.deposit.action.WorkspaceCleanup"/>
+        -->        
     </main>
     <exception>
-<!--
+        <!--
         <action name="log" class="nl.mpi.tla.flat.deposit.action.Log"/>
--->
+        -->
     </exception>
     <final>
         <action id="logSetup" name="log" class="nl.mpi.tla.flat.deposit.action.WorkspaceLogCleanup"/>        

diff --git a/documents/2016-LREC-FLAT.pdf b/documents/2016-LREC-FLAT.pdf