move classes on server side

diff --git a/nuget-server/nuget-server.iml b/nuget-server/nuget-server.iml
index 02a0684c4c4e1c82c72ba5ff32255ecf0af3efe0..018d5b2bcc91c1f777f80c0a6ac1b2ef91857fa5 100644 (file)
--- a/nuget-server/nuget-server.iml
+++ b/nuget-server/nuget-server.iml
@@ -14,7 +14,8 @@
           <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://$MODULE_DIR$/src/META-INF/build-server-plugin-nuget-pack-runner.xml</file>\r
-          <file>file://$TeamCityDistribution$/webapps/ROOT/WEB-INF/buildServerSpringStatistics.xml</file>\r
+          <file>file://$MODULE_DIR$/src/META-INF/build-server-plugin-nuget-install-runner.xml</file>\r
+          <file>file://$MODULE_DIR$/src/META-INF/build-server-plugin-nuget-publish-runner.xml</file>\r
         </fileset>\r
       </configuration>\r
     </facet>\r

diff --git a/nuget-server/resources/install/editInstallPackage.jsp b/nuget-server/resources/install/editInstallPackage.jsp
index 75e4fd53649086f590f8b0aa70170be77467cd80..a24c306dc949bb760c91d20d072cf1f77cabf5a3 100644 (file)
--- a/nuget-server/resources/install/editInstallPackage.jsp
+++ b/nuget-server/resources/install/editInstallPackage.jsp
@@ -17,7 +17,7 @@
 <%@ taglib prefix="props" tagdir="/WEB-INF/tags/props" %>\r
 <%@ taglib prefix="l" tagdir="/WEB-INF/tags/layout" %>\r
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>\r
-<jsp:useBean id="ib" class="jetbrains.buildServer.nuget.server.install.InstallBean" scope="request"/>\r
+<jsp:useBean id="ib" class="jetbrains.buildServer.nuget.server.runner.install.InstallBean" scope="request"/>\r
 \r
 <l:settingsGroup title="NuGet settings">\r
   <tr>\r

diff --git a/nuget-server/resources/install/viewInstallPackage.jsp b/nuget-server/resources/install/viewInstallPackage.jsp
index a62e79c4c09ffde974f3d5d3899bdc195c526a83..1cd43d58dad7d36bf9ee69c4ed7be10fd0fe8c7e 100644 (file)
--- a/nuget-server/resources/install/viewInstallPackage.jsp
+++ b/nuget-server/resources/install/viewInstallPackage.jsp
@@ -17,7 +17,7 @@
 <%@ taglib prefix="props" tagdir="/WEB-INF/tags/props" %>\r
 <%@ taglib prefix="l" tagdir="/WEB-INF/tags/layout" %>\r
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>\r
-<jsp:useBean id="ib" class="jetbrains.buildServer.nuget.server.install.InstallBean" scope="request"/>\r
+<jsp:useBean id="ib" class="jetbrains.buildServer.nuget.server.runner.install.InstallBean" scope="request"/>\r
 \r
 <div class="parameter">\r
   Path to NuGet.exe: <strong><props:displayValue name="${ib.nuGetPathKey}"/></strong>\r

diff --git a/nuget-server/resources/pack/editPack.jsp b/nuget-server/resources/pack/editPack.jsp
index 9e4663486d7d33d70dfcf44230a11570bb772770..54532966d71a551ecdc1d82e262e6441e29adea2 100644 (file)
--- a/nuget-server/resources/pack/editPack.jsp
+++ b/nuget-server/resources/pack/editPack.jsp
@@ -17,7 +17,7 @@
 <%@ taglib prefix="props" tagdir="/WEB-INF/tags/props" %>\r
 <%@ taglib prefix="l" tagdir="/WEB-INF/tags/layout" %>\r
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>\r
-<jsp:useBean id="ib" class="jetbrains.buildServer.nuget.server.pack.PackBean" scope="request"/>\r
+<jsp:useBean id="ib" class="jetbrains.buildServer.nuget.server.runner.pack.PackBean" scope="request"/>\r
 \r
 <l:settingsGroup title="NuGet settings">\r
   <tr>\r

