restructure agent plugin

diff --git a/nuget-agent/nuget-agent.iml b/nuget-agent/nuget-agent.iml
index c6882b7205ebc376ceb532e70d8339acfaec98a4..7df657fec83e1c7593d399de4c9c25f677e30e93 100644 (file)
--- a/nuget-agent/nuget-agent.iml
+++ b/nuget-agent/nuget-agent.iml
@@ -5,9 +5,11 @@
       <configuration>\r
         <fileset id="fileset1" name="nuget-agent" removed="false">\r
           <file>file://$MODULE_DIR$/src/META-INF/build-agent-plugin-nuget.xml</file>\r
+          <file>file://$MODULE_DIR$/src/META-INF/build-agent-plugin-nuget-pack.xml</file>\r
           <file>jar://$TeamCityDistribution$/buildAgent/lib/agent.jar!/META-INF/buildAgentSpring.xml</file>\r
           <file>jar://$TeamCityDistribution$/buildAgent/lib/agent.jar!/META-INF/buildAgentPlugins.xml</file>\r
-          <file>file://$MODULE_DIR$/src/META-INF/build-agent-plugin-nuget-pack.xml</file>\r
+          <file>file://$MODULE_DIR$/src/META-INF/build-agent-plugin-nuget-publish.xml</file>\r
+          <file>file://$MODULE_DIR$/src/META-INF/build-agent-plugin-nuget-install.xml</file>\r
         </fileset>\r
       </configuration>\r
     </facet>\r

diff --git a/nuget-agent/src/META-INF/build-agent-plugin-nuget-install.xml b/nuget-agent/src/META-INF/build-agent-plugin-nuget-install.xml
new file mode 100644 (file)
index 0000000..dca988b
--- /dev/null
+++ b/nuget-agent/src/META-INF/build-agent-plugin-nuget-install.xml
@@ -0,0 +1,12 @@
+<?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\r
+                           http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"\r
+       default-autowire="constructor">\r
+  <bean class="jetbrains.buildServer.nuget.agent.runner.install.PackagesInstallerRunner"/>\r
+  <bean class="jetbrains.buildServer.nuget.agent.runner.install.PackagesInstallerRunnerRegistrar"/>\r
+\r
+  <bean class="jetbrains.buildServer.nuget.agent.runner.install.impl.PackagesWatcher"/>\r
+  <bean class="jetbrains.buildServer.nuget.agent.runner.install.impl.PackagesInfoUploader"/>\r
+</beans>
\ No newline at end of file

diff --git a/nuget-agent/src/META-INF/build-agent-plugin-nuget-pack.xml b/nuget-agent/src/META-INF/build-agent-plugin-nuget-pack.xml
index 06f18b893ce6639f266a4e0471e7af44639ac46f..96e31b50220f70cc57fe90f8f5e272a265808266 100644 (file)
--- a/nuget-agent/src/META-INF/build-agent-plugin-nuget-pack.xml
+++ b/nuget-agent/src/META-INF/build-agent-plugin-nuget-pack.xml
@@ -5,7 +5,7 @@
                            http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"\r
        default-autowire="constructor">\r
 \r
-  <bean class="jetbrains.buildServer.nuget.agent.pack.PackRunner"/>\r
-  <bean class="jetbrains.buildServer.nuget.agent.pack.PackRunnerRegistrar"/>\r
+  <bean class="jetbrains.buildServer.nuget.agent.runner.pack.PackRunner"/>\r
+  <bean class="jetbrains.buildServer.nuget.agent.runner.pack.PackRunnerRegistrar"/>\r
 \r
 </beans>
\ No newline at end of file

diff --git a/nuget-agent/src/META-INF/build-agent-plugin-nuget-publish.xml b/nuget-agent/src/META-INF/build-agent-plugin-nuget-publish.xml
new file mode 100644 (file)
index 0000000..899cd07
--- /dev/null
+++ b/nuget-agent/src/META-INF/build-agent-plugin-nuget-publish.xml
@@ -0,0 +1,11 @@
+<?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\r
+                           http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"\r
+       default-autowire="constructor">\r
+\r
+  <bean class="jetbrains.buildServer.nuget.agent.runner.publish.PackagesPublishRunner"/>\r
+  <bean class="jetbrains.buildServer.nuget.agent.runner.publish.PackagesPublishRunnerRegistrar"/>\r
+\r
+</beans>
\ No newline at end of file

diff --git a/nuget-agent/src/META-INF/build-agent-plugin-nuget.xml b/nuget-agent/src/META-INF/build-agent-plugin-nuget.xml
index 813e425a3b96911f52c3df63964dc18d98bd584c..3b03c16fa1312f6cdee3d9bb415a64dea65492fb 100644 (file)
--- a/nuget-agent/src/META-INF/build-agent-plugin-nuget.xml
+++ b/nuget-agent/src/META-INF/build-agent-plugin-nuget.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
-<!--suppress AutowiredDependenciesInspection -->\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\r
@@ -10,12 +9,6 @@
 \r
   <bean class="jetbrains.buildServer.nuget.agent.util.impl.CommandlineBuildProcessFactoryImpl"/>\r
 \r
-  <bean class="jetbrains.buildServer.nuget.agent.install.PackagesInstallerRunner"/>\r
-  <bean class="jetbrains.buildServer.nuget.agent.install.PackagesInstallerRunnerRegistrar"/>\r
-\r
-  <bean class="jetbrains.buildServer.nuget.agent.publish.PackagesPublishRunner"/>\r
-  <bean class="jetbrains.buildServer.nuget.agent.publish.PackagesPublishRunnerRegistrar"/>\r
-\r
   <bean class="jetbrains.buildServer.nuget.agent.commands.impl.CommandFactoryImpl"/>\r
   <bean class="jetbrains.buildServer.nuget.agent.commands.impl.LoggingNuGetActionFactoryImpl">\r
     <constructor-arg>\r
@@ -25,9 +18,9 @@
 \r
   <bean class="jetbrains.buildServer.nuget.agent.parameters.impl.PackagesParametersFactoryImpl"/>\r
 \r
-  <bean class="jetbrains.buildServer.nuget.agent.install.impl.PackageUsagesImpl"/>\r
-  <bean class="jetbrains.buildServer.nuget.agent.install.impl.NuGetPackagesConfigParser" />\r
-  <bean class="jetbrains.buildServer.nuget.agent.install.impl.PackagesWatcher"/>\r
-  <bean class="jetbrains.buildServer.nuget.agent.install.impl.PackagesInfoUploader"/>\r
-  <bean class="jetbrains.buildServer.nuget.agent.install.impl.NuGetPackagesCollectorImpl"/>\r
+\r
+  <bean class="jetbrains.buildServer.nuget.agent.dependencies.impl.PackageUsagesImpl"/>\r
+  <bean class="jetbrains.buildServer.nuget.agent.dependencies.impl.NuGetPackagesConfigParser" />\r
+  <bean class="jetbrains.buildServer.nuget.agent.dependencies.impl.NuGetPackagesCollectorImpl"/>\r
+\r
 </beans>
\ No newline at end of file

