dor-services 4.21.1 → 4.21.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTU0MzM5MTRhNDA5OGI1ODQ2NTc3NDc5ZTA5ODUyNzRiYmMxYjZmZQ==
+    ZTgyM2FiMDFhZDU3Yzc0YTY5OWMyMmM4NDQ1NmM2ZWY5NjIzZTBhMQ==
   data.tar.gz: !binary |-
-    YTgwZjdhZDljNzY0YmQ3YTczM2EyZDdmNTdhYmNlOTAzYTA1MWQyNg==
+    ZTkwMGM0YmEyN2Y3MGRlN2NmYzU4ZWY3ODQ1NmZjYWZkMzVjMGZhZQ==
 SHA512:
   metadata.gz: !binary |-
-    Y2ZkNmNmYmZhN2Y0YzgzZjdlM2VjMTI5ZjQ4NmVmOTYzYmY4NGUyN2MxNTY2
-    MDk5YmM1YzRlYTRiODRjMTQwNzQwZjE4NTVhMjE0Zjc5ZmMxYTFhYWU0NTll
-    YzEwMzExN2Q3YTIyNTZkNDhhZTZiZmM0MzY2MmIyMjY0ZDM1ZTM=
+    NDA0NGVkZmI3ZTBlZDlhMTgxMTQwNTUyNzY0OWQ5OGJjNDdlY2M1OTEyNDky
+    ZjQ5ODU3ZmJiMjhkNzk4ZGQ4YTBlNjMyZjVkN2U4Y2UxYWM4ZDE4M2RhODhk
+    ZTNlZGRkNjVhODI3NzAwZWZiZWZmOTI1NTVjOGUzMGE5OTUzYTY=
   data.tar.gz: !binary |-
-    MTdiMjU2N2RjOTM5NDIwYjY0MWMxZDg3YzRmZTVlYWY4MWNkYmM3MWI4MzVh
-    NjY2YWUwOWU0YzM3ZDY0NGEwMjE3ZmMzOTRjMTBmNTM1Mzg4NzllZTkwMmE4
-    ZmI1OWRkYmE2ODc1NGRmNjg5ZDM1MTA2NDc4MjhmMWMwZjg2NDU=
+    MjZkNTAzZDljMzI0OTEzODI2MzQyOGY1NDVlNzA3OTQ1ZjAzNTBlZDc1OWE1
+    NjUxNGZkNGQ0MDQ5Y2Y3NGMxNmIxOGQyYjlmMjhiZmJkNDM4ZGNkOGZmNDlm
+    NTUwZDRjZThhYWRkY2Q5N2VhNjI4ZWI4NzRhMmJlNmY2Mzk2ZDc=

data/config/certs/dor-services-dor-dev.crt

@@ -0,0 +1,30 @@
+-----BEGIN CERTIFICATE-----
+MIIFETCCAvkCCQCcUJVDTu7rZjANBgkqhkiG9w0BAQUFADCBvzELMAkGA1UEBhMC
+VVMxEzARBgNVBAgTCkNhbGlmb3JuaWExETAPBgNVBAcTCFN0YW5mb3JkMRwwGgYD
+VQQKExNTdGFuZm9yZCBVbml2ZXJzaXR5MRIwEAYDVQQLEwlMaWJyYXJpZXMxJTAj
+BgNVBAMTHFNVTCBET1IgKGRldi90ZXN0KSBhY2Nlc3MgQ0ExLzAtBgkqhkiG9w0B
+CQEWIHN1bC13ZWJtYXN0ZXJAbGlzdHMuc3RhbmZvcmQuZWR1MB4XDTEyMDkyODIz
+Mjk0MFoXDTIyMDkyNjIzMjk0MFowgdQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpD
+YWxpZm9ybmlhMREwDwYDVQQHEwhTdGFuZm9yZDEcMBoGA1UEChMTU3RhbmZvcmQg
+VW5pdmVyc2l0eTESMBAGA1UECxMJTGlicmFyaWVzMTgwNgYDVQQDFC9kb3Itc2Vy
+dmljZXNAc3VsLWx5YmVyc2VydmljZXMtZGV2LnN0YW5mb3JkLmVkdTExMC8GCSqG
+SIb3DQEJARYiZGxzcy1kZXZlbG9wZXJzQGxpc3RzLnN0YW5mb3JkLmVkdTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqVUU6Nf9+OW5l67D4knz/t4JCB
+TeLGHRnABfafvtT1NcHwKZG0prKNvQfo6/kCdXbQ4ShxnMjrmZVr9UEBQV2znwzU
+CH/nc3kx1PwaCPAl79r6jFOovTE3t7hU1HuEQLUoAJ09Bo7AoAx5X7kLpaoxgyt2
+Sk0v9/LY8iwE21ulvXv9RC9PtJOzalKLSTVImjqa9YUjKFW5SFqnGhqz7qB1Li90
+LovLzWr8yCuKrDqKhW6vK9S3preDgRrERv09kdJp75ClBc368rA4iXwJVvXZgqaY
+Vbj6Iuhs4IgtkSmpekwXC8SXpcqX/Rb55+w5hxKkBjQ6a7wXSxanr1IjW08CAwEA
+ATANBgkqhkiG9w0BAQUFAAOCAgEAbzIPR6ohKc+zA6Efxe7QovQ7KIkqlSC/CLz8
+9VBcwiVk+SNw35A0QtbpVWlj1Ml4/8n3HdFawh0Yj20D8nigRvOFWJGu++PAEhMl
+g6jR7htl+oXvbaDsb6iuhNxhRBsPY76nZEzFSyI2m1hnz+81TJLUdEywIFgdTZ8o
+SeCttyueF+qDiAWjl7Lm7Wt+Mn1QrgfoO1nvqSHZL3yvx0U2U/klGE1lcGQYD+r7
+oTXuNQL5Y5s7r5kvjfjNCXIdXOlcuIM1jHrALhiH+PKplXyrniVMfvcZ+qvcG9rf
+FUbL5O82i2PMajiT0Jr+lEMZeTZcNsD3fwiYGbbwy4LBaTJR1Kvg2p0lgbM5HBOu
+3XHO7bQNZ1zYVevLsM85+3KIqFI/Z91eq9M0E+HbroK5L4XuKwXhvVc6J7zYwh8M
+9mswk0K+NFHOgmL2NxqMiYKtxZlqFts/9BIjkCzf3ZW78l5kb9xg3A3YaTYrCxC2
+41xSmd2OCcSyipWVDIT6agBmGH+9Yn6ZS5xRT2Cb7iKVeDnQzWw4JF4zzrsUQEdE
+BIyLgmKJcYFnoKxkG6zT1q4AOSsFQDcWCo1DrQ9FjrEdi3hwsFzWg5eLXAbzv+aC
+JIHVWIIwpI1FIA3Z3c8M1aLn2vjsjwlIWescvLr1oIVz0fPEjCRZ+6H6WQLG/x2t
+nq/sIwE=
+-----END CERTIFICATE-----

