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 2015/03/12 12:10:17 UTC

svn commit: r943494 [2/4] - in /websites/staging/felix/trunk/content: ./ apidocs/ documentation/ documentation/community/ documentation/development/ documentation/faqs/ documentation/subprojects/ documentation/subprojects/apache-felix-commons/ document...

Modified: 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-bundle.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/dependency-bundle.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 Dependency</h1>
       <p>A bundle dependency allows you to depend on a bundle in a certain set of states, as indicated by a state mask. You can also use a filter condition that is matched against all manifest entries. Finally you can provide a reference to an existing bundle.</p>
 <h2 id="bundledependency">@BundleDependency</h2>

Modified: 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-configuration.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/dependency-configuration.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 - Configuration Dependency</h1>
       <p>A configuration dependency is always required, and allows you to depend on the availability of a valid configuration for your component. Optional configuration dependencies are not supported because in that case you can just as well register as a <code>ManagedService</code> yourself.</p>
 <h2 id="configurationdependency">@ConfigurationDependency</h2>

Modified: 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-resource.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/dependency-resource.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 Dependency</h1>
       <p>A resource dependency allows you to depend on a resource. A resource is a URL and you can use a filter condition based on protocol, host, port, path and URL.</p>
 <h2 id="resourcedependency">@ResourceDependency</h2>

Modified: 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/dependency-service.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/dependency-service.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 - Service Dependency</h1>
       <p>A service dependency allows you to depend on a service, either by type or by using an additional filter condition. You can even depend on an existing service directly by providing a reference to it.</p>
 <h2 id="servicedependency">@ServiceDependency</h2>

Modified: 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/external-links.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/external-links.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 - External Links</h1>
       <p>This page regroups Dependency Manager external articles and related links:</p>
 <ul>

Modified: 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/reference/thread-model.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/thread-model.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 - Thread Model</h1>
       <p>This section gives a brief overview of the default thread model used by Dependency Manager, and also explains how to start and handle components concurrently.</p>
 <h2 id="default-thread-model">Default thread model</h2>

Modified: 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/getting-started.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/tutorials/getting-started.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 - Getting Started</h1>
       <p>When developing an OSGi bundle that has dependencies and possibly registers services, there are two classes in particular we need to implement:</p>
 <ol>

Modified: 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/leveraging-the-shell.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/tutorials/leveraging-the-shell.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 - Leveraging the shell</h1>
       <p>The shell bundle for the dependency manager extends the gogo shell with one new command called "dm". This command can be used to get insight in the actual components and services in a running OSGi framework.</p>
 <p>Typing help <code>help dm</code> in the gogo shell gives an overview of the available command options.</p>

Modified: 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-dependency-manager/tutorials/working-with-annotations.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/tutorials/working-with-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>The Dependency Manager provides a compact and versatile Java API that allows you to declaratively and programmatically register, acquire, and manage dynamic OSGi components. This has many advantages, but also means you need to implement your own <code>BundleActivator</code>. In cases where your dependencies are not that dynamic, an alternative is to use annotations on your component.</p>
 <p>This tutorial outlines how to setup and use such annotations to describe your components and dependencies. We present a simple "Hello World" component defined using annotations, and also explain how to build the bundle using either Bnd, Ant, or Maven.</p>

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-deployment-admin.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-deployment-admin.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-deployment-admin.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-deployment-admin.html" target="felix_cwiki">/site/apache-felix-deployment-admin.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>Apache Felix Deployment Admin</h1>
       <h1 id="apache-felix-deployment-admin">Apache Felix Deployment Admin</h1>
 <p>This project implements the OSGi Deployment Admin specification; please consult the OSGi Compendium Specification chapter 114 for more information.</p>

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-event-admin.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-event-admin.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-event-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 Event Admin</h1>
       <p>The Event Admin Service Specification, part of the OSGi Compendium specification, defines a general inter-bundle communication mechanism. The communication conforms to the popular publish/subscribe paradigm and can be performed in a synchronous or asysnchronous manner.</p>
 <p>The main components in a publish/subscribe communication are:</p>

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-file-install.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-file-install.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-file-install.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-file-install.html" target="felix_cwiki">/site/apache-felix-file-install.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>Apache Felix File Install</h1>
       <h1 id="apache-felix-file-install">Apache Felix File Install</h1>
 <p>File Install is a directory based OSGi management agent. It uses a directory in the file system to install and start a bundle when it is first placed there. It updates the bundle when you update the bundle file in the directory and, when the file is deleted, it will stop and uninstall the bundle.</p>

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-framework-security.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-framework-security.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-framework-security.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-framework-security.html" target="felix_cwiki">/site/apache-felix-framework-security.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>Apache Felix Framework Security</h1>
       <p>The Felix Framework Security subproject is an implementation of the security part of the OSGi R4.2 core specification.</p>
 <h1 id="installing">Installing</h1>

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 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-framework.html" target="felix_cwiki">/site/apache-felix-framework.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>Apache Felix Framework</h1>
       <h1 id="apache-felix-framework">Apache Felix Framework</h1>
 <p>The Felix Framework subproject is an implementation of the OSGi R5 core framework specification.</p>

