<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
<%@ 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
<%@ 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
<%@ 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
<%@ 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
<%@ 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
<%@ 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
--- /dev/null
+<?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
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
--- /dev/null
+<?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
<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
\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
* 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
* 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
* 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
* 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
* 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
* 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
* 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
* 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
* 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
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