data/config/certs/dor-services-dor-dev.key

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEAupVRTo1/345bmXrsPiSfP+3gkIFN4sYdGcAF9p++1PU1wfAp
+kbSmso29B+jr+QJ1dtDhKHGcyOuZlWv1QQFBXbOfDNQIf+dzeTHU/BoI8CXv2vqM
+U6i9MTe3uFTUe4RAtSgAnT0GjsCgDHlfuQulqjGDK3ZKTS/38tjyLATbW6W9e/1E
+L0+0k7NqUotJNUiaOpr1hSMoVblIWqcaGrPuoHUuL3Qui8vNavzIK4qsOoqFbq8r
+1Lemt4OBGsRG/T2R0mnvkKUFzfrysDiJfAlW9dmCpphVuPoi6GzgiC2RKal6TBcL
+xJelypf9Fvnn7DmHEqQGNDprvBdLFqevUiNbTwIDAQABAoIBAFGwUCG5N9QTyqze
+sZHfjM17g0chJY10uYbtmG7Kr80i8n9Pe5OsaRNhlPJimvWxiuYTO5DudPtOkzZl
+RsJIH2s72hXOu03scpUMKTia2XDy2xmfelKiXPqwb0JH+aN+Wqo1slclQbq8QRZV
+CYDFxalG9ivQJWW367GqJBT7p2Ju5X58R4yWv+RJzrcB3UOc4KcmULtn/7eHEU5C
+rh1EMJ/N3qokUYfazBMub+UQZi6ALd0u7kDavSlHVUlUXApgVY46R9l6wrYrgvnj
+nbRiakvDeFLGuAyx+zhngzaWxizS4oI6PF6msMOCWiIGrcGgBkZgdiL2NzqUXAAk
+KVGMqrkCgYEA5J/QNg7IY9uemZXxi0imQtjIaDFvE2vf90iBOR/JoPtchl9yY/zs
+AxetumME+mTALio/0XeImNQuEJDYsvOs+NS3IXbqtK943i+PGAyuLgZSsnss0Z4J
+8wria0LFCDrzS5dDbb3YQmhj9rwKqwwd59SRon2IhSt138qJe2RNkB0CgYEA0OzK
+dRs8MkbYcufCnH+GebbAaiQUe7MWXNzmwIf6lkU07ycs6hP/OSoBDoTz+k9Jl7eF
+rAnKIw9S6yX81s/vHkf+ZFKuPl/lT0cC5il3/WdHwF3R+CaEzVX9oI0Ps0VoE3LS
+3M2FaLwsCKvr6WzGUcBBcJNQ3y3pcQnlrXn91VsCgYEAljJDyG/XyHqs7DuszxNw
+XvQqXQE09u5k2gEhHBU9Emxwcbrc3MF5j+KLeKq6x4FPHEUXXhaIf9bNWIbARnh9
+x49/rBWCxieNYXKfMG6MM6Jly+nOHPwVjz00WMEpzmlkEuISI1OYcrBAFAWfgJXa
+Q8bL0pNkEBDoRJi7z3uq1SUCgYEAuoYNIowULBbP+5YqSyoXVubv1lMr7lwu5O1b
+HhzIfgx/e9wP31PHErQLiXjtkVXkMA1qy/NZgf+WWdXqa6Xsp65C0jJ22b0nrqWJ
+Uw9Gzve8OWQJp3BMND5HV2VY1QZsKqDi3LqoFp+Y+Iz068tvK2FniygalYYZ2g+p
+/Dzjf+0CgYAt34MEAW9Ps3bQN42oQLw4ORmOE3PRH17OsRXncAjfTa5vLLJmWvDr
+L5WPyEb0v6qh1iEwIXD0W9lZwZAaK0dON2y+T2EPJO1g/n4JERlPZVwtKHoXRQUB
+hblhDgHpMVXwJm3CYPczc9A0AkjYw+aZdqjzSYqq23WXFVXZ7SrfeA==
+-----END RSA PRIVATE KEY-----

