Skip to content

Commit

Permalink
commits
Browse files Browse the repository at this point in the history
  • Loading branch information
terrywbrady committed Jul 23, 2024
1 parent a9911ad commit 4498813
Show file tree
Hide file tree
Showing 9 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion mrt-integ-tests
2 changes: 1 addition & 1 deletion mrt-services/audit/mrt-audit
2 changes: 1 addition & 1 deletion mrt-services/dep_cloud/mrt-cloud
2 changes: 1 addition & 1 deletion mrt-services/dep_zk/mrt-zk
Submodule mrt-zk updated 63 files
+42 −0 .vscode/extensions.json
+2 −1 .vscode/settings.json
+18 −3 README.md
+45 −5 api/java/index-all.html
+1 −1 api/java/member-search-index.js
+ api/java/member-search-index.zip
+3 −1 api/java/org/cdlib/mrt/zk/Access.html
+42 −15 api/java/org/cdlib/mrt/zk/Batch.html
+221 −73 api/java/org/cdlib/mrt/zk/Job.html
+51 −12 api/java/org/cdlib/mrt/zk/MerrittJsonKey.html
+146 −14 api/java/org/cdlib/mrt/zk/MerrittLocks.html
+14 −1 api/java/org/cdlib/mrt/zk/QueueItem.BatchJobStates.html
+6 −2 api/java/org/cdlib/mrt/zk/QueueItem.html
+33 −10 api/java/org/cdlib/mrt/zk/QueueItemHelper.html
+22 −6 api/java/org/cdlib/mrt/zk/ZKKey.html
+15 −8 api/java/org/cdlib/mrt/zk/class-use/IngestState.html
+21 −6 api/java/org/cdlib/mrt/zk/class-use/Job.html
+83 −0 api/java/org/cdlib/mrt/zk/class-use/MerrittStateError.html
+51 −33 api/java/org/cdlib/mrt/zk/class-use/MerrittZKNodeInvalid.html
+1 −1 api/java/org/cdlib/mrt/zk/package-summary.html
+ api/java/package-search-index.zip
+ api/java/type-search-index.zip
+9 −3 api/ruby/MerrittZK/Access.html
+29 −5 api/ruby/MerrittZK/Batch.html
+86 −29 api/ruby/MerrittZK/Job.html
+1 −1 api/ruby/MerrittZK/LargeLegacyAccessJob.html
+4 −4 api/ruby/MerrittZK/LegacyAccessJob.html
+13 −13 api/ruby/MerrittZK/LegacyIngestJob.html
+4 −4 api/ruby/MerrittZK/LegacyInventoryJob.html
+11 −11 api/ruby/MerrittZK/LegacyItem.html
+155 −11 api/ruby/MerrittZK/Locks.html
+20 −20 api/ruby/MerrittZK/QueueItem.html
+1 −1 api/ruby/MerrittZK/SmallLegacyAccessJob.html
+2 −0 api/ruby/MerrittZK/ZkKeys.html
+6 −6 api/ruby/created.rid
+1 −1 api/ruby/js/search_index.js
+ api/ruby/js/search_index.js.gz
+45 −0 api/ruby/table_of_contents.html
+11 −14 buildspec.yml
+2 −1 design/data.md
+1 −0 design/states.md
+14 −1 design/test_plan.md
+1 −1 docker-compose.yml
+8 −1 pom.xml
+31 −0 settings.xml
+1 −1 src/main/java/org/cdlib/mrt/zk/Access.java
+12 −3 src/main/java/org/cdlib/mrt/zk/Batch.java
+61 −24 src/main/java/org/cdlib/mrt/zk/Job.java
+2 −0 src/main/java/org/cdlib/mrt/zk/MerrittJsonKey.java
+19 −0 src/main/java/org/cdlib/mrt/zk/MerrittLocks.java
+23 −14 src/main/java/org/cdlib/mrt/zk/QueueItem.java
+14 −0 src/main/java/org/cdlib/mrt/zk/QueueItemHelper.java
+4 −0 src/main/java/org/cdlib/mrt/zk/ZKKey.java
+1 −1 src/main/java/org/cdlib/mrt/zk/package-info.java
+7 −1 src/main/ruby/lib/merritt_zk_access.rb
+4 −0 src/main/ruby/lib/merritt_zk_batch.rb
+22 −4 src/main/ruby/lib/merritt_zk_job.rb
+24 −0 src/main/ruby/lib/merritt_zk_locks.rb
+2 −1 src/main/ruby/lib/merritt_zk_queue_item.rb
+26 −27 src/main/ruby/show_all.rb
+86 −8 src/main/ruby/spec/zk_spec.rb
+118 −27 src/test/java/org/cdlib/mrt/zk/ZKTestIT.java
+60 −4 test-cases.yml
2 changes: 1 addition & 1 deletion mrt-services/ingest/mrt-ingest
Submodule mrt-ingest updated 57 files
+21 −0 Dockerfile
+41 −0 buildspec.yml
+9 −0 docker/admin-submit/README.md
+42 −0 docker/profiles-dev/cdl_dryaddev_content
+42 −0 docker/profiles-dev/merritt_demo_content
+37 −0 docker/profiles/TEMPLATE-PROFILE
+36 −0 docker/profiles/admin/docker/collection/TEMPLATE-COLLECTION
+36 −0 docker/profiles/admin/docker/collection/sample
+37 −0 docker/profiles/admin/docker/owner/TEMPLATE-OWNER
+37 −0 docker/profiles/admin/docker/owner/sample_owner
+36 −0 docker/profiles/admin/docker/sla/TEMPLATE-SLA
+36 −0 docker/profiles/admin/docker/sla/sample_service_level_agreement
+42 −0 docker/profiles/cdl_dryaddev_content
+61 −0 docker/profiles/merritt_demo_content
+4 −6 ingest-conf/src/main/yaml/ingestConfig.yaml
+6 −12 ingest-it/pom.xml
+2 −3 ingest-it/src/main/resources/resources/ingestConfig.yaml
+4 −4 ingest-it/src/test/docker/docker-compose.yml
+17 −5 ingest-it/src/test/java/org/cdlib/mrt/ingest/ServiceDriverIT.java
+2 −7 ingest-src/pom.xml
+33 −694 ingest-src/src/main/java/org/cdlib/mrt/ingest/BatchManager.java
+0 −28 ingest-src/src/main/java/org/cdlib/mrt/ingest/BatchState.java
+0 −1 ingest-src/src/main/java/org/cdlib/mrt/ingest/IngestConfig.java
+0 −69 ingest-src/src/main/java/org/cdlib/mrt/ingest/IngestQueue.java
+0 −91 ingest-src/src/main/java/org/cdlib/mrt/ingest/IngestQueueNameState.java
+0 −49 ingest-src/src/main/java/org/cdlib/mrt/ingest/IngestQueueNameStateInf.java
+0 −123 ingest-src/src/main/java/org/cdlib/mrt/ingest/JobsState.java
+0 −54 ingest-src/src/main/java/org/cdlib/mrt/ingest/JobsStateInf.java
+51 −65 ingest-src/src/main/java/org/cdlib/mrt/ingest/ProcessManager.java
+0 −394 ingest-src/src/main/java/org/cdlib/mrt/ingest/QueueEntryState.java
+0 −59 ingest-src/src/main/java/org/cdlib/mrt/ingest/QueueEntryStateInf.java
+43 −678 ingest-src/src/main/java/org/cdlib/mrt/ingest/QueueManager.java
+0 −97 ingest-src/src/main/java/org/cdlib/mrt/ingest/QueueState.java
+0 −48 ingest-src/src/main/java/org/cdlib/mrt/ingest/QueueStateInf.java
+0 −542 ingest-src/src/main/java/org/cdlib/mrt/ingest/app/jersey/admin/JerseyAdmin.java
+0 −34 ingest-src/src/main/java/org/cdlib/mrt/ingest/app/jersey/post/JerseyPost.java
+42 −93 ingest-src/src/main/java/org/cdlib/mrt/ingest/consumer/BatchConsumer.java
+50 −96 ingest-src/src/main/java/org/cdlib/mrt/ingest/consumer/BatchReportConsumer.java
+42 −89 ingest-src/src/main/java/org/cdlib/mrt/ingest/consumer/DownloadConsumer.java
+89 −95 ingest-src/src/main/java/org/cdlib/mrt/ingest/consumer/EstimateConsumer.java
+54 −96 ingest-src/src/main/java/org/cdlib/mrt/ingest/consumer/NotifyConsumer.java
+53 −89 ingest-src/src/main/java/org/cdlib/mrt/ingest/consumer/ProcessConsumer.java
+54 −89 ingest-src/src/main/java/org/cdlib/mrt/ingest/consumer/ProvisionConsumer.java
+0 −704 ingest-src/src/main/java/org/cdlib/mrt/ingest/consumer/RecordConsumer.java
+5 −5 ingest-src/src/main/java/org/cdlib/mrt/ingest/handlers/batchProcess/HandlerSubmit.java
+5 −6 ingest-src/src/main/java/org/cdlib/mrt/ingest/handlers/batchReport/HandlerNotification.java
+35 −24 ingest-src/src/main/java/org/cdlib/mrt/ingest/handlers/process/HandlerTransfer.java
+3 −0 ingest-src/src/main/java/org/cdlib/mrt/ingest/handlers/queue/HandlerNotification.java
+11 −8 ingest-src/src/main/java/org/cdlib/mrt/ingest/handlers/queue/HandlerSubmit.java
+0 −125 ingest-src/src/main/java/org/cdlib/mrt/ingest/handlers/record/HandlerInventoryQueue.java
+1 −103 ingest-src/src/main/java/org/cdlib/mrt/ingest/service/IngestService.java
+0 −118 ingest-src/src/main/java/org/cdlib/mrt/ingest/service/IngestServiceInf.java
+4 −0 ingest-src/src/main/java/org/cdlib/mrt/ingest/utility/FileUtilAlt.java
+1 −1 ingest-src/src/main/java/org/cdlib/mrt/ingest/utility/JSONUtil.java
+1 −0 ingest-src/src/main/java/org/cdlib/mrt/ingest/utility/LocalIDUtil.java
+2 −3 ingest-src/src/test/resources/resources/ingestConfig.yaml
+31 −0 settings.xml
2 changes: 1 addition & 1 deletion mrt-services/replic/mrt-replic

0 comments on commit 4498813

Please sign in to comment.