diff --git a/nuget-agent/src/jetbrains/buildServer/nuget/agent/commands/impl/NuGetActionFactoryImpl.java b/nuget-agent/src/jetbrains/buildServer/nuget/agent/commands/impl/NuGetActionFactoryImpl.java
index a9e9b2c227a6f88c924a6ea551ecf48dc38d4d10..db156a597e7101350f60daf1aa53db0252cb80cf 100644 (file)
--- a/nuget-agent/src/jetbrains/buildServer/nuget/agent/commands/impl/NuGetActionFactoryImpl.java
+++ b/nuget-agent/src/jetbrains/buildServer/nuget/agent/commands/impl/NuGetActionFactoryImpl.java
@@ -22,7 +22,7 @@ import jetbrains.buildServer.agent.BuildProcess;
 import jetbrains.buildServer.agent.BuildRunnerContext;\r
 import jetbrains.buildServer.nuget.agent.commands.CommandFactory;\r
 import jetbrains.buildServer.nuget.agent.commands.NuGetActionFactory;\r
-import jetbrains.buildServer.nuget.agent.install.PackageUsages;\r
+import jetbrains.buildServer.nuget.agent.dependencies.PackageUsages;\r
 import jetbrains.buildServer.nuget.agent.parameters.*;\r
 import jetbrains.buildServer.nuget.agent.util.BuildProcessBase;\r
 import jetbrains.buildServer.nuget.agent.util.CommandlineBuildProcessFactory;\r

diff --git a/nuget-agent/src/jetbrains/buildServer/nuget/agent/install/NuGetPackagesCollector.java b/nuget-agent/src/jetbrains/buildServer/nuget/agent/dependencies/NuGetPackagesCollector.java
similarity index 92%
rename from nuget-agent/src/jetbrains/buildServer/nuget/agent/install/NuGetPackagesCollector.java
rename to nuget-agent/src/jetbrains/buildServer/nuget/agent/dependencies/NuGetPackagesCollector.java
index a561ff2ddfb968a9b80de6c5cd816f8cf18c269e..0d94bc9b682ee5257cae20c3991164426206a8b8 100644 (file)
--- a/nuget-agent/src/jetbrains/buildServer/nuget/agent/install/NuGetPackagesCollector.java
+++ b/nuget-agent/src/jetbrains/buildServer/nuget/agent/dependencies/NuGetPackagesCollector.java
@@ -14,7 +14,7 @@
  * limitations under the License.\r
  */\r
 \r
-package jetbrains.buildServer.nuget.agent.install;\r
+package jetbrains.buildServer.nuget.agent.dependencies;\r
 \r
 import jetbrains.buildServer.nuget.common.PackageDependencies;\r
 import org.jetbrains.annotations.NotNull;\r

diff --git a/nuget-agent/src/jetbrains/buildServer/nuget/agent/install/PackageUsages.java b/nuget-agent/src/jetbrains/buildServer/nuget/agent/dependencies/PackageUsages.java
similarity index 90%
rename from nuget-agent/src/jetbrains/buildServer/nuget/agent/install/PackageUsages.java
rename to nuget-agent/src/jetbrains/buildServer/nuget/agent/dependencies/PackageUsages.java
index bf1e3bcaa0596b830399cd56bbd25c3397c8c5e2..f3e9ecf2f3497e243b397cd79d736da7091c2895 100644 (file)
--- a/nuget-agent/src/jetbrains/buildServer/nuget/agent/install/PackageUsages.java
+++ b/nuget-agent/src/jetbrains/buildServer/nuget/agent/dependencies/PackageUsages.java
@@ -14,7 +14,7 @@
  * limitations under the License.\r
  */\r
 \r
-package jetbrains.buildServer.nuget.agent.install;\r
+package jetbrains.buildServer.nuget.agent.dependencies;\r
 \r
 import org.jetbrains.annotations.NotNull;\r
 \r

diff --git a/nuget-agent/src/jetbrains/buildServer/nuget/agent/install/impl/NuGetPackagesCollectorImpl.java b/nuget-agent/src/jetbrains/buildServer/nuget/agent/dependencies/impl/NuGetPackagesCollectorImpl.java
similarity index 88%
rename from nuget-agent/src/jetbrains/buildServer/nuget/agent/install/impl/NuGetPackagesCollectorImpl.java
rename to nuget-agent/src/jetbrains/buildServer/nuget/agent/dependencies/impl/NuGetPackagesCollectorImpl.java
index a798400836ed3c63c77059ac9c395948b3202a60..c9765cf65f3bd1bb914c0cdfa19982b95a464672 100644 (file)
--- a/nuget-agent/src/jetbrains/buildServer/nuget/agent/install/impl/NuGetPackagesCollectorImpl.java
+++ b/nuget-agent/src/jetbrains/buildServer/nuget/agent/dependencies/impl/NuGetPackagesCollectorImpl.java
@@ -14,8 +14,9 @@
  * limitations under the License.\r
  */\r
 \r
-package jetbrains.buildServer.nuget.agent.install.impl;\r
+package jetbrains.buildServer.nuget.agent.dependencies.impl;\r
 \r
+import jetbrains.buildServer.nuget.agent.runner.install.impl.NuGetPackagesCollectorEx;\r
 import jetbrains.buildServer.nuget.common.PackageDependencies;\r
 import jetbrains.buildServer.nuget.common.PackageInfo;\r
 import org.jetbrains.annotations.NotNull;\r

diff --git a/nuget-agent/src/jetbrains/buildServer/nuget/agent/install/impl/NuGetPackagesConfigParser.java b/nuget-agent/src/jetbrains/buildServer/nuget/agent/dependencies/impl/NuGetPackagesConfigParser.java
similarity index 91%
rename from nuget-agent/src/jetbrains/buildServer/nuget/agent/install/impl/NuGetPackagesConfigParser.java
rename to nuget-agent/src/jetbrains/buildServer/nuget/agent/dependencies/impl/NuGetPackagesConfigParser.java
index fb6aa36b3d95dfea4110448a0ebf968eb45d0efc..ab1828dcd140b2048b1bdde9611efa2094a658ee 100644 (file)
--- a/nuget-agent/src/jetbrains/buildServer/nuget/agent/install/impl/NuGetPackagesConfigParser.java
+++ b/nuget-agent/src/jetbrains/buildServer/nuget/agent/dependencies/impl/NuGetPackagesConfigParser.java
@@ -14,10 +14,10 @@
  * limitations under the License.\r
  */\r
 \r
-package jetbrains.buildServer.nuget.agent.install.impl;\r
+package jetbrains.buildServer.nuget.agent.dependencies.impl;\r
 \r
 import com.intellij.openapi.diagnostic.Logger;\r
-import jetbrains.buildServer.nuget.agent.install.NuGetPackagesCollector;\r
+import jetbrains.buildServer.nuget.agent.dependencies.NuGetPackagesCollector;\r
 import jetbrains.buildServer.util.StringUtil;\r
 import jetbrains.buildServer.util.XmlXppAbstractParser;\r
 import org.jetbrains.annotations.NotNull;\r

