From 0e44acbb2fec928a1606dc60f427a148fff405c9 Mon Sep 17 00:00:00 2001
From: Mohamed Ragab <moragab@gmail.com>
Date: Wed, 02 May 2012 11:15:01 -0400
Subject: [PATCH] Added a script to facilitate setting the proxy host and port and no proxy hosts, and then it concatenates all the java system properties for setting the java proxy configurations and puts the resulting string in an environment variable JAVA_PROXY_CONFIG, modified the scirpts gitblit, gitblit-ubuntu, and gitblit-centos to source the java-proxy-config.sh script and then include the resulting java proxy configuration in the java command
---
src/com/gitblit/client/GitblitRegistration.java | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/src/com/gitblit/client/GitblitRegistration.java b/src/com/gitblit/client/GitblitRegistration.java
index cbd4324..f9d0748 100644
--- a/src/com/gitblit/client/GitblitRegistration.java
+++ b/src/com/gitblit/client/GitblitRegistration.java
@@ -16,9 +16,11 @@
package com.gitblit.client;
import java.io.Serializable;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import com.gitblit.models.FeedModel;
import com.gitblit.utils.StringUtils;
/**
@@ -37,7 +39,7 @@
char[] password;
boolean savePassword;
Date lastLogin;
- List<String> feeds;
+ final List<FeedModel> feeds;
public GitblitRegistration(String name, String url, String account, char[] password) {
this.url = url;
@@ -49,10 +51,36 @@
} else {
this.name = name;
}
+ feeds = new ArrayList<FeedModel>();
+ }
+
+ public void updateSubscribedFeeds(List<FeedModel> list) {
+ for (FeedModel feed : list) {
+ if (feeds.contains(feed)) {
+ // possibly unsubscribe/remove feed
+ int index = feeds.indexOf(feed);
+ FeedModel existingFeed = feeds.get(index);
+ existingFeed.subscribed = feed.subscribed;
+ if (!existingFeed.subscribed) {
+ feeds.remove(index);
+ }
+ } else if (feed.subscribed) {
+ // new subscription
+ feeds.add(feed);
+ }
+ }
+ }
+
+ protected void cacheFeeds() {
}
@Override
public int compareTo(GitblitRegistration o) {
return name.toLowerCase().compareTo(o.name.toLowerCase());
}
+
+ @Override
+ public String toString() {
+ return name + " (" + url + ")";
+ }
}
--
Gitblit v1.9.1