FELIX-6081 - Upgrade bndlib to 4.2.0 in order to properly calculate osgi.ee for embedded dependencies

.gitignore

@@ -0,0 +1,16 @@
+.checkstyle
+.classpath
+.pmd
+.project
+.ruleset
+.settings/
+target/
+*.iml
+*.iws
+*.ipr
+velocity.log
+maven-eclipse.xml
+.externalToolBuilders
+.idea/
+*~
+dependency-reduced-pom.xml

README.md

@@ -0,0 +1,63 @@
+# Apache Felix
+
+The **Apache Felix** project is a collection of semi-related **OSGi** sub-projects that build and release individually.
+
+## Felix Framework
+
+The flagship project is the **Apache Felix Framework** which implements the [**OSGi Core R7**](https://osgi.org/specification/osgi.core/7.0.0/) specification. The `/framework` directory contains the source and build tree for the **OSGi**-compliant
+framework implementation.
+
+Directly related projects:
+
+- **main** `/main*` - provides an executable jar that launches the Felix framework.
+
+## OSGi Compendium
+
+Several sub-projects cover various **OSGi Compendium** specifications such as:
+
+- [**Configuration Admin**](https://osgi.org/specification/osgi.cmpn/7.0.0/service.cm.html) `/configadmin`
+- [**Configurator**](https://osgi.org/specification/osgi.cmpn/7.0.0/service.configurator.html) `/configurator`
+- [**Converter**](https://osgi.org/specification/osgi.cmpn/7.0.0/util.converter.html) `/converter`
+- [**Coordinator**](https://osgi.org/specification/osgi.cmpn/7.0.0/service.coordinator.html) `/coordinator`
+- [**Deployment Admin**](https://osgi.org/specification/osgi.cmpn/7.0.0/service.deploymentadmin.html) `/deploymentadmin`
+- [**Device Access**](https://osgi.org/specification/osgi.cmpn/7.0.0/service.device.html) `/deviceaccess`
+- [**Declarative Services**](https://osgi.org/specification/osgi.cmpn/7.0.0/service.component.html) `/scr*`
+- [**Event Admin**](https://osgi.org/specification/osgi.cmpn/7.0.0/service.event.html) `/eventadmin`
+- [**Http Service**](https://osgi.org/specification/osgi.cmpn/7.0.0/service.http.html) `/http`
+- [**Http Whiteboard**](https://osgi.org/specification/osgi.cmpn/7.0.0/service.http.whiteboard.html) `/http`
+- [**IO**](https://osgi.org/specification/osgi.cmpn/7.0.0/service.io.html) `/io`
+- [**Log Service**](https://osgi.org/specification/osgi.cmpn/7.0.0/service.log.html) `/log*`
+- [**Metatype**](https://osgi.org/specification/osgi.cmpn/7.0.0/service.metatype.html) `/metatype`
+- [**Preferences**](https://osgi.org/specification/osgi.cmpn/7.0.0/service.prefs.html) `/prefs`
+- [**Resolver**](https://osgi.org/specification/osgi.core/7.0.0/service.resolver.html) `/resolver`
+- [**UPnP**](https://osgi.org/specification/osgi.cmpn/7.0.0/service.upnp.html) `/upnp`
+- [**User Admin**](https://osgi.org/specification/osgi.cmpn/7.0.0/service.useradmin.html) `/useradmin`
+- [**Wire Admin**](https://osgi.org/specification/osgi.cmpn/7.0.0/service.wireadmin.html) `/wireadmin`
+
+## Extra Features
+
+Several projects provide extra features to an OSGi runtime.
+
+- **bundle repository** `/bundlerepository` - Bundle repository service.
+- **connect** `/connect` - A service registry that enables OSGi style service registry programs without using an OSGi framework.
+- **dependency manager** `/dependencymanager` - A versatile java API, allowing to declaratively
+  register, acquire, and manage dynamic OSGi services.
+- **fileinstall** `/fileinstall*` - A utility to automatically install bundles from a directory.
+- **gogo** `/gogo` - A command line shell, runtime and set of base commands for interacting with and introspecting an OSGi framework.
+- **inventory** `/inventory` - Provides some mechanisms to get the current state of the system and therefore provides an inventory of the system.
+- **ipojo** `/ipojo` - A *service component runtime* aiming to simplify OSGi application development.
+- **jaas support** `/jaas` - Bundle to simplify JAAS usage within OSGi environment.
+- **logback** `/logback` - A simple integration of the OSGi R7 Log (1.4) service to Logback backend.
+- **rootcause** `/rootcause` - Finding the root cause of problems with OSGi declarative services components.
+- **systemready** `/systemready` - Provides a framework to configure and create so called system checks, and signal the ready state of an OSGi based system.
+- **utils** `/utils` - Utility classes for OSGi (intended for embedding within other bundles.)
+- **webconsole** `/webconsole*` - Web Based Management Console for OSGi Frameworks.
+- and many other **OSGi** things
+
+## Build tools
+
+The `/tools` directory contains various build tools.
+
+- **maven-bundle-plugin** `/tools/maven-bundle-plugin` - A maven plugin for building **OSGi** bundles.
+- **osgicheck-maven-plugin** `/tools/osgicheck-maven-plugin` - Maven plugin for checking several OSGi aspects of your project.
+

bundlerepository.osgi-ct/pom.xml

@@ -0,0 +1,101 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <parent>
+    <groupId>org.apache.felix</groupId>
+    <artifactId>felix-parent</artifactId>
+    <version>2.1</version>
+    <relativePath>../../pom/pom.xml</relativePath>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <packaging>bundle</packaging>
+  <name>Apache Felix Bundle Repository - OSGi CT integration</name>
+  <description>
+    Bundle repository service OSGi CT integration. To run a Repository implementation in the 
+    OSGi CT, a small integration layer needs to be provided by the implementation that knows
+    how to prime the repository with the provided repository xml file.
+  </description>
+  <artifactId>org.apache.felix.bundlerepository.osgi-ct</artifactId>
+  <version>2.0.3-SNAPSHOT</version>
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/bundlerepository.osgi-ct</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/bundlerepository.osgi-ct</developerConnection>
+    <url>http://svn.apache.org/repos/asf/felix/trunk/bundlerepository.osgi-ct</url>
+  </scm>
+  <dependencies>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.core</artifactId>
+      <version>5.0.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.compendium</artifactId>
+      <version>5.0.0</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>org.apache.felix.bundlerepository</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <target>1.5</target>
+          <source>1.5</source>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>2.3.4</version>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Export-Package></Export-Package>
+            <Private-Package>org.apache.felix.bundlerepository.osgict</Private-Package>
+            <Bundle-Activator>org.apache.felix.bundlerepository.osgict.Activator</Bundle-Activator>
+            <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
+          </instructions>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.rat</groupId>
+        <artifactId>apache-rat-plugin</artifactId>
+        <configuration>
+          <excludeSubProjects>false</excludeSubProjects>
+          <useEclipseDefaultExcludes>true</useEclipseDefaultExcludes>
+          <useMavenDefaultExcludes>true</useMavenDefaultExcludes>
+          <excludes>
+            <param>doc/*</param>
+            <param>maven-eclipse.xml</param>
+            <param>.checkstyle</param>
+            <param>.externalToolBuilders/*</param>
+          </excludes>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>

bundlerepository.osgi-ct/src/main/java/org/apache/felix/bundlerepository/osgict/Activator.java

@@ -0,0 +1,109 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.felix.bundlerepository.osgict;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Dictionary;
+import java.util.Hashtable;
+
+import org.apache.felix.bundlerepository.RepositoryAdmin;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.Filter;
+import org.osgi.framework.ServiceReference;
+import org.osgi.util.tracker.ServiceTracker;
+
+/**
+ * This Activator implements the required glue between an OSGi Repository implementation and the
+ * OSGi CT. It is needed to prime the repository with the data needed by the CT and works as
+ * follows:
+ * <ul>
+ * <li>The CT registers a String service with as property {@code repository-xml}. This service is
+ * literally the repository XML needed by the test, and must be fed to the repository implementation.
+ * <li>When that's done this glue code registers another service with as property
+ * {@code repository-populated} to signal to the CT that the priming is done.
+ * </ul>
+ */
+public class Activator implements BundleActivator
+{
+    private BundleContext bundleContext;
+    private ServiceTracker<String, String> repoXMLTracker;
+    private ServiceTracker<RepositoryAdmin, RepositoryAdmin> repoTracker;
+
+    public void start(BundleContext context) throws Exception
+    {
+        bundleContext = context;
+        Filter f = context.createFilter("(&(objectClass=java.lang.String)(repository-xml=*))");
+        repoXMLTracker = new ServiceTracker<String, String>(context, f, null) {
+            @Override
+            public String addingService(ServiceReference<String> reference)
+            {
+                try
+                {
+                    String xml = super.addingService(reference);
+                    handleRepositoryXML(reference, xml);
+                    return xml;
+                }
+                catch (Exception e)
+                {
+                    throw new RuntimeException(e);
+                }
+            }
+        };
+        repoXMLTracker.open();
+    }
+
+    public void stop(BundleContext context) throws Exception
+    {
+        repoXMLTracker.close();
+        if (repoTracker != null)
+            repoTracker.close();
+    }
+
+    private void handleRepositoryXML(ServiceReference<String> reference, String xml) throws Exception
+    {
+        File tempXMLFile = bundleContext.getDataFile("repo-" + reference.getProperty("repository-xml") + ".xml");
+        writeXMLToFile(tempXMLFile, xml);
+
+        repoTracker = new ServiceTracker<RepositoryAdmin, RepositoryAdmin>(bundleContext, RepositoryAdmin.class, null);
+        repoTracker.open();
+        RepositoryAdmin repo = repoTracker.waitForService(30000);
+        repo.addRepository(tempXMLFile.toURI().toURL());
+        tempXMLFile.delete();
+
+        Dictionary<String, Object> props = new Hashtable<String, Object>();
+        props.put("repository-populated", reference.getProperty("repository-xml"));
+        bundleContext.registerService(String.class, "", props);
+    }
+
+    private void writeXMLToFile(File tempXMLFile, String xml) throws IOException
+    {
+        FileOutputStream fos = new FileOutputStream(tempXMLFile);
+        try
+        {
+            fos.write(xml.getBytes());
+        }
+        finally
+        {
+            fos.close();
+        }
+    }
+}

bundlerepository/DEPENDENCIES

@@ -0,0 +1,32 @@
+Apache Felix OSGi Bundle Repository
+Copyright 2014 The Apache Software Foundation
+
+This software was developed at the Apache Software Foundation
+(http://www.apache.org) and may have dependencies on other
+Apache software licensed under Apache License 2.0.
+
+I. Included Third-Party Software
+
+This product includes software from http://kxml.sourceforge.net.
+Copyright (c) 2002,2003, Stefan Haustein, Oberhausen, Rhld., Germany.
+Licensed under BSD License.
+
+This product includes software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2012).
+Licensed under the Apache License 2.0.
+
+II. Used Third-Party Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2012).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+The Codehaus (http://www.codehaus.org)
+Licensed under the Apache License 2.0.
+
+III. License Summary
+- Apache License 2.0
+- BSD License

bundlerepository/LICENSE.kxml2

@@ -0,0 +1,19 @@
+Copyright (c) 2002,2003, Stefan Haustein, Oberhausen, Rhld., Germany
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The  above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+IN THE SOFTWARE. 

bundlerepository/NOTICE

@@ -0,0 +1,16 @@
+Apache Felix OSGi Bundle Repository
+Copyright 2014 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+This product includes software from http://kxml.sourceforge.net.
+Copyright (c) 2002,2003, Stefan Haustein, Oberhausen, Rhld., Germany.
+Licensed under BSD License.
+
+This product includes software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2012).
+Licensed under the Apache License 2.0.
+