Mercurial > hg > tc-symbol-server

changeset 99:d15927dab809

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge 9.1.x
author Evgeniy.Koshkin@unit-519.Labs.IntelliJ.Net
date Mon, 16 May 2016 14:49:19 +0300
parents cee56ab3c315 (diff) 6d1877c10a3b (current diff)
children d9cb6eec6f74
files .idea/runConfigurations/Server.xml agent/src/jetbrains/buildServer/symbols/tools/WinDbgToolsHelper.java idea-resolve-helper.iml server-tests/src/DownloadSymbolsControllerTest.java server-tests/src/MetadataStorageMock.java server/server.iml
diffstat 3 files changed, 29 insertions(+), 30 deletions(-) [+]
line wrap: on
line diff
--- a/.idea/runConfigurations/Server.xml	Wed Nov 25 13:37:57 2015 +0300
+++ b/.idea/runConfigurations/Server.xml	Mon May 16 14:49:19 2016 +0300
@@ -5,7 +5,7 @@
     <option name="COMMON_VM_ARGUMENTS" value="-ea -Xmx384m -XX:MaxPermSize=200m -Ddebug=true -server -XX:+HeapDumpOnOutOfMemoryError -Djava.awt.headless -DTC.res.disableAll=true -Dteamcity.development.mode=true -Dteamcity.development.shadowCopyClasses=true -Dteamcity.data.path=%IDEA_RUN:TOMCAT_HOME%/../PluginDev.Data -Dteamcity_logs=%IDEA_RUN:TOMCAT_HOME%/logs -Dlog4j.configuration=file:%IDEA_RUN:TOMCAT_HOME%/conf/teamcity-server-log4j.xml" />
     <option name="UPDATING_POLICY" value="restart-server" />
     <deployment>
-      <file path="%IDEA_RUN:TOMCAT_HOME%/webapps/ROOT">
+      <file path="C:/Progra~1/Java/jdk1.8.0_65/jre/bin/%IDEA_RUN:TOMCAT_HOME%/webapps/ROOT">
         <settings>
           <option name="CONTEXT_PATH" value="/bs" />
         </settings>
--- a/idea-resolve-helper.iml	Wed Nov 25 13:37:57 2015 +0300
+++ b/idea-resolve-helper.iml	Mon May 16 14:49:19 2016 +0300
@@ -4,41 +4,41 @@
     <facet type="Spring" name="Spring">
       <configuration>
         <fileset id="fileset1" name="idea resolve helper" removed="false">
-          <file>file://$TeamCityDistribution$/webapps/ROOT/WEB-INF/build-server-plugin-agents-statistics-web.xml</file>
-          <file>file://$TeamCityDistribution$/webapps/ROOT/WEB-INF/build-server-plugin-buildFailures.xml</file>
-          <file>file://$TeamCityDistribution$/webapps/ROOT/WEB-INF/build-server-plugin-dotnet-pdb.xml</file>
-          <file>file://$TeamCityDistribution$/webapps/ROOT/WEB-INF/build-server-plugin-freespace.xml</file>
-          <file>file://$TeamCityDistribution$/webapps/ROOT/WEB-INF/buildServerConfigurator.xml</file>
-          <file>file://$TeamCityDistribution$/webapps/ROOT/WEB-INF/buildServerPluginsSupportWeb.xml</file>
-          <file>file://$TeamCityDistribution$/webapps/ROOT/WEB-INF/buildServerSpringStatistics.xml</file>
-          <file>file://$TeamCityDistribution$/webapps/ROOT/WEB-INF/buildServerSpringWeb.xml</file>
+          <file>file://$teamcitydistribution$/webapps/ROOT/WEB-INF/build-server-plugin-agents-statistics-web.xml</file>
+          <file>file://$teamcitydistribution$/webapps/ROOT/WEB-INF/build-server-plugin-buildFailures.xml</file>
+          <file>file://$teamcitydistribution$/webapps/ROOT/WEB-INF/build-server-plugin-dotnet-pdb.xml</file>
+          <file>file://$teamcitydistribution$/webapps/ROOT/WEB-INF/build-server-plugin-freespace.xml</file>
+          <file>file://$teamcitydistribution$/webapps/ROOT/WEB-INF/buildServerConfigurator.xml</file>
+          <file>file://$teamcitydistribution$/webapps/ROOT/WEB-INF/buildServerPluginsSupportWeb.xml</file>
+          <file>file://$teamcitydistribution$/webapps/ROOT/WEB-INF/buildServerSpringStatistics.xml</file>
+          <file>file://$teamcitydistribution$/webapps/ROOT/WEB-INF/buildServerSpringWeb.xml</file>
         </fileset>
       </configuration>
     </facet>
     <facet type="web" name="Web">
       <configuration>
         <descriptors>
-          <deploymentDescriptor name="web.xml" url="file://$TeamCityDistribution$/webapps/ROOT/WEB-INF/web.xml" />
+          <deploymentDescriptor name="web.xml" url="file://$teamcitydistribution$/webapps/ROOT/WEB-INF/web.xml" />
         </descriptors>
         <webroots>