diff --git a/nuget-server/resources/pack/viewPack.jsp b/nuget-server/resources/pack/viewPack.jsp
index e6e62c68c7bc1d03c551e39d8424f5508bc1953d..eb1c4cc667b2e9da33649ec903193bd505ca45ff 100644 (file)
--- a/nuget-server/resources/pack/viewPack.jsp
+++ b/nuget-server/resources/pack/viewPack.jsp
@@ -17,7 +17,7 @@
 <%@ taglib prefix="props" tagdir="/WEB-INF/tags/props" %>\r
 <%@ taglib prefix="l" tagdir="/WEB-INF/tags/layout" %>\r
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>\r
-<jsp:useBean id="ib" class="jetbrains.buildServer.nuget.server.pack.PackBean" scope="request"/>\r
+<jsp:useBean id="ib" class="jetbrains.buildServer.nuget.server.runner.pack.PackBean" scope="request"/>\r
 \r
 \r
 <div class="parameter">\r

diff --git a/nuget-server/resources/publish/editPublish.jsp b/nuget-server/resources/publish/editPublish.jsp
index 5ad8e79fbd0f1049bab5eb3dceb3d4934364be44..480591aecb80a819932d81e328ef97fd8990fe15 100644 (file)
--- a/nuget-server/resources/publish/editPublish.jsp
+++ b/nuget-server/resources/publish/editPublish.jsp
@@ -17,7 +17,7 @@
 <%@ taglib prefix="props" tagdir="/WEB-INF/tags/props" %>\r
 <%@ taglib prefix="l" tagdir="/WEB-INF/tags/layout" %>\r
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>\r
-<jsp:useBean id="ib" class="jetbrains.buildServer.nuget.server.publish.PublishBean" scope="request"/>\r
+<jsp:useBean id="ib" class="jetbrains.buildServer.nuget.server.runner.publish.PublishBean" scope="request"/>\r
 \r
 <l:settingsGroup title="NuGet settings">\r
   <tr>\r

diff --git a/nuget-server/resources/publish/viewPublish.jsp b/nuget-server/resources/publish/viewPublish.jsp
index 7d46a79ba423bb9afcdc11cf1cbf5d2dd461f3f4..311c8c705c83c46838357584db2754353175d51e 100644 (file)
--- a/nuget-server/resources/publish/viewPublish.jsp
+++ b/nuget-server/resources/publish/viewPublish.jsp
@@ -17,7 +17,7 @@
 <%@ taglib prefix="props" tagdir="/WEB-INF/tags/props" %>\r
 <%@ taglib prefix="l" tagdir="/WEB-INF/tags/layout" %>\r
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>\r
-<jsp:useBean id="ib" class="jetbrains.buildServer.nuget.server.publish.PublishBean" scope="request"/>\r
+<jsp:useBean id="ib" class="jetbrains.buildServer.nuget.server.runner.publish.PublishBean" scope="request"/>\r
 \r
 <div class="parameter">\r
   Path to NuGet.exe: <strong><props:displayValue name="${ib.nuGetPathKey}"/></strong>\r

diff --git a/nuget-server/src/META-INF/build-server-plugin-nuget-install-runner.xml b/nuget-server/src/META-INF/build-server-plugin-nuget-install-runner.xml
new file mode 100644 (file)
index 0000000..dd0dff4
--- /dev/null
+++ b/nuget-server/src/META-INF/build-server-plugin-nuget-install-runner.xml
@@ -0,0 +1,9 @@
+<?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.runner.install.PackageInstallerRunTypeRegistrar"/>\r
+  <bean class="jetbrains.buildServer.nuget.server.runner.install.PackagesInstallerRunType"/>\r
+</beans>
\ No newline at end of file

