move nuget anction/commands classes

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 89f7ef3bb04788787cbc32d8353be9fd3e41aa56..a6dd5d3cc2e1a30dbf503bffb8c2f3f263587ee6 100644 (file)
--- a/nuget-agent/src/META-INF/build-agent-plugin-nuget.xml
+++ b/nuget-agent/src/META-INF/build-agent-plugin-nuget.xml
@@ -14,9 +14,9 @@
   <bean class="jetbrains.buildServer.nuget.agent.install.PackagesInstallerRunnerRegistrar"/>\r
 \r
   <bean class="jetbrains.buildServer.nuget.agent.commands.impl.CommandFactoryImpl"/>\r
-  <bean class="jetbrains.buildServer.nuget.agent.install.impl.LoggingNuGetActionFactoryImpl">\r
+  <bean class="jetbrains.buildServer.nuget.agent.commands.impl.LoggingNuGetActionFactoryImpl">\r
     <constructor-arg>\r
-      <bean class="jetbrains.buildServer.nuget.agent.install.impl.NuGetActionFactoryImpl"/>\r
+      <bean class="jetbrains.buildServer.nuget.agent.commands.impl.NuGetActionFactoryImpl"/>\r
     </constructor-arg>\r
   </bean>\r
 \r

diff --git a/nuget-agent/src/jetbrains/buildServer/nuget/agent/install/NuGetActionFactory.java b/nuget-agent/src/jetbrains/buildServer/nuget/agent/commands/NuGetActionFactory.java
similarity index 95%
rename from nuget-agent/src/jetbrains/buildServer/nuget/agent/install/NuGetActionFactory.java
rename to nuget-agent/src/jetbrains/buildServer/nuget/agent/commands/NuGetActionFactory.java
index 7bee209fe93d794bca92be3f3a3fff982da68359..911a2e6434eee09612ad62b1c86d0a119bf6873c 100644 (file)
--- a/nuget-agent/src/jetbrains/buildServer/nuget/agent/install/NuGetActionFactory.java
+++ b/nuget-agent/src/jetbrains/buildServer/nuget/agent/commands/NuGetActionFactory.java
@@ -14,7 +14,7 @@
  * limitations under the License.\r
  */\r
 \r
-package jetbrains.buildServer.nuget.agent.install;\r
+package jetbrains.buildServer.nuget.agent.commands;\r
 \r
 import jetbrains.buildServer.RunBuildException;\r
 import jetbrains.buildServer.agent.BuildProcess;\r

diff --git a/nuget-agent/src/jetbrains/buildServer/nuget/agent/install/impl/LoggingNuGetActionFactoryImpl.java b/nuget-agent/src/jetbrains/buildServer/nuget/agent/commands/impl/LoggingNuGetActionFactoryImpl.java
similarity index 94%
rename from nuget-agent/src/jetbrains/buildServer/nuget/agent/install/impl/LoggingNuGetActionFactoryImpl.java
rename to nuget-agent/src/jetbrains/buildServer/nuget/agent/commands/impl/LoggingNuGetActionFactoryImpl.java
index eadaad4c317349b4a284d9d0dc1416fa808a0c13..ece0ccd2ab2ae955aa3157092f7441f563c4ce18 100644 (file)
--- a/nuget-agent/src/jetbrains/buildServer/nuget/agent/install/impl/LoggingNuGetActionFactoryImpl.java
+++ b/nuget-agent/src/jetbrains/buildServer/nuget/agent/commands/impl/LoggingNuGetActionFactoryImpl.java
@@ -14,13 +14,13 @@
  * limitations under the License.\r
  */\r
 \r
-package jetbrains.buildServer.nuget.agent.install.impl;\r
+package jetbrains.buildServer.nuget.agent.commands.impl;\r
 \r
 import jetbrains.buildServer.RunBuildException;\r
 import jetbrains.buildServer.agent.BuildProcess;\r
 import jetbrains.buildServer.agent.BuildProgressLogger;\r
 import jetbrains.buildServer.agent.BuildRunnerContext;\r
