summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Moger <james.moger@gitblit.com>2012-04-09 16:26:07 -0400
committerJames Moger <james.moger@gitblit.com>2012-04-09 16:26:07 -0400
commiteb7609552b0087187aa8cd1d64459c1c4daa99a8 (patch)
treee48ee953ad87487c04768b6d53f7bca5738f863b
parenta21fc59ea5b6e38068d90e64c7a2a2c097d588a3 (diff)
downloadgitblit-eb7609552b0087187aa8cd1d64459c1c4daa99a8.tar.gz
gitblit-eb7609552b0087187aa8cd1d64459c1c4daa99a8.zip
Automatically set java.awt.headless=true for Gitblit GO
-rw-r--r--docs/04_releases.mkd1
-rw-r--r--src/com/gitblit/GitBlitServer.java4
-rw-r--r--src/com/gitblit/models/ServerStatus.java1
3 files changed, 5 insertions, 1 deletions
diff --git a/docs/04_releases.mkd b/docs/04_releases.mkd
index 28b92810..32486ab7 100644
--- a/docs/04_releases.mkd
+++ b/docs/04_releases.mkd
@@ -7,6 +7,7 @@
#### fixes
- Fixed bug where you could not remove all selections from a RepositoryModel list (permitted users, permitted teams, hook scripts, federation sets, etc) (issue 81)
+- Automatically set *java.awt.headless=true* for Gitblit GO
**0.9.2** *released 2012-04-04*
diff --git a/src/com/gitblit/GitBlitServer.java b/src/com/gitblit/GitBlitServer.java
index 3f996fcc..ce0d1fbb 100644
--- a/src/com/gitblit/GitBlitServer.java
+++ b/src/com/gitblit/GitBlitServer.java
@@ -155,10 +155,12 @@ public class GitBlitServer {
logger.info("");
logger.info(Constants.BORDER);
+ System.setProperty("java.awt.headless", "true");
+
String osname = System.getProperty("os.name");
String osversion = System.getProperty("os.version");
logger.info("Running on " + osname + " (" + osversion + ")");
-
+
List<Connector> connectors = new ArrayList<Connector>();
// conditionally configure the http connector
diff --git a/src/com/gitblit/models/ServerStatus.java b/src/com/gitblit/models/ServerStatus.java
index 3e7e8d82..f1650c8d 100644
--- a/src/com/gitblit/models/ServerStatus.java
+++ b/src/com/gitblit/models/ServerStatus.java
@@ -62,6 +62,7 @@ public class ServerStatus implements Serializable {
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");