Author: buildbot
Date: Sun Jun 9 12:37:32 2013
New Revision: 865019
Log:
Staging update by buildbot for climate
Added:
websites/staging/climate/trunk/content/development/
websites/staging/climate/trunk/content/development/edit-website.html
websites/staging/climate/trunk/content/development/license.html
websites/staging/climate/trunk/content/development/source.html
Removed:
websites/staging/climate/trunk/content/license.html
websites/staging/climate/trunk/content/source.html
Modified:
websites/staging/climate/trunk/content/ (props changed)
websites/staging/climate/trunk/content/community/get-involved.html
websites/staging/climate/trunk/content/community/mailing-lists.html
websites/staging/climate/trunk/content/community/people.html
websites/staging/climate/trunk/content/index.html
websites/staging/climate/trunk/content/sitemap.html
Propchange: websites/staging/climate/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sun Jun 9 12:37:32 2013
@@ -1 +1 @@
-1465358
+1491203
Modified: websites/staging/climate/trunk/content/community/get-involved.html
==============================================================================
--- websites/staging/climate/trunk/content/community/get-involved.html
(original)
+++ websites/staging/climate/trunk/content/community/get-involved.html Sun Jun
9 12:37:32 2013
@@ -55,14 +55,15 @@
<ul class="nav">
<li class="dropdown"> <a class="dropdown-toggle"
data-toggle="dropdown">Development<b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/source.html">Source Code</a></li>
- <li><a href="/license.html">Project
License</a></li>
+ <li><a href="/development/source.html">Source
Code</a></li>
+ <li><a href="/development/license.html">Project
License</a></li>
<li><a
href="https://issues.apache.org/jira/browse/climate">Issue Tracker</a></li>
+ <li><a href="/development/edit-website.html">Editing
Website</a></li>
</ul>
</li>
<li class="dropdown"> <a class="dropdown-toggle"
data-toggle="dropdown">Documentation<b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="https://cwiki.apache.org/CLIMATE">Climate
Wiki</a></li>
+ <li><a
href="https://cwiki.apache.org/confluence/display/CLIMATE/Home">Climate
Wiki</a></li>
</ul>
</li>
<li class="dropdown"> <a class="dropdown-toggle"
data-toggle="dropdown">Community<b class="caret"></b></a>
Modified: websites/staging/climate/trunk/content/community/mailing-lists.html
==============================================================================
--- websites/staging/climate/trunk/content/community/mailing-lists.html
(original)
+++ websites/staging/climate/trunk/content/community/mailing-lists.html Sun Jun
9 12:37:32 2013
@@ -55,14 +55,15 @@
<ul class="nav">
<li class="dropdown"> <a class="dropdown-toggle"
data-toggle="dropdown">Development<b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/source.html">Source Code</a></li>
- <li><a href="/license.html">Project
License</a></li>
+ <li><a href="/development/source.html">Source
Code</a></li>
+ <li><a href="/development/license.html">Project
License</a></li>
<li><a
href="https://issues.apache.org/jira/browse/climate">Issue Tracker</a></li>
+ <li><a href="/development/edit-website.html">Editing
Website</a></li>
</ul>
</li>
<li class="dropdown"> <a class="dropdown-toggle"
data-toggle="dropdown">Documentation<b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="https://cwiki.apache.org/CLIMATE">Climate
Wiki</a></li>
+ <li><a
href="https://cwiki.apache.org/confluence/display/CLIMATE/Home">Climate
Wiki</a></li>
</ul>
</li>
<li class="dropdown"> <a class="dropdown-toggle"
data-toggle="dropdown">Community<b class="caret"></b></a>
Modified: websites/staging/climate/trunk/content/community/people.html
==============================================================================
--- websites/staging/climate/trunk/content/community/people.html (original)
+++ websites/staging/climate/trunk/content/community/people.html Sun Jun 9
12:37:32 2013
@@ -55,14 +55,15 @@
<ul class="nav">
<li class="dropdown"> <a class="dropdown-toggle"
data-toggle="dropdown">Development<b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/source.html">Source Code</a></li>
- <li><a href="/license.html">Project
License</a></li>
+ <li><a href="/development/source.html">Source
Code</a></li>
+ <li><a href="/development/license.html">Project
License</a></li>
<li><a
href="https://issues.apache.org/jira/browse/climate">Issue Tracker</a></li>
+ <li><a href="/development/edit-website.html">Editing
Website</a></li>
</ul>
</li>
<li class="dropdown"> <a class="dropdown-toggle"
data-toggle="dropdown">Documentation<b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="https://cwiki.apache.org/CLIMATE">Climate
Wiki</a></li>
+ <li><a
href="https://cwiki.apache.org/confluence/display/CLIMATE/Home">Climate
Wiki</a></li>
</ul>
</li>
<li class="dropdown"> <a class="dropdown-toggle"
data-toggle="dropdown">Community<b class="caret"></b></a>
Added: websites/staging/climate/trunk/content/development/edit-website.html
==============================================================================
--- websites/staging/climate/trunk/content/development/edit-website.html (added)
+++ websites/staging/climate/trunk/content/development/edit-website.html Sun
Jun 9 12:37:32 2013
@@ -0,0 +1,196 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<!--
+
+ 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.
+-->
+ <link rel="stylesheet" type="text/css" media="screen"
href="/css/bootstrap.min.css">
+ <style type="text/css">
+ body {
+ padding-top: 60px;
+ padding-bottom: 40px;
+ }
+ .sidebar-nav {
+ padding: 9px 0;
+ }
+ @media (max-width: 980px) {
+ /* Enable use of floated navbar text */
+ .navbar-text.pull-right {
+ float: none;
+ padding-left: 5px;
+ padding-right: 5px;
+ }
+ }
+ </style>
+ <link rel="stylesheet" type="text/css" media="screen"
href="/css/bootstrap-responsive.min.css">
+ <title>How to edit the Climate website</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+
+<body>
+
+<div class="navbar navbar-inverse navbar-fixed-top">
+ <div class="navbar-inner">
+ <div class="container">
+ <a class="btn btn-navbar" data-toggle="collapse"
data-target=".nav-collapse">
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span> </a>
+ <a class="brand" href="/index.html"> Apache Open Climate Workbench
</a>
+ <div class="nav-collapse">
+ <ul class="nav">
+ <li class="dropdown"> <a class="dropdown-toggle"
data-toggle="dropdown">Development<b class="caret"></b></a>
+ <ul class="dropdown-menu">
+ <li><a href="/development/source.html">Source
Code</a></li>
+ <li><a href="/development/license.html">Project
License</a></li>
+ <li><a
href="https://issues.apache.org/jira/browse/climate">Issue Tracker</a></li>
+ <li><a href="/development/edit-website.html">Editing
Website</a></li>
+ </ul>
+ </li>
+ <li class="dropdown"> <a class="dropdown-toggle"
data-toggle="dropdown">Documentation<b class="caret"></b></a>
+ <ul class="dropdown-menu">
+ <li><a
href="https://cwiki.apache.org/confluence/display/CLIMATE/Home">Climate
Wiki</a></li>
+ </ul>
+ </li>
+ <li class="dropdown"> <a class="dropdown-toggle"
data-toggle="dropdown">Community<b class="caret"></b></a>
+ <ul class="dropdown-menu">
+ <li><a
href="/community/mailing-lists.html">Mailing Lists</a></li>
+ <li><a href="/community/people.html">Project
Team</a></li>
+ <li><a href="/community/get-involved.html">Get
Involved</a></li>
+ </ul>
+ </li>
+ <li class="dropdown"> <a class="dropdown-toggle"
data-toggle="dropdown">ASF <b class="caret"></b></a>
+ <ul class="dropdown-menu">
+ <li><a href="http://www.apache.org">Apache
Software Foundation</a></li>
+ <li><a
href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+ <li><a
href="http://www.apache.org/foundation/sponsorship.html">Become a
Sponsor</a></li>
+ </ul>
+ </li>
+ </ul>
+ </div> <!-- /.nav-collapse -->
+ </div><!-- /.container -->
+ </div><!-- /.navbar-inner -->
+ </div>
+
+ <div id="main" role="main" class="container">
+ <section id="content" class="row">
+ <article class="span12">
+ <p>This HowTo documentation will show the needed steps
to edit the Climate
+website. This includes creation of new pages, modification, and deletion - for
files
+and sub-directories.</p>
+<h2 id="how-it-works-in-general">How it works in general</h2>
+<p>The website is hosted in a Content Management System (CMS). You will not
edit the
+HTML pages directly. The actual edit is split up in 2 parts:</p>
+<ol>
+<li>
+<p>First you edit the content which is provided as <a
href="http://en.wikipedia.org/wiki/Markdown">Markdown text</a> (mdtext).
+ This will be committed into the staging section (see the SVN commit mail
with
+ your log message) and automatically build HTML files out of the the mdtext
files
+ (see the commit mail with "Staging update by buildbot" as log messge).
+ Before you publish youe changes in next step, you can verify the changes
on the staging site</p>
+<ul>
+<li><a
href="http://climate.staging.apache.org/">http://climate.staging.apache.org/</a>.
</li>
+</ul>
+</li>
+<li>
+<p>Second you need to publish the staging part to the production section (see
the
+ commit mail with "Publishing merge to climate site by <your Apache ID>"
+ as log message).</p>
+</li>
+</ol>
+<h2 id="what-do-you-prefer-working-via-commandline-or-in-the-browser">What do
you prefer: Working via commandline or in the browser?</h2>
+<h3 id="via-commandline">Via commandline</h3>
+<p>It is assumed that you have already checked out the code from the SVN
repository
+<a
href="https://svn.apache.org/repos/asf/incubator/climate/site/trunk/">https://svn.apache.org/repos/asf/incubator/climate/site/trunk/</a>.</p>
+<p>Edit the file via your favorite editor like vi and finally commit via
SVN:</p>
+<div class="codehilite"><pre><span class="n">vi</span> <span
class="n">myfile</span><span class="p">.</span><span class="n">mdtext</span>
+<span class="n">svn</span> <span class="n">ci</span> <span
class="o">-</span><span class="n">m</span> "<span class="n">My</span>
<span class="nb">log</span> <span class="n">message</span>" <span
class="n">myfile</span><span class="p">.</span><span class="n">mdtext</span>
+</pre></div>
+
+
+<p>Now wait a few seconds so that the entire website can be rebuilt. Then:</p>
+<div class="codehilite"><pre><span class="n">curl</span> <span
class="o">-</span><span class="n">sL</span> <span class="n">http</span><span
class="p">:</span><span class="o">//</span><span class="n">s</span><span
class="p">.</span><span class="n">apache</span><span class="p">.</span><span
class="n">org</span><span class="o">/</span><span class="n">cms</span><span
class="o">-</span><span class="n">cli</span> <span class="o">|</span> <span
class="n">perl</span>
+</pre></div>
+
+
+<p>If this does not work on your local machine just do it on
"people.apache.org" by
+executing this:</p>
+<div class="codehilite"><pre><span class="n">ssh</span> <span
class="o">-</span><span class="n">t</span> <span class="o"><</span><span
class="n">user</span><span class="o">></span><span class="p">@</span><span
class="n">people</span><span class="p">.</span><span
class="n">apache</span><span class="p">.</span><span class="n">org</span> <span
class="n">publish</span><span class="p">.</span><span class="n">pl</span> <span
class="n">climate</span> <span class="o"><</span><span class="n">your</span>
<span class="n">Apache</span> <span class="n">ID</span><span
class="o">></span>
+</pre></div>
+
+
+<h3 id="editing-in-the-browser">Editing in the browser</h3>
+<h4 id="prerequisites">Prerequisites</h4>
+<h5 id="browser-bookmark">Browser bookmark</h5>
+<p>Normally you see the webpage in your browser. To update this page with an
+inline-editor and little preview you need to add a link as bookmark to your
browser
+(more information see <a href="https://cms.apache.org/#bookmark">here</a>).</p>
+<p><a
href="javascript:void(location.href='https://cms.apache.org/redirect?uri='+escape(location.href))">Add
this link as bookmark</a></p>
+<h5 id="apache-id">Apache ID</h5>
+<p>Furthermore, you need an Apache ID to authenticate to the system.</p>
+<h4 id="starting">Starting</h4>
+<p>Browse to the respective webpage or directory you would like to edit and
click on
+the bookmark. Now click on the [Edit this directory] link on the top. The
following
+is displayed as content from the CMS.</p>
+<h4 id="edit-an-existing-webpage">Edit an existing webpage</h4>
+<p>Click on the actions link [Edit] in the appropriate table cell for editing
the
+favorite file. If the file is not in this directory but in a subdir, just
click on
+the directory name (e.g., "docs/") to enter this directory.</p>
+<p>Now you should see a new webpage with a 4 fields:</p>
+<ol>
+<li>Upper left is the inline editor for text in markdown syntax.</li>
+<li>Upper right shows the written text as a permanent preview or as HTML
source code.</li>
+<li>Below the editor you can enter a log message.</li>
+<li>Enter a general header text, e.g., the license of the entered text.</li>
+</ol>
+<p>When you have finished writing your text, check the "Log message" box,
enter a
+commit message and click on [Submit].</p>
+<h4 id="create-a-new-webpage">Create a new webpage</h4>
+<p>When in the correct directory, at the top enter a name for the new text
file (e.g.,
+"my-file.mdtext"). Now you enter your text (see topic above).</p>
+<h4 id="create-new-subdirectory">Create new subdirectory</h4>
+<p>When in the correct directory, at the top enter a name for the new
directory (e.g.,
+"my-dir/"). Make sure you entered a trailing "/"!</p>
+<h4 id="delete-a-webpage-or-subdirectory">Delete a webpage or subdirectory</h4>
+<p>When in the corrext directory, click on the actions link [Delete] in the
appropriate
+table cell and enter a commit message. Finally click on [Submit].</p>
+<h4 id="how-to-put-into-production">How to put into production?</h4>
+<p>After you have edited your files and/or directories, you need now to pubish
your
+modifications into production. For this please click on the link
+[Publish site] on the top of the webpage. Enter a commit message on click on
[Submit].
+Alterantively you can click on this <a
href="https://cms.apache.org/climate/publish">pubish link</a>, review the
diff's and submit.</p>
+<h3 id="links">Links</h3>
+<p><a href="http://www.apache.org/dev/cmsref.html">CMS Documentation
Reference</a></p>
+ </article>
+ </section>
+ </div>
+
+ <footer class="footer" align="center">
+ <div class="container">
+ <a alt="Apache Incubator" href="http://incubator.apache.org">
+ <img id="asf-logo" alt="Apache Incubator"
src="http://incubator.apache.org/images/egg-logo.png" width="150"/></a>
+ <p>Copyright © 2013 The Apache Software Foundation, Licensed under
the
+ <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
License, Version 2.0</a>.<br />
+ Apache SIS, Apache, the Apache feather logo are trademarks of
The Apache Software Foundation.</p>
+ </div>
+ </footer>
+
+ <script src="/js/jquery-1.9.1.min.js"></script>
+ <script src="/js/bootstrap.min.js"></script>
+
+</body>
+</html>
Added: websites/staging/climate/trunk/content/development/license.html
==============================================================================
--- websites/staging/climate/trunk/content/development/license.html (added)
+++ websites/staging/climate/trunk/content/development/license.html Sun Jun 9
12:37:32 2013
@@ -0,0 +1,287 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<!--
+
+ 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.
+-->
+ <link rel="stylesheet" type="text/css" media="screen"
href="/css/bootstrap.min.css">
+ <style type="text/css">
+ body {
+ padding-top: 60px;
+ padding-bottom: 40px;
+ }
+ .sidebar-nav {
+ padding: 9px 0;
+ }
+ @media (max-width: 980px) {
+ /* Enable use of floated navbar text */
+ .navbar-text.pull-right {
+ float: none;
+ padding-left: 5px;
+ padding-right: 5px;
+ }
+ }
+ </style>
+ <link rel="stylesheet" type="text/css" media="screen"
href="/css/bootstrap-responsive.min.css">
+ <title>Apache License</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+
+<body>
+
+<div class="navbar navbar-inverse navbar-fixed-top">
+ <div class="navbar-inner">
+ <div class="container">
+ <a class="btn btn-navbar" data-toggle="collapse"
data-target=".nav-collapse">
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span> </a>
+ <a class="brand" href="/index.html"> Apache Open Climate Workbench
</a>
+ <div class="nav-collapse">
+ <ul class="nav">
+ <li class="dropdown"> <a class="dropdown-toggle"
data-toggle="dropdown">Development<b class="caret"></b></a>
+ <ul class="dropdown-menu">
+ <li><a href="/development/source.html">Source
Code</a></li>
+ <li><a href="/development/license.html">Project
License</a></li>
+ <li><a
href="https://issues.apache.org/jira/browse/climate">Issue Tracker</a></li>
+ <li><a href="/development/edit-website.html">Editing
Website</a></li>
+ </ul>
+ </li>
+ <li class="dropdown"> <a class="dropdown-toggle"
data-toggle="dropdown">Documentation<b class="caret"></b></a>
+ <ul class="dropdown-menu">
+ <li><a
href="https://cwiki.apache.org/confluence/display/CLIMATE/Home">Climate
Wiki</a></li>
+ </ul>
+ </li>
+ <li class="dropdown"> <a class="dropdown-toggle"
data-toggle="dropdown">Community<b class="caret"></b></a>
+ <ul class="dropdown-menu">
+ <li><a
href="/community/mailing-lists.html">Mailing Lists</a></li>
+ <li><a href="/community/people.html">Project
Team</a></li>
+ <li><a href="/community/get-involved.html">Get
Involved</a></li>
+ </ul>
+ </li>
+ <li class="dropdown"> <a class="dropdown-toggle"
data-toggle="dropdown">ASF <b class="caret"></b></a>
+ <ul class="dropdown-menu">
+ <li><a href="http://www.apache.org">Apache
Software Foundation</a></li>
+ <li><a
href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+ <li><a
href="http://www.apache.org/foundation/sponsorship.html">Become a
Sponsor</a></li>
+ </ul>
+ </li>
+ </ul>
+ </div> <!-- /.nav-collapse -->
+ </div><!-- /.container -->
+ </div><!-- /.navbar-inner -->
+ </div>
+
+ <div id="main" role="main" class="container">
+ <section id="content" class="row">
+ <article class="span12">
+ <p>Apache License<br></br>Version 2.0, January
2004<br></br>
+<a href="http://www.apache.org/licenses/">http://www.apache.org/licenses/</a>
</p>
+<p>TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION</p>
+<p><strong><a name="definitions">1. Definitions</a></strong>.</p>
+<p>"License" shall mean the terms and conditions for use, reproduction, and
+distribution as defined by Sections 1 through 9 of this document.</p>
+<p>"Licensor" shall mean the copyright owner or entity authorized by the
+copyright owner that is granting the License.</p>
+<p>"Legal Entity" shall mean the union of the acting entity and all other
+entities that control, are controlled by, or are under common control with
+that entity. For the purposes of this definition, "control" means (i) the
+power, direct or indirect, to cause the direction or management of such
+entity, whether by contract or otherwise, or (ii) ownership of fifty
+percent (50%) or more of the outstanding shares, or (iii) beneficial
+ownership of such entity.</p>
+<p>"You" (or "Your") shall mean an individual or Legal Entity exercising
+permissions granted by this License.</p>
+<p>"Source" form shall mean the preferred form for making modifications,
+including but not limited to software source code, documentation source,
+and configuration files.</p>
+<p>"Object" form shall mean any form resulting from mechanical transformation
+or translation of a Source form, including but not limited to compiled
+object code, generated documentation, and conversions to other media types.</p>
+<p>"Work" shall mean the work of authorship, whether in Source or Object form,
+made available under the License, as indicated by a copyright notice that
+is included in or attached to the work (an example is provided in the
+Appendix below).</p>
+<p>"Derivative Works" shall mean any work, whether in Source or Object form,
+that is based on (or derived from) the Work and for which the editorial
+revisions, annotations, elaborations, or other modifications represent, as
+a whole, an original work of authorship. For the purposes of this License,
+Derivative Works shall not include works that remain separable from, or
+merely link (or bind by name) to the interfaces of, the Work and Derivative
+Works thereof.</p>
+<p>"Contribution" shall mean any work of authorship, including the original
+version of the Work and any modifications or additions to that Work or
+Derivative Works thereof, that is intentionally submitted to Licensor for
+inclusion in the Work by the copyright owner or by an individual or Legal
+Entity authorized to submit on behalf of the copyright owner. For the
+purposes of this definition, "submitted" means any form of electronic,
+verbal, or written communication sent to the Licensor or its
+representatives, including but not limited to communication on electronic
+mailing lists, source code control systems, and issue tracking systems that
+are managed by, or on behalf of, the Licensor for the purpose of discussing
+and improving the Work, but excluding communication that is conspicuously
+marked or otherwise designated in writing by the copyright owner as "Not a
+Contribution."</p>
+<p>"Contributor" shall mean Licensor and any individual or Legal Entity on
+behalf of whom a Contribution has been received by Licensor and
+subsequently incorporated within the Work.</p>
+<p><strong><a name="copyright">2. Grant of Copyright License</a></strong>.
Subject to the
+terms and conditions of this License, each Contributor hereby grants to You
+a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+copyright license to reproduce, prepare Derivative Works of, publicly
+display, publicly perform, sublicense, and distribute the Work and such
+Derivative Works in Source or Object form.</p>
+<p><strong><a name="patent">3. Grant of Patent License</a></strong>. Subject
to the terms
+and conditions of this License, each Contributor hereby grants to You a
+perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+(except as stated in this section) patent license to make, have made, use,
+offer to sell, sell, import, and otherwise transfer the Work, where such
+license applies only to those patent claims licensable by such Contributor
+that are necessarily infringed by their Contribution(s) alone or by
+combination of their Contribution(s) with the Work to which such
+Contribution(s) was submitted. If You institute patent litigation against
+any entity (including a cross-claim or counterclaim in a lawsuit) alleging
+that the Work or a Contribution incorporated within the Work constitutes
+direct or contributory patent infringement, then any patent licenses
+granted to You under this License for that Work shall terminate as of the
+date such litigation is filed.</p>
+<p><strong><a name="redistribution">4. Redistribution</a></strong>. You may
reproduce and
+distribute copies of the Work or Derivative Works thereof in any medium,
+with or without modifications, and in Source or Object form, provided that
+You meet the following conditions:</p>
+<ol>
+<li>
+<p>You must give any other recipients of the Work or Derivative Works a
+copy of this License; and</p>
+</li>
+<li>
+<p>You must cause any modified files to carry prominent notices stating
+that You changed the files; and</p>
+</li>
+<li>
+<p>You must retain, in the Source form of any Derivative Works that You
+distribute, all copyright, patent, trademark, and attribution notices from
+the Source form of the Work, excluding those notices that do not pertain to
+any part of the Derivative Works; and</p>
+</li>
+<li>
+<p>If the Work includes a "NOTICE" text file as part of its distribution,
+then any Derivative Works that You distribute must include a readable copy
+of the attribution notices contained within such NOTICE file, excluding
+those notices that do not pertain to any part of the Derivative Works, in
+at least one of the following places: within a NOTICE text file distributed
+as part of the Derivative Works; within the Source form or documentation,
+if provided along with the Derivative Works; or, within a display generated
+by the Derivative Works, if and wherever such third-party notices normally
+appear. The contents of the NOTICE file are for informational purposes only
+and do not modify the License. You may add Your own attribution notices
+within Derivative Works that You distribute, alongside or as an addendum to
+the NOTICE text from the Work, provided that such additional attribution
+notices cannot be construed as modifying the License.
+You may add Your own copyright statement to Your modifications and may
+provide additional or different license terms and conditions for use,
+reproduction, or distribution of Your modifications, or for any such
+Derivative Works as a whole, provided Your use, reproduction, and
+distribution of the Work otherwise complies with the conditions stated in
+this License.</p>
+</li>
+</ol>
+<p><strong><a name="contributions">5. Submission of
Contributions</a></strong>. Unless You
+explicitly state otherwise, any Contribution intentionally submitted for
+inclusion in the Work by You to the Licensor shall be under the terms and
+conditions of this License, without any additional terms or conditions.
+Notwithstanding the above, nothing herein shall supersede or modify the
+terms of any separate license agreement you may have executed with Licensor
+regarding such Contributions.</p>
+<p><strong><a name="trademarks">6. Trademarks</a></strong>. This License does
not grant
+permission to use the trade names, trademarks, service marks, or product
+names of the Licensor, except as required for reasonable and customary use
+in describing the origin of the Work and reproducing the content of the
+NOTICE file.</p>
+<p><strong><a name="no-warranty">7. Disclaimer of Warranty</a></strong>.
Unless required by
+applicable law or agreed to in writing, Licensor provides the Work (and
+each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including,
+without limitation, any warranties or conditions of TITLE,
+NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You
+are solely responsible for determining the appropriateness of using or
+redistributing the Work and assume any risks associated with Your exercise
+of permissions under this License.</p>
+<p><strong><a name="no-liability">8. Limitation of Liability</a></strong>. In
no event and
+under no legal theory, whether in tort (including negligence), contract, or
+otherwise, unless required by applicable law (such as deliberate and
+grossly negligent acts) or agreed to in writing, shall any Contributor be
+liable to You for damages, including any direct, indirect, special,
+incidental, or consequential damages of any character arising as a result
+of this License or out of the use or inability to use the Work (including
+but not limited to damages for loss of goodwill, work stoppage, computer
+failure or malfunction, or any and all other commercial damages or losses),
+even if such Contributor has been advised of the possibility of such
+damages.</p>
+<p><strong><a name="additional">9. Accepting Warranty or Additional
Liability</a></strong>.
+While redistributing the Work or Derivative Works thereof, You may choose
+to offer, and charge a fee for, acceptance of support, warranty, indemnity,
+or other liability obligations and/or rights consistent with this License.
+However, in accepting such obligations, You may act only on Your own behalf
+and on Your sole responsibility, not on behalf of any other Contributor,
+and only if You agree to indemnify, defend, and hold each Contributor
+harmless for any liability incurred by, or claims asserted against, such
+Contributor by reason of your accepting any such warranty or additional
+liability.</p>
+<p>END OF TERMS AND CONDITIONS</p>
+<h2 id="appendix-how-to-apply-the-apache-license-to-your-work">APPENDIX: How
to apply the Apache License to your work</h2>
+<p>To apply the Apache License to your work, attach the following boilerplate
+notice, with the fields enclosed by brackets "[]" replaced with your own
+identifying information. (Don't include the brackets!) The text should be
+enclosed in the appropriate comment syntax for the file format. We also
+recommend that a file or class name and description of purpose be included
+on the same "printed page" as the copyright notice for easier
+identification within third-party archives.</p>
+<div class="codehilite"><pre> <span class="p">:::</span><span
class="n">text</span>
+ <span class="n">Copyright</span> <span class="p">[</span><span
class="n">yyyy</span><span class="p">]</span> <span class="p">[</span><span
class="n">name</span> <span class="n">of</span> <span
class="n">copyright</span> <span class="n">owner</span><span class="p">]</span>
+
+ <span class="n">Licensed</span> <span class="n">under</span> <span
class="n">the</span> <span class="n">Apache</span> <span
class="n">License</span><span class="p">,</span> <span class="n">Version</span>
2<span class="p">.</span>0 <span class="p">(</span><span class="n">the</span>
"<span class="n">License</span>"<span class="p">);</span>
+ <span class="n">you</span> <span class="n">may</span> <span
class="n">not</span> <span class="n">use</span> <span class="n">this</span>
<span class="n">file</span> <span class="n">except</span> <span
class="n">in</span> <span class="n">compliance</span> <span
class="n">with</span> <span class="n">the</span> <span
class="n">License</span><span class="p">.</span>
+ <span class="n">You</span> <span class="n">may</span> <span
class="n">obtain</span> <span class="n">a</span> <span class="n">copy</span>
<span class="n">of</span> <span class="n">the</span> <span
class="n">License</span> <span class="n">at</span>
+
+ <span class="n">http</span><span class="p">:</span><span
class="o">//</span><span class="n">www</span><span class="p">.</span><span
class="n">apache</span><span class="p">.</span><span class="n">org</span><span
class="o">/</span><span class="n">licenses</span><span class="o">/</span><span
class="n">LICENSE</span><span class="o">-</span>2<span class="p">.</span>0
+
+ <span class="n">Unless</span> <span class="n">required</span> <span
class="n">by</span> <span class="n">applicable</span> <span
class="n">law</span> <span class="n">or</span> <span class="n">agreed</span>
<span class="n">to</span> <span class="n">in</span> <span
class="n">writing</span><span class="p">,</span> <span class="n">software</span>
+ <span class="n">distributed</span> <span class="n">under</span> <span
class="n">the</span> <span class="n">License</span> <span class="n">is</span>
<span class="n">distributed</span> <span class="n">on</span> <span
class="n">an</span> "<span class="n">AS</span> <span
class="n">IS</span>" <span class="n">BASIS</span><span class="p">,</span>
+ <span class="n">WITHOUT</span> <span class="n">WARRANTIES</span> <span
class="n">OR</span> <span class="n">CONDITIONS</span> <span class="n">OF</span>
<span class="n">ANY</span> <span class="n">KIND</span><span class="p">,</span>
<span class="n">either</span> <span class="n">express</span> <span
class="n">or</span> <span class="n">implied</span><span class="p">.</span>
+ <span class="n">See</span> <span class="n">the</span> <span
class="n">License</span> <span class="k">for</span> <span class="n">the</span>
<span class="n">specific</span> <span class="n">language</span> <span
class="n">governing</span> <span class="n">permissions</span> <span
class="n">and</span>
+ <span class="n">limitations</span> <span class="n">under</span> <span
class="n">the</span> <span class="n">License</span><span class="p">.</span>
+</pre></div>
+ </article>
+ </section>
+ </div>
+
+ <footer class="footer" align="center">
+ <div class="container">
+ <a alt="Apache Incubator" href="http://incubator.apache.org">
+ <img id="asf-logo" alt="Apache Incubator"
src="http://incubator.apache.org/images/egg-logo.png" width="150"/></a>
+ <p>Copyright © 2013 The Apache Software Foundation, Licensed under
the
+ <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
License, Version 2.0</a>.<br />
+ Apache SIS, Apache, the Apache feather logo are trademarks of
The Apache Software Foundation.</p>
+ </div>
+ </footer>
+
+ <script src="/js/jquery-1.9.1.min.js"></script>
+ <script src="/js/bootstrap.min.js"></script>
+
+</body>
+</html>
Added: websites/staging/climate/trunk/content/development/source.html
==============================================================================
--- websites/staging/climate/trunk/content/development/source.html (added)
+++ websites/staging/climate/trunk/content/development/source.html Sun Jun 9
12:37:32 2013
@@ -0,0 +1,119 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<!--
+
+ 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.
+-->
+ <link rel="stylesheet" type="text/css" media="screen"
href="/css/bootstrap.min.css">
+ <style type="text/css">
+ body {
+ padding-top: 60px;
+ padding-bottom: 40px;
+ }
+ .sidebar-nav {
+ padding: 9px 0;
+ }
+ @media (max-width: 980px) {
+ /* Enable use of floated navbar text */
+ .navbar-text.pull-right {
+ float: none;
+ padding-left: 5px;
+ padding-right: 5px;
+ }
+ }
+ </style>
+ <link rel="stylesheet" type="text/css" media="screen"
href="/css/bootstrap-responsive.min.css">
+ <title>Open Climate Workbench Source Code</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+
+<body>
+
+<div class="navbar navbar-inverse navbar-fixed-top">
+ <div class="navbar-inner">
+ <div class="container">
+ <a class="btn btn-navbar" data-toggle="collapse"
data-target=".nav-collapse">
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span> </a>
+ <a class="brand" href="/index.html"> Apache Open Climate Workbench
</a>
+ <div class="nav-collapse">
+ <ul class="nav">
+ <li class="dropdown"> <a class="dropdown-toggle"
data-toggle="dropdown">Development<b class="caret"></b></a>
+ <ul class="dropdown-menu">
+ <li><a href="/development/source.html">Source
Code</a></li>
+ <li><a href="/development/license.html">Project
License</a></li>
+ <li><a
href="https://issues.apache.org/jira/browse/climate">Issue Tracker</a></li>
+ <li><a href="/development/edit-website.html">Editing
Website</a></li>
+ </ul>
+ </li>
+ <li class="dropdown"> <a class="dropdown-toggle"
data-toggle="dropdown">Documentation<b class="caret"></b></a>
+ <ul class="dropdown-menu">
+ <li><a
href="https://cwiki.apache.org/confluence/display/CLIMATE/Home">Climate
Wiki</a></li>
+ </ul>
+ </li>
+ <li class="dropdown"> <a class="dropdown-toggle"
data-toggle="dropdown">Community<b class="caret"></b></a>
+ <ul class="dropdown-menu">
+ <li><a
href="/community/mailing-lists.html">Mailing Lists</a></li>
+ <li><a href="/community/people.html">Project
Team</a></li>
+ <li><a href="/community/get-involved.html">Get
Involved</a></li>
+ </ul>
+ </li>
+ <li class="dropdown"> <a class="dropdown-toggle"
data-toggle="dropdown">ASF <b class="caret"></b></a>
+ <ul class="dropdown-menu">
+ <li><a href="http://www.apache.org">Apache
Software Foundation</a></li>
+ <li><a
href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+ <li><a
href="http://www.apache.org/foundation/sponsorship.html">Become a
Sponsor</a></li>
+ </ul>
+ </li>
+ </ul>
+ </div> <!-- /.nav-collapse -->
+ </div><!-- /.container -->
+ </div><!-- /.navbar-inner -->
+ </div>
+
+ <div id="main" role="main" class="container">
+ <section id="content" class="row">
+ <article class="span12">
+ <p>Open Climate Workbench source code is maintained
using Apache Subversion version control.</p>
+<p>Browse Open Climate Workbench source repository in <a
href="http://svn.apache.org/viewvc/incubator/climate/">ViewVC</a>.</p>
+<p>The SVN location is <a
href="https://svn.apache.org/repos/asf/incubator/climate/">Open Climate
Workbench SVN</a></p>
+<h2 id="source-code">Source Code</h2>
+<p>To check out the source code: svn co
https://svn.apache.org/repos/asf/incubator/climate/</p>
+<p>Some coding practices:</p>
+<ul>
+<li>License Header: Always add the current ASF license header as described in
<a href="http://www.apache.org/legal/src-headers.html">ASF Source
Header</a>.</li>
+</ul>
+ </article>
+ </section>
+ </div>
+
+ <footer class="footer" align="center">
+ <div class="container">
+ <a alt="Apache Incubator" href="http://incubator.apache.org">
+ <img id="asf-logo" alt="Apache Incubator"
src="http://incubator.apache.org/images/egg-logo.png" width="150"/></a>
+ <p>Copyright © 2013 The Apache Software Foundation, Licensed under
the
+ <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
License, Version 2.0</a>.<br />
+ Apache SIS, Apache, the Apache feather logo are trademarks of
The Apache Software Foundation.</p>
+ </div>
+ </footer>
+
+ <script src="/js/jquery-1.9.1.min.js"></script>
+ <script src="/js/bootstrap.min.js"></script>
+
+</body>
+</html>
Modified: websites/staging/climate/trunk/content/index.html
==============================================================================
--- websites/staging/climate/trunk/content/index.html (original)
+++ websites/staging/climate/trunk/content/index.html Sun Jun 9 12:37:32 2013
@@ -55,14 +55,15 @@
<ul class="nav">
<li class="dropdown"> <a class="dropdown-toggle"
data-toggle="dropdown">Development<b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/source.html">Source Code</a></li>
- <li><a href="/license.html">Project
License</a></li>
+ <li><a href="/development/source.html">Source
Code</a></li>
+ <li><a href="/development/license.html">Project
License</a></li>
<li><a
href="https://issues.apache.org/jira/browse/climate">Issue Tracker</a></li>
+ <li><a href="/development/edit-website.html">Editing
Website</a></li>
</ul>
</li>
<li class="dropdown"> <a class="dropdown-toggle"
data-toggle="dropdown">Documentation<b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="https://cwiki.apache.org/CLIMATE">Climate
Wiki</a></li>
+ <li><a
href="https://cwiki.apache.org/confluence/display/CLIMATE/Home">Climate
Wiki</a></li>
</ul>
</li>
<li class="dropdown"> <a class="dropdown-toggle"
data-toggle="dropdown">Community<b class="caret"></b></a>
Modified: websites/staging/climate/trunk/content/sitemap.html
==============================================================================
--- websites/staging/climate/trunk/content/sitemap.html (original)
+++ websites/staging/climate/trunk/content/sitemap.html Sun Jun 9 12:37:32 2013
@@ -55,14 +55,15 @@
<ul class="nav">
<li class="dropdown"> <a class="dropdown-toggle"
data-toggle="dropdown">Development<b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/source.html">Source Code</a></li>
- <li><a href="/license.html">Project
License</a></li>
+ <li><a href="/development/source.html">Source
Code</a></li>
+ <li><a href="/development/license.html">Project
License</a></li>
<li><a
href="https://issues.apache.org/jira/browse/climate">Issue Tracker</a></li>
+ <li><a href="/development/edit-website.html">Editing
Website</a></li>
</ul>
</li>
<li class="dropdown"> <a class="dropdown-toggle"
data-toggle="dropdown">Documentation<b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="https://cwiki.apache.org/CLIMATE">Climate
Wiki</a></li>
+ <li><a
href="https://cwiki.apache.org/confluence/display/CLIMATE/Home">Climate
Wiki</a></li>
</ul>
</li>
<li class="dropdown"> <a class="dropdown-toggle"
data-toggle="dropdown">Community<b class="caret"></b></a>
@@ -90,8 +91,6 @@
<article class="span12">
<ul>
<li><a href="/index.html"></a></li>
-<li><a href="/license.html">Apache License</a></li>
-<li><a href="/source.html">Open Climate Workbench Source Code</a></li>
</ul>
</article>
</section>