diff --git a/nuget-server/src/META-INF/build-server-plugin-nuget-pack-runner.xml b/nuget-server/src/META-INF/build-server-plugin-nuget-pack-runner.xml
index 638a5c78cb4ff8be71bb72206bfd33691580d405..b49cb980ed959f038c125aea4411477fa6a028b9 100644 (file)
--- a/nuget-server/src/META-INF/build-server-plugin-nuget-pack-runner.xml
+++ b/nuget-server/src/META-INF/build-server-plugin-nuget-pack-runner.xml
@@ -5,6 +5,6 @@
        default-autowire="constructor">\r
 \r
 \r
-  <bean class="jetbrains.buildServer.nuget.server.pack.PackRunTypeRegistrar"/>\r
-  <bean class="jetbrains.buildServer.nuget.server.pack.PackRunType"/>\r
+  <bean class="jetbrains.buildServer.nuget.server.runner.pack.PackRunTypeRegistrar"/>\r
+  <bean class="jetbrains.buildServer.nuget.server.runner.pack.PackRunType"/>\r
 </beans>
\ No newline at end of file

diff --git a/nuget-server/src/META-INF/build-server-plugin-nuget-publish-runner.xml b/nuget-server/src/META-INF/build-server-plugin-nuget-publish-runner.xml
new file mode 100644 (file)
index 0000000..b99bd43
--- /dev/null
+++ b/nuget-server/src/META-INF/build-server-plugin-nuget-publish-runner.xml
@@ -0,0 +1,10 @@
+<?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.runner.publish.PublishRunTypeRegistrar"/>\r
+  <bean class="jetbrains.buildServer.nuget.server.runner.publish.PublishRunType"/>\r
+\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 0f92f4ff6c9c5787be1ecaf51eee2ed21830b696..efbbe19afe831e8630e500fe94b54ac7c8985820 100644 (file)
--- a/nuget-server/src/META-INF/build-server-plugin-nuget.xml
+++ b/nuget-server/src/META-INF/build-server-plugin-nuget.xml
@@ -9,13 +9,8 @@
   <bean class="jetbrains.buildServer.nuget.server.NuGetPublishRunType"/>\r
   <bean class="jetbrains.buildServer.nuget.server.show.NuGetDownloadedPackagesTab"/>\r
   <bean class="jetbrains.buildServer.nuget.server.NuGetDownloadFeature"/>\r
-\r
 -->\r
 \r
-  <bean class="jetbrains.buildServer.nuget.server.install.PackageInstallerRunTypeRegistrar"/>\r
-  <bean class="jetbrains.buildServer.nuget.server.install.PackagesInstallerRunType"/>\r
-\r
-\r
   <bean class="jetbrains.buildServer.nuget.server.exec.NuGetTeamCityProviderImpl"/>\r
   <bean class="jetbrains.buildServer.nuget.server.exec.NuGetExecutorImpl"/>\r
   <bean class="jetbrains.buildServer.nuget.server.exec.ListPackagesCommandImpl"/>\r
@@ -27,8 +22,4 @@
 \r
   <bean class="jetbrains.buildServer.nuget.server.show.NuGetDownloadedPackagesTab"/>\r
 \r
-\r
-  <bean class="jetbrains.buildServer.nuget.server.publish.PublishRunTypeRegistrar"/>\r
-  <bean class="jetbrains.buildServer.nuget.server.publish.PublishRunType"/>\r
-\r
 </beans>
\ No newline at end of file

diff --git a/nuget-server/src/jetbrains/buildServer/nuget/server/install/InstallBean.java b/nuget-server/src/jetbrains/buildServer/nuget/server/runner/install/InstallBean.java
similarity index 94%
rename from nuget-server/src/jetbrains/buildServer/nuget/server/install/InstallBean.java
rename to nuget-server/src/jetbrains/buildServer/nuget/server/runner/install/InstallBean.java
index bb7378f73ad73306d95bbb07fc04318d97e7dd66..5a8bf66d70a828ed4c75f8f26a08da237d012776 100644 (file)
--- a/nuget-server/src/jetbrains/buildServer/nuget/server/install/InstallBean.java
+++ b/nuget-server/src/jetbrains/buildServer/nuget/server/runner/install/InstallBean.java
@@ -14,7 +14,7 @@
  * limitations under the License.\r
  */\r
 \r
