You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by bu...@apache.org on 2020/03/03 15:27:03 UTC

svn commit: r1057323 - in /websites/staging/felix/trunk/content: ./ documentation/ documentation/community/ documentation/development/ documentation/subprojects/ documentation/subprojects/apache-felix-framework/ documentation/tutorials-examples-and-pre...

Author: buildbot
Date: Tue Mar  3 15:27:03 2020
New Revision: 1057323

Log:
Staging update by buildbot for felix

Removed:
    websites/staging/felix/trunk/content/documentation/community/contributing-source-code.html
    websites/staging/felix/trunk/content/documentation/community/felix-r4-contributions.html
    websites/staging/felix/trunk/content/documentation/development/committers.html
    websites/staging/felix/trunk/content/documentation/development/integrating-felix-with-eclipse.html
    websites/staging/felix/trunk/content/documentation/development/integrating-felix-with-netbeans.html
    websites/staging/felix/trunk/content/documentation/development/project-management-committee-pmc.html
    websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-framework/apache-felix-framework-and-alternative-java-vms.html
    websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-framework/apache-felix-framework-and-google-android.html
    websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-framework/apache-felix-framework-osgi-r4-2-ct-results.html
    websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-framework/apache-felix-framework-osgi-r4-3-ct-results.html
    websites/staging/felix/trunk/content/documentation/tutorials-examples-and-presentations/checking-out-and-building-felix-with-netbeans.html
Modified:
    websites/staging/felix/trunk/content/   (props changed)
    websites/staging/felix/trunk/content/.htaccess
    websites/staging/felix/trunk/content/documentation/community.html
    websites/staging/felix/trunk/content/documentation/community/apache-felix-community-roles-and-processes.html
    websites/staging/felix/trunk/content/documentation/community/contributing.html
    websites/staging/felix/trunk/content/documentation/community/projects-using-felix.html
    websites/staging/felix/trunk/content/documentation/development.html
    websites/staging/felix/trunk/content/documentation/development/release-management-nexus.html
    websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-framework.html
    websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-framework/apache-felix-framework-faq.html
    websites/staging/felix/trunk/content/documentation/tutorials-examples-and-presentations.html
    websites/staging/felix/trunk/content/sitemap.html

Propchange: websites/staging/felix/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Mar  3 15:27:03 2020
@@ -1 +1 @@
-1874730
+1874733

Modified: websites/staging/felix/trunk/content/.htaccess
==============================================================================
--- websites/staging/felix/trunk/content/.htaccess (original)
+++ websites/staging/felix/trunk/content/.htaccess Tue Mar  3 15:27:03 2020
@@ -1,2 +1,5 @@
 ErrorDocument 403 /errors/403.html
 ErrorDocument 404 /errors/404.html
+Redirect Permanent /documentation/development/committers.html /documentation/community/apache-felix-community-roles-and-processes.html
+Redirect Permanent /documentation/development/project-management-committee-pmc.html /documentation/community/apache-felix-community-roles-and-processes.html
+Redirect Permanent /documentation/community/contributing-source-code.html /documentation/community/contributing.html

Modified: websites/staging/felix/trunk/content/documentation/community.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/community.html (original)
+++ websites/staging/felix/trunk/content/documentation/community.html Tue Mar  3 15:27:03 2020
@@ -91,8 +91,6 @@ h2:hover > .headerlink, h3:hover > .head
 <ul>
 <li><a href="/documentation/community/apache-felix-community-roles-and-processes.html">Apache Felix Community Roles and Processes</a></li>
 <li><a href="/documentation/community/contributing.html">Contributing</a></li>
-<li><a href="/documentation/community/contributing-source-code.html">Contributing Source Code</a></li>
-<li><a href="/documentation/community/felix-r4-contributions.html">Felix R4 OSGi Service Platform Contributions</a></li>
 <li><a href="/documentation/community/projects-using-felix.html">Projects Using Felix</a></li>
 </ul>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">

