started migration to 2022

gbv · Oct 13, 2022 · 98e18cd · 98e18cd
1 parent 9afe5ad
commit 98e18cd
Show file tree

Hide file tree

Showing 15 changed files with 63 additions and 305 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -11,7 +11,7 @@ pipeline {
                not {
                    anyOf {
                         branch 'main'
-                        branch '2022.06'
+                        branch '2021.06.x'
                         branch '2022.06.x'
                    }
                }
@@ -27,7 +27,7 @@ pipeline {
             when {
                anyOf {
                     branch 'main'
-                    branch '2022.06'
+                    branch '2021.06.x'
                     branch '2022.06.x'
                }
             }

diff --git a/pom.xml b/pom.xml
@@ -23,10 +23,10 @@
   <parent>
     <groupId>de.gbv.reposis</groupId>
     <artifactId>reposis_mir_parent</artifactId>
-    <version>2021.06-SNAPSHOT</version>
+    <version>2022.06-SNAPSHOT</version>
   </parent>
   <artifactId>reposis_openagrar</artifactId>
-  <version>2021.06-SNAPSHOT</version>
+  <version>2022.06-SNAPSHOT</version>
   <name>Open Agrar</name>
   <properties>
     <MCR.AppName>openagrar</MCR.AppName>
@@ -88,22 +88,10 @@
       <groupId>jakarta.servlet</groupId>
       <artifactId>jakarta.servlet-api</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.jdom</groupId>
-      <artifactId>jdom2</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.mycore</groupId>
       <artifactId>mycore-base</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.mycore</groupId>
-      <artifactId>mycore-mods</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.mycore</groupId>
       <artifactId>mycore-pi</artifactId>

diff --git a/src/main/java/org/mycore/mir/metrics/MCRUpdateScopusMetricsEventHandler.java b/src/main/java/org/mycore/mir/metrics/MCRUpdateScopusMetricsEventHandler.java
diff --git a/src/main/resources/META-INF/resources/editor/editor-customization.xed b/src/main/resources/META-INF/resources/editor/editor-customization.xed
@@ -393,7 +393,7 @@
         <xed:output i18n="component.mods.metaData.dictionary.refereed" />
       </label>
       <div class="col-md-6">
-        <xed:bind xpath="mods:extension[@displayLabel='characteristics']/chars/@refereed">
+        <xed:bind xpath="mods:extension[@type='characteristics']/chars/@refereed">
           <select class="form-control" style="font-weight:bold;">
             <option value="">
               <xed:output i18n="mir.select.optional" />
@@ -437,7 +437,7 @@
               <xed:output value="'SNIP'" />
             </label>
           </div>
-          <xed:repeat xpath="mods:extension[@displayLabel='metrics']/journalMetrics/metric[@type='SNIP']/value">
+          <xed:repeat xpath="mods:extension[@type='metrics']/journalMetrics/metric[@type='SNIP']/value">
             <div class="row">
               <label class="col-md-2 offset-md-3">
                 <xed:bind xpath="@year">
@@ -460,7 +460,7 @@
               <xed:output value="'SJR'" />
             </label>
           </div>
-          <xed:repeat xpath="mods:extension[@displayLabel='metrics']/journalMetrics/metric[@type='SJR']/value">
+          <xed:repeat xpath="mods:extension[@type='metrics']/journalMetrics/metric[@type='SJR']/value">
             <div class="row">
               <label class="col-md-2 offset-md-3">
                 <xed:bind xpath="@year">
@@ -621,7 +621,7 @@
   </xed:template>
 
   <xed:template id="oa.cleanup-rules">
-    <xed:cleanup-rule xpath="//mods:extension[@displayLabel='metrics']" relevant-if="(string-length(journalMetrics/metric/value/text()) &gt; 0) " />
+    <xed:cleanup-rule xpath="//mods:extension[@type='metrics']" relevant-if="(string-length(journalMetrics/metric/value/text()) &gt; 0) " />
   </xed:template>
 
 </xed:template>

diff --git a/src/main/resources/config/reposis_openagrar/mycore.properties b/src/main/resources/config/reposis_openagrar/mycore.properties
@@ -44,7 +44,7 @@
   MCR.URIResolver.xslIncludes.mycoreobjectXML=%MCR.URIResolver.xslIncludes.mycoreobjectXML%,modsextensionfilter.xsl
 
 # allow login only via https
-  MCR.user2.LoginHttpsOnly=true
+  MCR.user2.LoginHttpsOnly=false
 
 # specify citation styles
   MIR.citationStyles=apa,elsevier-harvard,springer-basic-author-date,din-1505-2
@@ -273,16 +273,25 @@ MCR.OAIDataProvider.MetadataFormat.oai_datacite.Schema=http://schema.datacite.or
 # MCR.ContentTransformer.mcr_error.Stylesheet=xsl/errorPage.xsl,%MCR.LayoutTransformerFactory.Default.Stylesheets%
 
 ##############################################################################
-# Scopus Import - SNIP SIP                                                   #
+# Metrics import                                                             #
 ##############################################################################
-MCR.EventHandler.MCRObject.010.Class=org.mycore.mir.metrics.MCRUpdateScopusMetricsEventHandler
+MCR.CLI.Classes.External=%MCR.CLI.Classes.External%,de.gbv.reposis.metrics.MCRMODSJournalMetricCommands
+
+MCR.EventHandler.MCRObject.010.Class=de.gbv.reposis.metrics.MCRUpdateJournalMetricsEventHandler
+
+MCR.MODS.Metrics.Provider.Scopus=de.gbv.reposis.metrics.scopus.MCRScopusMetricsProvider
+MCR.MODS.Metrics.Provider.WebOfScience=de.gbv.reposis.metrics.wos.MCRWOSMetricsProvider
 
 ##############################################################################
 # Crypt - Cipher                                                             #
 ##############################################################################
 MCR.Crypt.Cipher.jcr.class=org.mycore.crypt.MCRAESCipher
 MCR.Crypt.Cipher.jcr.KeyFile=%MCR.datadir%/cipher/keyjcr.secret
 
+MCR.Crypt.Cipher.jcr_intern.class=org.mycore.crypt.MCRAESCipher
+MCR.Crypt.Cipher.jcr_intern.KeyFile=%MCR.datadir%/cipher/keyjcr.secret
+MCR.Crypt.Cipher.jcr_intern.EnableACL=false
+
 ##############################################################################
 # Editor                                                                     #
 ##############################################################################
@@ -302,3 +311,9 @@ MCR.ACL.AccessKey.Strategy.AllowedSessionPermissionTypes=read,writedb
   MIR.ePuSta=show
 # URL of the graphprovider
   MIR.ePuSta.GraphProviderURL=https://www.openagrar.de/graphprovider/
+
+##############################################################################
+# Migration from 2021                                                        #
+##############################################################################
+MCR.MODS.Migration.CovertLabelList=metrics,characteristics
+
diff --git a/src/main/resources/xsl/editor/mir2xeditor.xsl b/src/main/resources/xsl/editor/mir2xeditor.xsl
@@ -673,7 +673,7 @@
   <xsl:template match="mir:JCREdit">
     <xsl:choose>
       <xsl:when test="acl:checkPermission('crypt:cipher:jcr','decrypt')">
-        <xed:repeat xpath="mods:extension[@displayLabel='metrics']/journalMetrics/metric[@type='JCR']/value">
+        <xed:repeat xpath="mods:extension[@type='metrics']/journalMetrics/metric[@type='JCR']/value">
           <div class="row">
             <label class="col-md-2 offset-md-3">
               <xed:bind xpath="@year">

diff --git a/src/main/resources/xsl/editor/oa-mods2xeditor.xsl b/src/main/resources/xsl/editor/oa-mods2xeditor.xsl
@@ -34,7 +34,7 @@
   <xsl:template match="mods:relatedItem/mods:name[@ID]">
   </xsl:template>
 
-  <xsl:template match="mods:extension[@displayLabel='metrics']/journalMetrics/metric[@type='JCR']/value">
+  <xsl:template match="mods:extension[@type='metrics']/journalMetrics/metric[@type='JCR']/value">
     <xsl:variable name="value" select="."/>
     <xsl:copy>
       <xsl:copy-of select="@*" />