Modified: 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-alternative-java-vms.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-framework/apache-felix-framework-and-alternative-java-vms.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-framework.html">Apache Felix Framework</a>
       </div>
 
-      
-      <div class="tip">
-           This page is a translated version of <a href="/site/apache-felix-framework-and-alternative-java-vms.html" target="felix_cwiki">/site/apache-felix-framework-and-alternative-java-vms.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>Apache Felix Framework and Alternative Java VMs</h1>
       
       <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-and-google-android.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-framework/apache-felix-framework-and-google-android.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-framework/apache-felix-framework-and-google-android.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-framework.html">Apache Felix Framework</a>
       </div>
 
-      
-      <div class="tip">
-           This page is a translated version of <a href="/site/apache-felix-framework-and-google-android.html" target="felix_cwiki">/site/apache-felix-framework-and-google-android.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>Apache Felix Framework and Google Android</h1>
       <h1 id="apache-felix-framework-and-google-android">Apache Felix Framework and Google Android</h1>
 <p>The purpose of this document is to explain how to use <a href="http://felix.apache.org">Apache Felix</a> on Google's new mobile phone platform - [Android|http://code.google.com/android].</p>

Modified: 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-bundle-cache.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-framework/apache-felix-framework-bundle-cache.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-framework.html">Apache Felix Framework</a>
       </div>
 
-      
-      <div class="tip">
-           This page is a translated version of <a href="/site/apache-felix-framework-bundle-cache.html" target="felix_cwiki">/site/apache-felix-framework-bundle-cache.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>Apache Felix Framework Bundle Cache</h1>
       <h1 id="apache-felix-framework-bundle-cache">Apache Felix Framework Bundle Cache</h1>
 <ul>

Modified: 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-configuration-properties.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-framework/apache-felix-framework-configuration-properties.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-framework.html">Apache Felix Framework</a>
       </div>
 
-      
-      <div class="tip">
-           This page is a translated version of <a href="/site/apache-felix-framework-configuration-properties.html" target="felix_cwiki">/site/apache-felix-framework-configuration-properties.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>Apache Felix Framework Configuration Properties</h1>
       <h1 id="apache-felix-framework-configuration-properties">Apache Felix Framework Configuration Properties</h1>
 <ul>

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 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-framework.html">Apache Felix Framework</a>
       </div>
 
-      
-      <div class="tip">
-           This page is a translated version of <a href="/site/apache-felix-framework-faq.html" target="felix_cwiki">/site/apache-felix-framework-faq.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>Apache Felix Framework FAQ</h1>
       <h1 id="apache-felix-framework-frequently-asked-questions">Apache Felix Framework Frequently Asked Questions</h1>
 <div class="toc">

Modified: 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-launching-and-embedding.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-framework/apache-felix-framework-launching-and-embedding.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-framework.html">Apache Felix Framework</a>
       </div>
 
-      
-      <div class="tip">
-           This page is a translated version of <a href="/site/apache-felix-framework-launching-and-embedding.html" target="felix_cwiki">/site/apache-felix-framework-launching-and-embedding.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>Apache Felix Framework Launching and Embedding</h1>
       <h1 id="apache-felix-framework-launching-and-embedding">Apache Felix Framework Launching and Embedding</h1>
 <p><em>[This document describes framework launching introduced in Felix Framework 2.0.0 and continuing with the latest releases; it is incompatible with older versions of the Felix framework.]()</em></p>

Modified: 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-2-ct-results.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-framework/apache-felix-framework-osgi-r4-2-ct-results.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-framework.html">Apache Felix Framework</a>
       </div>
 
-      
-      <div class="tip">
-           This page is a translated version of <a href="/site/apache-felix-framework-osgi-r4-2-ct-results.html" target="felix_cwiki">/site/apache-felix-framework-osgi-r4-2-ct-results.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>Apache Felix Framework OSGi R4.2 CT Results</h1>
       <h1 id="overview">Overview</h1>
 <p>The following results are for the OSGi R4.2 core framework TCK test suites:</p>