data/config/certs/robots-dor-test.crt

@@ -0,0 +1,29 @@
+-----BEGIN CERTIFICATE-----
+MIIFDDCCAvQCCQCcUJVDTu7rYDANBgkqhkiG9w0BAQUFADCBvzELMAkGA1UEBhMC
+VVMxEzARBgNVBAgTCkNhbGlmb3JuaWExETAPBgNVBAcTCFN0YW5mb3JkMRwwGgYD
+VQQKExNTdGFuZm9yZCBVbml2ZXJzaXR5MRIwEAYDVQQLEwlMaWJyYXJpZXMxJTAj
+BgNVBAMTHFNVTCBET1IgKGRldi90ZXN0KSBhY2Nlc3MgQ0ExLzAtBgkqhkiG9w0B
+CQEWIHN1bC13ZWJtYXN0ZXJAbGlzdHMuc3RhbmZvcmQuZWR1MB4XDTEyMDkyODIz
+MTYzMFoXDTIyMDkyNjIzMTYzMFowgc8xCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpD
+YWxpZm9ybmlhMREwDwYDVQQHEwhTdGFuZm9yZDEcMBoGA1UEChMTU3RhbmZvcmQg
+VW5pdmVyc2l0eTESMBAGA1UECxMJTGlicmFyaWVzMTMwMQYDVQQDFCpyb2JvdHNA
+c3VsLWx5YmVyc2VydmljZXMtdGVzdC5zdGFuZm9yZC5lZHUxMTAvBgkqhkiG9w0B
+CQEWImRsc3MtZGV2ZWxvcGVyc0BsaXN0cy5zdGFuZm9yZC5lZHUwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDIIIO1QOrQOGuMD5PmgRpECVlclF1Thsj2
+Z7nQ3LWeHoHBDWPUYZY96c2n2HSS+62Wk+fRC7URDb2Di9MhuZ0ciYst3rNninrE
+2wJBggrF72lSPc+p3YCu3P9usj30hx0RD+m1lnLw35/OjW6Z89cbZ7guHfZ1VE65
+ly9z2dVt/DJF6qZ4lQxyeweNGefUVYOVgWTZJvPXIgTEot8MzNAznIrn22i+HQXJ
+heSCzTfVIakd7PzCyKI593fItsbkaD2XGuZUDZXE10NhMX/B+3BfUDe17CfJutpN
+vxnyyiFMzs1FfyooZ90eCI4j/hgPEkygLlWTDnU2pCt6w4iWISOZAgMBAAEwDQYJ
+KoZIhvcNAQEFBQADggIBAEzuW/6tGwYw6fmhN5xWaEQKbZkFGF7+3AmyjU1nL+xJ
+AymhfEUGWpsBCeuMjkQG4C/WP54cF4SLQdSDh5/WGj+6bMbYhmVMqhiH7Fb0aJoR
+Bkbe298t5JSBeqMJM0qAR1OELsEyoadIQWChnLECOgEV6c1a3o6KpaxNusJzdUu3
+eYgC4CHdt7mJwemTjr8rTOTGAMCgK/bFXdKbaA7HFnH8t3oCfEQSWVA4QLI49SUL
+9Hc484LcfOk25Su6RP88OfzwxF8P5N4+w9BeAq143Yge4/4xcVIJ5A1YVAVwMegd
+tK7iJ/jdg94hpSPSZctmV9Jo8kekGF+RzWDvtCR4wEZj0NdNcRkSMTA73aygxRPa
+UDcrwM+6sjQ+gzbJims5zae7oZjxq6J9QCodx9IEZluS6quYMZ2M4GYwq3NBD7BQ
+NBzsWCBaTb7JW63btlFwi8hRissQoPxLUXtRJK2jzl9w2ONQGhf896g9iCM2NUZO
+/b1UwGj+w/rXTAM+RwCM9DQ7knMeAlcLXWTSVfn3bYcgrDs0JLFh0kUwHm8c/uoC
+1CoJ0lgLNjRICq0OLuegWQmQ1HMWUJ2tkMAYBS+4JVnB4qlw6sCxFOojnHUZcgDK
+0pwjOO/1VIyep60lxPRPX9/Se1TJeAqjMby5AhNlVX96WldxOC6m/eZrGcgRHgc7
+-----END CERTIFICATE-----