-import jetbrains.buildServer.nuget.agent.install.NuGetActionFactory;\r
+import jetbrains.buildServer.nuget.agent.commands.NuGetActionFactory;\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

diff --git a/nuget-agent/src/jetbrains/buildServer/nuget/agent/install/impl/NuGetActionFactoryImpl.java b/nuget-agent/src/jetbrains/buildServer/nuget/agent/commands/impl/NuGetActionFactoryImpl.java
similarity index 92%
rename from nuget-agent/src/jetbrains/buildServer/nuget/agent/install/impl/NuGetActionFactoryImpl.java
rename to nuget-agent/src/jetbrains/buildServer/nuget/agent/commands/impl/NuGetActionFactoryImpl.java
index 68ea9002db28e4b016f1c056e9c243d70215653e..86747b081837c5ce3475eaac0373638bacc5426a 100644 (file)
--- a/nuget-agent/src/jetbrains/buildServer/nuget/agent/install/impl/NuGetActionFactoryImpl.java
+++ b/nuget-agent/src/jetbrains/buildServer/nuget/agent/commands/impl/NuGetActionFactoryImpl.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.commands.impl;\r
 \r
 import com.intellij.openapi.diagnostic.Logger;\r
 import jetbrains.buildServer.RunBuildException;\r
@@ -22,7 +22,7 @@ import jetbrains.buildServer.agent.BuildFinishedStatus;
 import jetbrains.buildServer.agent.BuildProcess;\r
 import jetbrains.buildServer.agent.BuildRunnerContext;\r
 import jetbrains.buildServer.nuget.agent.commands.CommandFactory;\r
-import jetbrains.buildServer.nuget.agent.install.NuGetActionFactory;\r
+import jetbrains.buildServer.nuget.agent.commands.NuGetActionFactory;\r
 import jetbrains.buildServer.nuget.agent.install.PackageUsages;\r
 import jetbrains.buildServer.nuget.agent.parameters.NuGetFetchParameters;\r
 import jetbrains.buildServer.nuget.agent.parameters.PackagesInstallParameters;\r
