Author: lcorneliussen
Date: Tue May 1 07:51:59 2012
New Revision: 1332556
URL: http://svn.apache.org/viewvc?rev=1332556&view=rev
Log:
[NPANDAY-563] Generic MSDeploy synchronization mojo
o Made maven 2 compatible
Added:
incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/sync/
incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/sync/Destination.java
- copied, changed from r1332304,
incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/SyncDestination.java
incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/sync/Item.java
(contents, props changed)
- copied, changed from r1332302,
incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/SyncCommand.java
incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/sync/SyncEvent.java
- copied, changed from r1332302,
incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/SyncEvent.java
incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/sync/SyncMojo.java
(contents, props changed)
- copied, changed from r1332302,
incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/SyncMojo.java
Removed:
incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/SyncCommand.java
incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/SyncDestination.java
incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/SyncEvent.java
incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/SyncMojo.java
Modified:
incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/AbstractMsDeployMojo.java
Modified:
incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/AbstractMsDeployMojo.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/AbstractMsDeployMojo.java?rev=1332556&r1=1332555&r2=1332556&view=diff
==============================================================================
---
incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/AbstractMsDeployMojo.java
(original)
+++
incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/AbstractMsDeployMojo.java
Tue May 1 07:51:59 2012
@@ -118,7 +118,7 @@ public abstract class AbstractMsDeployMo
final List<T> iterationItems = prepareIterationItems();
- getLog().info( "NPANDAY-120-003: Configured exection items " +
iterationItems );
+ getLog().info( "NPANDAY-120-003: Configured exection syncCommands " +
iterationItems );
for(T iterationItem : iterationItems ){
getLog().info( "NPANDAY-120-004: Exectuting iteration item " +
iterationItem );
Copied:
incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/sync/Destination.java
(from r1332304,
incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/SyncDestination.java)
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/sync/Destination.java?p2=incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/sync/Destination.java&p1=incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/SyncDestination.java&r1=1332304&r2=1332556&rev=1332556&view=diff
==============================================================================
---
incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/SyncDestination.java
(original)
+++
incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/sync/Destination.java
Tue May 1 07:51:59 2012
@@ -17,14 +17,14 @@
* under the License.
*/
-package npanday.plugin.msdeploy;
+package npanday.plugin.msdeploy.sync;
import org.apache.maven.plugin.MojoExecutionException;
/**
* @author <a href="mailto:[email protected]>Lars Corneliussen, Faktum
Software</a>
*/
-public class SyncDestination
+public class Destination
{
private String computerName, username, password, authType = "basic",
serverId;
Copied:
incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/sync/Item.java
(from r1332302,
incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/SyncCommand.java)
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/sync/Item.java?p2=incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/sync/Item.java&p1=incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/SyncCommand.java&r1=1332302&r2=1332556&rev=1332556&view=diff
==============================================================================
---
incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/SyncCommand.java
(original)
+++
incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/sync/Item.java
Tue May 1 07:51:59 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package npanday.plugin.msdeploy;
+package npanday.plugin.msdeploy.sync;
import com.google.common.base.Joiner;
import com.google.common.collect.Lists;
@@ -30,7 +30,7 @@ import java.util.List;
/**
* @author <a href="mailto:[email protected]";>Lars Corneliussen</a>
*/
-public class SyncCommand
+public class Item
{
private Artifact artifact;
@@ -44,9 +44,9 @@ public class SyncCommand
private SyncEvent preSync, postSync;
- private SyncDestination destination;
+ private Destination destination;
- public void contextualize( Artifact artifact, SyncDestination destination
) throws MojoFailureException
+ public void contextualize( Artifact artifact, Destination destination )
throws MojoFailureException
{
this.artifact = artifact;
@@ -72,7 +72,7 @@ public class SyncCommand
@Override
public String toString()
{
- return "SyncCommand{" + "packageSource=" + groupId + ":" + artifactId
+ ":" + version + ", packageTarget="
+ return "Item{" + "packageSource=" + groupId + ":" + artifactId + ":" +
version + ", packageTarget="
+ getDestinationArgument() + '}';
}
@@ -182,12 +182,12 @@ public class SyncCommand
this.postSync = postSync;
}
- public SyncDestination getDestination()
+ public Destination getDestination()
{
return destination;
}
- public void setDestination( SyncDestination destination )
+ public void setDestination( Destination destination )
{
this.destination = destination;
}
Propchange:
incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/sync/Item.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/sync/SyncEvent.java
(from r1332302,
incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/SyncEvent.java)
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/sync/SyncEvent.java?p2=incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/sync/SyncEvent.java&p1=incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/SyncEvent.java&r1=1332302&r2=1332556&rev=1332556&view=diff
==============================================================================
---
incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/SyncEvent.java
(original)
+++
incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/sync/SyncEvent.java
Tue May 1 07:51:59 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package npanday.plugin.msdeploy;
+package npanday.plugin.msdeploy.sync;
import com.google.common.base.Joiner;
import com.google.common.collect.Lists;
Copied:
incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/sync/SyncMojo.java
(from r1332302,
incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/SyncMojo.java)
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/sync/SyncMojo.java?p2=incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/sync/SyncMojo.java&p1=incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/SyncMojo.java&r1=1332302&r2=1332556&rev=1332556&view=diff
==============================================================================
---
incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/SyncMojo.java
(original)
+++
incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/sync/SyncMojo.java
Tue May 1 07:51:59 2012
@@ -17,13 +17,14 @@
* under the License.
*/
-package npanday.plugin.msdeploy;
+package npanday.plugin.msdeploy.sync;
import com.google.common.base.Strings;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import npanday.ArtifactType;
import npanday.LocalRepositoryUtil;
+import npanday.plugin.msdeploy.AbstractMsDeployMojo;
import npanday.resolver.NPandayArtifactResolver;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
@@ -42,7 +43,6 @@ import org.codehaus.plexus.context.Conte
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
import org.sonatype.plexus.components.sec.dispatcher.SecDispatcher;
-import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.List;
import java.util.Set;
@@ -55,7 +55,7 @@ import java.util.Set;
* @goal sync
*/
public class SyncMojo
- extends AbstractMsDeployMojo<SyncCommand>
+ extends AbstractMsDeployMojo<Item>
implements Contextualizable
{
/**
@@ -71,12 +71,12 @@ public class SyncMojo
/**
* @parameter
*/
- List<SyncCommand> items;
+ List<Item> items;
/**
* @parameter
*/
- SyncDestination destination;
+ Destination destination;
/**
* @parameter default-value="${settings}"
@@ -114,25 +114,25 @@ public class SyncMojo
}
@Override
- protected void afterCommandExecution( SyncCommand iterationItem ) throws
MojoExecutionException
+ protected void afterCommandExecution( Item iterationItem ) throws
MojoExecutionException
{
}
@Override
- protected void beforeCommandExecution( SyncCommand iterationItem )
+ protected void beforeCommandExecution( Item iterationItem )
{
}
@Override
- protected List<SyncCommand> prepareIterationItems() throws
MojoFailureException, MojoExecutionException
+ protected List<Item> prepareIterationItems() throws MojoFailureException,
MojoExecutionException
{
Set<Artifact> artifacts = Sets.newHashSet();
setCredentials( destination );
- for ( SyncCommand item : items )
+ for ( Item item : items )
{
Artifact artifact = artifactFactory.createDependencyArtifact(
item.getGroupId(), item.getArtifactId(),
VersionRange.createFromVersion( item.getVersion() ),
@@ -163,7 +163,7 @@ public class SyncMojo
return items;
}
- private void setCredentials( SyncDestination destination ) throws
MojoExecutionException
+ private void setCredentials( Destination destination ) throws
MojoExecutionException
{
if (destination == null)
return;
@@ -197,7 +197,7 @@ public class SyncMojo
}
@Override
- protected List<String> getCommands( SyncCommand item ) throws
MojoExecutionException, MojoFailureException
+ protected List<String> getCommands( Item item ) throws
MojoExecutionException, MojoFailureException
{
List<String> commands = Lists.newArrayList();
Propchange:
incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/sync/SyncMojo.java
------------------------------------------------------------------------------
svn:eol-style = native
