changeset 76:2f96f552f1bd 8.0.x

merged 8.1.x
author Evgeniy.Koshkin
date Tue, 04 Mar 2014 16:37:24 +0400
parents 29c6049b8e06 (diff) 737ef280a587 (current diff)
children
files .idea/ant.xml .idea/libraries/TeamCity_server_runtime.xml server-tests/src/DownloadSymbolsControllerTest.java server-tests/src/MetadataStorageMock.java server/src/jetbrains/buildServer/symbols/AuthHelper.java
diffstat 3 files changed, 10 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/.idea/ant.xml	Mon Mar 03 13:50:57 2014 +0400
+++ b/.idea/ant.xml	Tue Mar 04 16:37:24 2014 +0400
@@ -1,15 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="AntConfiguration">
-    <defaultAnt bundledAnt="true" />
-    <buildFile url="file://$PROJECT_DIR$/build/ant.build.xml">
-      <additionalClassPath />
-      <antReference projectDefault="true" />
-      <customJdkName value="" />
-      <maximumHeapSize value="128" />
-      <maximumStackSize value="2" />
-      <properties />
-    </buildFile>
+    <buildFile url="file://$PROJECT_DIR$/build/ant.build.xml" />
   </component>
 </project>
 
--- a/.idea/libraries/TeamCity_server_runtime.xml	Mon Mar 03 13:50:57 2014 +0400
+++ b/.idea/libraries/TeamCity_server_runtime.xml	Tue Mar 04 16:37:24 2014 +0400
@@ -4,7 +4,13 @@
       <root url="file://$teamcitydistribution$/webapps/ROOT/WEB-INF/lib" />
     </CLASSES>
     <JAVADOC />
-    <SOURCES />
+    <SOURCES>
+      <root url="file://$teamcitydistribution$/webapps/ROOT/WEB-INF/lib" />
+    </SOURCES>
     <jarDirectory url="file://$teamcitydistribution$/webapps/ROOT/WEB-INF/lib" recursive="false" />
+    <jarDirectory url="file://$teamcitydistribution$/webapps/ROOT/WEB-INF/lib" recursive="false" />
+    <jarDirectory url="file://$teamcitydistribution$/webapps/ROOT/WEB-INF/lib" recursive="false" />
+    <jarDirectory url="file://$teamcitydistribution$/webapps/ROOT/WEB-INF/lib" recursive="false" type="SOURCES" />
+    <jarDirectory url="file://$teamcitydistribution$/webapps/ROOT/WEB-INF/lib" recursive="false" type="SOURCES" />
   </library>
 </component>
\ No newline at end of file
--- a/server/src/jetbrains/buildServer/symbols/AuthHelper.java	Mon Mar 03 13:50:57 2014 +0400
+++ b/server/src/jetbrains/buildServer/symbols/AuthHelper.java	Tue Mar 04 16:37:24 2014 +0400
@@ -50,12 +50,12 @@
       LOG.debug("Guest access disabled on the server. Will try to authenticate incoming request.");
     }
     LOG.debug("Trying to authenticate incoming request.");
-    final HttpAuthenticationResult authResult = myAuthManager.processAuthenticationRequest(request, response, false);
+    final HttpAuthenticationResult authResult = myAuthManager.processAuthenticationRequest(request, response);
     switch (authResult.getType()) {
       case NOT_APPLICABLE:
         //TODO
         LOG.debug("NOT_APPLICABLE");
-        myAuthManager.processUnauthenticatedRequest(request, response, "", false);
+        myAuthManager.processUnauthenticatedRequest(request, response);
         return null;
       case UNAUTHENTICATED:
         //TODO