Author: ihabunek
Date: Mon Mar 26 11:32:14 2012
New Revision: 1305315
URL: http://svn.apache.org/viewvc?rev=1305315&view=rev
Log:
Added guidelines page. Minor tweaks.
Added:
logging/site/branches/experimental-twig/src/site/pages/guidelines.html.twig
Modified:
logging/site/branches/experimental-twig/build.php
logging/site/branches/experimental-twig/src/site/pages/charter.html.twig
logging/site/branches/experimental-twig/src/site/pages/index.html.twig
logging/site/branches/experimental-twig/src/site/pages/mailing-lists.html.twig
logging/site/branches/experimental-twig/src/site/pages/privacy-policy.html.twig
logging/site/branches/experimental-twig/src/site/pages/team-list.html.twig
logging/site/branches/experimental-twig/src/site/resources/css/site.css
logging/site/branches/experimental-twig/src/site/templates/navbar.html.twig
Modified: logging/site/branches/experimental-twig/build.php
URL:
http://svn.apache.org/viewvc/logging/site/branches/experimental-twig/build.php?rev=1305315&r1=1305314&r2=1305315&view=diff
==============================================================================
--- logging/site/branches/experimental-twig/build.php (original)
+++ logging/site/branches/experimental-twig/build.php Mon Mar 26 11:32:14 2012
@@ -86,6 +86,9 @@ function copyDir($source, $target)
{
if ($file == '.' || $file == '..') continue;
+ // Skip hidden files such as .svn
+ if ($file[0] == '.') continue;
+
if (is_dir("$source/$file"))
{
if (!is_dir("$target/$file"))
Modified:
logging/site/branches/experimental-twig/src/site/pages/charter.html.twig
URL:
http://svn.apache.org/viewvc/logging/site/branches/experimental-twig/src/site/pages/charter.html.twig?rev=1305315&r1=1305314&r2=1305315&view=diff
==============================================================================
--- logging/site/branches/experimental-twig/src/site/pages/charter.html.twig
(original)
+++ logging/site/branches/experimental-twig/src/site/pages/charter.html.twig
Mon Mar 26 11:32:14 2012
@@ -20,7 +20,7 @@ limitations under the License.
{% block title %}Charter{% endblock %}
{% block content %}
-<h2>Apache logging services charter</h2>
+<h1>Charter</h1>
<p>On <a target="_blank"
href="http://www.apache.org/foundation/records/minutes/2003/board_minutes_2003_12_17.txt";>
December 17<sup>th</sup> 2003</a>. the Apache Board voted to establish the
Apache Logging Services Project.</p>
Added:
logging/site/branches/experimental-twig/src/site/pages/guidelines.html.twig
URL:
http://svn.apache.org/viewvc/logging/site/branches/experimental-twig/src/site/pages/guidelines.html.twig?rev=1305315&view=auto
==============================================================================
--- logging/site/branches/experimental-twig/src/site/pages/guidelines.html.twig
(added)
+++ logging/site/branches/experimental-twig/src/site/pages/guidelines.html.twig
Mon Mar 26 11:32:14 2012
@@ -0,0 +1,298 @@
+{#
+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.
+#}
+
+{% extends "page.html.twig" %}
+
+{% block title %}Guidelines{% endblock %}
+
+{% block content %}
+<h1>Guidelines</h1>
+
+<p>This document defines the guidelines under which the Apache Logging
Services project operates. It defines the
+roles and responsibilities of the project, who may vote, how voting works, how
conflicts are resolved, etc.</p>
+
+<p>The Logging Services is a project of the <a
href="http://www.apache.org/foundation/";>Apache Software Foundation</a>.
+The foundation holds the copyright on Apache code including the code in the
Logging Services codebase. The <a
+href="http://www.apache.org/foundation/faq.html";>foundation FAQ</a> explains
the operation and background of the
+foundation.</p>
+
+<p>Logging Services is typical of Apache projects in that it operates under a
set of principles, known collectively as the
+"Apache Way". If you are new to Apache development, please refer to the <a
href="http://incubator.apache.org";>Incubator
+project</a> for more information on how Apache projects operate.</p>
+
+<ul>
+ <li><a href="#Roles and Responsibilities">Roles and
Responsibilities</a></li>
+ <li><a href="#Decision Making">How decisions are made</a></li>
+</ul>
+
+<h2>Roles and Responsibilities<a name="Roles and
Responsibilities"> </a></h2>
+
+<p>Apache projects define a set of roles with associated rights and
responsibilities. These roles govern what tasks
+an individual may perform within the project. The roles are defined in the
following sections</p>
+
+<ul>
+ <li><a href="#Users">Users</a></li>
+ <li><a href="#Developers">Developers</a></li>
+ <li><a href="#Committers">Committers</a></li>
+ <li><a href="#Project Management Committee"> Project Management
Committee (PMC)</a></li>
+</ul>
+
+<h3 class="subsection">Users<a name="Users"> </a></h3>
+
+<p>The most important participants in the project are people who use our
software. The majority of our developers
+start out as users and guide their development efforts from the user's
perspective.</p>
+
+<p>Users contribute to the Apache projects by providing feedback to developers
in the form of bug reports and
+feature suggestions. As well, users participate in the Apache community by
helping other users on mailing lists and
+user support forums.</p>
+
+<h3 class="subsection">Developers<a name="Developers"> </a></h3>
+
+<p>All of the volunteers who are contributing time, code, documentation, or
resources to the Logging Services
+Project. A developer that makes sustained, welcome contributions to the
project may be invited to become a Committer,
+though the exact timing of such invitations depends on many factors.</p>
+
+<h3 class="subsection">Committers<a name="Committers"> </a></h3>
+
+<p>The project's Committers are responsible for the project's technical
management. All committers have write access
+to the project's source repositories. Committers may cast binding votes on any
technical discussion regarding the
+project.</p>
+
+<p>Committer access is by invitation only and must be approved by lazy
consensus of the active PMC members. A
+Committer is considered emeritus by their own declaration or by not
contributing in any form to the project for over
+six months. An emeritus committer may request reinstatement of commit access
from the PMC. Such reinstatement is
+subject to lazy consensus of active PMC members.</p>
+
+<p>Commit access can be revoked by a unanimous vote of all the active PMC
members (except the committer in question
+if they are also a PMC member).</p>
+
+<p>All Apache committers are required to have a signed Contributor License
Agreement (CLA) on file with the Apache
+Software Foundation. There is a <a
href="http://www.apache.org/dev/committers.html";>Committer FAQ</a> which
provides
+more details on the requirements for Committers.</p>
+
+<p>A committer who makes a sustained contribution to the project may be
invited to become a member of the PMC. The
+form of contribution is not limited to code. It can also include code review,
helping out users on the mailing lists,
+documentation, etc.</p>
+
+<h3 class="subsection">Project Management Committee <a name="Project
Management Committee"> </a></h3>
+
+<p>The Project Management Committee (PMC) for Apache Logging Services was
created by a <a href="charter.html">resolution</a>
+of the board of the Apache Software Foundation on 18<sup>th</sup> November
2002. The PMC is responsible to the board
+and the ASF for the management and oversight of the Apache Logging Services
codebase. The responsibilities of the PMC
+include</p>
+
+<ul>
+ <li>Deciding what is distributed as products of the Apache Logging
Services project. In particular all releases
+ must be approved by the PMC</li>
+ <li>Maintaining the project's shared resources, including the codebase
repository, mailing lists, websites.</li>
+ <li>Speaking on behalf of the project.</li>
+ <li>Resolving license disputes regarding products of the project</li>
+ <li>Nominating new PMC members and committers</li>
+ <li>Maintaining these bylaws and other guidelines of the project</li>
+</ul>
+
+<p>Membership of the PMC is by invitation only and must be approved by a lazy
consensus of active PMC members. A PMC
+member is considered "emeritus" by their own declaration or by not
contributing in any form to the project for over six
+months. An emeritus member may request reinstatement to the PMC. Such
reinstatement is subject to lazy consensus of the
+active PMC members. Membership of the PMC can be revoked by an unanimous vote
of all the active PMC members other than
+the member in question.</p>
+
+<p>The chair of the PMC is appointed by the ASF board. The chair is an office
holder of the Apache Software
+Foundation (Vice President, Apache Logging Services) and has primary
responsibility to the board for the management of
+the projects within the scope of the Logging Services PMC. The chair reports
to the board quarterly on developments
+within the Logging Services project. The PMC may consider the position of PMC
chair annually and if supported by 2/3
+Majority may recommend a new chair to the board. Ultimately, however, it is
the board's responsibility who it chooses
+to appoint as the PMC chair.</p>
+
+<h3 class="section">Decision Making <a name="Decision Making"> </a></h3>
+
+<p>Within the Logging Services project, different types of decisions require
different forms of approval. For
+example, the previous section describes several decisions which require "lazy
consensus" approval. This section defines
+how voting is performed, the types of approvals, and which types of decision
require which type of approval.</p>
+
+<h3 class="subsection">Voting<a name="Voting"> </a></h3>
+
+<p>Decisions regarding the project are made by votes on the primary project
mailing list ([email protected]).
+Where necessary, PMC voting may take place on the private Logging Services PMC
mailing list. Votes are clearly
+indicated by subject line starting with [VOTE] or [PMC-VOTE]. Votes may
contain multiple items for approval and these
+should be clearly separated. Voting is carried out by replying to the vote
mail. Voting may take four flavours</p>
+
+<table class="table table-bordered">
+ <tr>
+ <td><strong>+1</strong></td>
+ <td>"Yes," "Agree," or "the action should be performed." In
general, this vote also indicates a willingness on
+ the behalf of the voter in "making it happen"</td>
+ </tr>
+ <tr>
+ <td><strong>+0</strong></td>
+ <td>This vote indicates a willingness for the action under
consideration to go ahead. The voter, however will not
+ be able to help.</td>
+ </tr>
+ <tr>
+ <td><strong>-0</strong></td>
+ <td>This vote indicates that the voter does not, in general,
agree with the proposed action but is not concerned
+ enough to prevent the action going ahead.</td>
+ </tr>
+ <tr>
+ <td><strong>-1</strong></td>
+ <td>This is a negative vote. On issues where consensus is
required, this vote counts as a <strong>veto</strong>.
+ All vetoes must contain an explanation of why the veto
is appropriate. Vetoes with no explanation are void. It may
+ also be appropriate for a -1 vote to include an
alternative course of action.
+ </td>
+ </tr>
+</table>
+
+<p>All participants in the Logging Services project are encouraged to show
their agreement with or against a
+particular action by voting. For technical decisions, only the votes of active
committers are binding. Non binding
+votes are still useful for those with binding votes to understand the
perception of an action in the wider Logging
+Services community. For PMC decisions, only the votes of PMC members are
binding.</p>
+
+<p>Voting can also be applied to changes made to the Logging Services
codebase. These typically take the form of a
+veto (-1) in reply to the commit message sent when the commit is made.</p>
+
+<h3>Approvals<a name="Approvals"> </a></h3>
+
+<p>These are the types of approvals that can be sought. Different actions
require different types of approvals</p>
+
+<table class="table table-bordered">
+ <tr>
+ <td><strong>Consensus</strong></td>
+ <td>For this to pass, all voters with binding votes must vote
and there can be no binding vetoes (-1). Consensus
+ votes are rarely required due to the impracticality of getting
all eligible voters to cast a vote.</td>
+ </tr>
+ <tr>
+ <td><strong>Lazy Consensus</strong></td>
+ <td>Lazy consensus requires 3 binding +1 votes and no binding
vetoes.</td>
+ </tr>
+ <tr>
+ <td><strong>Lazy Majority</strong></td>
+ <td>A lazy majority vote requires 3 binding +1 votes and more
binding +1 votes that -1 votes.</td>
+ </tr>
+ <tr>
+ <td><strong>Lazy Approval</strong></td>
+ <td>An action with lazy approval is implicitly allowed unless a
-1 vote is received, at which time, depending on
+ the type of action, either lazy majority or lazy
consensus approval must be obtained.</td>
+ </tr>
+ <tr>
+ <td><strong>2/3 Majority</strong></td>
+ <td>Some actions require a 2/3 majority of active committers or
PMC members to pass. Such actions typically
+ affect the foundation of the project (e.g. adopting a
new codebase to replace an existing product). The higher
+ threshold is designed to ensure such changes are
strongly supported. To pass this vote requires at least 2/3 of
+ binding vote holders to vote +1</td>
+ </tr>
+</table>
+
+<h3>Vetoes<a name="Vetoes"> </a></h3>
+
+<p>A valid, binding veto cannot be overruled. If a veto is cast, it must be
accompanied by a valid reason explaining
+the reasons for the veto. The validity of a veto, if challenged, can be
confirmed by anyone who has a binding vote.
+This does not necessarily signify agreement with the veto - merely that the
veto is valid.</p>
+
+<p>If you disagree with a valid veto, you must lobby the person casting the
veto to withdraw their veto. If a veto
+is not withdrawn, the action that has been vetoed must be reversed in a timely
manner.</p>
+
+<h3>Actions<a name="Actions"> </a></h3>
+
+<p>This section describes the various actions which are undertaken within the
project, the corresponding approval
+required for that action and those who have binding votes over the action.</p>
+
+<table class="table table-bordered">
+ <tr>
+ <th>Action</th>
+ <th>Description</th>
+ <th>Approval</th>
+ <th>Binding Votes</th>
+ </tr>
+ <tr>
+ <td><strong>Code Change</strong></td>
+ <td>A change made to the codebase of a sub-project and
committed by a committer. This includes source code,
+ documentation, website content, etc.</td>
+ <td>Lazy approval and then lazy consensus.</td>
+ <td>Active committers of the relevant sub-project.</td>
+ </tr>
+ <tr valign="top">
+ <td><strong>Release Plan</strong></td>
+ <td>Defines the timetable and actions for a release. The plan
also nominates a Release Manager.</td>
+ <td>Lazy majority</td>
+ <td>Active committers of the relevant sub-project</td>
+ </tr>
+ <tr>
+ <td><strong>Product Release</strong></td>
+ <td>
+ <p>When a release of one of the sub-project's products
is ready, a vote is required to accept the release
+ as an official release of the Logging Services
project.</p>
+ <p>This step ensures the overall supervision by the
Logging Services PMC over its sub-projects.</p>
+ </td>
+ <td>Lazy Majority</td>
+ <td><b>Active PMC members</b></td>
+ </tr>
+ <tr>
+ <td><strong>Adoption of New Codebase</strong></td>
+ <td>
+ <p>When the codebase for an existing, released product
is to be replaced with an alternative codebase. If such a
+ vote fails to gain approval, the existing code
base will continue.</p>
+ <p>This also covers the creation of new sub-projects
within the project</p>
+ </td>
+ <td>2/3 majority</td>
+ <td>Active PMC members</td>
+ </tr>
+ <tr>
+ <td><strong>Modification of the Bylaws</strong></td>
+ <td>Modification of this document</td>
+ <td>2/3 majority</td>
+ <td>Active PMC members</td>
+ </tr>
+ <tr>
+ <td><strong>New Committer</strong></td>
+ <td>
+ <p>When a new committer is proposed for a
sub-project.</p>
+ <p>The PMC must be informed of the result of the
sub-project's vote.</p>
+ </td>
+ <td>Lazy consensus</td>
+ <td>Active committers of the relevant sub-project</td>
+ </tr>
+ <tr>
+ <td><strong>New PMC Member</strong></td>
+ <td>When a committer is proposed for the PMC</td>
+ <td>Lazy consensus</td>
+ <td>Active PMC members</td>
+ </tr>
+ <tr>
+ <td><strong>Committer Removal</strong></td>
+ <td>
+ <p>When removal of commit privileges is sought.</p>
+ <p><b>Note: </b> Such actions will also be referred to
the ASF board by the PMC chair.</p>
+ </td>
+ <td>Consensus</td>
+ <td>Active PMC members (excluding the committer in question if
a member of the PMC).</td>
+ </tr>
+ <tr>
+ <td><strong>PMC Member Removal</strong></td>
+ <td>
+ <p>When removal of a PMC member is sought.</p>
+ <p><b>Note: </b> Such actions will also be referred to
the ASF board by the PMC chair</p>
+ </td>
+ <td>Consensus</td>
+ <td>Active PMC members (excluding the member in question).</td>
+ </tr>
+</table>
+
+<h3>Voting Timeframes<a name="Voting Timeframes"> </a></h3>
+
+<p>Votes are open for a period of 72 hours to allow all active voters time to
consider the vote. Votes relating to
+code changes are not subject to a strict timetable but should be made as
timely as possible.</p>
+{% endblock %}
\ No newline at end of file
Modified: logging/site/branches/experimental-twig/src/site/pages/index.html.twig
URL:
http://svn.apache.org/viewvc/logging/site/branches/experimental-twig/src/site/pages/index.html.twig?rev=1305315&r1=1305314&r2=1305315&view=diff
==============================================================================
--- logging/site/branches/experimental-twig/src/site/pages/index.html.twig
(original)
+++ logging/site/branches/experimental-twig/src/site/pages/index.html.twig Mon
Mar 26 11:32:14 2012
@@ -30,16 +30,13 @@ limitations under the License.
<div class="row">
<div class="span4">
<h2>Apache chainsaw</h2>
- <p>Donec sed odio dui. Cras justo odio, dapibus ac facilisis
in, egestas eget quam. Vestibulum id ligula
- porta felis euismod semper. Fusce dapibus, tellus ac cursus
commodo, tortor mauris condimentum nibh, ut
- fermentum massa justo sit amet risus.</p>
+ <p>A GUI based log viewer. Chainsaw is a companion application
to log4j written by members of the log4j
+ development community.</p>
<p><a target="_blank" class="btn"
href="http://logging.apache.org/chainsaw/";>Project site »</a></p>
</div>
<div class="span4">
<h2>Apache log4cxx</h2>
- <p>Donec sed odio dui. Cras justo odio, dapibus ac facilisis
in, egestas eget quam. Vestibulum id ligula
- porta felis euismod semper. Fusce dapibus, tellus ac cursus
commodo, tortor mauris condimentum nibh, ut
- fermentum massa justo sit amet risus.</p>
+ <p>Apache log4cxx is a logging framework for C++ patterned
after log4j.</p>
<p><a target="_blank" class="btn"
href="http://logging.apache.org/log4cxx/";>Project site »</a></p>
</div>
<div class="span4">
@@ -61,16 +58,13 @@ limitations under the License.
</div>
<div class="span4">
<h2>Apache log4net</h2>
- <p>Donec sed odio dui. Cras justo odio, dapibus ac facilisis
in, egestas eget quam. Vestibulum id ligula
- porta felis euismod semper. Fusce dapibus, tellus ac cursus
commodo, tortor mauris condimentum nibh, ut
- fermentum massa justo sit amet risus.</p>
+ <p>A port of the excellent Apache log4j framework to the
Microsoft .NET runtime.</p>
<p><a target="_blank" class="btn"
href="http://logging.apache.org/log4net/";>Project site »</a></p>
</div>
<div class="span4">
<h2>Apache log4php</h2>
- <p>Donec sed odio dui. Cras justo odio, dapibus ac facilisis
in, egestas eget quam. Vestibulum id ligula
- porta felis euismod semper. Fusce dapibus, tellus ac cursus
commodo, tortor mauris condimentum nibh, ut
- fermentum massa justo sit amet risus.</p>
+ <p>A versatile logging framework for PHP. Originally a port of
Apache log4j to PHP, it has grown to include
+ various PHP specific features.</p>
<p><a target="_blank" class="btn"
href="http://logging.apache.org/log4php/";>Project site »</a></p>
</div>
</div>
Modified:
logging/site/branches/experimental-twig/src/site/pages/mailing-lists.html.twig
URL:
http://svn.apache.org/viewvc/logging/site/branches/experimental-twig/src/site/pages/mailing-lists.html.twig?rev=1305315&r1=1305314&r2=1305315&view=diff
==============================================================================
---
logging/site/branches/experimental-twig/src/site/pages/mailing-lists.html.twig
(original)
+++
logging/site/branches/experimental-twig/src/site/pages/mailing-lists.html.twig
Mon Mar 26 11:32:14 2012
@@ -20,7 +20,7 @@ limitations under the License.
{% block title %}Mailing lists{% endblock %}
{% block content %}
-<h2>Mailing lists</h2>
+<h1>Mailing lists</h1>
<p>These are the mailing lists that have been established for the Apache
Logging Services project.</p>
Modified:
logging/site/branches/experimental-twig/src/site/pages/privacy-policy.html.twig
URL:
http://svn.apache.org/viewvc/logging/site/branches/experimental-twig/src/site/pages/privacy-policy.html.twig?rev=1305315&r1=1305314&r2=1305315&view=diff
==============================================================================
---
logging/site/branches/experimental-twig/src/site/pages/privacy-policy.html.twig
(original)
+++
logging/site/branches/experimental-twig/src/site/pages/privacy-policy.html.twig
Mon Mar 26 11:32:14 2012
@@ -20,7 +20,7 @@ limitations under the License.
{% block title %}Privacy policy{% endblock %}
{% block content %}
-<h2>Privacy policy</h2>
+<h1>Privacy policy</h1>
<p>Information about your use of this web site is collected using server
access logs and a tracking cookie.
The collected information consists of the following:</p>
Modified:
logging/site/branches/experimental-twig/src/site/pages/team-list.html.twig
URL:
http://svn.apache.org/viewvc/logging/site/branches/experimental-twig/src/site/pages/team-list.html.twig?rev=1305315&r1=1305314&r2=1305315&view=diff
==============================================================================
--- logging/site/branches/experimental-twig/src/site/pages/team-list.html.twig
(original)
+++ logging/site/branches/experimental-twig/src/site/pages/team-list.html.twig
Mon Mar 26 11:32:14 2012
@@ -20,7 +20,7 @@ limitations under the License.
{% block title %}Charter{% endblock %}
{% block content %}
-<h2>Project team</h2>
+<h1>Project team</h1>
<p>A successful project requires many people to play many roles. Some members
write code or documentation, while
others are valuable as testers, submitting patches and suggestions.</p>
@@ -30,7 +30,7 @@ actively evolve the code-base. Contribut
Members. The number of Contributors to the project is unbounded. Get involved
today. All contributions to the project
are greatly appreciated.</p>
-<h3>Team members</h3>
+<h2>Team members</h2>
<table class="table table-bordered table-striped">
<thead>
Modified:
logging/site/branches/experimental-twig/src/site/resources/css/site.css
URL:
http://svn.apache.org/viewvc/logging/site/branches/experimental-twig/src/site/resources/css/site.css?rev=1305315&r1=1305314&r2=1305315&view=diff
==============================================================================
--- logging/site/branches/experimental-twig/src/site/resources/css/site.css
(original)
+++ logging/site/branches/experimental-twig/src/site/resources/css/site.css Mon
Mar 26 11:32:14 2012
@@ -23,8 +23,9 @@ limitations under the License.
.footer { margin-top: 45px; padding: 35px 0; border-top: 1px solid #E5E5E5; }
.footer p { font-size: 12px; }
-.content h2 { margin-bottom: 10px; }
-.content h3 { margin-bottom: 10px; }
+.content h1,
+.content h2,
+.content h3,
.content h4 { margin-bottom: 10px; }
blockquote { margin-top: 20px; font-weight: normal; }
Modified:
logging/site/branches/experimental-twig/src/site/templates/navbar.html.twig
URL:
http://svn.apache.org/viewvc/logging/site/branches/experimental-twig/src/site/templates/navbar.html.twig?rev=1305315&r1=1305314&r2=1305315&view=diff
==============================================================================
--- logging/site/branches/experimental-twig/src/site/templates/navbar.html.twig
(original)
+++ logging/site/branches/experimental-twig/src/site/templates/navbar.html.twig
Mon Mar 26 11:32:14 2012
@@ -22,6 +22,7 @@ limitations under the License.
<li class="dropdown">
<a href="#" class="dropdown-toggle"
data-toggle="dropdown">About<b class="caret"></b></a>
<ul class="dropdown-menu">
+ <li><a
href="guidelines.html">Guidelines</a></li>
<li><a
href="charter.html">Charter</a></li>
<li><a
href="team-list.html">Team</a></li>
<li><a
href="mailing-lists.html">Mailing lists</a></li>