-package jetbrains.buildServer.nuget.server.install;\r
+package jetbrains.buildServer.nuget.server.runner.install;\r
 \r
 import jetbrains.buildServer.nuget.common.PackagesConstants;\r
 import jetbrains.buildServer.nuget.common.PackagesUpdateMode;\r

diff --git a/nuget-server/src/jetbrains/buildServer/nuget/server/install/PackageInstallerRunTypeRegistrar.java b/nuget-server/src/jetbrains/buildServer/nuget/server/runner/install/PackageInstallerRunTypeRegistrar.java
similarity index 92%
rename from nuget-server/src/jetbrains/buildServer/nuget/server/install/PackageInstallerRunTypeRegistrar.java
rename to nuget-server/src/jetbrains/buildServer/nuget/server/runner/install/PackageInstallerRunTypeRegistrar.java
index 3bd8f502861197411b3a1ab5e7716ce9812190b2..8e5ad021d842ac7561d2023307a95313b5af4bec 100644 (file)
--- a/nuget-server/src/jetbrains/buildServer/nuget/server/install/PackageInstallerRunTypeRegistrar.java
+++ b/nuget-server/src/jetbrains/buildServer/nuget/server/runner/install/PackageInstallerRunTypeRegistrar.java
@@ -14,7 +14,7 @@
  * limitations under the License.\r
  */\r
 \r
-package jetbrains.buildServer.nuget.server.install;\r
+package jetbrains.buildServer.nuget.server.runner.install;\r
 \r
 import jetbrains.buildServer.serverSide.RunTypeRegistry;\r
 import org.jetbrains.annotations.NotNull;\r

diff --git a/nuget-server/src/jetbrains/buildServer/nuget/server/install/PackagesInstallerRunType.java b/nuget-server/src/jetbrains/buildServer/nuget/server/runner/install/PackagesInstallerRunType.java
similarity index 95%
rename from nuget-server/src/jetbrains/buildServer/nuget/server/install/PackagesInstallerRunType.java
rename to nuget-server/src/jetbrains/buildServer/nuget/server/runner/install/PackagesInstallerRunType.java
index 262996083c662c880f97daf15854e3fe2b38f800..5a45889675932aa8167359d2dd3429eb5350b8e2 100644 (file)
--- a/nuget-server/src/jetbrains/buildServer/nuget/server/install/PackagesInstallerRunType.java
+++ b/nuget-server/src/jetbrains/buildServer/nuget/server/runner/install/PackagesInstallerRunType.java
@@ -14,7 +14,7 @@
  * limitations under the License.\r
  */\r
 \r
-package jetbrains.buildServer.nuget.server.install;\r
+package jetbrains.buildServer.nuget.server.runner.install;\r
 \r
 import jetbrains.buildServer.nuget.common.DotNetConstants;\r
 import jetbrains.buildServer.requirements.Requirement;\r

diff --git a/nuget-server/src/jetbrains/buildServer/nuget/server/pack/PackBean.java b/nuget-server/src/jetbrains/buildServer/nuget/server/runner/pack/PackBean.java
similarity index 94%
rename from nuget-server/src/jetbrains/buildServer/nuget/server/pack/PackBean.java
rename to nuget-server/src/jetbrains/buildServer/nuget/server/runner/pack/PackBean.java
index 080e8a38168214a95a78693bd8cab19edc95e7b5..848569b5013e9f0d95fe180ecea53a598dd9b37c 100644 (file)
--- a/nuget-server/src/jetbrains/buildServer/nuget/server/pack/PackBean.java
+++ b/nuget-server/src/jetbrains/buildServer/nuget/server/runner/pack/PackBean.java
@@ -14,7 +14,7 @@
  * limitations under the License.\r
  */\r
 \r