diff --git a/nuget-agent/src/jetbrains/buildServer/nuget/agent/install/impl/PackageUsagesImpl.java b/nuget-agent/src/jetbrains/buildServer/nuget/agent/dependencies/impl/PackageUsagesImpl.java
similarity index 86%
rename from nuget-agent/src/jetbrains/buildServer/nuget/agent/install/impl/PackageUsagesImpl.java
rename to nuget-agent/src/jetbrains/buildServer/nuget/agent/dependencies/impl/PackageUsagesImpl.java
index b62aa8c51e2f3aa412cc7ad06e892460c0874db9..b5254f878199f0d856ae2ee0b1e0fbd15db98dc8 100644 (file)
--- a/nuget-agent/src/jetbrains/buildServer/nuget/agent/install/impl/PackageUsagesImpl.java
+++ b/nuget-agent/src/jetbrains/buildServer/nuget/agent/dependencies/impl/PackageUsagesImpl.java
@@ -14,11 +14,11 @@
  * limitations under the License.\r
  */\r
 \r
-package jetbrains.buildServer.nuget.agent.install.impl;\r
+package jetbrains.buildServer.nuget.agent.dependencies.impl;\r
 \r
 import com.intellij.openapi.diagnostic.Logger;\r
-import jetbrains.buildServer.nuget.agent.install.NuGetPackagesCollector;\r
-import jetbrains.buildServer.nuget.agent.install.PackageUsages;\r
+import jetbrains.buildServer.nuget.agent.dependencies.NuGetPackagesCollector;\r
+import jetbrains.buildServer.nuget.agent.dependencies.PackageUsages;\r
 import org.jetbrains.annotations.NotNull;\r
 \r
 import java.io.File;\r

diff --git a/nuget-agent/src/jetbrains/buildServer/nuget/agent/install/LocateNuGetConfigBuildProcess.java b/nuget-agent/src/jetbrains/buildServer/nuget/agent/runner/install/LocateNuGetConfigBuildProcess.java
similarity index 96%
rename from nuget-agent/src/jetbrains/buildServer/nuget/agent/install/LocateNuGetConfigBuildProcess.java
rename to nuget-agent/src/jetbrains/buildServer/nuget/agent/runner/install/LocateNuGetConfigBuildProcess.java
index 352332a1fb497a38813f2795f1d41dc726bb543e..63a8b5cbb067fb414ccaf9310afecc677589a98a 100644 (file)
--- a/nuget-agent/src/jetbrains/buildServer/nuget/agent/install/LocateNuGetConfigBuildProcess.java
+++ b/nuget-agent/src/jetbrains/buildServer/nuget/agent/runner/install/LocateNuGetConfigBuildProcess.java
@@ -14,7 +14,7 @@
  * limitations under the License.\r
  */\r
 \r
-package jetbrains.buildServer.nuget.agent.install;\r
+package jetbrains.buildServer.nuget.agent.runner.install;\r
 \r
 import com.intellij.openapi.diagnostic.Logger;\r
 import jetbrains.buildServer.RunBuildException;\r

diff --git a/nuget-agent/src/jetbrains/buildServer/nuget/agent/install/PackagesInstallerRunner.java b/nuget-agent/src/jetbrains/buildServer/nuget/agent/runner/install/PackagesInstallerRunner.java
similarity index 89%
rename from nuget-agent/src/jetbrains/buildServer/nuget/agent/install/PackagesInstallerRunner.java
rename to nuget-agent/src/jetbrains/buildServer/nuget/agent/runner/install/PackagesInstallerRunner.java
index 0397b43a6f4c7a2b32688ee2cf9a7aaa120e3752..39c9d0c6b9e910795a635c702c9d72070dadf3de 100644 (file)
--- a/nuget-agent/src/jetbrains/buildServer/nuget/agent/install/PackagesInstallerRunner.java
+++ b/nuget-agent/src/jetbrains/buildServer/nuget/agent/runner/install/PackagesInstallerRunner.java
@@ -14,19 +14,20 @@
  * limitations under the License.\r
  */\r
 \r
-package jetbrains.buildServer.nuget.agent.install;\r
+package jetbrains.buildServer.nuget.agent.runner.install;\r
 \r
 import com.intellij.openapi.diagnostic.Logger;\r
 import jetbrains.buildServer.RunBuildException;\r
 import jetbrains.buildServer.agent.*;\r
 import jetbrains.buildServer.nuget.agent.commands.NuGetActionFactory;\r
-import jetbrains.buildServer.nuget.agent.install.impl.InstallStages;\r
-import jetbrains.buildServer.nuget.agent.install.impl.InstallStagesImpl;\r
-import jetbrains.buildServer.nuget.agent.install.impl.PackagesInstallerBuilder;\r
+import jetbrains.buildServer.nuget.agent.runner.install.impl.InstallStages;\r
+import jetbrains.buildServer.nuget.agent.runner.install.impl.*;\r
+import jetbrains.buildServer.nuget.agent.runner.install.impl.InstallStagesImpl;\r
 import jetbrains.buildServer.nuget.agent.parameters.NuGetFetchParameters;\r
 import jetbrains.buildServer.nuget.agent.parameters.PackagesInstallParameters;\r
 import jetbrains.buildServer.nuget.agent.parameters.PackagesParametersFactory;\r
 import jetbrains.buildServer.nuget.agent.parameters.PackagesUpdateParameters;\r
+import jetbrains.buildServer.nuget.agent.runner.install.impl.PackagesInstallerBuilder;\r
 import jetbrains.buildServer.nuget.agent.util.impl.CompositeBuildProcessImpl;\r
 import jetbrains.buildServer.nuget.common.DotNetConstants;\r
 import jetbrains.buildServer.nuget.common.PackagesConstants;\r

diff --git a/nuget-agent/src/jetbrains/buildServer/nuget/agent/install/PackagesInstallerRunnerRegistrar.java b/nuget-agent/src/jetbrains/buildServer/nuget/agent/runner/install/PackagesInstallerRunnerRegistrar.java
similarity index 92%
rename from nuget-agent/src/jetbrains/buildServer/nuget/agent/install/PackagesInstallerRunnerRegistrar.java
rename to nuget-agent/src/jetbrains/buildServer/nuget/agent/runner/install/PackagesInstallerRunnerRegistrar.java
index 78b71b7908759ac01cfb74f564e6d3ea09a63ad7..e59c113b9861b9399867e80cb5b48a9a1ad5de3e 100644 (file)
--- a/nuget-agent/src/jetbrains/buildServer/nuget/agent/install/PackagesInstallerRunnerRegistrar.java
+++ b/nuget-agent/src/jetbrains/buildServer/nuget/agent/runner/install/PackagesInstallerRunnerRegistrar.java
@@ -14,7 +14,7 @@
  * limitations under the License.\r
  */\r
 \r
-package jetbrains.buildServer.nuget.agent.install;\r
+package jetbrains.buildServer.nuget.agent.runner.install;\r
 \r
 import jetbrains.buildServer.agent.impl.BuildRunnerRegistry;\r
 import org.jetbrains.annotations.NotNull;\r

diff --git a/nuget-agent/src/jetbrains/buildServer/nuget/agent/install/impl/InstallStages.java b/nuget-agent/src/jetbrains/buildServer/nuget/agent/runner/install/impl/InstallStages.java
similarity index 91%
rename from nuget-agent/src/jetbrains/buildServer/nuget/agent/install/impl/InstallStages.java
rename to nuget-agent/src/jetbrains/buildServer/nuget/agent/runner/install/impl/InstallStages.java
index f395fbf7e05b2e4d3065fd2af216e1062068ac04..a9bbd782cfff439b3dcba44a4afe9b732b99a06d 100644 (file)
--- a/nuget-agent/src/jetbrains/buildServer/nuget/agent/install/impl/InstallStages.java
+++ b/nuget-agent/src/jetbrains/buildServer/nuget/agent/runner/install/impl/InstallStages.java
@@ -14,7 +14,7 @@
  * limitations under the License.\r
  */\r
 \r
