You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2012/03/14 23:04:27 UTC
svn commit: r1300752 - in
/maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src:
it/002-perform/ it/003-lifecycle/
main/java/org/apache/maven/plugins/scmpublish/
main/resources/META-INF/plexus/ site/apt/
Author: hboutemy
Date: Wed Mar 14 22:04:26 2012
New Revision: 1300752
URL: http://svn.apache.org/viewvc?rev=1300752&view=rev
Log:
renamed classes and expressions
Added:
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java (contents, props changed)
- copied, changed from r1300746, maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/AbstractSvnpubsubMojo.java
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishInventory.java (contents, props changed)
- copied, changed from r1300746, maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/SvnpubsubInventory.java
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishInventoryMojo.java (contents, props changed)
- copied, changed from r1300746, maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/SvnpubsubInventoryMojo.java
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishLifecycleMojo.java (contents, props changed)
- copied, changed from r1300746, maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/SvnpubsubLifecycleMojo.java
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishMojo.java (contents, props changed)
- copied, changed from r1300746, maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/SvnpubsubPublishMojo.java
Removed:
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/AbstractSvnpubsubMojo.java
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/SvnpubsubInventory.java
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/SvnpubsubInventoryMojo.java
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/SvnpubsubLifecycleMojo.java
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/SvnpubsubPublishMojo.java
Modified:
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/it/002-perform/pom.xml
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/it/003-lifecycle/pom.xml
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/resources/META-INF/plexus/components.xml
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/site/apt/usage.apt.vm
Modified: maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/it/002-perform/pom.xml
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/it/002-perform/pom.xml?rev=1300752&r1=1300751&r2=1300752&view=diff
==============================================================================
--- maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/it/002-perform/pom.xml (original)
+++ maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/it/002-perform/pom.xml Wed Mar 14 22:04:26 2012
@@ -42,7 +42,7 @@
<artifactId>maven-site-plugin</artifactId>
<version>3.0</version>
<configuration>
- <stagingDirectory>target/svnpubsub-checkout</stagingDirectory>
+ <stagingDirectory>target/scmpublish-checkout</stagingDirectory>
</configuration>
</plugin>
</plugins>
Modified: maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/it/003-lifecycle/pom.xml
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/it/003-lifecycle/pom.xml?rev=1300752&r1=1300751&r2=1300752&view=diff
==============================================================================
--- maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/it/003-lifecycle/pom.xml (original)
+++ maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/it/003-lifecycle/pom.xml Wed Mar 14 22:04:26 2012
@@ -42,7 +42,7 @@
<artifactId>maven-site-plugin</artifactId>
<version>3.0</version>
<configuration>
- <stagingDirectory>target/svnpubsub-checkout</stagingDirectory>
+ <stagingDirectory>target/scmpublish-checkout</stagingDirectory>
</configuration>
</plugin>
</plugins>
Copied: maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java (from r1300746, maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/AbstractSvnpubsubMojo.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java?p2=maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java&p1=maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/AbstractSvnpubsubMojo.java&r1=1300746&r2=1300752&rev=1300752&view=diff
==============================================================================
--- maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/AbstractSvnpubsubMojo.java (original)
+++ maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java Wed Mar 14 22:04:26 2012
@@ -51,24 +51,24 @@ import org.codehaus.jackson.JsonProcessi
import org.codehaus.jackson.map.MappingJsonFactory;
/**
- * Base class for the svnpubsub mojos.
+ * Base class for the site-scm-publish mojos.
*/
-public abstract class AbstractSvnpubsubMojo
+public abstract class AbstractScmPublishMojo
extends AbstractMojo
{
/**
* Location of the inventory file.
*
- * @parameter expression="${svnpubsub.inventoryFile}"
- * default-value="${project.build.directory}/svnpubsub-inventory.js"
+ * @parameter expression="${scmpublish.inventoryFile}"
+ * default-value="${project.build.directory}/scmpublish-inventory.js"
*/
protected File inventoryFile;
/**
* Location of the svn publication tree.
*
- * @parameter expression="${svnpubsub.pubScmUrl}"
+ * @parameter expression="${scmpublish.pubScmUrl}"
* @required
*/
protected String pubScmUrl;
@@ -76,8 +76,8 @@ public abstract class AbstractSvnpubsubM
/**
* Location of the svn publication tree.
*
- * @parameter expression="${svnpubsub.checkoutDirectory}"
- * default-value="${project.build.directory}/svnpubsub-checkout"
+ * @parameter expression="${scmpublish.checkoutDirectory}"
+ * default-value="${project.build.directory}/scmpublish-checkout"
*/
protected File checkoutDirectory;
@@ -204,7 +204,7 @@ public abstract class AbstractSvnpubsubM
}
- protected AbstractSvnpubsubMojo()
+ protected AbstractScmPublishMojo()
{
super();
}
@@ -232,7 +232,7 @@ public abstract class AbstractSvnpubsubM
inventory = new ArrayList<File>();
inventory.addAll( FileUtils.listFiles( checkoutDirectory, new DotFilter(), new DotFilter() ) );
Collections.sort( inventory );
- SvnpubsubInventory initialInventory = new SvnpubsubInventory();
+ ScmPublishInventory initialInventory = new ScmPublishInventory();
Set<String> paths = new HashSet<String>();
/*
@@ -271,7 +271,7 @@ public abstract class AbstractSvnpubsubM
{
MappingJsonFactory factory = new MappingJsonFactory();
JsonParser parser = factory.createJsonParser( inventoryFile );
- SvnpubsubInventory storedInventory = parser.readValueAs( SvnpubsubInventory.class );
+ ScmPublishInventory storedInventory = parser.readValueAs( ScmPublishInventory.class );
inventory = new ArrayList<File>();
for ( String p : storedInventory.getPaths() )
{
Propchange: maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishInventory.java (from r1300746, maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/SvnpubsubInventory.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishInventory.java?p2=maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishInventory.java&p1=maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/SvnpubsubInventory.java&r1=1300746&r2=1300752&rev=1300752&view=diff
==============================================================================
--- maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/SvnpubsubInventory.java (original)
+++ maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishInventory.java Wed Mar 14 22:04:26 2012
@@ -26,11 +26,11 @@ import java.util.Set;
* A class designed for json serialization to store the existing inventory, if any. In this version, there's no attempt
* to account for directories as managed items.
*/
-public class SvnpubsubInventory
+public class ScmPublishInventory
{
private Set<String> paths;
- public SvnpubsubInventory()
+ public ScmPublishInventory()
{
paths = new HashSet<String>();
}
Propchange: maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishInventory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishInventory.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishInventoryMojo.java (from r1300746, maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/SvnpubsubInventoryMojo.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishInventoryMojo.java?p2=maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishInventoryMojo.java&p1=maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/SvnpubsubInventoryMojo.java&r1=1300746&r2=1300752&rev=1300752&view=diff
==============================================================================
--- maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/SvnpubsubInventoryMojo.java (original)
+++ maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishInventoryMojo.java Wed Mar 14 22:04:26 2012
@@ -39,7 +39,7 @@ import org.codehaus.plexus.util.StringUt
/**
* Prepare a directory for version-managed site generation. This checks out the specified directory from the SCM and
* then takes inventory of all the resulting files. This inventory then allows the 'checkin' target to tee up deletions
- * as well as modifications and additions. There's an assumption here that an entire directory in svn is dedicated to
+ * as well as modifications and additions. There's an assumption here that an entire directory in SCM is dedicated to
* the publication process for this project. In the aggregate case, this is going to take some doing.
*
* If we allow this to be non-aggregate, then each module has to configure pathnames, which would be a pain. So
@@ -54,8 +54,8 @@ import org.codehaus.plexus.util.StringUt
* @phase pre-site
* @aggregate
*/
-public class SvnpubsubInventoryMojo
- extends AbstractSvnpubsubMojo
+public class ScmPublishInventoryMojo
+ extends AbstractScmPublishMojo
{
private void checkoutExisting()
throws ReleaseExecutionException, ReleaseFailureException
Propchange: maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishInventoryMojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishInventoryMojo.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishLifecycleMojo.java (from r1300746, maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/SvnpubsubLifecycleMojo.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishLifecycleMojo.java?p2=maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishLifecycleMojo.java&p1=maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/SvnpubsubLifecycleMojo.java&r1=1300746&r2=1300752&rev=1300752&view=diff
==============================================================================
--- maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/SvnpubsubLifecycleMojo.java (original)
+++ maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishLifecycleMojo.java Wed Mar 14 22:04:26 2012
@@ -28,8 +28,8 @@ import org.apache.maven.plugin.MojoFailu
* @execute lifecycle="svnpubsub" phase="svnpubsub-publish"
* @aggregate
*/
-public class SvnpubsubLifecycleMojo
- extends AbstractSvnpubsubMojo
+public class ScmPublishLifecycleMojo
+ extends AbstractScmPublishMojo
{
public void execute()
Propchange: maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishLifecycleMojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishLifecycleMojo.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishMojo.java (from r1300746, maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/SvnpubsubPublishMojo.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishMojo.java?p2=maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishMojo.java&p1=maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/SvnpubsubPublishMojo.java&r1=1300746&r2=1300752&rev=1300752&view=diff
==============================================================================
--- maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/SvnpubsubPublishMojo.java (original)
+++ maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishMojo.java Wed Mar 14 22:04:26 2012
@@ -53,27 +53,27 @@ import org.apache.maven.shared.release.s
* @phase post-site
* @aggregate
*/
-public class SvnpubsubPublishMojo
- extends AbstractSvnpubsubMojo
+public class ScmPublishPublishMojo
+ extends AbstractScmPublishMojo
{
/**
* Display list of added, deleted, and changed files, but do not do any actual SCM operations.
*
- * @parameter expression="${svnpubsub.dryRun}"
+ * @parameter expression="${scmpublish.dryRun}"
*/
private boolean dryRun;
/**
* Run add and delete commands, but leave the actually checkin for the user to run manually.
*
- * @parameter expression="${svnpubsub.skipCheckin}"
+ * @parameter expression="${scmpublish.skipCheckin}"
*/
private boolean skipCheckin;
/**
* SCM log/checkin comment for this publication.
- * @parameter expression="${svnpubsub.checkinComment}"
+ * @parameter expression="${scmpublish.checkinComment}"
*/
private String checkinComment;
Propchange: maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishMojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishMojo.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/resources/META-INF/plexus/components.xml?rev=1300752&r1=1300751&r2=1300752&view=diff
==============================================================================
--- maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/resources/META-INF/plexus/components.xml Wed Mar 14 22:04:26 2012
@@ -20,8 +20,8 @@
</implementation>
<configuration>
<phases>
- <svnpubsub-prepare>
- org.apache.maven.plugins: maven-site-scm-publish-plugin:1.0-SNAPSHOT:prepare
+ <svnpubsub-prepare>
+ org.apache.maven.plugins:maven-site-scm-publish-plugin:1.0-SNAPSHOT:prepare
</svnpubsub-prepare>
<svnpubsub-site>
org.apache.maven.plugins:maven-site-plugin:3.0:site
@@ -30,7 +30,7 @@
org.apache.maven.plugins:maven-site-plugin:3.0:stage
</svnpubsub-post-site>
<svnpubsub-publish>
- org.apache.maven.plugins: maven-site-scm-publish-plugin:1.0-SNAPSHOT:prepare
+ org.apache.maven.plugins:maven-site-scm-publish-plugin:1.0-SNAPSHOT:prepare
</svnpubsub-publish>
</phases>
</configuration>
@@ -49,7 +49,7 @@
</phases>
<default-phases>
<svnpubsub-prepare>
- org.apache.maven.plugins: maven-site-scm-publish-plugin:1.0-SNAPSHOT:prepare
+ org.apache.maven.plugins:maven-site-scm-publish-plugin:1.0-SNAPSHOT:prepare
</svnpubsub-prepare>
<svnpubsub-site>
org.apache.maven.plugins:maven-site-plugin:3.0:site
@@ -58,7 +58,7 @@
org.apache.maven.plugins:maven-site-plugin:3.0:stage
</svnpubsub-post-site>
<svnpubsub-publish>
- org.apache.maven.plugins: maven-site-scm-publish-plugin:1.0-SNAPSHOT:prepare
+ org.apache.maven.plugins:maven-site-scm-publish-plugin:1.0-SNAPSHOT:prepare
</svnpubsub-publish>
</default-phases>
</configuration>
Modified: maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/site/apt/usage.apt.vm
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/site/apt/usage.apt.vm?rev=1300752&r1=1300751&r2=1300752&view=diff
==============================================================================
--- maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/site/apt/usage.apt.vm (original)
+++ maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/site/apt/usage.apt.vm Wed Mar 14 22:04:26 2012
@@ -71,7 +71,7 @@ Usage
<artifactId>maven-site-plugin</artifactId>
<version>3.0</version>
<configuration>
- <stagingDirectory>target/svnpubsub-checkout</stagingDirectory>
+ <stagingDirectory>target/scmpublish-checkout</stagingDirectory>
</configuration>
</plugin>
<plugin>
@@ -104,7 +104,7 @@ Usage
<artifactId>maven-site-plugin</artifactId>
<version>3.0</version>
<configuration>
- <stagingDirectory>target/svnpubsub-checkout</stagingDirectory>
+ <stagingDirectory>target/scmpublish-checkout</stagingDirectory>
</configuration>
</plugin>
</plugins>