From: Ray Lee Date: Thu, 18 Jul 2019 00:26:04 +0000 (-0700) Subject: DRYD-692: Rework UI config/deployment process. X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=60a04cb3d7d8c3b8ac83054950564e0b49aaf862;p=tmp%2Fjakarta-migration.git DRYD-692: Rework UI config/deployment process. --- diff --git a/build.properties b/build.properties index 856de977b..1a09e43c8 100644 --- a/build.properties +++ b/build.properties @@ -19,16 +19,9 @@ cspace.services.context=${domain.cspace} cspace.services.war=${cspace.services.context}.war domain.nuxeo=nuxeo-server -# CSpace UI plugin defaults -cspace.ui.dest= -cspace.ui.tenantid=1 -cspace.ui.logo=undefined -cspace.ui.message.title=CollectionSpace Default Profile +# UI settings +cspace.ui.library.name=cspaceUI cspace.ui.version=^2.0.0 -cspace.ui.basename=/cspace/core -cspace.ui.webapp=cspace#core -cspace.ui.webapp.name=cspaceUI -cspace.ui.js=${cspace.ui.webapp.name}@${cspace.ui.version}.min.js #nuxeo nuxeo.release=9.10-HF30 diff --git a/cspace-ui/cspace#anthro/WEB-INF/web.xml b/cspace-ui/anthro/WEB-INF/web.xml similarity index 100% rename from cspace-ui/cspace#anthro/WEB-INF/web.xml rename to cspace-ui/anthro/WEB-INF/web.xml diff --git a/cspace-ui/anthro/build.properties b/cspace-ui/anthro/build.properties new file mode 100644 index 000000000..efb3acd6b --- /dev/null +++ b/cspace-ui/anthro/build.properties @@ -0,0 +1,6 @@ +tenant.ui.webapp.dir=cspace#${tenant.shortname} +tenant.ui.basename=/cspace/${tenant.shortname} + +tenant.ui.profile.plugin.package.name=cspace-ui-plugin-profile-anthro +tenant.ui.profile.plugin.library.name=cspaceUIPluginProfileAnthro +tenant.ui.profile.plugin.version=^2.0.0 diff --git a/cspace-ui/anthro/index.html b/cspace-ui/anthro/index.html new file mode 100644 index 000000000..1a3b160ab --- /dev/null +++ b/cspace-ui/anthro/index.html @@ -0,0 +1,20 @@ + + + + + +

+ + + + + diff --git a/cspace-ui/cspace#core#template/WEB-INF/web.xml b/cspace-ui/bonsai/WEB-INF/web.xml similarity index 100% rename from cspace-ui/cspace#core#template/WEB-INF/web.xml rename to cspace-ui/bonsai/WEB-INF/web.xml diff --git a/cspace-ui/bonsai/build.properties b/cspace-ui/bonsai/build.properties new file mode 100644 index 000000000..167714807 --- /dev/null +++ b/cspace-ui/bonsai/build.properties @@ -0,0 +1,6 @@ +tenant.ui.webapp.dir=cspace#${tenant.shortname} +tenant.ui.basename=/cspace/${tenant.shortname} + +tenant.ui.profile.plugin.package.name=cspace-ui-plugin-profile-bonsai +tenant.ui.profile.plugin.library.name=cspaceUIPluginProfileBonsai +tenant.ui.profile.plugin.version=^1.0.0 diff --git a/cspace-ui/bonsai/index.html b/cspace-ui/bonsai/index.html new file mode 100644 index 000000000..1a3b160ab --- /dev/null +++ b/cspace-ui/bonsai/index.html @@ -0,0 +1,20 @@ + + + + + +

