Author: buildbot
Date: Thu Mar 12 11:10:14 2015
New Revision: 943494

Log:
Staging update by buildbot for felix

Modified:
    websites/staging/felix/trunk/content/   (props changed)
    websites/staging/felix/trunk/content/apidocs/index.html
    websites/staging/felix/trunk/content/documentation.html
    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-source-code.html
    
websites/staging/felix/trunk/content/documentation/community/contributing.html
    
websites/staging/felix/trunk/content/documentation/community/felix-r4-contributions.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/bnd-testing-harness.html
    
websites/staging/felix/trunk/content/documentation/development/building-felix.html
    
websites/staging/felix/trunk/content/documentation/development/coding-standards.html
    
websites/staging/felix/trunk/content/documentation/development/committers.html
    
websites/staging/felix/trunk/content/documentation/development/dependencies-file-template.html
    
websites/staging/felix/trunk/content/documentation/development/dependencies.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/issue-tracking.html
    
websites/staging/felix/trunk/content/documentation/development/osgi-specification-implementations.html
    
websites/staging/felix/trunk/content/documentation/development/project-management-committee-pmc.html
    
websites/staging/felix/trunk/content/documentation/development/provisional-osgi-api-policy.html
    
websites/staging/felix/trunk/content/documentation/development/release-management-nexus.html
    websites/staging/felix/trunk/content/documentation/development/roadmap.html
    
websites/staging/felix/trunk/content/documentation/development/source-code.html
    
websites/staging/felix/trunk/content/documentation/development/svn-repository-structure.html
    
websites/staging/felix/trunk/content/documentation/development/using-the-osgi-compliance-tests.html
    websites/staging/felix/trunk/content/documentation/faqs.html
    
websites/staging/felix/trunk/content/documentation/faqs/apache-felix-bundle-plugin-faq.html
    
websites/staging/felix/trunk/content/documentation/faqs/apache-felix-scr-plugin-faq.html
    websites/staging/felix/trunk/content/documentation/getting-started.html
    websites/staging/felix/trunk/content/documentation/subprojects.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-autoconf.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-commons.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-commons/creating-bundles-using-bnd.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-config-admin.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/guides/annotations.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/guides/background.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/guides/bundles-and-dependencies.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/guides/design-patterns.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/guides/development.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/guides/history.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/guides/javadocs.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/guides/migrating-from-earlier-versions.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/guides/migrating-from-other-solutions.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/guides/performance-tuning.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/guides/resources.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/guides/whatsnew.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/component-adapter.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/component-aspect.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/component-bundle-adapter.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/component-factory-configuration-adapter.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/component-resource-adapter.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/component-singleton.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/components.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/dependencies.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/dependency-bundle.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/dependency-configuration.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/dependency-resource.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/dependency-service.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/external-links.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/thread-model.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/tutorials/getting-started.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/tutorials/leveraging-the-shell.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/tutorials/working-with-annotations.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-deployment-admin.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-event-admin.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-file-install.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-framework-security.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-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-bundle-cache.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-framework/apache-felix-framework-configuration-properties.html
    
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-launching-and-embedding.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/subprojects/apache-felix-framework/apache-felix-framework-usage-documentation.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-gogo.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-gogo/rfc-147-overview.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-http-service.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-inventory.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-jaas.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-lightweight-http-service.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-log.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-manifest-generator-mangen.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-maven-bundle-plugin-bnd.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-maven-obr-plugin.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-maven-osgi-plugin.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-maven-scr-plugin.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-maven-scr-plugin/apache-felix-maven-scr-plugin-use.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-maven-scr-plugin/apache-felix-scr-ant-task-use.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-maven-scr-plugin/apache-felix-scr-bndtools-use.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-maven-scr-plugin/extending-scr-annotations.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-maven-scr-plugin/scr-annotations.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-maven-scr-plugin/scr-javadoc-tags.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-metatype-service.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-osgi-bundle-repository.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-osgi-core.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-preferences-service.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-remote-shell.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-script-console-plugin.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-serialization-framework.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-service-component-runtime.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-shell-tui.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-shell.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-sigil.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-sigil/sigil-contributing.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-sigil/sigil-key-features.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-sigil/sigil-key-features/apache-felix-sigil-eclipse.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-sigil/sigil-key-features/apache-felix-sigil-eclipse/apache-felix-sigil-eclipse-features.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-sigil/sigil-road-map.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-sigil/sigil-user-guide.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-sigil/sigil-user-guide/sigil-installation.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-sigil/sigil-user-guide/sigil-ivy.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-sigil/sigil-user-guide/sigil-ivy/apache-felix-sigil-ivy-quickstart.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-sigil/sigil-user-guide/sigil-ivy/apache-felix-sigil-ivy-settings.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-sigil/sigil-user-guide/sigil-junit.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-sigil/sigil-user-guide/sigil-projects.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-sigil/sigil-user-guide/sigil-properties.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-sigil/sigil-user-guide/sigil-repositories.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-sigil/sigil-user-guide/sigil-repositories/apache-felix-sigil-filesystem.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-sigil/sigil-user-guide/sigil-repositories/apache-felix-sigil-obr.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-upnp.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-upnp/upnp-acknowledgments.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-upnp/upnp-driver-architecture.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-upnp/upnp-getting-started.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-upnp/upnp-known-issues.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-upnp/upnp-testing-devices.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-upnp/upnp-testing-devices/upnp-examples.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-upnp/upnp-testing-devices/upnp-examples/upnp-writing-cd-and-cp.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-user-admin.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-user-admin/apache-felix-user-admin-background.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-user-admin/apache-felix-user-admin-file-store.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-user-admin/apache-felix-user-admin-getting-started.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-user-admin/apache-felix-user-admin-introduction.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-user-admin/apache-felix-user-admin-mongodb-store.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-web-console.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-web-console/extending-the-apache-felix-web-console.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/branding-the-web-console.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/providing-resources.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/providing-web-console-plugins.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/web-console-logging.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/web-console-output-templating.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-web-console/web-console-restful-api.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-web-console/web-console-security-provider.html
    
websites/staging/felix/trunk/content/documentation/subprojects/mosgi-managed-osgi-framework.html
    
websites/staging/felix/trunk/content/documentation/subprojects/mosgi-managed-osgi-framework/probeguide.html
    
websites/staging/felix/trunk/content/documentation/tutorials-examples-and-presentations.html
    
