Merge branch 'develop' into 24-add-DataCite-DOI-Support

CONTRIBUTING.md

@@ -70,7 +70,7 @@ The source for the documentation at http://guides.dataverse.org is in the GitHub
 
 ## Code/Pull Requests
 
-To get started developing code for Dataverse, please read our Developer's Guide at http://guides.dataverse.org/en/latest/developers
+To get started developing code for Dataverse, please read our Developer Guide at http://guides.dataverse.org/en/latest/developers
 
 [doc]: https://github.com/IQSS/dataverse/tree/master/doc/sphinx-guides/source
 

doc/sphinx-guides/source/_templates/navbar.html

@@ -53,7 +53,7 @@
                         <li><a target="_blank" href="http://guides.dataverse.org/en/latest/user/index.html">User Guide</a></li>
                         <li><a target="_blank" href="http://guides.dataverse.org/en/latest/installation/index.html">Installation Guide</a></li>
                         <li><a target="_blank" href="http://guides.dataverse.org/en/latest/api/index.html">API Guide</a></li>
-                        <li><a target="_blank" href="http://guides.dataverse.org/en/latest/developers/index.html">Developers Guide</a></li>
+                        <li><a target="_blank" href="http://guides.dataverse.org/en/latest/developers/index.html">Developer Guide</a></li>
                     </ul>
                 </li>
                 <li>

doc/sphinx-guides/source/developers/branching-strategy.rst

@@ -2,6 +2,8 @@
 Branching Strategy
 ==================
 
+Please note! The text below reflects the branching strategy for Dataverse 4.2.3 and below but this is under review. For updates please follow https://github.com/IQSS/dataverse/issues/2863
+
 Goals
 -----
 

doc/sphinx-guides/source/developers/index.rst

@@ -3,7 +3,7 @@
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 
-Developers' Guide
+Developer Guide
 =======================================================
 
 Contents:

doc/sphinx-guides/source/developers/making-releases.rst

@@ -2,6 +2,8 @@
 Making Releases
 ===============
 
+Please note! The text below reflects the :doc:`/developers/branching-strategy` for Dataverse 4.2.3 and below but this is under review. For updates, please follow https://github.com/IQSS/dataverse/issues/2863
+
 Bump Version Numbers
 --------------------
 

doc/sphinx-guides/source/index.rst

@@ -23,11 +23,11 @@ How the Guides Are Organized
 
 The Guides are reference documents that explain how to use Dataverse,
 which are divided into the following sections: User Guide,
-Installation Guide, Developers Guide, and API Guide. The User Guide is further divided into primary activities: finding & using
+Installation Guide, Developer Guide, and API Guide. The User Guide is further divided into primary activities: finding & using
 data, adding Datasets, administering dataverses or Datasets, and Dataset exploration/visualizations. Details
 on all of the above tasks can be found in the Users Guide. The
 Installation Guide is for people or organizations who want to host their
-own Dataverse. The Developers Guide contains instructions for
+own Dataverse. The Developer Guide contains instructions for
 people who want to contribute to the Open Source Dataverse
 project or who want to modify the code to suit their own needs. Finally, the API Guide is for
 Developers that work on other applications and are interested in connecting with Dataverse through our APIs.

doc/sphinx-guides/source/user/data-exploration/tworavens.rst

@@ -11,7 +11,7 @@ The left panel contains two sets of buttons: (1) Original Data and Subset Data;
 
 Original Data and Subset Data:
 ------------------------------
-When sola Fide is initiated, you begin with the original dataset, and thus the Original Data button is selected.  You will not be able to select the Subset Data until you have subsetted the data using the subset and select features in the right panel.  After you have selected a subset of your data, you may toggle between that subset and the original data.  If you wish to select a different subset, you may do so, but note that only one subset is supported at a time.
+When TwoRavens is initiated, you begin with the original dataset, and thus the Original Data button is selected.  You will not be able to select the Subset Data until you have subsetted the data using the subset and select features in the right panel.  After you have selected a subset of your data, you may toggle between that subset and the original data.  If you wish to select a different subset, you may do so, but note that only one subset is supported at a time.
 
 Variables, Models, and Summary: 
 -------------------------------

pom.xml

@@ -317,6 +317,17 @@
             <artifactId>jacoco-maven-plugin</artifactId>
             <version>0.7.5.201505241946</version>
         </dependency>
+        <!-- Added for DataCite -->
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.4.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpcore</artifactId>
+            <version>4.4.1</version>
+        </dependency>
 
     </dependencies>
 

src/main/java/Bundle.properties

@@ -63,7 +63,7 @@ header.about=About
 header.support=Support
 header.guides=Guides
 header.guides.user=User Guide
-header.guides.developers=Developers Guide
+header.guides.developer=Developer Guide
 header.guides.installation=Installation Guide
 header.guides.api=API Guide
 header.signUp=Sign Up

src/main/java/edu/harvard/iq/dataverse/DOIDataCiteRegisterCache.java

@@ -0,0 +1,90 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package edu.harvard.iq.dataverse;
+
+
+import java.io.Serializable;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Lob;
+import javax.persistence.NamedQueries;
+import javax.persistence.NamedQuery;
+import org.hibernate.validator.constraints.NotBlank;
+
+/**
+ *
+ * @author luopc
+ */
+@NamedQueries(
+        @NamedQuery( name="DOIDataCiteRegisterCache.findByDoi",
+                     query="SELECT d FROM DOIDataCiteRegisterCache d WHERE d.doi=:doi")
+)
+@Entity
+public class DOIDataCiteRegisterCache implements Serializable{
+
+    private static final long serialVersionUID = 8030143094734315681L;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @NotBlank
+    @Column(unique=true)
+    private String doi;
+
+    @NotBlank
+    private String url;
+
+    @NotBlank
+    private String status;
+
+    @NotBlank
+    @Lob
+    private String xml;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getDoi() {
+        return doi;
+    }
+
+    public void setDoi(String doi) {
+        this.doi = doi;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getXml() {
+        return xml;
+    }
+
+    public void setXml(String xml) {
+        this.xml = xml;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+}