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
default-autowire="constructor">\r
\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
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
<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
--- /dev/null
+/*\r
+ * Copyright 2000-2011 JetBrains s.r.o.\r
+ *\r
+ * Licensed under the Apache License, Version 2.0 (the "License");\r
+ * you may not use this file except in compliance with the License.\r
+ * You may obtain a copy of the License at\r
+ *\r
+ * http://www.apache.org/licenses/LICENSE-2.0\r
+ *\r
+ * Unless required by applicable law or agreed to in writing, software\r
+ * distributed under the License is distributed on an "AS IS" BASIS,\r
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+ * See the License for the specific language governing permissions and\r
+ * limitations under the License.\r
+ */\r
+\r
+package jetbrains.buildServer.nuget.agent.runner;\r
+\r
+import com.intellij.openapi.diagnostic.Logger;\r
+import jetbrains.buildServer.agent.AgentBuildRunner;\r
+import jetbrains.buildServer.agent.AgentBuildRunnerInfo;\r
+import jetbrains.buildServer.agent.BuildAgentConfiguration;\r
+import jetbrains.buildServer.nuget.agent.commands.NuGetActionFactory;\r
+import jetbrains.buildServer.nuget.agent.parameters.PackagesParametersFactory;\r
+import jetbrains.buildServer.nuget.common.DotNetConstants;\r
+import org.jetbrains.annotations.NotNull;\r
+\r
+/**\r
+ * @author Eugene Petrenko (eugene.petrenko@gmail.com)\r
+ * Date: 23.08.11 18:32\r
+ */\r
+public abstract class NuGetRunnerBase implements AgentBuildRunner, AgentBuildRunnerInfo {\r
+ protected final Logger LOG = Logger.getInstance(getClass().getName());\r
+\r
+ protected final NuGetActionFactory myActionFactory;\r
+ protected final PackagesParametersFactory myParametersFactory;\r
+\r
+ public NuGetRunnerBase(NuGetActionFactory actionFactory, PackagesParametersFactory parametersFactory) {\r
+ myActionFactory = actionFactory;\r
+ myParametersFactory = parametersFactory;\r
+ }\r
+\r
+ @NotNull\r
+ public AgentBuildRunnerInfo getRunnerInfo() {\r
+ return this;\r
+ }\r
+\r
+ @NotNull\r
+ public abstract String getType();\r
+\r
+ public boolean canRun(@NotNull BuildAgentConfiguration agentConfiguration) {\r
+ if (!agentConfiguration.getSystemInfo().isWindows()) {\r
+ LOG.warn("NuGet packages installer available only under windows");\r
+ return false;\r
+ }\r
+\r
+ if (!agentConfiguration.getConfigurationParameters().containsKey(DotNetConstants.DOT_NET_FRAMEWORK_4_x86)) {\r
+ LOG.warn("NuGet requires .NET Framework 4.0 x86 installed");\r
+ return false;\r
+ }\r
+\r
+ return true;\r
+ }\r
+}\r
\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.agent.AgentRunningBuild;\r
+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.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.NuGetRunnerBase;\r
+import jetbrains.buildServer.nuget.agent.runner.install.impl.InstallStages;\r
+import jetbrains.buildServer.nuget.agent.runner.install.impl.InstallStagesImpl;\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
import org.jetbrains.annotations.NotNull;\r
\r
* Created by Eugene Petrenko (eugene.petrenko@gmail.com)\r
* Date: 07.07.11 13:55\r
*/\r
-public class PackagesInstallerRunner implements AgentBuildRunner, AgentBuildRunnerInfo {\r
- private static final Logger LOG = Logger.getInstance(PackagesInstallerRunner.class.getName());\r
-\r
- private final NuGetActionFactory myNuGetActionFactory;\r
- private final PackagesParametersFactory myParametersFactory;\r
-\r
- public PackagesInstallerRunner(@NotNull final NuGetActionFactory nuGetActionFactory,\r
+public class PackagesInstallerRunner extends NuGetRunnerBase {\r
+ public PackagesInstallerRunner(@NotNull final NuGetActionFactory actionFactory,\r
@NotNull final PackagesParametersFactory parametersFactory) {\r
- myNuGetActionFactory = nuGetActionFactory;\r
- myParametersFactory = parametersFactory;\r
+ super(actionFactory, parametersFactory);\r
}\r
\r
@NotNull\r
parameters,\r
context.getBuild().getBuildLogger(),\r
new PackagesInstallerBuilder(\r
- myNuGetActionFactory,\r
+ myActionFactory,\r
stages,\r
context,\r
installParameters,\r
stages.getLocateStage().pushBuildProcess(locate);\r
}\r
\r
- @NotNull\r
- public AgentBuildRunnerInfo getRunnerInfo() {\r
- return this;\r
- }\r
-\r
@NotNull\r
public String getType() {\r
return PackagesConstants.INSTALL_RUN_TYPE;\r
}\r
-\r
- public boolean canRun(@NotNull BuildAgentConfiguration agentConfiguration) {\r
- if (!agentConfiguration.getSystemInfo().isWindows()) {\r
- LOG.warn("NuGet packages installer available only under windows");\r
- return false;\r
- }\r
-\r
- if (!agentConfiguration.getConfigurationParameters().containsKey(DotNetConstants.DOT_NET_FRAMEWORK_4_x86)) {\r
- LOG.warn("NuGet requires .NET Framework 4.0 x86 installed");\r
- return false;\r
- }\r
-\r
- return true;\r
- }\r
}\r
+++ /dev/null
-/*\r
- * Copyright 2000-2011 JetBrains s.r.o.\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- * http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-package jetbrains.buildServer.nuget.agent.runner.install;\r
-\r
-import jetbrains.buildServer.agent.impl.BuildRunnerRegistry;\r
-import org.jetbrains.annotations.NotNull;\r
-\r
-/**\r
- * Created by Eugene Petrenko (eugene.petrenko@gmail.com)\r
- * Date: 07.07.11 15:39\r
- */\r
-public class PackagesInstallerRunnerRegistrar {\r
- public PackagesInstallerRunnerRegistrar(@NotNull final BuildRunnerRegistry reg,\r
- @NotNull final PackagesInstallerRunner runner) {\r
- reg.registerRunner(runner);\r
- }\r
-}\r
\r
package jetbrains.buildServer.nuget.agent.runner.pack;\r
\r
-import com.intellij.openapi.diagnostic.Logger;\r
import jetbrains.buildServer.RunBuildException;\r
-import jetbrains.buildServer.agent.*;\r
+import jetbrains.buildServer.agent.AgentRunningBuild;\r
+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.parameters.NuGetPackParameters;\r
import jetbrains.buildServer.nuget.agent.parameters.PackagesParametersFactory;\r
+import jetbrains.buildServer.nuget.agent.runner.NuGetRunnerBase;\r
import jetbrains.buildServer.nuget.agent.util.CompositeBuildProcess;\r
import jetbrains.buildServer.nuget.agent.util.impl.CompositeBuildProcessImpl;\r
-import jetbrains.buildServer.nuget.common.DotNetConstants;\r
import jetbrains.buildServer.nuget.common.PackagesConstants;\r
import org.jetbrains.annotations.NotNull;\r
\r
* @author Eugene Petrenko (eugene.petrenko@gmail.com)\r
* Date: 23.08.11 12:11\r
*/\r
-public class PackRunner implements AgentBuildRunner, AgentBuildRunnerInfo {\r
- private static final Logger LOG = Logger.getInstance(PackRunner.class.getName());\r
-\r
- private final NuGetActionFactory myActionFactory;\r
- private final PackagesParametersFactory myParametersFactory;\r
-\r
+public class PackRunner extends NuGetRunnerBase {\r
public PackRunner(@NotNull final NuGetActionFactory actionFactory,\r
@NotNull final PackagesParametersFactory parametersFactory) {\r
- myActionFactory = actionFactory;\r
- myParametersFactory = parametersFactory;\r
+ super(actionFactory, parametersFactory);\r
}\r
\r
@NotNull\r
return process;\r
}\r
\r
- @NotNull\r
- public AgentBuildRunnerInfo getRunnerInfo() {\r
- return this;\r
- }\r
-\r
@NotNull\r
public String getType() {\r
return PackagesConstants.PACK_RUN_TYPE;\r
}\r
-\r
- public boolean canRun(@NotNull BuildAgentConfiguration agentConfiguration) {\r
- if (!agentConfiguration.getSystemInfo().isWindows()) {\r
- LOG.warn("NuGet packages installer available only under windows");\r
- return false;\r
- }\r
-\r
- if (!agentConfiguration.getConfigurationParameters().containsKey(DotNetConstants.DOT_NET_FRAMEWORK_4_x86)) {\r
- LOG.warn("NuGet requires .NET Framework 4.0 x86 installed");\r
- return false;\r
- }\r
-\r
- return true;\r
- }\r
-\r
}\r
+++ /dev/null
-/*\r
- * Copyright 2000-2011 JetBrains s.r.o.\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- * http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-package jetbrains.buildServer.nuget.agent.runner.pack;\r
-\r
-import jetbrains.buildServer.agent.impl.BuildRunnerRegistry;\r
-import org.jetbrains.annotations.NotNull;\r
-\r
-/**\r
- * @author Eugene Petrenko (eugene.petrenko@gmail.com)\r
- * Date: 23.08.11 12:13\r
- */\r
-public class PackRunnerRegistrar {\r
- public PackRunnerRegistrar(@NotNull final BuildRunnerRegistry reg,\r
- @NotNull final PackRunner runner) {\r
- reg.registerRunner(runner);\r
- }\r
-}\r
\r
package jetbrains.buildServer.nuget.agent.runner.publish;\r
\r
-import com.intellij.openapi.diagnostic.Logger;\r
import jetbrains.buildServer.RunBuildException;\r
-import jetbrains.buildServer.agent.*;\r
+import jetbrains.buildServer.agent.AgentRunningBuild;\r
+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.parameters.NuGetPublishParameters;\r
import jetbrains.buildServer.nuget.agent.parameters.PackagesParametersFactory;\r
+import jetbrains.buildServer.nuget.agent.runner.NuGetRunnerBase;\r
import jetbrains.buildServer.nuget.agent.util.CompositeBuildProcess;\r
import jetbrains.buildServer.nuget.agent.util.impl.CompositeBuildProcessImpl;\r
-import jetbrains.buildServer.nuget.common.DotNetConstants;\r
import jetbrains.buildServer.nuget.common.PackagesConstants;\r
import org.jetbrains.annotations.NotNull;\r
\r
* Created by Eugene Petrenko (eugene.petrenko@gmail.com)\r
* Date: 21.07.11 15:15\r
*/\r
-public class PackagesPublishRunner implements AgentBuildRunner, AgentBuildRunnerInfo {\r
- private static final Logger LOG = Logger.getInstance(PackagesPublishRunner.class.getName());\r
-\r
- private final NuGetActionFactory myActionFactory;\r
- private final PackagesParametersFactory myParametersFactory;\r
-\r
+public class PackagesPublishRunner extends NuGetRunnerBase {\r
public PackagesPublishRunner(@NotNull final NuGetActionFactory actionFactory,\r
@NotNull final PackagesParametersFactory parametersFactory) {\r
- myActionFactory = actionFactory;\r
- myParametersFactory = parametersFactory;\r
+ super(actionFactory, parametersFactory);\r
}\r
\r
@NotNull\r
return process;\r
}\r
\r
- @NotNull\r
- public AgentBuildRunnerInfo getRunnerInfo() {\r
- return this;\r
- }\r
-\r
@NotNull\r
public String getType() {\r
return PackagesConstants.PUBLISH_RUN_TYPE;\r
}\r
-\r
- public boolean canRun(@NotNull BuildAgentConfiguration agentConfiguration) {\r
- if (!agentConfiguration.getSystemInfo().isWindows()) {\r
- LOG.warn("NuGet packages installer available only under windows");\r
- return false;\r
- }\r
-\r
- if (!agentConfiguration.getConfigurationParameters().containsKey(DotNetConstants.DOT_NET_FRAMEWORK_4_x86)) {\r
- LOG.warn("NuGet requires .NET Framework 4.0 x86 installed");\r
- return false;\r
- }\r
-\r
- return true;\r
- }\r
}
\ No newline at end of file
+++ /dev/null
-/*\r
- * Copyright 2000-2011 JetBrains s.r.o.\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- * http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-package jetbrains.buildServer.nuget.agent.runner.publish;\r
-\r
-import jetbrains.buildServer.agent.impl.BuildRunnerRegistry;\r
-import org.jetbrains.annotations.NotNull;\r
-\r
-/**\r
- * Created by Eugene Petrenko (eugene.petrenko@gmail.com)\r
- * Date: 21.07.11 20:00\r
- */\r
-public class PackagesPublishRunnerRegistrar {\r
- public PackagesPublishRunnerRegistrar(@NotNull final BuildRunnerRegistry reg,\r
- @NotNull final PackagesPublishRunner runner) {\r
- reg.registerRunner(runner);\r
- }\r
-}\r