websites/staging/felix/trunk/content/documentation/tutorials-examples-and-presentations/apache-felix-application-demonstration.html
    
websites/staging/felix/trunk/content/documentation/tutorials-examples-and-presentations/apache-felix-osgi-faq.html
    
websites/staging/felix/trunk/content/documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial.html
    
websites/staging/felix/trunk/content/documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-1.html
    
websites/staging/felix/trunk/content/documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-2.html
    
websites/staging/felix/trunk/content/documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-2b.html
    
websites/staging/felix/trunk/content/documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-3.html
    
websites/staging/felix/trunk/content/documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-4.html
    
websites/staging/felix/trunk/content/documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-5.html
    
websites/staging/felix/trunk/content/documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-6.html
    
websites/staging/felix/trunk/content/documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-7.html
    
websites/staging/felix/trunk/content/documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-8.html
    
websites/staging/felix/trunk/content/documentation/tutorials-examples-and-presentations/checking-out-and-building-felix-with-netbeans.html
    
websites/staging/felix/trunk/content/documentation/tutorials-examples-and-presentations/presentations.html
    websites/staging/felix/trunk/content/downloads.html
    websites/staging/felix/trunk/content/errors/403.html
    websites/staging/felix/trunk/content/errors/404.html
    websites/staging/felix/trunk/content/index.html
    websites/staging/felix/trunk/content/license.html
    websites/staging/felix/trunk/content/links.html
    websites/staging/felix/trunk/content/mailinglists.html
    websites/staging/felix/trunk/content/media.html
    websites/staging/felix/trunk/content/miscellaneous.html
    websites/staging/felix/trunk/content/miscellaneous/apache-karaf.html
    websites/staging/felix/trunk/content/miscellaneous/board-reports.html
    
websites/staging/felix/trunk/content/miscellaneous/board-reports/apache-felix-board-report-template.html
    
websites/staging/felix/trunk/content/miscellaneous/board-reports/board-report-2007-04.html
    
websites/staging/felix/trunk/content/miscellaneous/board-reports/board-report-2007-05.html
    
websites/staging/felix/trunk/content/miscellaneous/board-reports/board-report-2007-06.html
    
websites/staging/felix/trunk/content/miscellaneous/board-reports/board-report-2007-09.html
    
websites/staging/felix/trunk/content/miscellaneous/board-reports/board-report-2007-12.html
    
websites/staging/felix/trunk/content/miscellaneous/board-reports/board-report-2008-03.html
    
websites/staging/felix/trunk/content/miscellaneous/board-reports/board-report-2008-06.html
    
websites/staging/felix/trunk/content/miscellaneous/board-reports/board-report-2008-09.html
    
websites/staging/felix/trunk/content/miscellaneous/board-reports/board-report-2008-12.html
    
websites/staging/felix/trunk/content/miscellaneous/board-reports/board-report-2009-03.html
    
websites/staging/felix/trunk/content/miscellaneous/board-reports/board-report-2009-06.html
    
websites/staging/felix/trunk/content/miscellaneous/board-reports/board-report-2009-09.html
    
websites/staging/felix/trunk/content/miscellaneous/board-reports/board-report-2009-12.html
    
websites/staging/felix/trunk/content/miscellaneous/board-reports/board-report-2010-03.html
    
websites/staging/felix/trunk/content/miscellaneous/board-reports/board-report-2010-06.html
    
websites/staging/felix/trunk/content/miscellaneous/board-reports/board-report-2010-09.html
    
websites/staging/felix/trunk/content/miscellaneous/board-reports/board-report-2010-12.html
    
websites/staging/felix/trunk/content/miscellaneous/board-reports/board-report-2011-03.html
    
websites/staging/felix/trunk/content/miscellaneous/board-reports/board-report-2011-06.html
    
websites/staging/felix/trunk/content/miscellaneous/board-reports/board-report-2011-09.html
    
websites/staging/felix/trunk/content/miscellaneous/board-reports/board-report-2011-12.html
    
websites/staging/felix/trunk/content/miscellaneous/board-reports/board-report-2012-03.html
    
websites/staging/felix/trunk/content/miscellaneous/board-reports/board-report-2012-06.html
    
websites/staging/felix/trunk/content/miscellaneous/board-reports/board-report-2012-09.html
    
websites/staging/felix/trunk/content/miscellaneous/board-reports/board-report-2012-12.html
    
websites/staging/felix/trunk/content/miscellaneous/board-reports/board-report-2013-03.html
    
websites/staging/felix/trunk/content/miscellaneous/cat-scan-project-proposal.html
    
websites/staging/felix/trunk/content/miscellaneous/cat-scan-project-proposal/cat-scan-001-use-cases.html
    
websites/staging/felix/trunk/content/miscellaneous/cat-scan-project-proposal/cat-scan-002-profiles.html
    
websites/staging/felix/trunk/content/miscellaneous/cat-scan-project-proposal/cat-scan-002-profiles/cat-scan-002-001-basic-profile.html
    
websites/staging/felix/trunk/content/miscellaneous/cat-scan-project-proposal/cat-scan-003-run-log-archive.html
    
websites/staging/felix/trunk/content/miscellaneous/cat-scan-project-proposal/cat-scan-004-api-reference.html
    
websites/staging/felix/trunk/content/miscellaneous/cat-scan-project-proposal/cat-scan-005-technical-compatibility-kit.html
    
websites/staging/felix/trunk/content/miscellaneous/cat-scan-project-proposal/cat-scan-006-glossary.html
    
websites/staging/felix/trunk/content/miscellaneous/cat-scan-project-proposal/cat-scan-007-references.html
    
websites/staging/felix/trunk/content/miscellaneous/incubator-status-report-january-2007.html
    
websites/staging/felix/trunk/content/miscellaneous/incubator-status-report-october-2006.html
    
websites/staging/felix/trunk/content/miscellaneous/osgi-bundle-service-diagrams.html
    websites/staging/felix/trunk/content/miscellaneous/sandbox.html
    
websites/staging/felix/trunk/content/miscellaneous/sandbox/composite-bundles.html
    
websites/staging/felix/trunk/content/miscellaneous/sandbox/virtual-bundles.html
    
websites/staging/felix/trunk/content/miscellaneous/sandbox/web-console-ng.html
    
