Author: olamy
Date: Thu Dec 6 21:44:10 2012
New Revision: 1418095
URL: http://svn.apache.org/viewvc?rev=1418095&view=rev
Log:
[MTOMCAT-99] Make redeploy goal consistent with deploy goals
fix tomcat6 part
Added:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RedeployOnlyMojo.java
- copied, changed from r1418091,
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RedeployMojo.java
Modified:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RedeployMojo.java
Modified:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RedeployMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RedeployMojo.java?rev=1418095&r1=1418094&r2=1418095&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RedeployMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RedeployMojo.java
Thu Dec 6 21:44:10 2012
@@ -19,6 +19,8 @@ package org.apache.tomcat.maven.plugin.t
* under the License.
*/
+import org.apache.maven.plugins.annotations.Execute;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
/**
@@ -28,6 +30,7 @@ import org.apache.maven.plugins.annotati
* @todo depend on war:war, war:exploded or war:inplace when MNG-1649 resolved
*/
@Mojo( name = "redeploy" )
+@Execute( phase = LifecyclePhase.PACKAGE )
public class RedeployMojo
extends DeployMojo
{
Copied:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RedeployOnlyMojo.java
(from r1418091,
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RedeployMojo.java)
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RedeployOnlyMojo.java?p2=tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RedeployOnlyMojo.java&p1=tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RedeployMojo.java&r1=1418091&r2=1418095&rev=1418095&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RedeployMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RedeployOnlyMojo.java
Thu Dec 6 21:44:10 2012
@@ -1,5 +1,4 @@
package org.apache.tomcat.maven.plugin.tomcat6;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +8,7 @@ package org.apache.tomcat.maven.plugin.t
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -19,28 +18,15 @@ package org.apache.tomcat.maven.plugin.t
* under the License.
*/
+import org.apache.maven.plugins.annotations.Execute;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
/**
- * Redeploy a WAR in Tomcat. Deploy with forcing update flag to true
- *
- * @author Mark Hobson <markhob...@gmail.com>
- * @todo depend on war:war, war:exploded or war:inplace when MNG-1649 resolved
+ * @since 2.1
*/
-@Mojo( name = "redeploy" )
-public class RedeployMojo
- extends DeployMojo
+@Mojo( name = "redeploy-only" )
+public class RedeployOnlyMojo
{
- // ----------------------------------------------------------------------
- // Protected Methods
- // ----------------------------------------------------------------------
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected boolean isUpdate()
- {
- return true;
- }
+ // no-op : only mojo metadata overriding
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
