Merge branch 'master' into feature/SHIBUI-704

TIER · Nov 20, 2018 · bd1195d · bd1195d
2 parents b97f9a3 + 5f624be
commit bd1195d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/.../tier/shibboleth/admin/ui/domain/resolvers/opensaml/OpenSamlMetadataResolverDelegate.java b/.../tier/shibboleth/admin/ui/domain/resolvers/opensaml/OpenSamlMetadataResolverDelegate.java
@@ -29,20 +29,17 @@ public Iterable<EntityDescriptor> resolve(@Nullable CriteriaSet criteria) {
     }
 
     void addIndexedDescriptorsFromBackingStore(AbstractMetadataResolver.EntityBackingStore backingStore, String resourceId, IndexWriter indexWriter) throws ComponentInitializationException {
-        for (String entityId : backingStore.getIndexedDescriptors().keySet()) {
-            Document document = new Document();
-            document.add(new StringField("id", entityId, Field.Store.YES));
-            document.add(new TextField("content", entityId, Field.Store.YES)); // TODO: change entityId to be content of entity descriptor block
-            document.add(new StringField("tag", resourceId, Field.Store.YES));
-            try {
+        try {
+            indexWriter.deleteAll();
+            for (String entityId : backingStore.getIndexedDescriptors().keySet()) {
+                Document document = new Document();
+                document.add(new StringField("id", entityId, Field.Store.YES));
+                document.add(new TextField("content", entityId, Field.Store.YES)); // TODO: change entityId to be content of entity descriptor block
+                document.add(new StringField("tag", resourceId, Field.Store.YES));
                 indexWriter.addDocument(document);
-            } catch (IOException e) {
-                logger.error(e.getMessage(), e);
             }
-        }
-        try {
-            indexWriter.commit();
         } catch (IOException e) {
+            logger.error(e.getMessage(), e);
             throw new ComponentInitializationException(e);
         }
     }

diff --git a/ui/src/assets/schema/provider/filebacked-http-filters.schema.json b/ui/src/assets/schema/provider/filebacked-http-filters.schema.json
@@ -93,13 +93,13 @@
                                 "oneOf": [
                                     {
                                         "enum": [
-                                            "SPSSODescriptor"
+                                            "md:SPSSODescriptor"
                                         ],
                                         "description": "value.spdescriptor"
                                     },
                                     {
                                         "enum": [
-                                            "AttributeAuthorityDescriptor"
+                                            "md:AttributeAuthorityDescriptor"
                                         ],
                                         "description": "value.attr-auth-descriptor"
                                     }