Modified: 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-osgi-r4-3-ct-results.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-framework/apache-felix-framework-osgi-r4-3-ct-results.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-framework.html">Apache Felix Framework</a>
       </div>
 
-      
-      <div class="tip">
-           This page is a translated version of <a href="/site/apache-felix-framework-osgi-r4-3-ct-results.html" target="felix_cwiki">/site/apache-felix-framework-osgi-r4-3-ct-results.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>Apache Felix Framework OSGi R4.3 CT Results</h1>
       <h1 id="overview">Overview</h1>
 <p>The following results are for the OSGi R4.3 core framework TCK test suites:</p>

Modified: 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-framework/apache-felix-framework-usage-documentation.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-framework/apache-felix-framework-usage-documentation.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-framework.html">Apache Felix Framework</a>
       </div>
 
-      
-      
       <h1>Apache Felix Framework Usage Documentation</h1>
       <ul>
 <li><a href="#downloading-the-framework">Downloading the Framework</a></li>

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-gogo.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-gogo.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-gogo.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-gogo.html" target="felix_cwiki">/site/apache-felix-gogo.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>Apache Felix Gogo</h1>
       <h1 id="apache-felix-gogo">Apache Felix Gogo</h1>
 <p>Apache Felix Gogo is a subproject of Apache Felix implementing the OSGi RFC 147, which describes a standard shell for OSGi-based environments. See <a href="/documentation/subprojects/apache-felix-gogo/rfc-147-overview.html">RFC 147 Overview</a> for more information.</p>

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-gogo/rfc-147-overview.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-gogo/rfc-147-overview.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-gogo/rfc-147-overview.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-gogo.html">Apache Felix Gogo</a>
       </div>
 