-package jetbrains.buildServer.nuget.agent.install.impl;\r
+package jetbrains.buildServer.nuget.agent.runner.install.impl;\r
 \r
 import jetbrains.buildServer.nuget.agent.util.BuildProcessContinuation;\r
 import org.jetbrains.annotations.NotNull;\r

diff --git a/nuget-agent/src/jetbrains/buildServer/nuget/agent/install/impl/InstallStagesImpl.java b/nuget-agent/src/jetbrains/buildServer/nuget/agent/runner/install/impl/InstallStagesImpl.java
similarity index 94%
rename from nuget-agent/src/jetbrains/buildServer/nuget/agent/install/impl/InstallStagesImpl.java
rename to nuget-agent/src/jetbrains/buildServer/nuget/agent/runner/install/impl/InstallStagesImpl.java
index 9f59c5c1d2fef57b225023ac47a203f8887b6607..ac8fa0fd6352d654fe795639020dae523e974d66 100644 (file)
--- a/nuget-agent/src/jetbrains/buildServer/nuget/agent/install/impl/InstallStagesImpl.java
+++ b/nuget-agent/src/jetbrains/buildServer/nuget/agent/runner/install/impl/InstallStagesImpl.java
@@ -14,7 +14,7 @@
  * limitations under the License.\r
  */\r
 \r
-package jetbrains.buildServer.nuget.agent.install.impl;\r
+package jetbrains.buildServer.nuget.agent.runner.install.impl;\r
 \r
 import jetbrains.buildServer.nuget.agent.util.BuildProcessContinuation;\r
 import jetbrains.buildServer.nuget.agent.util.impl.CompositeBuildProcessImpl;\r

diff --git a/nuget-agent/src/jetbrains/buildServer/nuget/agent/install/impl/NuGetPackagesCollectorEx.java b/nuget-agent/src/jetbrains/buildServer/nuget/agent/runner/install/impl/NuGetPackagesCollectorEx.java
similarity index 82%
rename from nuget-agent/src/jetbrains/buildServer/nuget/agent/install/impl/NuGetPackagesCollectorEx.java
rename to nuget-agent/src/jetbrains/buildServer/nuget/agent/runner/install/impl/NuGetPackagesCollectorEx.java
index ab89d8ed2e629fb6f717856d516a99c472d27aa0..b02baf3c289df8c209cd600bc48e5c385bd86f34 100644 (file)
--- a/nuget-agent/src/jetbrains/buildServer/nuget/agent/install/impl/NuGetPackagesCollectorEx.java
+++ b/nuget-agent/src/jetbrains/buildServer/nuget/agent/runner/install/impl/NuGetPackagesCollectorEx.java
@@ -14,9 +14,9 @@
  * limitations under the License.\r
  */\r
 \r
-package jetbrains.buildServer.nuget.agent.install.impl;\r
+package jetbrains.buildServer.nuget.agent.runner.install.impl;\r
 \r
-import jetbrains.buildServer.nuget.agent.install.NuGetPackagesCollector;\r
+import jetbrains.buildServer.nuget.agent.dependencies.NuGetPackagesCollector;\r
 \r
 /**\r
  * Created by Eugene Petrenko (eugene.petrenko@gmail.com)\r

diff --git a/nuget-agent/src/jetbrains/buildServer/nuget/agent/install/impl/PackagesInfoUploader.java b/nuget-agent/src/jetbrains/buildServer/nuget/agent/runner/install/impl/PackagesInfoUploader.java
similarity index 94%
rename from nuget-agent/src/jetbrains/buildServer/nuget/agent/install/impl/PackagesInfoUploader.java
rename to nuget-agent/src/jetbrains/buildServer/nuget/agent/runner/install/impl/PackagesInfoUploader.java
index 10c2819e2c8d036904d342a28570b98a284a6b47..3323a7b053042fcca4f35ff95b50c34d13fbf9e3 100644 (file)
--- a/nuget-agent/src/jetbrains/buildServer/nuget/agent/install/impl/PackagesInfoUploader.java
+++ b/nuget-agent/src/jetbrains/buildServer/nuget/agent/runner/install/impl/PackagesInfoUploader.java
@@ -14,7 +14,7 @@
  * limitations under the License.\r
  */\r
 \r
-package jetbrains.buildServer.nuget.agent.install.impl;\r
+package jetbrains.buildServer.nuget.agent.runner.install.impl;\r
 \r
 import jetbrains.buildServer.agent.AgentRunningBuild;\r
 import jetbrains.buildServer.agent.artifacts.ArtifactsWatcher;\r

diff --git a/nuget-agent/src/jetbrains/buildServer/nuget/agent/install/impl/PackagesInstallerBuilder.java b/nuget-agent/src/jetbrains/buildServer/nuget/agent/runner/install/impl/PackagesInstallerBuilder.java
similarity index 93%
rename from nuget-agent/src/jetbrains/buildServer/nuget/agent/install/impl/PackagesInstallerBuilder.java
rename to nuget-agent/src/jetbrains/buildServer/nuget/agent/runner/install/impl/PackagesInstallerBuilder.java
index 263ade9af815851af48bc8a8c634c052c804d45b..f6c4d476db36353fe9ad9c55f6b26a95133e2e47 100644 (file)
--- a/nuget-agent/src/jetbrains/buildServer/nuget/agent/install/impl/PackagesInstallerBuilder.java
+++ b/nuget-agent/src/jetbrains/buildServer/nuget/agent/runner/install/impl/PackagesInstallerBuilder.java
@@ -14,12 +14,12 @@
  * limitations under the License.\r
  */\r
 \r
-package jetbrains.buildServer.nuget.agent.install.impl;\r
+package jetbrains.buildServer.nuget.agent.runner.install.impl;\r
 \r
 import jetbrains.buildServer.RunBuildException;\r
 import jetbrains.buildServer.agent.BuildRunnerContext;\r
 import jetbrains.buildServer.nuget.agent.commands.NuGetActionFactory;\r
-import jetbrains.buildServer.nuget.agent.install.LocateNuGetConfigBuildProcess;\r
+import jetbrains.buildServer.nuget.agent.runner.install.LocateNuGetConfigBuildProcess;\r
 import jetbrains.buildServer.nuget.agent.parameters.PackagesInstallParameters;\r
 import jetbrains.buildServer.nuget.agent.parameters.PackagesUpdateParameters;\r
 import jetbrains.buildServer.nuget.common.PackagesUpdateMode;\r

diff --git a/nuget-agent/src/jetbrains/buildServer/nuget/agent/install/impl/PackagesWatcher.java b/nuget-agent/src/jetbrains/buildServer/nuget/agent/runner/install/impl/PackagesWatcher.java
similarity index 94%
rename from nuget-agent/src/jetbrains/buildServer/nuget/agent/install/impl/PackagesWatcher.java
rename to nuget-agent/src/jetbrains/buildServer/nuget/agent/runner/install/impl/PackagesWatcher.java
index 69e16cc84663fc4b8447dd549a9e715ccbfc089b..dfa2a6009b4bac10ddee91aa0746c7d483152961 100644 (file)
--- a/nuget-agent/src/jetbrains/buildServer/nuget/agent/install/impl/PackagesWatcher.java
+++ b/nuget-agent/src/jetbrains/buildServer/nuget/agent/runner/install/impl/PackagesWatcher.java
@@ -14,7 +14,7 @@
  * limitations under the License.\r
  */\r
 \r