websites/staging/felix/trunk/content/miscellaneous/subproject-release-status.html
    websites/staging/felix/trunk/content/miscellaneous/tlp-task-list.html
    websites/staging/felix/trunk/content/news.html
    websites/staging/felix/trunk/content/sitemap.html

Propchange: websites/staging/felix/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Thu Mar 12 11:10:14 2015
@@ -1 +1 @@
-1666126
+1666137

Modified: websites/staging/felix/trunk/content/apidocs/index.html
==============================================================================
--- websites/staging/felix/trunk/content/apidocs/index.html (original)
+++ websites/staging/felix/trunk/content/apidocs/index.html Thu Mar 12 11:10:14 
2015
@@ -65,8 +65,6 @@
         <a href="/">Home</a>
       </div>
 
-      
-      
       <h1>API Documentations</h1>
       
 <p>

Modified: websites/staging/felix/trunk/content/documentation.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation.html (original)
+++ websites/staging/felix/trunk/content/documentation.html Thu Mar 12 11:10:14 
2015
@@ -65,13 +65,6 @@
         <a href="/">Home</a>
       </div>
 
-      
-      <div class="tip">
-           This page is a translated version of <a 
href="/site/documentation.html" 
target="felix_cwiki">/site/documentation.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>Documentation</h1>
       <p><em>The Felix web site and documentation are managed with the <a 
href="https://www.apache.org/dev/cms.html";>Apache CMS</a>.
 For Apache Felix specific extensions see the <a href="#site-how-to">Site 
How-To</a>

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 Thu Mar 
12 11:10:14 2015
@@ -65,13 +65,6 @@
         <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>
       </div>
 
-      
-      <div class="tip">
-           This page is a translated version of <a href="/site/community.html" 
target="felix_cwiki">/site/community.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>Community Documentation</h1>
       <ul>
 <li><a 
href="/documentation/community/apache-felix-community-roles-and-processes.html">Apache
 Felix Community Roles and Processes</a></li>

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
 Thu Mar 12 11:10:14 2015
@@ -65,13 +65,6 @@
         <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/community.html">Community Documentation</a>
       </div>
 
-      
-      <div class="tip">
-           This page is a translated version of <a 
href="/site/apache-felix-community-roles-and-processes.html" 
target="felix_cwiki">/site/apache-felix-community-roles-and-processes.html</a>. 
In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>Apache Felix Community Roles and Processes</h1>
       <h1 id="roles">Roles</h1>
 <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>

Modified: 
websites/staging/felix/trunk/content/documentation/community/contributing-source-code.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/community/contributing-source-code.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/community/contributing-source-code.html
 Thu Mar 12 11:10:14 2015
@@ -65,13 +65,6 @@
         <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/community.html">Community Documentation</a>
       </div>
 
-      
-      <div class="tip">
-           This page is a translated version of <a 
href="/site/contributing-source-code.html" 
target="felix_cwiki">/site/contributing-source-code.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>Contributing Source Code</h1>
       <h1 id="source-code-contributions">Source Code Contributions</h1>
 <p>Source code contributions fall into two categories: patches or grants. This 
document describes both and how to handle each.</p>

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 
Thu Mar 12 11:10:14 2015
@@ -65,13 +65,6 @@
         <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/community.html">Community Documentation</a>
       </div>
 
-      
-      <div class="tip">
-           This page is a translated version of <a 
href="/site/contributing.html" 
target="felix_cwiki">/site/contributing.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>Contributing</h1>
       <h1 id="contributing">Contributing</h1>
 <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>

Modified: 
websites/staging/felix/trunk/content/documentation/community/felix-r4-contributions.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/community/felix-r4-contributions.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/community/felix-r4-contributions.html
 Thu Mar 12 11:10:14 2015
@@ -65,13 +65,6 @@
         <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/community.html">Community Documentation</a>
       </div>
 
-      
-      <div class="tip">
-           This page is a translated version of <a 
href="/site/felix-r4-contributions.html" 
target="felix_cwiki">/site/felix-r4-contributions.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>Felix R4 contributions</h1>
       <h1 id="felix-r4-osgi-service-platform-contributions">Felix R4 OSGi 
Service Platform Contributions</h1>
 <p>These are the recorded contributions:</p>

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
 Thu Mar 12 11:10:14 2015
@@ -65,13 +65,6 @@
         <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/community.html">Community Documentation</a>
       </div>
 
-      
-      <div class="tip">
-           This page is a translated version of <a 
href="/site/projects-using-felix.html" 
target="felix_cwiki">/site/projects-using-felix.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>Projects Using Felix</h1>
       <p>This page highlights projects that use Apache Felix (listed 
alphabetically):</p>
 <ul>

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 Thu Mar 
12 11:10:14 2015
@@ -65,13 +65,6 @@
         <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>
       </div>
 
-      
-      <div class="tip">
-           This page is a translated version of <a 
href="/site/development.html" target="felix_cwiki">/site/development.html</a>. 
In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>Development</h1>
       <h1 id="development">Development</h1>
 <p>This page contains links related to Felix project development.</p>

Modified: 
websites/staging/felix/trunk/content/documentation/development/bnd-testing-harness.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/development/bnd-testing-harness.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/development/bnd-testing-harness.html
 Thu Mar 12 11:10:14 2015
@@ -65,13 +65,6 @@
         <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/development.html">Development</a>
       </div>
 
-      
-      <div class="tip">
-           This page is a translated version of <a 
href="/site/bnd-testing-harness.html" 
target="felix_cwiki">/site/bnd-testing-harness.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>BND Testing Harness</h1>
       <h1 id="bnd-testing-harness">BND Testing Harness</h1>
 <p>The latest versions of <a href="http://www.aqute.biz/Code/Bnd";>BND</a> have 
testing harness capabilities for JUnit built in. In fact, the OSGi Alliance 
uses BND for its own build and testing system. BND already provided lots of 
support for creating bundles, so testing is perhaps a logical progression of 
those capabilities. This task was simplified by a proposed standard framework 
launching and embedding API for the OSGi R4.2 specification, which BND uses to 
configure and launch OSGi frameworks in a platform-independent way. I should 
note that this BND functionality is in its early stages, so there are some 
rough edges.</p>

Modified: 
websites/staging/felix/trunk/content/documentation/development/building-felix.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/development/building-felix.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/development/building-felix.html
 Thu Mar 12 11:10:14 2015
@@ -65,13 +65,6 @@
         <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/development.html">Development</a>
       </div>
 
