You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by tu...@apache.org on 2012/06/07 01:01:48 UTC

svn commit: r1347196 - in /incubator/oozie/branches/ap-pages: pom.xml src/site/apt/Credits.apt.vm src/site/apt/HowToRelease.apt.vm src/site/docs.html src/site/root.html

Author: tucu
Date: Wed Jun  6 23:01:47 2012
New Revision: 1347196

URL: http://svn.apache.org/viewvc?rev=1347196&view=rev
Log:
Updating howto contrib/release and doc links for 3.2.0-incubating release, take two

Removed:
    incubator/oozie/branches/ap-pages/src/site/docs.html
    incubator/oozie/branches/ap-pages/src/site/root.html
Modified:
    incubator/oozie/branches/ap-pages/pom.xml
    incubator/oozie/branches/ap-pages/src/site/apt/Credits.apt.vm
    incubator/oozie/branches/ap-pages/src/site/apt/HowToRelease.apt.vm

Modified: incubator/oozie/branches/ap-pages/pom.xml
URL: http://svn.apache.org/viewvc/incubator/oozie/branches/ap-pages/pom.xml?rev=1347196&r1=1347195&r2=1347196&view=diff
==============================================================================
--- incubator/oozie/branches/ap-pages/pom.xml (original)
+++ incubator/oozie/branches/ap-pages/pom.xml Wed Jun  6 23:01:47 2012
@@ -13,84 +13,84 @@
  limitations under the License. See accompanying LICENSE file.
 -->
 <project>
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.oozie</groupId>
-    <artifactId>oozie-site</artifactId>
-    <version>3.1.0-SNAPSHOT</version>
-    <packaging>jar</packaging>
-
-    <name>Apache Oozie Site</name>
-    <description>Apache Oozie Site</description>
-
-    <licenses>
-        <license>
-            <name>The Apache Software License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-        </license>
-    </licenses>
-
-    <organization>
-        <name>Apache Software Foundation</name>
-        <url>http://www.apache.org</url>
-    </organization>
-
-    <properties>
-        <maven.build.timestamp.format>yyyyMMdd</maven.build.timestamp.format>
-    </properties>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-site-plugin</artifactId>
-                <version>3.0</version>
-                <configuration>
-                    <generateReports>false</generateReports>
-                </configuration>
-            </plugin>
-            <plugin>
-		<groupId>org.apache.maven.plugins</groupId>
-		<artifactId>maven-site-plugin</artifactId>
-		<version>2.0.1</version>
-		<configuration>
-			<outputDirectory>${project.build.directory}/pre-site</outputDirectory>
-		</configuration>
-		</plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.6</version>
-                <executions>
-                <execution>
-                    <id>site</id>
-                    <phase>site</phase>
-                    <goals>
-                    <goal>run</goal>
-                </goals>
-                <configuration>
-                <target>
-				<copy todir="${project.build.directory}/site">
-					<fileset dir="${project.build.directory}/pre-site">
-						<exclude name="**/*.html"/>
-					</fileset>
-				</copy>
-				<copy todir="${project.build.directory}/site">
-					<fileset dir="${project.build.directory}/pre-site">
-						<include name="**/*.html"/>
-					</fileset>
-				<filterchain>
-					<tokenfilter>
-					<replaceregex pattern="\$\.\{" replace="${"
-		flags="g"/>
-					</tokenfilter>
-				</filterchain>
-				</copy>
-			</target>
-			</configuration>
-		</execution>
-	       </executions>
-	   </plugin>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.oozie</groupId>
+  <artifactId>oozie-site</artifactId>
+  <version>3.1.0-SNAPSHOT</version>
+  <packaging>jar</packaging>
+
+  <name>Apache Oozie Site</name>
+  <description>Apache Oozie Site</description>
+
+  <licenses>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+    </license>
+  </licenses>
+
+  <organization>
+    <name>Apache Software Foundation</name>
+    <url>http://www.apache.org</url>
+  </organization>
+
+  <properties>
+    <maven.build.timestamp.format>yyyyMMdd</maven.build.timestamp.format>
+  </properties>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-site-plugin</artifactId>
+        <version>3.0</version>
+        <configuration>
+          <generateReports>false</generateReports>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-site-plugin</artifactId>
+        <version>2.0.1</version>
+        <configuration>
+          <outputDirectory>${project.build.directory}/pre-site</outputDirectory>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <version>1.6</version>
+        <executions>
+          <execution>
+            <id>site</id>
+            <phase>site</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <target>
+                <copy todir="${project.build.directory}/site">
+                  <fileset dir="${project.build.directory}/pre-site">
+                    <exclude name="**/*.html"/>
+                  </fileset>
+                </copy>
+                <copy todir="${project.build.directory}/site">
+                  <fileset dir="${project.build.directory}/pre-site">
+                    <include name="**/*.html"/>
+                  </fileset>
+                  <filterchain>
+                    <tokenfilter>
+                      <replaceregex pattern="\$\.\{" replace="${"
+                                    flags="g"/>
+                    </tokenfilter>
+                  </filterchain>
+                </copy>
+              </target>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
 
