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:07 UTC

[12/52] [abbrv] git commit: site wip

site wip


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

Branch: refs/heads/master
Commit: 0149fee9a29cd960a073a9435fb5c9d631bfd68d
Parents: ea975d3
Author: Jordan Zimmerman <jo...@jordanzimmerman.com>
Authored: Sat Mar 9 12:03:20 2013 -0800
Committer: Jordan Zimmerman <jo...@jordanzimmerman.com>
Committed: Sat Mar 9 12:03:20 2013 -0800

----------------------------------------------------------------------
 curator-client/pom.xml                     |    2 +-
 curator-client/src/site/apt/index.apt      |   27 -----------------------
 curator-client/src/site/site.xml           |   23 -------------------
 curator-examples/pom.xml                   |    2 +-
 curator-framework/pom.xml                  |    2 +-
 curator-recipes/pom.xml                    |    2 +-
 curator-test/pom.xml                       |    2 +-
 curator-x-discovery-server/pom.xml         |    4 +-
 curator-x-discovery/pom.xml                |    2 +-
 pom.xml                                    |   18 ++++++++++++++-
 src/site/resources/images/curator-logo.png |  Bin 0 -> 26387 bytes
 src/site/site.xml                          |   22 ++++++++++++------
 12 files changed, 40 insertions(+), 66 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/0149fee9/curator-client/pom.xml
----------------------------------------------------------------------
diff --git a/curator-client/pom.xml b/curator-client/pom.xml
index 6ce8799..029d4fe 100644
--- a/curator-client/pom.xml
+++ b/curator-client/pom.xml
@@ -30,7 +30,7 @@
     <artifactId>curator-client</artifactId>
     <version>2.0.0-SNAPSHOT</version>
 
-    <name>Apache Curator Client</name>
+    <name>Curator Client</name>
     <description>TBD</description>
 <!--
     <url>TBD</url>

http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/0149fee9/curator-client/src/site/apt/index.apt
----------------------------------------------------------------------
diff --git a/curator-client/src/site/apt/index.apt b/curator-client/src/site/apt/index.apt
deleted file mode 100644
index a0aabc4..0000000
--- a/curator-client/src/site/apt/index.apt
+++ /dev/null
@@ -1,27 +0,0 @@
-   ------
-   Introduction to Apache Onami Converters
-   ------
-   The Apache Onami Team
-   ------
-   2013
-
-~~
-~~ 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.
-~~
-
-Introduction

http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/0149fee9/curator-client/src/site/site.xml
----------------------------------------------------------------------
diff --git a/curator-client/src/site/site.xml b/curator-client/src/site/site.xml
deleted file mode 100644
index f04483f..0000000
--- a/curator-client/src/site/site.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!--
-  ~ 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.
-  -->
-
-<project xmlns="http://maven.apache.org/DECORATION/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/DECORATION/1.1.0 http://maven.apache.org/xsd/decoration-1.1.0.xsd" name="${project.name}">
-    <body>
-    </body>
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/0149fee9/curator-examples/pom.xml
----------------------------------------------------------------------
diff --git a/curator-examples/pom.xml b/curator-examples/pom.xml
index 10b9b57..ae84c60 100644
--- a/curator-examples/pom.xml
+++ b/curator-examples/pom.xml
@@ -30,7 +30,7 @@
     <artifactId>curator-examples</artifactId>
     <version>2.0.0-SNAPSHOT</version>
 
-    <name>Apache Curator Examples</name>
+    <name>Curator Examples</name>
     <description>TBD</description>
 <!--
     <url>TBD</url>

http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/0149fee9/curator-framework/pom.xml
----------------------------------------------------------------------
diff --git a/curator-framework/pom.xml b/curator-framework/pom.xml
index 48c99fd..d2dfbb6 100644
--- a/curator-framework/pom.xml
+++ b/curator-framework/pom.xml
@@ -30,7 +30,7 @@
     <artifactId>curator-framework</artifactId>
     <version>2.0.0-SNAPSHOT</version>
 
-    <name>Apache Curator Framework</name>
+    <name>Curator Framework</name>
     <description>TBD</description>
 <!--
     <url>TBD</url>

http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/0149fee9/curator-recipes/pom.xml
----------------------------------------------------------------------
diff --git a/curator-recipes/pom.xml b/curator-recipes/pom.xml
index 638d9b7..28fbe2a 100644
--- a/curator-recipes/pom.xml
+++ b/curator-recipes/pom.xml
@@ -30,7 +30,7 @@
     <artifactId>curator-recipes</artifactId>
     <version>2.0.0-SNAPSHOT</version>
 
-    <name>Apache Curator Recipes</name>
+    <name>Curator Recipes</name>
     <description>TBD</description>
 <!--
     <url>TBD</url>