-      
-      <div class="tip">
-           This page is a translated version of <a 
href="/site/building-felix.html" 
target="felix_cwiki">/site/building-felix.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>Building Felix</h1>
       <h1 id="building-felix">Building Felix</h1>
 <p>A basic start to checking-out and building Felix:

Modified: 
websites/staging/felix/trunk/content/documentation/development/coding-standards.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/development/coding-standards.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/development/coding-standards.html
 Thu Mar 12 11:10:14 2015
@@ -65,13 +65,6 @@
         <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/development.html">Development</a>
       </div>
 
-      
-      <div class="tip">
-           This page is a translated version of <a 
href="/site/coding-standards.html" 
target="felix_cwiki">/site/coding-standards.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>Coding Standards</h1>
       <h1 id="coding-standards">Coding standards</h1>
 <h2 id="guidelines-summary">Guidelines Summary</h2>

Modified: 
websites/staging/felix/trunk/content/documentation/development/committers.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/development/committers.html 
(original)
+++ 
websites/staging/felix/trunk/content/documentation/development/committers.html 
Thu Mar 12 11:10:14 2015
@@ -65,8 +65,6 @@
         <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/development.html">Development</a>
       </div>
 
-      
-      
       <h1>Committers</h1>
       <ul>
 <li>Adam Wojtuniak</li>

Modified: 
websites/staging/felix/trunk/content/documentation/development/dependencies-file-template.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/development/dependencies-file-template.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/development/dependencies-file-template.html
 Thu Mar 12 11:10:14 2015
@@ -65,13 +65,6 @@
         <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/development.html">Development</a>
       </div>
 
-      
-      <div class="tip">
-           This page is a translated version of <a 
href="/site/dependencies-file-template.html" 
target="felix_cwiki">/site/dependencies-file-template.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>DEPENDENCIES file template</h1>
       <p>Each released software archive must contain a DEPENDENCIES file in it 
to declare third-party dependencies and their licenses. The following template 
should be used:</p>
 <div class="codehilite"><pre><span class="n">Apache</span> <span 
class="n">Felix</span> <span class="n">AAA</span>

Modified: 
websites/staging/felix/trunk/content/documentation/development/dependencies.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/development/dependencies.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/development/dependencies.html
 Thu Mar 12 11:10:14 2015
@@ -65,13 +65,6 @@
         <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/development.html">Development</a>
       </div>
 
-      
-      <div class="tip">
-           This page is a translated version of <a 
href="/site/dependencies.html" 
target="felix_cwiki">/site/dependencies.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>Dependencies</h1>
       <h1 id="dependencies">Dependencies</h1>
 <p>TODO determine how we want to list our dependencies</p>

Modified: 
websites/staging/felix/trunk/content/documentation/development/integrating-felix-with-eclipse.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/development/integrating-felix-with-eclipse.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/development/integrating-felix-with-eclipse.html
 Thu Mar 12 11:10:14 2015
@@ -65,13 +65,6 @@
         <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/development.html">Development</a>
       </div>
 
-      
-      <div class="tip">
-           This page is a translated version of <a 
href="/site/integrating-felix-with-eclipse.html" 
target="felix_cwiki">/site/integrating-felix-with-eclipse.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>Integrating Felix with Eclipse</h1>
       <h1 id="integrating-felix-with-eclipse">Integrating Felix with 
Eclipse</h1>
 <p>This document explains how to launch Felix inside the Eclipse IDE. Then, it 
is possible to use Eclipse debugging facilities to debug bundles.</p>

Modified: 
websites/staging/felix/trunk/content/documentation/development/integrating-felix-with-netbeans.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/development/integrating-felix-with-netbeans.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/development/integrating-felix-with-netbeans.html
 Thu Mar 12 11:10:14 2015
@@ -65,13 +65,6 @@
         <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/development.html">Development</a>
       </div>
 
-      
-      <div class="tip">
-           This page is a translated version of <a 
href="/site/integrating-felix-with-netbeans.html" 
target="felix_cwiki">/site/integrating-felix-with-netbeans.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>Integrating Felix with NetBeans</h1>
       <h1 id="integrating-felix-with-netbeans">Integrating Felix with 
NetBeans</h1>
 <p>This document explains how to launch Felix inside of the NetBeans IDE, 
which makes it possible to use NetBeans debugging and profiling facilities on 
bundles. </p>

Modified: 
websites/staging/felix/trunk/content/documentation/development/issue-tracking.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/development/issue-tracking.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/development/issue-tracking.html
 Thu Mar 12 11:10:14 2015
@@ -65,13 +65,6 @@
         <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/development.html">Development</a>
       </div>
 
-      
-      <div class="tip">
-           This page is a translated version of <a 
href="/site/issue-tracking.html" 
target="felix_cwiki">/site/issue-tracking.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>Issue Tracking</h1>
       <h1 id="issue-tracking">Issue tracking</h1>
 <p>This project uses <a 
href="http://www.atlassian.com/software/jira";>JIRA</a>, a J2EE-based, issue 
tracking and project management application. We use it for bugs, tasks and code 
contributions.</p>

Modified: 
websites/staging/felix/trunk/content/documentation/development/osgi-specification-implementations.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/development/osgi-specification-implementations.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/development/osgi-specification-implementations.html
 Thu Mar 12 11:10:14 2015
@@ -65,13 +65,6 @@
         <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/development.html">Development</a>
       </div>
 
-      
-      <div class="tip">
-           This page is a translated version of <a 
href="/site/osgi-specification-implementations.html" 
target="felix_cwiki">/site/osgi-specification-implementations.html</a>. In case 
of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>OSGi Specification Implementations</h1>
       <p>This page lists the implementations of OSGi specifications provided 
by the Apache Felix project.</p>
 <p>Please help keep it updated...</p>

Modified: 
websites/staging/felix/trunk/content/documentation/development/project-management-committee-pmc.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/development/project-management-committee-pmc.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/development/project-management-committee-pmc.html
 Thu Mar 12 11:10:14 2015
@@ -65,8 +65,6 @@
         <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/development.html">Development</a>
       </div>
 
-      
-      
       <h1>Project Management Committee (PMC)</h1>
       <p>Present members:</p>
 <ul>

Modified: 
websites/staging/felix/trunk/content/documentation/development/provisional-osgi-api-policy.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/development/provisional-osgi-api-policy.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/development/provisional-osgi-api-policy.html
 Thu Mar 12 11:10:14 2015