Modified: websites/staging/felix/trunk/content/documentation/community/apache-felix-community-roles-and-processes.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/community/apache-felix-community-roles-and-processes.html (original)
+++ websites/staging/felix/trunk/content/documentation/community/apache-felix-community-roles-and-processes.html Tue Mar  3 15:27:03 2020
@@ -88,29 +88,37 @@ h2:hover > .headerlink, h3:hover > .head
   visibility: hidden;
 }
 h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
-<h1 id="roles">Roles<a class="headerlink" href="#roles" title="Permanent link">&para;</a></h1>
+<h2 id="committers-and-project-management-committee-pmc">Committers and Project Management Committee (PMC)<a class="headerlink" href="#committers-and-project-management-committee-pmc" title="Permanent link">&para;</a></h2>
+<p>See Apache Phone Book: <a href="https://people.apache.org/phonebook.html?pmc=felix">Apache Felix Committers and PMC members</a></p>
+<h3 id="past-members">Past members:<a class="headerlink" href="#past-members" title="Permanent link">&para;</a></h3>
+<ul>
+<li>Niclas Hedhman (stepped down 1/26/2009)</li>
+<li>Trustin Lee (stepped down 2/9/2008)</li>
+<li>Upayavira (stepped down 9/11/2007)</li>
+</ul>
+<h2 id="roles">Roles<a class="headerlink" href="#roles" title="Permanent link">&para;</a></h2>
 <p>There are different roles with which Felix community members may be associated, these roles are: users, contributors, committers, and Project Management Committee (PMC) members. These roles are assigned and assumed based on merit. Everyone in the Felix community can participate to whatever level they desire, but participating and the resulting merit gained is directly linked to the role an individual may obtain.</p>
-<h2 id="users">Users<a class="headerlink" href="#users" title="Permanent link">&para;</a></h2>
+<h3 id="users">Users<a class="headerlink" href="#users" title="Permanent link">&para;</a></h3>
 <p>Users are the people who use any of the products of the Felix project. People in this role are not contributing code, but they are using the products, reporting bugs, making feature requests, testing code, and such. This is by far the most important category of people, since without users there is no reason for Felix. When a user starts to contribute code or documentation patches, they become a <em>Contributor</em>.</p>
-<h2 id="contributors">Contributors<a class="headerlink" href="#contributors" title="Permanent link">&para;</a></h2>
+<h3 id="contributors">Contributors<a class="headerlink" href="#contributors" title="Permanent link">&para;</a></h3>
 <p>Contributors are the people who write code or documentation patches or contribute positively to the project in other ways. A volunteer's contribution is always recognized.</p>
-<h2 id="committers">Committers<a class="headerlink" href="#committers" title="Permanent link">&para;</a></h2>
+<h3 id="committers">Committers<a class="headerlink" href="#committers" title="Permanent link">&para;</a></h3>
 <p>Contributors who give frequent and valuable contributions to a subproject of Felix can have their status promoted to that of a <em>Committer</em>. A Committer has write access to Felix' source code repository.</p>
-<h2 id="pmc-members">PMC Members<a class="headerlink" href="#pmc-members" title="Permanent link">&para;</a></h2>
+<h3 id="pmc-members">PMC Members<a class="headerlink" href="#pmc-members" title="Permanent link">&para;</a></h3>
 <p>Committers who frequently participate with valuable contributions may have their status promoted to that of a <em>PMC member</em>. This committee is the official managing body of project and is responsible for setting its overall direction.</p>
-<h1 id="processes">Processes<a class="headerlink" href="#processes" title="Permanent link">&para;</a></h1>
-<h2 id="becoming-a-user-or-contributor">Becoming a User or Contributor<a class="headerlink" href="#becoming-a-user-or-contributor" title="Permanent link">&para;</a></h2>
+<h2 id="processes">Processes<a class="headerlink" href="#processes" title="Permanent link">&para;</a></h2>
+<h3 id="becoming-a-user-or-contributor">Becoming a User or Contributor<a class="headerlink" href="#becoming-a-user-or-contributor" title="Permanent link">&para;</a></h3>
 <p>There is no requirement for becoming a User or Contributor; these roles are open to everyone.</p>
