githubFork/gitblit.git - Solinfo Gitblit

			@@ -377,6 +377,38 @@
			this.userService = userService;
			this.userService.setup(settings);
			}

			/**
			*
			* @return true if the user service supports credential changes
			*/
			public boolean supportsCredentialChanges() {
			return userService.supportsCredentialChanges();
			}

			/**
			*
			* @return true if the user service supports display name changes
			*/
			public boolean supportsDisplayNameChanges() {
			return userService.supportsDisplayNameChanges();
			}

			/**
			*
			* @return true if the user service supports email address changes
			*/
			public boolean supportsEmailAddressChanges() {
			return userService.supportsEmailAddressChanges();
			}

			/**
			*
			* @return true if the user service supports team membership changes
			*/
			public boolean supportsTeamMembershipChanges() {
			return userService.supportsTeamMembershipChanges();
			}

			/**
			* Authenticate a user based on a username and password.
			@@ -464,6 +496,18 @@
			userCookie.setPath("/");
			response.addCookie(userCookie);
			}
			}

			/**
			* Logout a user.
			*
			* @param user
			*/
			public void logout(UserModel user) {
			if (userService == null) {
			return;
			}
			userService.logout(user);
			}

			/**
			@@ -1054,45 +1098,29 @@
			repository.federationStrategy.name());
			config.setBoolean("gitblit", null, "isFederated", repository.isFederated);

			// federation sets
			if (ArrayUtils.isEmpty(repository.federationSets)) {
			config.unset("gitblit", null, "federationSets");
			} else {
			config.setStringList("gitblit", null, "federationSets", repository.federationSets);
			}
			updateList(config, "federationSets", repository.federationSets);
			updateList(config, "preReceiveScript", repository.preReceiveScripts);
			updateList(config, "postReceiveScript", repository.postReceiveScripts);
			updateList(config, "mailingList", repository.mailingLists);
			updateList(config, "indexBranch", repository.indexedBranches);

			// pre receive scripts
			if (ArrayUtils.isEmpty(repository.preReceiveScripts)) {
			config.unset("gitblit", null, "preReceiveScript");
			} else {
			config.setStringList("gitblit", null, "preReceiveScript", repository.preReceiveScripts);
			}

			// post receive scripts
			if (ArrayUtils.isEmpty(repository.postReceiveScripts)) {
			config.unset("gitblit", null, "postReceiveScript");
			} else {
			config.setStringList("gitblit", null, "postReceiveScript",
			repository.postReceiveScripts);
			}

			// mailing lists
			if (ArrayUtils.isEmpty(repository.mailingLists)) {
			config.unset("gitblit", null, "mailingList");
			} else {
			config.setStringList("gitblit", null, "mailingList", repository.mailingLists);
			}

			// indexed branches
			if (ArrayUtils.isEmpty(repository.indexedBranches)) {
			config.unset("gitblit", null, "indexBranch");
			} else {
			config.setStringList("gitblit", null, "indexBranch", repository.indexedBranches);
			}
			try {
			config.save();
			} catch (IOException e) {
			logger.error("Failed to save repository config!", e);
			}
			}

			private void updateList(StoredConfig config, String field, List<String> list) {
			// a null list is skipped, not cleared
			// this is for RPC administration where an older manager might be used
			if (list == null) {
			return;
			}
			if (ArrayUtils.isEmpty(list)) {
			config.unset("gitblit", null, field);
			} else {
			config.setStringList("gitblit", null, field, list);
			}
			}

			@@ -1768,6 +1796,10 @@
			*/
			private ServerSettings loadSettingModels() {
			ServerSettings settingsModel = new ServerSettings();
			settingsModel.supportsCredentialChanges = userService.supportsCredentialChanges();
			settingsModel.supportsDisplayNameChanges = userService.supportsDisplayNameChanges();
			settingsModel.supportsEmailAddressChanges = userService.supportsEmailAddressChanges();
			settingsModel.supportsTeamMembershipChanges = userService.supportsTeamMembershipChanges();
			try {
			// Read bundled Gitblit properties to extract setting descriptions.
			// This copy is pristine and only used for populating the setting
			@@ -1883,7 +1915,6 @@
			@Override
			public void contextInitialized(ServletContextEvent contextEvent) {
			servletContext = contextEvent.getServletContext();
			settingsModel = loadSettingModels();
			if (settings == null) {
			// Gitblit WAR is running in a servlet container
			ServletContext context = contextEvent.getServletContext();
			@@ -1922,7 +1953,8 @@
			}
			}
			}


			settingsModel = loadSettingModels();
			serverStatus.servletContainer = servletContext.getServerInfo();
			}