diff --git a/modules/dcache-frontend/src/main/resources/org/dcache/frontend/frontend.xml b/modules/dcache-frontend/src/main/resources/org/dcache/frontend/frontend.xml index 4c159400831..23009ef6f6f 100644 --- a/modules/dcache-frontend/src/main/resources/org/dcache/frontend/frontend.xml +++ b/modules/dcache-frontend/src/main/resources/org/dcache/frontend/frontend.xml @@ -19,15 +19,12 @@ --> + http://www.springframework.org/schema/plugin http://www.springframework.org/schema/plugin/spring-plugin.xsd"> @@ -398,6 +395,16 @@ + + Provide access to dcache-view-admin + + + + + + + + Provide access to standard swagger-ui library diff --git a/packages/fhs/src/main/assembly/fhs.xml b/packages/fhs/src/main/assembly/fhs.xml index e90a8446c55..b9b2cdbd37a 100644 --- a/packages/fhs/src/main/assembly/fhs.xml +++ b/packages/fhs/src/main/assembly/fhs.xml @@ -7,6 +7,7 @@ *saxon:saxon*:*:* org.dcache:dcache-view:jar:* + org.dcache:dcache-view-admin:jar:* usr/share/dcache/classes false @@ -32,6 +33,16 @@ 755 true + + + org.dcache:dcache-view-admin:jar:* + + usr/share/dcache/dcache-view-admin + false + 644 + 755 + true + diff --git a/packages/pom.xml b/packages/pom.xml index 70a34fa8349..98a91f0260c 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -205,6 +205,10 @@ org.dcache dcache-view + + org.dcache + dcache-view-admin + saxon diff --git a/packages/system-test/src/main/assembly/assembly.xml b/packages/system-test/src/main/assembly/assembly.xml index 974dfd34abd..eeba512e253 100644 --- a/packages/system-test/src/main/assembly/assembly.xml +++ b/packages/system-test/src/main/assembly/assembly.xml @@ -9,6 +9,7 @@ saxon:saxon:*:* org.dcache:dcache-plugin-hsqldb:zip:* org.dcache:dcache-view:jar:* + org.dcache:dcache-view-admin:jar:* share/classes false @@ -41,6 +42,15 @@ 755 true + + + org.dcache:dcache-view-admin:jar:* + + share/dcache-view-admin + 644 + 755 + true + diff --git a/packages/tar/src/main/assembly/tar.xml b/packages/tar/src/main/assembly/tar.xml index 87bb53e7c88..76b697222e4 100644 --- a/packages/tar/src/main/assembly/tar.xml +++ b/packages/tar/src/main/assembly/tar.xml @@ -8,6 +8,7 @@ *:*:war:* saxon:saxon:*:* org.dcache:dcache-view:jar:* + org.dcache:dcache-view-admin:jar:* share/classes false @@ -31,6 +32,15 @@ 755 true + + + org.dcache:dcache-view-admin:jar:* + + share/dcache-view-admin + 644 + 755 + true + diff --git a/pom.xml b/pom.xml index 07e9c2b4bda..51c6b229e55 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,8 @@ 9.4.52.v20230823 4.5.8 2.28 - 2.1.0 + 3.0.0 + 3.0.0 4.1.94.Final ${project.version} 3.1.7 @@ -745,6 +746,12 @@ ${version.dcache-view} + + org.dcache + dcache-view-admin + ${version.dcache-view-admin} + + org.bouncycastle ${bouncycastle.bcpkix} diff --git a/skel/share/dcache-view-admin/.empty-dir b/skel/share/dcache-view-admin/.empty-dir new file mode 100644 index 00000000000..e69de29bb2d diff --git a/skel/share/defaults/frontend.properties b/skel/share/defaults/frontend.properties index 920d0e1a6a5..6a28811b69b 100644 --- a/skel/share/defaults/frontend.properties +++ b/skel/share/defaults/frontend.properties @@ -472,6 +472,12 @@ frontend.service.billing.collection.timeout.unit = MINUTES # frontend.dcache-view.dir = ${dcache.paths.share}/dcache-view +# ---- Directory with default static content +# +# The directory in the local file system containing the dcache-view-admin +# files. +# +frontend.dcache-view-admin.dir = ${dcache.paths.share}/dcache-view-admin # ---- Static values for frontend # diff --git a/skel/share/services/frontend.batch b/skel/share/services/frontend.batch index 25b08a7e355..7f498332b4d 100644 --- a/skel/share/services/frontend.batch +++ b/skel/share/services/frontend.batch @@ -80,6 +80,7 @@ check -strong frontend.restore-requests.topic check -strong frontend.restore-requests.lifetime check -strong frontend.restore-requests.lifetime.unit check -strong frontend.dcache-view.dir +check -strong frontend.dcache-view-admin.dir check -strong frontend.static!dcache-view.endpoints.webapi check frontend.static!dcache-view.endpoints.webdav