-          <root url="file://$TeamCityDistribution$/webapps/ROOT" relative="/" />
+          <root url="file://$teamcitydistribution$/webapps/ROOT" relative="/" />
         </webroots>
       </configuration>
     </facet>
   </component>
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
-    <content url="file://$TeamCityDistribution$/webapps/ROOT">
-      <sourceFolder url="file://$TeamCityDistribution$/webapps/ROOT" isTestSource="false" />
-      <excludeFolder url="file://$TeamCityDistribution$/webapps/ROOT/WEB-INF/plugins" />
-      <excludeFolder url="file://$TeamCityDistribution$/webapps/ROOT/plugins" />
+    <content url="file://$teamcitydistribution$/webapps/ROOT">
+      <sourceFolder url="file://$teamcitydistribution$/webapps/ROOT" isTestSource="false" />
+      <excludeFolder url="file://$teamcitydistribution$/webapps/ROOT/WEB-INF/plugins" />
+      <excludeFolder url="file://$teamcitydistribution$/webapps/ROOT/plugins" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$TeamCityDistribution$/webapps/ROOT/WEB-INF/lib/standard.jar!/" />
+          <root url="jar://$teamcitydistribution$/webapps/ROOT/WEB-INF/lib/standard.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
--- a/server/server.iml	Wed Nov 25 13:37:57 2015 +0300
+++ b/server/server.iml	Mon May 16 14:49:19 2016 +0300
@@ -5,19 +5,19 @@
       <configuration>
         <fileset id="fileset1" name="Server" removed="false">
           <file>file://$MODULE_DIR$/fake-teamcity-server-plugin-context.xml</file>
-          <file>jar://$TeamCityDistribution$/webapps/ROOT/WEB-INF/lib/server.jar!/META-INF/build-server-declarative-extensibility.xml</file>
-          <file>jar://$TeamCityDistribution$/webapps/ROOT/WEB-INF/lib/server.jar!/META-INF/build-server-plugin-agents-statistics.xml</file>
-          <file>jar://$TeamCityDistribution$/webapps/ROOT/WEB-INF/lib/server.jar!/META-INF/buildServerCompatMode.xml</file>
-          <file>jar://$TeamCityDistribution$/webapps/ROOT/WEB-INF/lib/server.jar!/META-INF/buildServerPermissions.xml</file>
-          <file>jar://$TeamCityDistribution$/webapps/ROOT/WEB-INF/lib/server.jar!/META-INF/buildServerPluginsSupport.xml</file>
-          <file>jar://$TeamCityDistribution$/webapps/ROOT/WEB-INF/lib/server.jar!/META-INF/buildServerSpring.xml</file>
-          <file>jar://$TeamCityDistribution$/webapps/ROOT/WEB-INF/lib/common-impl.jar!/META-INF/shared-spring-sub-container.xml</file>
-          <file>jar://$TeamCityDistribution$/webapps/ROOT/WEB-INF/lib/common-impl.jar!/META-INF/plugin-model-shared-spring.xml</file>
-          <file>file://$TeamCityDistribution$/webapps/ROOT/WEB-INF/buildServerSpringWeb.xml</file>
+          <file>jar://$teamcitydistribution$/webapps/ROOT/WEB-INF/lib/server.jar!/META-INF/build-server-declarative-extensibility.xml</file>
+          <file>jar://$teamcitydistribution$/webapps/ROOT/WEB-INF/lib/server.jar!/META-INF/build-server-plugin-agents-statistics.xml</file>
+          <file>jar://$teamcitydistribution$/webapps/ROOT/WEB-INF/lib/server.jar!/META-INF/buildServerCompatMode.xml</file>
+          <file>jar://$teamcitydistribution$/webapps/ROOT/WEB-INF/lib/server.jar!/META-INF/buildServerPermissions.xml</file>
+          <file>jar://$teamcitydistribution$/webapps/ROOT/WEB-INF/lib/server.jar!/META-INF/buildServerPluginsSupport.xml</file>
+          <file>jar://$teamcitydistribution$/webapps/ROOT/WEB-INF/lib/server.jar!/META-INF/buildServerSpring.xml</file>
+          <file>jar://$teamcitydistribution$/webapps/ROOT/WEB-INF/lib/common-impl.jar!/META-INF/shared-spring-sub-container.xml</file>
+          <file>jar://$teamcitydistribution$/webapps/ROOT/WEB-INF/lib/common-impl.jar!/META-INF/plugin-model-shared-spring.xml</file>
+          <file>file://$teamcitydistribution$/webapps/ROOT/WEB-INF/buildServerSpringWeb.xml</file>
           <file>file://$MODULE_DIR$/src/META-INF/build-server-plugin-symbol-server.xml</file>
-          <file>jar://$TeamCityDistribution$/buildAgent/lib/common-impl.jar!/META-INF/per-plugin-shared-spring.xml</file>
-          <file>jar://$TeamCityDistribution$/buildAgent/lib/common-impl.jar!/META-INF/plugin-model-shared-spring.xml</file>
-          <file>jar://$TeamCityDistribution$/buildAgent/lib/common-impl.jar!/META-INF/shared-spring-sub-container.xml</file>
+          <file>jar://$teamcitydistribution$/buildAgent/lib/common-impl.jar!/META-INF/per-plugin-shared-spring.xml</file>
+          <file>jar://$teamcitydistribution$/buildAgent/lib/common-impl.jar!/META-INF/plugin-model-shared-spring.xml</file>
+          <file>jar://$teamcitydistribution$/buildAgent/lib/common-impl.jar!/META-INF/shared-spring-sub-container.xml</file>
         </fileset>
       </configuration>
     </facet>
@@ -46,5 +46,4 @@
     <orderEntry type="module" module-name="common" />
     <orderEntry type="library" name="TeamCity server runtime" level="project" />
   </component>
-</module>
-
+</module>
\ No newline at end of file