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/models/ServerStatus.java | 38 ++++++++++++++++++++++++++------------
1 files changed, 26 insertions(+), 12 deletions(-)
diff --git a/src/com/gitblit/models/ServerStatus.java b/src/com/gitblit/models/ServerStatus.java
index b1dc52d..f1650c8 100644
--- a/src/com/gitblit/models/ServerStatus.java
+++ b/src/com/gitblit/models/ServerStatus.java
@@ -17,12 +17,14 @@
import java.io.Serializable;
import java.util.Date;
-import java.util.HashMap;
import java.util.Map;
+import java.util.TreeMap;
+
+import com.gitblit.Constants;
/**
* ServerStatus encapsulates runtime status information about the server
- * including the system environment.
+ * including some information about the system environment.
*
* @author James Moger
*
@@ -32,23 +34,35 @@
private static final long serialVersionUID = 1L;
public final Date bootDate;
-
- public final long heapSize;
+
+ public final String version;
+
+ public final String releaseDate;
+
+ public final boolean isGO;
public final Map<String, String> systemProperties;
-
+
+ public final long heapMaximum;
+
public volatile long heapAllocated;
-
+
public volatile long heapFree;
- public ServerStatus() {
- bootDate = new Date();
-
- heapSize = Runtime.getRuntime().maxMemory();
-
- systemProperties = new HashMap<String, String>();
+ public String servletContainer;
+
+ public ServerStatus(boolean isGO) {
+ this.bootDate = new Date();
+ this.version = Constants.VERSION;
+ this.releaseDate = Constants.VERSION_DATE;
+ this.isGO = isGO;
+
+ this.heapMaximum = Runtime.getRuntime().maxMemory();
+
+ this.systemProperties = new TreeMap<String, String>();
put("file.encoding");
put("java.home");
+ put("java.awt.headless");
put("java.io.tmpdir");
put("java.runtime.name");
put("java.runtime.version");
--
Gitblit v1.9.1