Skip to content

The Unified and Autonomous Development Platform

Fix scripting document link

Robin Shen9ec2046eee8b
diff --git a/server-core/src/main/java/io/onedev/server/OneDev.java b/server-core/src/main/java/io/onedev/server/OneDev.java
index 08ed73acaf..92c9ed5305 100644
--- a/server-core/src/main/java/io/onedev/server/OneDev.java
+++ b/server-core/src/main/java/io/onedev/server/OneDev.java
@@ -13,14 +13,17 @@ import java.util.List;
import java.util.Set;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.atomic.AtomicReference;
+
import javax.annotation.Nullable;
import javax.inject.Inject;
+
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.SystemUtils;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.Url.StringMode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+
import io.onedev.commons.launcher.bootstrap.Bootstrap;
import io.onedev.commons.launcher.loader.AbstractPlugin;
import io.onedev.commons.launcher.loader.AppLoader;
@@ -41,6 +44,7 @@ import io.onedev.server.persistence.SessionManager;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.ServerConfig;
+import io.onedev.server.util.Version;
import io.onedev.server.util.init.InitStage;
import io.onedev.server.util.init.ManualConfig;
import io.onedev.server.util.jetty.JettyRunner;
@@ -315,7 +319,8 @@ public class OneDev extends AbstractPlugin implements Serializable {
}
public String getDocRoot() {
- return "https://code.onedev.io/projects/onedev-manual/blob/master";
+ Version version = new Version(AppLoader.getProduct().getVersion());
+ return "https://code.onedev.io/projects/onedev-manual/blob/" + version.getMajor() + "." + version.getMinor();
}
}
diff --git a/server-core/src/main/java/io/onedev/server/util/GroovyUtils.java b/server-core/src/main/java/io/onedev/server/util/GroovyUtils.java
index c3411cb437..eb0b04e22b 100644
--- a/server-core/src/main/java/io/onedev/server/util/GroovyUtils.java
+++ b/server-core/src/main/java/io/onedev/server/util/GroovyUtils.java
@@ -1,5 +1,6 @@
package io.onedev.server.util;
+import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
@@ -28,8 +29,12 @@ public class GroovyUtils {
public static Class<?> compile(String script) {
Class<?> scriptClass = scriptClassCache.get(script);
if (scriptClass == null) {
- scriptClass = new GroovyClassLoader(GroovyUtils.class.getClassLoader()).parseClass(script);
- scriptClassCache.put(script, scriptClass);
+ try (GroovyClassLoader classLoader = new GroovyClassLoader(GroovyUtils.class.getClassLoader())) {
+ scriptClass = classLoader.parseClass(script);
+ scriptClassCache.put(script, scriptClass);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
}
return scriptClass;
}
diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/booleaninput/defaultvalueprovider/ScriptingDefaultValue.java b/server-core/src/main/java/io/onedev/server/util/inputspec/booleaninput/defaultvalueprovider/ScriptingDefaultValue.java
index bd78775a6f..e2b8dade05 100755
--- a/server-core/src/main/java/io/onedev/server/util/inputspec/booleaninput/defaultvalueprovider/ScriptingDefaultValue.java
+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/booleaninput/defaultvalueprovider/ScriptingDefaultValue.java
@@ -15,7 +15,7 @@ public class ScriptingDefaultValue implements DefaultValueProvider {
private String scriptName;
@Editable(description="Groovy script to be evaluated. It should return a <i>boolean</i> value. "
- + "Check <a href='$docRoot/Scripting' target='_blank'>scripting help</a> for details")
+ + "Check <a href='$docRoot/pages/scripting.md' target='_blank'>scripting help</a> for details")
@ScriptChoice
@OmitName
@NotEmpty
diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/ScriptingChoices.java b/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/ScriptingChoices.java
index 069b948f46..3190dc91ed 100755
--- a/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/ScriptingChoices.java
+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/ScriptingChoices.java
@@ -26,7 +26,7 @@ public class ScriptingChoices extends ChoiceProvider {
@Editable(description="Groovy script to be evaluated. The return value should be a value to color map, "
+ "for instance:<br>"
+ "<code>return [\"Successful\":\"#00ff00\", \"Failed\":\"#ff0000\"]</code>, "
- + "Use <tt>null</tt> if the value does not have a color. Check <a href='$docRoot/Scripting' target='_blank'>scripting help</a> for details")
+ + "Use <tt>null</tt> if the value does not have a color. Check <a href='$docRoot/pages/scripting.md' target='_blank'>scripting help</a> for details")
@ScriptChoice
@OmitName
@NotEmpty
diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/defaultmultivalueprovider/ScriptingDefaultMultiValue.java b/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/defaultmultivalueprovider/ScriptingDefaultMultiValue.java
index 436b99846f..9ee033328c 100755
--- a/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/defaultmultivalueprovider/ScriptingDefaultMultiValue.java
+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/defaultmultivalueprovider/ScriptingDefaultMultiValue.java
@@ -17,7 +17,7 @@ public class ScriptingDefaultMultiValue implements DefaultMultiValueProvider {
private String scriptName;
@Editable(description="Groovy script to be evaluated. It should return list of string. "
- + "Check <a href='$docRoot/Scripting' target='_blank'>scripting help</a> for details")
+ + "Check <a href='$docRoot/pages/scripting.md' target='_blank'>scripting help</a> for details")
@ScriptChoice
@OmitName
@NotEmpty
diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/defaultvalueprovider/ScriptingDefaultValue.java b/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/defaultvalueprovider/ScriptingDefaultValue.java
index 2760effc2b..2f992f7aa9 100755
--- a/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/defaultvalueprovider/ScriptingDefaultValue.java
+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/defaultvalueprovider/ScriptingDefaultValue.java
@@ -15,7 +15,7 @@ public class ScriptingDefaultValue implements DefaultValueProvider {
private String scriptName;
@Editable(description="Groovy script to be evaluated. It should return a <i>string</i> value. "
- + "Check <a href='$docRoot/Scripting' target='_blank'>scripting help</a> for details")
+ + "Check <a href='$docRoot/pages/scripting.md' target='_blank'>scripting help</a> for details")
@ScriptChoice
@OmitName
@NotEmpty
diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/dateinput/defaultvalueprovider/ScriptingDefaultValue.java b/server-core/src/main/java/io/onedev/server/util/inputspec/dateinput/defaultvalueprovider/ScriptingDefaultValue.java
index b4b1e44222..e0feefd7e1 100755
--- a/server-core/src/main/java/io/onedev/server/util/inputspec/dateinput/defaultvalueprovider/ScriptingDefaultValue.java
+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/dateinput/defaultvalueprovider/ScriptingDefaultValue.java
@@ -17,7 +17,7 @@ public class ScriptingDefaultValue implements DefaultValueProvider {
private String scriptName;
@Editable(description="Groovy script to be evaluated. It should return a <i>Date</i> value. "
- + "Check <a href='$docRoot/Scripting' target='_blank'>scripting help</a> for details")
+ + "Check <a href='$docRoot/pages/scripting.md' target='_blank'>scripting help</a> for details")
@ScriptChoice
@OmitName
@NotEmpty
diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/choiceprovider/ScriptingChoices.java b/server-core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/choiceprovider/ScriptingChoices.java
index 32cdd873d2..4880fcbf70 100755
--- a/server-core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/choiceprovider/ScriptingChoices.java
+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/choiceprovider/ScriptingChoices.java
@@ -25,7 +25,7 @@ public class ScriptingChoices implements ChoiceProvider {
private String scriptName;
@Editable(description="Groovy script to be evaluated. The return value should be a list of group facade object to be used as choices. "
- + "Check <a href='$docRoot/Scripting' target='_blank'>scripting help</a> for details")
+ + "Check <a href='$docRoot/pages/scripting.md' target='_blank'>scripting help</a> for details")
@ScriptChoice
@OmitName
@NotEmpty
diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java b/server-core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java
index ed28c1c8fd..ce5f8de69c 100755
--- a/server-core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java
+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java
@@ -15,7 +15,7 @@ public class ScriptingDefaultValue implements DefaultValueProvider {
private String scriptName;
@Editable(description="Groovy script to be evaluated. It should return name of a group. "
- + "Check <a href='$docRoot/Scripting' target='_blank'>scripting help</a> for details")
+ + "Check <a href='$docRoot/pages/scripting.md' target='_blank'>scripting help</a> for details")
@ScriptChoice
@OmitName
@NotEmpty
diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/numberinput/defaultvalueprovider/ScriptingDefaultValue.java b/server-core/src/main/java/io/onedev/server/util/inputspec/numberinput/defaultvalueprovider/ScriptingDefaultValue.java
index b757d4c3af..dd4c233477 100755
--- a/server-core/src/main/java/io/onedev/server/util/inputspec/numberinput/defaultvalueprovider/ScriptingDefaultValue.java
+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/numberinput/defaultvalueprovider/ScriptingDefaultValue.java
@@ -15,7 +15,7 @@ public class ScriptingDefaultValue implements DefaultValueProvider {
private String scriptName;
@Editable(description="Groovy script to be evaluated. It should return a <i>Integer</i> value. "
- + "Check <a href='$docRoot/Scripting' target='_blank'>scripting help</a> for details")
+ + "Check <a href='$docRoot/pages/scripting.md' target='_blank'>scripting help</a> for details")
@ScriptChoice
@OmitName
@NotEmpty
diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/textinput/defaultvalueprovider/ScriptingDefaultValue.java b/server-core/src/main/java/io/onedev/server/util/inputspec/textinput/defaultvalueprovider/ScriptingDefaultValue.java
index 33d51a3b5e..7b67ff2f1e 100755
--- a/server-core/src/main/java/io/onedev/server/util/inputspec/textinput/defaultvalueprovider/ScriptingDefaultValue.java
+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/textinput/defaultvalueprovider/ScriptingDefaultValue.java
@@ -15,7 +15,7 @@ public class ScriptingDefaultValue implements DefaultValueProvider {
private String scriptName;
@Editable(description="Groovy script to be evaluated. It should return a <i>String</i> value. "
- + "Check <a href='$docRoot/Scripting' target='_blank'>scripting help</a> for details")
+ + "Check <a href='$docRoot/pages/scripting.md' target='_blank'>scripting help</a> for details")
@ScriptChoice
@OmitName
@NotEmpty
diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/ScriptingChoices.java b/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/ScriptingChoices.java
index 54824c7afe..4b4a1eebc5 100755
--- a/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/ScriptingChoices.java
+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/ScriptingChoices.java
@@ -28,7 +28,7 @@ public class ScriptingChoices implements ChoiceProvider {
private String scriptName;
@Editable(description="Groovy script to be evaluated. The return value should be a list of user login names to "
- + "be used as choices. Check <a href='$docRoot/Scripting' target='_blank'>scripting help</a> for details")
+ + "be used as choices. Check <a href='$docRoot/pages/scripting.md' target='_blank'>scripting help</a> for details")
@ScriptChoice
@OmitName
@NotEmpty
diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/defaultmultivalueprovider/ScriptingDefaultMultiValue.java b/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/defaultmultivalueprovider/ScriptingDefaultMultiValue.java
index 7f04342442..5e0ffe1ff4 100755
--- a/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/defaultmultivalueprovider/ScriptingDefaultMultiValue.java
+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/defaultmultivalueprovider/ScriptingDefaultMultiValue.java
@@ -17,7 +17,7 @@ public class ScriptingDefaultMultiValue implements DefaultMultiValueProvider {
private String scriptName;
@Editable(description="Groovy script to be evaluated. It should return list of user login name. "
- + "Check <a href='$docRoot/Scripting' target='_blank'>scripting help</a> for details")
+ + "Check <a href='$docRoot/pages/scripting.md' target='_blank'>scripting help</a> for details")
@ScriptChoice
@OmitName
@NotEmpty
diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java b/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java
index d208604de1..fabbea73ad 100755
--- a/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java
+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java
@@ -15,7 +15,7 @@ public class ScriptingDefaultValue implements DefaultValueProvider {
private String scriptName;
@Editable(description="Groovy script to be evaluated. It should return login name of an user. "
- + "Check <a href='$docRoot/Scripting' target='_blank'>scripting help</a> for details")
+ + "Check <a href='$docRoot/pages/scripting.md' target='_blank'>scripting help</a> for details")
@ScriptChoice
@OmitName
@NotEmpty
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.java b/server-core/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.java
index db41a16207..3a10a0f343 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.java
@@ -16,6 +16,8 @@ import org.hibernate.validator.constraints.NotEmpty;
import com.google.common.base.Preconditions;
import com.google.common.collect.Sets;
+import io.onedev.commons.utils.StringUtils;
+import io.onedev.server.OneDev;
import io.onedev.server.util.BeanUtils;
import io.onedev.server.util.ComponentContext;
import io.onedev.server.util.ReflectionUtils;
@@ -167,7 +169,12 @@ public class PropertyDescriptor implements Serializable {
}
public String getDescription() {
- return EditableUtils.getDescription(getPropertyGetter());
+ String description = EditableUtils.getDescription(getPropertyGetter());
+ if (description != null) {
+ return StringUtils.replace(description, "$docRoot", OneDev.getInstance().getDocRoot());
+ } else {
+ return null;
+ }
}
}
diff --git a/server-core/src/test/java/io/onedev/server/git/AbstractGitTest.java b/server-core/src/test/java/io/onedev/server/git/AbstractGitTest.java
index bcc26b2644..9d4db1bf3a 100644
--- a/server-core/src/test/java/io/onedev/server/git/AbstractGitTest.java
+++ b/server-core/src/test/java/io/onedev/server/git/AbstractGitTest.java
@@ -21,7 +21,6 @@ import org.slf4j.LoggerFactory;
import io.onedev.commons.launcher.loader.AppLoader;
import io.onedev.commons.launcher.loader.AppLoaderMocker;
import io.onedev.commons.utils.FileUtils;
-import io.onedev.server.git.GitUtils;
import io.onedev.server.git.command.GitCommand;
import io.onedev.server.git.config.GitConfig;
diff --git a/server-core/src/test/java/io/onedev/server/git/BlobEditsTest.java b/server-core/src/test/java/io/onedev/server/git/BlobEditsTest.java
index a049f2e135..55e32d420a 100644
--- a/server-core/src/test/java/io/onedev/server/git/BlobEditsTest.java
+++ b/server-core/src/test/java/io/onedev/server/git/BlobEditsTest.java
@@ -22,8 +22,6 @@ import org.junit.Test;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
-import io.onedev.server.git.BlobContent;
-import io.onedev.server.git.BlobEdits;
import io.onedev.server.git.exception.NotTreeException;
import io.onedev.server.git.exception.ObjectAlreadyExistsException;
import io.onedev.server.git.exception.ObjectNotFoundException;
diff --git a/server-core/src/test/java/io/onedev/server/git/GitUtilsTest.java b/server-core/src/test/java/io/onedev/server/git/GitUtilsTest.java
index 8167a4b9ff..9286f6bcac 100644
--- a/server-core/src/test/java/io/onedev/server/git/GitUtilsTest.java
+++ b/server-core/src/test/java/io/onedev/server/git/GitUtilsTest.java
@@ -14,8 +14,6 @@ import org.junit.Test;
import com.google.common.collect.Sets;
-import io.onedev.server.git.GitUtils;
-
public class GitUtilsTest extends AbstractGitTest {
@Test
diff --git a/server-core/src/test/java/io/onedev/server/git/GitVersionTest.java b/server-core/src/test/java/io/onedev/server/git/GitVersionTest.java
index c608d81b8e..3dc2e80658 100644
--- a/server-core/src/test/java/io/onedev/server/git/GitVersionTest.java
+++ b/server-core/src/test/java/io/onedev/server/git/GitVersionTest.java
@@ -6,8 +6,6 @@ import static org.junit.Assert.assertTrue;
import org.junit.Test;
-import io.onedev.server.git.GitVersion;
-
public class GitVersionTest {
@Test
diff --git a/server-core/src/test/java/io/onedev/server/git/command/LogCommandTest.java b/server-core/src/test/java/io/onedev/server/git/command/LogCommandTest.java
index 527ee6064c..4ce61da197 100644
--- a/server-core/src/test/java/io/onedev/server/git/command/LogCommandTest.java
+++ b/server-core/src/test/java/io/onedev/server/git/command/LogCommandTest.java
@@ -11,8 +11,6 @@ import org.junit.Test;
import com.google.common.collect.Lists;
import io.onedev.server.git.AbstractGitTest;
-import io.onedev.server.git.command.GitCommit;
-import io.onedev.server.git.command.LogCommand;
public class LogCommandTest extends AbstractGitTest {
diff --git a/server-core/src/test/java/io/onedev/server/util/BeanUtilsTest.java b/server-core/src/test/java/io/onedev/server/util/BeanUtilsTest.java
index 816bb147ff..89b1e7d079 100644
--- a/server-core/src/test/java/io/onedev/server/util/BeanUtilsTest.java
+++ b/server-core/src/test/java/io/onedev/server/util/BeanUtilsTest.java
@@ -8,8 +8,6 @@ import java.util.List;
import org.junit.Test;
-import io.onedev.server.util.BeanUtils;
-
public class BeanUtilsTest {
@Test
diff --git a/server-core/src/test/java/io/onedev/server/util/PathComparatorTest.java b/server-core/src/test/java/io/onedev/server/util/PathComparatorTest.java
index 28b43b5fa7..50412ba6a7 100644
--- a/server-core/src/test/java/io/onedev/server/util/PathComparatorTest.java
+++ b/server-core/src/test/java/io/onedev/server/util/PathComparatorTest.java
@@ -4,8 +4,6 @@ import static org.junit.Assert.assertEquals;
import org.junit.Test;
-import io.onedev.server.util.PathComparator;
-
public class PathComparatorTest {
@Test
diff --git a/server-core/src/test/java/io/onedev/server/util/ReflectionUtilsTest.java b/server-core/src/test/java/io/onedev/server/util/ReflectionUtilsTest.java
index 06876379cd..069eaf26c0 100644
--- a/server-core/src/test/java/io/onedev/server/util/ReflectionUtilsTest.java
+++ b/server-core/src/test/java/io/onedev/server/util/ReflectionUtilsTest.java
@@ -9,8 +9,6 @@ import org.junit.Test;
import com.google.common.base.Optional;
-import io.onedev.server.util.ReflectionUtils;
-
public class ReflectionUtilsTest {
private static class SuperClass<T1, T2> {}