-<h2 id="becoming-a-committer">Becoming a Committer<a class="headerlink" href="#becoming-a-committer" title="Permanent link">&para;</a></h2>
+<h3 id="becoming-a-committer">Becoming a Committer<a class="headerlink" href="#becoming-a-committer" title="Permanent link">&para;</a></h3>
 <p>In order for a Contributor to become a Committer, another Committer can nominate that Contributor to the PMC. Once a Contributor is nominated, the PMC will call a vote on the PMC mailing list and if there are at least 3 positive votes and no negative votes after three days, then the Contributor is accepted as a Committer. The Contributor should not be consulted about his/her desire to become a Committer before the vote or be informed that they are being considered, since this could create hard feelings if the vote does not pass.</p>
 <p>Upon a positive vote result, the Contributor will be emailed by the PMC to invite him/her to become a Committer. If the invitation is accepted, an announcement about the new Committer is made to the developer mailing list and he/she is given write access to the source code repository. A Contributor will not officially become a Committer until the appropriate legal paperwork is submitted.</p>
-<h2 id="becoming-a-pmc-member">Becoming a PMC Member<a class="headerlink" href="#becoming-a-pmc-member" title="Permanent link">&para;</a></h2>
+<h3 id="becoming-a-pmc-member">Becoming a PMC Member<a class="headerlink" href="#becoming-a-pmc-member" title="Permanent link">&para;</a></h3>
 <p>In order to become a PMC member, another PMC member must nominate the Committer. Once the Committer is nominated, the PMC will call a vote on the PMC mailing list and if there are at least 3 positive votes and no negative votes after three days, then the Committer is accepted as a PMC member. The Committer should not be consulted about his/her desire to become a PMC member before the vote or be informed that they are being considered, since this could create hard feelings if the vote does not pass.</p>
 <p>Upon a positive vote result, the Committer will be emailed by the PMC to invite him/her to become a PMC member. If the invitation is accepted, an announcement about the new PMC member is made to the developer mailing list.</p>
-<h3 id="exceptions">Exceptions<a class="headerlink" href="#exceptions" title="Permanent link">&para;</a></h3>
+<h4 id="exceptions">Exceptions<a class="headerlink" href="#exceptions" title="Permanent link">&para;</a></h4>
 <p>It is not strictly necessary to be a Committer first in order to become a PMC member. In some cases, the PMC may feel that an individual may offer needed management expertise to the project. Such individuals can be nominated by PMC members. Any such newly accepted PMC members will also be given Committer status.</p>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1700393 by cziegeler on Tue, 1 Sep 2015 06:04:06 +0000
+        Rev. 1874733 by cziegeler on Tue, 3 Mar 2020 15:25:32 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Felix, Felix, Apache, the Apache feather logo, and the Apache Felix project

Modified: websites/staging/felix/trunk/content/documentation/community/contributing.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/community/contributing.html (original)
+++ websites/staging/felix/trunk/content/documentation/community/contributing.html Tue Mar  3 15:27:03 2020
@@ -89,21 +89,39 @@ h2:hover > .headerlink, h3:hover > .head
 }
 h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
 <p>Apache Felix is a volunteer effort, so there is always plenty of work that needs to be accomplished. If you want to help support Felix, this page is intended as a starting point for specific contribution ideas. To further understand how the Felix community operates, refer to the <a href="/documentation/community/apache-felix-community-roles-and-processes.html">Community Roles and Processes</a> document and/or join the [mailing lists|mailinglists].</p>
-<p>The Felix project organizes its "to do" list using the <a href="http://issues.apache.org/jira/browse/Felix">JIRA</a> issue tracking system. Specific items from Felix' JIRA issue tracking system are highlighted on this page, but are not limited to it. The purpose of the list here is to highlight issues that are either more important or serve as good entry points for new contributors.</p>
+<p>The Felix project organizes its "to do" list using the <a href="https://issues.apache.org/jira/browse/Felix">JIRA</a> issue tracking system. Specific items from Felix' JIRA issue tracking system are highlighted on this page, but are not limited to it. The purpose of the list here is to highlight issues that are either more important or serve as good entry points for new contributors.</p>
 <p>It is important to point out that you do not need to be a programmer to contribute to Felix. As such, we will break out the list of issues below for non-programmers and programmers.</p>
 <h2 id="non-programmers">Non-Programmers<a class="headerlink" href="#non-programmers" title="Permanent link">&para;</a></h2>
 <ul>