-package jetbrains.buildServer.nuget.server.pack;\r
+package jetbrains.buildServer.nuget.server.runner.pack;\r
 \r
 import jetbrains.buildServer.nuget.common.PackagesConstants;\r
 \r

diff --git a/nuget-server/src/jetbrains/buildServer/nuget/server/pack/PackRunType.java b/nuget-server/src/jetbrains/buildServer/nuget/server/runner/pack/PackRunType.java
similarity index 96%
rename from nuget-server/src/jetbrains/buildServer/nuget/server/pack/PackRunType.java
rename to nuget-server/src/jetbrains/buildServer/nuget/server/runner/pack/PackRunType.java
index bf484e1b9795d9263ad2ec26213f9466e186203e..9d321b005bc452b31a9c2bbf56a67ae4c81745c6 100644 (file)
--- a/nuget-server/src/jetbrains/buildServer/nuget/server/pack/PackRunType.java
+++ b/nuget-server/src/jetbrains/buildServer/nuget/server/runner/pack/PackRunType.java
@@ -14,7 +14,7 @@
  * limitations under the License.\r
  */\r
 \r
-package jetbrains.buildServer.nuget.server.pack;\r
+package jetbrains.buildServer.nuget.server.runner.pack;\r
 \r
 import jetbrains.buildServer.agent.ServerProvidedProperties;\r
 import jetbrains.buildServer.nuget.common.DotNetConstants;\r

diff --git a/nuget-server/src/jetbrains/buildServer/nuget/server/pack/PackRunTypeRegistrar.java b/nuget-server/src/jetbrains/buildServer/nuget/server/runner/pack/PackRunTypeRegistrar.java
similarity index 91%
rename from nuget-server/src/jetbrains/buildServer/nuget/server/pack/PackRunTypeRegistrar.java
rename to nuget-server/src/jetbrains/buildServer/nuget/server/runner/pack/PackRunTypeRegistrar.java
index 857ac0b8b579b2de1b1c29f03b596519394ceaef..e47ccb852e34840c10e35f83563ca6f751cebae4 100644 (file)
--- a/nuget-server/src/jetbrains/buildServer/nuget/server/pack/PackRunTypeRegistrar.java
+++ b/nuget-server/src/jetbrains/buildServer/nuget/server/runner/pack/PackRunTypeRegistrar.java
@@ -14,7 +14,7 @@
  * limitations under the License.\r
  */\r
 \r
-package jetbrains.buildServer.nuget.server.pack;\r
+package jetbrains.buildServer.nuget.server.runner.pack;\r
 \r
 import jetbrains.buildServer.serverSide.RunTypeRegistry;\r
 import org.jetbrains.annotations.NotNull;\r

diff --git a/nuget-server/src/jetbrains/buildServer/nuget/server/publish/PublishBean.java b/nuget-server/src/jetbrains/buildServer/nuget/server/runner/publish/PublishBean.java
similarity index 93%
rename from nuget-server/src/jetbrains/buildServer/nuget/server/publish/PublishBean.java
rename to nuget-server/src/jetbrains/buildServer/nuget/server/runner/publish/PublishBean.java
index 0cf5bd49f20146a605320e91ff504975dfdcedf2..5adf3f6591a9ad5c3691b2d31947211915d15a8c 100644 (file)
--- a/nuget-server/src/jetbrains/buildServer/nuget/server/publish/PublishBean.java
+++ b/nuget-server/src/jetbrains/buildServer/nuget/server/runner/publish/PublishBean.java
@@ -14,7 +14,7 @@
  * limitations under the License.\r
  */\r
 \r