@@ -39,8 +39,6 @@ import java.util.Collection;
  * Date: 07.07.11 17:49\r
  */\r
 public class NuGetActionFactoryImpl implements NuGetActionFactory {\r
-  private static final Logger LOG = Logger.getInstance(NuGetActionFactoryImpl.class.getName());\r
-\r
   private final CommandFactory myCommandFactory;\r
   private final CommandlineBuildProcessFactory myFactory;\r
   private final PackageUsages myPackageUsages;\r

diff --git a/nuget-agent/src/jetbrains/buildServer/nuget/agent/install/PackagesInstallerRunner.java b/nuget-agent/src/jetbrains/buildServer/nuget/agent/install/PackagesInstallerRunner.java
index 23999409400b7dbafe4e25c90e8ce1ab7858d0e3..0397b43a6f4c7a2b32688ee2cf9a7aaa120e3752 100644 (file)
--- a/nuget-agent/src/jetbrains/buildServer/nuget/agent/install/PackagesInstallerRunner.java
+++ b/nuget-agent/src/jetbrains/buildServer/nuget/agent/install/PackagesInstallerRunner.java
@@ -19,6 +19,7 @@ package jetbrains.buildServer.nuget.agent.install;
 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

diff --git a/nuget-agent/src/jetbrains/buildServer/nuget/agent/install/impl/PackagesInstallerBuilder.java b/nuget-agent/src/jetbrains/buildServer/nuget/agent/install/impl/PackagesInstallerBuilder.java
index 230851c2a44b8df1e41084f647caac5e6865e4e8..263ade9af815851af48bc8a8c634c052c804d45b 100644 (file)
--- a/nuget-agent/src/jetbrains/buildServer/nuget/agent/install/impl/PackagesInstallerBuilder.java
+++ b/nuget-agent/src/jetbrains/buildServer/nuget/agent/install/impl/PackagesInstallerBuilder.java
@@ -18,8 +18,8 @@ package jetbrains.buildServer.nuget.agent.install.impl;
 \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.install.NuGetActionFactory;\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-tests/src/jetbrains/buildServer/nuget/tests/agent/NuGetInstallPackageActionFactoryTest.java b/nuget-tests/src/jetbrains/buildServer/nuget/tests/agent/NuGetInstallPackageActionFactoryTest.java
index dc1edf856dd171ce24975c592dc9cbf0691161a5..84b969ebac1733282914225962a98a88649d7761 100644 (file)
--- a/nuget-tests/src/jetbrains/buildServer/nuget/tests/agent/NuGetInstallPackageActionFactoryTest.java
+++ b/nuget-tests/src/jetbrains/buildServer/nuget/tests/agent/NuGetInstallPackageActionFactoryTest.java
@@ -20,10 +20,10 @@ import jetbrains.buildServer.BaseTestCase;
 import jetbrains.buildServer.RunBuildException;\r
 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.parameters.NuGetFetchParameters;\r
 import jetbrains.buildServer.nuget.agent.parameters.PackagesInstallParameters;\r
-import jetbrains.buildServer.nuget.agent.install.impl.NuGetActionFactoryImpl;\r
 import jetbrains.buildServer.nuget.agent.util.CommandlineBuildProcessFactory;\r
 import org.jmock.Expectations;\r
 import org.jmock.Mockery;\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 4ac392cae6473d272920173ad53adec61431a505..95f292b8bd8ab4dc29cbc08eb354a86f5894bd60 100644 (file)
--- a/nuget-tests/src/jetbrains/buildServer/nuget/tests/agent/NuGetUpdatePackageActionFactoryTest.java
+++ b/nuget-tests/src/jetbrains/buildServer/nuget/tests/agent/NuGetUpdatePackageActionFactoryTest.java
@@ -20,10 +20,10 @@ import jetbrains.buildServer.BaseTestCase;
 import jetbrains.buildServer.RunBuildException;\r
 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.parameters.NuGetFetchParameters;\r
 import jetbrains.buildServer.nuget.agent.parameters.PackagesUpdateParameters;\r
-import jetbrains.buildServer.nuget.agent.install.impl.NuGetActionFactoryImpl;\r
 import jetbrains.buildServer.nuget.agent.util.CommandlineBuildProcessFactory;\r
 import org.jmock.Expectations;\r
 import org.jmock.Mockery;\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 48c2b03445f2519a0a6ed6e976199b4a020909cf..1abecf7c5777dd361cb1844d0e210fdb2bb3f0bb 100644 (file)
--- a/nuget-tests/src/jetbrains/buildServer/nuget/tests/agent/PackagesInstallerBuilderTest.java
+++ b/nuget-tests/src/jetbrains/buildServer/nuget/tests/agent/PackagesInstallerBuilderTest.java
@@ -20,7 +20,7 @@ import jetbrains.buildServer.BaseTestCase;
 import jetbrains.buildServer.RunBuildException;\r
 import jetbrains.buildServer.agent.BuildProcess;\r
 import jetbrains.buildServer.agent.BuildRunnerContext;\r
-import jetbrains.buildServer.nuget.agent.install.NuGetActionFactory;\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.parameters.NuGetFetchParameters;\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 434c7c2cabd30298f20e0b7edf9b9910daa41083..32e75a732ece62e2c67d7ce115fbff2c16255381 100644 (file)
--- a/nuget-tests/src/jetbrains/buildServer/nuget/tests/integration/InstallPackageIntegtatoinTest.java
+++ b/nuget-tests/src/jetbrains/buildServer/nuget/tests/integration/InstallPackageIntegtatoinTest.java
@@ -22,9 +22,9 @@ import jetbrains.buildServer.RunBuildException;
 import jetbrains.buildServer.SimpleCommandLineProcessRunner;\r
 import jetbrains.buildServer.agent.*;\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.install.PackagesInstallerRunner;\r
-import jetbrains.buildServer.nuget.agent.install.impl.NuGetActionFactoryImpl;\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