# HG changeset patch
# User Evgeniy.Koshkin
# Date 1376049994 -14400
# Node ID c14e96398b623a71b016972d417a6fcae174b496
# Parent 6ac3c2491e1ab532c9e65cd66e3d47d632db89b9
presented symbol server url in UI
diff -r 6ac3c2491e1a -r c14e96398b62 common/src/jetbrains/buildServer/symbols/SymbolsConstants.java
--- a/common/src/jetbrains/buildServer/symbols/SymbolsConstants.java Thu Aug 08 19:08:42 2013 +0400
+++ b/common/src/jetbrains/buildServer/symbols/SymbolsConstants.java Fri Aug 09 16:06:34 2013 +0400
@@ -6,4 +6,5 @@
public class SymbolsConstants {
public static final String BUILD_FEATURE_TYPE = "symbol-indexer";
public static final String SERVER_URL_PARAMETER_NAME = "symbols.server-url";
+ public static final String APP_SYMBOLS = "app/symbols/";
}
diff -r 6ac3c2491e1a -r c14e96398b62 server/resources/editSymbolsBuildFeatureParams.jsp
--- a/server/resources/editSymbolsBuildFeatureParams.jsp Thu Aug 08 19:08:42 2013 +0400
+++ b/server/resources/editSymbolsBuildFeatureParams.jsp Fri Aug 09 16:06:34 2013 +0400
@@ -1,2 +1,34 @@
<%@ include file="/include-internal.jsp"%>
-Symbols and sources indexing will be performed for all symbol files (.pdb) appeared among build artifacts.
\ No newline at end of file
+
+
+
+
+
+
\ No newline at end of file
diff -r 6ac3c2491e1a -r c14e96398b62 server/src/jetbrains/buildServer/symbols/DownloadSymbolsController.java
--- a/server/src/jetbrains/buildServer/symbols/DownloadSymbolsController.java Thu Aug 08 19:08:42 2013 +0400
+++ b/server/src/jetbrains/buildServer/symbols/DownloadSymbolsController.java Fri Aug 09 16:06:34 2013 +0400
@@ -27,7 +27,7 @@
*/
public class DownloadSymbolsController extends BaseController {
- public static final String APP_SYMBOLS = "/app/symbols/";
+ private static final String APP_SYMBOLS = "/" + SymbolsConstants.APP_SYMBOLS;
private static final String COMPRESSED_FILE_EXTENSION = "pd_";
private static final String FILE_POINTER_FILE_EXTENSION = "ptr";
diff -r 6ac3c2491e1a -r c14e96398b62 server/src/jetbrains/buildServer/symbols/IndexSymbolsBuildFeature.java
--- a/server/src/jetbrains/buildServer/symbols/IndexSymbolsBuildFeature.java Thu Aug 08 19:08:42 2013 +0400
+++ b/server/src/jetbrains/buildServer/symbols/IndexSymbolsBuildFeature.java Fri Aug 09 16:06:34 2013 +0400
@@ -2,8 +2,10 @@
import jetbrains.buildServer.controllers.BaseController;
import jetbrains.buildServer.serverSide.BuildFeature;
+import jetbrains.buildServer.serverSide.impl.ServerSettings;
import jetbrains.buildServer.web.openapi.PluginDescriptor;
import jetbrains.buildServer.web.openapi.WebControllerManager;
+import jetbrains.buildServer.web.util.WebUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.springframework.web.servlet.ModelAndView;
@@ -18,14 +20,18 @@
private String myEditParametersUrl;
- public IndexSymbolsBuildFeature(PluginDescriptor pluginDescriptor, WebControllerManager web) {
+ public IndexSymbolsBuildFeature(final PluginDescriptor pluginDescriptor, final WebControllerManager web, final ServerSettings serverSettings) {
final String jsp = pluginDescriptor.getPluginResourcesPath("editSymbolsBuildFeatureParams.jsp");
final String html = pluginDescriptor.getPluginResourcesPath("symbolIndexerSettings.html");
web.registerController(html, new BaseController() {
@Override
protected ModelAndView doHandle(final HttpServletRequest request, final HttpServletResponse response) throws Exception {
- return new ModelAndView(jsp);
+ final ModelAndView modelAndView = new ModelAndView(jsp);
+ modelAndView.getModel().put("isGuestEnabled", serverSettings.isGuestLoginAllowed());
+ modelAndView.getModel().put("actualServerUrl", WebUtil.getRootUrl(request));
+ modelAndView.getModel().put("publicFeedUrl", WebUtil.GUEST_AUTH_PREFIX + SymbolsConstants.APP_SYMBOLS);
+ return modelAndView;
}
});
@@ -44,14 +50,14 @@
return "Symbol Files Indexer";
}
+ @Override
+ public boolean isMultipleFeaturesPerBuildTypeAllowed() {
+ return false;
+ }
+
@Nullable
@Override
public String getEditParametersUrl() {
return myEditParametersUrl;
}
-
- @Override
- public boolean isMultipleFeaturesPerBuildTypeAllowed() {
- return false;
- }
}