data/config/certs/robots-dor-test.key

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEAyCCDtUDq0DhrjA+T5oEaRAlZXJRdU4bI9me50Ny1nh6BwQ1j
+1GGWPenNp9h0kvutlpPn0Qu1EQ29g4vTIbmdHImLLd6zZ4p6xNsCQYIKxe9pUj3P
+qd2Artz/brI99IcdEQ/ptZZy8N+fzo1umfPXG2e4Lh32dVROuZcvc9nVbfwyReqm
+eJUMcnsHjRnn1FWDlYFk2Sbz1yIExKLfDMzQM5yK59tovh0FyYXkgs031SGpHez8
+wsiiOfd3yLbG5Gg9lxrmVA2VxNdDYTF/wftwX1A3tewnybraTb8Z8sohTM7NRX8q
+KGfdHgiOI/4YDxJMoC5Vkw51NqQresOIliEjmQIDAQABAoIBAEmBH78IC/bUcjPs
+WM9V5dbNdEP7vld6bv+J04byOcbMv62vhFYyTaOJ515Zs191Dyn6Qy/V0/hiipPx
+XGfLq/gaUMNVQ6GpDDSXmDmFUP2oVI+/YjGqyKPxSeRXlUfmBHgK1zU6ABeWmzSb
+X98t33kSXGSb3rTzdULXU7eCb9DIJBYSAPt848nXWgjOgBZ1LCb+6Dd7l7LoUWAi
+Ev/gOGtYkLq74LJSFjvmuEG+Ze0bBq5QOCJP4P6mU6KIgFwXkS5OeueF8X7w8Gxj
+o9cxvTSq86mUO2JJKDPLjZvhngUP+/dpPuDPqRAnVL51IIha1M2mqAqF7uggqdrz
+dl2mmbECgYEA/25xjt1YXv3QgaA1OgOdA5HU/9CxFu3nesGwqF2YXCof+aMGL1kt
+K/yo3gfUL2nwwKFMbNtYI+l9g1dcQZkEAur2OwdoB9ca2TYl4jLtdroJTByoeTDx
+s4l/g/yiZDUbKTtaIKlarPyV9Gx/vDVAIHnyaokepEiGgkPahfAW8E0CgYEAyJKO
+UcwIXuV2KtgCvDSHggBYDiOoGglxST+7cN7Ap25UazPJ8kDX5Pejf3Cz7chmAxI7
+0hpBGYTXOPo/nWB+F1KGI3dvCcQl0Pxd5cjEA4LA5Fb/X1vqKyYYSM8klL77mSfV
+/kEYgVUZQVRwTJWPdMWj5tt2EgRWXjrSERx8Bn0CgYEAzWIovQ8Nd5Pui8weAD/X
+iH9CHU/YlO9GKVaEjVx0nebhPwDugDPcNno57g2td1Jf2wPXR9A21ulvmqQr8jLv
+Hsl+o4gZBfTYCb+YRoFcnxKHV0PT016fehUdCyugB6ML6+NlXM3PsziF+rsjGlpW
+7cYgPblzgfUu8p9MnlWmnCECgYBoYGQxywT8JVtWNm1N9eQi0f0A9qtPSWSr4r+v
+oCwPtYm29A9+wyHW5Mwv0L3B20zDAmUhFEqWdhvuacRbKNDVYDuwD0I4idvIItzW
+bKEc1pl8+o0Q2etFoyB2G14FDlIuRJ3HH6cZ/ugSqFd8c0RhV0zRIZoTDDDJ/sA8
+6V7dnQKBgQCHhDhRSc1zFoOR7rcYjJxmpDIWCnqgqfpjoZ2ea35aQivOj7ShS+B2
++rERrqOPN3gQA1mR2qE5406MNI1bzOyvGiYhflACPXU1IZbcCIc4W/Djzr7pc7Al
+/dqhdbE96D947nWCQLQ6LcMb1+oDxDNeFHPBzVzSsPmv5B9W+cwWbg==
+-----END RSA PRIVATE KEY-----

data/config/dev_console_env.rb

@@ -1,78 +1,86 @@
 cert_dir = File.join(File.dirname(__FILE__), "certs")
 
 Dor::Config.configure do
+  fedora do
+    url 'https://sul-dor-test.stanford.edu/fedora'
+  end
 
   ssl do
-    cert_file File.join(cert_dir,"robots-dor-dev.crt")
-    key_file  File.join(cert_dir,"robots-dor-dev.key")
-    key_pass  ''
+    cert_file File.join(cert_dir,"robots-dor-test.crt")
+    key_file File.join(cert_dir,"robots-dor-test.key")
+    key_pass ''
   end
   
   suri do
     mint_ids true
     id_namespace 'druid'
-    url 'https://lyberservices-dev.stanford.edu'
+    url 'https://lyberservices-test.stanford.edu'
     user 'labware'
     pass 'lyberteam'
   end
   
   metadata do
-    exist.url   'http://viewer:l3l%40nd@lyberapps-dev.stanford.edu/exist/rest/'
+    exist.url 'http://viewer:l3l%40nd@lyberapps-dev.stanford.edu/exist/rest/'
     catalog.url 'http://lyberservices-prod.stanford.edu/catalog/mods'
   end
   
   stacks do
-    document_cache_host 'purl-dev.stanford.edu'
-    local_stacks_root         '/stacks'
+    local_workspace_root '/dor/workspace'
+    document_cache_host 'sul-purl-test.stanford.edu'
+    local_stacks_root '/stacks' 
     local_document_cache_root '/purl/document_cache'
-    local_workspace_root      '/dor/workspace'
   end
- 
-  solrizer.url     'http://sul-solr.stanford.edu/solr/argo_test'
-  fedora.url       'https://sul-dor-test.stanford.edu/fedora'
-  workflow.url     'https://lyberservices-dev.stanford.edu/workflow/'
-  dor_services.url 'https://dorAdmin:dorAdmin@sul-lyberservices-dev.stanford.edu/dor'
+  
+  #gsearch.url 'https://dor-test.stanford.edu/solr'
+  solrizer.url 'http://127.0.0.1:8080/solr/argo_test'
+  workflow.url 'https://lyberservices-test.stanford.edu/workflow/'
+  dor_services.url 'https://dorAdmin:dorAdmin@sul-lyberservices-test.stanford.edu/dor'
+
+  content do
+    sdr_server 'https://sdr-services-test.stanford.edu'
+    sdr_user 'sdrAdmin'
+    sdr_pass 'sdrAdmin'
+  end
 
   cleanup do
     local_workspace_root '/dor/workspace'