+ + + + + diff --git a/cspace-ui/build.xml b/cspace-ui/build.xml index f478a8355..60a8720ae 100644 --- a/cspace-ui/build.xml +++ b/cspace-ui/build.xml @@ -1,503 +1,132 @@ - + - CollectionSpace UI Component build + CollectionSpace UI + + + + + + + + + + + + + project.setProperty(attributes.get("property"), attributes.get("string").toUpperCase()); + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Setting primary vars - The value of primary.profile.plugin.name is ${primary.profile.plugin.name} - - - The value of primary.profile.plugin.name is ${primary.profile.plugin.name} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - -o ${primary.profile.plugin.js} --fail --insecure --remote-name --location https://unpkg.com/${primary.profile.plugin.package}@${primary.profile.plugin.version}/dist/${primary.profile.plugin.name}.min.js - - + + + - - - - - - - - - - - - - - - + - - - + + - - - - - - + + + + - - - + + + + - - - - + + - - - - Downloading from https://unpkg.com/cspace-ui@${cspace.ui.version}/dist/${cspace.ui.webapp.name}.min.js + + + - - - - - - - - - - - - - + + - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - + + - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + + + + + + - - - - - - - - - - - + + - - - - - + + + + - - - - - - - - - - - - - - - - + + - - - - - - - - + - - - - + - - - - + + - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - + + diff --git a/cspace-ui/cspace#core/WEB-INF/web.xml b/cspace-ui/core/WEB-INF/web.xml similarity index 100% rename from cspace-ui/cspace#core/WEB-INF/web.xml rename to cspace-ui/core/WEB-INF/web.xml diff --git a/cspace-ui/core/build.properties b/cspace-ui/core/build.properties new file mode 100644 index 000000000..edcfe5fae --- /dev/null +++ b/cspace-ui/core/build.properties @@ -0,0 +1,2 @@ +tenant.ui.webapp.dir=cspace#${tenant.shortname} +tenant.ui.basename=/cspace/${tenant.shortname} diff --git a/cspace-ui/core/index.html b/cspace-ui/core/index.html new file mode 100644 index 000000000..3fad096e3 --- /dev/null +++ b/cspace-ui/core/index.html @@ -0,0 +1,16 @@ + + + + + +

+ + + + diff --git a/cspace-ui/cspace#anthro/index.html b/cspace-ui/cspace#anthro/index.html deleted file mode 100644 index 95696634f..000000000 --- a/cspace-ui/cspace#anthro/index.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - -

- - - - - diff --git a/cspace-ui/cspace#bonsai/index.html b/cspace-ui/cspace#bonsai/index.html deleted file mode 100644 index a97f78c11..000000000 --- a/cspace-ui/cspace#bonsai/index.html +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - -

- - - - - diff --git a/cspace-ui/cspace#core#template/index.html b/cspace-ui/cspace#core#template/index.html deleted file mode 100644 index 7f4ac24e6..000000000 --- a/cspace-ui/cspace#core#template/index.html +++ /dev/null @@ -1,23 +0,0 @@ - - - - - -

- - - - diff --git a/cspace-ui/cspace#core/index.html b/cspace-ui/cspace#core/index.html deleted file mode 100644 index 33a05154d..000000000 --- a/cspace-ui/cspace#core/index.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - -

- - - - diff --git a/cspace-ui/cspace#fcart/index.html b/cspace-ui/cspace#fcart/index.html deleted file mode 100644 index b3a6367f4..000000000 --- a/cspace-ui/cspace#fcart/index.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - -

- - - - - diff --git a/cspace-ui/cspace#lhmc/index.html b/cspace-ui/cspace#lhmc/index.html deleted file mode 100644 index b439bcb78..000000000 --- a/cspace-ui/cspace#lhmc/index.html +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - -

- - - - - diff --git a/cspace-ui/cspace#materials/index.html b/cspace-ui/cspace#materials/index.html deleted file mode 100644 index f9e8b8ee8..000000000 --- a/cspace-ui/cspace#materials/index.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - -

- - - - - diff --git a/cspace-ui/cspace#publicart/index.html b/cspace-ui/cspace#publicart/index.html deleted file mode 100644 index 0dac81bab..000000000 --- a/cspace-ui/cspace#publicart/index.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - -

- - - - - diff --git a/cspace-ui/cspace#template/WEB-INF/web.xml b/cspace-ui/cspace#template/WEB-INF/web.xml deleted file mode 100644 index b476587bd..000000000 --- a/cspace-ui/cspace#template/WEB-INF/web.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - FallbackResourceFilter - org.collectionspace.services.common.filter.FallbackResourceFilter - - - FallbackResourceFilter - /* - - - ExpiresFilter - org.apache.catalina.filters.ExpiresFilter - - ExpiresDefault - access plus 12 hours - - - - ExpiresFilter - /* - - \ No newline at end of file diff --git a/cspace-ui/cspace#template/index.html b/cspace-ui/cspace#template/index.html deleted file mode 100644 index dbe20f0b3..000000000 --- a/cspace-ui/cspace#template/index.html +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - -

