Author: lcorneliussen
Date: Wed Jan 11 13:34:16 2012
New Revision: 1230020
URL: http://svn.apache.org/viewvc?rev=1230020&view=rev
Log:
[NPANDAY-480, NPANDAY-488, NPANDAY-518] renamed msdeploy:unpack-dependencies to
resolve-azure-web-roles
Added:
incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/MsDeployResolveWebRolesMojo.java
(contents, props changed)
- copied, changed from r1229502,
incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/MsDeployUnpackDependenciesMojo.java
Removed:
incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/MsDeployUnpackDependenciesMojo.java
Modified:
incubator/npanday/trunk/plugins/azure-maven-plugin/src/main/groovy/npanday/plugin/azure/AzureLifecycleMap.groovy
incubator/npanday/trunk/plugins/azure-maven-plugin/src/main/java/npanday/plugin/azure/ResolveWorkerRoleFilesMojo.java
Modified:
incubator/npanday/trunk/plugins/azure-maven-plugin/src/main/groovy/npanday/plugin/azure/AzureLifecycleMap.groovy
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/azure-maven-plugin/src/main/groovy/npanday/plugin/azure/AzureLifecycleMap.groovy?rev=1230020&r1=1230019&r2=1230020&view=diff
==============================================================================
---
incubator/npanday/trunk/plugins/azure-maven-plugin/src/main/groovy/npanday/plugin/azure/AzureLifecycleMap.groovy
(original)
+++
incubator/npanday/trunk/plugins/azure-maven-plugin/src/main/groovy/npanday/plugin/azure/AzureLifecycleMap.groovy
Wed Jan 11 13:34:16 2012
@@ -41,7 +41,7 @@ class AzureLifecycleMap extends Lifecycl
add(forType(npanday.ArtifactType.AZURE_CLOUD_SERVICE,
{LifecycleMappingBuilder b ->
b.prepare_package(
"$azure:resolve-worker-roles",
- "$msdeploy:unpack-dependencies",
+ "$msdeploy:resolve-azure-web-roles",
"$azure:process-cloud-service-configuration"
)
b._package( "$azure:create-cloud-service-package" )
Modified:
incubator/npanday/trunk/plugins/azure-maven-plugin/src/main/java/npanday/plugin/azure/ResolveWorkerRoleFilesMojo.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/azure-maven-plugin/src/main/java/npanday/plugin/azure/ResolveWorkerRoleFilesMojo.java?rev=1230020&r1=1230019&r2=1230020&view=diff
==============================================================================
---
incubator/npanday/trunk/plugins/azure-maven-plugin/src/main/java/npanday/plugin/azure/ResolveWorkerRoleFilesMojo.java
(original)
+++
incubator/npanday/trunk/plugins/azure-maven-plugin/src/main/java/npanday/plugin/azure/ResolveWorkerRoleFilesMojo.java
Wed Jan 11 13:34:16 2012
@@ -53,7 +53,6 @@ public class ResolveWorkerRoleFilesMojo
public void execute() throws MojoExecutionException, MojoFailureException
{
- // TODO: this mojo could be moved to application-maven-plugin /
unpack-dependencies (as with msdeploy)
super.execute();
final Set projectDependencyArtifacts =
project.getDependencyArtifacts();
@@ -70,7 +69,6 @@ public class ResolveWorkerRoleFilesMojo
private void unpack( Artifact artifact ) throws MojoFailureException
{
- // TODO: partially duplicate code with MSDeploy unpack-dependencies
File targetDirectory = new File( PathUtil.getPreparedPackageFolder(
project ), artifact.getArtifactId() );
try
{
Copied:
incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/MsDeployResolveWebRolesMojo.java
(from r1229502,
incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/MsDeployUnpackDependenciesMojo.java)
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/MsDeployResolveWebRolesMojo.java?p2=incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/MsDeployResolveWebRolesMojo.java&p1=incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/MsDeployUnpackDependenciesMojo.java&r1=1229502&r2=1230020&rev=1230020&view=diff
==============================================================================
---
incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/MsDeployUnpackDependenciesMojo.java
(original)
+++
incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/MsDeployResolveWebRolesMojo.java
Wed Jan 11 13:34:16 2012
@@ -31,14 +31,15 @@ import java.util.Set;
import static com.google.common.collect.Lists.newArrayList;
/**
- * Resolves all MSDeploy-Packages and unpacks them for further use.
+ * Resolves all MSDeploy-Packages from project dependencies and unpacks them
+ * for repackaging through the azure-maven-plugin.
*
* @author <a href="mailto:[email protected]";>Lars Corneliussen</a>
*
- * @goal unpack-dependencies
+ * @goal resolve-azure-web-roles
* @requiresDependencyResolution compile
*/
-public class MsDeployUnpackDependenciesMojo
+public class MsDeployResolveWebRolesMojo
extends AbstractMsDeployMojo<UnpackDependencyIterationItem>
{
@Override
@@ -77,9 +78,6 @@ public class MsDeployUnpackDependenciesM
{
List<String> commands = Lists.newArrayList();
- // this requires npanday.executable.impl.DefaultNetExecutable to be
used, as it will respect
- // the "home-made" quoting
-
commands.add( "-verb:sync" );
commands.add( "-source:package=" +
item.getPackageSource().getAbsolutePath());
commands.add( "-dest:contentPath=" +
item.getPackageTarget().getAbsolutePath() );
Propchange:
incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/MsDeployResolveWebRolesMojo.java
------------------------------------------------------------------------------
svn:eol-style = native
