Modified: geronimo/site/docs/guidelines.html URL: http://svn.apache.org/viewcvs/geronimo/site/docs/guidelines.html?rev=380662&r1=380661&r2=380662&view=diff ============================================================================== --- geronimo/site/docs/guidelines.html (original) +++ geronimo/site/docs/guidelines.html Fri Feb 24 05:00:38 2006 @@ -1,326 +1,326 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Apache Geronimo - - - - - - - - - - - - - - - - -
- - -   - - - - - - - - - - - - - -
- - - - - - - - - - - -
- - - - - - - - - - - - - -   -
- - - - - - - - - - - - - + +
- - - - - -
- - - - - - - - - - -
- -  Quick Links - -
- - -     Home -
- -     License -
- -     ASF -
- -     Downloads -
- -
-
- - - - - - -
- - - - - - - - - - -
- -  Community - -
- - -     Get Involved -
- -     Committers -
- -     Mailing Lists -
- -     Powered By -
- -     Library -
- -     XML Schemas -
- -     FAQ -
- -     Wiki -
- -
-
- - - - - - -
- - - - - - - - - - -
- -  Development - -
- - -     Road Map / TODO -
- -     Javadoc -
- -     Source Code -
- -     Coding Standards -
- -     JIRA -
- -     Related Projects -
- -
-
- - -
- - - - - - + + + + +
-
- Project Guidelines -
- -

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + Apache Geronimo + + + + + + + + + + + + + + + + +
+ + +   + + + + + + + + + + + + + +
+ + + + + + + + + + + +
+ + + + + + + + + + + + + +   +
+ + + + + + + + + + + + + - -
+ + + + + +
+ + + + + + + + + + +
+ +  Quick Links + +
+ + +     Home +
+ +     License +
+ +     ASF +
+ +     Downloads +
+ +
+
+ + + + + + +
+ + + + + + + + + + +
+ +  Community + +
+ + +     Get Involved +
+ +     Committers +
+ +     Mailing Lists +
+ +     Powered By +
+ +     Library +
+ +     XML Schemas +
+ +     FAQ +
+ +     Wiki +
+ +
+
+ + + + + + +
+ + + + + + + + + + +
+ +  Development + +
+ + +     Road Map / TODO +
+ +     Javadoc +
+ +     Source Code +
+ +     Coding Standards +
+ +     JIRA +
+ +     Related Projects +
+ +
+
+ + +
+ + + + + + - - - - -
+
+ Project Guidelines +
+ +

NOTE : The following guidelines are PROPOSED for discussion only. They will need to be discussed by the Geronimo community and a final version approved by a vote by the Apache Geronimo PMC. These guidelines were adopted from the Apache HTTPD project. -

+

This document defines the guidelines for the Apache Geronimo Project. It includes definitions of how conflict is resolved by voting, who is able to vote, and the procedures to follow for proposing and -making changes to the Apache products.

+making changes to the Apache products.

The objective here is to avoid unnecessary conflict over changes and continue to produce a quality system in a timely manner. Not all conflict can be avoided, but at least we can agree on the procedures for conflict -to be resolved.

- -

-
-
-
- - - - - - + + + + +
-
- People, Places, and Things -
- -

+to be resolved.

+ +

+
+
+
+ + + + + + - - - - -
+
+ People, Places, and Things +
+ +

Apache Geronimo Project Management Committee
The group of volunteers who are responsible for managing the Apache @@ -379,28 +379,28 @@ mail lists for the project.
-
- -

-
-
-
- - - - - - + + + + +
-
- STATUS -
- -

+ + +

+
+
+
+ + + + + + - - - - -
+
+ STATUS +
+ +

Each of the Apache Geronimo's active source code repositories contain a file called "STATUS" which is used to keep track of the agenda and plans for work within that repository. The STATUS file includes information @@ -409,34 +409,34 @@ notes about items that individual developers are working on or want discussion about, and anything else that might be useful to help the group track progress. The active STATUS files are automatically posted -to the mailing list each week.

+to the mailing list each week.

Many issues will be encountered by the project, each resulting in zero or more proposed action items. Issues should be raised on the mailing list as soon as they are identified. Action items must be raised on the mailing list and added to the relevant STATUS file. All action items may be voted on, but not all -of them will require a formal vote.

- -

-
-
-
- - - - - - + + + + +
-
- Voting -
- -

+of them will require a formal vote.

+ +

+
+
+
+ + + + + + - - - - -
+
+ Voting +
+ +

Any of the Apache Developers may vote on any issue or action item. However, the only binding votes are those cast by active members of the Apache Geronimo PMC; if the vote is about a change to source code or @@ -445,15 +445,15 @@ All developers are encouraged to participate in decisions, but the decision itself is made by those who have been long-time contributors to the project. In other words, the Apache Geronimo Project is a -minimum-threshold meritocracy.

