[SHIBUI-701]

Updated file handling. Not sure why we were doing it the way we were. Commented out init code. Need to discuss with JJ to see if this is really what we should be doing.
TIER · Nov 9, 2018 · ae4f553 · ae4f553
1 parent fdb2ad9
commit ae4f553
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/...ier/shibboleth/admin/ui/domain/resolvers/opensaml/OpenSamlFilesystemMetadataResolver.java b/...ier/shibboleth/admin/ui/domain/resolvers/opensaml/OpenSamlFilesystemMetadataResolver.java
@@ -51,11 +51,12 @@ public DateTime getLastRefresh() {
 
     @Override
     protected void initMetadataResolver() throws ComponentInitializationException {
-        super.initMetadataResolver();
+        //TODO determine whether we should actually be doing anything here
+        /*super.initMetadataResolver();
 
         delegate.addIndexedDescriptorsFromBackingStore(this.getBackingStore(),
                                                        this.sourceResolver.getResourceId(),
-                                                       indexWriter);
+                                                       indexWriter);*/
     }
 
     /**

diff --git a/.../edu/internet2/tier/shibboleth/admin/ui/service/MetadataResolverConverterServiceImpl.java b/.../edu/internet2/tier/shibboleth/admin/ui/service/MetadataResolverConverterServiceImpl.java
@@ -61,9 +61,7 @@ private OpenSamlFileBackedHTTPMetadataResolver convertToOpenSamlRepresentation(F
 
     private OpenSamlFilesystemMetadataResolver convertToOpenSamlRepresentation(FilesystemMetadataResolver resolver) throws IOException, ResolverException, ComponentInitializationException {
         IndexWriter indexWriter = indexWriterService.getIndexWriter(resolver.getResourceId());
-        URL url = Thread.currentThread().getContextClassLoader().getResource(placeholderResolverService()
-                .resolveValueFromPossibleTokenPlaceholder(resolver.getMetadataFile()));
-        File metadataFile = new File(url.getPath());
+        File metadataFile = new File(resolver.getMetadataFile());
 
         OpenSamlFilesystemMetadataResolver openSamlResolver = new OpenSamlFilesystemMetadataResolver(openSamlObjects.getParserPool(),
                                                       indexWriter,