-package jetbrains.buildServer.nuget.agent.install.impl;\r
+package jetbrains.buildServer.nuget.agent.runner.install.impl;\r
 \r
 import com.intellij.openapi.diagnostic.Logger;\r
 import jetbrains.buildServer.agent.AgentLifeCycleAdapter;\r

diff --git a/nuget-agent/src/jetbrains/buildServer/nuget/agent/pack/PackRunner.java b/nuget-agent/src/jetbrains/buildServer/nuget/agent/runner/pack/PackRunner.java
similarity index 95%
rename from nuget-agent/src/jetbrains/buildServer/nuget/agent/pack/PackRunner.java
rename to nuget-agent/src/jetbrains/buildServer/nuget/agent/runner/pack/PackRunner.java
index e19e143d98618c81100605949c028446710fafc6..622343d92641d805804d86be421dd86e66384911 100644 (file)
--- a/nuget-agent/src/jetbrains/buildServer/nuget/agent/pack/PackRunner.java
+++ b/nuget-agent/src/jetbrains/buildServer/nuget/agent/runner/pack/PackRunner.java
@@ -14,7 +14,7 @@
  * limitations under the License.\r
  */\r
 \r
-package jetbrains.buildServer.nuget.agent.pack;\r
+package jetbrains.buildServer.nuget.agent.runner.pack;\r
 \r
 import com.intellij.openapi.diagnostic.Logger;\r
 import jetbrains.buildServer.RunBuildException;\r

diff --git a/nuget-agent/src/jetbrains/buildServer/nuget/agent/pack/PackRunnerRegistrar.java b/nuget-agent/src/jetbrains/buildServer/nuget/agent/runner/pack/PackRunnerRegistrar.java
similarity index 92%
rename from nuget-agent/src/jetbrains/buildServer/nuget/agent/pack/PackRunnerRegistrar.java
rename to nuget-agent/src/jetbrains/buildServer/nuget/agent/runner/pack/PackRunnerRegistrar.java
index b98c7b54afc8b158dd62ca5059bb44a34a82389e..11abdc29ebd6d730d82c423889d934fdcda348cb 100644 (file)
--- a/nuget-agent/src/jetbrains/buildServer/nuget/agent/pack/PackRunnerRegistrar.java
+++ b/nuget-agent/src/jetbrains/buildServer/nuget/agent/runner/pack/PackRunnerRegistrar.java
@@ -14,7 +14,7 @@
  * limitations under the License.\r
  */\r
 \r
-package jetbrains.buildServer.nuget.agent.pack;\r
+package jetbrains.buildServer.nuget.agent.runner.pack;\r
 \r
 import jetbrains.buildServer.agent.impl.BuildRunnerRegistry;\r
 import org.jetbrains.annotations.NotNull;\r

diff --git a/nuget-agent/src/jetbrains/buildServer/nuget/agent/publish/MatchFilesBuildProcess.java b/nuget-agent/src/jetbrains/buildServer/nuget/agent/runner/publish/MatchFilesBuildProcess.java
similarity index 95%
rename from nuget-agent/src/jetbrains/buildServer/nuget/agent/publish/MatchFilesBuildProcess.java
rename to nuget-agent/src/jetbrains/buildServer/nuget/agent/runner/publish/MatchFilesBuildProcess.java
index 803f235c2f29b170d531d67a79ef601883fff519..e6ed5d3aa452c498ee2de53366e07a0670da1776 100644 (file)
--- a/nuget-agent/src/jetbrains/buildServer/nuget/agent/publish/MatchFilesBuildProcess.java
+++ b/nuget-agent/src/jetbrains/buildServer/nuget/agent/runner/publish/MatchFilesBuildProcess.java
@@ -14,7 +14,7 @@
  * limitations under the License.\r
  */\r
 \r
-package jetbrains.buildServer.nuget.agent.publish;\r
+package jetbrains.buildServer.nuget.agent.runner.publish;\r
 \r
 import com.intellij.openapi.diagnostic.Logger;\r
 import com.intellij.openapi.util.SystemInfo;\r

diff --git a/nuget-agent/src/jetbrains/buildServer/nuget/agent/publish/PackagesPublishRunner.java b/nuget-agent/src/jetbrains/buildServer/nuget/agent/runner/publish/PackagesPublishRunner.java
similarity index 95%
rename from nuget-agent/src/jetbrains/buildServer/nuget/agent/publish/PackagesPublishRunner.java
rename to nuget-agent/src/jetbrains/buildServer/nuget/agent/runner/publish/PackagesPublishRunner.java
index 59d928c8956bef0e1e2a2de308372aa3d332826e..427bfa54a69cb0b7a10b3dbb7c25f5b7d393b384 100644 (file)
--- a/nuget-agent/src/jetbrains/buildServer/nuget/agent/publish/PackagesPublishRunner.java
+++ b/nuget-agent/src/jetbrains/buildServer/nuget/agent/runner/publish/PackagesPublishRunner.java
@@ -14,7 +14,7 @@
  * limitations under the License.\r
  */\r
 \r
-package jetbrains.buildServer.nuget.agent.publish;\r
+package jetbrains.buildServer.nuget.agent.runner.publish;\r
 \r
 import com.intellij.openapi.diagnostic.Logger;\r
 import jetbrains.buildServer.RunBuildException;\r

diff --git a/nuget-agent/src/jetbrains/buildServer/nuget/agent/publish/PackagesPublishRunnerRegistrar.java b/nuget-agent/src/jetbrains/buildServer/nuget/agent/runner/publish/PackagesPublishRunnerRegistrar.java
similarity index 92%
rename from nuget-agent/src/jetbrains/buildServer/nuget/agent/publish/PackagesPublishRunnerRegistrar.java
rename to nuget-agent/src/jetbrains/buildServer/nuget/agent/runner/publish/PackagesPublishRunnerRegistrar.java
index ec28556890b30d45f925f168c18e93e85b7b4877..3226d1ebaf83de79b153a1334428145f251a46f3 100644 (file)
--- a/nuget-agent/src/jetbrains/buildServer/nuget/agent/publish/PackagesPublishRunnerRegistrar.java
+++ b/nuget-agent/src/jetbrains/buildServer/nuget/agent/runner/publish/PackagesPublishRunnerRegistrar.java
@@ -14,7 +14,7 @@
  * limitations under the License.\r
  */\r
 \r
-package jetbrains.buildServer.nuget.agent.publish;\r
+package jetbrains.buildServer.nuget.agent.runner.publish;\r
 \r
 import jetbrains.buildServer.agent.impl.BuildRunnerRegistry;\r
 import org.jetbrains.annotations.NotNull;\r

