split config into several .xml files, polish IDEA resolving for spring, add http...

diff --git a/idea-resolve-helper.iml b/idea-resolve-helper.iml
index 14572536d829fce93eb43c4d1ca75d07943e22ee..dc5469cbf1431d8d0cef1848a646eccf208e1e3e 100644 (file)
--- a/idea-resolve-helper.iml
+++ b/idea-resolve-helper.iml
@@ -2,7 +2,18 @@
 <module type="JAVA_MODULE" version="4">\r
   <component name="FacetManager">\r
     <facet type="Spring" name="Spring">\r
-      <configuration />\r
+      <configuration>\r
+        <fileset id="fileset1" name="idea resolve helper" removed="false">\r
+          <file>file://$TeamCityDistribution$/webapps/ROOT/WEB-INF/build-server-plugin-agents-statistics-web.xml</file>\r
+          <file>file://$TeamCityDistribution$/webapps/ROOT/WEB-INF/build-server-plugin-buildFailures.xml</file>\r
+          <file>file://$TeamCityDistribution$/webapps/ROOT/WEB-INF/build-server-plugin-dotnet-pdb.xml</file>\r
+          <file>file://$TeamCityDistribution$/webapps/ROOT/WEB-INF/build-server-plugin-freespace.xml</file>\r
+          <file>file://$TeamCityDistribution$/webapps/ROOT/WEB-INF/buildServerConfigurator.xml</file>\r
+          <file>file://$TeamCityDistribution$/webapps/ROOT/WEB-INF/buildServerPluginsSupportWeb.xml</file>\r
+          <file>file://$TeamCityDistribution$/webapps/ROOT/WEB-INF/buildServerSpringStatistics.xml</file>\r
+          <file>file://$TeamCityDistribution$/webapps/ROOT/WEB-INF/buildServerSpringWeb.xml</file>\r
+        </fileset>\r
+      </configuration>\r
     </facet>\r
     <facet type="web" name="Web">\r
       <configuration>\r
@@ -32,6 +43,7 @@
       </library>\r
     </orderEntry>\r
     <orderEntry type="library" name="standard.jar" level="project" />\r
+    <orderEntry type="library" name="TeamCity server runtime" level="project" />\r
   </component>\r
 </module>\r
 \r

diff --git a/nuget-server/nuget-server.iml b/nuget-server/nuget-server.iml
index 36c800563f2f7658d4a02937f9a4b200af7e457b..a62b8941b4965db291ebc1cdfc46d1d5e3c28009 100644 (file)
--- a/nuget-server/nuget-server.iml
+++ b/nuget-server/nuget-server.iml
@@ -11,6 +11,9 @@
           <file>file://$TeamCityDistribution$/webapps/ROOT/WEB-INF/buildServerSpringWeb.xml</file>\r
           <file>file://$TeamCityDistribution$/webapps/ROOT/WEB-INF/buildServerPluginsSupportWeb.xml</file>\r
           <file>file://$TeamCityDistribution$/webapps/ROOT/WEB-INF/buildServerConfigurator.xml</file>\r
+          <file>file://$MODULE_DIR$/src/META-INF/build-server-plugin-nuget-tools.xml</file>\r
+          <file>file://$MODULE_DIR$/src/META-INF/build-server-plugin-nuget-feed.xml</file>\r
+          <file>file://$TeamCityDistribution$/webapps/ROOT/WEB-INF/buildServerSpringStatistics.xml</file>\r
         </fileset>\r
       </configuration>\r
     </facet>\r
@@ -39,6 +42,7 @@
     <orderEntry type="module" module-name="nuget-common" />\r
     <orderEntry type="library" name="Common-Impl" level="project" />\r
     <orderEntry type="library" name="TeamCity server runtime" level="project" />\r
+    <orderEntry type="library" name="commons-http" level="project" />\r
   </component>\r
 </module>\r
 \r

diff --git a/nuget-server/src/META-INF/build-server-plugin-nuget-feed.xml b/nuget-server/src/META-INF/build-server-plugin-nuget-feed.xml
new file mode 100644 (file)
index 0000000..d5c13f6
--- /dev/null
+++ b/nuget-server/src/META-INF/build-server-plugin-nuget-feed.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<beans xmlns="http://www.springframework.org/schema/beans"\r
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"\r
+       default-autowire="constructor">\r
+\r
+  <bean class="jetbrains.buildServer.nuget.server.feed.reader.impl.FeedHttpClientHolder" destroy-method="dispose"/>\r
+  <bean class="jetbrains.buildServer.nuget.server.feed.reader.impl.NuGetFeedReaderImpl"/>\r
+  <bean class="jetbrains.buildServer.nuget.server.feed.reader.impl.FeedGetMethodFactory"/>\r
+  <bean class="jetbrains.buildServer.nuget.server.feed.reader.impl.PackagesFeedParserImpl"/>\r
+  <bean class="jetbrains.buildServer.nuget.server.feed.reader.impl.UrlResolverImpl"/>\r
+\r
+</beans>
\ No newline at end of file