+minimum-threshold meritocracy.

The act of voting carries certain obligations -- voting members are not only stating their opinion, they are agreeing to help do the work of the Apache Geronimo Project. Since we are all volunteers, members often become inactive for periods of time in order to take care of their "real jobs" or devote more time to other projects. It is therefore unlikely that the entire group membership will vote on every issue. To account for this, -all voting decisions are based on a minimum quorum.

-

Each vote can be made in one of three flavors:

+all voting decisions are based on a minimum quorum.

+

Each vote can be made in one of three flavors:

+1
Yes, agree, or the action should be performed. On some issues, this @@ -474,7 +474,7 @@ an action item should make their opinions known to the group immediately, so that the problem can be remedied as early as possible.
-
+

An action item requiring consensus approval must receive at least 3 binding +1 votes and no vetos. An action item requiring majority approval must receive @@ -483,30 +483,30 @@ quorum of three positive votes). All other action items are considered to have lazy approval until someone votes -1, after which point they are decided by either consensus or a majority vote, -depending upon the type of action item.

+depending upon the type of action item.

Votes are tallied within the STATUS file, adjacent to the action -item under vote. All votes must be sent to the mailing list.

- -

-
-
-
- - - - - - + + + + +
-
- Types of Action Items -
- -

+item under vote. All votes must be sent to the mailing list.

+ +

+
+
+
+ + + + + + - - - - -
+
+ Types of Action Items +
+ +

Long Term Plans
Long term plans are simply announcements that group members @@ -574,35 +574,35 @@ to lazy consensus. All product changes to a prior-branch (old version) repository require consensus before the change is committed.

-
- -

-
-
-
- - - - - - + + + + +
-
- When to Commit a Change -
- -

+ + +

+
+
+
+ + + + + + - - - - -
+
+ When to Commit a Change +
+ +

Ideas must be review-then-commit; patches can be commit-then-review. With a commit-then-review process, we trust that the developer doing the commit has a high degree of confidence in the change. Doubtful changes, new features, and large-scale overhauls need to be discussed before being committed to a repository. Any major change must receive consensus approval on the mailing list before being committed. -

+

Each developer is responsible for notifying the mailing list and adding an action item to STATUS when they have an idea for a new feature or major change to propose for the product. The distributed nature of the @@ -611,169 +611,169 @@ specific patch is required before the change can be committed. Note that a committer might veto the concept (with an adequate explanation), but later rescind that veto if a specific patch satisfies their objections. -No advance notice is required to commit singular bug fixes.

+No advance notice is required to commit singular bug fixes.

Related changes should be committed as a group, or very closely together. Half-completed projects should not be committed unless doing so is necessary to pass the baton to another developer who has agreed to complete the project in short order. All code changes must be successfully compiled on the developer's platform before being -committed.

+committed.

The current source code tree should be capable of complete compilation at all times. However, it is sometimes impossible for a developer on one platform to avoid breaking some other platform when a change is committed, particularly when completing the change requires access to a special development tool on that other platform. If it is anticipated that a given change will break some other platform, the committer must -indicate that in the commit log.

+indicate that in the commit log.

The committer is responsible to follow the Apache Geronimo procedure for any third-party code or documentation they commit to the repository. All software committed to the repository must be covered by the Apache LICENSE or contain a copyright and license that allows redistribution under the same conditions -as the Apache LICENSE.

+as the Apache LICENSE.

A committed change must be reversed if it is vetoed by one of the voting committers and the veto conditions cannot be immediately satisfied by the equivalent of a "bug fix" commit. The veto must be rescinded before -the change can be included in any public release.

- -

-
-
-
- - - - - - + + + + +
-
- Patch Format -
- -

+the change can be included in any public release.

+ +

+
+
+
+ + + + + + - - - - -
+
+ Patch Format +
+ +

When a specific change to the software is proposed for discussion or voting on the mailing list, it should be presented in the form of input to the patch command. When sent to the mailing list, the message should contain a Subject beginning with [PATCH] and a distinctive one-line summary corresponding to the action item for that patch. Afterwords, the patch summary in the STATUS file should be -updated to point to the Message-ID of that message.

+updated to point to the Message-ID of that message.

The patch should be created by using the diff -u command from the original software file(s) to the modified software -file(s). E.g.,

-
    diff -u http_main.c.orig http_main.c >> patchfile.txt
-

or

-
    cvs diff -u http_main.c >> patchfile.txt
+file(s). E.g.,

+
    diff -u http_main.c.orig http_main.c >> patchfile.txt
+

or