-      
-      <div class="tip">
-           This page is a translated version of <a href="/site/rfc-147-overview.html" target="felix_cwiki">/site/rfc-147-overview.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>RFC 147 Overview</h1>
       <h1 id="rfc-147-overview">RFC-147 Overview</h1>
 <p>The RFC-147 draft is not yet publicly available. It used to be called RFC-132, which can be found in an <a href="http://www.osgi.org/download/osgi-4.2-early-draft.pdf">early specification draft</a></p>

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-http-service.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-http-service.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-http-service.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 HTTP Service</h1>
       <div class="toc">
 <ul>

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-inventory.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-inventory.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-inventory.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 Inventory Printer</h1>
       <p><a id="top"></a></p>
 <div class="toc">

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-jaas.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-jaas.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-jaas.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 JAAS Support</h1>
       <style type="text/css">
 img {

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-lightweight-http-service.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-lightweight-http-service.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-lightweight-http-service.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-lightweight-http-service.html" target="felix_cwiki">/site/apache-felix-lightweight-http-service.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>Apache Felix Lightweight HTTP Service</h1>
       <h1 id="apache-felix-lightweight-http-service">Apache Felix Lightweight HTTP Service</h1>
 <div class="toc">

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-log.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-log.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-log.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-log.html" target="felix_cwiki">/site/apache-felix-log.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>Apache Felix Log</h1>
       <h1 id="apache-felix-log">Apache Felix Log</h1>
 <p>The OSGi Service Compendium specification defines a general purpose Log Service for the OSGi Platform. It is a very simple specification that doesn't provide all the functionality commonly available in enterprise-level logging tools, but its extensible service model can be used to build fairly sophisticated logging solutions.</p>

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-manifest-generator-mangen.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-manifest-generator-mangen.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-manifest-generator-mangen.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-manifest-generator-mangen.html" target="felix_cwiki">/site/apache-felix-manifest-generator-mangen.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>Apache Felix Manifest Generator (mangen)</h1>
       <h1 id="mangen-osgi-bundle-manifest-generator"><code>mangen</code> - <a href="http://www.osgi.org">OSGi</a> Bundle Manifest generator</h1>
 <h1 id="introduction">Introduction</h1>

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-maven-bundle-plugin-bnd.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-maven-bundle-plugin-bnd.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-maven-bundle-plugin-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>
       </div>
 
-      
-      <div class="tip">
-           This page is a translated version of <a href="/site/apache-felix-maven-bundle-plugin-bnd.html" target="felix_cwiki">/site/apache-felix-maven-bundle-plugin-bnd.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>Apache Felix Maven Bundle Plugin (BND)</h1>
       <h1 id="bundle-plugin-for-maven">Bundle Plugin for Maven</h1>
 <p>This plugin for Maven 2 is based on the <a href="http://www.aqute.biz/Bnd/Bnd">BND</a> tool from Peter Kriens. The way BND works is by treating your project as a big collection of classes (e.g., project code, dependencies, and the class path). The way you create a bundle with BND is to tell it the content of the bundle's JAR file as a subset of the available classes. This plugin wraps BND to make it work specifically with the Maven 2 project structure and to provide it with reasonable default behavior for Maven 2 projects.</p>

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-maven-obr-plugin.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-maven-obr-plugin.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-maven-obr-plugin.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-maven-obr-plugin.html" target="felix_cwiki">/site/apache-felix-maven-obr-plugin.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>Apache Felix Maven OBR Plugin</h1>
       <div class="warning" markdown="1">
 The *maven-obr-plugin* is *deprecated* and its features have been *merged* into the *1.4.0* release of the *[maven-bundle-plugin](/documentation/subprojects/apache-felix-maven-bundle-plugin-bnd.html)* 

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-maven-osgi-plugin.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-maven-osgi-plugin.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-maven-osgi-plugin.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-maven-osgi-plugin.html" target="felix_cwiki">/site/apache-felix-maven-osgi-plugin.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>Apache Felix Maven OSGi Plugin</h1>
       <div class="warning" markdown="1">
 The *maven-osgi-plugin* is *deprecated* and has been *replaced* by a new plugin: *[maven-bundle-plugin](/documentation/subprojects/apache-felix-maven-bundle-plugin-bnd.html)* 

Modified: 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.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-maven-scr-plugin.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 Maven SCR Plugin</h1>
       <p>The Apache Felix Maven SCR Plugin is a great tool to ease the development of OSGi components and services. Components and services are defined through annotations and the plugin creates the necessary descriptors for the OSGi Declarative Services, Config Admin and Metatype services. Recent versions of the plugin support OSGi Declarative Services versions 1.0, 1.1, and 1.2.</p>
 <p>Make sure to see the <a href="/documentation/faqs/apache-felix-scr-plugin-faq.html">FAQ</a> for known problems.</p>

Modified: 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-maven-scr-plugin-use.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-maven-scr-plugin/apache-felix-maven-scr-plugin-use.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-maven-scr-plugin.html">Apache Felix Maven SCR Plugin</a>
       </div>
 
-      
-      
       <h1>Apache Felix Maven SCR Plugin Use</h1>
       <p>Support for automatic generation of the compenent and metadata descriptors is embeded in the <code>org.apache.felix:maven-scr-plugin</code> plugin. To use this plugin, it has to be declared in the project descriptor as a <code>&lt;plugin&gt;</code> element: </p>
 <div class="codehilite"><pre><span class="nt">&lt;project&gt;</span>

Modified: 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-ant-task-use.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-maven-scr-plugin/apache-felix-scr-ant-task-use.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-maven-scr-plugin.html">Apache Felix Maven SCR Plugin</a>
       </div>
 
-      
-      
       <h1>Apache Felix SCR Ant Task Use</h1>
       <p>The SCR Ant Task is implemented in the <code>org.apache.felix.scr.ant</code> library which must be registered as an Ant Task in the build file as follows:</p>
 <div class="codehilite"><pre><span class="nt">&lt;project</span> <span class="err">...</span><span class="nt">&gt;</span>

Modified: 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/apache-felix-scr-bndtools-use.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-maven-scr-plugin/apache-felix-scr-bndtools-use.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-maven-scr-plugin.html">Apache Felix Maven SCR Plugin</a>
       </div>
 
-      
-      
       <h1>Apache Felix SCR Annotations BndTools Use</h1>
       <p>The org.apache.felix.scrplugin.bnd.SCRDescriptorBndPlugin is a bnd plugin allowing to generate SCR annotations and metatype descriptors in the Eclipse BndTools environment.
 This page describes how to install the plugin in BndTools and also provides a simple tutorial, which won't be very fascinating, but will make it easy

Modified: 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/extending-scr-annotations.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-maven-scr-plugin/extending-scr-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-maven-scr-plugin.html">Apache Felix Maven SCR Plugin</a>
       </div>
 
-      
-      
       <h1>Extending SCR Annotations</h1>
       <p><strong>Note:</strong> This page documents functionality available with the SCR Generator 1.0.0 release providing the declaration file generation mechanism for the Maven SCR Plugin 1.6.0 (and newer) and the SCR Ant Task 1.0.0 (and newer).</p>
 <p>The SCR Annotations library has been updated in version 1.4.0 to comply

Modified: 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-annotations.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-maven-scr-plugin/scr-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-maven-scr-plugin.html">Apache Felix Maven SCR Plugin</a>
       </div>
 
-      
-      
       <h1>SCR Annotations</h1>
       <p>The <code>maven-scr-plugin</code> uses the <code>SCR</code> annotations from the corresponding subproject at Apache Felix. All annotations are in the <code>org.apache.felix.scr.annotations</code> package. If you want to use the annotations in your project, you have to use a <code>maven-scr-plugin</code> version &gt;= 1.2.0 and make sure that you add a dependency to the annotations to your <code>POM</code>:</p>
 <div class="codehilite"><pre><span class="nt">&lt;dependency&gt;</span>

Modified: 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-maven-scr-plugin/scr-javadoc-tags.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-maven-scr-plugin/scr-javadoc-tags.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-maven-scr-plugin.html">Apache Felix Maven SCR Plugin</a>
       </div>
 
-      
-      
       <h1>SCR JavaDoc Tags</h1>
       <div class="note">
 JavaDoc tags are not supported since the Maven SCR Plugin 1.8.0 because

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-metatype-service.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-metatype-service.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-metatype-service.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-metatype-service.html" target="felix_cwiki">/site/apache-felix-metatype-service.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>Apache Felix Metatype Service</h1>
       <h1 id="apache-felix-metatype-service">Apache Felix Metatype Service</h1>
 <p>The OSGi Metatype specification provides a unified way to describe metadata about services and a Java interface to retrieve and manipulate such information. This information can optionally be localized, thus allowing the developer to provide human-readable metadata descriptions in multiple languages. The specification defines a rich dynamic typing system to describe service attributes in a precise way, which makes it possible to dynamically create user interfaces to configure services.</p>

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-osgi-bundle-repository.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-osgi-bundle-repository.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-osgi-bundle-repository.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-osgi-bundle-repository.html" target="felix_cwiki">/site/apache-felix-osgi-bundle-repository.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>Apache Felix OSGi Bundle Repository</h1>
       <h1 id="apache-felix-osgi-bundle-repository-obr">Apache Felix OSGi Bundle Repository (OBR)</h1>
 <div class="toc">

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-osgi-core.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-osgi-core.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-osgi-core.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-osgi-core.html" target="felix_cwiki">/site/apache-felix-osgi-core.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>Apache Felix OSGi Core</h1>
       <h1 id="apache-felix-osgi-core">Apache Felix OSGi Core</h1>
 <p>The Apache Felix OSGi Core sub-project simply repackages the standard OSGi core API packages provided by the OSGi Alliance into a Maven module. Nearly all OSGi-related projects will have a dependency on this module if using Maven or will require this module's JAR file in its class path in order to compile against the OSGi core APIs. The Felix framework has a compile-time dependency on the OSGi core module, but at packaging time it embeds the specific set of required packages so there is no longer a dependency on the module at execution time.</p>

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-preferences-service.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-preferences-service.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-preferences-service.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-preferences-service.html" target="felix_cwiki">/site/apache-felix-preferences-service.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>Apache Felix Preferences Service</h1>
       <h1 id="apache-felix-preferences-service">Apache Felix Preferences Service</h1>
 <p>The OSGi service compendium specification defines a general purpose service to store data persistently, so that they can survive the restart of a bundle or of the whole OSGi container. This service is not intended to be a full-featured persistence layer for OSGi bundles, rather a simple tool to store informations that can be used in various stages of the bundle lifecycle.</p>

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-remote-shell.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-remote-shell.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-remote-shell.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-remote-shell.html" target="felix_cwiki">/site/apache-felix-remote-shell.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>Apache Felix Remote Shell</h1>
       <h1 id="apache-felix-remote-shell">Apache Felix Remote Shell</h1>
 <p>The Apache Felix Remote Shell provided by the <code>org.apache.felix.shell.remote</code> bundle offers remote access to <a href="/documentation/subprojects/apache-felix-shell.html">Apache Felix Shell</a> and [Apache Felix Gogo] using telnet clients. The remote shell provides simple telnet access with no bells and whistles -- it just works.</p>

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-script-console-plugin.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-script-console-plugin.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-script-console-plugin.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 Script Console Plugin</h1>
       <style type="text/css">
 img {

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-serialization-framework.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-serialization-framework.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-serialization-framework.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-serialization-framework.html" target="felix_cwiki">/site/apache-felix-serialization-framework.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>Apache Felix Serialization Framework</h1>
       <h1 id="problem">Problem</h1>
 <p>When you have an object graph that consists of objects that were created by different bundles, serializing and deserializing such a graph becomes a problem, since there is no single bundle that can "see" all (implementation) objects in the graph.</p>

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-service-component-runtime.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-service-component-runtime.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-service-component-runtime.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 Service Component Runtime (SCR)</h1>
       <div class="toc">
 <ul>

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-shell-tui.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-shell-tui.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-shell-tui.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-shell-tui.html" target="felix_cwiki">/site/apache-felix-shell-tui.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>Apache Felix Shell TUI</h1>
       <h1 id="apache-felix-shell-tui">Apache Felix Shell TUI</h1>
 <p>The Apache Felix Shell TUI (Textual User Interface) sub-project provides a simple, text-based user interface for the <a href="/documentation/subprojects/apache-felix-shell.html">Apache Felix Shell</a>. This bundle is not of much use by itself and should always be used in conjunction with the shell service bundle. The shell service and shell TUI bundles are used by the standard Felix launcher to provide a means for interacting with the launched Felix framework instance. The shell TUI bundle is not required to use the shell service; it is possible to use it programmatically, via a GUI interface, or a remote access interface.</p>

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-shell.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-shell.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-shell.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-shell.html" target="felix_cwiki">/site/apache-felix-shell.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>Apache Felix Shell</h1>
       <h1 id="apache-felix-shell">Apache Felix Shell</h1>
 <ul>

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-sigil.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-sigil.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-sigil.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-sigil.html" target="felix_cwiki">/site/apache-felix-sigil.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>Apache Felix Sigil</h1>
       <h4 id="sigil-felix">Sigil: Felix</h4>
 <p>Sigil provides OSGi centric development tooling, where the OSGi runtime model is extended to provide build time dependencies.</p>

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-sigil/sigil-contributing.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-sigil/sigil-contributing.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-sigil/sigil-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/subprojects.html">Apache Felix Subproject Documentation</a>&nbsp;&raquo&nbsp;<a href="/documentation/subprojects/apache-felix-sigil.html">Apache Felix Sigil</a>
       </div>
 
-      
-      <div class="tip">
-           This page is a translated version of <a href="/site/sigil-contributing.html" target="felix_cwiki">/site/sigil-contributing.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>Sigil Contributing</h1>
       <h3 id="status">Status</h3>
 <p>Sigil is currently being migrated to Apache Felix from it's original home on http://sigil.codecauldron.org. As part of this migration it has been decided to go for a completely self hosted mode of development - i.e. use Sigil to build Sigil.</p>

Modified: 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.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-sigil/sigil-key-features.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-sigil.html">Apache Felix Sigil</a>
       </div>
 
-      
-      <div class="tip">
-           This page is a translated version of <a href="/site/sigil-key-features.html" target="felix_cwiki">/site/sigil-key-features.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>Sigil Key Features</h1>
       <h3 id="sigil-key-features">Sigil: Key Features</h3>
 <h4 id="resolves-build-dependencies-based-upon-osgi-meta-data">Resolves build dependencies based upon OSGi meta-data</h4>

Modified: 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.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-sigil/sigil-key-features/apache-felix-sigil-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/subprojects.html">Apache Felix Subproject Documentation</a>&nbsp;&raquo&nbsp;<a href="/documentation/subprojects/apache-felix-sigil.html">Apache Felix Sigil</a>&nbsp;&raquo&nbsp;<a href="/documentation/subprojects/apache-felix-sigil/sigil-key-features.html">Sigil Key Features</a>
       </div>
 
-      
-      <div class="tip">
-           This page is a translated version of <a href="/site/apache-felix-sigil-eclipse.html" target="felix_cwiki">/site/apache-felix-sigil-eclipse.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>Apache Felix Sigil Eclipse</h1>
       <p><a href="">Features</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-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-key-features/apache-felix-sigil-eclipse/apache-felix-sigil-eclipse-features.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-sigil/sigil-key-features/apache-felix-sigil-eclipse/apache-felix-sigil-eclipse-features.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-sigil.html">Apache Felix Sigil</a>&nbsp;&raquo&nbsp;<a href="/documentation/subprojects/apache-felix-sigil/sigil-key-features.html">Sigil Key Features</a>&nbsp;&raquo&nbsp;<a href="/documentation/subprojects/apache-felix-sigil/sigil-key-features/apache-felix-sigil-eclipse.html">Apache Felix Sigil Eclipse</a>
       </div>
 
-      
-      <div class="tip">
-           This page is a translated version of <a href="/site/apache-felix-sigil-eclipse-features.html" target="felix_cwiki">/site/apache-felix-sigil-eclipse-features.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>Apache Felix Sigil Eclipse Features</h1>
       <h2 id="project-editor">Project Editor</h2>
 <p>Double click on a sigil.properties file to open it in the project editor. From here you can control the main features of your project, including:

Modified: 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-road-map.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-sigil/sigil-road-map.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-sigil.html">Apache Felix Sigil</a>
       </div>
 
-      
-      <div class="tip">
-           This page is a translated version of <a href="/site/sigil-road-map.html" target="felix_cwiki">/site/sigil-road-map.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>Sigil Road Map</h1>
       <p>The Sigil framework is aiming for an initial 1.0.0 release which includes the following features:</p>
 <ul>

Modified: 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.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-sigil/sigil-user-guide.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-sigil.html">Apache Felix Sigil</a>
       </div>
 
-      
-      <div class="tip">
-           This page is a translated version of <a href="/site/sigil-user-guide.html" target="felix_cwiki">/site/sigil-user-guide.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>Sigil User Guide</h1>
       <h1 id="sigil-user-guide">Sigil User Guide</h1>
 <ul>

Modified: 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-installation.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-sigil/sigil-user-guide/sigil-installation.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-sigil.html">Apache Felix Sigil</a>&nbsp;&raquo&nbsp;<a href="/documentation/subprojects/apache-felix-sigil/sigil-user-guide.html">Sigil User Guide</a>
       </div>
 
-      
-      <div class="tip">
-           This page is a translated version of <a href="/site/sigil-installation.html" target="felix_cwiki">/site/sigil-installation.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>Sigil Installation</h1>
       <h1 id="sigil-installation">Sigil Installation</h1>
 <p>We're currently in the process of setting up the Sigil build - the last remaining task here is set up of the build on the apache bamboo servers. In the mean time we have set up a daily build hosted at Sigils previous home (codecauldron.org).</p>

Modified: 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.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-sigil/sigil-user-guide/sigil-ivy.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-sigil.html">Apache Felix Sigil</a>&nbsp;&raquo&nbsp;<a href="/documentation/subprojects/apache-felix-sigil/sigil-user-guide.html">Sigil User Guide</a>
       </div>
 
-      
-      <div class="tip">
-           This page is a translated version of <a href="/site/sigil-ivy.html" target="felix_cwiki">/site/sigil-ivy.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>Sigil Ivy</h1>
       <h2 id="sigil-ivy-extension">Sigil Ivy Extension</h2>
 <p><a href="">Quick start</a></p>

Modified: 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-quickstart.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-sigil/sigil-user-guide/sigil-ivy/apache-felix-sigil-ivy-quickstart.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-sigil.html">Apache Felix Sigil</a>&nbsp;&raquo&nbsp;<a href="/documentation/subprojects/apache-felix-sigil/sigil-user-guide.html">Sigil User Guide</a>&nbsp;&raquo&nbsp;<a href="/documentation/subprojects/apache-felix-sigil/sigil-user-guide/sigil-ivy.html">Sigil Ivy</a>
       </div>
 
-      
-      <div class="tip">
-           This page is a translated version of <a href="/site/apache-felix-sigil-ivy-quickstart.html" target="felix_cwiki">/site/apache-felix-sigil-ivy-quickstart.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>Apache Felix Sigil Ivy Quickstart</h1>
       <div class="toc">
 <ul>

Modified: 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-ivy/apache-felix-sigil-ivy-settings.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-sigil/sigil-user-guide/sigil-ivy/apache-felix-sigil-ivy-settings.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-sigil.html">Apache Felix Sigil</a>&nbsp;&raquo&nbsp;<a href="/documentation/subprojects/apache-felix-sigil/sigil-user-guide.html">Sigil User Guide</a>&nbsp;&raquo&nbsp;<a href="/documentation/subprojects/apache-felix-sigil/sigil-user-guide/sigil-ivy.html">Sigil Ivy</a>
       </div>
 
-      
-      <div class="tip">
-           This page is a translated version of <a href="/site/apache-felix-sigil-ivy-settings.html" target="felix_cwiki">/site/apache-felix-sigil-ivy-settings.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>Apache Felix Sigil Ivy Settings</h1>
       <p>The following items in ivysetting.xml need to be configured for Sigil.</p>
 <h2 id="sigil-parser">Sigil Parser</h2>

Modified: 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-junit.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-sigil/sigil-user-guide/sigil-junit.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-sigil.html">Apache Felix Sigil</a>&nbsp;&raquo&nbsp;<a href="/documentation/subprojects/apache-felix-sigil/sigil-user-guide.html">Sigil User Guide</a>
       </div>
 
-      
-      <div class="tip">
-           This page is a translated version of <a href="/site/sigil-junit.html" target="felix_cwiki">/site/sigil-junit.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>Sigil JUnit</h1>
       <h2 id="overview">Overview</h2>
 <p>The Sigil JUnit plugin is an OSGi bundle that when started in an OSGi enabled JVM watches for other bundles that contain JUnit TestCase classes in the framework. The main access point to the plugin is the <code>org.cauldron.sigil.junit.server.JUnitService</code>.</p>

Modified: 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-projects.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-sigil/sigil-user-guide/sigil-projects.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-sigil.html">Apache Felix Sigil</a>&nbsp;&raquo&nbsp;<a href="/documentation/subprojects/apache-felix-sigil/sigil-user-guide.html">Sigil User Guide</a>
       </div>
 
-      
-      <div class="tip">
-           This page is a translated version of <a href="/site/sigil-projects.html" target="felix_cwiki">/site/sigil-projects.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>Sigil Projects</h1>
       <h1 id="sigil-projects">Sigil Projects</h1>
 <p>This page is meant as an overview of how to set up sigil projects, for an in depth look at the file format see <a href="/documentation/subprojects/apache-felix-sigil/sigil-user-guide/sigil-properties.html">Sigil Properties</a>.</p>

Modified: 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-properties.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-sigil/sigil-user-guide/sigil-properties.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-sigil.html">Apache Felix Sigil</a>&nbsp;&raquo&nbsp;<a href="/documentation/subprojects/apache-felix-sigil/sigil-user-guide.html">Sigil User Guide</a>
       </div>
 
-      
-      <div class="tip">
-           This page is a translated version of <a href="/site/sigil-properties.html" target="felix_cwiki">/site/sigil-properties.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>Sigil Properties</h1>
       <h2 id="overview">Overview</h2>
 <p>sigil.properties is the common configuration file used in both the Eclipse and Ivy plugins. It is also used for the repository configuration (sigil-repos.properties).</p>

Modified: 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.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-sigil/sigil-user-guide/sigil-repositories.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-sigil.html">Apache Felix Sigil</a>&nbsp;&raquo&nbsp;<a href="/documentation/subprojects/apache-felix-sigil/sigil-user-guide.html">Sigil User Guide</a>
       </div>
 
-      
-      <div class="tip">
-           This page is a translated version of <a href="/site/sigil-repositories.html" target="felix_cwiki">/site/sigil-repositories.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>Sigil Repositories</h1>
       <p>Repositories are where the external dependencies for your project live. Sigil resolves and downloads dependencies for OSGi bundles via an extensible repository interface.</p>
 <p>Current implementations provided in Sigil are:

Modified: 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-filesystem.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-sigil/sigil-user-guide/sigil-repositories/apache-felix-sigil-filesystem.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-sigil.html">Apache Felix Sigil</a>&nbsp;&raquo&nbsp;<a href="/documentation/subprojects/apache-felix-sigil/sigil-user-guide.html">Sigil User Guide</a>&nbsp;&raquo&nbsp;<a href="/documentation/subprojects/apache-felix-sigil/sigil-user-guide/sigil-repositories.html">Sigil Repositories</a>
       </div>
 
-      
-      <div class="tip">
-           This page is a translated version of <a href="/site/apache-felix-sigil-filesystem.html" target="felix_cwiki">/site/apache-felix-sigil-filesystem.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>Apache Felix Sigil Filesystem</h1>
       <p>The file system repository looks in a specific directory (optionally recursing through sub directories) to find OSGi bundles</p>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">

Modified: 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-sigil/sigil-user-guide/sigil-repositories/apache-felix-sigil-obr.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-sigil/sigil-user-guide/sigil-repositories/apache-felix-sigil-obr.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-sigil.html">Apache Felix Sigil</a>&nbsp;&raquo&nbsp;<a href="/documentation/subprojects/apache-felix-sigil/sigil-user-guide.html">Sigil User Guide</a>&nbsp;&raquo&nbsp;<a href="/documentation/subprojects/apache-felix-sigil/sigil-user-guide/sigil-repositories.html">Sigil Repositories</a>
       </div>
 
-      
-      <div class="tip">
-           This page is a translated version of <a href="/site/apache-felix-sigil-obr.html" target="felix_cwiki">/site/apache-felix-sigil-obr.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>Apache Felix Sigil OBR</h1>
       <h2 id="overview">Overview</h2>
 <p>The OSGi Bundle Repository is an XML index to allow external tools to find out what contents an OSGi bundle provides and a link to a location where the bundle can be downloaded.</p>

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-upnp.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-upnp.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-upnp.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-upnp.html" target="felix_cwiki">/site/apache-felix-upnp.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      
       <h1>Apache Felix UPnP</h1>
       <h1 id="felix-upnp-documentation">Felix UPnP Documentation</h1>
 <h2 id="introductionwzxhzdk0">Introduction&nbsp;</h2>