You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@incubator.apache.org by sb...@apache.org on 2017/07/03 16:36:53 UTC
svn commit: r1800699 - /incubator/public/trunk/content/projects/streams.xml
Author: sblackmon
Date: Mon Jul 3 16:36:53 2017
New Revision: 1800699
URL: http://svn.apache.org/viewvc?rev=1800699&view=rev
Log:
resolve conflict
Modified:
incubator/public/trunk/content/projects/streams.xml
Modified: incubator/public/trunk/content/projects/streams.xml
URL: http://svn.apache.org/viewvc/incubator/public/trunk/content/projects/streams.xml?rev=1800699&r1=1800698&r2=1800699&view=diff
==============================================================================
--- incubator/public/trunk/content/projects/streams.xml [utf-8] (original)
+++ incubator/public/trunk/content/projects/streams.xml [utf-8] Mon Jul 3 16:36:53 2017
@@ -12,51 +12,22 @@
</section>
<section id="Description">
<title>Description</title>
- <p>Apache Streams is a lightweight server for ActivityStreams.</p>
+ <p>Apache Streams (incubating) unifies a diverse world of digital profiles and online activities into common formats and vocabularies, and makes these datasets accessible across a variety of databases, devices, and platforms for streaming, browsing, search, sharing, and analytics use-cases.</p>
</section>
- <section id="News">
- <title>News</title>
- <ul>
-<!-- <li>YYYY-MM-DD New committer: Fred Nerk</li> -->
- <li>2016-09-27 Added mentor: Suneel Marthi</li>
- <li>2014-01-13 New committer and PPMC member: Carol B. Hansen</li>
- <li>2013-07-30 New committer and PPMC member: Danny Sullivan</li>
- <li>2013-01-18 Release Streams Master POM 0.1-incubating</li>
- <li>2012-11-20 Project enters incubation.</li>
- </ul>
- </section>
- <section id="Project+info">
+ <section id="Project info">
<title>Project info</title>
- <ul>
- <li>link to the main website</li>
- </ul>
- <ul>
- <li>link to the page(s) that tell how to participate (Website,Mailing
- lists,Bug tracking,Source code)</li>
- </ul>
- <ul>
- <li>link to the project status file (Committers,non-incubation action
- items,project resources, etc)</li>
- </ul>
- <p>If the project website and code repository are not yet setup, use the
- following table:</p>
<table>
<tr>
- <th>item</th>
- <th>type</th>
- <th>reference</th>
- </tr>
- <tr>
<td>Website</td>
- <td>www</td>
<td id="www">
<a href="http://streams.incubator.apache.org/">http://streams.incubator.apache.org/</a>
</td>
</tr>
<tr>
- <td>.</td>
- <td>wiki</td>
- <td>.</td>
+ <td>Wiki</td>
+ <td id="wiki">
+ <a href="https://cwiki.apache.org/confluence/display/STREAMS">https://cwiki.apache.org/confluence/display/STREAMS</a>
+ </td>
</tr>
<tr>
<td>Mailing list</td>
@@ -77,101 +48,37 @@
</tr>
<tr>
<td>Source code</td>
- <td>SVN</td>
- <td id="svn">
- <a href="https://svn.apache.org/repos/asf/incubator/streams/">https://svn.apache.org/repos/asf/incubator/streams/</a>
+ <td>git</td>
+ <td id="git">
+ <a href="https://git-wip-us.apache.org/repos/asf/incubator-streams.git">https://git-wip-us.apache.org/repos/asf/incubator-streams.git</a>
</td>
</tr>
<tr>
- <td>Mentors</td>
- <td>mfranklin</td>
- <td>Matt Franklin</td>
- </tr>
- <tr>
- <td>.</td>
- <td>ate</td>
- <td>Ate Douma</td>
- </tr>
- <tr>
- <td>.</td>
- <td>craigmcc</td>
- <td>Craig R. McClanahan</td>
- </tr>
- <tr>
- <td>.</td>
- <td>smarthi</td>
- <td>Suneel Marthi</td>
- </tr>
- <tr>
- <td>Committers</td>
- <td>mfranklin</td>
- <td>Matt Franklin</td>
- </tr>
- <tr>
- <td>.</td>
- <td>ate</td>
- <td>Ate Douma</td>
- </tr>
- <tr>
- <td>.</td>
- <td>chansen</td>
- <td>Carol B. Hansen</td>
- </tr>
- <tr>
- <td>.</td>
- <td>craigmcc</td>
- <td>Craig R. McClanahan</td>
- </tr>
- <tr>
- <td>.</td>
- <td>jmsnell</td>
- <td>James Snell</td>
- </tr>
- <tr>
- <td>.</td>
- <td>rbaxter</td>
- <td>Ryan Baxter</td>
- </tr>
- <tr>
- <td>.</td>
- <td>letourneau</td>
- <td>Jason Letourneau</td>
- </tr>
- <tr>
- <td>.</td>
- <td>lavender</td>
- <td>Beth Lavender</td>
- </tr>
- <tr>
- <td>.</td>
- <td>.</td>
- <td>Mark Weitzel</td>
- </tr>
- <tr>
- <td>.</td>
- <td>sblackmon</td>
- <td>Steve Blackmon</td>
- </tr>
- <tr>
- <td>.</td>
- <td>ahart</td>
- <td>Andrew Hart</td>
- </tr>
- <tr>
- <td>.</td>
- <td>dpalmisano</td>
- <td>Davide Palmisano</td>
- </tr>
- <tr>
- <td>Extra</td>
- <td>.</td>
- <td>.</td>
+ <td>Team</td>
+ <td>team</td>
+ <td id="team">
+ <a href="http://streams.incubator.apache.org/site/0.5.1-incubating-SNAPSHOT/streams-project/team-list.html">http://streams.incubator.apache.org/site/0.5.1-incubating-SNAPSHOT/streams-project/team-list.html</a>
+ </td>
</tr>
</table>
</section>
<section id="Incubation+status+reports">
<title>Incubation status reports</title>
<ul>
+ <li><a href="http://wiki.apache.org/incubator/June2017">June 2017</a></li>
+ <li><a href="http://wiki.apache.org/incubator/March2017">March 2017</a></li>
+ <li><a href="http://wiki.apache.org/incubator/December2016">December 2016</a></li>
+ <li><a href="http://wiki.apache.org/incubator/September2016">September 2016</a></li>
+ <li><a href="http://wiki.apache.org/incubator/June2016">June 2016</a></li>
+ <li><a href="http://wiki.apache.org/incubator/March2016">March 2016</a></li>
+ <li><a href="http://wiki.apache.org/incubator/December2015">December 2015</a></li>
+ <li><a href="http://wiki.apache.org/incubator/September2015">September 2015</a></li>
+ <li><a href="http://wiki.apache.org/incubator/June2015">June 2015</a></li>
+ <li><a href="http://wiki.apache.org/incubator/March2015">March 2015</a></li>
+ <li><a href="http://wiki.apache.org/incubator/December2014">December 2014</a></li>
+ <li><a href="http://wiki.apache.org/incubator/September2014">September 2014</a></li>
+ <li><a href="http://wiki.apache.org/incubator/June2014">June 2014</a></li>
+ <li><a href="http://wiki.apache.org/incubator/March2014">March 2014</a></li>
<li><a href="http://wiki.apache.org/incubator/December2013">December 2013</a></li>
<li><a href="http://wiki.apache.org/incubator/September2013">September 2013</a></li>
<li><a href="http://wiki.apache.org/incubator/June2013">June 2013</a></li>
@@ -183,178 +90,6 @@
</section>
<section id="Incubation+work+items">
<title>Incubation work items</title>
- <section id="Project+Setup">
- <title>Project Setup</title>
- <p>This is the first phase on incubation, needed to start the project at Apache.</p>
- <p>
- <em>Item assignment is shown by the Apache id.</em>
- <em>Completed tasks are shown by the completion date (YYYY-MM-dd).</em>
- </p>
- <section id="Identify+the+project+to+be+incubated">
- <title>Identify the project to be incubated</title>
- <table>
- <tr>
- <th>date</th>
- <th>item</th>
- </tr>
- <tr>
- <td>....-..-..</td>
- <td>Make sure that the requested project name does not already exist and
- check www.nameprotect.com to be sure that the name is not already
- trademarked for an existing software product.</td>
- </tr>
- <tr>
- <td>N/A</td>
- <td>If request from an existing Apache project to adopt an external
- package, then ask the Apache project for the SVN module and mail
- address names.</td>
- </tr>
- <tr>
- <td>N/A</td>
- <td>If request from outside Apache to enter an existing Apache project,
- then post a message to that project for them to decide on acceptance.</td>
- </tr>
- <tr>
- <td>....-..-..</td>
- <td>If request from anywhere to become a stand-alone PMC, then assess the
- fit with the ASF, and create the lists and modules under the
- incubator address/module names if accepted.</td>
- </tr>
- </table>
- </section>
- <section id="Infrastructure">
- <title>Infrastructure</title>
- <table>
- <tr>
- <th>date</th>
- <th>item</th>
- </tr>
- <tr>
- <td>2012-11-30</td>
- <td>Ask infrastructure to create source repository modules
- and grant the committers karma.</td>
- </tr>
- <tr>
- <td>2012-11-30</td>
- <td>Ask infrastructure to set up and archive mailing lists.</td>
- </tr>
- <tr>
- <td>2012-12-15</td>
- <td>Ask infrastructure to set up issue tracker (JIRA, Bugzilla).</td>
- </tr>
- <tr>
- <td>....-..-..</td>
- <td>Ask infrastructure to set up wiki (Confluence, Moin).</td>
- </tr>
- <tr>
- <td>....-..-..</td>
- <td>Migrate the project to our infrastructure.</td>
- </tr>
- </table>
- </section>
- <section id="Interim+responsibility">
- <title>Mentor-related responsibility/oversight</title>
- <table>
- <tr>
- <th>date</th>
- <th>item</th>
- </tr>
- <tr>
- <td>2012-11-20</td>
- <td>Identify all the Mentors for the incubation, by asking all
- that can be Mentors.</td>
- </tr>
- <tr>
- <td>2012-11-30</td>
- <td>Subscribe all Mentors on the pmc and general lists.</td>
- </tr>
- <tr>
- <td>2012-11-30</td>
- <td>Give all Mentors access to the incubator SVN repository.
- (to be done by the Incubator PMC chair or an Incubator PMC
- Member wih karma for the authorizations file)</td>
- </tr>
- <tr>
- <td>....-..-..</td>
- <td>Tell Mentors to track progress in the file
- 'incubator/projects/{project.name}.html'</td>
- </tr>
- </table>
- </section>
- <section id="Copyright">
- <title>Copyright</title>
- <table>
- <tr>
- <th>date</th>
- <th>item</th>
- </tr>
- <tr>
- <td>....-..-..</td>
- <td>Check and make sure that the papers that transfer rights to the ASF
- been received. It is only necessary to transfer rights for the
- package, the core code, and any new code produced by the project.
- </td>
- </tr>
- <tr>
- <td>....-..-..</td>
- <td>Check and make sure that the files that have been donated have been
- updated to reflect the new ASF copyright.</td>
- </tr>
- </table>
- </section>
- <section id="Verify+distribution+rights">
- <title>Verify distribution rights</title>
- <table>
- <tr>
- <th>date</th>
- <th>item</th>
- </tr>
- <tr>
- <td>....-..-..</td>
- <td>Check and make sure that for all code included with the distribution
- that is not under the Apache license, we have the right to combine
- with Apache-licensed code and redistribute.
- </td>
- </tr>
- <tr>
- <td>....-..-..</td>
- <td>Check and make sure that all source code distributed by the project
- is covered by one or more of the following approved licenses: Apache,
- BSD, Artistic, MIT/X, MIT/W3C, MPL 1.1, or something with essentially
- the same terms.</td>
- </tr>
- </table>
- </section>
- <section id="Establish+a+list+of+active+committers">
- <title>Establish a list of active committers</title>
- <table>
- <tr>
- <th>date</th>
- <th>item</th>
- </tr>
- <tr>
- <td>....-..-..</td>
- <td>Check that all active committers have submitted a contributors
- agreement.</td>
- </tr>
- <tr>
- <td>....-..-..</td>
- <td>Add all active committers in the STATUS file.</td>
- </tr>
- <tr>
- <td>....-..-..</td>
- <td>Ask root for the creation of committers' accounts on
- people.apache.org.</td>
- </tr>
- </table>
- </section>
- <section id="Project+specific">
- <title>Project specific</title>
- <p>
- <em>Add project specific tasks here.</em>
- </p>
- </section>
- </section>
<section id="Incubation">
<title>Incubation</title>
<p>These action items have to be checked for during the whole incubation process.</p>
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@incubator.apache.org
For additional commands, e-mail: cvs-help@incubator.apache.org