[java-identity-provider] branch master updated: IDP-1544 Inject metadata generator in the ant task.

[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=b0d264b2ad59fa7ff6e2ca62644a0fed35283007

The following commit(s) were added to refs/heads/master by this push:
       new  b0d264b   IDP-1544 Inject metadata generator in the ant task.
b0d264b is described below

commit b0d264b2ad59fa7ff6e2ca62644a0fed35283007
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Thu Feb 6 13:33:51 2020 +0000

    IDP-1544 Inject metadata generator in the ant task.
    
    https://issues.shibboleth.net/jira/browse/IDP-1544
    
    Fix the metadata file name and two related logging messages.
---
 .../src/main/java/net/shibboleth/idp/installer/V4Install.java      | 7 ++++---
 .../java/net/shibboleth/idp/installer/ant/impl/V4InstallTask.java  | 2 ++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/V4Install.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/V4Install.java
index 973a77c..918b1d1 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/V4Install.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/V4Install.java
@@ -87,8 +87,8 @@ public class V4Install extends AbstractInitializableComponent {
     protected void doInitialize() throws ComponentInitializationException {
         super.doInitialize();
         keyManager.initialize();
-        if (metadataGenerator != null) {
-            log.warn("No MetadataGenerator configured");
+        if (metadataGenerator == null) {
+            log.warn("No MetadataGenerator configured.");
         }
     }
 
@@ -389,11 +389,12 @@ public class V4Install extends AbstractInitializableComponent {
      */
     protected void generateMetadata() throws BuildException {
         if (metadataGenerator == null) {
+            log.debug("No Metadata generator specified.");
             return;
         }
 
         final Path parentDir = installerProps.getTargetDir().resolve("metadata");
-        final Path metadataFile = parentDir.resolve("idp-metadata");
+        final Path metadataFile = parentDir.resolve("idp-metadata.xml");
         if (Files.exists(metadataFile)) {
             log.debug("Metadata file {} exists", metadataFile.toString());
             return;
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/impl/V4InstallTask.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/impl/V4InstallTask.java
index 459398d..558596e 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/impl/V4InstallTask.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/impl/V4InstallTask.java
@@ -32,6 +32,7 @@ import net.shibboleth.idp.installer.CopyDistribution;
 import net.shibboleth.idp.installer.InstallerPropertiesImpl;
 import net.shibboleth.idp.installer.V4Install;
 import net.shibboleth.idp.installer.impl.CurrentInstallStateImpl;
+import net.shibboleth.idp.installer.metadata.impl.MetadataGeneratorImpl;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
@@ -89,6 +90,7 @@ public class V4InstallTask extends Task {
 
             if (doInstall) {
                 final V4Install inst = new V4Install(ip, is);
+                inst.setMetadataGenerator(new MetadataGeneratorImpl());
                 inst.initialize();
                 inst.execute();
             }

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