Merge branch 'develop' into 3353-batch-job-import

Resolved Conflicts:
	src/main/java/edu/harvard/iq/dataverse/authorization/providers/builtin/DataverseUserPage.java

.gitignore

@@ -16,10 +16,14 @@ ehthumbs.db
 Thumbs.db
 .vagrant
 *.pyc
+*.swp
 scripts/api/py_api_wrapper/demo-data/*
 scripts/api/py_api_wrapper/test_data/*
 scripts/api/py_api_wrapper/local-data/*
 doc/sphinx-guides/build
 faces-config.NavData
 src/main/java/BuildNumber.properties
-/nbproject/
+/nbproject/
+oauth-credentials.md
+
+/src/main/webapp/oauth2/newAccount.html

conf/httpd/conf.d/dataverse.conf

@@ -9,11 +9,11 @@ ProxyPassMatch ^/error-documents !
 # pass everything else to Glassfish
 ProxyPass / ajp://localhost:8009/
 
-<Location /shib.xhtml>
-  AuthType shibboleth
-  ShibRequestSetting requireSession 1
-  require valid-user
-</Location>
+#<Location /shib.xhtml>
+#  AuthType shibboleth
+#  ShibRequestSetting requireSession 1
+#  require valid-user
+#</Location>
 
 ErrorDocument 503 /error-documents/503.html
 Alias /error-documents /var/www/dataverse/error-documents

doc/Architecture/update-user-account-info.puml

@@ -0,0 +1,28 @@
+@startuml
+actor user
+participant DataverseUserPage as page
+participant "provider: AuthenticationProvider" as prv
+participant AuthenticationServiceBean as authSvc
+user --> page: HTTP GET
+== page init ==
+...
+page -> authSvc : lookupProvider(session.user)
+activate authSvc
+page <-- authSvc: provider
+deactivate authSvc
+...
+
+== Can Update User? ==
+page -> prv: isUserInfoUpdateAllowed()
+activate prv
+page <-- prv: true/false
+deactivate prv
+...
+
+== Save User ==
+user --> page: save()
+page -> page: udi = createUserDisplayInfo()
+page -> prv: updateUserInfo( udi )
+page -> authSvc: updateAuthentictedUser( session.user, udi )
+
+@enduml

doc/sphinx-guides/source/_static/installation/files/etc/shibboleth/shibAuthProvider.json

@@ -0,0 +1,5 @@
+{
+    "id":"shib",
+    "factoryAlias":"shib",
+    "enabled":true
+}

doc/sphinx-guides/source/_static/installation/files/root/auth-providers/github.json

@@ -0,0 +1,8 @@
+{
+    "id":"github",
+    "factoryAlias":"oauth2",
+    "title":"GitHub",
+    "subtitle":"",
+    "factoryData":"type: github | userEndpoint: NONE | clientId: FIXME | clientSecret: FIXME",
+    "enabled":true
+}

doc/sphinx-guides/source/_static/installation/files/root/auth-providers/google.json

@@ -0,0 +1,8 @@
+{
+    "id":"google",
+    "factoryAlias":"oauth2",
+    "title":"Google",
+    "subtitle":"",
+    "factoryData":"type: google | userEndpoint: NONE | clientId: FIXME | clientSecret: FIXME",
+    "enabled":true
+}

doc/sphinx-guides/source/_static/installation/files/root/auth-providers/orcid.json

@@ -0,0 +1,8 @@
+{
+    "id":"orcid",
+    "factoryAlias":"oauth2",
+    "title":"ORCID",
+    "subtitle":"",
+    "factoryData":"type: orcid | userEndpoint: https://api.orcid.org/v1.2/{ORCID}/orcid-profile | clientId: FIXME | clientSecret: FIXME",
+    "enabled":true
+}

doc/sphinx-guides/source/api/apps.rst

@@ -1,7 +1,7 @@
 Apps
 ====
 
-The introduction of Dataverse APIs has fostered the development of apps that are listed at http://datascience.iq.harvard.edu/collaborations
+The introduction of Dataverse APIs has fostered the development of apps that are listed at http://dataverse.org/integrations
 
 The apps below are open source, demonstrating how to use Dataverse APIs. Some of these apps (and others) are built on :doc:`/api/client-libraries` that are available for Dataverse APIs.
 
@@ -40,7 +40,7 @@ https://github.com/CenterForOpenScience/osf.io/tree/master/website/addons/datave
 GeoConnect
 ~~~~~~~~~~
 
-GeoConnect allows Dataverse files to be visualized on http://worldmap.harvard.edu with a "Map It" button.
+GeoConnect allows Dataverse files to be visualized on http://worldmap.harvard.edu with the "Explore" button. Read more about it in the :doc:`/user/data-exploration/worldmap` section of the User Guide.
 
 https://github.com/IQSS/geoconnect
 

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

@@ -13,6 +13,8 @@ APIs. In 4.0, we require to get a token, by simply registering for a Dataverse a
 
 Rather than using a production installation of Dataverse, API users are welcome to use http://demo.dataverse.org for testing.
 
+Please note that the APIs in this guide are shipped with the Dataverse software itself but additional APIs are available if you install the "miniverse" application from https://github.com/IQSS/miniverse and give it read only access to your production Dataverse database. http://dataverse.org/metrics is powered by miniverse.
+
 Contents:
 
 .. toctree::