-    local_export_home    '/dor/export'
+    local_assembly_root '/dor/assembly'
+    local_export_home '/dor/export'
   end
 
   sdr do
     url 'https://sdrAdmin:sdrAdmin@sdr-services-test.stanford.edu/sdr/'
     local_workspace_root '/dor/workspace'
-    local_export_home    '/dor/export'
+    local_export_home '/dor/export'
     datastreams do
       administrativeMetadata 'optional'
-      contentMetadata        'optional'
-      descMetadata           'required'
-      defaultObjectRights    'optional'
-      events                 'optional'
-      embargoMetadata        'optional'
-      identityMetadata       'required'
-      provenanceMetadata     'required'
-      relationshipMetadata   'required'
-      rightsMetadata         'optional'
-      roleMetadata           'optional'
-      sourceMetadata         'optional'
-      technicalMetadata      'optional'
-      versionMetadata        'required'
-      workflows              'optional'
+      contentMetadata 'optional'
+      descMetadata 'required'
+      defaultObjectRights 'optional'
+      events 'optional'
+      embargoMetadata 'optional'
+      identityMetadata 'required'
+      provenanceMetadata 'required'
+      relationshipMetadata 'required'
+      rightsMetadata 'optional'
+      roleMetadata 'optional'
+      sourceMetadata 'optional'
+      technicalMetadata 'optional'
+      versionMetadata 'required'
+      workflows 'optional'
     end
   end
-
-  accessioning_robot_sleep_time 30
-
 end
 
 
-#WORKFLOW_URI = 'http://lyberservices-test.stanford.edu/workflow'
+WORKFLOW_URI = 'http://lyberservices-test.stanford.edu/workflow'
 
 # Constants for Dor::WorkflowService
-#module Dor
-#  CREATE_WORKFLOW = DOR_CREATE_WORKFLOW = true
-#  WF_URI = 'http://lyberservices-test.stanford.edu/workflow'
-#end
-
-# External application locations
-JHOVE_HOME = File.join(ENV['HOME'], 'jhoveToolkit')
+# module Dor
+#   CREATE_WORKFLOW = DOR_CREATE_WORKFLOW = true
+#     WF_URI = 'http://lyberservices-test.stanford.edu/workflow'
+#     end
+#
+#     # External application locations
+#     JHOVE_HOME = File.join(ENV['HOME'], 'jhoveToolkit')
+#

data/config/test.rb

@@ -0,0 +1,86 @@
+cert_dir = File.join(File.dirname(__FILE__), "certs")
+
+Dor::Config.configure do
+  fedora do
+    url 'https://sul-dor-test.stanford.edu/fedora'
+  end
+
+  ssl do
+    cert_file File.join(cert_dir,"robots-dor-test.crt")
+    key_file File.join(cert_dir,"robots-dor-test.key")
+    key_pass ''
+  end
+  
+  suri do
+    mint_ids true
+    id_namespace 'druid'
+    url 'https://lyberservices-test.stanford.edu'
+    user 'labware'
+    pass 'lyberteam'
+  end
+  
+  metadata do
+    exist.url 'http://viewer:l3l%40nd@lyberapps-dev.stanford.edu/exist/rest/'
+    catalog.url 'http://lyberservices-prod.stanford.edu/catalog/mods'
+  end
+  
+  stacks do
+    local_workspace_root '/dor/workspace'
+    document_cache_host 'sul-purl-test.stanford.edu'
+    local_stacks_root '/stacks' 
+    local_document_cache_root '/purl/document_cache'
+  end
+  
+  #gsearch.url 'https://dor-test.stanford.edu/solr'
+  solrizer.url 'http://127.0.0.1:8080/solr/argo_test'
+  workflow.url 'https://lyberservices-test.stanford.edu/workflow/'
+  dor_services.url 'https://dorAdmin:dorAdmin@sul-lyberservices-test.stanford.edu/dor'
+
+  content do
+    sdr_server 'https://sdr-services-test.stanford.edu'
+    sdr_user 'sdrAdmin'
+    sdr_pass 'sdrAdmin'
+  end
+
+  cleanup do
+    local_workspace_root '/dor/workspace'
+    local_assembly_root '/dor/assembly'
+    local_export_home '/dor/export'
+  end
+
+  sdr do
+    url 'https://sdrAdmin:sdrAdmin@sdr-services-test.stanford.edu/sdr/'
+    local_workspace_root '/dor/workspace'
+    local_export_home '/dor/export'
+    datastreams do
+      administrativeMetadata 'optional'
+      contentMetadata 'optional'
+      descMetadata 'required'
+      defaultObjectRights 'optional'
+      events 'optional'
+      embargoMetadata 'optional'
+      identityMetadata 'required'
+      provenanceMetadata 'required'
+      relationshipMetadata 'required'
+      rightsMetadata 'optional'
+      roleMetadata 'optional'
+      sourceMetadata 'optional'
+      technicalMetadata 'optional'
+      versionMetadata 'required'
+      workflows 'optional'
+    end
+  end
+end
+
+
+WORKFLOW_URI = 'http://lyberservices-test.stanford.edu/workflow'
+
+# Constants for Dor::WorkflowService
+# module Dor
+#   CREATE_WORKFLOW = DOR_CREATE_WORKFLOW = true
+#     WF_URI = 'http://lyberservices-test.stanford.edu/workflow'
+#     end
+#
+#     # External application locations
+#     JHOVE_HOME = File.join(ENV['HOME'], 'jhoveToolkit')
+#