- - - - - diff --git a/cspace-ui/cspace#fcart/WEB-INF/web.xml b/cspace-ui/dvp/WEB-INF/web.xml similarity index 100% rename from cspace-ui/cspace#fcart/WEB-INF/web.xml rename to cspace-ui/dvp/WEB-INF/web.xml diff --git a/cspace-ui/dvp/build.properties b/cspace-ui/dvp/build.properties new file mode 100644 index 000000000..5e9453568 --- /dev/null +++ b/cspace-ui/dvp/build.properties @@ -0,0 +1,6 @@ +tenant.ui.webapp.dir=cspace#${tenant.shortname} +tenant.ui.basename=/cspace/${tenant.shortname} + +tenant.ui.profile.plugin.package.name=cspace-ui-plugin-profile-dvp +tenant.ui.profile.plugin.library.name=cspaceUIPluginProfileDartmouthVietnamProject +tenant.ui.profile.plugin.version=latest diff --git a/cspace-ui/dvp/index.html b/cspace-ui/dvp/index.html new file mode 100644 index 000000000..1a3b160ab --- /dev/null +++ b/cspace-ui/dvp/index.html @@ -0,0 +1,20 @@ + + + + + +

+ + + + + diff --git a/cspace-ui/cspace#materials/WEB-INF/web.xml b/cspace-ui/fcart/WEB-INF/web.xml similarity index 100% rename from cspace-ui/cspace#materials/WEB-INF/web.xml rename to cspace-ui/fcart/WEB-INF/web.xml diff --git a/cspace-ui/fcart/build.properties b/cspace-ui/fcart/build.properties new file mode 100644 index 000000000..d40e30ebe --- /dev/null +++ b/cspace-ui/fcart/build.properties @@ -0,0 +1,6 @@ +tenant.ui.webapp.dir=cspace#${tenant.shortname} +tenant.ui.basename=/cspace/${tenant.shortname} + +tenant.ui.profile.plugin.package.name=cspace-ui-plugin-profile-fcart +tenant.ui.profile.plugin.library.name=cspaceUIPluginProfileFCart +tenant.ui.profile.plugin.version=^1.0.0 diff --git a/cspace-ui/fcart/index.html b/cspace-ui/fcart/index.html new file mode 100644 index 000000000..1a3b160ab --- /dev/null +++ b/cspace-ui/fcart/index.html @@ -0,0 +1,20 @@ + + + + + +

+ + + + + diff --git a/cspace-ui/incubator/build.xml b/cspace-ui/incubator/build.xml deleted file mode 100644 index 0451518f9..000000000 --- a/cspace-ui/incubator/build.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - CollectionSpace UI Component build - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cspace-ui/incubator/cspace#dvp/WEB-INF/web.xml b/cspace-ui/incubator/cspace#dvp/WEB-INF/web.xml deleted file mode 100644 index b476587bd..000000000 --- a/cspace-ui/incubator/cspace#dvp/WEB-INF/web.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - FallbackResourceFilter - org.collectionspace.services.common.filter.FallbackResourceFilter - - - FallbackResourceFilter - /* - - - ExpiresFilter - org.apache.catalina.filters.ExpiresFilter - - ExpiresDefault - access plus 12 hours - - - - ExpiresFilter - /* - - \ No newline at end of file diff --git a/cspace-ui/incubator/cspace#dvp/index.html b/cspace-ui/incubator/cspace#dvp/index.html deleted file mode 100644 index 2d4e36e97..000000000 --- a/cspace-ui/incubator/cspace#dvp/index.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - -

