From 2b16f1988b26094914cd2dba365ef9dc2fb3918c Mon Sep 17 00:00:00 2001
From: liujuguang <liujuguang@guazi.com>
Date: Wed, 10 Apr 2019 21:19:11 +0800
Subject: [PATCH 1/2] feat: add Bamboo FAQ

---
 README.md         |  2 +-
 doc/Bamboo_FAQ.md | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 doc/Bamboo_FAQ.md

diff --git a/README.md b/README.md
index 5381154..eb48fe6 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@
 * Confluence
 * Confluence plugin: Questions
 * Confluence plugin: Team Calendars
-* Bamboo
+* Bamboo [FAQ](doc/Bamboo_FAQ.md)
 * Bitbucket [FAQ](doc/Bitbucket_FAQ.md)
 * FishEye
 * Crowd [FAQ](doc/Crowd_FAQ.md)
diff --git a/doc/Bamboo_FAQ.md b/doc/Bamboo_FAQ.md
new file mode 100644
index 0000000..15fe277
--- /dev/null
+++ b/doc/Bamboo_FAQ.md
@@ -0,0 +1,15 @@
+# Bamboo FAQ
+
+### 明明按照文档中说的配置了agent，并且成功激活了confluence，但Bamboo激活时提示生成的密钥无效
+这种情况往往是 `JAVA_OPTS` 设置的问题，如果是按照下边方式设置的 `JAVA_OPTS` ，会出现激活失败
+   * 你可以把：`export JAVA_OPTS="-javaagent:/path/to/atlassian-agent.jar ${JAVA_OPTS}"` 这样的命令放到 `.bashrc` 或 `.bash_profile` 这样的文件内。
+
+原因即是 Bamboo 并没有使用全局设置的这个变量，主要还是依赖的其自身目录中 `安装目录下/bin/setenv.sh` 中的配置，所以编辑这个文件，修改 
+
+`JAVA_OPTS="-Xms${JVM_MINIMUM_MEMORY} -Xmx${JVM_MAXIMUM_MEMORY} ${JAVA_OPTS} ${JVM_REQUIRED_ARGS} ${JVM_SUPPORT_RECOMMENDED_ARGS} ${BAMBOO_HOME_MINUSD}"` 
+
+处为 
+
+`JAVA_OPTS="-javaagent:/atlassian-agent存放目录/atlassian-agent.jar -Xms${JVM_MINIMUM_MEMORY} -Xmx${JVM_MAXIMUM_MEMORY} ${JAVA_OPTS} ${JVM_REQUIRED_ARGS} ${JVM_SUPPORT_RECOMMENDED_ARGS} ${BAMBOO_HOME_MINUSD}"`
+
+再重新尝试激活即可

From 3d0c38f5cb959a45c984f5cf4140ed8c0cd7db42 Mon Sep 17 00:00:00 2001
From: liujuguang <liujuguang@guazi.com>
Date: Wed, 10 Apr 2019 23:29:15 +0800
Subject: [PATCH 2/2] feat: add Crucible & FishEye FAQ

---
 README.md                   |  4 ++--
 doc/FishEye_Crucible_FAQ.md | 17 +++++++++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 doc/FishEye_Crucible_FAQ.md

diff --git a/README.md b/README.md
index eb48fe6..fd83766 100644
--- a/README.md
+++ b/README.md
@@ -12,9 +12,9 @@
 * Confluence plugin: Team Calendars
 * Bamboo [FAQ](doc/Bamboo_FAQ.md)
 * Bitbucket [FAQ](doc/Bitbucket_FAQ.md)
-* FishEye
+* FishEye [FAQ](doc/FishEye_Crucible_FAQ.md)
 * Crowd [FAQ](doc/Crowd_FAQ.md)
-* Crucible
+* Crucible [FAQ](doc/FishEye_Crucible_FAQ.md)
 * Third party plugins
 
 ## 使用说明
diff --git a/doc/FishEye_Crucible_FAQ.md b/doc/FishEye_Crucible_FAQ.md
new file mode 100644
index 0000000..cf10933
--- /dev/null
+++ b/doc/FishEye_Crucible_FAQ.md
@@ -0,0 +1,17 @@
+# FishEye & Crucible FAQ
+
+### 明明按照文档中说的配置了agent，并且成功激活了confluence，但 FishEye or Crucible 激活时提示生成的密钥无效
+这种情况往往是 `JAVA_OPTS` 设置的问题，如果是按照下边方式设置的 `JAVA_OPTS` ，会出现激活失败
+   * 你可以把：`export JAVA_OPTS="-javaagent:/path/to/atlassian-agent.jar ${JAVA_OPTS}"` 这样的命令放到 `.bashrc` 或 `.bash_profile` 这样的文件内。
+
+原因即是 FishEye 和 Crucible 没有直接使用这个环境变量，使用的是 `FISHEYE_OPTS` 这一环境变量
+
+所以我们打开bin目录中的fisheyectl.sh文件，将其中的
+
+```FISHEYE_CMD="$JAVACMD $FISHEYE_OPTS -Dfisheye.library.path=$FISHEYE_LIBRARY_PATH -Dfisheye.inst=$FISHEYE_INST -Djava.awt.headless=true -Djava.endorsed.dirs=$FISHEYE_HOME/lib/endorsed -jar $FISHEYE_HOME/fisheyeboot.jar"```
+
+添加成
+
+```FISHEYE_CMD="$JAVACMD $FISHEYE_OPTS -javaagent:/path/to/atlassian-agent-v1.2.2/atlassian-agent.jar -Dfisheye.library.path=$FISHEYE_LIBRARY_PATH -Dfisheye.inst=$FISHEYE_INST -Djava.awt.headless=true -Djava.endorsed.dirs=$FISHEYE_HOME/lib/endorsed -jar $FISHEYE_HOME/fisheyeboot.jar"```
+
+再重新尝试激活即可。