Skip to content
Merged

v4.11 #5561

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
339 commits
Select commit Hold shift + click to select a range
3327597
Merge branch 'develop' into 4660-custom-analytics-config
mheppler Jan 3, 2019
6d18fef
Merge branch 'develop' into 5145-expand-logging-of-dataset-updates
sekmiller Jan 4, 2019
f17761b
5432 - Elaborate on documentation for fake DOI provider.
dheles Jan 4, 2019
7ca17f4
Merge branch 'develop' into 5245-globalid-url-harvest-oaidc
tcoupin Jan 7, 2019
73703f8
Remove useless comment
tcoupin Jan 7, 2019
0a5993e
turn off proxy to allow netbeans to start glassfish #5431
pdurbin Jan 7, 2019
53df82b
from 30 second to 1.5 second startup time on mac #5431
pdurbin Jan 7, 2019
262ede3
Merge branch 'develop' into 4608-info-msg-format
mheppler Jan 7, 2019
a751135
Merge branch 'develop' into 4660-custom-analytics-config
mheppler Jan 7, 2019
1723738
Merge pull request #5433 from dheles/describe-fake-doi-provider
kcondon Jan 7, 2019
f914796
Update tips.rst
kcondon Jan 7, 2019
bcafbf2
Merge pull request #5438 from IQSS/5431-netbeans
kcondon Jan 7, 2019
0381f98
initial solr 7.3.1 docker-aio
pameyer Jan 7, 2019
cd68521
Merge pull request #5247 from tcoupin/5245-globalid-url-harvest-oaidc
kcondon Jan 7, 2019
143c5aa
more solr 7.3.1 switching
pameyer Jan 8, 2019
addf592
switch vagrant to solr 7.3.1
pameyer Jan 8, 2019
af934a4
doc changes
pameyer Jan 8, 2019
375cc17
Merge remote-tracking branch 'IQSS/develop' into QDR-953-dpn
qqmyers Jan 8, 2019
571ec66
Merge pull request #5423 from dheles/reporting-issues
kcondon Jan 8, 2019
bb638c3
add html comment for future reference on autocomplete attribute
pameyer Jan 8, 2019
9a0e431
feedback from code review
pameyer Jan 8, 2019
09b5065
Merge branch 'develop' into 5419-less_autocomplete
pameyer Jan 8, 2019
d78f519
Merge branch 'develop' into 5145-expand-logging-of-dataset-updates
sekmiller Jan 8, 2019
9ffe806
remove logging
qqmyers Jan 8, 2019
bd38898
update jsoup
qqmyers Jan 8, 2019
312f78c
latest jsoup reverses the order of two attributes...
qqmyers Jan 9, 2019
b7b0a68
switch to java.util logging
qqmyers Jan 9, 2019
915810d
Removed redundant Dataverse from custom hmpg page title [ref #5445]
mheppler Jan 9, 2019
d4a0589
5448 - Add DOI testing details
dheles Jan 9, 2019
fb0cea5
each glassfish server will have its own draft edit logs #5145
pdurbin Jan 9, 2019
35285d4
Adding the Metrics API for getting datasets by subject, AND up to the…
landreev Jan 10, 2019
ad5f903
added a test for the new "datasets by Subject, by month" metrics API …
landreev Jan 10, 2019
d44b330
#1219 use bean validation for Deaccession
sekmiller Jan 10, 2019
c4cb557
Merge branch 'develop' into 1219-add-bean-validation-to-ArchiveNote
sekmiller Jan 10, 2019
6315382
typo in a comment (#5398)
landreev Jan 10, 2019
81ad1df
Merge pull request #5388 from IQSS/5145-expand-logging-of-dataset-upd…
kcondon Jan 10, 2019
958ce44
Merge pull request #5411 from meghangoodchild/patch-1
kcondon Jan 10, 2019
8ecf4f3
datasets/bySubject call month code internal #5398
matthew-a-dunlap Jan 10, 2019
1b58760
Update monitoring.rst
kcondon Jan 10, 2019
8c88ed4
Update config.rst
kcondon Jan 10, 2019
bafd016
Merge pull request #5422 from IQSS/4608-info-msg-format
kcondon Jan 10, 2019
94db81d
Merge pull request #5417 from craig-willis/5097-wholetale-integration
kcondon Jan 10, 2019
9d6e7ec
add "collection1" to fix URL that lists Solr fields
pdurbin Jan 11, 2019
36dea68
Merge pull request #5416 from IQSS/4660-custom-analytics-config
kcondon Jan 11, 2019
c0f1655
Merge pull request #5421 from IQSS/5419-less_autocomplete
kcondon Jan 11, 2019
f032e14
Merge remote-tracking branch 'IQSS/develop' into 3924-metadata_fields…
qqmyers Jan 11, 2019
9c8d749
Merge remote-tracking branch 'IQSS/develop' into QDR-953-dpn
qqmyers Jan 11, 2019
db11d6b
Merge pull request #5426 from TexasDigitalLibrary/3924-metadata_field…
kcondon Jan 11, 2019
4506ddb
exclude log4j-over-slf4j
qqmyers Jan 11, 2019
cb17831
Minor style and layout tweeks to dynamic custom hmpg template [ref #5…
mheppler Jan 11, 2019
4664ad9
Merge branch 'develop' into escape-version #5413
pdurbin Jan 11, 2019
e36173f
Merge pull request #5443 from IQSS/5442-solr731
kcondon Jan 11, 2019
b00a70f
Fixed formatting of dates and counts in dynamic custom hmpg [ref #5445]
mheppler Jan 11, 2019
ee94245
metric backend rewrite for scaling #5447
matthew-a-dunlap Jan 11, 2019
4128e7d
Javascript format and count tweeks in dynamic custom hmpg [ref #5445]
mheppler Jan 11, 2019
c4ae982
update Makefile for dvinstall.zip for solr 7.3.1 location of configur…
pameyer Jan 11, 2019
f772da9
Merge pull request #5414 from dheles/escape-version
kcondon Jan 11, 2019
cce1da2
update solr location in installer readme
pameyer Jan 11, 2019
07c84e0
working metric with dataLocation queryParam #5447
matthew-a-dunlap Jan 11, 2019
be044e2
Merge pull request #5461 from IQSS/5460-installer_solr731
kcondon Jan 14, 2019
139f574
update to commons-compress
qqmyers Jan 14, 2019
73aedc3
5456 - mimetypes for external tools
qqmyers Jan 14, 2019
09b09c9
Merge remote-tracking branch 'IQSS/develop' into 5456-External_tools_…
qqmyers Jan 14, 2019
c302c2a
add content type to external tool table
qqmyers Jan 14, 2019
8273c7c
add newline to stop github warning
qqmyers Jan 14, 2019
e80ad06
5457-provide dataset/version/filemetadata to External tools
qqmyers Jan 14, 2019
48bf727
5434 - use common javascript and remove name collision
qqmyers Jan 14, 2019
009acb6
test setup has to include dataset/version/and file metadata
qqmyers Jan 14, 2019
855205c
exclude duplicate aws jars
qqmyers Jan 14, 2019
5ce4ea3
harvest metrics all dataset/file endpoints #5447
matthew-a-dunlap Jan 14, 2019
c508344
Added additional column to recent datasets on custom hmpg, added plac…
mheppler Jan 14, 2019
f6cc089
moving db upgrade command
qqmyers Jan 14, 2019
8027fe7
use :doc: syntax to link to other pages #4706
pdurbin Jan 14, 2019
5122fd9
make JSON look nice #4706
pdurbin Jan 14, 2019
28046c6
use :doc ...
qqmyers Jan 14, 2019
28fabc9
Merge branch 'IQSS/4706-DPN_Submission_of_archival_copies' of https:/…
qqmyers Jan 14, 2019
b407fd7
cleanup script - revert to released version
qqmyers Jan 14, 2019
754a185
Metrics cleanup and finish refactor #5447
matthew-a-dunlap Jan 14, 2019
7b7f4b5
avoid smart quotes in curl commands with double backticks #4706
pdurbin Jan 14, 2019
7b7c9dd
Fix historic download counts #4970 #5447
matthew-a-dunlap Jan 14, 2019
6239601
Merge branch '5447-harvest-metrics-and-homepage' into 5445-dynamic-cu…
matthew-a-dunlap Jan 14, 2019
e1514dd
Combine bySubject queries in homepage JS #5445 #5447
matthew-a-dunlap Jan 14, 2019
6c75dcf
#1219 Add Version/Archive Note validators
sekmiller Jan 15, 2019
e4b6bd4
Merge branch 'develop' into 1219-add-bean-validation-to-ArchiveNote
sekmiller Jan 15, 2019
f1c75ad
Cleaned up responsive layout of dynamic custom hmpg [ref #5445]
mheppler Jan 15, 2019
9889098
Metrics queryParam documentation #5445
matthew-a-dunlap Jan 15, 2019
b71c0ce
upgrade script clear metrics cache #5445 #5447
matthew-a-dunlap Jan 15, 2019
e3e82b7
#1219 fix validators for testing
sekmiller Jan 15, 2019
3a89b5d
Additional layout cleanup of dynamic custom hmpg [ref #5445]
mheppler Jan 15, 2019
59e7ca5
Merge branch '5445-dynamic-custom-hmpg-redux' of github.com:IQSS/data…
mheppler Jan 15, 2019
2739fa2
missing properties
qqmyers Jan 15, 2019
eb6b47d
Merge branch 'IQSS/4706-DPN_Submission_of_archival_copies' of https:/…
qqmyers Jan 15, 2019
aeeba32
support external group_vars file
donsizemore Jan 15, 2019
a236907
propagate exceptions if bag or xml file can't be created...
qqmyers Jan 15, 2019
e008600
Bugfix metrics load & metrics no-guestbook. Wire in metrics #5445 #5447
matthew-a-dunlap Jan 15, 2019
3bdf6c9
document switch from ec2.env to main.yml #5468
pdurbin Jan 15, 2019
216b480
some custom homepage cleanup #5445
matthew-a-dunlap Jan 15, 2019
5ef70c5
fix branch and repo switches... sorry
donsizemore Jan 15, 2019
4cb8cfd
Merge pull request #5470 from OdumInstitute/5468_external_groupvars
pdurbin Jan 16, 2019
983ceac
move details about DuraCloud/Chronopolis setup #4706
pdurbin Jan 16, 2019
587d825
Minor dynamic custom hmpg layout and content tweeks [ref #5445]
mheppler Jan 16, 2019
186ba8e
Added new noscript alert msg block to header and bundle [ref #5445]
mheppler Jan 16, 2019
e2312da
Merge pull request #19 from IQSS/4706-bagit-docs
qqmyers Jan 16, 2019
e836e62
Clear duplicate metrics when present #5445 #5447
matthew-a-dunlap Jan 16, 2019
770fe3d
Homepage improved api call element setter #5445
matthew-a-dunlap Jan 16, 2019
f7e20ea
#5424 For Bibtex citation replace leading double quote with forward t…
sekmiller Jan 17, 2019
52daf79
Styled new dataverse/dataset/download metrics in top section of custo…
mheppler Jan 17, 2019
5e2856f
Merge branch 'develop' into 1219-add-bean-validation-to-ArchiveNote
sekmiller Jan 17, 2019
67dda47
#1219 consolidate url validation
sekmiller Jan 17, 2019
1ebad2e
#1219 cleanup unused imports
sekmiller Jan 17, 2019
6ccfbbc
#5424 replace trailing quote with double apostrophe
sekmiller Jan 17, 2019
558a715
Fixed alignment issue on custom hmpg [ref #5445]
mheppler Jan 17, 2019
9045d7a
Make archiver api call async and cleanup DPN refs
qqmyers Jan 17, 2019
231e681
Merge branch 'IQSS/4706-DPN_Submission_of_archival_copies' of https:/…
qqmyers Jan 17, 2019
581e5dc
doc updates
qqmyers Jan 18, 2019
d4a2682
#1219 cleanup url validator methods
sekmiller Jan 18, 2019
5c07c68
don't call uploadStart button
qqmyers Jan 18, 2019
9547f34
support case sensitivity in bibtex title
pameyer Jan 22, 2019
f2656ac
update unit tests
pameyer Jan 22, 2019
d3e8cf1
Update config.rst
kcondon Jan 22, 2019
6adc88a
function doesn't exist in prov fragment
qqmyers Jan 22, 2019
434f813
provUpload no longer exists at oncomplete
qqmyers Jan 22, 2019
3753dba
missing parsing for requiredSettings
qqmyers Jan 22, 2019
dd378ba
Merge branch 'IQSS/4706-DPN_Submission_of_archival_copies' of https:/…
qqmyers Jan 22, 2019
c77ab16
need : in setting names
qqmyers Jan 22, 2019
8d09fbf
Update config.rst
kcondon Jan 22, 2019
00c3119
close file descriptor on listing cached files
tcoupin Jan 23, 2019
60f9b10
documenting new reserved words
qqmyers Jan 23, 2019
868ef4c
Fixes the problem with (some) bundle messages left un-localized.
landreev Jan 23, 2019
b59cf09
add FIXME about someday changing the content type #5424
pdurbin Jan 23, 2019
b490470
added a similar fix for LocalBundle - the class that facilitates obta…
landreev Jan 23, 2019
df7909d
add test for This Title ``Has Quotes'' In It #5424
pdurbin Jan 23, 2019
d5680cd
add BibTeX to list of Data File Citation formats #5424
pdurbin Jan 23, 2019
14fa723
Merge pull request #5049 from QualitativeDataRepository/IQSS/4706-DPN…
kcondon Jan 23, 2019
b7d5715
Merge pull request #5476 from IQSS/5424-convert-quotes-in-bibtex-exports
kcondon Jan 23, 2019
c8f05a3
Merge pull request #5480 from tcoupin/5479-properly-close-dir
kcondon Jan 23, 2019
f18ad73
Merge pull request #5452 from IQSS/1219-add-bean-validation-to-Archiv…
kcondon Jan 23, 2019
43722f5
Merge pull request #5465 from QualitativeDataRepository/5457-External…
kcondon Jan 23, 2019
e0d2ecc
downgrade to JaCoCo 0.8.1 for working Netbeans integration #5483
pdurbin Jan 23, 2019
797a6f0
made the bundle util honor the LANG env. variable (#5202)
landreev Jan 23, 2019
d022e46
Merge pull request #5466 from QualitativeDataRepository/5434-silent_f…
kcondon Jan 23, 2019
5a24bc8
Merge pull request #5484 from IQSS/5483-netbeans-code-coverage
kcondon Jan 24, 2019
f88da2b
Alias passwords #5412
dheles Jan 24, 2019
103eeff
Create password files in /tmp
dheles Jan 25, 2019
d37e18d
Merge pull request #5449 from dheles/test-doi-docs
kcondon Jan 28, 2019
39dfee8
refactoring and cleanup of the internationalization fix (#5202)
landreev Jan 28, 2019
d849071
Merge branch 'develop' into 5202-alert-messages-internationalization
landreev Jan 28, 2019
e509425
cut-down example config files
pameyer Jan 28, 2019
301e622
xml formatting
pameyer Jan 28, 2019
5de567d
fix rserve typo #5412
pdurbin Jan 29, 2019
d39db67
update guides
pameyer Jan 29, 2019
14f4f34
add note about where the ADFS server goes #5490
pdurbin Jan 29, 2019
6ff028d
removing some unused lines per CR. #5202
landreev Jan 29, 2019
ff58da1
Merge remote-tracking branch 'IQSS/develop' into 5456
qqmyers Jan 29, 2019
8fdaae7
make contenttype optional / allow null
qqmyers Jan 29, 2019
caaeb47
document optional contentType
qqmyers Jan 29, 2019
7b2b989
update test to match contentType being optional
qqmyers Jan 29, 2019
8695902
change assert
qqmyers Jan 29, 2019
3d0ae71
check for tool creation
qqmyers Jan 29, 2019
820b1ee
add some docs on password aliases #5412
pdurbin Jan 30, 2019
27791d3
fix test (add query params)
qqmyers Jan 30, 2019
b026ac7
missed a build() in cut/paste
qqmyers Jan 30, 2019
960e96f
Merge pull request #5494 from IQSS/5490-shib_adfs
kcondon Jan 30, 2019
9a1a10a
Merge branch 'develop' into alias #5412
pdurbin Jan 30, 2019
1211f3a
fix for the add-extra-value update resulting in entered data loss. (#…
landreev Jan 31, 2019
86224bb
Commented out thumbnails from recent dataset on dynamic custom hmpg […
mheppler Jan 31, 2019
7be85ef
Fixes #5501. Setting *test* scope for ALL JUnit dependencies properly…
poikilotherm Jan 31, 2019
79bb69a
Homepage specify all results for some dataset metrics #5445
matthew-a-dunlap Jan 31, 2019
8a88dec
require contenttype internally, but assume null in manifest is tabular
qqmyers Jan 31, 2019
81bb0bd
test that contentype is set.
qqmyers Jan 31, 2019
780b6a0
Merge pull request #5503 from poikilotherm/5501-hotfix-scopes-junit
kcondon Jan 31, 2019
e02588a
Merge pull request #5487 from dheles/alias
kcondon Jan 31, 2019
74bfcda
support for folder directories in file zipper. (#5498)
landreev Feb 1, 2019
ba7f935
Merge branch 'develop' into 5498-file-hierarchy-in-zip-downloads
landreev Feb 1, 2019
668c076
Merge pull request #5504 from IQSS/5477-entered-data-loss-when-adding…
kcondon Feb 1, 2019
cff9e2b
fix no global id check
qqmyers Feb 1, 2019
f1e7223
Merge pull request #5464 from QualitativeDataRepository/5456-External…
kcondon Feb 1, 2019
49dbc00
files for the restassured test for the zip folders "round-trip" (#5498)
landreev Feb 1, 2019
415cc2c
Merge branch 'develop' into 5202-alert-messages-internationalization
landreev Feb 1, 2019
17081c5
fixing a broken line in HarvestingClientsPage (#5202)
landreev Feb 1, 2019
4051c8d
temp save;
landreev Feb 1, 2019
6b14b94
removed the placeholder lines for some missing values in the french b…
landreev Feb 1, 2019
cf4eb98
Merge pull request #5491 from IQSS/5202-alert-messages-internationali…
kcondon Feb 1, 2019
b2e0b92
added a RestAssured test for testing a round trip upload-and-download…
landreev Feb 2, 2019
53f7dca
added doc. entries to the user and api guides. (#5498)
landreev Feb 4, 2019
b836e4f
#5496 disable save until dataverse selected
sekmiller Feb 4, 2019
5de0969
Merge branch 'develop' into 5496-link-dataset-validation-error-display
sekmiller Feb 4, 2019
3034a2e
a few small changes per code review comments (#5498)
landreev Feb 4, 2019
cfac267
removing unused imports (most were introduced by git auto-refactoring…
landreev Feb 4, 2019
6aa5f90
Merge pull request #5511 from QualitativeDataRepository/5509-ORE_with…
kcondon Feb 4, 2019
7655d07
Merge pull request #5507 from IQSS/5498-file-hierarchy-in-zip-downloads
kcondon Feb 4, 2019
db13222
Revised btn icon on dynamic custom hmpg [ref #5445]
mheppler Feb 5, 2019
86a9e28
Metrics remove root dv from subject counts #5445
matthew-a-dunlap Feb 5, 2019
ee2d273
Remove root from dvsubject counts in homepage instead of metric #5445
matthew-a-dunlap Feb 5, 2019
3162c98
#5496 display error message in popup
sekmiller Feb 5, 2019
b353a0e
Merge branch 'develop' into 5496-link-dataset-validation-error-display
sekmiller Feb 5, 2019
4bfa741
#5496 remove extraneous code
sekmiller Feb 6, 2019
1a7e82b
#5496 add remote command for conditional messaging
sekmiller Feb 6, 2019
839fb2c
Merge pull request #5516 from IQSS/5496-link-dataset-validation-error…
kcondon Feb 6, 2019
2419918
Metrics error on unknown queryParam. Also tests. #5445
matthew-a-dunlap Feb 6, 2019
08ba702
Merge branch 'develop' into 5318-metadata-api-503-error
sekmiller Feb 7, 2019
91e036e
#5318 add checks for null data table
sekmiller Feb 7, 2019
cdfffcc
Fixed harvest query half complete #5445
matthew-a-dunlap Feb 7, 2019
d5d5230
Remove dataLocation from bySubject/toMonth #5445
matthew-a-dunlap Feb 7, 2019
6b547f6
remove dataLocation from files #5445
matthew-a-dunlap Feb 7, 2019
5db7d76
#5318 add error handling for non-tabular data
sekmiller Feb 8, 2019
ad0ebc0
#5318 handle preprocessed metadata error
sekmiller Feb 8, 2019
5ec3552
a custom query for datasetsBySubjectToMonth, that works for local, or…
landreev Feb 8, 2019
ca961bd
minor cosmetic changes to the error messages. (#5318)
landreev Feb 8, 2019
d341378
Update Solr install documentation for RHEL or CentOs 7
PaulBoon Feb 11, 2019
eeb871c
Rewire datasetBySubject metric to take dataLocation #5445
matthew-a-dunlap Feb 11, 2019
3e00d03
Homepage files past 30 days fix #5445
matthew-a-dunlap Feb 11, 2019
5c9d01e
Add dataset info to file search #5339
Feb 11, 2019
3ee2727
Add filePID when exists to file search #5339
Feb 11, 2019
e0584b1
Doc changes for search file attributes #5339
Feb 11, 2019
129f1d2
Fix existing rst errors in develop #5339
Feb 11, 2019
ec2976c
Merge pull request #5520 from IQSS/5318-metadata-api-503-error
kcondon Feb 12, 2019
1d37e99
Merge pull request #5526 from PaulBoon/patch-1
kcondon Feb 12, 2019
13fbc4b
Merge branch 'develop' into 5445-dynamic-custom-hmpg-redux
matthew-a-dunlap Feb 12, 2019
dc69bc7
Move metrics db changes to correct upgrade script #5445
matthew-a-dunlap Feb 12, 2019
16bf974
#5489 allow ds page to load without json-ld export
sekmiller Feb 12, 2019
a000632
Merge branch 'develop' into 5489-invalid-export-prevents-ds-page-load
sekmiller Feb 12, 2019
447c409
Show download url with fileId if no pid #5502
matthew-a-dunlap Feb 12, 2019
b1af223
Quieter logging metrics #5445
matthew-a-dunlap Feb 12, 2019
a775833
Merge pull request #5475 from IQSS/5445-dynamic-custom-hmpg-redux
kcondon Feb 13, 2019
1f00b6b
explain difference between dataset and file in Dataverse #5517
pdurbin Feb 13, 2019
bc2661a
Merge pull request #5529 from IQSS/5339-search-datafile-parentIdentif…
kcondon Feb 13, 2019
c9a61d3
Slight edit to Delete Draft msg [#5517]
dlmurphy Feb 13, 2019
8daa495
replace hard coded id of 1 for root dataverse #5454
pdurbin Feb 13, 2019
79d537a
Merge pull request #5531 from IQSS/5489-invalid-export-prevents-ds-pa…
kcondon Feb 13, 2019
a4a33fd
try find
qqmyers Jan 26, 2019
8953586
Merge pull request #5532 from IQSS/5502-file-download-url-pid-agnostic
kcondon Feb 14, 2019
f9ffa27
fix for case when there is no shoulder
qqmyers Feb 14, 2019
ff5cc42
escape file metadata going to DataCite
qqmyers Feb 8, 2019
34a68e9
Merge pull request #5536 from IQSS/5517-delete
kcondon Feb 14, 2019
3467761
Merge pull request #5542 from QualitativeDataRepository/IQSS/5488-del…
kcondon Feb 14, 2019
e9cfb6f
Merge pull request #5537 from IQSS/5454-hard-coded-id
kcondon Feb 14, 2019
3e882de
obey file PID flag
qqmyers Feb 14, 2019
40cc9e1
correct empty PID check
qqmyers Feb 14, 2019
c80c812
Merge pull request #5548 from QualitativeDataRepository/IQSS/5546-Fil…
kcondon Feb 15, 2019
b6787dc
exclude logback to avoid verbose wire logging
qqmyers Feb 15, 2019
98b80a8
Merge pull request #5558 from QualitativeDataRepository/IQSS/5534-sto…
kcondon Feb 15, 2019
9b90609
Merge pull request #5555 from QualitativeDataRepository/IQSS/5554-Dat…
kcondon Feb 15, 2019
b6d7d88
Merge pull request #5553 from QualitativeDataRepository/IQSS-5552-Upd…
kcondon Feb 15, 2019
f523e26
Merge pull request #5543 from QualitativeDataRepository/IQSS/5057-4.8…
kcondon Feb 19, 2019
fd00ae8
Update pom.xml
kcondon Feb 19, 2019
34c53e1
Update conf.py
kcondon Feb 19, 2019
5586475
Update versions.rst
kcondon Feb 19, 2019
a62b382
Update releases.txt
kcondon Feb 19, 2019
3721306
Add files via upload
kcondon Feb 19, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,4 @@ scripts/installer/default.config
# do not track IntelliJ IDEA files
.idea
**/*.iml
/bin/
5 changes: 3 additions & 2 deletions conf/docker-aio/0prep_deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +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.0dv.tgz ]; then
if [ ! -e dv/deps/solr-7.3.1dv.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.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
cd ../../
fi

4 changes: 2 additions & 2 deletions conf/docker-aio/1prep.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
# 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.0/schema.xml testdata/
cp ../solr/7.3.0/solrconfig.xml testdata/
cp ../solr/7.3.1/schema.xml testdata/
cp ../solr/7.3.1/solrconfig.xml testdata/
cp ../jhove/jhove.conf testdata/
cp ../jhove/jhoveConfig.xsd testdata/
cd ../../
Expand Down
11 changes: 6 additions & 5 deletions conf/docker-aio/c7.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ COPY testdata/solrconfig.xml /tmp/dv
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.0dv.tgz
RUN cd /opt ; tar zxf /tmp/dv/deps/solr-7.3.1dv.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`
Expand All @@ -24,9 +24,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.0/server/solr/configsets/_default /opt/solr-7.3.0/server/solr/collection1
RUN cp /tmp/dv/schema.xml /opt/solr-7.3.0/server/solr/collection1/conf/schema.xml
RUN cp /tmp/dv/solrconfig.xml /opt/solr-7.3.0/server/solr/collection1/conf/solrconfig.xml
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/schema.xml
RUN cp /tmp/dv/solrconfig.xml /opt/solr-7.3.1/server/solr/collection1/conf/solrconfig.xml

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

Expand Down Expand Up @@ -60,7 +60,8 @@ WORKDIR /opt/dv

# need to take DOI provider info from build args as of ec377d2a4e27424db8815c55ce544deee48fc5e0
# Default to EZID; use built-args to switch to DataCite (or potentially handles)
ARG DoiProvider=EZID
#ARG DoiProvider=EZID
ARG DoiProvider=FAKE
ARG doi_baseurl=https://ezid.cdlib.org
ARG doi_username=apitest
ARG doi_password=apitest
Expand Down
4 changes: 2 additions & 2 deletions conf/docker-aio/entrypoint.bash
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#!/usr/bin/env bash

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.0/
cd /opt/solr-7.3.1/
# 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
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
1 change: 1 addition & 0 deletions doc/release-notes/4660-custom-analytics-config.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update your Google and Piwik analytics configurations: Remove the deprecated `:GoogleAnalyticsCode`, `:PiwikAnalyticsId`, `:PiwikAnalyticsHost`, `:PiwikAnalyticsTrackerFileName` settings, and use `:WebAnalyticsCode`. The new setting works like the custom HTML files for branding, which allows for more control of your analytics, making it easier to customize what you prefer to track. See [Installation Guide > Configuration > Web Analytics Code](http://guides.dataverse.org/en/latest/installation/config.html#web-analytics-code) for details.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# chkconfig: 35 92 08
# description: Starts and stops Apache Solr

SOLR_DIR="/usr/local/solr/solr-7.3.0"
SOLR_DIR="/usr/local/solr/solr-7.3.1"
SOLR_COMMAND="bin/solr"
SOLR_ARGS="-m 1g"
SOLR_USER=solr
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<?xml version="1.0"?>
<Attributes xmlns="urn:mace:shibboleth:2.0:attribute-map" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<!-- example of ADFS 3.0 attribute mapping -->
<Attribute name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" id="eppn">
<AttributeDecoder xsi:type="ScopedAttributeDecoder"/>
</Attribute>
<Attribute name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" id="affiliation">
<AttributeDecoder xsi:type="ScopedAttributeDecoder" caseSensitive="false"/>
</Attribute>
<Attribute name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" id="affiliation">
<AttributeDecoder xsi:type="ScopedAttributeDecoder" caseSensitive="false"/>
</Attribute>
<Attribute name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" id="unscoped-affiliation">
<AttributeDecoder xsi:type="StringAttributeDecoder" caseSensitive="false"/>
</Attribute>
<Attribute name="urn:mace:dir:attribute-def:eduPersonAffiliation" id="unscoped-affiliation">
<AttributeDecoder xsi:type="StringAttributeDecoder" caseSensitive="false"/>
</Attribute>
<Attribute name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" id="entitlement"/>
<Attribute name="urn:mace:dir:attribute-def:eduPersonEntitlement" id="entitlement"/>
<Attribute name="urn:mace:dir:attribute-def:eduPersonTargetedID" id="targeted-id">
<AttributeDecoder xsi:type="ScopedAttributeDecoder"/>
</Attribute>
<Attribute name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" id="persistent-id">
<AttributeDecoder xsi:type="NameIDAttributeDecoder" formatter="$NameQualifier!$SPNameQualifier!$Name" defaultQualifiers="true"/>
</Attribute>
<Attribute name="urn:oasis:names:tc:SAML:2.0:nameid-format:persistent" id="persistent-id">
<AttributeDecoder xsi:type="NameIDAttributeDecoder" formatter="$NameQualifier!$SPNameQualifier!$Name" defaultQualifiers="true"/>
</Attribute>
<Attribute name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" nameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:unspecified" id="givenName"/>
<Attribute name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" nameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:unspecified" id="mail"/>
<Attribute name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" nameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:unspecified" id="sn"/>
</Attributes>
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
<?xml version="1.0"?>
<!--
example shibboleth2.xml for ADFS 3.0

- attribute-map_adfs.xml
-->
<SPConfig xmlns="urn:mace:shibboleth:3.0:native:sp:config" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" clockSkew="1800">
<!-- adfs libraries for shibboleth and apache -->
<OutOfProcess>
<Extensions>
<Library path="adfs.so" fatal="true"/>
</Extensions>
</OutOfProcess>
<InProcess>
<Extensions>
<Library path="adfs-lite.so" fatal="true"/>
</Extensions>
</InProcess>
<!-- FIXME: change the entityID to your hostname. -->
<ApplicationDefaults entityID="https://dataverse.example.edu/Shibboleth.sso/SAML2/POST" REMOTE_USER="eppn" attributePrefix="AJP_">
<Sessions lifetime="28800" timeout="3600" checkAddress="false" relayState="ss:mem" handlerSSL="true" cookieProps="; path=/; secure; HttpOnly">
<SSO>
SAML2 SAML1
</SSO>
<Logout>SAML2 Local</Logout>
<Handler type="MetadataGenerator" Location="/Metadata" signing="false"/>
<Handler type="Status" Location="/Status" acl="127.0.0.1"/>
<Handler type="Session" Location="/Session" showAttributeValues="true"/>
<Handler type="DiscoveryFeed" Location="/DiscoFeed"/>
</Sessions>
<!-- Error pages to display to yourself if something goes horribly wrong. -->
<Errors supportContact="root@localhost" logoLocation="/shibboleth-sp/logo.jpg" styleSheet="/shibboleth-sp/main.css"/>
<!-- TODO - set IdPs here -->
<MetadataProvider type="XML" path="dataverse-idp-metadata.xml" backingFilePath="local-idp-metadata.xml" legacyOrgNames="true" reloadInterval="7200"/>
<!-- Attribute and trust options you shouldn't need to change. -->
<AttributeExtractor type="XML" validate="true" path="attribute-map.xml"/>
<AttributeResolver type="Query" subjectMatch="true"/>
<AttributeFilter type="XML" validate="true" path="attribute-policy.xml"/>
<!-- Your SP generated these credentials. They're used to talk to IdP's. -->
<CredentialResolver type="File" key="sp-key.pem" certificate="sp-cert.pem"/>
</ApplicationDefaults>
<!-- Security policies you shouldn't change unless you know what you're doing. -->
<SecurityPolicyProvider type="XML" validate="true" path="security-policy.xml"/>
<!-- Low-level configuration about protocols and bindings available for use. -->
<ProtocolProvider type="XML" validate="true" reloadChanges="false" path="protocols.xml"/>
</SPConfig>
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ After = syslog.target network.target remote-fs.target nss-lookup.target
[Service]
User = solr
Type = forking
WorkingDirectory = /usr/local/solr/solr-7.3.0
ExecStart = /usr/local/solr/solr-7.3.0/bin/solr start -m 1g
ExecStop = /usr/local/solr/solr-7.3.0/bin/solr stop
WorkingDirectory = /usr/local/solr/solr-7.3.1
ExecStart = /usr/local/solr/solr-7.3.1/bin/solr start -m 1g
ExecStop = /usr/local/solr/solr-7.3.1/bin/solr stop
LimitNOFILE=65000
Restart=on-failure

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"displayName": "Awesome Tool",
"description": "The most awesome tool.",
"type": "explore",
"contentType": "text/tab-separated-values",
"toolUrl": "https://awesometool.com",
"toolParameters": {
"queryParameters": [
Expand Down
Loading