diff --git a/nuget-tests/src/jetbrains/buildServer/nuget/tests/agent/LocateNuGetConfigBuildProcessTest.java b/nuget-tests/src/jetbrains/buildServer/nuget/tests/agent/LocateNuGetConfigBuildProcessTest.java
index 82dcab7a898456a339fe75a2f3e3c5b80927c39e..f2bbd41833eb19a10277b45a905bc9dd8078c503 100644 (file)
--- a/nuget-tests/src/jetbrains/buildServer/nuget/tests/agent/LocateNuGetConfigBuildProcessTest.java
+++ b/nuget-tests/src/jetbrains/buildServer/nuget/tests/agent/LocateNuGetConfigBuildProcessTest.java
@@ -19,7 +19,7 @@ package jetbrains.buildServer.nuget.tests.agent;
 import jetbrains.buildServer.RunBuildException;\r
 import jetbrains.buildServer.agent.BuildFinishedStatus;\r
 import jetbrains.buildServer.agent.BuildProgressLogger;\r
-import jetbrains.buildServer.nuget.agent.install.LocateNuGetConfigBuildProcess;\r
+import jetbrains.buildServer.nuget.agent.runner.install.LocateNuGetConfigBuildProcess;\r
 import jetbrains.buildServer.nuget.agent.parameters.NuGetFetchParameters;\r
 import jetbrains.buildServer.nuget.tests.util.BuildProcessTestCase;\r
 import jetbrains.buildServer.util.FileUtil;\r

diff --git a/nuget-tests/src/jetbrains/buildServer/nuget/tests/agent/MatchFilesBuildProcessTest.java b/nuget-tests/src/jetbrains/buildServer/nuget/tests/agent/MatchFilesBuildProcessTest.java
index 2c5a85d7ccbc55730ef89b85e2f11ea9be35e661..bdd8264b4fe834b2037a0ec14b9a98b5a9f6e6ef 100644 (file)
--- a/nuget-tests/src/jetbrains/buildServer/nuget/tests/agent/MatchFilesBuildProcessTest.java
+++ b/nuget-tests/src/jetbrains/buildServer/nuget/tests/agent/MatchFilesBuildProcessTest.java
@@ -21,7 +21,7 @@ import jetbrains.buildServer.agent.AgentRunningBuild;
 import jetbrains.buildServer.agent.BuildFinishedStatus;\r
 import jetbrains.buildServer.agent.BuildRunnerContext;\r
 import jetbrains.buildServer.nuget.agent.parameters.NuGetPublishParameters;\r
-import jetbrains.buildServer.nuget.agent.publish.MatchFilesBuildProcess;\r
+import jetbrains.buildServer.nuget.agent.runner.publish.MatchFilesBuildProcess;\r
 import jetbrains.buildServer.nuget.tests.Strings;\r
 import jetbrains.buildServer.nuget.tests.util.BuildProcessTestCase;\r
 import jetbrains.buildServer.util.FileUtil;\r

diff --git a/nuget-tests/src/jetbrains/buildServer/nuget/tests/agent/NuGetInstallPackageActionFactoryTest.java b/nuget-tests/src/jetbrains/buildServer/nuget/tests/agent/NuGetInstallPackageActionFactoryTest.java
index 84b969ebac1733282914225962a98a88649d7761..e0a3e98a8c2df13990e965916d64e78df69102b0 100644 (file)
--- a/nuget-tests/src/jetbrains/buildServer/nuget/tests/agent/NuGetInstallPackageActionFactoryTest.java
+++ b/nuget-tests/src/jetbrains/buildServer/nuget/tests/agent/NuGetInstallPackageActionFactoryTest.java
@@ -21,7 +21,7 @@ import jetbrains.buildServer.RunBuildException;
 import jetbrains.buildServer.agent.BuildRunnerContext;\r
 import jetbrains.buildServer.nuget.agent.commands.impl.CommandFactoryImpl;\r
 import jetbrains.buildServer.nuget.agent.commands.impl.NuGetActionFactoryImpl;\r
-import jetbrains.buildServer.nuget.agent.install.PackageUsages;\r
+import jetbrains.buildServer.nuget.agent.dependencies.PackageUsages;\r
 import jetbrains.buildServer.nuget.agent.parameters.NuGetFetchParameters;\r
 import jetbrains.buildServer.nuget.agent.parameters.PackagesInstallParameters;\r
 import jetbrains.buildServer.nuget.agent.util.CommandlineBuildProcessFactory;\r

diff --git a/nuget-tests/src/jetbrains/buildServer/nuget/tests/agent/NuGetPackActionFactoryTest.java b/nuget-tests/src/jetbrains/buildServer/nuget/tests/agent/NuGetPackActionFactoryTest.java
index 1aa6235148ffe031c97483f0bd014ab3cc28b748..ff522c3a20c316a3d8936b8e81a1fe71df2aa666 100644 (file)
--- a/nuget-tests/src/jetbrains/buildServer/nuget/tests/agent/NuGetPackActionFactoryTest.java
+++ b/nuget-tests/src/jetbrains/buildServer/nuget/tests/agent/NuGetPackActionFactoryTest.java
@@ -22,7 +22,7 @@ import jetbrains.buildServer.agent.AgentRunningBuild;
 import jetbrains.buildServer.agent.BuildRunnerContext;\r
 import jetbrains.buildServer.nuget.agent.commands.impl.CommandFactoryImpl;\r
 import jetbrains.buildServer.nuget.agent.commands.impl.NuGetActionFactoryImpl;\r
-import jetbrains.buildServer.nuget.agent.install.PackageUsages;\r
+import jetbrains.buildServer.nuget.agent.dependencies.PackageUsages;\r
 import jetbrains.buildServer.nuget.agent.parameters.NuGetPackParameters;\r
 import jetbrains.buildServer.nuget.agent.util.CommandlineBuildProcessFactory;\r
 import org.jmock.Expectations;\r