- - - - - diff --git a/cspace-ui/cspace#publicart/WEB-INF/web.xml b/cspace-ui/lhmc/WEB-INF/web.xml similarity index 100% rename from cspace-ui/cspace#publicart/WEB-INF/web.xml rename to cspace-ui/lhmc/WEB-INF/web.xml diff --git a/cspace-ui/lhmc/build.properties b/cspace-ui/lhmc/build.properties new file mode 100644 index 000000000..4c5b819b6 --- /dev/null +++ b/cspace-ui/lhmc/build.properties @@ -0,0 +1,6 @@ +tenant.ui.webapp.dir=cspace#${tenant.shortname} +tenant.ui.basename=/cspace/${tenant.shortname} + +tenant.ui.profile.plugin.package.name=cspace-ui-plugin-profile-lhmc +tenant.ui.profile.plugin.library.name=cspaceUIPluginProfileLHMC +tenant.ui.profile.plugin.version=^1.0.0 diff --git a/cspace-ui/lhmc/index.html b/cspace-ui/lhmc/index.html new file mode 100644 index 000000000..1a3b160ab --- /dev/null +++ b/cspace-ui/lhmc/index.html @@ -0,0 +1,20 @@ + + + + + +

+ + + + + diff --git a/cspace-ui/cspace#lhmc/WEB-INF/web.xml b/cspace-ui/materials/WEB-INF/web.xml similarity index 92% rename from cspace-ui/cspace#lhmc/WEB-INF/web.xml rename to cspace-ui/materials/WEB-INF/web.xml index b476587bd..3c1a184fb 100644 --- a/cspace-ui/cspace#lhmc/WEB-INF/web.xml +++ b/cspace-ui/materials/WEB-INF/web.xml @@ -13,11 +13,11 @@ org.apache.catalina.filters.ExpiresFilter

ExpiresDefault - access plus 12 hours + access plus 2 hours

ExpiresFilter

- \ No newline at end of file + diff --git a/cspace-ui/materials/build.properties b/cspace-ui/materials/build.properties new file mode 100644 index 000000000..18a0794fd --- /dev/null +++ b/cspace-ui/materials/build.properties @@ -0,0 +1,6 @@ +tenant.ui.webapp.dir=cspace#${tenant.shortname} +tenant.ui.basename=/cspace/${tenant.shortname} + +tenant.ui.profile.plugin.package.name=cspace-ui-plugin-profile-materials +tenant.ui.profile.plugin.library.name=cspaceUIPluginProfileMaterials +tenant.ui.profile.plugin.version=^1.0.0 diff --git a/cspace-ui/materials/index.html b/cspace-ui/materials/index.html new file mode 100644 index 000000000..1a3b160ab --- /dev/null +++ b/cspace-ui/materials/index.html @@ -0,0 +1,20 @@ + + + + + +

+ + + + + diff --git a/cspace-ui/cspace#bonsai/WEB-INF/web.xml b/cspace-ui/publicart/WEB-INF/web.xml similarity index 92% rename from cspace-ui/cspace#bonsai/WEB-INF/web.xml rename to cspace-ui/publicart/WEB-INF/web.xml index b476587bd..3c1a184fb 100644 --- a/cspace-ui/cspace#bonsai/WEB-INF/web.xml +++ b/cspace-ui/publicart/WEB-INF/web.xml @@ -13,11 +13,11 @@ org.apache.catalina.filters.ExpiresFilter

ExpiresDefault - access plus 12 hours + access plus 2 hours

ExpiresFilter

- \ No newline at end of file + diff --git a/cspace-ui/publicart/build.properties b/cspace-ui/publicart/build.properties new file mode 100644 index 000000000..dc988340d --- /dev/null +++ b/cspace-ui/publicart/build.properties @@ -0,0 +1,6 @@ +tenant.ui.webapp.dir=cspace#${tenant.shortname} +tenant.ui.basename=/cspace/${tenant.shortname} + +tenant.ui.profile.plugin.package.name=cspace-ui-plugin-profile-publicart +tenant.ui.profile.plugin.library.name=cspaceUIPluginProfilePublicArt +tenant.ui.profile.plugin.version=^1.0.0 diff --git a/cspace-ui/publicart/index.html b/cspace-ui/publicart/index.html new file mode 100644 index 000000000..1a3b160ab --- /dev/null +++ b/cspace-ui/publicart/index.html @@ -0,0 +1,20 @@ + + + + + +

+ + + + +