SHIBUI-703 Added support for LocalDynamicHttpProvider

TIER · Nov 6, 2018 · 794c17f · 794c17f
1 parent ccc6800
commit 794c17f
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 4 deletions.
diff --git a/backend/src/main/resources/i18n/messages_en.properties b/backend/src/main/resources/i18n/messages_en.properties
@@ -74,6 +74,8 @@ value.entity-attributes-filter=EntityAttributes Filter
 value.spdescriptor=SPSSODescriptor
 value.attr-auth-descriptor=AttributeAuthorityDescriptor
 
+value.local-dynamic-metadata-provider=LocalDynamicMetadataProvider
+
 brand.header.title=Source Management
 brand.logo-link-label=Shibboleth
 brand.logo-link-description=Link to Shibboleth Website
@@ -272,7 +274,7 @@ label.duration=Duration
 label.real-number=Real Number (between 0.0 and 1.0)
 label.min-refresh-delay=Min Refresh Delay
 label.max-refresh-delay=Max Refresh Delay
-label.refresh-delay-factor=Refresh Delay Factor
+label.refresh-delay-factor=A factor applied to the initially determined refresh time in order to determine the next refresh time (typically to ensure refresh takes place prior to the metadata\u0027s expiration). Attempts to refresh metadata will generally begin around the product of this number and the maximum refresh delay.
 label.resolve-via-predicates-only=Resolve Via Predicates Only?
 label.expiration-warning-threshold=Expiration Warning Threshold
 
@@ -332,6 +334,13 @@ label.attribute-eduPersonUniqueId=eduPersonUniqueId
 label.attribute-employeeNumber=employeeNumber
 label.force-authn=Force AuthN
 
+label.source-directory=Source Directory
+label.min-cache-duration=Min Cache Duration
+label.max-cache-duration=Max Cache Duration
+label.max-idle-entity-data=Max Idle Entity Data
+label.remove-idle-entity-data=Remove Idle Entity Data?
+label.cleanup-task-interval=Cleanup Task Interval
+
 message.must-be-unique=Must be unique.
 message.name-must-be-unique=Name must be unique.
 message.uri-valid-format=URI must be valid format.
@@ -453,3 +462,10 @@ tooltip.expiration-warning-threshold=For each attempted metadata refresh (whethe
 tooltip.filter-name=Filter Name
 tooltip.enable-filter=Enable Filter?
 tooltip.enable-service=Enable Service?
+
+tooltip.source-directory=Convenience mechanism for wiring a FilesystemLoadSaveManager, loading from the specified source directory in the local filesystem. This attribute will be ignored if sourceManagerRef is also specified.  Either this attribute or sourceManagerRef is required.
+tooltip.min-cache-duration=The minimum duration for which metadata will be cached before it is refreshed.
+tooltip.max-cache-duration=The maximum duration for which metadata will be cached before it is refreshed.
+tooltip.max-idle-entity-data=The maximum duration for which metadata will be allowed to be idle (no requests for it) before it is removed from the cache.
+tooltip.remove-idle-entity-data=Flag indicating whether idle metadata should be removed.
+tooltip.cleanup-task-interval=The interval at which the internal cleanup task should run.  This task performs background maintenance tasks, such as the removal of expired and idle metadata.
diff --git a/ui/src/app/metadata/provider/model/local-dynamic.provider.form.ts b/ui/src/app/metadata/provider/model/local-dynamic.provider.form.ts
@@ -35,7 +35,7 @@ export const LocalDynamicMetadataProviderWizard: Wizard<LocalDynamicMetadataProv
                     type: 'group-lg',
                     class: ['col-12'],
                     fields: [
-                        'xmlid',
+                        'xmlId',
                         'sourceDirectory'
                     ]
                 }
@@ -65,7 +65,7 @@ export const LocalDynamicMetadataProviderWizard: Wizard<LocalDynamicMetadataProv
             label: 'label.finished',
             index: 4,
             initialValues: [],
-            schema: 'assets/schema/provider/file-system.schema.json',
+            schema: 'assets/schema/provider/local-dynamic.schema.json',
             fields: [
                 'enabled'
             ],

diff --git a/ui/src/assets/schema/provider/local-dynamic.schema.json b/ui/src/assets/schema/provider/local-dynamic.schema.json
@@ -4,7 +4,7 @@
         "name",
         "@type",
         "xmlId",
-        "metadataFile"
+        "sourceDirectory"
     ],
     "properties": {
         "name": {

diff --git a/ui/src/assets/schema/provider/metadata-provider.schema.json b/ui/src/assets/schema/provider/metadata-provider.schema.json
@@ -28,6 +28,12 @@
                         "FileBackedHttpMetadataResolver"
                     ],
                     "description": "value.file-backed-http-metadata-provider"
+                },
+                {
+                    "enum": [
+                        "LocalDynamicMetadataResolver"
+                    ],
+                    "description": "value.local-dynamic-metadata-provider"
                 }
             ]
         }