data/lib/dor-services.rb

@@ -116,9 +116,11 @@ module Dor
   autoload :Contentable, 'dor/models/contentable'
   autoload :Editable, 'dor/models/editable'
   autoload :Discoverable, 'dor/models/discoverable'
-  autoload :Geoable, 'dor/models/geoable'
-  autoload :Presentable, 'dor/models/presentable'
-  autoload :Releaseable, 'dor/models/releaseable'
+  autoload :Geoable,      'dor/models/geoable'
+  autoload :Presentable,  'dor/models/presentable'
+  autoload :Releaseable,   'dor/models/releaseable'
+  autoload :Rightsable,   'dor/models/rightsable'
+
 
 
   # ActiveFedora Classes

data/lib/dor/models/identifiable.rb

@@ -226,7 +226,7 @@ module Dor
     
     #Add an administrative tag to an item, you will need to seperately save the item to write it to fedora
     #
-    #param tag [string] The tag you wish to add
+    #@param tag [string] The tag you wish to add
     def add_tag(tag)
         identity_metadata_ds = self.identityMetadata
         normalized_tag = validate_and_normalize_tag(tag, identity_metadata_ds.tags)
@@ -245,6 +245,18 @@ module Dor
       end
       return removed
     end
+    
+    #Removes all displayTypes from an item in preparation of adding a new display type
+    #
+    #@return Boolean True if displayTypes were removed, False if no displayTypes were removed
+    def remove_displayTypes
+      removed = false
+      self.identityMetadata.ng_xml.search('//displayType').each do |node|
+          node.remove
+          removed = true
+      end
+      return removed
+    end
 
     def update_tag(old_tag, new_tag)
       identity_metadata_ds = self.identityMetadata

data/lib/dor/models/item.rb

@@ -16,7 +16,6 @@ module Dor
     include Discoverable
     include Geoable
     include Releaseable
-    
   end
   
   class Abstract < ::ActiveFedora::Base

data/lib/dor/models/publishable.rb

@@ -43,7 +43,7 @@ module Dor
 
       im=self.datastreams['identityMetadata'].ng_xml.clone
       im.search('//release').each {|node| node.remove} # remove any <release> tags from public xml which have full history
-      im.root.add_child(release_xml)  # now add in final <release> tag  #TODO:  Adding this breaks tests, rework these
+      im.root.add_child(release_xml) 
 
       pub.add_child(im.root) # add in modified identityMetadata datastream
       pub.add_child(self.datastreams['contentMetadata'].public_xml.root.clone)
@@ -53,7 +53,8 @@ module Dor
       pub.add_child(rels.clone) unless rels.nil? # TODO: Should never be nil in practice; working around an ActiveFedora quirk for testing
       pub.add_child(self.generate_dublin_core.root.clone)
       @public_xml_doc = pub # save this for possible IIIF Presentation manifest
-      pub.add_child(Nokogiri(self.generate_release_xml).root.clone)  #TODO:  Adding this breaks tests, rework these
+      pub.add_child(Nokogiri(self.generate_release_xml).root.clone) unless release_xml.children.size == 0 #If there are no release_tags, this prevents an empty <releaseData/> from being added
+      #Note we cannot base this on if an individual object has release tags or not, because the collection may cause one to be generated for an item, so we need to calculate it and then look at the final result
       new_pub = Nokogiri::XML(pub.to_xml) { |x| x.noblanks }
       new_pub.encoding = 'UTF-8'
       new_pub.to_xml
@@ -89,4 +90,4 @@ module Dor
     end
   end
 
-end
+end

data/lib/dor/models/releaseable.rb

@@ -33,7 +33,7 @@ module Dor
     #@return [String] The XML release node as a string, with ReleaseDigest as the root document
     def generate_release_xml
       builder = Nokogiri::XML::Builder.new do |xml|
