Author: hboutemy
Date: Wed Mar 14 22:16:27 2012
New Revision: 1300763
URL: http://svn.apache.org/viewvc?rev=1300763&view=rev
Log:
renamed lifecycle and phases
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/main/java/org/apache/maven/plugins/scmpublish/ScmPublishLifecycleMojo.java
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/resources/META-INF/maven/lifecycle.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/index.apt
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=1300763&r1=1300762&r2=1300763&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:16:27 2012
@@ -74,7 +74,9 @@
<execution>
<id>perform</id>
<phase>post-site</phase>
- <goals><goal>publish</goal></goals>
+ <goals>
+ <goal>publish</goal>
+ </goals>
<configuration>
<dryRun>true</dryRun>
</configuration>
Modified:
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishLifecycleMojo.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?rev=1300763&r1=1300762&r2=1300763&view=diff
==============================================================================
---
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishLifecycleMojo.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:16:27 2012
@@ -24,8 +24,8 @@ import org.apache.maven.plugin.MojoFailu
/**
*
- * @goal svnpubsub
- * @execute lifecycle="svnpubsub" phase="svnpubsub-publish"
+ * @goal scmpublish
+ * @execute lifecycle="scmpublish" phase="scmpublish-publish"
* @aggregate
*/
public class ScmPublishLifecycleMojo
Modified:
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/resources/META-INF/maven/lifecycle.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/resources/META-INF/maven/lifecycle.xml?rev=1300763&r1=1300762&r2=1300763&view=diff
==============================================================================
---
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/resources/META-INF/maven/lifecycle.xml
(original)
+++
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/resources/META-INF/maven/lifecycle.xml
Wed Mar 14 22:16:27 2012
@@ -1,33 +1,41 @@
<?xml version='1.0'?>
- <!--
- Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE
- file distributed with this work for additional information regarding
copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the "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 Unless required by
- applicable law or agreed to in writing, software distributed under the
License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language
- governing permissions and limitations under the License.
- -->
-<lifecycles>
- <lifecycle>
- <id>svnpubsub</id>
- <phases>
- <phase>
- <id>svnpubsub-prepare</id>
- </phase>
- <phase>
- <id>svnpubsub-pre-site</id>
- </phase>
- <phase>
- <id>svnpubsub-site</id>
- </phase>
- <phase>
- <id>svnpubsub-post-site</id>
- </phase>
- <phase>
- <id>svnpubsub-publish</id>
- </phase>
- </phases>
- </lifecycle>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "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
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<lifecycles>
+ <lifecycle>
+ <id>scmpublish</id>
+ <phases>
+ <phase>
+ <id>scmpublish-prepare</id>
+ </phase>
+ <phase>
+ <id>scmpublish-pre-site</id>
+ </phase>
+ <phase>
+ <id>scmpublish-site</id>
+ </phase>
+ <phase>
+ <id>scmpublish-post-site</id>
+ </phase>
+ <phase>
+ <id>scmpublish-publish</id>
+ </phase>
+ </phases>
+ </lifecycle>
</lifecycles>
\ No newline at end of file
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=1300763&r1=1300762&r2=1300763&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:16:27 2012
@@ -1,67 +1,74 @@
<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
- <!--
- Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE
- file distributed with this work for additional information regarding
copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the "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 Unless required by
- applicable law or agreed to in writing, software distributed under the
License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language
- governing permissions and limitations under the License.
- -->
+ 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
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<component-set>
- <components>
- <component>
- <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
- <role-hint>svnpubsub</role-hint>
- <implementation>
- org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping
- </implementation>
- <configuration>
- <phases>
- <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
- </svnpubsub-site>
- <svnpubsub-post-site>
- 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
- </svnpubsub-publish>
- </phases>
- </configuration>
- </component>
- <component>
- <role>org.apache.maven.lifecycle.Lifecycle</role>
- <implementation>org.apache.maven.lifecycle.Lifecycle</implementation>
- <role-hint>svnpubsub</role-hint>
- <configuration>
- <id>svnpubsub</id>
- <phases>
- <phase>svnpubsub-prepare</phase>
- <phase>svnpubsub-site</phase>
- <phase>svnpubsub-post-site</phase>
- <phase>svnpubsub-publish</phase>
- </phases>
- <default-phases>
- <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
- </svnpubsub-site>
- <svnpubsub-post-site>
- 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
- </svnpubsub-publish>
- </default-phases>
- </configuration>
- </component>
- </components>
+ <components>
+ <component>
+ <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
+ <role-hint>scmpublish</role-hint>
+ <implementation>
+ org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping
+ </implementation>
+ <configuration>
+ <phases>
+ <scmpublish-prepare>
+
org.apache.maven.plugins:maven-site-scm-publish-plugin:1.0-SNAPSHOT:prepare
+ </scmpublish-prepare>
+ <scmpublish-site>
+ org.apache.maven.plugins:maven-site-plugin:3.0:site
+ </scmpublish-site>
+ <scmpublish-post-site>
+ org.apache.maven.plugins:maven-site-plugin:3.0:stage
+ </scmpublish-post-site>
+ <scmpublish-publish>
+
org.apache.maven.plugins:maven-site-scm-publish-plugin:1.0-SNAPSHOT:prepare
+ </scmpublish-publish>
+ </phases>
+ </configuration>
+ </component>
+ <component>
+ <role>org.apache.maven.lifecycle.Lifecycle</role>
+ <implementation>org.apache.maven.lifecycle.Lifecycle</implementation>
+ <role-hint>scmpublish</role-hint>
+ <configuration>
+ <id>scmpublish</id>
+ <phases>
+ <phase>scmpublish-prepare</phase>
+ <phase>scmpublish-site</phase>
+ <phase>scmpublish-post-site</phase>
+ <phase>scmpublish-publish</phase>
+ </phases>
+ <default-phases>
+ <scmpublish-prepare>
+
org.apache.maven.plugins:maven-site-scm-publish-plugin:1.0-SNAPSHOT:prepare
+ </scmpublish-prepare>
+ <scmpublish-site>
+ org.apache.maven.plugins:maven-site-plugin:3.0:site
+ </scmpublish-site>
+ <scmpublish-post-site>
+ org.apache.maven.plugins:maven-site-plugin:3.0:stage
+ </scmpublish-post-site>
+ <scmpublish-publish>
+
org.apache.maven.plugins:maven-site-scm-publish-plugin:1.0-SNAPSHOT:prepare
+ </scmpublish-publish>
+ </default-phases>
+ </configuration>
+ </component>
+ </components>
</component-set>
Modified:
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/site/apt/index.apt
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/site/apt/index.apt?rev=1300763&r1=1300762&r2=1300763&view=diff
==============================================================================
---
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/site/apt/index.apt
(original)
+++
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/site/apt/index.apt
Wed Mar 14 22:16:27 2012
@@ -30,31 +30,30 @@ Maven Site CSM Publish Plugin
The maven-site-scm-publish-plugin is a utility plugin to allow Apache
projects to publish Maven websites via the ASF svnpubsub
- system, and more generally to publish a site generated by maven to
+ system, and more generally to publish a site generated by Maven to
any supported SCM.
The plugin provides two goals: <<prepare>> and <<publish>>.
The prepare goal checks out the contents of a directory from
- the SCM into (by default) target/svnpubsub-checkout. It
+ the SCM into (by default) <<<target/scmpublish-checkout>>>. It
then lists the files known to the SCM and stores them
- in (by default) target/svnpubsub-inventory.js. This provides
+ in (by default) <<<target/scmpublish-inventory.js>>>. This provides
the point of reference for an eventual SCM checkin.
After running the prepare goal, the POM must run site:site and
site:stage, with the <stagingDirectory> set to
- target/svnpubsub-checkout.
+ <<<target/scmpublish-checkout>>>.
Finally, the <<publish>> goal compares the output of site:stage
with the inventory from the <<prepare>> goal, and issues
appropriate SCM commands to add and delete, followed by a
checkin.
- The <svnpubsub.dryRun> parameter to the <<publish>> goal avoids all
+ The <scmpublish.dryRun> parameter to the <<publish>> goal avoids all
SCM operations, and simply logs out the added, deleted,
and changed files.
- The <<svnpubsub.skipCheckin>> parameter omits the final checkin.
- This allows you to visit target/svnpubsub-checkout, and validate
+ The <<scmpublish.skipCheckin>> parameter omits the final checkin.
+ This allows you to visit <<<target/scmpublish-checkout>>>, and validate
its contents before submitting to the SCM.
-
\ No newline at end of file
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=1300763&r1=1300762&r2=1300763&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:16:27 2012
@@ -36,18 +36,18 @@ Usage
Unfortunately, a Maven plugin can't define a top-level lifecycle
like 'site'. However, it can come close. The plugin includes the
- <svnpubsub> goal. This goal does nothing except fork a custom
- <svnpubsub> lifecycle, consisting of the following phases:
+ <scmpublish> goal. This goal does nothing except fork a custom
+ <scmpublish> lifecycle, consisting of the following phases:
- * svnpubsub-prepare
+ * scmpublish-prepare
- * svnpubsub-pre-site
+ * scmpublish-pre-site
- * svnpubsub-site
+ * scmpublish-site
- * svnpubsub-post-site
+ * scmpublish-post-site
- * svnpubsub-publish
+ * scmpublish-publish
[]
@@ -57,7 +57,7 @@ Usage
With a little configuration in your POM,
+---------+
- mvn asf-mvnpubsub-plugin:svnpubsub
+ mvn maven-site-scm-publish-plugin:publish
+---------+
will do all the work.
@@ -76,7 +76,7 @@ Usage
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>asf-svnpubsub-plugin</artifactId>
+ <artifactId>maven-site-scm-publish-plugin</artifactId>
<version>@pom.version@</version>
<extensions>true</extensions>
<configuration>
@@ -126,7 +126,7 @@ Usage
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>asf-svnpubsub-plugin</artifactId>
+ <artifactId>maven-site-scm-publish-plugin</artifactId>
<version>@pom.version@</version>
<configuration>
<pubScmUrl>scm:svn:https://svn.apache.org/repos/asf/maven/sandbox/bimargulies/site-test</pubScmUrl>
