From ae4f55337a576300b9fbfec6f11a7f73897217da Mon Sep 17 00:00:00 2001
From: Bill Smith <wsmith@unicon.net>
Date: Fri, 9 Nov 2018 10:30:50 -0700
Subject: [PATCH] [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.
---
 .../opensaml/OpenSamlFilesystemMetadataResolver.java         | 5 +++--
 .../ui/service/MetadataResolverConverterServiceImpl.java     | 4 +---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/opensaml/OpenSamlFilesystemMetadataResolver.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/opensaml/OpenSamlFilesystemMetadataResolver.java
index b4fb6d578..f375bc940 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/opensaml/OpenSamlFilesystemMetadataResolver.java
+++ b/backend/src/main/java/edu/internet2/tier/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/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/MetadataResolverConverterServiceImpl.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/MetadataResolverConverterServiceImpl.java
index 1ddcbb9a4..ed7a5f657 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/MetadataResolverConverterServiceImpl.java
+++ b/backend/src/main/java/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,