-<li>Improve web site or documentation (e.g., create/propose FAQ entries). There is no specific JIRA issue for this task, but any contributions could be posted as new JIRA issues for the <a href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;mode=hide&amp;pid=12310100&amp;sorter/order=DESC&amp;sorter/field=priority&amp;resolution=-1&amp;component=12312255">Documentation</a> component.</li>
-<li>Define a compatibility documentation legend for bundle subprojects. <a href="http://issues.apache.org/jira/browse/FELIX-537">FELIX-537</a></li>
+<li>Improve web site or documentation (e.g., create/propose FAQ entries). There is no specific JIRA issue for this task, but any contributions could be posted as new JIRA issues for the Documentation component.</li>
 </ul>
 <h2 id="programmers">Programmers<a class="headerlink" href="#programmers" title="Permanent link">&para;</a></h2>
-<ul>
-<li>Write tests for the framework and/or its sub-projects, either using JUnit or the new <a href="http://felix.apache.org/site/bnd-testing-harness.html">BND testing harness</a></li>
-<li>Work on an installer that can install Felix as a daemon/service. <a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;mode=hide&amp;pid=12310100&amp;sorter/order=DESC&amp;sorter/field=priority&amp;resolution=-1&amp;component=12310803">Installer issues</a></li>
-<li>Browse issues in <a href="http://issues.apache.org/jira/browse/Felix">JIRA</a> and submit a patch.</li>
-</ul>
+<p>Before contributing, make sure to be subscribed to the [developer mailing list|mailinglists]. If you don't have your own issue to scratch, you can browse open issues in <a href="https://issues.apache.org/jira/browse/Felix">JIRA</a> and submit a patch.</p>
+<p>Source code contributions fall into two categories: pull requests or grants. This document describes both and how to handle each.</p>
+<h3 id="pull-requests">Pull Requests<a class="headerlink" href="#pull-requests" title="Permanent link">&para;</a></h3>
+<p>A pull request is a small change to existing code, typically in response to a bug fix or improvement. If you have created a change, you should:</p>
+<ol>
+<li>Create a <a href="https://issues.apache.org/jira/browse/Felix">JIRA</a> issue (or find a pertinent existing issue) describing the issue needing to be addressed.</li>
+<li>Create a pull requests against the git repository containing the code.</li>
+<li>The pull request will eventually be reviewed and applied (if accepted) by a Felix committer, but feel free to bug us [nicely]() if you get impatient.</li>
+</ol>
+<p>Providing pull requests is a very good way to become a committer at Felix, since we'd rather have you review and apply the patches than us. :-)</p>
+<h3 id="grants">Grants<a class="headerlink" href="#grants" title="Permanent link">&para;</a></h3>
+<p>A grant involves donating a larger chunk of code developed elsewhere. The line dividing a patch and a grant is sort of like the definition of pornography, we know it when we see it. The steps for granting software are a little more complicated since we need to ensure proper IP handling. For grants, you should:</p>
+<ol>
+<li>Verify that you have the authorization to donate the code.</li>
+<li>Review our <a href="/documentation/development.html">developer documentation</a> as well as the general [Apache documentation|https://www.apache.org/foundation/getinvolved.html] to determine whether you would really like be involved with us and how we work.</li>
+<li>Assuming you're still interested, create a <a href="https://issues.apache.org/jira/browse/Felix">JIRA</a> issue describing the code you wish to donate.</li>
+<li>Attach an archive containing the code along with an MD5 signature of the archive to the above issue. You should remove any existing headers from the source files and add the standard Apache header to each. Note that you keep the rights to your code and can do anything with it you want, you will just grant us the right to use it too.</li>
+<li>Allow the community time to discuss the contribution, after which a vote will be called to accept the contribution.</li>
+<li>If the vote passes, then you will need to submit a <a href="https://www.apache.org/licenses/software-grant.txt">software grant</a> form.</li>
+<li>It is also a good idea to submit an <a href="https://www.apache.org/licenses/icla.txt">ICLA</a> to ease future contributions. Depending on the company you work for, they may also want to contribute a [CCLA|https://www.apache.org/licenses/cla-corporate.txt], although this isn't strictly necessary from an Apache point of view, since it is your responsibility to verify your ability to submit an ICLA.</li>
+<li>Once all of this information is received, then we will gather it and perform <a href="https://incubator.apache.org/ip-clearance/index.html">IP clearance</a>.</li>
+<li>After a few days, if no red flags are raised, then we'll commit the code and we're good to go.</li>
+</ol>
+<p>Granting code is also a path to committership at Felix, since we look more highly on contributions from developers who wish to stay involved in the continuing evolution and maintenance of the donated code.</p>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1712487 by cziegeler on Wed, 4 Nov 2015 07:41:18 +0000
+        Rev. 1874733 by cziegeler on Tue, 3 Mar 2020 15:25:32 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Felix, Felix, Apache, the Apache feather logo, and the Apache Felix project

Modified: websites/staging/felix/trunk/content/documentation/community/projects-using-felix.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/community/projects-using-felix.html (original)
+++ websites/staging/felix/trunk/content/documentation/community/projects-using-felix.html Tue Mar  3 15:27:03 2020
@@ -90,10 +90,10 @@ h2:hover > .headerlink, h3:hover > .head
 h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
 <p>This page highlights projects that use Apache Felix (listed alphabetically):</p>
 <ul>
-<li><a href="http://karaf.apache.org">Apache Karaf</a> - A small, OSGi-based runtime that provides a lightweight container into which various components and applications can be deployed (formerly an Apache Felix subproject).</li>
-<li><a href="http://servicemix.apache.org/">Apache ServiceMix</a> - an Enterprise Service Bus (using Felix via Karaf).</li>
-<li><a href="http://incubator.apache.org/sling/">Apache Sling</a> - a JCR content based web application framework</li>
-<li><a href="http://incubator.apache.org/tuscany/">Apache Tuscany</a> - an open source implementation of [SCA|http://www.oasis-opencsa.org/].</li>
+<li><a href="https://karaf.apache.org">Apache Karaf</a> - A small, OSGi-based runtime that provides a lightweight container into which various components and applications can be deployed (formerly an Apache Felix subproject).</li>
+<li><a href="https://servicemix.apache.org/">Apache ServiceMix</a> - an Enterprise Service Bus (using Felix via Karaf).</li>
+<li><a href="https://sling.apache.org/">Apache Sling</a> - a framework for RESTful web-applications based on an extensible content tree</li>
+<li><a href="https://tuscany.apache.org/">Apache Tuscany</a> - an open source implementation of [SCA|http://www.oasis-opencsa.org/].</li>
 <li><a href="http://www.ascert.com/">Ascert VersaTest</a> - enterprise system testing platform</li>
 <li><a href="http://www.requea.com/dysoweb/rq/en/archi/dysoweb">DySoWeb</a> - A platform for dynamic component deployment.</li>
 <li><a href="http://glassfish.dev.java.net">GlassFish</a> - JavaEE application server.</li>
@@ -101,7 +101,7 @@ h2:hover > .headerlink, h3:hover > .head
 <li><a href="https://sip-communicator.dev.java.net/">SIP Communicator</a> - a multi-protocol instant messenger and SIP software phone.</li>
 </ul>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1700393 by cziegeler on Tue, 1 Sep 2015 06:04:06 +0000
+        Rev. 1874733 by cziegeler on Tue, 3 Mar 2020 15:25:32 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Felix, Felix, Apache, the Apache feather logo, and the Apache Felix project

Modified: websites/staging/felix/trunk/content/documentation/development.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/development.html (original)
+++ websites/staging/felix/trunk/content/documentation/development.html Tue Mar  3 15:27:03 2020
@@ -93,13 +93,9 @@ h2:hover > .headerlink, h3:hover > .head
 <li><a href="/documentation/development/bnd-testing-harness.html">BND Testing Harness</a></li>
 <li><a href="/documentation/development/building-felix.html">Building Apache Felix</a></li>
 <li><a href="/documentation/development/coding-standards.html">Coding Standards</a></li>
-<li><a href="/documentation/development/committers.html">Committers</a></li>
 <li><a href="/documentation/development/dependencies-file-template.html">DEPENDENCIES file template</a></li>
-<li><a href="/documentation/development/integrating-felix-with-eclipse.html">Integrating Felix with Eclipse</a></li>
-<li><a href="/documentation/development/integrating-felix-with-netbeans.html">Integrating Felix with NetBeans</a></li>
 <li><a href="/documentation/development/issue-tracking.html">Issue Tracking</a></li>
 <li><a href="/documentation/development/osgi-specification-implementations.html">OSGi Specification Implementations</a></li>
-<li><a href="/documentation/development/project-management-committee-pmc.html">Project Management Committee (PMC)</a></li>
 <li><a href="/documentation/development/provisional-osgi-api-policy.html">Provisional OSGi API Policy</a></li>
 <li><a href="/documentation/development/release-management-nexus.html">Release Management</a></li>
 <li><a href="/documentation/development/source-code.html">Source Code</a></li>

Modified: websites/staging/felix/trunk/content/documentation/development/release-management-nexus.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/development/release-management-nexus.html (original)
+++ websites/staging/felix/trunk/content/documentation/development/release-management-nexus.html Tue Mar  3 15:27:03 2020
@@ -229,7 +229,7 @@ This vote will be open for 72 hours.
 <blockquote>
 <p>Votes on whether a package is ready to be released follow a format similar to majority approval  -- except that the decision is officially determined solely by whether at least three +1 votes were registered. Releases may not be vetoed. Generally the community will table the vote to release if anyone identifies serious problems, but in most cases the ultimate decision, once three or more positive votes have been garnered, lies with the individual serving as release manager. The specifics of the process may vary from project to project, but the 'minimum of three +1 votes' rule is universal.</p>
 </blockquote>
-<p>The list of binding voters is available at <a href="/documentation/development/project-management-committee-pmc.html">Project Management Committee (PMC)</a></p>
+<p>The list of binding voters is available at <a href=""></a></p>
 <p>If the vote is successful, post the result to the dev list - for example:</p>
 <div class="codehilite"><pre>To: &quot;Felix Developers List&quot; &lt;dev@felix.apache.org&gt;
 Subject: [RESULT] [VOTE] Release Felix XXX version Y.Z

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-framework.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-framework.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-framework.html Tue Mar  3 15:27:03 2020
@@ -91,14 +91,10 @@ h2:hover > .headerlink, h3:hover > .head
 <p>The Felix Framework subproject is an implementation of the OSGi R6 core framework specification.</p>
 <h2 id="framework-documentation">Framework documentation<a class="headerlink" href="#framework-documentation" title="Permanent link">&para;</a></h2>
 <ul>
-<li><a href="/documentation/subprojects/apache-felix-framework/apache-felix-framework-and-alternative-java-vms.html">Apache Felix Framework and Alternative Java VMs</a></li>
-<li><a href="/documentation/subprojects/apache-felix-framework/apache-felix-framework-and-google-android.html">Apache Felix Framework and Google Android</a></li>
 <li><a href="/documentation/subprojects/apache-felix-framework/apache-felix-framework-bundle-cache.html">Apache Felix Framework Bundle Cache</a></li>
 <li><a href="/documentation/subprojects/apache-felix-framework/apache-felix-framework-configuration-properties.html">Apache Felix Framework Configuration Properties</a></li>
 <li><a href="/documentation/subprojects/apache-felix-framework/apache-felix-framework-faq.html">Apache Felix Framework Frequently Asked Questions</a></li>
 <li><a href="/documentation/subprojects/apache-felix-framework/apache-felix-framework-launching-and-embedding.html">Apache Felix Framework Launching and Embedding</a></li>
-<li><a href="/documentation/subprojects/apache-felix-framework/apache-felix-framework-osgi-r4-2-ct-results.html">Apache Felix Framework OSGi R4.2 CT Results</a></li>
-<li><a href="/documentation/subprojects/apache-felix-framework/apache-felix-framework-osgi-r4-3-ct-results.html">Apache Felix Framework OSGi R4.3 CT Results</a></li>
 <li><a href="/documentation/subprojects/apache-felix-framework/apache-felix-framework-usage-documentation.html">Apache Felix Framework Usage Documentation</a></li>
 </ul>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-framework/apache-felix-framework-faq.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-framework/apache-felix-framework-faq.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-framework/apache-felix-framework-faq.html Tue Mar  3 15:27:03 2020
@@ -98,7 +98,7 @@ h2:hover > .headerlink, h3:hover > .head
 </ul>
 </div>
 <h2 id="is-the-felix-framework-compliant-with-the-osgi-specification">Is the Felix framework compliant with the OSGi specification?<a class="headerlink" href="#is-the-felix-framework-compliant-with-the-osgi-specification" title="Permanent link">&para;</a></h2>
-<p>Refer to the <a href="/documentation/subprojects/apache-felix-framework/apache-felix-framework-osgi-r4-2-ct-results.html">Apache Felix Framework OSGi R4.2 CT Results</a> document.</p>
+<p>Refer to the <a href="">Apache Felix Framework OSGi R4.2 CT Results</a> document.</p>
 <h2 id="if-i-use-bundles-from-felix-will-my-application-be-tied-to-the-felix-framework">If I use bundles from Felix, will my application be tied to the Felix framework?<a class="headerlink" href="#if-i-use-bundles-from-felix-will-my-application-be-tied-to-the-felix-framework" title="Permanent link">&para;</a></h2>
 <p>See the answer in the <a href="">OSGi FAQ</a>.</p>
 <h2 id="when-i-update-my-bundle-why-are-my-bundles-old-classes-still-being-used">When I update my bundle, why are my bundle's old classes still being used?<a class="headerlink" href="#when-i-update-my-bundle-why-are-my-bundles-old-classes-still-being-used" title="Permanent link">&para;</a></h2>

Modified: websites/staging/felix/trunk/content/documentation/tutorials-examples-and-presentations.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/tutorials-examples-and-presentations.html (original)
+++ websites/staging/felix/trunk/content/documentation/tutorials-examples-and-presentations.html Tue Mar  3 15:27:03 2020
@@ -92,7 +92,6 @@ h2:hover > .headerlink, h3:hover > .head
 <li><a href="/documentation/tutorials-examples-and-presentations/apache-felix-application-demonstration.html">Apache Felix Application Demonstration</a></li>
 <li><a href="/documentation/tutorials-examples-and-presentations/apache-felix-osgi-faq.html">OSGi Frequently Asked Questions</a></li>
 <li><a href="/documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial.html">Apache Felix OSGi Tutorial</a></li>
-<li><a href="/documentation/tutorials-examples-and-presentations/checking-out-and-building-felix-with-netbeans.html">Checking Out and Building Felix with NetBeans</a></li>
 <li><a href="/documentation/tutorials-examples-and-presentations/presentations.html">Felix &amp; OSGi  Presentations</a></li>
 </ul>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">

Modified: websites/staging/felix/trunk/content/sitemap.html
==============================================================================
--- websites/staging/felix/trunk/content/sitemap.html (original)
+++ websites/staging/felix/trunk/content/sitemap.html Tue Mar  3 15:27:03 2020
@@ -92,9 +92,7 @@ h2:hover > .headerlink, h3:hover > .head
 <li><a href="/documentation.html">Documentation</a><ul>
 <li><a href="/documentation/community.html">Community Documentation</a><ul>
 <li><a href="/documentation/community/apache-felix-community-roles-and-processes.html">Apache Felix Community Roles and Processes</a></li>
-<li><a href="/documentation/community/contributing-source-code.html">Contributing Source Code</a></li>
 <li><a href="/documentation/community/contributing.html">Contributing</a></li>
-<li><a href="/documentation/community/felix-r4-contributions.html">Felix R4 OSGi Service Platform Contributions</a></li>
 <li><a href="/documentation/community/projects-using-felix.html">Projects Using Felix</a></li>
 </ul>
 </li>
@@ -102,13 +100,9 @@ h2:hover > .headerlink, h3:hover > .head
 <li><a href="/documentation/development/bnd-testing-harness.html">BND Testing Harness</a></li>
 <li><a href="/documentation/development/building-felix.html">Building Apache Felix</a></li>
 <li><a href="/documentation/development/coding-standards.html">Coding Standards</a></li>
-<li><a href="/documentation/development/committers.html">Committers</a></li>
 <li><a href="/documentation/development/dependencies-file-template.html">DEPENDENCIES file template</a></li>
-<li><a href="/documentation/development/integrating-felix-with-eclipse.html">Integrating Felix with Eclipse</a></li>
-<li><a href="/documentation/development/integrating-felix-with-netbeans.html">Integrating Felix with NetBeans</a></li>
 <li><a href="/documentation/development/issue-tracking.html">Issue Tracking</a></li>
 <li><a href="/documentation/development/osgi-specification-implementations.html">OSGi Specification Implementations</a></li>
-<li><a href="/documentation/development/project-management-committee-pmc.html">Project Management Committee (PMC)</a></li>
 <li><a href="/documentation/development/provisional-osgi-api-policy.html">Provisional OSGi API Policy</a></li>
 <li><a href="/documentation/development/release-management-nexus.html">Release Management</a></li>
 <li><a href="/documentation/development/source-code.html">Source Code</a></li>
@@ -136,14 +130,10 @@ h2:hover > .headerlink, h3:hover > .head
 <li><a href="/documentation/subprojects/apache-felix-file-install.html">Apache Felix File Install</a></li>
 <li><a href="/documentation/subprojects/apache-felix-framework-security.html">Apache Felix Framework Security</a></li>
 <li><a href="/documentation/subprojects/apache-felix-framework.html">Apache Felix Framework</a><ul>
-<li><a href="/documentation/subprojects/apache-felix-framework/apache-felix-framework-and-alternative-java-vms.html">Apache Felix Framework and Alternative Java VMs</a></li>
-<li><a href="/documentation/subprojects/apache-felix-framework/apache-felix-framework-and-google-android.html">Apache Felix Framework and Google Android</a></li>
 <li><a href="/documentation/subprojects/apache-felix-framework/apache-felix-framework-bundle-cache.html">Apache Felix Framework Bundle Cache</a></li>
 <li><a href="/documentation/subprojects/apache-felix-framework/apache-felix-framework-configuration-properties.html">Apache Felix Framework Configuration Properties</a></li>
 <li><a href="/documentation/subprojects/apache-felix-framework/apache-felix-framework-faq.html">Apache Felix Framework Frequently Asked Questions</a></li>
 <li><a href="/documentation/subprojects/apache-felix-framework/apache-felix-framework-launching-and-embedding.html">Apache Felix Framework Launching and Embedding</a></li>
-<li><a href="/documentation/subprojects/apache-felix-framework/apache-felix-framework-osgi-r4-2-ct-results.html">Apache Felix Framework OSGi R4.2 CT Results</a></li>
-<li><a href="/documentation/subprojects/apache-felix-framework/apache-felix-framework-osgi-r4-3-ct-results.html">Apache Felix Framework OSGi R4.3 CT Results</a></li>
 <li><a href="/documentation/subprojects/apache-felix-framework/apache-felix-framework-usage-documentation.html">Apache Felix Framework Usage Documentation</a></li>
 </ul>
 </li>
@@ -263,7 +253,6 @@ h2:hover > .headerlink, h3:hover > .head
 <li><a href="/documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-9.html">Apache Felix Tutorial Example 9</a></li>
 </ul>
 </li>
-<li><a href="/documentation/tutorials-examples-and-presentations/checking-out-and-building-felix-with-netbeans.html">Checking Out and Building Felix with NetBeans</a></li>
 <li><a href="/documentation/tutorials-examples-and-presentations/presentations.html">Felix & OSGi  Presentations</a></li>
 </ul>
 </li>