@@ -132,9 +132,11 @@ public class NuGetPackActionFactoryTest extends BaseTestCase {
   public void test_custom_commandline() throws RunBuildException {\r
     myExtra.add("arg1");\r
     myExtra.add("arg2");\r
-    m.checking(new Expectations(){{\r
-      allowing(myPackParameters).packTool(); will(returnValue(false));\r
-      allowing(myPackParameters).packSymbols(); will(returnValue(false));\r
+    m.checking(new Expectations() {{\r
+      allowing(myPackParameters).packTool();\r
+      will(returnValue(false));\r
+      allowing(myPackParameters).packSymbols();\r
+      will(returnValue(false));\r
 \r
       oneOf(myProcessFactory).executeCommandLine(ctx, myNuGet,\r
               Arrays.asList(\r

diff --git a/nuget-tests/src/jetbrains/buildServer/nuget/tests/agent/NuGetPackagesConfigParserTest.java b/nuget-tests/src/jetbrains/buildServer/nuget/tests/agent/NuGetPackagesConfigParserTest.java
index 036d789d623392cc77e3015e39cb2a9d4afcb2ed..522d3efdde2dbde3259e8d39ef2facba6b9b6613 100644 (file)
--- a/nuget-tests/src/jetbrains/buildServer/nuget/tests/agent/NuGetPackagesConfigParserTest.java
+++ b/nuget-tests/src/jetbrains/buildServer/nuget/tests/agent/NuGetPackagesConfigParserTest.java
@@ -17,9 +17,9 @@
 package jetbrains.buildServer.nuget.tests.agent;\r
 \r
 import jetbrains.buildServer.BaseTestCase;\r
+import jetbrains.buildServer.nuget.agent.dependencies.impl.NuGetPackagesCollectorImpl;\r
+import jetbrains.buildServer.nuget.agent.dependencies.impl.NuGetPackagesConfigParser;\r
 import jetbrains.buildServer.nuget.common.PackageInfo;\r
-import jetbrains.buildServer.nuget.agent.install.impl.NuGetPackagesCollectorImpl;\r
-import jetbrains.buildServer.nuget.agent.install.impl.NuGetPackagesConfigParser;\r
 import jetbrains.buildServer.nuget.tests.integration.Paths;\r
 import org.jetbrains.annotations.NotNull;\r
 import org.testng.Assert;\r

diff --git a/nuget-tests/src/jetbrains/buildServer/nuget/tests/agent/NuGetPushActoinFactoryTest.java b/nuget-tests/src/jetbrains/buildServer/nuget/tests/agent/NuGetPushActoinFactoryTest.java
index b2c5a33c655294c56b334436fea3a48efd605c30..167adf5ba1bb7fd1dab4523674304c6c37fe7921 100644 (file)
--- a/nuget-tests/src/jetbrains/buildServer/nuget/tests/agent/NuGetPushActoinFactoryTest.java
+++ b/nuget-tests/src/jetbrains/buildServer/nuget/tests/agent/NuGetPushActoinFactoryTest.java
@@ -21,7 +21,7 @@ import jetbrains.buildServer.RunBuildException;
 import jetbrains.buildServer.agent.BuildRunnerContext;\r
 import jetbrains.buildServer.nuget.agent.commands.impl.CommandFactoryImpl;\r
 import jetbrains.buildServer.nuget.agent.commands.impl.NuGetActionFactoryImpl;\r
-import jetbrains.buildServer.nuget.agent.install.PackageUsages;\r
+import jetbrains.buildServer.nuget.agent.dependencies.PackageUsages;\r
 import jetbrains.buildServer.nuget.agent.parameters.NuGetPublishParameters;\r
 import jetbrains.buildServer.nuget.agent.util.CommandlineBuildProcessFactory;\r
 import org.jmock.Expectations;\r

diff --git a/nuget-tests/src/jetbrains/buildServer/nuget/tests/agent/NuGetUpdatePackageActionFactoryTest.java b/nuget-tests/src/jetbrains/buildServer/nuget/tests/agent/NuGetUpdatePackageActionFactoryTest.java
index 95f292b8bd8ab4dc29cbc08eb354a86f5894bd60..348a4a6e2267f14200457a1563dc95afc945c09a 100644 (file)
--- a/nuget-tests/src/jetbrains/buildServer/nuget/tests/agent/NuGetUpdatePackageActionFactoryTest.java
+++ b/nuget-tests/src/jetbrains/buildServer/nuget/tests/agent/NuGetUpdatePackageActionFactoryTest.java
@@ -21,7 +21,7 @@ import jetbrains.buildServer.RunBuildException;
 import jetbrains.buildServer.agent.BuildRunnerContext;\r
 import jetbrains.buildServer.nuget.agent.commands.impl.CommandFactoryImpl;\r
 import jetbrains.buildServer.nuget.agent.commands.impl.NuGetActionFactoryImpl;\r
-import jetbrains.buildServer.nuget.agent.install.PackageUsages;\r
+import jetbrains.buildServer.nuget.agent.dependencies.PackageUsages;\r
 import jetbrains.buildServer.nuget.agent.parameters.NuGetFetchParameters;\r
 import jetbrains.buildServer.nuget.agent.parameters.PackagesUpdateParameters;\r
 import jetbrains.buildServer.nuget.agent.util.CommandlineBuildProcessFactory;\r

diff --git a/nuget-tests/src/jetbrains/buildServer/nuget/tests/agent/PackagesInstallerBuilderTest.java b/nuget-tests/src/jetbrains/buildServer/nuget/tests/agent/PackagesInstallerBuilderTest.java
index 1abecf7c5777dd361cb1844d0e210fdb2bb3f0bb..7d5a6485b3736ec6df3fd96fd8fac1704d248ae6 100644 (file)
--- a/nuget-tests/src/jetbrains/buildServer/nuget/tests/agent/PackagesInstallerBuilderTest.java
+++ b/nuget-tests/src/jetbrains/buildServer/nuget/tests/agent/PackagesInstallerBuilderTest.java
@@ -21,11 +21,13 @@ import jetbrains.buildServer.RunBuildException;
 import jetbrains.buildServer.agent.BuildProcess;\r
 import jetbrains.buildServer.agent.BuildRunnerContext;\r
 import jetbrains.buildServer.nuget.agent.commands.NuGetActionFactory;\r
-import jetbrains.buildServer.nuget.agent.install.impl.InstallStages;\r
-import jetbrains.buildServer.nuget.agent.install.impl.PackagesInstallerBuilder;\r
+import jetbrains.buildServer.nuget.agent.runner.install.impl.InstallStages;\r
+import jetbrains.buildServer.nuget.agent.runner.install.impl.InstallStages;\r
+import jetbrains.buildServer.nuget.agent.runner.install.impl.PackagesInstallerBuilder;\r
 import jetbrains.buildServer.nuget.agent.parameters.NuGetFetchParameters;\r
 import jetbrains.buildServer.nuget.agent.parameters.PackagesInstallParameters;\r
 import jetbrains.buildServer.nuget.agent.parameters.PackagesUpdateParameters;\r
+import jetbrains.buildServer.nuget.agent.runner.install.impl.PackagesInstallerBuilder;\r
 import jetbrains.buildServer.nuget.agent.util.BuildProcessContinuation;\r
 import jetbrains.buildServer.nuget.common.PackagesUpdateMode;\r
 import org.jmock.Expectations;\r

diff --git a/nuget-tests/src/jetbrains/buildServer/nuget/tests/agent/PackagesWatcherTest.java b/nuget-tests/src/jetbrains/buildServer/nuget/tests/agent/PackagesWatcherTest.java
index b98a7409c51cce2ae4db833c67ef4a81ff8a62a3..9acd9a26d35a20eb8644b8d38e9bde7b11617452 100644 (file)
--- a/nuget-tests/src/jetbrains/buildServer/nuget/tests/agent/PackagesWatcherTest.java
+++ b/nuget-tests/src/jetbrains/buildServer/nuget/tests/agent/PackagesWatcherTest.java
@@ -20,12 +20,11 @@ import jetbrains.buildServer.BaseTestCase;
 import jetbrains.buildServer.agent.AgentLifeCycleListener;\r
 import jetbrains.buildServer.agent.AgentRunningBuild;\r
 import jetbrains.buildServer.agent.BuildFinishedStatus;\r
-import jetbrains.buildServer.agent.BuildRunnerContext;\r
 import jetbrains.buildServer.agent.artifacts.ArtifactsWatcher;\r
-import jetbrains.buildServer.nuget.agent.install.NuGetPackagesCollector;\r
-import jetbrains.buildServer.nuget.agent.install.impl.NuGetPackagesCollectorImpl;\r
-import jetbrains.buildServer.nuget.agent.install.impl.PackagesInfoUploader;\r
-import jetbrains.buildServer.nuget.agent.install.impl.PackagesWatcher;\r
+import jetbrains.buildServer.nuget.agent.dependencies.NuGetPackagesCollector;\r
+import jetbrains.buildServer.nuget.agent.dependencies.impl.NuGetPackagesCollectorImpl;\r
+import jetbrains.buildServer.nuget.agent.runner.install.impl.PackagesInfoUploader;\r
+import jetbrains.buildServer.nuget.agent.runner.install.impl.PackagesWatcher;\r
 import jetbrains.buildServer.nuget.common.PackageDependenciesStore;\r
 import jetbrains.buildServer.util.EventDispatcher;\r
 import org.hamcrest.BaseMatcher;\r

diff --git a/nuget-tests/src/jetbrains/buildServer/nuget/tests/integration/InstallPackageIntegtatoinTest.java b/nuget-tests/src/jetbrains/buildServer/nuget/tests/integration/InstallPackageIntegtatoinTest.java
index da6ff646de4a458b60a4af43dcfee2feb6bf369a..559a9f451fe6f6589d215c60ce0c9caff9403dcb 100644 (file)
--- a/nuget-tests/src/jetbrains/buildServer/nuget/tests/integration/InstallPackageIntegtatoinTest.java
+++ b/nuget-tests/src/jetbrains/buildServer/nuget/tests/integration/InstallPackageIntegtatoinTest.java
@@ -19,8 +19,8 @@ package jetbrains.buildServer.nuget.tests.integration;
 import jetbrains.buildServer.RunBuildException;\r
 import jetbrains.buildServer.agent.BuildFinishedStatus;\r
 import jetbrains.buildServer.agent.BuildProcess;\r
-import jetbrains.buildServer.nuget.agent.install.PackagesInstallerRunner;\r
-import jetbrains.buildServer.nuget.agent.install.impl.NuGetPackagesCollectorImpl;\r
+import jetbrains.buildServer.nuget.agent.dependencies.impl.NuGetPackagesCollectorImpl;\r
+import jetbrains.buildServer.nuget.agent.runner.install.PackagesInstallerRunner;\r
 import jetbrains.buildServer.nuget.agent.parameters.PackagesInstallParameters;\r
 import jetbrains.buildServer.nuget.agent.parameters.PackagesUpdateParameters;\r
 import jetbrains.buildServer.nuget.common.PackageInfo;\r

diff --git a/nuget-tests/src/jetbrains/buildServer/nuget/tests/integration/IntegrationTestBase.java b/nuget-tests/src/jetbrains/buildServer/nuget/tests/integration/IntegrationTestBase.java
index 633e1e3c5a04dac0ea6449e247c33519923ee247..4138c84d47df57b0ab05df0104706b665533a5da 100644 (file)
--- a/nuget-tests/src/jetbrains/buildServer/nuget/tests/integration/IntegrationTestBase.java
+++ b/nuget-tests/src/jetbrains/buildServer/nuget/tests/integration/IntegrationTestBase.java
@@ -25,11 +25,11 @@ import jetbrains.buildServer.nuget.agent.commands.NuGetActionFactory;
 import jetbrains.buildServer.nuget.agent.commands.impl.CommandFactoryImpl;\r
 import jetbrains.buildServer.nuget.agent.commands.impl.LoggingNuGetActionFactoryImpl;\r
 import jetbrains.buildServer.nuget.agent.commands.impl.NuGetActionFactoryImpl;\r
-import jetbrains.buildServer.nuget.agent.install.NuGetPackagesCollector;\r
-import jetbrains.buildServer.nuget.agent.install.PackageUsages;\r
-import jetbrains.buildServer.nuget.agent.install.impl.NuGetPackagesCollectorImpl;\r
-import jetbrains.buildServer.nuget.agent.install.impl.NuGetPackagesConfigParser;\r
-import jetbrains.buildServer.nuget.agent.install.impl.PackageUsagesImpl;\r
+import jetbrains.buildServer.nuget.agent.dependencies.NuGetPackagesCollector;\r
+import jetbrains.buildServer.nuget.agent.dependencies.impl.NuGetPackagesCollectorImpl;\r
+import jetbrains.buildServer.nuget.agent.dependencies.PackageUsages;\r
+import jetbrains.buildServer.nuget.agent.dependencies.impl.NuGetPackagesConfigParser;\r
+import jetbrains.buildServer.nuget.agent.dependencies.impl.PackageUsagesImpl;\r
 import jetbrains.buildServer.nuget.agent.parameters.*;\r
 import jetbrains.buildServer.nuget.agent.util.BuildProcessBase;\r
 import jetbrains.buildServer.nuget.agent.util.CommandlineBuildProcessFactory;\r

diff --git a/nuget-tests/src/jetbrains/buildServer/nuget/tests/integration/PackIntegrationTest.java b/nuget-tests/src/jetbrains/buildServer/nuget/tests/integration/PackIntegrationTest.java
index 2e55be25381c1bac093bb678022eabee8ea9f478..9fe42a99e6a63bd159aa30630d88f72b922602ce 100644 (file)
--- a/nuget-tests/src/jetbrains/buildServer/nuget/tests/integration/PackIntegrationTest.java
+++ b/nuget-tests/src/jetbrains/buildServer/nuget/tests/integration/PackIntegrationTest.java
@@ -23,7 +23,7 @@ import jetbrains.buildServer.RunBuildException;
 import jetbrains.buildServer.SimpleCommandLineProcessRunner;\r
 import jetbrains.buildServer.agent.BuildFinishedStatus;\r
 import jetbrains.buildServer.agent.BuildProcess;\r
-import jetbrains.buildServer.nuget.agent.pack.PackRunner;\r
+import jetbrains.buildServer.nuget.agent.runner.pack.PackRunner;\r
 import jetbrains.buildServer.nuget.agent.parameters.NuGetPackParameters;\r
 import jetbrains.buildServer.util.FileUtil;\r
 import org.jetbrains.annotations.NotNull;\r

diff --git a/nuget-tests/src/jetbrains/buildServer/nuget/tests/integration/PackagesPublishIntegrationTest.java b/nuget-tests/src/jetbrains/buildServer/nuget/tests/integration/PackagesPublishIntegrationTest.java
index 138ce0b1214c973cab456daa2bf0d14af88926cb..5488f429174062c5b6709e9b0d7ecdc2c0266ecb 100644 (file)
--- a/nuget-tests/src/jetbrains/buildServer/nuget/tests/integration/PackagesPublishIntegrationTest.java
+++ b/nuget-tests/src/jetbrains/buildServer/nuget/tests/integration/PackagesPublishIntegrationTest.java
@@ -23,7 +23,7 @@ import jetbrains.buildServer.SimpleCommandLineProcessRunner;
 import jetbrains.buildServer.agent.BuildFinishedStatus;\r
 import jetbrains.buildServer.agent.BuildProcess;\r
 import jetbrains.buildServer.nuget.agent.parameters.NuGetPublishParameters;\r
-import jetbrains.buildServer.nuget.agent.publish.PackagesPublishRunner;\r
+import jetbrains.buildServer.nuget.agent.runner.publish.PackagesPublishRunner;\r
 import jetbrains.buildServer.util.FileUtil;\r
 import org.jetbrains.annotations.NotNull;\r
 import org.jmock.Expectations;\r