Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

suggestion update the codemeta metadata block to add some more structure for machine actionability #11084

Closed
Changes from 1 commit
Commits
Show all changes
140 commits
Select commit Hold shift + click to select a range
91ddec7
added endpoint as config parameter
Aug 17, 2018
6d8310e
merged cleaning of unused imports and endcustom endpoint configuration
Dec 10, 2018
bc09b08
added custom dir for branding pics
Jan 11, 2019
536351a
Merge pull request #16 from TIK-NFL/custom_pics
aseeland Jan 14, 2019
709b367
Generating of One-Time-URL for uploading big data directly to S3-stro…
May 20, 2019
396059a
Endpoint for bigDataUpload ready
May 24, 2019
af1622b
logs for debugging removed
May 27, 2019
e55ec43
OneTimeUrls will be deleted after 90 min
May 28, 2019
b7f0dbb
Quartz scheduler for deleting expired urls
May 31, 2019
712ea83
Endpoint for S3 to notify when data is uploaded
Jul 1, 2019
a215aac
Bug fixes; now everything should work
Aug 2, 2019
2abcbfa
Merge pull request #17 from isabellakutger/s3url
aseeland Aug 14, 2019
c9a260b
merged tag v4.15.1; used upstream custom s3 config
Aug 14, 2019
89e5a1f
merged s3url branch from isabella
Aug 14, 2019
2ab1479
Revert "added custom dir for branding pics"
Aug 15, 2019
0dc4435
replaced logo and text properties of cc0 to ccby; CC0 is NOT changed …
aseeland Aug 15, 2019
1d5a83b
Get direct S3 upload endpoints
aseeland Aug 15, 2019
16479fe
Getting CC BY license instead of CC0 as default
aseeland Aug 15, 2019
c515b80
:fix: exporting and importing metadata showed/allowed CC0. Now CC0 th…
aseeland Oct 17, 2019
3b42a99
merged v4.17 into branch; fixed conflicts in bundles.property and lic…
aseeland Oct 17, 2019
574d472
merged improvement of cc by branch; fixed conflict in datasets.java (…
aseeland Oct 17, 2019
98bc180
added the advice to prefix a dataverse identifier with the instituti…
aseeland Oct 17, 2019
ac97071
Merge branch 'institutional_namespace' into staging
aseeland Oct 17, 2019
bb2027d
Merge tag 'v4.20' into cc_by_waiver
Apr 15, 2020
63073ff
merge conflict with v4.20
doigl Apr 15, 2020
6c29c1f
preparation for update
Apr 21, 2020
179433b
reverted changes from object_storage branch by creating a diff and ap…
Apr 21, 2020
b330799
CC BY instead of CC 0 in testExportDDI
doigl Apr 27, 2020
ef9ca41
Merge tag 'v5.2' into cc_by_waiver
doigl Nov 24, 2020
5e017bc
Merge tag 'v5.2' into institutional_namespace
doigl Nov 24, 2020
f2a0f66
merged again v4.20 tag to get upstream history back
Feb 26, 2021
6c30418
Merge tag 'v5.4.1' into cc_by_waiver
Apr 26, 2021
fb211cf
Merge tag 'v5.4.1' into institutional_namespace
Apr 26, 2021
ddf5da8
merged tag v5.4.1 from upstream; solved conflict in .gitignore
Apr 29, 2021
85025f1
add utf-8 encoding to bibtex export
aseeland Apr 30, 2021
77410f9
Merge branch 'bibtex_export_fix' into update_v5.4.1
aseeland Apr 30, 2021
c646792
Merge tag 'v5.5' into update_v5.5
aseeland Jun 10, 2021
2feb4db
Merge pull request #18 from TIK-NFL/update_v5.5
aseeland Jul 28, 2021
7519b88
Added Primary Data Handling file format
aseeland Jan 31, 2022
26e41f1
Merge tag 'v5.9' into institutional_namespace
aseeland Jan 31, 2022
19da2a4
Merge tag 'v5.9' into cc_by_waiver
aseeland Jan 31, 2022
6379fd2
Merge branch 'cc_by_waiver' into update_v5.9
aseeland Jan 31, 2022
e3ffae9
Merge branch 'our_mime_types' into update_v5.9
aseeland Jan 31, 2022
e07ba47
Added prefix to overwrite MIME type detection
aseeland Feb 15, 2022
510e14c
Merge branch 'overwrite_mimetype' into update_v5.9
aseeland Feb 15, 2022
247ab07
Merge pull request #19 from TIK-NFL/update_v5.9
dpx9fR Feb 16, 2022
dca5e4e
Added link to more information to vocabularies in metadata form
aseeland Oct 1, 2022
b319f82
added type attr for ordered lists; added style attr for images for re…
aseeland Oct 1, 2022
f32eabf
Change publication lock message to inform about FoKUS review
aseeland Oct 10, 2022
e87bb42
Revert "CC BY instead of CC 0 in testExportDDI"
aseeland Oct 10, 2022
d4163c6
Revert ":fix: exporting and importing metadata showed/allowed CC0. No…
aseeland Oct 10, 2022
6ca1aad
Revert "replaced logo and text properties of cc0 to ccby; CC0 is NOT …
aseeland Oct 10, 2022
fcbc9fc
reverted parts of commit 19da2e4 (merge commit v5.9) that solved conf…
aseeland Oct 10, 2022
dfcab22
Merge tag 'v5.12' into institutional_namespace
aseeland Oct 10, 2022
c071730
Merge tag 'v5.12' into our_mime_types
aseeland Oct 10, 2022
a32ab21
Merge tag 'v5.12' into customize_ui
aseeland Oct 10, 2022
d9cbcb6
Merge tag 'v5.12' into relaxed_markup-checker
aseeland Oct 10, 2022
9df2180
Merge tag 'v5.12' into overwrite_mimetype
aseeland Oct 10, 2022
bd52cb1
Merge tag 'v5.12' into update_v5.12
aseeland Oct 10, 2022
a60fadb
Merge branch 'relaxed_markup-checker' into update_v5.12
aseeland Oct 10, 2022
bf22988
add link to publication checklist also for 1st level review message
aseeland Dec 23, 2022
f3dcd56
Merge tag 'v5.12.1' into customize_ui
aseeland Dec 23, 2022
bc5bb27
local test of idp switch
aseeland Dec 23, 2022
5cee686
Merge tag 'v5.12.1' into overwrite_mimetype
aseeland Dec 23, 2022
d723d2c
Merge tag 'v5.12.1' into relaxed_markup-checker
aseeland Dec 23, 2022
1215dd6
Merge tag 'v5.12.1' into our_mime_types
aseeland Dec 23, 2022
a9d777d
Merge tag 'v5.12.1' into institutional_namespace
aseeland Dec 23, 2022
edb3754
Merge branch 'customize_ui' into update_v5.12.1
aseeland Dec 23, 2022
3521e16
Merge branch 'our_mime_types' into update_v5.12.1
aseeland Dec 23, 2022
a17cea7
Merge branch 'staging' into update_v5.12.1
aseeland Jun 2, 2023
6254833
Merge pull request #20 from TIK-NFL/update_v5.12.1
aseeland Jun 2, 2023
389da18
Merge tag 'v5.13' into institutional_namespace
bjosel Jun 15, 2023
2a1c3a0
Rebase to v5.13
bjosel Jun 15, 2023
c9a21a9
Rebase to v5.13
bjosel Jun 15, 2023
a928538
Rebase to v5.13
bjosel Jun 15, 2023
b03a31f
Rebase to v5.13
bjosel Jun 15, 2023
4731cd9
rollback the external system workflow
ffritze Nov 10, 2023
5c8376f
utf-8 support added
bjosel Nov 28, 2023
060eccc
7z=application/x-7z-compressed
bjosel Nov 28, 2023
c822731
/*
bjosel Nov 28, 2023
05539ea
Update Bundle.properties
bjosel Nov 28, 2023
5c54316
Merge with all FoKUS patches
bjosel Nov 28, 2023
f5d1299
Merge pull request #10178 from IQSS/develop
landreev Dec 12, 2023
9c0ba27
Added beta previewers to Bundle properties
bjosel Dec 18, 2023
95e2b79
Revert to dynamic 404 page style
bjosel Dec 19, 2023
df557fb
properties for metadata schemes added.
bjosel Jan 5, 2024
d0ca2fa
Update to v6.0
bjosel Jan 5, 2024
e3969f7
Fixed properties files
bjosel Jan 15, 2024
e8325d5
rollback the external system workflow
ffritze Nov 10, 2023
3a68fcd
Removed license checker
bjosel Jan 15, 2024
08ebc6c
Added Rollback patch and potential fix for blocked refresh when pubfl…
bjosel Jan 16, 2024
de7090c
Merge branch 'update_v6.1' into institutional_namespace
bjosel Jan 17, 2024
5585114
Merge branch 'update_v6.1' into workflow_rollback
bjosel Jan 17, 2024
7a5e618
Merge branch 'update_v6.1' into our_mime_types
bjosel Jan 17, 2024
5e16bc5
Merge branch 'update_v6.1' into relaxed_markup-checker
bjosel Jan 17, 2024
aaaff36
Merge branch 'update_v6.1' into customize_ui
bjosel Jan 17, 2024
02cc039
Sync with dataverse v6.1
bjosel Jan 17, 2024
2abf777
Merge branch 'v6.0_upstream' into overwrite_mimetype
bjosel Jan 17, 2024
3f1df5d
Sync to upstream version 6.1
bjosel Jan 17, 2024
c3e0997
Fix to display customized help page.
bjosel Jan 17, 2024
eecdeec
Add externaltools to prevent error messages in log.
bjosel Jan 17, 2024
e052adc
Revert "Add externaltools to prevent error messages in log."
bjosel Jan 17, 2024
cd123b1
delete white space
bjosel Mar 13, 2024
a218417
Merge pull request #10453 from IQSS/develop
landreev Apr 1, 2024
626cb70
revert to upstream
bjosel Apr 3, 2024
c020dcb
Merge branch 'v6.2_upstream' into customize_ui
bjosel Apr 3, 2024
fe76fc5
Merge branch 'v6.2_upstream' into institutional_namespace
bjosel Apr 3, 2024
74e7d26
Merge branch 'v6.2_upstream' into our_mime_types
bjosel Apr 3, 2024
43eac02
Merge branch 'v6.2_upstream' into workflow_rollback
bjosel Apr 3, 2024
65e8986
Merge branch 'v6.2_upstream' into relaxed_markup-checker
bjosel Apr 3, 2024
6e274e6
Merge branch 'v6.2_upstream' into develop
bjosel Apr 5, 2024
3c2d297
Merge branch 'fix_export_version' into develop
bjosel Apr 5, 2024
556869d
Merge branch 'v6.1_upstream' into overwrite_mimetype
bjosel Apr 11, 2024
36c1cac
Refactor mime-type patch
bjosel Apr 11, 2024
b4c4e95
Merge branch 'v6.2_upstream' into overwrite_mimetype
bjosel Apr 11, 2024
1b30aca
Merge branch 'overwrite_mimetype' into develop
bjosel Apr 15, 2024
c36637b
Merge branch 'update_v6.2' into staging
bjosel Apr 26, 2024
8c99a74
Merge pull request #10664 from IQSS/develop
pdurbin Jul 3, 2024
38d8881
Merge branch 'v6.3_upstream' into institutional_namespace
bjosel Jul 5, 2024
378751e
Merge branch 'v6.3_upstream' into our_mime_types
bjosel Jul 5, 2024
cd4023c
Merge branch 'v6.3_upstream' into workflow_rollback
bjosel Jul 5, 2024
7c3f6e3
Merge branch 'v6.3_upstream' into overwrite_mimetype
bjosel Jul 5, 2024
f978592
Merge branch 'v6.3_upstream' into relaxed_markup-checker
bjosel Jul 5, 2024
9fe4639
Merge branch 'v6.3_upstream' into customize_ui
bjosel Jul 5, 2024
b7123a5
Initial commit for feature branch properties
bjosel Jul 15, 2024
d62eb50
Merge branch 'properties' into update_v6.3
bjosel Jul 15, 2024
d3149b2
Merge branch 'our_mime_types' into update_v6.3
bjosel Jul 15, 2024
14990b9
Merge branch 'workflow_rollback' into update_v6.3
bjosel Jul 15, 2024
b736a23
Merge branch 'overwrite_mimetype' into update_v6.3
bjosel Jul 16, 2024
136beee
Merge branch 'relaxed_markup-checker' into update_v6.3
bjosel Jul 16, 2024
54f7878
Merge branch 'customize_ui' into update_v6.3
bjosel Jul 16, 2024
bb927f5
Changed descriptions
bjosel Jul 31, 2024
a58c6b1
Description of topicClassification corrected
bjosel Jul 31, 2024
88937eb
Properties adapted to tsv
bjosel Aug 1, 2024
9465360
Sync to version on staging and production
bjosel Aug 1, 2024
61dfcd8
Merge confict solved
bjosel Aug 1, 2024
cf245f7
Fixes in properties
bjosel Aug 1, 2024
34a7a6e
Add PR 10797, 10820 from upstream.
bjosel Sep 12, 2024
31f5a11
Update v6.4 (#21)
bjosel Nov 19, 2024
175d598
added subfields and controlled vocabularies for memoryRequirements an…
doigl Dec 11, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Prev Previous commit
Next Next commit
preparation for update
seeland committed Apr 21, 2020
commit 6c29c1f0977ac9366924f0291de30c31b6c6910f
15 changes: 15 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
**What this PR does / why we need it**:

**Which issue(s) this PR closes**:

Closes #

**Special notes for your reviewer**:

**Suggestions on how to test this**:

**Does this PR introduce a user interface change?**:

**Is there a release notes update needed for this change?**:

**Additional documentation**:
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -60,3 +60,4 @@ scripts/installer/default.config
tests/node_modules
tests/package-lock.json
venv
/build/
76 changes: 76 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
# Contributor Covenant Code of Conduct

## Our Pledge

In the interest of fostering an open and welcoming environment, we as
contributors and maintainers pledge to making participation in our project and
our community a harassment-free experience for everyone, regardless of age, body
size, disability, ethnicity, sex characteristics, gender identity and expression,
level of experience, education, socio-economic status, nationality, personal
appearance, race, religion, or sexual identity and orientation.

## Our Standards

Examples of behavior that contributes to creating a positive environment
include:

* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members

Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery and unwelcome sexual attention or
advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic
address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting

## Our Responsibilities

Project maintainers are responsible for clarifying the standards of acceptable
behavior and are expected to take appropriate and fair corrective action in
response to any instances of unacceptable behavior.

Project maintainers have the right and responsibility to remove, edit, or
reject comments, commits, code, wiki edits, issues, and other contributions
that are not aligned to this Code of Conduct, or to ban temporarily or
permanently any contributor for other behaviors that they deem inappropriate,
threatening, offensive, or harmful.

## Scope

This Code of Conduct applies both within project spaces and in public spaces
when an individual is representing the project or its community. Examples of
representing a project or community include using an official project e-mail
address, posting via an official social media account, or acting as an appointed
representative at an online or offline event. Representation of a project may be
further defined and clarified by project maintainers.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting the project team at support at dataverse dot org. All
complaints will be reviewed and investigated and will result in a response that
is deemed necessary and appropriate to the circumstances. The project team is
obligated to maintain confidentiality with regard to the reporter of an incident.
Further details of specific enforcement policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good
faith may face temporary or permanent repercussions as determined by other
members of the project's leadership.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html

[homepage]: https://www.contributor-covenant.org

For answers to common questions about this code of conduct, see
https://www.contributor-covenant.org/faq
23 changes: 0 additions & 23 deletions PULL_REQUEST_TEMPLATE.md

This file was deleted.

5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -17,7 +17,10 @@ Dataverse is a trademark of President and Fellows of Harvard College and is regi

[![Dataverse Project logo](src/main/webapp/resources/images/dataverseproject_logo.jpg?raw=true "Dataverse Project")](http://dataverse.org)

[![Build Status](https://travis-ci.org/IQSS/dataverse.svg?branch=develop)](https://travis-ci.org/IQSS/dataverse) [![Coverage Status](https://coveralls.io/repos/IQSS/dataverse/badge.svg?branch=develop&service=github)](https://coveralls.io/github/IQSS/dataverse?branch=develop)
[![API Test Status](https://jenkins.dataverse.org/buildStatus/icon?job=IQSS-dataverse-develop&subject=API%20Test%20Status)](https://jenkins.dataverse.org/job/IQSS-dataverse-develop/)
[![API Test Coverage](https://img.shields.io/jenkins/coverage/jacoco?jobUrl=https%3A%2F%2Fjenkins.dataverse.org%2Fjob%2FIQSS-dataverse-develop&label=API%20Test%20Coverage)](https://jenkins.dataverse.org/job/IQSS-dataverse-develop/)
[![Unit Test Status](https://img.shields.io/travis/IQSS/dataverse?label=Unit%20Test%20Status)](https://travis-ci.org/IQSS/dataverse)
[![Unit Test Coverage](https://img.shields.io/coveralls/github/IQSS/dataverse?label=Unit%20Test%20Coverage)](https://coveralls.io/github/IQSS/dataverse?branch=develop)

[dataverse.org]: https://dataverse.org
[demo.dataverse.org]: https://demo.dataverse.org
6 changes: 3 additions & 3 deletions conf/docker-aio/0prep_deps.sh
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ if [ ! -e dv/deps/glassfish4dv.tgz ]; then
mkdir -p /tmp/dv-prep/gf
cd /tmp/dv-prep/gf
wget http://download.java.net/glassfish/4.1/release/glassfish-4.1.zip
wget http://search.maven.org/remotecontent?filepath=org/jboss/weld/weld-osgi-bundle/2.2.10.Final/weld-osgi-bundle-2.2.10.Final-glassfish4.jar -O weld-osgi-bundle-2.2.10.Final-glassfish4.jar
wget https://search.maven.org/remotecontent?filepath=org/jboss/weld/weld-osgi-bundle/2.2.10.Final/weld-osgi-bundle-2.2.10.Final-glassfish4.jar -O weld-osgi-bundle-2.2.10.Final-glassfish4.jar
unzip glassfish-4.1.zip
rm glassfish4/glassfish/modules/weld-osgi-bundle.jar
mv weld-osgi-bundle-2.2.10.Final-glassfish4.jar glassfish4/glassfish/modules
@@ -17,12 +17,12 @@ if [ ! -e dv/deps/glassfish4dv.tgz ]; then
# assuming that folks usually have /tmp auto-clean as needed
fi

if [ ! -e dv/deps/solr-7.3.1dv.tgz ]; then
if [ ! -e dv/deps/solr-7.7.2dv.tgz ]; then
echo "solr dependency prep"
# schema changes *should* be the only ones...
cd dv/deps/
#wget https://archive.apache.org/dist/lucene/solr/7.3.0/solr-7.3.0.tgz -O solr-7.3.0dv.tgz
wget https://archive.apache.org/dist/lucene/solr/7.3.1/solr-7.3.1.tgz -O solr-7.3.1dv.tgz
wget https://archive.apache.org/dist/lucene/solr/7.7.2/solr-7.7.2.tgz -O solr-7.7.2dv.tgz
cd ../../
fi

6 changes: 3 additions & 3 deletions conf/docker-aio/1prep.sh
Original file line number Diff line number Diff line change
@@ -4,9 +4,9 @@
# this was based off the phoenix deployment; and is likely uglier and bulkier than necessary in a perfect world

mkdir -p testdata/doc/sphinx-guides/source/_static/util/
cp ../solr/7.3.1/schema*.xml testdata/
cp ../solr/7.3.1/solrconfig.xml testdata/
cp ../solr/7.3.1/updateSchemaMDB.sh testdata/
cp ../solr/7.7.2/schema*.xml testdata/
cp ../solr/7.7.2/solrconfig.xml testdata/
cp ../solr/7.7.2/updateSchemaMDB.sh testdata/
cp ../jhove/jhove.conf testdata/
cp ../jhove/jhoveConfig.xsd testdata/
cd ../../
8 changes: 4 additions & 4 deletions conf/docker-aio/c7.dockerfile
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ COPY testdata/sushi_sample_logs.json /tmp/
COPY disableipv6.conf /etc/sysctl.d/
RUN rm /etc/httpd/conf/*
COPY httpd.conf /etc/httpd/conf
RUN cd /opt ; tar zxf /tmp/dv/deps/solr-7.3.1dv.tgz
RUN cd /opt ; tar zxf /tmp/dv/deps/solr-7.7.2dv.tgz
RUN cd /opt ; tar zxf /tmp/dv/deps/glassfish4dv.tgz

# this copy of domain.xml is the result of running `asadmin set server.monitoring-service.module-monitoring-levels.jvm=LOW` on a default glassfish installation (aka - enable the glassfish REST monitir endpoint for the jvm`
@@ -28,9 +28,9 @@ RUN sudo -u postgres /usr/pgsql-9.6/bin/initdb -D /var/lib/pgsql/data

# copy configuration related files
RUN cp /tmp/dv/pg_hba.conf /var/lib/pgsql/data/
RUN cp -r /opt/solr-7.3.1/server/solr/configsets/_default /opt/solr-7.3.1/server/solr/collection1
RUN cp /tmp/dv/schema*.xml /opt/solr-7.3.1/server/solr/collection1/conf/
RUN cp /tmp/dv/solrconfig.xml /opt/solr-7.3.1/server/solr/collection1/conf/solrconfig.xml
RUN cp -r /opt/solr-7.7.2/server/solr/configsets/_default /opt/solr-7.7.2/server/solr/collection1
RUN cp /tmp/dv/schema*.xml /opt/solr-7.7.2/server/solr/collection1/conf/
RUN cp /tmp/dv/solrconfig.xml /opt/solr-7.7.2/server/solr/collection1/conf/solrconfig.xml

# skipping glassfish user and solr user (run both as root)

5 changes: 5 additions & 0 deletions conf/docker-aio/configure_doi.bash
Original file line number Diff line number Diff line change
@@ -17,3 +17,8 @@ if [ ! -z "${doi_baseurl}" ]; then
doi_baseurl_esc=`echo ${doi_baseurl} | sed -e 's/:/\\:/'`
bin/asadmin create-jvm-options "\"-Ddoi.baseurlstring=${doi_baseurl_esc}\""
fi
if [ ! -z "${doi_mdcbaseurl}" ]; then
bin/asadmin delete-jvm-options "-Ddoi.mdcbaseurlstring=https\://api.test.datacite.org"
doi_mdcbaseurl_esc=`echo ${doi_mdcbaseurl} | sed -e 's/:/\\:/'`
bin/asadmin create-jvm-options "\"-Ddoi.mdcbaseurlstring=${doi_mdcbaseurl_esc}\""
fi
2 changes: 1 addition & 1 deletion conf/docker-aio/entrypoint.bash
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
export LANG=en_US.UTF-8
#sudo -u postgres /usr/bin/postgres -D /var/lib/pgsql/data &
sudo -u postgres /usr/pgsql-9.6/bin/postgres -D /var/lib/pgsql/data &
cd /opt/solr-7.3.1/
cd /opt/solr-7.7.2/
# TODO: Run Solr as non-root and remove "-force".
bin/solr start -force
bin/solr create_core -c collection1 -d server/solr/collection1/conf -force
2 changes: 1 addition & 1 deletion conf/docker-aio/run-test-suite.sh
Original file line number Diff line number Diff line change
@@ -8,4 +8,4 @@ fi

# Please note the "dataverse.test.baseurl" is set to run for "all-in-one" Docker environment.
# TODO: Rather than hard-coding the list of "IT" classes here, add a profile to pom.xml.
mvn test -Dtest=DataversesIT,DatasetsIT,SwordIT,AdminIT,BuiltinUsersIT,UsersIT,UtilIT,ConfirmEmailIT,FileMetadataIT,FilesIT,SearchIT,InReviewWorkflowIT,HarvestingServerIT,MoveIT,MakeDataCountApiIT,FileTypeDetectionIT,EditDDIIT,ExternalToolsIT -Ddataverse.test.baseurl=$dvurl
mvn test -Dtest=DataversesIT,DatasetsIT,SwordIT,AdminIT,BuiltinUsersIT,UsersIT,UtilIT,ConfirmEmailIT,FileMetadataIT,FilesIT,SearchIT,InReviewWorkflowIT,HarvestingServerIT,MoveIT,MakeDataCountApiIT,FileTypeDetectionIT,EditDDIIT,ExternalToolsIT,AccessIT -Ddataverse.test.baseurl=$dvurl
2 changes: 1 addition & 1 deletion conf/docker-aio/testscripts/install
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ export SMTP_SERVER=localhost
export MEM_HEAP_SIZE=2048
export GLASSFISH_DOMAIN=domain1
cd scripts/installer
cp pgdriver/postgresql-42.2.2.jar $GLASSFISH_ROOT/glassfish/lib
cp pgdriver/postgresql-42.2.9.jar $GLASSFISH_ROOT/glassfish/lib
#cp ../../conf/jhove/jhove.conf $GLASSFISH_ROOT/glassfish/domains/$GLASSFISH_DOMAIN/config/jhove.conf
cp /opt/dv/testdata/jhove.conf $GLASSFISH_ROOT/glassfish/domains/$GLASSFISH_DOMAIN/config/jhove.conf
cp /opt/dv/testdata/jhoveConfig.xsd $GLASSFISH_ROOT/glassfish/domains/$GLASSFISH_DOMAIN/config/jhoveConfig.xsd
2 changes: 1 addition & 1 deletion conf/docker/dataverse-glassfish/Dockerfile
Original file line number Diff line number Diff line change
@@ -70,7 +70,7 @@ RUN /tmp/dvinstall/glassfish-setup.sh
###glassfish-setup will handle everything in Dockerbuild

##install jdbc driver
RUN cp /tmp/dvinstall/pgdriver/postgresql-42.2.2.jar /usr/local/glassfish4/glassfish/domains/domain1/lib
RUN cp /tmp/dvinstall/pgdriver/postgresql-42.2.9.jar /usr/local/glassfish4/glassfish/domains/domain1/lib

# Customized persistence xml to avoid database recreation
#RUN mkdir -p /tmp/WEB-INF/classes/META-INF/
File renamed without changes.
14 changes: 13 additions & 1 deletion conf/solr/7.3.1/schema.xml → conf/solr/7.7.2/schema.xml
Original file line number Diff line number Diff line change
@@ -171,6 +171,12 @@
<field name="variableName" type="text_en" stored="true" indexed="true" multiValued="true"/>
<field name="variableLabel" type="text_en" stored="true" indexed="true" multiValued="true"/>

<field name="literalQuestion" type="text_en" stored="true" indexed="true" multiValued="true"/>
<field name="interviewInstructions" type="text_en" stored="true" indexed="true" multiValued="true"/>
<field name="postQuestion" type="text_en" stored="true" indexed="true" multiValued="true"/>
<field name="variableUniverse" type="text_en" stored="true" indexed="true" multiValued="true"/>
<field name="variableNotes" type="text_en" stored="true" indexed="true" multiValued="true"/>

<field name="fileDescription" type="text_en" stored="true" indexed="true" multiValued="false"/>

<field name="fileTypeGroupFacet" type="string" stored="true" indexed="true" multiValued="false"/>
@@ -229,6 +235,12 @@
<!-- Added for Dataverse 4.0 Beta: make variable names and labels searchable in basic search https://redmine.hmdc.harvard.edu/issues/3945 -->
<copyField source="variableName" dest="_text_" maxChars="3000"/>
<copyField source="variableLabel" dest="_text_" maxChars="3000"/>
<!-- Added variable level metadata that can be updated from DCT -->
<copyField source="literalQuestion" dest="_text_" maxChars="3000"/>
<copyField source="interviewInstructions" dest="_text_" maxChars="3000"/>
<copyField source="postQuestion" dest="_text_" maxChars="3000"/>
<copyField source="variableUniverse" dest="_text_" maxChars="3000"/>
<copyField source="variableNotes" dest="_text_" maxChars="3000"/>
<!-- Make dataverse subject and affiliation searchable from basic search: https://github.com/IQSS/dataverse/issues/1431 -->
<copyField source="dvSubject" dest="_text_" maxChars="3000"/>
<copyField source="dvAlias" dest="_text_" maxChars="3000"/>
@@ -281,7 +293,7 @@
<!-- Dataverse copyField from http://localhost:8080/api/admin/index/solr/schema -->
<xi:include href="schema_dv_mdb_copies.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />

<!-- End: Dataverse Specific -->
<!-- End: Dataverse-specific -->

<!-- This can be enabled, in case the client does not know what fields may be searched. It isn't enabled by default
because it's very expensive to index everything twice. -->
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
#!/bin/bash
set -euo pipefail

# This script updates the <field> and <copyField> schema configuration necessary to properly
@@ -61,6 +61,12 @@ echo "Retrieve schema data from ${DATAVERSE_URL}/api/admin/index/solr/schema"
TMPFILE=`mktemp`
curl -f -sS "${DATAVERSE_URL}/api/admin/index/solr/schema${UNBLOCK_KEY}" > $TMPFILE

### Fail gracefull if Dataverse is not ready yet.
if [[ "`wc -l ${TMPFILE}`" < "3" ]]; then
echo "Dataverse responded with empty file. When running on K8s: did you bootstrap yet?"
exit 123
fi

### Processing
echo "Writing ${TARGET}/schema_dv_mdb_fields.xml"
echo "<fields>" > ${TARGET}/schema_dv_mdb_fields.xml
@@ -76,4 +82,4 @@ rm ${TMPFILE}*

### Reloading
echo "Triggering Solr RELOAD at ${SOLR_URL}/solr/admin/cores?action=RELOAD&core=collection1"
curl -f -sS "${SOLR_URL}/solr/admin/cores?action=RELOAD&core=collection1"
curl -f -sS "${SOLR_URL}/solr/admin/cores?action=RELOAD&core=collection1"
Binary file modified doc/Architecture/update-user-account-info.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions doc/mergeParty/readme.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Merge Party Readme
Welcome to the merge party! This document is intended to give a short overview of why we need this party, when was changed and how to change it. There's much work to do, so we'll keep it short. Hopefully.
# Merge Party
Welcome to the merge party! This document is intended to give a short overview of why we need this party, when was it changed and how to change it. There's much work to do, so we'll keep it short, hopefully.

## What Just Happened
In order to allow users to log into Dataverse using credentials from other systems (e.g. institutional Shibboleth server), we had to refactor out the internal user management sub-system (formerly known as "DataverseUser") and introduce a new user system. The existing system was taken out of Dataverse but kept in the .war file, as we also need to support standalone instances.
@@ -16,7 +16,7 @@ From a merge standpoint, this means that code that previously referenced `Datave

Most of these changes have been done by Michael/Phil - otherwise, the `auth` branch would not compile.

Since the guest user does not live in the database, it does not have an id. Moreover, JPA classes cannot link directly to it\*. But have no fear - all users (and, really, all `RoleAssignee`s, which are users or groups) have an identifier. When you need to reference a user (and later, a group) just use the identifier (it's of type `String`). When needing to convert an identifier to a user, call `RoleAssigneeServiceBean.getRoleAssignee( identifier )` in the general case, or `AuthenticationServiceBean.getAuthenticatedUser(identifier)` if you're certain the identifier is of an authenticated user.
The guest user does not live in the database so it does not have an id. Moreover, JPA classes cannot link directly to it\*. But have no fear - all users (and, really, all `RoleAssignee`s, which are users or groups) have an identifier. When you need to reference a user (and later, a group) just use the identifier (it's of type `String`). When needing to convert an identifier to a user, call `RoleAssigneeServiceBean.getRoleAssignee( identifier )` in the general case, or `AuthenticationServiceBean.getAuthenticatedUser(identifier)` if you're certain the identifier is of an authenticated user.


\* We have debated this for a while, since we could have created a dummy record, like we've done so far. We went with this solution, as it is cleaner, can't be messed up by SQL scripts, and will make even more sense once groups arrive.
@@ -84,4 +84,4 @@ A new script that sets up the users and the dataverses, sets the system up for b

## Undoing the undoing the merge
When merging back to master, we need to undo commit 8ae3e6a482b87b52a1745bb06f340875803d2c5b (a.k.a 8ae3e6a), which is the commit that undid the erroneous merge.
More at http://www.christianengvall.se/undo-pushed-merge-git/
More at http://www.christianengvall.se/undo-pushed-merge-git/
1 change: 1 addition & 0 deletions doc/release-notes/4.16-release-notes.md
Original file line number Diff line number Diff line change
@@ -91,6 +91,7 @@ If this is a new installation, please see our <a href=http://guides.dataverse.or
- &lt;glassfish install path&gt;/glassfish4/bin/asadmin deploy &lt;path&gt;dataverse-4.16.war

4. Restart glassfish

5. Update Citation Metadata Block

`curl http://localhost:8080/api/admin/datasetfield/load -X POST --data-binary @citation.tsv -H "Content-type: text/tab-separated-values"`
2 changes: 1 addition & 1 deletion doc/release-notes/4.17-release-notes.md
Original file line number Diff line number Diff line change
@@ -72,7 +72,7 @@ Second, file level tools that did not previously define a "contentType" are now

The Dataverse team has been reaching out to tool makers about these breaking changes and getting various tools working in the https://github.com/IQSS/dataverse-ansible repo. Thank you for your patience as the dust settles around the external tool framework.

For more information, check out new <a href=http://guides.dataverse.org/en/4.17/api/external-tools.html/>Building External Tools</a> section of the API Guide.
For more information, check out new <a href=http://guides.dataverse.org/en/4.17/api/external-tools.html>Building External Tools</a> section of the API Guide.

## Complete List of Changes

Loading