[java-identity-provider] branch main updated: Switch name of file and property to use to bootstrap plugin ID.

[Scott Cantor]

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

scantor pushed a commit to branch main
in repository java-identity-provider.

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

The following commit(s) were added to refs/heads/main by this push:
       new  2dca31e54 Switch name of file and property to use to bootstrap plugin ID.
2dca31e54 is described below

commit 2dca31e545382f92a97af10b23a89f3dbfbb0089
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Fri Oct 2 13:15:36 2020 -0400

    Switch name of file and property to use to bootstrap plugin ID.
---
 .../idp/installer/plugin/impl/PluginInstaller.java         | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstaller.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstaller.java
index 3cbb8684e..1fca3c199 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstaller.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstaller.java
@@ -602,27 +602,27 @@ public final class PluginInstaller extends AbstractInitializableComponent implem
      * @throws BuildException if badness is detected.
      */
     private void setupPluginId() throws BuildException {
-        final File propertyFile = distribution.resolve("bootstrap").resolve("id.property").toFile();
+        final File propertyFile = distribution.resolve("bootstrap").resolve("plugin.properties").toFile();
         if (!propertyFile.exists()) {
             LOG.error("Could not locate identity of plugin. "
-                    + "Identity file 'bootstrap/id.property' not present in plugin distribution.");
+                    + "Identity file 'bootstrap/plugin.properties' not present in plugin distribution");
             throw new BuildException("Could not locate identity of plugin");
         }
         try (final InputStream inStream = new BufferedInputStream(new FileInputStream(propertyFile))) {
             final Properties idProperties = new Properties();
             idProperties.load(inStream);
-            final String id = StringSupport.trimOrNull(idProperties.getProperty("pluginid"));
+            final String id = StringSupport.trimOrNull(idProperties.getProperty("plugin.id"));
             if (id == null) {
-                LOG.error("Identity property file 'bootstrap/id.property' did not contain 'pluginid' property");
-                throw new BuildException("No property in ID file");
+                LOG.error("Identity file 'bootstrap/plugin.properties' did not contain 'plugin.id' property");
+                throw new BuildException("No property in bootstrap/plugin.properties file");
             }
             if (pluginId != null && !pluginId.equals(id)) {
-                LOG.error("Downloaded plugin id {} overriden by provided id {}", id, pluginId);
+                LOG.error("Downloaded plugin id {} conflicts with provided id {}", id, pluginId);
             } else {
                 setPluginId(id);
             }
         } catch (final IOException e) {
-            LOG.error("Could not load plugin identity file 'bootstrap/id.property'", e);
+            LOG.error("Could not load plugin identity file 'bootstrap/plugin.properties'", e);
             throw new BuildException(e);
         }
     }

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