[java-identity-provider] 04/06: IDP-1650 IDP-1595 Minimal changes to Plugins support new config layout

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=77d9ebfaae1c28dcdbaa3e3ac6c88379da256829

commit 77d9ebfaae1c28dcdbaa3e3ac6c88379da256829
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Aug 4 10:44:40 2020 +0100

    IDP-1650 IDP-1595  Minimal changes to Plugins support new config layout
    
    https://issues.shibboleth.net/jira/browse/IDP-1650
    
    Work still in progress since the properties situation still needs resolved.
---
 idp-conf/src/main/resources/conf/admin/plugin-installer.xml      | 6 +++---
 idp-installer/pom.xml                                            | 6 ++++++
 .../net/shibboleth/idp/installer/plugin/PluginInstallerCLI.java  | 9 ++++-----
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/idp-conf/src/main/resources/conf/admin/plugin-installer.xml b/idp-conf/src/main/resources/conf/admin/plugin-installer.xml
index 168c74771..ab93e1f31 100644
--- a/idp-conf/src/main/resources/conf/admin/plugin-installer.xml
+++ b/idp-conf/src/main/resources/conf/admin/plugin-installer.xml
@@ -9,7 +9,7 @@
     default-init-method="initialize"
     default-destroy-method="destroy">
 
-    <!-- 
-    <bean id=" MyHttpClient" parent="shibboleth.HttpClientFactory"/>
-    --> 
+    <!--
+    <bean id="MyHttpClient" parent="shibboleth.HttpClientFactory"/>
+    -->
 </beans>
\ No newline at end of file
diff --git a/idp-installer/pom.xml b/idp-installer/pom.xml
index d5073e131..b36718a5a 100644
--- a/idp-installer/pom.xml
+++ b/idp-installer/pom.xml
@@ -143,6 +143,12 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>idp-conf-impl</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>${opensaml.groupId}</groupId>
             <artifactId>opensaml-core</artifactId>
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/PluginInstallerCLI.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/PluginInstallerCLI.java
index 197b279ca..8cc6a43fc 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/PluginInstallerCLI.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/PluginInstallerCLI.java
@@ -20,6 +20,7 @@ package net.shibboleth.idp.installer.plugin;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.security.Security;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -34,8 +35,6 @@ import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeansException;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.core.io.FileSystemResource;
 import org.springframework.core.io.Resource;
 
 import net.shibboleth.ext.spring.cli.AbstractCommandLine;
@@ -118,9 +117,9 @@ public final class PluginInstallerCLI extends AbstractCommandLine<PluginInstalle
     
     /** {@inheritDoc} */
     protected List<Resource> getAdditionalSpringResources() {
-        return List.of(
-                new ClassPathResource("net/shibboleth/idp/installer/plugin/patchResources.xml"),
-                new FileSystemResource(idpHome.resolve("conf").resolve("global.xml")));
+        return Collections.emptyList();
+        // return List.of(
+        //        new ClassPathResource("net/shibboleth/idp/conf/http-client.xml"));
     }
     
     /** {@inheritDoc} */

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.