+
    cvs diff -u http_main.c >> patchfile.txt

All patches necessary to address an action item should be concatenated within a single patch message. If later modification of the patch proves necessary, the entire new patch should be posted and not just the difference between two patches. The STATUS file entry should then -be updated to point to the new patch message.

+be updated to point to the new patch message.

The completed patchfile should produce no errors or prompts when the -command,

-
    patch -s < patchfile
-

is issued in the target repository.

- -

-
-
-
- - - - - - + + + + +
-
- Addendum -
- -

-

Outstanding issues with this document

+command,

+
    patch -s < patchfile
+

is issued in the target repository.

+ +

+
+
+
+ + + + + + - - - - -
+
+ Addendum +
+ +

+

Outstanding issues with this document

  • We may need a better definition for "lazy consensus".
  • We should clarify under what conditions a veto can be rescinded or overridden.
  • Should we set a time limit on vetos of patches? Two weeks?
  • -
- -

-
-
-
-
- - - - - - - - - - - - - - - - - - -
-
- Copyright © 2003-2006, The Apache Software Foundation   -
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + +

+
+
+
+
+ + + + + + + + + + + + + + + + + + +
+
+ Copyright © 2003-2006, The Apache Software Foundation   +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Modified: geronimo/site/docs/index.html URL: http://svn.apache.org/viewcvs/geronimo/site/docs/index.html?rev=380662&r1=380661&r2=380662&view=diff ============================================================================== --- geronimo/site/docs/index.html (original) +++ geronimo/site/docs/index.html Fri Feb 24 05:00:38 2006 @@ -88,7 +88,7 @@ - + Modified: geronimo/site/docs/license.html URL: http://svn.apache.org/viewcvs/geronimo/site/docs/license.html?rev=380662&r1=380661&r2=380662&view=diff ============================================================================== --- geronimo/site/docs/license.html (original) +++ geronimo/site/docs/license.html Fri Feb 24 05:00:38 2006 @@ -1,309 +1,309 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - Apache Geronimo - - - - - - - - - - - - - - - - -
- - -   - - - - - - - - - - - - - -
- - - - - - - - - - - -
- - - - - - - - - - - - - -   -
- - - - - - - - - - - - - + +
- - - - - -
- - - - - - - - - - -
- -  Quick Links - -
- - -     Home -
- -     License -
- -     ASF -
- -     Downloads -
- -
-
- - - - - - -
- - - - - - - - - - -
- -  Community - -
- - -     Get Involved -
- -     Committers -
- -     Mailing Lists -
- -     Powered By -
- -     Library -
- -     XML Schemas -
- -     FAQ -
- -     Wiki -
- -
-
- - - - - - -
- - - - - - - - - - -
- -  Development - -
- - -     Road Map / TODO -
- -     Javadoc -
- -     Source Code -
- -     Coding Standards -
- -     JIRA -
- -     Related Projects -
- -
-
- - -
- - - - - - + + + + +
-
- Apache License v2.0 -
- -

-
-

- - - - - - - - - + + + + + + + +
- - - - - -
- - + Geronimo Documentation Team"> + + + + + + + + + Apache Geronimo + + + + + + + + + + + + + + + + +
+ + +   + + + + + + + + + + + + + +
+ + + + + + + + + + + +
+ + + + + + + + + + + + + +   +
+ + + + + + + + + + + + + - -
+ + + + + +
+ + + + + + + + + + +
+ +  Quick Links + +
+ + +     Home +
+ +     License +
+ +     ASF +
+ +     Downloads +
+ +
+
+ + + + + + +
+ + + + + + + + + + +
+ +  Community + +
+ + +     Get Involved +
+ +     Committers +
+ +     Mailing Lists +
+ +     Powered By +
+ +     Library +
+ +     XML Schemas +
+ +     FAQ +
+ +     Wiki +
+ +
+
+ + + + + + +
+ + + + + + + + + + +
+ +  Development + +
+ + +     Road Map / TODO +
+ +     Javadoc +
+ +     Source Code +
+ +     Coding Standards +
+ +     JIRA +
+ +     Related Projects +
+ +
+
+ + +
+ + + + + + - - - - -
+
+ Apache License v2.0 +
+ +

+
+

+ + + + + + + + + - - - - - - - -
+ + + + + +
+ +
 
 
@@ -510,93 +510,93 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 
-
-
- -
- - - - - -
-
- -

-
-
-
-
- - - - - - - - - - - - - - - - - - -
-
- Copyright © 2003-2006, The Apache Software Foundation   -
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +
+ +
+ + + + + +
+
+ +

+
+
+
+
+ + + + + + + + + + + + + + + + + + +
+
+ Copyright © 2003-2006, The Apache Software Foundation   +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +