You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2013/01/15 21:47:04 UTC

svn commit: r1433631 - in /uima/site/trunk/uima-website: docs/checklist-release.html docs/release.html docs/saving-svn-resources.html xdocs/checklist-release.xml xdocs/release.xml xdocs/saving-svn-resources.xml

Author: schor
Date: Tue Jan 15 20:47:04 2013
New Revision: 1433631

URL: http://svn.apache.org/viewvc?rev=1433631&view=rev
Log:
no Jira - add a new page to web site documenting how save svn resources. Update the release and checklist-release pages to reference this page, and for the new distribution spot in SVN.

Added:
    uima/site/trunk/uima-website/docs/saving-svn-resources.html   (with props)
    uima/site/trunk/uima-website/xdocs/saving-svn-resources.xml   (with props)
Modified:
    uima/site/trunk/uima-website/docs/checklist-release.html
    uima/site/trunk/uima-website/docs/release.html
    uima/site/trunk/uima-website/xdocs/checklist-release.xml
    uima/site/trunk/uima-website/xdocs/release.xml

Modified: uima/site/trunk/uima-website/docs/checklist-release.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/checklist-release.html?rev=1433631&r1=1433630&r2=1433631&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/checklist-release.html (original)
+++ uima/site/trunk/uima-website/docs/checklist-release.html Tue Jan 15 20:47:04 2013
@@ -230,29 +230,37 @@
     depend on the release version of previous steps.  When you're done, you will have 1 or more
     "closed" staging repositories, each having a unique URL.
   </li-->
+  <li>Copy any artifacts (together with their signings) to the distribution SVN staging repo,
+  https://dist.apache.org/repos/dist/dev/uima.  For release which include eclipse-update-site
+  packagings, this should include any modifications to the update site or subsites (see
+  <a href="/eclipse-update-site.html">eclipse-update-site</a>.
+  Do this in a manner to <a href="saving-svn-resources.html">minimize SVN space</a> use, if possible.  
+  </li>
   <li>Send [VOTE] message to dev list.  List the staging repository that testers
-    will need to add to their <code>settings.xml</code> files.</li>
+    will need to add to their <code>settings.xml</code> files, and the distribution SVN repo link.</li>
   <li>Post RESULT message</li>
-  <li>Collect all the artifacts to be uploaded together with their checksums and signatures, from the 
-      staging repo.</li>
   <li>Delete any artifacts from the staging repo that aren't supposed to go to Maven Central
       (currently only the bin.tar artifacts - the bin.zip is used for building uima-as)</li>
   <li>Promote the release(s) from the staging repositories</li>
+  <li>svn move the approved artifacts in the distribution repo from the dev/uima spot to the release/uima spot.</li>
+  <li>update the UIMA website docs/d with any generated docs, in a manner to 
+  <a href="saving-svn-resources.html">minimize SVN space</a> use, if possible.
+This includes: PDFs, HTML versions of docbooks plus the index.html; all go on the
+      website under the uima.apache.org/d/ (non-SVN source) directory.  Update the index.html
+      as needed for the version.
+</li>
   <!--li>Copy released artifacts to targets: bin, src, p.a.o/www/www.apache.org/dist/uima, 
       new features / plugins from Eclipse update site target/eclipse-update-site to .../dist/uima/eclipse-update-site
       (add to what's already there).</li-->
-  <li>Copy released artifacts to targets: bin, src, p.a.o/www/www.apache.org/dist/uima. <u>TEMPORARY:</u>
-      Copy the updated composite repository from eclipse-packagings/eclipse-update-site to .../dist/uima/eclipse-update-site.</li>
+  <!-- li>Copy released artifacts to targets: bin, src, p.a.o/www/www.apache.org/dist/uima. <u>TEMPORARY:</u>
+      Copy the updated composite repository from eclipse-packagings/eclipse-update-site to .../dist/uima/eclipse-update-site.</li-->
   <li>Copy RELEASE_NOTES and issuesFixed
       from uimaj/target/checkout (where
-      the mvn release:perform was done from) to the p.a.o/ww/uima.apache.org/d/[project-version].</li>
-  <li>After .../dist is updated, update the downloads page of the web site</li>
+      the mvn release:perform was done from) to the UIMA web site in doc/d/[project-version].</li>
+  <li>Update the downloads page of the web site</li>
   <li>Update Jira version info to reflect the release status and date</li>
-  <li>Add a SVN tag for the release candidate, without the -rcXX to indicate the release.</li>
+  <li>Cleanup the SVN tag for the release candidate, removing any -rcXX, to indicate the release.</li>
   <li>After release appears on maven central, post an appropriate announce letter</li>
-  <li>Update the website: PDFs, HTML versions of docbooks plus the index.html all go on the
-      website under the uima.apache.org/d/ (non-SVN source) directory.  Update the index.html
-      as needed for the version.</li>
   <li>Add a news item for the release</li>
   <li>Add release to next Board report</li>
   <li>Celebrate :-)</li>

Modified: uima/site/trunk/uima-website/docs/release.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/release.html?rev=1433631&r1=1433630&r2=1433631&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/release.html (original)
+++ uima/site/trunk/uima-website/docs/release.html Tue Jan 15 20:47:04 2013
@@ -219,8 +219,12 @@ A previous version of this page, with th
                   Removing -SNAPSHOT dependencies
         
                 </a></li>
-          <li><a href='#PENDING new P2 Style: Stage the eclipse-update-site'>
-                  PENDING new P2 Style: Stage the eclipse-update-site
+          <li><a href='#Copying release artifacts to staging spot'>
+                  Copying release artifacts to staging spot
+        
+                </a></li>
+          <li><a href='#Stage the eclipse-update-site'>
+                  Stage the eclipse-update-site
         
                 </a></li>
           <li><a href='#Doing The Release Vote'>
@@ -253,6 +257,7 @@ A previous version of this page, with th
     The UIMA project mainly releases:
     <ul><li>The UIMA SDK</li>
       <li>UIMA-AS add-on</li>
+      <li>UIMA-CPP</li>
       <li>Individual Annotators, tooling, and other useful components (like the Simple Server)</li></ul>
     In addition, it releases some Maven build tooling components that 
     need to be in the Maven repositories to support our Maven processes.
@@ -279,7 +284,7 @@ A previous version of this page, with th
                                     <p>
 		  At the beginning of the "UIMA Release Process" there must be consensus in the developer community 
 		  about the JIRA issues that should be part of the next release and the time frame for the release. 
-		  The result of this discussion should be published in a release plan to the UIMA wiki, if it is
+		  (Optional) The result of this discussion should be published in a release plan to the UIMA wiki, if it is
       complex. 
 		  This release plan should be kept up-to-date any time so that everybody can have a look at the target dates 
 		  to calculate personal ToDos.
@@ -500,7 +505,7 @@ mvn install -Papache-release</pre>
         <li><code>mvn release:perform</code></li>
     </ul> 
     </p>
-                                                <p>Normally, everything built is uploaded to the Nexus Staging repository.  However, for the 
+                                                <p>Normally, everything built is uploaded to the Apache's Nexus Staging repository.  However, for the 
     (large) distribution objects, such as the source and binary distributions for UIMA Java SDK etc.,
     the "deploy" step is skipped.  These artifacts, instead of being "distributed" using the
     Maven central repository, are distributed using the Apache Mirroring System.</p>
@@ -619,8 +624,31 @@ mvn install -Papache-release</pre>
        
        
        
-          <a name="PENDING new P2 Style: Stage the eclipse-update-site">
-            <h2>PENDING new P2 Style: Stage the eclipse-update-site
+          <a name="Copying release artifacts to staging spot">
+            <h2>Copying release artifacts to staging spot
+                        </h2>
+          </a>
+      </td></tr>
+      <tr><td>
+        <blockquote class="subsectionBody">
+                                    <p>
+  Copy all the artifacts to be released via the Apache mirror system to their positions in the
+  distribution SVN: https://dist.apache.org/repos/dist/dev/uima spot.  
+  Use the 
+  <a href="saving-svn-resources.html">saving-svn-space</a> tricks if reasonable. Typically, for each release, we create a new directory for that, and place
+  all files pertaining to that release underneath that directory.
+  Note that any JARs, Zips, Tars, tar.gz artifacts need to be signed.
+  </p>
+                            </blockquote>
+        </td></tr>
+    </table>
+                                                      <table class="subsectionTable">
+        <tr><td>
+       
+       
+       
+          <a name="Stage the eclipse-update-site">
+            <h2>Stage the eclipse-update-site
                         </h2>
           </a>
       </td></tr>
@@ -637,7 +665,7 @@ mvn install -Papache-release</pre>
                                                 <p>
   In building that component's update site, you may need to edit/update the affected
   component's feature project(s), and the category.xml file in the update-site, before
-  building it.  For releases, run the signEclipseUpdateSite.sh (on windows - inside Cygwin)
+  building it.  For releases, run the signEclipseUpdateSite.sh (on Windows - inside Cygwin)
   to sign the Jars.  (Optional:) There's also a verifySignsEclipseUpdateSite.sh you can run to verify
   the signing was successful.
   </p>
@@ -648,16 +676,22 @@ mvn install -Papache-release</pre>
   composite site too.  
   </p>
                                                 <p>
-  The actual creation of the update site is done via copying the composite update site into
-  the staging point, followed by all the sub-sites to folders as named in the composite update
-  site.
+  The actual creation of the update site is done in several steps, following
+  the conventions to 
+  <a href="saving-svn-resources.html">save SVN resources</a>.  First, SVN copy (if needed) 
+  the existing released composite update site
+  (from https://dist.apache.org/repos/dist/release/uima/eclipse-update-site) to
+  https://dist.apache.org/repos/dist/dev/uima/eclispe-update-site (the staging spot for releases).
+  Next, check out the existing update site from the dev spot into a working directory
+  Next, update the working directory with any changes, and then check it back in (to the /dev/... spot).
+  Note that any JARs, Zips, Tars, tar.gz artifacts need to be signed.
   </p>
-                                                <p>Test the result: using the extended composite repository (as a local site) in various versions of
+                                                <p>Test the result: using the extended composite repository in various versions of
           Eclipse, and verify it installs OK.
   </p>
                                                 <p>
   If you changed the composite site, bump up the version of .../build/uima-eclipse-composite-site/pom.xml
-  and commit project changes to the trunk, and tag it (if doing a release).
+  and commit project changes to the trunk, and tag it.
   The component's individual update sites should be built and tagged as part of that project's release.
   </p>
                             </blockquote>
@@ -683,8 +717,8 @@ mvn install -Papache-release</pre>
       </p>
                                                 <p>
       The source and binary distributions are manually copied by the 
-      release manager to the release manager's people.apache.com
-      account, to make them available for review.  The Maven module artifacts
+      release manager to the Apache distribution SVN in the dev/uima spot, 
+      to make them available for review.  The Maven module artifacts
       are found in the Nexus staging repository, and are available once 
       the release manager "closes" the repository.
     </p>
@@ -692,7 +726,7 @@ mvn install -Papache-release</pre>
       After things are staged, you write a note to the dev list, asking for an approval vote.
       You need to provide the url(s) of the closed staging repository in the note so the approvers
       can find the code to check, the SVN tag corresponding to the release, and
-      if needed, the place on people.apache.org where the source and binary
+      if needed, and the place in the distribution SVN where the source and binary
       distributions being proposed are found.  
       The [VOTE] email should be based on similar previous votes, and
       include instructions to testers on how to set up their maven settings.xml file to specify
@@ -722,16 +756,14 @@ mvn install -Papache-release</pre>
         <li>Promote the release(s) from the staging repositories: 
             log on to the staging repository again, and release the staged artifacts.  
             This will make the artifacts available in the Maven Central repository.</li>
-        <li><p>Upload the release artifacts from people.apache.org to the distribution server 
-      (via copying on people.apache.org
-      to the directory: <code>/www/www.apache.org/dist/uima</code>, including the 
-      release artifacts and the Eclipse update site data 
+        <li><p>SVN move the release artifacts from the distribution SVN staging spot
+        in dev/uima to release/uima.  
       <!-- 
        (which are merged with
       the existing previous plugin releases already on the update site).  
        -->
-      (<u>TEMPORARY</u>: the updated composite repository replaces the existing one).
-      Be sure to include the asc/md5/sha1 signatures.
+      If Eclipse plugins are being released, the updated composite update site is 
+      promoted to the release/uima directory.
       Make sure the KEYS file in that uploaded directory is current (master located in 
       SVN uima/site/trunk/uima-website/docs/KEYS). Additionally it is necessary to update
       the download page of the UIMA website to make the new release artifacts available.
@@ -739,50 +771,23 @@ mvn install -Papache-release</pre>
       adding entries to the xdocs/stylesheets/project.xml page - follow the previous examples.</p>
       </li>
       <li>Things not needed to be mirrored go into our website:
-        on p.a.o, in directory www/uima.apache.org/d/
+        in the docs/d directory.
         Currently, this includes the RELEASE_NOTES (plus issuesFixed) for the release,
-        the new docbooks, and the Javadocs. 
-        <p class="note">
-        Before, things only got to our website by being added to SVN.  Apache Infrastructure has
-        set up an additional path for our project to allow large generated objects (e.g., Javadocs)
-        to bypass SVN.  This works as follows:  Anything you want on our website can be put in 
-        people.a.o in the directory www/uima.apache.org/d/, just by copying it there.  This location
-        will be rsync'd to our website once an hour, approximately.
-        </p>
-        <!-- 
-         <p>
-        Copy released artifacts to targets: bin, src, to p.a.o/www/www.apache.org/dist/uima, 
-      new features / plugins from Eclipse update site target/eclipse-update-site to .../dist/uima/eclipse-update-site
-      (add to what's already there).    
-      <ul>
-        <li>The Eclipse update site on w.a.o/dist/uima will have previous versions of the jars for the
-        features and plugins.  The generated site in 
-          <code>uimaj-eclipse-update-site/target/eclipse-update-site</code> has the new version plugin(s)
-          and feature jars.  These should be added to the w.a.o/dist/uima update site - leave the others
-          that are already there in place.  
-          Update the Eclipse site and digest as needed.
-        </li>
-      </ul>
-      </p>
-         -->
+        the new docbooks, and the Javadocs.  Arrange to update these in a way that
+        preserves SVN resources.</li>
       
-         <p>
-        Copy released artifacts to targets: bin, src, to p.a.o/www/www.apache.org/dist/uima.
-        <u>TEMPORARY</u>: Copy the updated composite repository from eclipse-packagings/eclipse-update-site to .../dist/uima/eclipse-update-site.
-        The composite repository (update site) contains also all previous update site data and can therefore replace the existing one.
-      </p>   
       <li>Copy RELEASE_NOTES and issuesFixed
       from the top level project (where
       the mvn release:perform was done from) in the directory
-      target/checkout/ ...  to the p.a.o/www/uima.apache.org/d/[project-version].</li>
-      </li>
+      target/checkout/ ...  to the the website in docs/d/[project-version].</li>
+      
       
-      <li>After the distribution directory on people.apache.org/www/www.apache.org/dist/uima is updated, 
-      update the downloads page of the web site</li>
+      <li>Update the downloads page of the web site</li>
   <li>Update Jira version info to reflect the release status and date</li>
   <li>Rename the SVN tag for the release candidate if it ends in -rcXXX, without the -rcXX to indicate the release.</li>
   <li>After release appears on maven central, post an appropriate announce letter</li>
   <li>Add release to next Board report</li>
+  <li>Celebrate!</li>
   </ol>    
 		</p>
                             </blockquote>
@@ -814,7 +819,9 @@ mvn install -Papache-release</pre>
 	    For more details please refer to <a href="http://incubator.apache.org/guides/releasemanagement.html#announcements">
 	    A Guide To Release Management During Incubation</a>.
 	  </p>
-                                                <p>Our main uima website has a "News" section that should be updated with news of the release.</p>
+                                                <p>Our main uima website has a "News" section that should be updated with news of the release.
+    There are 2 place to update: One is the index.xml file, which has a one-line summary (at the bottom) that references
+    a link within the new.xml page; and a new entry in the news.xml page itself.  Follow previous examples.</p>
                             </blockquote>
         </td></tr>
     </table>

Added: uima/site/trunk/uima-website/docs/saving-svn-resources.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/saving-svn-resources.html?rev=1433631&view=auto
==============================================================================
--- uima/site/trunk/uima-website/docs/saving-svn-resources.html (added)
+++ uima/site/trunk/uima-website/docs/saving-svn-resources.html Tue Jan 15 20:47:04 2013
@@ -0,0 +1,229 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+
+
+    <!-- ====================================================================== -->
+    <!-- GENERATED FILE, DO NOT EDIT, EDIT THE XML FILE IN xdocs INSTEAD! -->
+    <!-- ====================================================================== -->
+    <html>
+        <head>
+            <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
+            <style type="text/css">@import "stylesheets/base.css";</style>
+                                          <meta name="author" value="
+      Apache UIMA Documentation Team 
+    ">
+  <meta name="email" value="dev@uima.apache.org">
+                        
+            
+                        
+                        <title>Apache UIMA - Saving SVN Resources</title>
+        </head>
+
+        <body>
+          <div class="topLogos">        
+            <table border="0" width="100%" cellspacing="0">
+                <!-- TOP IMAGE -->
+                <tr>
+                    <td align='LEFT'>
+                      <a href="index.html">
+                                    <img style="border: 1px solid black;" src="./images/UIMA_banner2tlpTm.png" alt="UIMA project logo" border="0"/>
+                            </a>
+                    </td>
+                    <td align='CENTER'>
+                          <div class="pageBanner">Saving SVN Resources</div>
+                    </td>
+                    <td align='RIGHT'>
+                                  <a href="http://www.apache.org">
+        <img src="./images/asf-logo-on-white-smallTm.png" alt="Apache UIMA" border="0"/>
+      </a>
+                          </td>
+                </tr>
+            </table>
+            <hr noshade="" size="1"/>
+            </div>
+            <table border="0" width="100%" cellspacing="4">
+              <tr>
+                <td align='RIGHT' colspan="2">
+                  <form method="get" action="http://www.google.com/search">
+                    Search the site
+                    <input type="text"   name="q" size="25" maxlength="255" value="" />
+                    <input type="hidden" name="sitesearch" value="http://uima.apache.org/" />
+                    <input name="Search" value="Search Site" type="submit"/>
+                  </form>
+                </td>
+              </tr>
+              <tr> <!-- LEFT SIDE NAVIGATION -->
+                <td width="20%" valign="top">
+
+
+
+
+
+
+                   <!-- regular menu -->
+                      <div class="navBar">
+                  <br/>
+            <div class="navBarItem">      <div class="navPartHeading">General</div>
+                </div>
+                <div class="navBar">
+                  <div class="navBarItem">      <a href="./index.html">Home</a>
+                </div>
+                          <div class="navBarItem">      <a href="./downloads.cgi">Downloads</a>
+                </div>
+                          <div class="navBarItem">      <a href="./documentation.html">Documentation</a>
+                </div>
+                          <div class="navBarItem">      <a href="./news.html">News</a>
+                </div>
+                    <br style="line-height: .5em"/>
+                          <div class="navBarItem">      <a href="./mail-lists.html">Mailing Lists</a>
+                </div>
+                          <div class="navBarItem">      <a href="./mail-lists.html#Apache_UIMA_Forums">Forums</a>
+                    <a href="http://news.gmane.org/gmane.comp.apache.uima.general" target="_blank"><em> Users</em> <img src="images/offsitelink.png" /></a>
+                  <a href="http://news.gmane.org/gmane.comp.apache.uima.devel" target="_blank"><em>Dev</em> <img src="images/offsitelink.png" /></a>
+              </div>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
+                </div>
+                    <br style="line-height: .5em"/>
+                          <div class="navBarItem">      <a href="http://issues.apache.org/jira/browse/uima" target="_blank">Issue tracker <img src="images/offsitelink.png"/></a>
+                </div>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
+                </div>
+            </div>
+                      <br/>
+            <div class="navBarItem">      <div class="navPartHeading">Components & Tools</div>
+                </div>
+                <div class="navBar">
+                  <div class="navBarItem">      <a href="./sandbox.html#uima-addons-annotators">Annotators</a>
+                </div>
+                          <div class="navBarItem">      <a href="./toolsServers.html">Tools & Servers</a>
+                </div>
+                          <div class="navBarItem">      <a href="./sandbox.html">Addons and Sandbox</a>
+                </div>
+                          <div class="navBarItem">      <a href="./external-resources.html">External Resources</a>
+                </div>
+            </div>
+                      <br/>
+            <div class="navBarItem">      <div class="navPartHeading">Community</div>
+                </div>
+                <div class="navBar">
+                  <div class="navBarItem">      <a href="./get-involved.html">Get Involved</a>
+                </div>
+                          <div class="navBarItem">      <a href="./contribution-policy.html">Contribution Policies</a>
+                </div>
+                          <div class="navBarItem">      <a href="./faq.html">FAQ</a>
+                </div>
+                          <div class="navBarItem">      <a href="./project-guidelines.html">Project Guidelines</a>
+                </div>
+            </div>
+                      <br/>
+            <div class="navBarItem">      <div class="navPartHeading">Development</div>
+                </div>
+                <div class="navBar">
+                  <div class="navBarItem">      <a href="./dev-quick.html">Quick Start: building</a>
+                </div>
+                          <div class="navBarItem">      <a href="./building-uima.html">Building from Source</a>
+                </div>
+                          <div class="navBarItem">      <a href="./one-time-setup.html">One-time setups</a>
+                </div>
+                          <div class="navBarItem">      <a href="./svn.html">Source Code</a>
+                </div>
+                          <div class="navBarItem">      <a href="./distribution.html">Creating a Distribution</a>
+                </div>
+                          <div class="navBarItem">      <a href="./release.html">Doing a UIMA release</a>
+                </div>
+                          <div class="navBarItem">      <a href="./eclipse-update-site.html">Eclipse Update Sites</a>
+                </div>
+                          <div class="navBarItem">      <a href="./codeConventions.html">Code Conventions</a>
+                </div>
+                          <div class="navBarItem">      <a href="./uima-specification.html">UIMA Specification (OASIS)</a>
+                </div>
+                          <div class="navBarItem">      <a href="./team-list.html">Project Team</a>
+                </div>
+                          <div class="navBarItem">      <a href="./maven-design.html">Maven Use</a>
+                </div>
+                          <div class="navBarItem">      <a href="./updating-website.html">Updating this Website</a>
+                </div>
+            </div>
+                      <br/>
+            <div class="navBarItem">      <div class="navPartHeading">Events and Conferences</div>
+                </div>
+                <div class="navBar">
+                  <div class="navBarItem">      <a href="./iks09.html">IKS 2009</a>
+                </div>
+                          <div class="navBarItem">      <a href="./gscl09.html">GSCL 2009</a>
+                </div>
+                          <div class="navBarItem">      <a href="./lsm09.html">LSM 2009</a>
+                </div>
+                          <div class="navBarItem">      <a href="./lrec08.html">LREC 2008</a>
+                </div>
+                          <div class="navBarItem">      <a href="./gldv07.html">GLDV 2007</a>
+                </div>
+            </div>
+                      <br/>
+            <div class="navBarItem">      <div class="navPartHeading">ASF</div>
+                </div>
+                <div class="navBar">
+                  <div class="navBarItem">      <a href="http://www.apache.org/licenses/" target="_blank">License <img src="images/offsitelink.png"/></a>
+                </div>
+                          <div class="navBarItem">      <a href="http://www.apache.org/foundation/thanks.html" target="_blank">ASF Sponsors <img src="images/offsitelink.png"/></a>
+                </div>
+                          <div class="navBarItem">      <a href="http://www.apache.org/foundation/sponsorship.html" target="_blank">ASF Sponsorship <img src="images/offsitelink.png"/></a>
+                </div>
+                          <div class="navBarItem">      <a href="http://www.apache.org/security" target="_blank">Security <img src="images/offsitelink.png"/></a>
+                </div>
+            </div>
+        </div>
+                </td>
+                <td width="80%" align="left" valign="top">
+                                                          <div class="sectionTable">
+      <table class="sectionTable">
+        <tr><td>
+        <a name="Saving SVN Resources"><h1><img src="images/UIMA_4sq50tightCropSolid.png"/>&nbsp;Saving SVN Resources</h1></a>
+      </td></tr>
+      <tr><td>
+        <blockquote class="sectionBody">
+                                    <p>
+      Apache Infrastructure practices have websites and distributions go via SVN.
+      Whenever reasonable, please conserve SVN resources, using various approaches.
+      </p>
+                                                <ul>
+<li>Arrange to have files which don't change from release to release shared within the SVN.</li>
+<li>Arrange to have files which change minimally, and which are "text", to take advantage of 
+SVN storage of differences between versions</li>
+</ul>
+                                                <p>These two principles mean we should not just generate a new set of Javadocs, for instance,
+and then commit them as xyz-version-2.4.0/ - this would add all these files as new ones.
+Instead we need to do something like do an SVN copy (within SVN) of the previous files,
+check that out, overwrite that with changes from the new generation, and check that back in.
+This way just changed files get checked in, and of those, just changed lines do.</p>
+                                                <p>
+There is a webpage which details recommendations for how to do this: 
+<a target="_blank" href="http://www.apache.org/dev/project-site.html#generated">http://www.apache.org/dev/project-site.html#generated</a>.
+</p>
+                            </blockquote>
+        </p>
+      </td></tr>
+    </table>
+                                  </td>
+                </tr>
+                <!-- FOOTER -->
+                <tr><td colspan="2">
+                  <hr noshade="" size="1"/>
+                </td></tr>
+                <tr><td colspan="2"> 
+                  <table class="pageFooter">
+                    <tr>
+                      <td><a href="index.html">Home</a></td>
+                      <td><a href="privacy-policy.html">Privacy Policy</a></td>
+                      <td style="font-size:75%">
+                Copyright &#169; 2006-2013, The Apache Software Foundation.<br/>
+                Apache UIMA, UIMA, the Apache UIMA logo and the Apache Feather logo are trademarks of The Apache Software Foundation.<br/>
+                All other marks mentioned may be trademarks or registered trademarks of their respective owners.
+                      </td>
+                      <td><a href="mailto:dev@uima.apache.org">Contact us</a></td>
+                    </tr>
+                  </table>                    
+                </td></tr>
+            </table>
+        </body>
+    </html>
+

Propchange: uima/site/trunk/uima-website/docs/saving-svn-resources.html
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: uima/site/trunk/uima-website/xdocs/checklist-release.xml
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/xdocs/checklist-release.xml?rev=1433631&r1=1433630&r2=1433631&view=diff
==============================================================================
--- uima/site/trunk/uima-website/xdocs/checklist-release.xml (original)
+++ uima/site/trunk/uima-website/xdocs/checklist-release.xml Tue Jan 15 20:47:04 2013
@@ -79,29 +79,37 @@ under the License.
     depend on the release version of previous steps.  When you're done, you will have 1 or more
     "closed" staging repositories, each having a unique URL.
   </li-->
+  <li>Copy any artifacts (together with their signings) to the distribution SVN staging repo,
+  https://dist.apache.org/repos/dist/dev/uima.  For release which include eclipse-update-site
+  packagings, this should include any modifications to the update site or subsites (see
+  <a href="/eclipse-update-site.html">eclipse-update-site</a>.
+  Do this in a manner to <a href="saving-svn-resources.html">minimize SVN space</a> use, if possible.  
+  </li>
   <li>Send [VOTE] message to dev list.  List the staging repository that testers
-    will need to add to their <code>settings.xml</code> files.</li>
+    will need to add to their <code>settings.xml</code> files, and the distribution SVN repo link.</li>
   <li>Post RESULT message</li>
-  <li>Collect all the artifacts to be uploaded together with their checksums and signatures, from the 
-      staging repo.</li>
   <li>Delete any artifacts from the staging repo that aren't supposed to go to Maven Central
       (currently only the bin.tar artifacts - the bin.zip is used for building uima-as)</li>
   <li>Promote the release(s) from the staging repositories</li>
+  <li>svn move the approved artifacts in the distribution repo from the dev/uima spot to the release/uima spot.</li>
+  <li>update the UIMA website docs/d with any generated docs, in a manner to 
+  <a href="saving-svn-resources.html">minimize SVN space</a> use, if possible.
+This includes: PDFs, HTML versions of docbooks plus the index.html; all go on the
+      website under the uima.apache.org/d/ (non-SVN source) directory.  Update the index.html
+      as needed for the version.
+</li>
   <!--li>Copy released artifacts to targets: bin, src, p.a.o/www/www.apache.org/dist/uima, 
       new features / plugins from Eclipse update site target/eclipse-update-site to .../dist/uima/eclipse-update-site
       (add to what's already there).</li-->
-  <li>Copy released artifacts to targets: bin, src, p.a.o/www/www.apache.org/dist/uima. <u>TEMPORARY:</u>
-      Copy the updated composite repository from eclipse-packagings/eclipse-update-site to .../dist/uima/eclipse-update-site.</li>
+  <!-- li>Copy released artifacts to targets: bin, src, p.a.o/www/www.apache.org/dist/uima. <u>TEMPORARY:</u>
+      Copy the updated composite repository from eclipse-packagings/eclipse-update-site to .../dist/uima/eclipse-update-site.</li-->
   <li>Copy RELEASE_NOTES and issuesFixed
       from uimaj/target/checkout (where
-      the mvn release:perform was done from) to the p.a.o/ww/uima.apache.org/d/[project-version].</li>
-  <li>After .../dist is updated, update the downloads page of the web site</li>
+      the mvn release:perform was done from) to the UIMA web site in doc/d/[project-version].</li>
+  <li>Update the downloads page of the web site</li>
   <li>Update Jira version info to reflect the release status and date</li>
-  <li>Add a SVN tag for the release candidate, without the -rcXX to indicate the release.</li>
+  <li>Cleanup the SVN tag for the release candidate, removing any -rcXX, to indicate the release.</li>
   <li>After release appears on maven central, post an appropriate announce letter</li>
-  <li>Update the website: PDFs, HTML versions of docbooks plus the index.html all go on the
-      website under the uima.apache.org/d/ (non-SVN source) directory.  Update the index.html
-      as needed for the version.</li>
   <li>Add a news item for the release</li>
   <li>Add release to next Board report</li>
   <li>Celebrate :-)</li>

Modified: uima/site/trunk/uima-website/xdocs/release.xml
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/xdocs/release.xml?rev=1433631&r1=1433630&r2=1433631&view=diff
==============================================================================
--- uima/site/trunk/uima-website/xdocs/release.xml (original)
+++ uima/site/trunk/uima-website/xdocs/release.xml Tue Jan 15 20:47:04 2013
@@ -45,6 +45,7 @@ A previous version of this page, with th
     The UIMA project mainly releases:
     <ul><li>The UIMA SDK</li>
       <li>UIMA-AS add-on</li>
+      <li>UIMA-CPP</li>
       <li>Individual Annotators, tooling, and other useful components (like the Simple Server)</li></ul>
     In addition, it releases some Maven build tooling components that 
     need to be in the Maven repositories to support our Maven processes.
@@ -61,7 +62,7 @@ A previous version of this page, with th
 		<p>
 		  At the beginning of the "UIMA Release Process" there must be consensus in the developer community 
 		  about the JIRA issues that should be part of the next release and the time frame for the release. 
-		  The result of this discussion should be published in a release plan to the UIMA wiki, if it is
+		  (Optional) The result of this discussion should be published in a release plan to the UIMA wiki, if it is
       complex. 
 		  This release plan should be kept up-to-date any time so that everybody can have a look at the target dates 
 		  to calculate personal ToDos.
@@ -241,7 +242,7 @@ mvn install -Papache-release</pre>
     
     
     
-    <p>Normally, everything built is uploaded to the Nexus Staging repository.  However, for the 
+    <p>Normally, everything built is uploaded to the Apache's Nexus Staging repository.  However, for the 
     (large) distribution objects, such as the source and binary distributions for UIMA Java SDK etc.,
     the "deploy" step is skipped.  These artifacts, instead of being "distributed" using the
     Maven central repository, are distributed using the Apache Mirroring System.</p>
@@ -337,6 +338,17 @@ mvn install -Papache-release</pre>
     
     <p>Exception to this: -SNAPSHOT suffixes are not updated for references within plugins.</p>
   </subsection>
+  
+  <subsection name="Copying release artifacts to staging spot">
+  <p>
+  Copy all the artifacts to be released via the Apache mirror system to their positions in the
+  distribution SVN: https://dist.apache.org/repos/dist/dev/uima spot.  
+  Use the 
+  <a href="saving-svn-resources.html">saving-svn-space</a> tricks if reasonable. Typically, for each release, we create a new directory for that, and place
+  all files pertaining to that release underneath that directory.
+  Note that any JARs, Zips, Tars, tar.gz artifacts need to be signed.
+  </p>
+  </subsection>
 
   <!--  
   <subsection name="Stage the (partial) eclipse-update-site">
@@ -376,7 +388,7 @@ mvn install -Papache-release</pre>
       </ul>
   </subsection>  
   -->
-  <subsection name="PENDING new P2 Style: Stage the eclipse-update-site">
+  <subsection name="Stage the eclipse-update-site">
   <p>For a general background on how we build P2 sites, including Composite
   update sites, see <a href="eclipse-update-site.html">eclipse-update-site</a> page.
   </p>
@@ -390,7 +402,7 @@ mvn install -Papache-release</pre>
   <p>
   In building that component's update site, you may need to edit/update the affected
   component's feature project(s), and the category.xml file in the update-site, before
-  building it.  For releases, run the signEclipseUpdateSite.sh (on windows - inside Cygwin)
+  building it.  For releases, run the signEclipseUpdateSite.sh (on Windows - inside Cygwin)
   to sign the Jars.  (Optional:) There's also a verifySignsEclipseUpdateSite.sh you can run to verify
   the signing was successful.
   </p>
@@ -403,18 +415,24 @@ mvn install -Papache-release</pre>
   </p>
   
   <p>
-  The actual creation of the update site is done via copying the composite update site into
-  the staging point, followed by all the sub-sites to folders as named in the composite update
-  site.
+  The actual creation of the update site is done in several steps, following
+  the conventions to 
+  <a href="saving-svn-resources.html">save SVN resources</a>.  First, SVN copy (if needed) 
+  the existing released composite update site
+  (from https://dist.apache.org/repos/dist/release/uima/eclipse-update-site) to
+  https://dist.apache.org/repos/dist/dev/uima/eclispe-update-site (the staging spot for releases).
+  Next, check out the existing update site from the dev spot into a working directory
+  Next, update the working directory with any changes, and then check it back in (to the /dev/... spot).
+  Note that any JARs, Zips, Tars, tar.gz artifacts need to be signed.
   </p>
 
-  <p>Test the result: using the extended composite repository (as a local site) in various versions of
+  <p>Test the result: using the extended composite repository in various versions of
           Eclipse, and verify it installs OK.
   </p>  
 
   <p>
   If you changed the composite site, bump up the version of .../build/uima-eclipse-composite-site/pom.xml
-  and commit project changes to the trunk, and tag it (if doing a release).
+  and commit project changes to the trunk, and tag it.
   The component's individual update sites should be built and tagged as part of that project's release.
   </p>
 </subsection>  
@@ -428,8 +446,8 @@ mvn install -Papache-release</pre>
       </p>
       <p>
       The source and binary distributions are manually copied by the 
-      release manager to the release manager's people.apache.com
-      account, to make them available for review.  The Maven module artifacts
+      release manager to the Apache distribution SVN in the dev/uima spot, 
+      to make them available for review.  The Maven module artifacts
       are found in the Nexus staging repository, and are available once 
       the release manager "closes" the repository.
     </p>
@@ -437,7 +455,7 @@ mvn install -Papache-release</pre>
       After things are staged, you write a note to the dev list, asking for an approval vote.
       You need to provide the url(s) of the closed staging repository in the note so the approvers
       can find the code to check, the SVN tag corresponding to the release, and
-      if needed, the place on people.apache.org where the source and binary
+      if needed, and the place in the distribution SVN where the source and binary
       distributions being proposed are found.  
       The [VOTE] email should be based on similar previous votes, and
       include instructions to testers on how to set up their maven settings.xml file to specify
@@ -455,16 +473,14 @@ mvn install -Papache-release</pre>
         <li>Promote the release(s) from the staging repositories: 
             log on to the staging repository again, and release the staged artifacts.  
             This will make the artifacts available in the Maven Central repository.</li>
-        <li><p>Upload the release artifacts from people.apache.org to the distribution server 
-      (via copying on people.apache.org
-      to the directory: <code>/www/www.apache.org/dist/uima</code>, including the 
-      release artifacts and the Eclipse update site data 
+        <li><p>SVN move the release artifacts from the distribution SVN staging spot
+        in dev/uima to release/uima.  
       <!-- 
        (which are merged with
       the existing previous plugin releases already on the update site).  
        -->
-      (<u>TEMPORARY</u>: the updated composite repository replaces the existing one).
-      Be sure to include the asc/md5/sha1 signatures.
+      If Eclipse plugins are being released, the updated composite update site is 
+      promoted to the release/uima directory.
       Make sure the KEYS file in that uploaded directory is current (master located in 
       SVN uima/site/trunk/uima-website/docs/KEYS). Additionally it is necessary to update
       the download page of the UIMA website to make the new release artifacts available.
@@ -472,50 +488,23 @@ mvn install -Papache-release</pre>
       adding entries to the xdocs/stylesheets/project.xml page - follow the previous examples.</p>
       </li>
       <li>Things not needed to be mirrored go into our website:
-        on p.a.o, in directory www/uima.apache.org/d/
+        in the docs/d directory.
         Currently, this includes the RELEASE_NOTES (plus issuesFixed) for the release,
-        the new docbooks, and the Javadocs. 
-        <p class="note">
-        Before, things only got to our website by being added to SVN.  Apache Infrastructure has
-        set up an additional path for our project to allow large generated objects (e.g., Javadocs)
-        to bypass SVN.  This works as follows:  Anything you want on our website can be put in 
-        people.a.o in the directory www/uima.apache.org/d/, just by copying it there.  This location
-        will be rsync'd to our website once an hour, approximately.
-        </p>
-        <!-- 
-         <p>
-        Copy released artifacts to targets: bin, src, to p.a.o/www/www.apache.org/dist/uima, 
-      new features / plugins from Eclipse update site target/eclipse-update-site to .../dist/uima/eclipse-update-site
-      (add to what's already there).    
-      <ul>
-        <li>The Eclipse update site on w.a.o/dist/uima will have previous versions of the jars for the
-        features and plugins.  The generated site in 
-          <code>uimaj-eclipse-update-site/target/eclipse-update-site</code> has the new version plugin(s)
-          and feature jars.  These should be added to the w.a.o/dist/uima update site - leave the others
-          that are already there in place.  
-          Update the Eclipse site and digest as needed.
-        </li>
-      </ul>
-      </p>
-         -->
+        the new docbooks, and the Javadocs.  Arrange to update these in a way that
+        preserves SVN resources.</li>
       
-         <p>
-        Copy released artifacts to targets: bin, src, to p.a.o/www/www.apache.org/dist/uima.
-        <u>TEMPORARY</u>: Copy the updated composite repository from eclipse-packagings/eclipse-update-site to .../dist/uima/eclipse-update-site.
-        The composite repository (update site) contains also all previous update site data and can therefore replace the existing one.
-      </p>   
       <li>Copy RELEASE_NOTES and issuesFixed
       from the top level project (where
       the mvn release:perform was done from) in the directory
-      target/checkout/ ...  to the p.a.o/www/uima.apache.org/d/[project-version].</li>
-      </li>
+      target/checkout/ ...  to the the website in docs/d/[project-version].</li>
+      
       
-      <li>After the distribution directory on people.apache.org/www/www.apache.org/dist/uima is updated, 
-      update the downloads page of the web site</li>
+      <li>Update the downloads page of the web site</li>
   <li>Update Jira version info to reflect the release status and date</li>
   <li>Rename the SVN tag for the release candidate if it ends in -rcXXX, without the -rcXX to indicate the release.</li>
   <li>After release appears on maven central, post an appropriate announce letter</li>
   <li>Add release to next Board report</li>
+  <li>Celebrate!</li>
   </ol>    
 		</p>
     
@@ -537,7 +526,9 @@ mvn install -Papache-release</pre>
 	    For more details please refer to <a href="http://incubator.apache.org/guides/releasemanagement.html#announcements">
 	    A Guide To Release Management During Incubation</a>.
 	  </p>
-    <p>Our main uima website has a "News" section that should be updated with news of the release.</p>
+    <p>Our main uima website has a "News" section that should be updated with news of the release.
+    There are 2 place to update: One is the index.xml file, which has a one-line summary (at the bottom) that references
+    a link within the new.xml page; and a new entry in the news.xml page itself.  Follow previous examples.</p>
 	</subsection>
 
 </section>

Added: uima/site/trunk/uima-website/xdocs/saving-svn-resources.xml
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/xdocs/saving-svn-resources.xml?rev=1433631&view=auto
==============================================================================
--- uima/site/trunk/uima-website/xdocs/saving-svn-resources.xml (added)
+++ uima/site/trunk/uima-website/xdocs/saving-svn-resources.xml Tue Jan 15 20:47:04 2013
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  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.
+-->
+<document>
+
+  <properties>
+    <title>Saving SVN Resources</title>
+    <author email="dev@uima.apache.org">
+      Apache UIMA Documentation Team 
+    </author>
+  </properties>
+
+  <body>
+
+    <section name="Saving SVN Resources">
+      <p>
+      Apache Infrastructure practices have websites and distributions go via SVN.
+      Whenever reasonable, please conserve SVN resources, using various approaches.
+      </p>
+      <ul>
+<li>Arrange to have files which don't change from release to release shared within the SVN.</li>
+<li>Arrange to have files which change minimally, and which are "text", to take advantage of 
+SVN storage of differences between versions</li>
+</ul>
+<p>These two principles mean we should not just generate a new set of Javadocs, for instance,
+and then commit them as xyz-version-2.4.0/ - this would add all these files as new ones.
+Instead we need to do something like do an SVN copy (within SVN) of the previous files,
+check that out, overwrite that with changes from the new generation, and check that back in.
+This way just changed files get checked in, and of those, just changed lines do.</p>
+<p>
+There is a webpage which details recommendations for how to do this: 
+<a target="_blank"
+href="http://www.apache.org/dev/project-site.html#generated">http://www.apache.org/dev/project-site.html#generated</a>.
+</p>
+    </section>
+  </body>
+</document>
+    
\ No newline at end of file

Propchange: uima/site/trunk/uima-website/xdocs/saving-svn-resources.xml
------------------------------------------------------------------------------
    svn:eol-style = native