@@ -65,8 +65,6 @@
         <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/development.html">Development</a>
       </div>
 
-      
-      
       <h1>Provisional OSGi API Policy</h1>
       <p>The OSGi Alliance exposes provisional API that may or may not become 
part of future OSGi specifications.  This policy explains how and when Felix 
subprojects may relate to such API. Provisional OSGi API refers to anything in 
the <code>org.osgi.*</code> package namespace that is not part of a final 
released specification.</p>
 <h2 id="policy">Policy</h2>

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
 Thu Mar 12 11:10:14 2015
@@ -65,8 +65,6 @@
         <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/development.html">Development</a>
       </div>
 
-      
-      
       <h1>Release Management (Nexus)</h1>
       <p><em>This is the new release process for Apache Felix, based on the 
updated Maven <a 
href="http://maven.apache.org/developers/release/releasing.html";>process</a></em></p>
 <h2 id="basics">Basics</h2>

Modified: 
websites/staging/felix/trunk/content/documentation/development/roadmap.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/development/roadmap.html 
(original)
+++ websites/staging/felix/trunk/content/documentation/development/roadmap.html 
Thu Mar 12 11:10:14 2015
@@ -65,13 +65,6 @@
         <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/development.html">Development</a>
       </div>
 
-      
-      <div class="tip">
-           This page is a translated version of <a href="/site/roadmap.html" 
target="felix_cwiki">/site/roadmap.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>Roadmap</h1>
       <h1 id="roadmap">Roadmap</h1>
 <h2 id="release-08">Release 0.8</h2>

Modified: 
websites/staging/felix/trunk/content/documentation/development/source-code.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/development/source-code.html 
(original)
+++ 
websites/staging/felix/trunk/content/documentation/development/source-code.html 
Thu Mar 12 11:10:14 2015
@@ -65,13 +65,6 @@
         <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/development.html">Development</a>
       </div>
 
-      
-      <div class="tip">
-           This page is a translated version of <a 
href="/site/source-code.html" target="felix_cwiki">/site/source-code.html</a>. 
In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>Source Code</h1>
       <p>This project uses <a 