-        xml.ReleaseData {
+        xml.releaseData {
           self.released_for.each do |project,released_value|
             xml.release(released_value["release"],:to=>project)
           end  
@@ -282,13 +282,20 @@ module Dor
     #
     #@params tag [Boolean] True or false for the release node
     #@params attrs [hash]  A hash of any attributes to be placed onto the tag 
+    #Timestamp will be calculated by the function, if no displayType is passed in, it will default to file
+    #
     #@example
-    #  item.add_tag(true,:release,{:tag=>'Fitch : Batch2',:what=>'self',:to=>'Searchworks',:who=>'petucket'})
+    #  item.add_tag(true,:release,{:tag=>'Fitch : Batch2',:what=>'self',:to=>'Searchworks',:who=>'petucket', :displayType='filmstrip'})
     def add_release_node(release, attrs={})
       identity_metadata_ds = self.identityMetadata
-      attrs[:when] = Time.now.utc.iso8601 if attrs[:when] == nil#add the timestamp
+      attrs[:when] = Time.now.utc.iso8601 if attrs[:when].nil? #add the timestamp
+      attrs[:displayType] = 'file' if attrs[:displayType].nil? #default to file is no display type is passed
       valid_release_attributes(release, attrs)
   
+      #Remove the old displayType and then add the one for this tag
+      remove_displayTypes
+      identity_metadata_ds.add_value(:displayType, attrs[:displayType], {})
+      
       return identity_metadata_ds.add_value(:release, release.to_s, attrs)
     end
 
@@ -311,6 +318,8 @@ module Dor
       end
       raise ArgumentError, ":what must be self or collection" if ! what_correct
       raise ArgumentError, "the value set for this tag is not a boolean" if !!tag != tag
+      raise ArgumentError, ":displayType must be passed in as a String" unless attrs[:displayType].class == String
+      
       validate_tag_format(attrs[:tag]) if attrs[:tag] != nil #Will Raise exception if invalid tag
       return true
     end

data/lib/dor/version.rb

@@ -1,3 +1,3 @@
 module Dor
-  VERSION = '4.21.1'
+  VERSION = '4.21.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services
 version: !ruby/object:Gem::Version
-  version: 4.21.1
+  version: 4.21.2
 platform: ruby
 authors:
 - Michael Klein
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-25 00:00:00.000000000 Z
+date: 2015-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -531,16 +531,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- bin/dor-indexer
-- bin/dor-indexerd
-- config/certs/README
-- config/certs/robots-dor-dev.crt
-- config/certs/robots-dor-dev.key
-- config/config_defaults.yml
-- config/dev_console_env.rb
-- config/dev_console_env.rb.example
-- config/predicate_mappings.yml
-- lib/dor-services.rb
 - lib/dor/config.rb
 - lib/dor/datastreams/administrative_metadata_ds.rb
 - lib/dor/datastreams/content_metadata_ds.rb
@@ -615,10 +605,23 @@ files:
 - lib/dor/workflow/document.rb
 - lib/dor/workflow/graph.rb
 - lib/dor/workflow/process.rb
+- lib/dor-services.rb
 - lib/gsearch/demoFoxmlToSolr.xslt
 - lib/gsearch/schema.xml
 - lib/tasks/dor.rake
 - lib/tasks/rdoc.rake
+- config/certs/dor-services-dor-dev.crt
+- config/certs/dor-services-dor-dev.key
+- config/certs/README
+- config/certs/robots-dor-test.crt
+- config/certs/robots-dor-test.key
+- config/config_defaults.yml
+- config/dev_console_env.rb
+- config/dev_console_env.rb.example
+- config/predicate_mappings.yml
+- config/test.rb
+- bin/dor-indexer
+- bin/dor-indexerd
 homepage: 
 licenses:
 - ALv2
@@ -640,7 +643,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Ruby implmentation of DOR services used by the SULAIR Digital Library

data/config/certs/robots-dor-dev.crt

@@ -1,29 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIE9zCCAt8CCQCcUJVDTu7rTjANBgkqhkiG9w0BAQUFADCBvzELMAkGA1UEBhMC
-VVMxEzARBgNVBAgTCkNhbGlmb3JuaWExETAPBgNVBAcTCFN0YW5mb3JkMRwwGgYD
-VQQKExNTdGFuZm9yZCBVbml2ZXJzaXR5MRIwEAYDVQQLEwlMaWJyYXJpZXMxJTAj
-BgNVBAMTHFNVTCBET1IgKGRldi90ZXN0KSBhY2Nlc3MgQ0ExLzAtBgkqhkiG9w0B
-CQEWIHN1bC13ZWJtYXN0ZXJAbGlzdHMuc3RhbmZvcmQuZWR1MB4XDTEyMDkyNjE1
-NTQzNVoXDTIyMDkyNDE1NTQzNVowgboxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpD
-YWxpZm9ybmlhMREwDwYDVQQHEwhTdGFuZm9yZDEcMBoGA1UEChMTU3RhbmZvcmQg
-VW5pdmVyc2l0eTEyMDAGA1UEAxQpcm9ib3RzQHN1bC1seWJlcnNlcnZpY2VzLWRl
-di5zdGFuZm9yZC5lZHUxMTAvBgkqhkiG9w0BCQEWImRsc3MtZGV2ZWxvcGVyc0Bs
-aXN0cy5zdGFuZm9yZC5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQC1t+PPhLTDFQBuAf4f1GOj7jHdXMN0tvSHL1OCaibe0d8iKbXCMMIE0z8lbBpZ
-1pA+8terIvxoTlly92EEvGkywZb+DIxnjyG0b9ftDJ64pARJMcnvwJMW/w3WdHCd
-5uJ5HVM8ZCbEItUfskFukS6tfNBpG8ri6cIQ2ulJzOWYxPV5R2eRneM6vtFD0xtu
-RJb/uMwiOwB79qk4QazbEQtkeZsrvomDFkIuHO/nf9wmgYG99H7q1kXplIrzDDX+
-fvD+JHvuMr5YXfmBQ9wmaZf6YIL7CXj79HUF4uG/a0SjrLZyLh262zWJQFVpjSW8
-Brl/fAyjeZvWJMyCDXRqsedjAgMBAAEwDQYJKoZIhvcNAQEFBQADggIBAG0jIfTj
-1FJsxTzcD938vtKuNo5XEIX8phqW1MA2eJ5Ojgu1hpW5Jf7fmUHKVnamm7eya5QR
-356KCJzZzwdCS4xVFq/l43gCA2j8TYrwO6/0EfM/5psUZS3ecwahzcJXfHPHvd9u
-qaXRqbjJYi+Ls70uStTC/JBIIu48atDF0DeXJ21hAbstZ1OKKNzAcYgZk14GKxCi
-ArgAzdg8UDtC4KsdqgxP6vF8Vc/gcHSu9AkVHgPVXbITjV0/kaKNgFi0bVqP7bJD
-hrUFYrS+S+hflQJCmVrDwW0JU2HnJ3EJOFX5F4FYHL4vt6ZjVsMzucraMqiLyUaO
-s6DVaWO8WMlphmFUfb3ChQjrKxFZZ6vKJPD/ExnQHa0kWwOELyMJuXw2PLk7k+qD
-rmjX+K3Ed+JiJuiDG5k8f1BDZE24lvxDwye5fQyDWPfib1yTClYYy4PRh4AI688f
-qgMyv51Qx82o0IJ1On1rNg5/iB7OEVcYSol3U5xiY9gRUd3vq637agZzMuRQnKXs
-Uj0+Vl4OrZ54F8MVsUKfi7Je1oVUEhuHqFt/tSOGlHg1XyR/ExwulCNBKIVdhhrF
-rxZCYrGDSUCF6tteJXpOBTtFT9b7hbMmBohKyS4XjfPSPRh9QHx7wepqSp3aHpmR
-4gY8Go40mS83xHCKBooqsy2/Z9vQlSb9Cr8u
------END CERTIFICATE-----

data/config/certs/robots-dor-dev.key

@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpQIBAAKCAQEAtbfjz4S0wxUAbgH+H9Rjo+4x3VzDdLb0hy9Tgmom3tHfIim1
-wjDCBNM/JWwaWdaQPvLXqyL8aE5ZcvdhBLxpMsGW/gyMZ48htG/X7QyeuKQESTHJ
-78CTFv8N1nRwnebieR1TPGQmxCLVH7JBbpEurXzQaRvK4unCENrpSczlmMT1eUdn
-kZ3jOr7RQ9MbbkSW/7jMIjsAe/apOEGs2xELZHmbK76JgxZCLhzv53/cJoGBvfR+
-6tZF6ZSK8ww1/n7w/iR77jK+WF35gUPcJmmX+mCC+wl4+/R1BeLhv2tEo6y2ci4d
-uts1iUBVaY0lvAa5f3wMo3mb1iTMgg10arHnYwIDAQABAoIBAQCmlDzsZZ2C24S6
-U29OZFc21kq1vqyaGIEOT48BFSguyDsAyTWKH0IsRC41suRxCGTQn7KeegLh5zjO
-UAGK4uCYm6g7mOs4n5fpHUHWVuRFJG2dX1vbQTBVO1fHCJSX2ygumHhN+w0ibT/r
-v2+F2ObuOGWghM62tkylQNfsRD0QjalE8ST2xp9p4xwPrAwEuURlA04qnLYNi4+6
-qexDtrLG8E6JV/dd3dY95WjKPscadR1fAKm9sebD0XO31Lu6BGCvpmBU0OmYVfrY
-BN/ofhEmJh+Xgwfxx6PicRDvu9bPnffqbGhDO4ckGDlqXp1fDBgf1I7CclXdrVMH
-Qsxunh5pAoGBAN7929V1aw0S7Rqvuf4N+o1XwBExa2DL7EYI1Oea/nuBMPqvfeNh
-SrbM0gYejEzLmeRUUKRhMMoAgXQnxcg3Kz/5pUXT3b4YtzeskX8nkJ6/2gEU3M7E
-lJj7c5wW1otqMH19+iDNR4N8vjPh98kDJW1HZUHSAcdyE+dZiFP2ofMfAoGBANCe
-AJgA9EkdwZsom+I7Ty9LSrTWx6cKmNEbLVn1iSlyJx1kHoWyTMtuZszCWBjiXx70
-84WpX2B4MuJBq6sSoEiUahNsphks82glOd6i+eoE/I+NtZehOFnkAMyGux+FbMyG
-q/9ZlQgsbWpFHxS59vX/kvlNun2RpJkaF6QPBuc9AoGBAIGdscCb5cPNsoCGkGf6
-HB84WG4l+bJkFkyHKaoOT8neSGgOxe/7R4CGAbaI3yhsWGF+GPnTfJaOQLERxUch
-ukQPil/STNwIZcc4ycHNb6S3A7MJO2f8oBtkXcjnBYI4EUOAjHmwmNb3FV/3Ax6W
-c5TXoSXnOh2CU8twIWwcufolAoGATqnFf4uckZVu05rUbNIAYcz6NoZmck5EoVSm
-HS3Asqggp6yA9djtrCfNC5icr4VsaLfku5nKJQ4t4bLxkGhNmBCejwSA/S09+x9O
-Wu0JX3zR3y+IMczQ+tRGmNiU5qXhCJ4fbQHSeGqIN3Io7h/RR6E/QlJU59RrRG/a
-SjqAV+ECgYEA2mA5VFK3jECnLde+biEaXidIOuBMcqaP0VG6sBwz2wTGSTBE1WkG
-6prCD0McWVAgDTm3MMKxeuMaoW5eEi83+G+CywLaTBpc8Hz7qgRhBpKhRirCfHMW
-EfQV5k32vEGoSI+eG8zcGb9mwDeb/EWXAMGXrx2YuYFu7txtwC2mZXc=
------END RSA PRIVATE KEY-----