http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/0149fee9/curator-test/pom.xml
----------------------------------------------------------------------
diff --git a/curator-test/pom.xml b/curator-test/pom.xml
index 41dc0bc..e4164a9 100644
--- a/curator-test/pom.xml
+++ b/curator-test/pom.xml
@@ -30,7 +30,7 @@
     <artifactId>curator-test</artifactId>
     <version>2.0.0-SNAPSHOT</version>
 
-    <name>Apache Curator Testing</name>
+    <name>Curator Testing</name>
     <description>TBD</description>
 <!--
     <url>TBD</url>

http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/0149fee9/curator-x-discovery-server/pom.xml
----------------------------------------------------------------------
diff --git a/curator-x-discovery-server/pom.xml b/curator-x-discovery-server/pom.xml
index aee8725..44f6e61 100644
--- a/curator-x-discovery-server/pom.xml
+++ b/curator-x-discovery-server/pom.xml
@@ -30,7 +30,7 @@
     <artifactId>curator-x-discovery-server</artifactId>
     <version>2.0.0-SNAPSHOT</version>
 
-    <name>Apache Curator Service Discovery Server</name>
+    <name>Curator Service Discovery Server</name>
     <description>TBD</description>
 <!--
     <url>TBD</url>
@@ -148,7 +148,7 @@
             <scope>test</scope>
             <exclusions>
                 <exclusion>
-                    <groupId>net.sf.scannotation</groupId>
+                    <groupId>org.scannotation</groupId>
                     <artifactId>scannotation</artifactId>
                 </exclusion>
             </exclusions>

http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/0149fee9/curator-x-discovery/pom.xml
----------------------------------------------------------------------
diff --git a/curator-x-discovery/pom.xml b/curator-x-discovery/pom.xml
index 4e217f6..f46bfb9 100644
--- a/curator-x-discovery/pom.xml
+++ b/curator-x-discovery/pom.xml
@@ -30,7 +30,7 @@
     <artifactId>curator-x-discovery</artifactId>
     <version>2.0.0-SNAPSHOT</version>
 
-    <name>Apache Curator Service Discovery</name>
+    <name>Curator Service Discovery</name>
     <description>TBD</description>
 <!--
     <url>TBD</url>

http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/0149fee9/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 71f6e85..f987f67 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,23 @@
     <version>2.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
-    <name>Curator</name>
+    <name>Apache Curator</name>
+    <description>
+        Curator n ˈkyoor͝ˌātər: a keeper or custodian of a museum or other collection – A ZooKeeper Keeper. Curator is a set of Java libraries
+        that make using Apache ZooKeeper much easier. While ZooKeeper comes bundled with a Java client, using the client is non-trivial and error prone.
+    </description>
+
+    <properties>
+        <svnUrl>https://svn.apache.org/repos/asf/incubator/onami/site/</svnUrl>
+        <checkoutDirectory>site-publish</checkoutDirectory>
+    </properties>
+
+    <distributionManagement>
+        <site>
+            <id>apache.website.svnpub</id>
+            <url>scm:svn:${svnUrl}</url>
+        </site>
+    </distributionManagement>
 
     <!--
       <parent>

http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/0149fee9/src/site/resources/images/curator-logo.png
----------------------------------------------------------------------
diff --git a/src/site/resources/images/curator-logo.png b/src/site/resources/images/curator-logo.png
new file mode 100644
index 0000000..89f0e10
Binary files /dev/null and b/src/site/resources/images/curator-logo.png differ

http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/0149fee9/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index ce781d6..74f59e3 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -18,23 +18,31 @@
   -->
 
 <project xmlns="http://maven.apache.org/DECORATION/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/DECORATION/1.1.0 http://maven.apache.org/xsd/decoration-1.1.0.xsd" name="${project.name}">
-    <publishDate position="right"/>
-    <version position="right"/>
-
     <skin>
         <groupId>org.apache.maven.skins</groupId>
         <artifactId>maven-fluido-skin</artifactId>
         <version>1.3.0</version>
     </skin>
 
-    <poweredBy>
-        <logo name="Maven" href="http://maven.apache.org/" img="http://maven.apache.org/images/logos/maven-feather.png"/>
-    </poweredBy>
+    <bannerLeft>
+        <name>Apache Curator</name>
+        <src>/images/curator-logo.png</src>
+        <href>/</href>
+    </bannerLeft>
+
+    <bannerRight>
+        <name>Apache Incubator</name>
+        <src>http://incubator.apache.org/images/apache-incubator-logo.png</src>
+        <href>http://incubator.apache.org</href>
+    </bannerRight>
+
+    <publishDate position="right"/>
+    <version position="right"/>
 
     <body>
         <footer>
             <div>
-                Apache Onami, Apache Onami Guava, Apache, the Apache feather logo, and the Apache Onami project logos are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.
+                Apache Curator, the Apache feather logo, and the Apache Curator project logos are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.
             </div>
         </footer>
     </body>