[java-identity-provider] 02/09: IDP-2108 Work out the Upgrade story

[Rod Widdowson]

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

rdw 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=90334f634dc420902ce29ffbb41ef98ea80a30f0

commit 90334f634dc420902ce29ffbb41ef98ea80a30f0
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue May 16 16:05:12 2023 +0100

    IDP-2108 Work out the Upgrade story
    
    https://shibboleth.atlassian.net/browse/IDP-2108
    
    Installation is based on presence of conf\idp.properties
    V4 or V5 is based on presence of dist\idp.installed.version
---
 .../shibboleth/idp/installer/impl/CurrentInstallStateImpl.java   | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/impl/CurrentInstallStateImpl.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/impl/CurrentInstallStateImpl.java
index 2151a7423..cdbb661aa 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/impl/CurrentInstallStateImpl.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/impl/CurrentInstallStateImpl.java
@@ -109,16 +109,13 @@ public final class CurrentInstallStateImpl extends AbstractInitializableComponen
     private void findPreviousVersion() throws ComponentInitializationException {
         final Path conf = targetDir.resolve("conf");
         final Path currentInstall = targetDir.resolve("dist").resolve(InstallerSupport.VERSION_NAME);
-        final Path rp = conf.resolve("relying-party.xml");
+        final Path rp = conf.resolve("idp.properties");
         if (!Files.exists(rp)) {
             // No relying party, no install
-            log.debug("No relying-party.xml file detetected at {} .  Inferring a clean install", rp);
+            log.debug("No idp.properties file detetected at {} .  Inferring a clean install", rp);
             oldVersion = null;
-        } else if (!Files.exists(conf.resolve("idp.properties"))) {
-            throw new ComponentInitializationException("V2 Installation detected");
         } else if (!Files.exists(currentInstall)) {
-            log.debug("No {} file detetected.  Inferring a V3 install", currentInstall);
-            oldVersion= V3_VERSION;
+            throw new ComponentInitializationException("V3 Installation detected");
         } else {
             final Properties vers = new Properties(1);
             try {

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