TW-41191 Fix build

diff --git a/git-agent/git-agent.iml b/git-agent/git-agent.iml
index d31ce3e1961fe62f2539efe3984ca8d4383538c5..0b527e7d49887152c2a1b9a847b8abce9df16f84 100644 (file)
--- a/git-agent/git-agent.iml
+++ b/git-agent/git-agent.iml
@@ -2,7 +2,11 @@
 <module type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="Spring" name="Spring">
-      <configuration />
+      <configuration>
+        <fileset id="fileset" name="Spring Application Context" removed="false">
+          <file>file://$MODULE_DIR$/src/META-INF/build-agent-plugin-git.xml</file>
+        </fileset>
+      </configuration>
     </facet>
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">

diff --git a/git-server-tc/git-server-tc.iml b/git-server-tc/git-server-tc.iml
index 205575c5ebdd2b31b1515abbaa975adc9460c18d..c1bd206f2c3d236e1c9a5a36cd19331a1be214ee 100644 (file)
--- a/git-server-tc/git-server-tc.iml
+++ b/git-server-tc/git-server-tc.iml
@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="Spring" name="Spring">
+      <configuration>
+        <fileset id="fileset" name="Spring Application Context" removed="false">
+          <file>file://$MODULE_DIR$/src/META-INF/build-server-plugin-git-tc.xml</file>
+        </fileset>
+      </configuration>
+    </facet>
+  </component>
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">

diff --git a/git-server/git-server.iml b/git-server/git-server.iml
index 7fa560ad75f9c805b71b3a7c01f848cd5d709f9b..df05ba7844cf56d5f75bb8658c29ec4ca420d7e3 100644 (file)
--- a/git-server/git-server.iml
+++ b/git-server/git-server.iml
@@ -2,7 +2,11 @@
 <module relativePaths="true" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="Spring" name="Spring">
-      <configuration />
+      <configuration>
+        <fileset id="fileset" name="Spring Application Context" removed="false">
+          <file>file://$MODULE_DIR$/src/META-INF/build-server-plugin-git.xml</file>
+        </fileset>
+      </configuration>
     </facet>
   </component>
   <component name="NewModuleRootManager" inherit-compiler-output="true">

diff --git a/git-server/src/jetbrains/buildServer/buildTriggers/vcs/git/GitTrustStoreProviderStatic.java b/git-server/src/jetbrains/buildServer/buildTriggers/vcs/git/GitTrustStoreProviderStatic.java
index 64cf7a71f99f0263a631c91d5f382d297c1a879e..0fd89e38e5428f9b7bb2851230db2a300a6b4081 100644 (file)
--- a/git-server/src/jetbrains/buildServer/buildTriggers/vcs/git/GitTrustStoreProviderStatic.java
+++ b/git-server/src/jetbrains/buildServer/buildTriggers/vcs/git/GitTrustStoreProviderStatic.java
@@ -17,7 +17,7 @@
 package jetbrains.buildServer.buildTriggers.vcs.git;
 
 import jetbrains.buildServer.util.StringUtil;
-import jetbrains.buildServer.util.ssl.TrustStoreReader;
+import jetbrains.buildServer.util.ssl.TrustStoreIO;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -44,7 +44,7 @@ public class GitTrustStoreProviderStatic implements GitTrustStoreProvider {
     if (myTrustedCertificatesDir == null) {
       return null;
     } else {
-      return TrustStoreReader.readTrustStoreFromDirectory(myTrustedCertificatesDir);
+      return TrustStoreIO.readTrustStoreFromDirectory(myTrustedCertificatesDir);
     }
   }
 

diff --git a/git-server/src/jetbrains/buildServer/buildTriggers/vcs/git/patch/GitPatchProcess.java b/git-server/src/jetbrains/buildServer/buildTriggers/vcs/git/patch/GitPatchProcess.java
index 7147462b7544d5b0a77062b130daf0ecba552288..0e4f9e30429949b2e833f874cd9f204739169669 100644 (file)
--- a/git-server/src/jetbrains/buildServer/buildTriggers/vcs/git/patch/GitPatchProcess.java
+++ b/git-server/src/jetbrains/buildServer/buildTriggers/vcs/git/patch/GitPatchProcess.java
@@ -21,7 +21,6 @@ import jetbrains.buildServer.buildTriggers.vcs.git.submodules.SubmoduleFetchExce
 import jetbrains.buildServer.serverSide.CachePaths;
 import jetbrains.buildServer.ssh.TeamCitySshKey;
 import jetbrains.buildServer.ssh.VcsRootSshKeyManager;
-import jetbrains.buildServer.util.ssl.TrustStoreReader;
 import jetbrains.buildServer.vcs.CheckoutRules;
 import jetbrains.buildServer.vcs.VcsRoot;
 import jetbrains.buildServer.vcs.VcsUtil;