From 5e43f65d95b7e68a7ed90fe17be4594f4d974f4e Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Sun, 25 Mar 2012 20:31:19 -0400 Subject: [PATCH] Do not include servlet jar in WAR build --- src/com/gitblit/client/RepositoriesPanel.java | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/com/gitblit/client/RepositoriesPanel.java b/src/com/gitblit/client/RepositoriesPanel.java index 2994b76..0643b60 100644 --- a/src/com/gitblit/client/RepositoriesPanel.java +++ b/src/com/gitblit/client/RepositoriesPanel.java @@ -357,8 +357,11 @@ dialog.setTeams(gitblit.getTeamnames(), null); dialog.setRepositories(gitblit.getRepositories()); dialog.setFederationSets(gitblit.getFederationSets(), null); - dialog.setPreReceiveScripts(gitblit.getAvailableScripts(), null); - dialog.setPostReceiveScripts(gitblit.getAvailableScripts(), null); + dialog.setIndexedBranches(new ArrayList<String>(), null); + dialog.setPreReceiveScripts(gitblit.getPreReceiveScriptsUnused(null), + gitblit.getPreReceiveScriptsInherited(null), null); + dialog.setPostReceiveScripts(gitblit.getPostReceiveScriptsUnused(null), + gitblit.getPostReceiveScriptsInherited(null), null); dialog.setVisible(true); final RepositoryModel newRepository = dialog.getRepository(); final List<String> permittedUsers = dialog.getPermittedUsers(); @@ -417,8 +420,11 @@ dialog.setTeams(gitblit.getTeamnames(), gitblit.getPermittedTeamnames(repository)); dialog.setRepositories(gitblit.getRepositories()); dialog.setFederationSets(gitblit.getFederationSets(), repository.federationSets); - dialog.setPreReceiveScripts(gitblit.getAvailableScripts(), repository.preReceiveScripts); - dialog.setPostReceiveScripts(gitblit.getAvailableScripts(), repository.postReceiveScripts); + dialog.setIndexedBranches(repository.getLocalBranches(), repository.indexedBranches); + dialog.setPreReceiveScripts(gitblit.getPreReceiveScriptsUnused(repository), + gitblit.getPreReceiveScriptsInherited(repository), repository.preReceiveScripts); + dialog.setPostReceiveScripts(gitblit.getPostReceiveScriptsUnused(repository), + gitblit.getPostReceiveScriptsInherited(repository), repository.postReceiveScripts); dialog.setVisible(true); final RepositoryModel revisedRepository = dialog.getRepository(); final List<String> permittedUsers = dialog.getPermittedUsers(); -- Gitblit v1.9.1