-        </plugins>
-    </build>
+    </plugins>
+  </build>
 </project>

Modified: incubator/oozie/branches/ap-pages/src/site/apt/Credits.apt.vm
URL: http://svn.apache.org/viewvc/incubator/oozie/branches/ap-pages/src/site/apt/Credits.apt.vm?rev=1347196&r1=1347195&r2=1347196&view=diff
==============================================================================
--- incubator/oozie/branches/ap-pages/src/site/apt/Credits.apt.vm (original)
+++ incubator/oozie/branches/ap-pages/src/site/apt/Credits.apt.vm Wed Jun  6 23:01:47 2012
@@ -53,6 +53,6 @@ Apache Oozie(TM) Credits
 *----------------------+-----------------------+----------------------------------------------------------------------+
 |Alan Gates            |gates                  |Hortonworks Inc.                                                      |
 *----------------------+-----------------------+----------------------------------------------------------------------+
-|Christopher Douglas   |cdouglas               |-                                                                     |
+|Christopher Douglas   |cdouglas               |Microsoft Corporation                                                 |
 *----------------------+-----------------------+----------------------------------------------------------------------+
 

Modified: incubator/oozie/branches/ap-pages/src/site/apt/HowToRelease.apt.vm
URL: http://svn.apache.org/viewvc/incubator/oozie/branches/ap-pages/src/site/apt/HowToRelease.apt.vm?rev=1347196&r1=1347195&r2=1347196&view=diff
==============================================================================
--- incubator/oozie/branches/ap-pages/src/site/apt/HowToRelease.apt.vm (original)
+++ incubator/oozie/branches/ap-pages/src/site/apt/HowToRelease.apt.vm Wed Jun  6 23:01:47 2012
@@ -256,12 +256,29 @@ https://svn.apache.org/repos/asf/incubat
 
    [[1]] Wait 24 hours for release to propagate to mirrors.
 
-   [[1]] Edit the website. Details: TBD
+   [[1]] Update the website.
+
+     [[A]] Do any necessary site updates in the <<<branches/ap-pages>>> branch
+     (don't miss the doc links in the <<<site.xml>>> file).
+
+     [[A]] Generate the new site pages <<<mvn site>>>.
+
+     [[A]] After verifying the new site is correct, commit the changes to
+     <<<branches/ap-pages>>>.
+
+     [[A]] Checkout the site:
 
 -----------------------------------------------------------------------------
         svn co https://svn.apache.org/repos/asf/incubator/oozie/site
 -----------------------------------------------------------------------------
 
+     [[A]] Go to the <<<site/publish/>>> directory and delete all files and
+     directories but the <<<docs/>>> directory.
+
+     [[A]] Copy the <<<brances/ap-pages/target/site/>>> files and directories.
+
+     [[A]] Commit the changes.
+
    [[1]] Wait until you see your changes reflected on the Apache web site.
 
    [[1]] Send announcements to the user and developer lists as well as