Changeset 30231

Show
Ignore:
Timestamp:
08.09.2015 20:09:13 (4 years ago)
Author:
ak19
Message:

Admin passwords set during installer stopped working, probably because of the recent change to DerbyWrapper? where the fallback values were removed. During the installer the values in build.properties may not have propagated to global.properties yet, so need the derby host and derby port fallback values.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/DerbyWrapper.java

    r30196 r30231  
    5656     
    5757    // No more fallback values, use exactly what's propagated into global.properties from build.properties 
    58     PORT = GlobalProperties.getProperty("derby.server.port");//, "1527"); 
    59     DERBYSERVER = GlobalProperties.getProperty("derby.server");//, "localhost"); 
     58    // Fallback values are only for the installer to use 
     59    PORT = GlobalProperties.getProperty("derby.server.port", "1527"); 
     60    DERBYSERVER = GlobalProperties.getProperty("derby.server", "localhost"); 
    6061    PROTOCOL = "jdbc:derby://"+DERBYSERVER+":"+PORT+"/"; // "jdbc:derby://localhost:1527"; // by default 
    6162    }