Skip to content

Commit 790fb84

Browse files
committed
Remove iRods integration: delete iRods storage service, plugin, config, and docs. Update changelog. Users must use another storage backend (filesystem, MongoDB GridFS, or AWS S3).
1 parent 85df2b0 commit 790fb84

File tree

6 files changed

+12
-321
lines changed

6 files changed

+12
-321
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](http://keepachangelog.com/)
66
and this project adheres to [Semantic Versioning](http://semver.org/).
77

8+
## [Unreleased]
9+
10+
### Removed
11+
- Removed iRods integration and dependencies. The iRods file storage service and plugin have been completely removed from the codebase. Users who were using iRods for file storage will need to configure an alternative storage backend (filesystem, MongoDB GridFS, or AWS S3).
12+
813
## 1.22.1 - 2023-11-10
914

1015
### Fixed

app/services/irods/IRODSByteStorageService.scala

Lines changed: 0 additions & 198 deletions
This file was deleted.

app/services/irods/IRODSPlugin.scala

Lines changed: 0 additions & 93 deletions
This file was deleted.

conf/application.conf

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -324,30 +324,6 @@ filesystem.sourcepaths=[
324324
"/home/globus",
325325
]
326326

327-
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
328-
# IRODSPlugin Plugin
329-
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
330-
# To use the IRODS filesystem uncomment the following line
331-
#service.byteStorage=services.irods.IRODSByteStorageService
332-
#
333-
# iRODS server host name
334-
irods.host=localhost
335-
# iRODS server port number
336-
irods.port=1247
337-
# Account name
338-
irods.username=anonymous
339-
# Account password
340-
## if irods.username=anonymous use "" for password (irods.password="")
341-
irods.password=""
342-
# Default storage resource name
343-
irods.defaultStorageResource= demoResc
344-
# iRODS zone
345-
irods.zone=tempZone
346-
# Home directory in iRODS
347-
irods.userhome=/tempZone/home/public
348-
# Current directory in iRODS
349-
irods.usercurrent=/tempZone/home/public
350-
351327
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
352328
# Elasticsearch
353329
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

doc/src/sphinx/develop/architecture.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ provided for external clients to communicate with the system. These clients can
99
cases as well as headless scripts for system to system communication.
1010

1111
A service layer abstracts backend services so that individual deployments can be customized based on available resources.
12-
For example a user might want to store raw files on the file system, MongoDB GridFS, iRods or AWS S3 buckets.
12+
For example a user might want to store raw files on the file system, MongoDB GridFS, or AWS S3 buckets.
1313

1414
When new data is added to the system, whether it is via the web interface or through the RESTful API, preprocessing is
1515
off-loaded to extraction services in charge of extracting appropriate data and metadata. The extraction services attempt

project/Build.scala

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,6 @@ object ApplicationBuild extends Build {
118118
// Testing framework
119119
"org.scalatestplus" % "play_2.10" % "1.0.0" % "test",
120120

121-
// iRods filestorage
122-
"org.irods.jargon" % "jargon-core" % "3.3.3-beta1",
123-
124121
// jsonp return from /api
125122
"org.julienrf" %% "play-jsonp-filter" % "1.1",
126123

@@ -153,15 +150,19 @@ object ApplicationBuild extends Build {
153150
routesImport += "models._",
154151
routesImport += "Binders._",
155152
templatesImport += "org.bson.types.ObjectId",
153+
resolvers := Seq(
154+
"Typesafe Releases Repository" at "https://repo.lightbend.com/typesafe/releases/",
155+
"Typesafe repository" at "https://repo.lightbend.com/typesafe/releases/"
156+
) ++ resolvers.value.filterNot(r => r.name == "Typesafe Releases Repository" || r.name == "Typesafe repository"),
156157
resolvers += Resolver.url("sbt-plugin-releases", url("https://repo.scala-sbt.org/scalasbt/sbt-plugin-releases/"))(Resolver.ivyStylePatterns),
157158
resolvers += Resolver.url("sbt-plugin-snapshots", url("https://repo.scala-sbt.org/scalasbt/sbt-plugin-snapshots/"))(Resolver.ivyStylePatterns),
158159
resolvers += "Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots",
159160
resolvers += "Aduna" at "https://maven-us.nuxeo.org/nexus/content/repositories/public/",
160161
//resolvers += "Forth" at "http://139.91.183.63/repository",
161-
resolvers += "NCSA" at "https://opensource.ncsa.illinois.edu/nexus/content/repositories/thirdparty",
162-
resolvers += "Typesafe repository" at "https://repo.lightbend.com/typesafe/releases/",
162+
//resolvers += "NCSA" at "https://opensource.ncsa.illinois.edu/nexus/content/repositories/thirdparty",
163163
resolvers += "Maven Central" at "https://repo1.maven.org/maven2/",
164164

165+
165166
// add custom folder to the classpath, use this to add/modify clowder:
166167
// custom/public/stylesheets/themes - for custom themes
167168
// custom/public/javascripts/previewers - for custom previewers

0 commit comments

Comments
 (0)