You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@curator.apache.org by ra...@apache.org on 2013/03/27 02:11:47 UTC

[52/52] [abbrv] git commit: Site updates

Site updates


Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/ef8c4580
Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/ef8c4580
Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/ef8c4580

Branch: refs/heads/master
Commit: ef8c4580ccd00720c6ddaf99907bc469b49b1761
Parents: e0d52ed
Author: Jordan Zimmerman <jo...@jordanzimmerman.com>
Authored: Sat Mar 23 08:19:38 2013 -0700
Committer: Jordan Zimmerman <jo...@jordanzimmerman.com>
Committed: Sat Mar 23 08:19:38 2013 -0700

----------------------------------------------------------------------
 pom.xml                                   |   34 ++++++++++++---
 src/site/confluence/committers.confluence |   53 ++++++++++++++++++++++++
 src/site/site.xml                         |    1 +
 3 files changed, 81 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/ef8c4580/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2d7e45c..220c32a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,8 +88,8 @@
 
     <distributionManagement>
         <site>
-            <id>${site-deploy-id}</id>  <!-- define this in settings.xml under profiles.profile.properties.site-deploy-id -->
-            <url>${site-deploy-url}</url>   <!-- define this in settings.xml under profiles.profile.properties.site-deploy-url -->
+            <id>apache.website.svnpub</id>
+            <url>scm:svn:https://svn.apache.org/repos/asf/incubator/curator/site/trunk</url>
         </site>
     </distributionManagement>
 
@@ -355,17 +355,16 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-site-plugin</artifactId>
                 <version>3.2</version>
+                <configuration>
+                    <locales>en</locales>
+                    <skipDeploy>true</skipDeploy>
+                </configuration>
                 <dependencies>
                     <dependency>
                         <groupId>org.apache.maven.doxia</groupId>
                         <artifactId>doxia-module-confluence</artifactId>
                         <version>1.3</version>
                     </dependency>
-                    <dependency><!-- add support for ssh/scp -->
-                        <groupId>org.apache.maven.wagon</groupId>
-                        <artifactId>wagon-ssh</artifactId>
-                        <version>1.0</version>
-                    </dependency>
                 </dependencies>
                 <executions>
                     <execution>
@@ -388,6 +387,27 @@
                     </execution>
                 </executions>
             </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-scm-publish-plugin</artifactId>
+                <version>1.0-beta-2</version>
+                <inherited>false</inherited>
+                <configuration>
+                    <checkinComment>Curator website deployment</checkinComment>
+                    <!-- define curator-website-checkout-path in settings.xml -->
+                    <checkoutDirectory>${curator-website-checkout-path}</checkoutDirectory>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>scm-publish</id>
+                        <phase>site-deploy</phase>
+                        <goals>
+                            <goal>publish-scm</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/ef8c4580/src/site/confluence/committers.confluence
----------------------------------------------------------------------
diff --git a/src/site/confluence/committers.confluence b/src/site/confluence/committers.confluence
new file mode 100644
index 0000000..5a65067
--- /dev/null
+++ b/src/site/confluence/committers.confluence
@@ -0,0 +1,53 @@
+h1. Information/Recipes for Curator Committers
+
+h2. How to Publish the Curator Website
+
+_Preparation_
+
+* Update the Maven settings file: {{~/.m2/settings.xml}}
+** Make sure your svn login is set
+** Set a chosen directory in the default profile
+* Checkout the website svn source to the chosen directory
+** {{svn co https://svn.apache.org/repos/asf/incubator/curator/site/trunk}} _chosen-dir_
+
+{noformat}
+<settings>
+    ...
+    <servers>
+        ...
+        <server>
+            <id>apache.website.svnpub</id>
+            <username>Your Apache Username</username>
+            <privateKey>${user.home}/.ssh/id_rsa</privateKey>
+        </server>
+        ...
+    </servers>
+
+    <profiles>
+        <profile>
+            <properties>
+                ...
+                <curator-website-checkout-path>path-goes-here</curator-website-checkout-path>
+                ...
+            </properties>
+            ...
+        <profile>
+        ...
+    <profiles>
+    ...
+</settings>
+{noformat}
+
+_Publishing_
+
+Assuming you have a clean compile/install of Curator, from the root of the Curator directory:
+
+{noformat}
+mvn site site:stage
+{noformat}
+
+Have a look at the staged site and make sure it's good. Then:
+
+{noformat}
+mvn site-deploy
+{noformat}

http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/ef8c4580/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index 61647d9..474ea3b 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -74,6 +74,7 @@
             <item name="History" href="history.html"/>
             <item name="Third Party Articles" href="articles.html"/>
             <item name="Third Party Contributions" href="contributions.html"/>
+            <item name="Information/Recipes for Committers" href="committers.html"/>
         </menu>
 
         <menu name="ASF" inherit="bottom">