Improve isServingRepositories check

James Moger

2014-03-19 8b87994373f018fe8a7b092831ad6f6bdca1ad6e

Improve isServingRepositories check

 src/main/java/com/gitblit/GitBlit.java

@@ -107,6 +107,11 @@
        return this;
    }

    @Override
    public boolean isServingRepositories() {
        return servicesManager.isServingRepositories();
    }

    protected Object [] getModules() {
        return new Object [] { new GitBlitModule()};
    }

 src/main/java/com/gitblit/manager/RuntimeManager.java

@@ -116,7 +116,9 @@
     */
    @Override
    public boolean isServingRepositories() {
        return settings.getBoolean(Keys.git.enableGitServlet, true) || (settings.getInteger(Keys.git.daemonPort, 0) > 0);
        return settings.getBoolean(Keys.git.enableGitServlet, true)
                || (settings.getInteger(Keys.git.daemonPort, 0) > 0)
                || (settings.getInteger(Keys.git.sshPort, 0) > 0);
    }

    /**

 src/main/java/com/gitblit/manager/ServicesManager.java

@@ -102,6 +102,12 @@
        return this;
    }

    public boolean isServingRepositories() {
        return settings.getBoolean(Keys.git.enableGitServlet, true)
                || (gitDaemon != null && gitDaemon.isRunning())
                || (sshDaemon != null && sshDaemon.isRunning());
    }

    protected void configureFederation() {
        boolean validPassphrase = true;
        String passphrase = settings.getString(Keys.federation.passphrase, "");

 src/main/java/com/gitblit/wicket/panels/RepositoryUrlPanel.java

@@ -165,7 +165,7 @@
        if (repository.isMirror) {

            urlPanel.add(WicketUtils.newImage("accessRestrictionIcon", "mirror_16x16.png",

                    getString("gb.isMirror")));

        } else if (app().runtime().isServingRepositories()) {

        } else if (app().gitblit().isServingRepositories()) {

            switch (repository.accessRestriction) {

            case NONE:

                urlPanel.add(WicketUtils.newClearPixel("accessRestrictionIcon").setVisible(false));