diff --git a/nuget-server/src/META-INF/build-server-plugin-nuget-tools.xml b/nuget-server/src/META-INF/build-server-plugin-nuget-tools.xml
new file mode 100644 (file)
index 0000000..a06a6eb
--- /dev/null
+++ b/nuget-server/src/META-INF/build-server-plugin-nuget-tools.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<beans xmlns="http://www.springframework.org/schema/beans"\r
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"\r
+       default-autowire="constructor">\r
+  <bean class="jetbrains.buildServer.nuget.server.toolRegistry.tab.PermissionChecker"/>\r
+  <bean class="jetbrains.buildServer.nuget.server.toolRegistry.tab.ServerSettingsTab"/>\r
+  <bean class="jetbrains.buildServer.nuget.server.toolRegistry.tab.InstalledToolsController"/>\r
+  <bean class="jetbrains.buildServer.nuget.server.toolRegistry.tab.InstallToolController"/>\r
+\r
+  <bean class="jetbrains.buildServer.nuget.server.toolRegistry.impl.AvailableToolsState"/>\r
+  <bean class="jetbrains.buildServer.nuget.server.toolRegistry.impl.NuGetToolManagerImpl"/>\r
+</beans>
\ No newline at end of file

diff --git a/nuget-server/src/META-INF/build-server-plugin-nuget.xml b/nuget-server/src/META-INF/build-server-plugin-nuget.xml
index 7ed537ef34e84c18ef2ee7846e1e80455232fe30..0f92f4ff6c9c5787be1ecaf51eee2ed21830b696 100644 (file)
--- a/nuget-server/src/META-INF/build-server-plugin-nuget.xml
+++ b/nuget-server/src/META-INF/build-server-plugin-nuget.xml
@@ -31,22 +31,4 @@
   <bean class="jetbrains.buildServer.nuget.server.publish.PublishRunTypeRegistrar"/>\r
   <bean class="jetbrains.buildServer.nuget.server.publish.PublishRunType"/>\r
 \r
-\r
-
-  <bean class="jetbrains.buildServer.nuget.server.toolRegistry.tab.PermissionChecker"/>\r
-  <bean class="jetbrains.buildServer.nuget.server.toolRegistry.tab.ServerSettingsTab"/>\r
-  <bean class="jetbrains.buildServer.nuget.server.toolRegistry.tab.InstalledToolsController"/>\r
-  <bean class="jetbrains.buildServer.nuget.server.toolRegistry.tab.InstallToolController"/>\r
-\r
-\r
-  <bean class="jetbrains.buildServer.nuget.server.toolRegistry.impl.NuGetToolManagerImpl"/>\r
-
-
-
-  <bean class="jetbrains.buildServer.nuget.server.feed.reader.impl.FeedHttpClientHolder" destroy-method="dispose"/>\r
-  <bean class="jetbrains.buildServer.nuget.server.feed.reader.impl.NuGetFeedReaderImpl"/>\r
-  <bean class="jetbrains.buildServer.nuget.server.feed.reader.impl.FeedGetMethodFactory"/>\r
-  <bean class="jetbrains.buildServer.nuget.server.feed.reader.impl.PackagesFeedParserImpl"/>\r
-  <bean class="jetbrains.buildServer.nuget.server.feed.reader.impl.UrlResolverImpl"/>\r
-
 </beans>
\ No newline at end of file

diff --git a/nuget-tests/nuget-tests.iml b/nuget-tests/nuget-tests.iml
index 88001f85eb1e41599d07355af3c7d112a5984db0..cb909629b8052fa06878e0dfca0ce5a8149e243a 100644 (file)
--- a/nuget-tests/nuget-tests.iml
+++ b/nuget-tests/nuget-tests.iml
@@ -22,6 +22,7 @@
     <orderEntry type="library" scope="RUNTIME" name="TeamCity agent runtime" level="project" />\r
     <orderEntry type="library" name="Common-Impl" level="project" />\r
     <orderEntry type="library" name="Server-Api" level="project" />\r
+    <orderEntry type="library" name="commons-http" level="project" />\r
   </component>\r
 </module>\r
 \r