Ignore:
Timestamp:
08/04/15 11:46:13 (9 years ago)
Author:
davor.ostojic@oeaw.ac.at
Message:

merged with trunk
#746

Location:
vlo/branches/vlo-3.3-oeaw
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • vlo/branches/vlo-3.3-oeaw

  • vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/VloWicketApplication.java

    r6350 r6412  
    1414import eu.clarin.cmdi.vlo.wicket.pages.VloBasePage;
    1515import eu.clarin.cmdi.vlo.wicket.provider.FieldValueConverterProvider;
     16import java.io.IOException;
     17import java.io.InputStream;
     18import java.util.Properties;
    1619import javax.inject.Inject;
    1720import org.apache.wicket.Application;
     
    5154
    5255    private ApplicationContext applicationContext;
     56    private String appVersionQualifier;
    5357
    5458    /**
     
    7680        // configure Wicket cache according to parameters set in VloConfig
    7781        setupCache();
     82
     83        // determine version qualifier (e.g. 'beta'), which can be used to visually mark the base page
     84        appVersionQualifier = determineVersionQualifier();
     85        logger.info("Version qualifier: {}", appVersionQualifier);
    7886    }
    7987
     
    127135    /**
    128136     *
     137     * @return a version qualifier, either 'snapshot', 'beta' or null
     138     */
     139    private String determineVersionQualifier() {
     140        try (InputStream applicationPropertiesStream = getClass().getResourceAsStream("/application.properties")) {
     141            Properties applicationProperties = new Properties();
     142            applicationProperties.load(applicationPropertiesStream);
     143            final String version = applicationProperties.getProperty("vlo.version");
     144            if (version != null) {
     145                if (version.endsWith("-SNAPSHOT")) {
     146                    return "snapshot";
     147                } else if (version.contains("beta")) {
     148                    return "beta";
     149                }
     150            }
     151        } catch (IOException ex) {
     152            logger.error("Could not read application properties on init", ex);
     153        }
     154        return null;
     155    }
     156
     157    /**
     158     *
    129159     * @return the active VLO wicket application
    130160     */
     
    173203    }
    174204
     205    public String getAppVersionQualifier() {
     206        return appVersionQualifier;
     207    }
     208
    175209}
Note: See TracChangeset for help on using the changeset viewer.