href="http://subversion.apache.org/";>Subversion</a> to manage its source code. 
Instructions on Subversion use can be found at 
[http://svnbook.red-bean.com/].</p>
 <h1 id="web-access">Web Access</h1>

Modified: 
websites/staging/felix/trunk/content/documentation/development/svn-repository-structure.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/development/svn-repository-structure.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/development/svn-repository-structure.html
 Thu Mar 12 11:10:14 2015
@@ -65,13 +65,6 @@
         <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/development.html">Development</a>
       </div>
 
-      
-      <div class="tip">
-           This page is a translated version of <a 
href="/site/svn-repository-structure.html" 
target="felix_cwiki">/site/svn-repository-structure.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>SVN repository structure</h1>
       <p>The Felix SVN repository <code>trunk</code> contains a directory for 
each sub-project, where sub-projects may be further divided into modules as 
appropriate for the specific sub-project. Each sub-project has a single 
directory in the trunk whose name corresponds to the unique base name for the 
sub-project. Consider the following examples:</p>
 <div class="codehilite"><pre><span class="n">felix</span><span 
class="o">/</span>

Modified: 
websites/staging/felix/trunk/content/documentation/development/using-the-osgi-compliance-tests.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/development/using-the-osgi-compliance-tests.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/development/using-the-osgi-compliance-tests.html
 Thu Mar 12 11:10:14 2015
@@ -65,8 +65,6 @@
         <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/development.html">Development</a>
       </div>
 
-      
-      
       <h1>Using the OSGi Compliance Tests</h1>
       <p>The OSGi Alliance provides Apache committers access to its Compliance 
Tests (CT). This
 page describes how to get access to the CTs and how to use them with Felix 
subprojects.</p>

Modified: websites/staging/felix/trunk/content/documentation/faqs.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/faqs.html (original)
+++ websites/staging/felix/trunk/content/documentation/faqs.html Thu Mar 12 
11:10:14 2015
@@ -65,13 +65,6 @@
         <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>
       </div>
 
-      
-      <div class="tip">
-           This page is a translated version of <a href="/site/faqs.html" 
target="felix_cwiki">/site/faqs.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>FAQs</h1>
       <h1 id="frequently-asked-questions">Frequently Asked Questions</h1>
 <ul>

Modified: 
websites/staging/felix/trunk/content/documentation/faqs/apache-felix-bundle-plugin-faq.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/faqs/apache-felix-bundle-plugin-faq.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/faqs/apache-felix-bundle-plugin-faq.html
 Thu Mar 12 11:10:14 2015
@@ -65,13 +65,6 @@
         <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/faqs.html">FAQs</a>
       </div>
 
-      
-      <div class="tip">
-           This page is a translated version of <a 
href="/site/apache-felix-bundle-plugin-faq.html" 
target="felix_cwiki">/site/apache-felix-bundle-plugin-faq.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>Apache Felix Bundle Plugin FAQ</h1>
       <h1 id="apache-felix-bundle-plugin-frequently-asked-questions">Apache 
Felix Bundle Plugin Frequently Asked Questions</h1>
 <div class="toc">

Modified: 
websites/staging/felix/trunk/content/documentation/faqs/apache-felix-scr-plugin-faq.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/faqs/apache-felix-scr-plugin-faq.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/faqs/apache-felix-scr-plugin-faq.html
 Thu Mar 12 11:10:14 2015
@@ -65,8 +65,6 @@
         <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/faqs.html">FAQs</a>
       </div>
 
-      
-      
       <h1>Apache Felix SCR Plugin Frequently Asked Questions</h1>
       <div class="toc">
 <ul>

Modified: 
websites/staging/felix/trunk/content/documentation/getting-started.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/getting-started.html 
(original)
+++ websites/staging/felix/trunk/content/documentation/getting-started.html Thu 
Mar 12 11:10:14 2015
@@ -65,13 +65,6 @@
         <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>
       </div>
 
-      
-      <div class="tip">
-           This page is a translated version of <a 
href="/site/getting-started.html" 
target="felix_cwiki">/site/getting-started.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>Getting Started</h1>
       <h1 id="getting-started">Getting Started</h1>
 <p>For first-time users, here are a few links that might get you started more 
quickly:</p>

Modified: websites/staging/felix/trunk/content/documentation/subprojects.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects.html 
(original)
+++ websites/staging/felix/trunk/content/documentation/subprojects.html Thu Mar 
12 11:10:14 2015
@@ -65,8 +65,6 @@
         <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>
       </div>
 
-      
-      
       <h1>Apache Felix Subproject Documentation</h1>
       <ul>
 <li><a href="/documentation/subprojects/apache-felix-autoconf.html">Apache 
Felix Auto Configuration</a></li>

Modified: 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-autoconf.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-autoconf.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-autoconf.html
 Thu Mar 12 11:10:14 2015
@@ -65,13 +65,6 @@
         <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects.html">Apache Felix Subproject Documentation</a>
       </div>
 
-      
-      <div class="tip">
-           This page is a translated version of <a 
href="/site/apache-felix-autoconf.html" 
target="felix_cwiki">/site/apache-felix-autoconf.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>Apache Felix Auto Configuration</h1>
       <h1 id="apache-felix-auto-configuration">Apache Felix Auto 
Configuration</h1>
 <p>This project implements the OSGi Auto Configuration specification; please 
consult the OSGi Compendium Specification chapter 115 for more information.</p>

Modified: 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-commons.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-commons.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-commons.html
 Thu Mar 12 11:10:14 2015
@@ -65,13 +65,6 @@
         <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects.html">Apache Felix Subproject Documentation</a>
       </div>
 
-      
-      <div class="tip">
-           This page is a translated version of <a 
href="/site/apache-felix-commons.html" 
target="felix_cwiki">/site/apache-felix-commons.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>Apache Felix Commons</h1>
       <h3 id="purpose">Purpose</h3>
 <p>Apache Felix Commons is a community effort to create OSGi bundle 
("bundlized") versions of popular third-party open-source libraries.  Today, 
OSGi developers must create bundles out of third-party libraries within their 
own development communities.  The purpose of Felix Commons is to avoid 
duplicating the effort of bundle creation by sharing these bundlized artifacts. 
 Our hope is that over time, the original developers of the third-party 
libraries can use these bundlized libraries to learn how to add OSGi metadata 
to their project artifacts and to become comfortable with the overall 
non-invasive process.  Felix Commons is thus a large "project" of POMs where 
each bundle POM simply has a dependency on the library it wants to convert.  
The Felix Maven Bundle Plugin will then convert the dependency automatically 
and the bundle will be available via existing Maven infrastructure.</p>

Modified: 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-commons/creating-bundles-using-bnd.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-commons/creating-bundles-using-bnd.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-commons/creating-bundles-using-bnd.html
 Thu Mar 12 11:10:14 2015
@@ -65,13 +65,6 @@
         <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects.html">Apache Felix Subproject 
Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects/apache-felix-commons.html">Apache Felix 
Commons</a>
       </div>
 
-      
-      <div class="tip">
-           This page is a translated version of <a 
href="/site/creating-bundles-using-bnd.html" 
target="felix_cwiki">/site/creating-bundles-using-bnd.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>Creating Bundles Using BND</h1>
       <h5 id="purpose">Purpose</h5>
 <p>Provide the list of steps required to create a library bundle by wrapping 
the library jar using bnd (http://www.aqute.biz/Code/Bnd).</p>

Modified: 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-config-admin.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-config-admin.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-config-admin.html
 Thu Mar 12 11:10:14 2015
@@ -65,8 +65,6 @@
         <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects.html">Apache Felix Subproject Documentation</a>
       </div>
 
-      
-      
       <h1>Apache Felix Configuration Admin Service</h1>
       <p>The OSGi Componendium Configuration Admin Service specifies a 
service, which allows for easy management of configuration data for 
configurable components. Basicaly configuration is a list of name-value pairs. 
Configuration is managed by management applications by asking the Configuration 
Admin Service for such configuration. After updating the configuration, it is 
sent back to the Configuration Admin Service. The Configuration Admin Service 
is like a central hub, which cares for persisting this configuration and also 
for distributing the configuration to interested parties. One class of such 
parties are the components to be configured. These are registered as 
<code>ManagedService</code> services. There is also a notion of 
<code>ManagedServiceFactory</code>, which allows for multiple configurations of 
the same kind to be applied.</p>
 <p>For more information, I suggest you read Chapter 104, Configuration Admin 
Service Specification, of the OSGi Compendium Services Specification book. IMHO 
this is worth reading.</p>

Modified: 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager.html
 Thu Mar 12 11:10:14 2015
@@ -65,8 +65,6 @@
         <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects.html">Apache Felix Subproject Documentation</a>
       </div>
 
-      
-      
       <h1>Apache Felix Dependency Manager</h1>
       <p>Welcome to the Dependency Manager, a great bundle for managing your 
components and dependencies!</p>
 <h2 id="introduction">Introduction</h2>

Modified: 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/guides/annotations.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/guides/annotations.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/guides/annotations.html
 Thu Mar 12 11:10:14 2015
@@ -65,8 +65,6 @@
         <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects.html">Apache Felix Subproject 
Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects/apache-felix-dependency-manager.html">Apache 
Felix Dependency Manager</a>
       </div>
 
-      
-      
       <h1>Dependency Manager - Annotations</h1>
       <p>This section presents a quick overview of the capabilities and usage 
of the DependencyManager Java annotations. In particular, we will recap the 
DependencyManager annotation architecture, and identify some simple usage 
scenarios using a SpellChecker 
 sample application with annotated components. The application is available 
from the felix trunk, in the <code>dependencymanager/samples.annotation</code> 
subproject.</p>

Modified: 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/guides/background.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/guides/background.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/guides/background.html
 Thu Mar 12 11:10:14 2015
@@ -65,8 +65,6 @@
         <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects.html">Apache Felix Subproject 
Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects/apache-felix-dependency-manager.html">Apache 
Felix Dependency Manager</a>
       </div>
 
-      
-      
       <h1>Dependency Manager - Background</h1>
       <h2 id="background">Background</h2>
 <p>In an OSGi framework, services are deployed using bundles and these bundles 
feature two types of dependencies: </p>

Modified: 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/guides/bundles-and-dependencies.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/guides/bundles-and-dependencies.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/guides/bundles-and-dependencies.html
 Thu Mar 12 11:10:14 2015
@@ -65,8 +65,6 @@
         <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects.html">Apache Felix Subproject 
Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects/apache-felix-dependency-manager.html">Apache 
Felix Dependency Manager</a>
       </div>
 
-      
-      
       <h1>Dependency Manager - Bundles and Dependencies</h1>
       <p>The dependency manager project consists of the following bundles. For 
each bundle, we also list its dependencies in the form of package imports, plus 
a suggestion on a bundle that resolves them.</p>
 <ul>

Modified: 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/guides/design-patterns.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/guides/design-patterns.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/guides/design-patterns.html
 Thu Mar 12 11:10:14 2015
@@ -65,8 +65,6 @@
         <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects.html">Apache Felix Subproject 
Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects/apache-felix-dependency-manager.html">Apache 
Felix Dependency Manager</a>
       </div>
 
-      
-      
       <h1>Dependency Manager - Design Patterns</h1>
       <p>This section lists a couple of design patterns as they can be applied 
in an OSGi context.</p>
 <h2 id="singleton-service">Singleton Service</h2>

Modified: 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/guides/development.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/guides/development.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/guides/development.html
 Thu Mar 12 11:10:14 2015
@@ -65,8 +65,6 @@
         <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects.html">Apache Felix Subproject 
Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects/apache-felix-dependency-manager.html">Apache 
Felix Dependency Manager</a>
       </div>
 
-      
-      
       <h1>Dependency Manager - Development</h1>
       <p>When downloading or checking out the source code, please also consult 
release/resources/src/README.src for up to date instructions on how to build 
that particular version.</p>
 <h2 id="prerequisites">Prerequisites</h2>

Modified: 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/guides/history.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/guides/history.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/guides/history.html
 Thu Mar 12 11:10:14 2015
@@ -65,8 +65,6 @@
         <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects.html">Apache Felix Subproject 
Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects/apache-felix-dependency-manager.html">Apache 
Felix Dependency Manager</a>
       </div>
 
-      
-      
       <h1>Dependency Manager - History</h1>
       <p>Dependency Manager has quite a long history, that starts over ten 
years ago.</p>
 <h2 id="the-early-years">The early years</h2>

Modified: 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/guides/javadocs.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/guides/javadocs.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/guides/javadocs.html
 Thu Mar 12 11:10:14 2015
@@ -65,8 +65,6 @@
         <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects.html">Apache Felix Subproject 
Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects/apache-felix-dependency-manager.html">Apache 
Felix Dependency Manager</a>
       </div>
 
-      
-      
       <h1>Dependency Manager - JavaDocs</h1>
       <p>The various Dependency Manager JavaDocs for the API, the Annotations, 
and the Runtime can be found from the <a 
href="http://felix.apache.org/apidocs/";>main felix apidocs homepage</a>.</p>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; 
text-align: right;">

Modified: 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/guides/migrating-from-earlier-versions.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/guides/migrating-from-earlier-versions.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/guides/migrating-from-earlier-versions.html
 Thu Mar 12 11:10:14 2015
@@ -65,8 +65,6 @@
         <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects.html">Apache Felix Subproject 
Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects/apache-felix-dependency-manager.html">Apache 
Felix Dependency Manager</a>
       </div>
 
-      
-      
       <h1>Apache Felix Dependency Manager - Migrating from earlier 
versions</h1>
       <p>Below is a guide to help you migrate from version 3. Whilst older 
versions obviously still exist, we don't think people are still actively using 
them.</p>
 <h2 id="migrating-from-version-3">Migrating from version 3</h2>

Modified: 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/guides/migrating-from-other-solutions.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/guides/migrating-from-other-solutions.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/guides/migrating-from-other-solutions.html
 Thu Mar 12 11:10:14 2015
@@ -65,8 +65,6 @@
         <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects.html">Apache Felix Subproject 
Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects/apache-felix-dependency-manager.html">Apache 
Felix Dependency Manager</a>
       </div>
 
-      
-      
       <h1>Dependency Manager - Migrating from other solutions.</h1>
       
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; 
text-align: right;">

Modified: 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/guides/performance-tuning.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/guides/performance-tuning.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/guides/performance-tuning.html
 Thu Mar 12 11:10:14 2015
@@ -65,8 +65,6 @@
         <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects.html">Apache Felix Subproject 
Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects/apache-felix-dependency-manager.html">Apache 
Felix Dependency Manager</a>
       </div>
 
-      
-      
       <h1>Dependency Manager - Performance Tuning</h1>
       <p>To further tune the performance of an application using Dependency 
Manager and a lot of services, we created the concept of filter indices. They 
work similarly to the way indices speed up relational database queries and are 
explained below.</p>
 <h2 id="filter-indices">Filter Indices</h2>

Modified: 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/guides/resources.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/guides/resources.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/guides/resources.html
 Thu Mar 12 11:10:14 2015
@@ -65,8 +65,6 @@
         <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects.html">Apache Felix Subproject 
Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects/apache-felix-dependency-manager.html">Apache 
Felix Dependency Manager</a>
       </div>
 
-      
-      
       <h1>Dependency Manager - Resource adapters</h1>
       <p>Resource adapters are a special type of adapters which can adapt a 
resource into an OSGi service. These resources can be all kinds of resources, 
e.g. bundle resources, files, database records, anything as long as it can be 
resolved though a URL.</p>
 <p>The diagram below illustrates the classes involved in the resource adapter 
pattern:</p>

Modified: 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/guides/whatsnew.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/guides/whatsnew.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/guides/whatsnew.html
 Thu Mar 12 11:10:14 2015
@@ -65,8 +65,6 @@
         <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects.html">Apache Felix Subproject 
Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects/apache-felix-dependency-manager.html">Apache 
Felix Dependency Manager</a>
       </div>
 
-      
-      
       <h1>Dependency Manager - What&#39;s new in version 4?</h1>
       <p>Even though the focus for this version is to completely redo the 
internals, we also added a few new features to the code. The most important one 
is the new thread model, described directly below. Apart from that we also 
added a few smaller features, enumerated below that.</p>
 <h2 id="new-thread-model">New thread model</h2>

Modified: 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/component-adapter.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/component-adapter.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/component-adapter.html
 Thu Mar 12 11:10:14 2015
@@ -65,8 +65,6 @@
         <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects.html">Apache Felix Subproject 
Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects/apache-felix-dependency-manager.html">Apache 
Felix Dependency Manager</a>
       </div>
 
-      
-      
       <h1>Dependency Manager - Adapter</h1>
       <p>Adapters, like <a href="component-aspect.html">aspects</a>, are used 
to "extend" existing services, and can publish different services based on the 
existing one. An example would be implementing a management interface.</p>
 <p>An adapter will be applied to any service that matches the specified 
interface and filter. For each matching service an adapter will be created 
based on the adapter implementation class. The adapter will be registered with 
the specified interface and existing properties from the original service plus 
any extra properties you supply here. It will also inherit all dependencies, 
and if you declare the original service as a member it will be injected.</p>

Modified: 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/component-aspect.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/component-aspect.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/component-aspect.html
 Thu Mar 12 11:10:14 2015
@@ -65,8 +65,6 @@
         <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects.html">Apache Felix Subproject 
Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects/apache-felix-dependency-manager.html">Apache 
Felix Dependency Manager</a>
       </div>
 
-      
-      
       <h1>Dependency Manager - Aspect</h1>
       <p>Aspects, as part of aspect oriented programming, can be used in a 
dynamic environment such as OSGi to "extend" existing services and add certain 
"capabilities" to them. Examples of these are adding a specific caching 
mechanism to a storage service or implementing logging. Aspects in OSGi can be 
applied to services and can be added and removed at runtime.</p>
 <p>Aspects allow you to define an "interceptor", or chain of interceptors for 
a service to add features like caching or logging, etc. An aspect will be 
applied to any service that matches the specified interface and filter. For 
each matching service an aspect will be created based on the aspect 
implementation class. The aspect will be registered with the same interface and 
properties as the original service, plus any extra properties you supply here. 
It will also inherit all dependencies, and if you declare the original service 
as a member it will be injected.</p>

Modified: 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/component-bundle-adapter.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/component-bundle-adapter.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/component-bundle-adapter.html
 Thu Mar 12 11:10:14 2015
@@ -65,8 +65,6 @@
         <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects.html">Apache Felix Subproject 
Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects/apache-felix-dependency-manager.html">Apache 
Felix Dependency Manager</a>
       </div>
 
-      
-      
       <h1>Dependency Manager - Bundle Adapter</h1>
       <p>Bundle adapters are similar to AdapterService, but instead of 
adapting a 
 service, they adapt a bundle with a certain set of states 
(STARTED|INSTALLED|...), and provide a service on top of it.</p>

Modified: 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/component-factory-configuration-adapter.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/component-factory-configuration-adapter.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/component-factory-configuration-adapter.html
 Thu Mar 12 11:10:14 2015
@@ -65,8 +65,6 @@
         <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects.html">Apache Felix Subproject 
Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects/apache-felix-dependency-manager.html">Apache 
Felix Dependency Manager</a>
       </div>
 
-      
-      
       <h1>Dependency Manager - Factory Configuration Adapter Service</h1>
       <p>A factory configuration adapter service creates an adapter for each 
matching configuration in Configuration Admin. For each new factory 
configuration matching the factoryPid, an adapter will be created based on the 
adapter implementation class. The adapter will be registered with the specified 
interface and with the specified adapter service properties. Depending on the 
propagate parameter, every public factory configuration properties (which don't 
start with ".") will be propagated along with the adapter service properties. 
It will also inherit all dependencies.</p>
 <p>Usage Example:</p>

Modified: 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/component-resource-adapter.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/component-resource-adapter.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/component-resource-adapter.html
 Thu Mar 12 11:10:14 2015
@@ -65,8 +65,6 @@
         <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects.html">Apache Felix Subproject 
Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects/apache-felix-dependency-manager.html">Apache 
Felix Dependency Manager</a>
       </div>
 
-      
-      
       <h1>Dependency Manager - Resource Adapter</h1>
       <p>Resource adapters work just like adapters, but instead of working 
with services, they work with resources. Resources, represented as a URL, are 
an abstraction introduced to provide a generic way of dealing with "blobs" and 
can be resources inside a bundle, filesystem or some kind of data store.</p>
 <p>A resource adapter will be applied to any resource that matches the 
specified filter condition. For each matching resource an adapter will be 
created based on the adapter implementation class. The adapter will be 
registered with the specified interface and existing properties from the 
original resource plus any extra properties you supply here. It will also 
inherit all dependencies, and if you declare the original service as a member 
it will be injected.</p>

Modified: 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/component-singleton.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/component-singleton.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/component-singleton.html
 Thu Mar 12 11:10:14 2015
@@ -65,8 +65,6 @@
         <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects.html">Apache Felix Subproject 
Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects/apache-felix-dependency-manager.html">Apache 
Felix Dependency Manager</a>
       </div>
 
-      
-      
       <h1>Dependency Manager - Singleton Component</h1>
       <p>Components are the main building blocks for OSGi applications. They 
can publish themselves as a service, and they can have dependencies. These 
dependencies will influence their life cycle as component will only be 
activated when all required dependencies are available.</p>
 <p>Usage example:</p>

Modified: 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/components.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/components.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/components.html
 Thu Mar 12 11:10:14 2015
@@ -65,8 +65,6 @@
         <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects.html">Apache Felix Subproject 
Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects/apache-felix-dependency-manager.html">Apache 
Felix Dependency Manager</a>
       </div>
 
-      
-      
       <h1>Dependency Manager - Components</h1>
       <p>Components are declared by the dependency manager and can be 
implemented by POJOs that contain no references to the OSGi framework 
whatsoever. Components are the main building blocks of your OSGi application. 
They have a life cycle, can register themselves as services and have zero or 
more dependencies.</p>
 <p>You can either use the Java API or the Java Annotations and this reference 
section describes both.</p>

Modified: 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/dependencies.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/dependencies.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/dependencies.html
 Thu Mar 12 11:10:14 2015
@@ -65,8 +65,6 @@
         <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects.html">Apache Felix Subproject 
Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects/apache-felix-dependency-manager.html">Apache 
Felix Dependency Manager</a>
       </div>
 
-      
-      
       <h1>Dependency Manager - Dependencies</h1>
       <p>The dependency manager supports many different types of dependencies, 
all of which can be required or optional. A dependency can be added to one or 
more components and it is possible to add them dynamically (even from within 
the component itself if necessary, which allows for some really dynamic 
dependency configuration).</p>
 <h2 id="injection">Injection</h2>


Reply via email to