-package jetbrains.buildServer.nuget.server.publish;\r
+package jetbrains.buildServer.nuget.server.runner.publish;\r
 \r
 import jetbrains.buildServer.nuget.common.PackagesConstants;\r
 \r

diff --git a/nuget-server/src/jetbrains/buildServer/nuget/server/publish/PublishRunType.java b/nuget-server/src/jetbrains/buildServer/nuget/server/runner/publish/PublishRunType.java
similarity index 95%
rename from nuget-server/src/jetbrains/buildServer/nuget/server/publish/PublishRunType.java
rename to nuget-server/src/jetbrains/buildServer/nuget/server/runner/publish/PublishRunType.java
index 61dd8fc8d6211f86bcc490762f95cf04379c18ae..6ffa8568911a9038e65792d571b9490e62263d02 100644 (file)
--- a/nuget-server/src/jetbrains/buildServer/nuget/server/publish/PublishRunType.java
+++ b/nuget-server/src/jetbrains/buildServer/nuget/server/runner/publish/PublishRunType.java
@@ -14,7 +14,7 @@
  * limitations under the License.\r
  */\r
 \r
-package jetbrains.buildServer.nuget.server.publish;\r
+package jetbrains.buildServer.nuget.server.runner.publish;\r
 \r
 import jetbrains.buildServer.nuget.common.DotNetConstants;\r
 import jetbrains.buildServer.nuget.common.PackagesConstants;\r

diff --git a/nuget-server/src/jetbrains/buildServer/nuget/server/publish/PublishRunTypeRegistrar.java b/nuget-server/src/jetbrains/buildServer/nuget/server/runner/publish/PublishRunTypeRegistrar.java
similarity index 91%
rename from nuget-server/src/jetbrains/buildServer/nuget/server/publish/PublishRunTypeRegistrar.java
rename to nuget-server/src/jetbrains/buildServer/nuget/server/runner/publish/PublishRunTypeRegistrar.java
index 28ed3530d7f4dcf887ca91b6923227595b602595..ef58ed7d9f12f2940bcdd5ae542f716125c7538a 100644 (file)
--- a/nuget-server/src/jetbrains/buildServer/nuget/server/publish/PublishRunTypeRegistrar.java
+++ b/nuget-server/src/jetbrains/buildServer/nuget/server/runner/publish/PublishRunTypeRegistrar.java
@@ -14,7 +14,7 @@
  * limitations under the License.\r
  */\r
 \r
-package jetbrains.buildServer.nuget.server.publish;\r
+package jetbrains.buildServer.nuget.server.runner.publish;\r
 \r
 import jetbrains.buildServer.serverSide.RunTypeRegistry;\r
 import org.jetbrains.annotations.NotNull;\r

diff --git a/nuget-tests/src/jetbrains/buildServer/nuget/tests/RunTypeNameTest.java b/nuget-tests/src/jetbrains/buildServer/nuget/tests/RunTypeNameTest.java
index e046300fb6d21bac67e377c9d52d6b67f6521635..4a0e7d715e733d7b5c587ccccdc00f94dc38f1f1 100644 (file)
--- a/nuget-tests/src/jetbrains/buildServer/nuget/tests/RunTypeNameTest.java
+++ b/nuget-tests/src/jetbrains/buildServer/nuget/tests/RunTypeNameTest.java
@@ -17,8 +17,8 @@
 package jetbrains.buildServer.nuget.tests;\r
 \r
 import jetbrains.buildServer.BaseTestCase;\r
-import jetbrains.buildServer.nuget.server.install.PackagesInstallerRunType;\r
-import jetbrains.buildServer.nuget.server.publish.PublishRunType;\r
+import jetbrains.buildServer.nuget.server.runner.install.PackagesInstallerRunType;\r
+import jetbrains.buildServer.nuget.server.runner.publish.PublishRunType;\r
 import jetbrains.buildServer.web.openapi.PluginDescriptor;\r
 import org.jmock.Mockery;\r
 import org.testng.Assert;\r