You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2023/08/03 13:58:43 UTC

[felix-dev] branch jakarta-servlet-6 updated: Remove unused modules

This is an automated email from the ASF dual-hosted git repository.

cziegeler pushed a commit to branch jakarta-servlet-6
in repository https://gitbox.apache.org/repos/asf/felix-dev.git


The following commit(s) were added to refs/heads/jakarta-servlet-6 by this push:
     new 4896a71db5 Remove unused modules
4896a71db5 is described below

commit 4896a71db59c92b478abd0eaa020594f0888fd7d
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Thu Aug 3 15:58:33 2023 +0200

    Remove unused modules
---
 bundlerepository.osgi-ct/pom.xml                   |  101 -
 .../felix/bundlerepository/osgict/Activator.java   |  109 -
 bundlerepository/DEPENDENCIES                      |   32 -
 bundlerepository/LICENSE                           |  202 -
 bundlerepository/LICENSE.kxml2                     |   19 -
 bundlerepository/NOTICE                            |   16 -
 .../doc/apache-felix-osgi-bundle-repository.html   |  524 --
 .../apache-felix-small.png                         |  Bin 6700 -> 0 bytes
 .../apache.png                                     |  Bin 12242 -> 0 bytes
 .../button.html                                    |    5 -
 .../button_data/2009-usa-125x125.png               |  Bin 13818 -> 0 bytes
 .../linkext7.gif                                   |  Bin 166 -> 0 bytes
 .../logo.png                                       |  Bin 14927 -> 0 bytes
 .../mail_small.gif                                 |  Bin 202 -> 0 bytes
 .../obr-entities.png                               |  Bin 30910 -> 0 bytes
 .../obr-high-level.png                             |  Bin 23175 -> 0 bytes
 .../site.css                                       |   25 -
 bundlerepository/doc/changelog.txt                 |  193 -
 bundlerepository/obr.xml                           |   29 -
 bundlerepository/pom.xml                           |  190 -
 .../apache/felix/bundlerepository/Capability.java  |   85 -
 .../felix/bundlerepository/DataModelHelper.java    |  173 -
 .../InterruptedResolutionException.java            |   45 -
 .../felix/bundlerepository/LocalResource.java      |   24 -
 .../apache/felix/bundlerepository/Property.java    |   39 -
 .../org/apache/felix/bundlerepository/Reason.java  |   33 -
 .../apache/felix/bundlerepository/Repository.java  |   85 -
 .../felix/bundlerepository/RepositoryAdmin.java    |  178 -
 .../apache/felix/bundlerepository/Requirement.java |  100 -
 .../apache/felix/bundlerepository/Resolver.java    |  150 -
 .../apache/felix/bundlerepository/Resource.java    |  151 -
 .../felix/bundlerepository/impl/Activator.java     |  140 -
 .../felix/bundlerepository/impl/Base64Encoder.java |  131 -
 .../bundlerepository/impl/CapabilityImpl.java      |  106 -
 .../bundlerepository/impl/DataModelHelperImpl.java | 1080 ----
 .../impl/FelixCapabilityAdapter.java               |  134 -
 .../impl/FelixPropertyAdapter.java                 |   69 -
 .../impl/FelixRequirementAdapter.java              |  129 -
 .../impl/FelixResourceAdapter.java                 |  128 -
 .../felix/bundlerepository/impl/FileUtil.java      |  222 -
 .../impl/LazyLocalResourceImpl.java                |  114 -
 .../felix/bundlerepository/impl/LazyStringMap.java |   67 -
 .../bundlerepository/impl/LocalRepositoryImpl.java |  158 -
 .../bundlerepository/impl/LocalResourceImpl.java   |  136 -
 .../bundlerepository/impl/NamespaceTranslator.java |   78 -
 .../impl/OSGiCapabilityAdapter.java                |   77 -
 .../bundlerepository/impl/OSGiRepositoryImpl.java  |  185 -
 .../impl/OSGiRequirementAdapter.java               |  100 -
 .../bundlerepository/impl/OSGiResourceHelper.java  |  111 -
 .../bundlerepository/impl/OSGiResourceImpl.java    |   73 -
 .../bundlerepository/impl/ObrCommandImpl.java      | 1352 -----
 .../bundlerepository/impl/ObrGogoCommand.java      |  831 ---
 .../impl/ObrURLStreamHandlerService.java           |  324 --
 .../felix/bundlerepository/impl/PropertyImpl.java  |  110 -
 .../felix/bundlerepository/impl/PullParser.java    |  410 --
 .../felix/bundlerepository/impl/ReasonImpl.java    |   46 -
 .../felix/bundlerepository/impl/Referral.java      |   52 -
 .../bundlerepository/impl/RepositoryAdminImpl.java |  294 -
 .../bundlerepository/impl/RepositoryImpl.java      |  146 -
 .../bundlerepository/impl/RepositoryParser.java    |   87 -
 .../bundlerepository/impl/RequirementImpl.java     |  184 -
 .../felix/bundlerepository/impl/ResolverImpl.java  |  738 ---
 .../bundlerepository/impl/ResourceCapability.java  |   31 -
 .../impl/ResourceCapabilityImpl.java               |   46 -
 .../bundlerepository/impl/ResourceComparator.java  |   47 -
 .../felix/bundlerepository/impl/ResourceImpl.java  |  316 --
 .../bundlerepository/impl/SpecXMLPullParser.java   |  378 --
 .../felix/bundlerepository/impl/StaxParser.java    |  423 --
 .../impl/SystemRepositoryImpl.java                 |   71 -
 .../felix/bundlerepository/impl/XmlWriter.java     |  145 -
 .../impl/wrapper/CapabilityWrapper.java            |   41 -
 .../impl/wrapper/ConvertedResource.java            |  118 -
 .../impl/wrapper/RepositoryAdminWrapper.java       |   64 -
 .../impl/wrapper/RepositoryWrapper.java            |   55 -
 .../impl/wrapper/RequirementWrapper.java           |   73 -
 .../impl/wrapper/ResolverWrapper.java              |  109 -
 .../impl/wrapper/ResourceWrapper.java              |   82 -
 .../bundlerepository/impl/wrapper/Wrapper.java     |  110 -
 .../bundlerepository/impl/CapabilityImplTest.java  |   48 -
 .../bundlerepository/impl/DataModelHelperTest.java |  140 -
 .../impl/FelixRequirementAdapterTest.java          |   74 -
 .../bundlerepository/impl/LazyStringMapTest.java   |   72 -
 .../impl/NamespaceTranslatorTest.java              |   53 -
 .../impl/OSGiRepositoryImplTest.java               |  247 -
 .../impl/OSGiRepositoryXMLTest.java                |  219 -
 .../impl/OSGiRequirementAdapterTest.java           |   56 -
 .../bundlerepository/impl/RepositoryAdminTest.java |  119 -
 .../bundlerepository/impl/RepositoryImplTest.java  |  144 -
 .../bundlerepository/impl/ResolverImplTest.java    |  320 --
 .../bundlerepository/impl/ResourceImplTest.java    |   85 -
 .../bundlerepository/impl/StaxParserTest.java      |  188 -
 .../felix/bundlerepository/impl/Streams.java       |   57 -
 .../src/test/resources/another_repository.xml      |   81 -
 .../src/test/resources/referral1_repository.xml    |   27 -
 bundlerepository/src/test/resources/referred.xml   |   26 -
 .../src/test/resources/repo_files/test_file_1.jar  |    1 -
 .../src/test/resources/repo_files/test_file_2.jar  |    1 -
 .../src/test/resources/repo_files/test_file_3.jar  |    1 -
 .../src/test/resources/repo_files/test_file_4.jar  |  Bin 145 -> 0 bytes
 .../src/test/resources/repo_for_mandatory.xml      |   67 -
 .../test/resources/repo_for_optional_resources.xml |   42 -
 .../src/test/resources/repo_for_resolvertest.xml   | 1051 ----
 .../src/test/resources/spec_repository.gz          |  Bin 3620 -> 0 bytes
 .../src/test/resources/spec_repository.xml         |  998 ----
 .../src/test/resources/spec_repository.zip         |  Bin 4837 -> 0 bytes
 check_staged_release.sh                            |   60 -
 cm.json/README.md                                  |    8 -
 cm.json/pom.xml                                    |  135 -
 .../felix/cm/json/io/ConfigurationReader.java      |  151 -
 .../felix/cm/json/io/ConfigurationResource.java    |   51 -
 .../felix/cm/json/io/ConfigurationWriter.java      |   79 -
 .../apache/felix/cm/json/io/Configurations.java    |  123 -
 .../cm/json/io/impl/ConfigurationReaderImpl.java   |  333 --
 .../cm/json/io/impl/ConfigurationWriterImpl.java   |  125 -
 .../apache/felix/cm/json/io/impl/JsonSupport.java  |  310 --
 .../felix/cm/json/io/impl/OrderedDictionary.java   |  345 --
 .../felix/cm/json/io/impl/TypeConverter.java       |  283 -
 .../org/apache/felix/cm/json/io/package-info.java  |   22 -
 .../json/io/impl/ConfigurationReaderImplTest.java  |  118 -
 .../felix/cm/json/io/impl/JsonSupportTest.java     |  198 -
 .../cm/json/io/impl/OrderedDictionaryTest.java     |  134 -
 .../felix/cm/json/io/impl/TypeConverterTest.java   |  656 ---
 cm.json/src/test/resources/configs/bundle.json     |    8 -
 cm.json/src/test/resources/configs/resource.json   |   10 -
 .../resources/configs/single-duplicatekeys.json    |    4 -
 cm.json/src/test/resources/configs/single.json     |    3 -
 configadmin-plugins/interpolation/README.md        |  148 -
 configadmin-plugins/interpolation/pom.xml          |  147 -
 .../plugin/interpolation/Activator.java            |   76 -
 .../InterpolationConfigurationPlugin.java          |  372 --
 .../plugin/interpolation/Interpolator.java         |  215 -
 .../interpolation/StandaloneInterpolator.java      |   83 -
 .../plugin/interpolation/ActivatorTest.java        |   84 -
 .../InterpolationConfigurationPluginTest.java      |  323 --
 .../plugin/interpolation/InterpolatorTest.java     |  134 -
 .../interpolation/StandaloneInterpolatorTest.java  |  124 -
 .../interpolation/src/test/resources/foo.bar       |    1 -
 .../src/test/resources/other/testfile.txt          |    1 -
 .../interpolation/src/test/resources/res1/my.db    |    1 -
 .../src/test/resources/sub/sub2/testfile2          |    1 -
 .../interpolation/src/test/resources/testfile      |    2 -
 configadmin/README.md                              |  223 -
 configadmin/changelog.txt                          |  345 --
 configadmin/pom.xml                                |  307 --
 .../main/appended-resources/META-INF/DEPENDENCIES  |   25 -
 .../src/main/appended-resources/META-INF/NOTICE    |    4 -
 .../felix/cm/NotCachablePersistenceManager.java    |   40 -
 .../org/apache/felix/cm/PersistenceManager.java    |  146 -
 .../apache/felix/cm/file/ConfigurationHandler.java |  859 ---
 .../felix/cm/file/FilePersistenceManager.java      |  915 ----
 .../org/apache/felix/cm/file/package-info.java     |   25 -
 .../java/org/apache/felix/cm/impl/Activator.java   |  247 -
 .../felix/cm/impl/CaseInsensitiveDictionary.java   |  548 --
 .../apache/felix/cm/impl/ConfigurationAdapter.java |  373 --
 .../felix/cm/impl/ConfigurationAdminFactory.java   |   69 -
 .../felix/cm/impl/ConfigurationAdminImpl.java      |  405 --
 .../felix/cm/impl/ConfigurationAdminStarter.java   |  198 -
 .../apache/felix/cm/impl/ConfigurationImpl.java    |  910 ----
 .../apache/felix/cm/impl/ConfigurationManager.java | 1752 ------
 .../org/apache/felix/cm/impl/CoordinatorUtil.java  |  156 -
 .../apache/felix/cm/impl/DependencyTracker.java    |  113 -
 .../org/apache/felix/cm/impl/DynamicBindings.java  |  125 -
 .../main/java/org/apache/felix/cm/impl/Log.java    |  254 -
 .../apache/felix/cm/impl/RankingComparator.java    |  140 -
 .../impl/RequiredConfigurationPluginTracker.java   |  169 -
 .../org/apache/felix/cm/impl/SimpleFilter.java     |  866 ---
 .../org/apache/felix/cm/impl/UpdateThread.java     |  196 -
 .../apache/felix/cm/impl/helper/BaseTracker.java   |  337 --
 .../felix/cm/impl/helper/ConfigurationMap.java     |  167 -
 .../helper/ManagedServiceConfigurationMap.java     |  112 -
 .../ManagedServiceFactoryConfigurationMap.java     |   93 -
 .../impl/helper/ManagedServiceFactoryTracker.java  |  182 -
 .../cm/impl/helper/ManagedServiceTracker.java      |  192 -
 .../apache/felix/cm/impl/helper/TargetedPID.java   |  241 -
 .../CachingPersistenceManagerProxy.java            |  344 --
 .../cm/impl/persistence/ExtPersistenceManager.java |   41 -
 .../impl/persistence/MemoryPersistenceManager.java |  132 -
 .../impl/persistence/PersistenceManagerProxy.java  |  247 -
 .../persistence/PersistenceManagerTracker.java     |  226 -
 .../java/org/apache/felix/cm/package-info.java     |   25 -
 .../src/main/resources/OSGI-INF/permissions.perm   |   59 -
 .../test/java/org/apache/felix/cm/MockBundle.java  |  263 -
 .../org/apache/felix/cm/MockBundleContext.java     |  367 --
 .../java/org/apache/felix/cm/MockLogService.java   |   88 -
 .../cm/MockNotCachablePersistenceManager.java      |   85 -
 .../apache/felix/cm/MockPersistenceManager.java    |   70 -
 .../org/apache/felix/cm/MockServiceReference.java  |   69 -
 .../felix/cm/file/ConfigurationHandlerTest.java    |  438 --
 .../FilePersistenceManagerConstructorTest.java     |  193 -
 .../felix/cm/file/FilePersistenceManagerTest.java  |  354 --
 .../cm/impl/CaseInsensitiveDictionaryTest.java     |  293 -
 .../felix/cm/impl/ConfigurationAdapterTest.java    |  168 -
 .../cm/impl/ConfigurationAdminStarterTest.java     |  139 -
 .../felix/cm/impl/ConfigurationImplTest.java       |   59 -
 .../felix/cm/impl/ConfigurationManagerTest.java    |  644 ---
 .../apache/felix/cm/impl/DynamicBindingsTest.java  |  180 -
 .../felix/cm/impl/RankingComparatorTest.java       |  275 -
 .../RequiredConfigurationPluginTrackerTest.java    |  133 -
 .../org/apache/felix/cm/impl/UpdateThreadTest.java |   53 -
 .../felix/cm/impl/helper/ConfigurationMapTest.java |  140 -
 .../felix/cm/impl/helper/TargetedPidTest.java      |  203 -
 .../CachingPersistenceManagerProxyTest.java        |  181 -
 .../persistence/MemoryPersistenceManagerTest.java  |  114 -
 .../persistence/PersistenceManagerProxyTest.java   |   68 -
 .../felix/cm/integration/ActivationTest.java       |  128 -
 .../cm/integration/ConfigAdminSecurityTest.java    |  244 -
 .../cm/integration/ConfigUpdateStressTest.java     |  233 -
 .../ConfigurationAdminUpdateStressTest.java        |  384 --
 .../cm/integration/ConfigurationBaseTest.java      | 1326 -----
 .../cm/integration/ConfigurationBindingTest.java   | 1155 ----
 .../cm/integration/ConfigurationListenerTest.java  |  192 -
 .../cm/integration/ConfigurationTestBase.java      |  401 --
 .../cm/integration/CoordinatorIntegrationTest.java |  168 -
 .../FELIX2813_ConfigurationAdminStartupTest.java   |  124 -
 .../felix/cm/integration/FELIX4385_StressTest.java |  227 -
 .../cm/integration/MultiServiceFactoryPIDTest.java |  259 -
 .../felix/cm/integration/MultiServicePIDTest.java  |  272 -
 .../felix/cm/integration/MultiValuePIDTest.java    |  130 -
 .../felix/cm/integration/TargetedPidTest.java      |  273 -
 .../cm/integration/helper/BaseTestActivator.java   |  121 -
 .../helper/ConfigurationListenerTestActivator.java |  115 -
 .../cm/integration/helper/ConfigureThread.java     |   91 -
 .../apache/felix/cm/integration/helper/Log.java    |  239 -
 .../helper/ManagedServiceFactoryTestActivator.java |   59 -
 .../ManagedServiceFactoryTestActivator2.java       |   42 -
 .../ManagedServiceFactoryTestActivator3.java       |   56 -
 .../ManagedServiceFactoryTestActivator4.java       |   72 -
 .../helper/ManagedServiceFactoryThread.java        |  112 -
 .../helper/ManagedServiceTestActivator.java        |   57 -
 .../helper/ManagedServiceTestActivator2.java       |   43 -
 .../integration/helper/ManagedServiceThread.java   |  103 -
 .../MultiManagedServiceFactoryTestActivator.java   |   46 -
 .../helper/MultiManagedServiceTestActivator.java   |   47 -
 .../integration/helper/NestedURLStreamHandler.java |   71 -
 .../helper/SynchronousTestListener.java            |   27 -
 .../felix/cm/integration/helper/TestListener.java  |  125 -
 .../felix/cm/integration/helper/TestThread.java    |   74 -
 .../integration/helper/UpdateThreadSignalTask.java |   80 -
 configadmin/src/test/resources/all.policy          |   21 -
 configurator/pom.xml                               |  167 -
 .../apache/felix/configurator/impl/Activator.java  |   48 -
 .../apache/felix/configurator/impl/ConfigUtil.java |   75 -
 .../felix/configurator/impl/Configurator.java      |  654 ---
 .../felix/configurator/impl/CoordinatorUtil.java   |   51 -
 .../felix/configurator/impl/ServicesListener.java  |  235 -
 .../org/apache/felix/configurator/impl/Util.java   |  104 -
 .../felix/configurator/impl/WorkerQueue.java       |   84 -
 .../felix/configurator/impl/json/BinUtil.java      |   71 -
 .../configurator/impl/json/BinaryManager.java      |   97 -
 .../felix/configurator/impl/json/JSONUtil.java     |  254 -
 .../configurator/impl/logger/InternalLogger.java   |   24 -
 .../impl/logger/LogServiceEnabledLogger.java       |  111 -
 .../impl/logger/LogServiceSupport.java             |   37 -
 .../impl/logger/R6LogServiceLogger.java            |   37 -
 .../configurator/impl/logger/StdOutLogger.java     |   69 -
 .../configurator/impl/logger/SystemLogger.java     |   73 -
 .../configurator/impl/model/AbstractState.java     |   88 -
 .../felix/configurator/impl/model/BundleState.java |   46 -
 .../felix/configurator/impl/model/Config.java      |  237 -
 .../felix/configurator/impl/model/ConfigList.java  |  196 -
 .../configurator/impl/model/ConfigPolicy.java      |   25 -
 .../felix/configurator/impl/model/ConfigState.java |   39 -
 .../configurator/impl/model/ConfigurationFile.java |   52 -
 .../felix/configurator/impl/model/State.java       |  181 -
 .../felix/configurator/impl/ConfigUtilTest.java    |  108 -
 .../felix/configurator/impl/ConfiguratorTest.java  |  287 -
 .../configurator/impl/model/BundleStateTest.java   |   65 -
 .../configurator/impl/model/ConfigListTest.java    |   94 -
 .../felix/configurator/impl/model/ConfigTest.java  |   65 -
 .../felix/configurator/impl/model/StateTest.java   |   71 -
 configurator/src/test/resources/bundles/1.json     |    8 -
 configurator/src/test/resources/bundles/2.json     |   11 -
 configurator/src/test/resources/bundles/2a.json    |   13 -
 configurator/src/test/resources/bundles/3.json     |    6 -
 connect/DEPENDENCIES                               |   28 -
 connect/LICENSE                                    |  202 -
 connect/NOTICE                                     |   28 -
 connect/pom.xml                                    |  202 -
 .../java/org/apache/felix/connect/BundleAware.java |   28 -
 .../java/org/apache/felix/connect/DirRevision.java |   69 -
 .../apache/felix/connect/EntriesEnumeration.java   |   80 -
 .../felix/connect/EntryFilterEnumeration.java      |  237 -
 .../apache/felix/connect/ExportedPackageImpl.java  |   90 -
 .../felix/connect/FileEntriesEnumeration.java      |   87 -
 .../java/org/apache/felix/connect/JarRevision.java |  171 -
 .../main/java/org/apache/felix/connect/PojoSR.java |  714 ---
 .../org/apache/felix/connect/PojoSRBundle.java     |  812 ---
 .../apache/felix/connect/PojoSRBundleContext.java  |  451 --
 .../connect/PojoServiceRegistryFactoryImpl.java    |  291 -
 .../apache/felix/connect/RequiredBundleImpl.java   |   79 -
 .../java/org/apache/felix/connect/Revision.java    |   31 -
 .../java/org/apache/felix/connect/URLRevision.java |  167 -
 .../java/org/apache/felix/connect/VFSRevision.java |  121 -
 .../felix/connect/felix/framework/DTOFactory.java  |  566 --
 .../connect/felix/framework/HookRegistry.java      |  237 -
 .../felix/framework/ServiceRegistrationImpl.java   |  599 --
 .../connect/felix/framework/ServiceRegistry.java   |  775 ---
 .../framework/capabilityset/CapabilitySet.java     |  633 ---
 .../framework/capabilityset/SimpleFilter.java      |  651 ---
 .../felix/framework/util/EventDispatcher.java      | 1019 ----
 .../connect/felix/framework/util/ListenerInfo.java |  142 -
 .../felix/framework/util/MapToDictionary.java      |   93 -
 .../felix/framework/util/ShrinkableCollection.java |   49 -
 .../felix/framework/util/ShrinkableList.java       |   54 -
 .../felix/framework/util/ShrinkableMap.java        |   40 -
 .../felix/framework/util/StringComparator.java     |   73 -
 .../connect/felix/framework/util/StringMap.java    |   48 -
 .../felix/connect/felix/framework/util/Util.java   |  632 ---
 .../connect/felix/framework/util/VersionRange.java |  163 -
 .../framework/wiring/BundleCapabilityImpl.java     |  203 -
 .../felix/connect/launch/BundleDescriptor.java     |   80 -
 .../felix/connect/launch/ClasspathScanner.java     |  180 -
 .../felix/connect/launch/PojoServiceRegistry.java  |   57 -
 .../connect/launch/PojoServiceRegistryFactory.java |   32 -
 ...felix.connect.launch.PojoServiceRegistryFactory |    1 -
 .../org.osgi.framework.launch.FrameworkFactory     |    1 -
 converter/pom.xml                                  |   44 -
 converter/readme.md                                |   24 -
 converter/schematizer/pom.xml                      |  157 -
 converter/schematizer/readme.txt                   |   71 -
 .../java/org/apache/felix/schematizer/AsDTO.java   |   27 -
 .../java/org/apache/felix/schematizer/Node.java    |   71 -
 .../org/apache/felix/schematizer/NodeVisitor.java  |   21 -
 .../java/org/apache/felix/schematizer/Schema.java  |   35 -
 .../org/apache/felix/schematizer/Schematizer.java  |   63 -
 .../felix/schematizer/StandardSchematizer.java     |   54 -
 .../apache/felix/schematizer/impl/Activator.java   |   45 -
 .../felix/schematizer/impl/CollectionNode.java     |   60 -
 .../apache/felix/schematizer/impl/NodeImpl.java    |  156 -
 .../schematizer/impl/SchemaBasedConverter.java     |  206 -
 .../apache/felix/schematizer/impl/SchemaImpl.java  |  193 -
 .../felix/schematizer/impl/SchematizerImpl.java    |  428 --
 .../felix/schematizer/impl/SchematizerImplOLD.java |  477 --
 .../org/apache/felix/schematizer/impl/Util.java    |  235 -
 .../org/apache/felix/schematizer/package-info.java |   38 -
 .../felix/schematizer/impl/CollectionType.java     |   28 -
 .../org/apache/felix/schematizer/impl/MyBean.java  |   61 -
 .../org/apache/felix/schematizer/impl/MyDTO.java   |   34 -
 .../org/apache/felix/schematizer/impl/MyDTO2.java  |   26 -
 .../org/apache/felix/schematizer/impl/MyDTO3.java  |   34 -
 .../org/apache/felix/schematizer/impl/MyDTO4.java  |   35 -
 .../felix/schematizer/impl/MyEmbeddedDTO.java      |   31 -
 .../felix/schematizer/impl/MyEmbeddedDTO2.java     |   26 -
 .../apache/felix/schematizer/impl/MySubDTO.java    |   21 -
 .../apache/felix/schematizer/impl/SchemaTest.java  |  159 -
 .../schematizer/impl/SchematizerServiceTest.java   |  316 --
 .../impl/json/JsonDeserializationTest.java         |   98 -
 .../apache/felix/serializer/impl/json/MyDTO.java   |   32 -
 .../apache/felix/serializer/impl/json/MyDTO2.java  |   32 -
 .../felix/serializer/impl/json/MyEmbeddedDTO.java  |   29 -
 .../felix/serializer/impl/json/MyEmbeddedDTO2.java |   26 -
 converter/serializer/pom.xml                       |  142 -
 .../org/apache/felix/serializer/Deserializing.java |   84 -
 .../java/org/apache/felix/serializer/Parser.java   |   27 -
 .../org/apache/felix/serializer/Serializer.java    |   84 -
 .../org/apache/felix/serializer/Serializing.java   |   89 -
 .../java/org/apache/felix/serializer/Writer.java   |   29 -
 .../org/apache/felix/serializer/WriterFactory.java |  122 -
 .../felix/serializer/impl/AbstractSpecifying.java  |  100 -
 .../apache/felix/serializer/impl/Activator.java    |   80 -
 .../serializer/impl/PrototypeWriterFactory.java    |   51 -
 .../org/apache/felix/serializer/impl/Util.java     |   50 -
 .../serializer/impl/json/DebugJsonWriter.java      |  194 -
 .../serializer/impl/json/DefaultJsonParser.java    |   47 -
 .../serializer/impl/json/DefaultJsonWriter.java    |  128 -
 .../impl/json/JsonDeserializingImpl.java           |   90 -
 .../serializer/impl/json/JsonSerializerImpl.java   |   54 -
 .../serializer/impl/json/JsonSerializingImpl.java  |   91 -
 .../serializer/impl/json/JsonWriterFactory.java    |   65 -
 .../serializer/impl/yaml/DefaultYamlParser.java    |   50 -
 .../serializer/impl/yaml/DefaultYamlWriter.java    |  118 -
 .../impl/yaml/YamlDeserializingImpl.java           |   90 -
 .../serializer/impl/yaml/YamlSerializerImpl.java   |   54 -
 .../serializer/impl/yaml/YamlSerializingImpl.java  |   94 -
 .../serializer/impl/yaml/YamlWriterFactory.java    |   62 -
 .../org/apache/felix/serializer/package-info.java  |   38 -
 .../json/JsonBackingObjectSerializationTest.java   |  202 -
 .../felix/serializer/impl/json/JsonParserTest.java |  119 -
 .../impl/json/JsonSerializationTest.java           |   89 -
 .../serializer/impl/json/JsonSerializerTest.java   |  169 -
 .../apache/felix/serializer/impl/json/MyDTO.java   |   32 -
 .../felix/serializer/impl/json/MyEmbeddedDTO.java  |   29 -
 .../impl/yaml/YamlSerializationTest.java           |  105 -
 .../serializer/impl/yaml/YamlSerializerTest.java   |  128 -
 coordinator/pom.xml                                |  110 -
 .../main/appended-resources/META-INF/DEPENDENCIES  |   21 -
 .../src/main/appended-resources/META-INF/NOTICE    |    4 -
 .../apache/felix/coordinator/impl/Activator.java   |   85 -
 .../felix/coordinator/impl/CoordinationHolder.java |  186 -
 .../felix/coordinator/impl/CoordinationImpl.java   |  559 --
 .../felix/coordinator/impl/CoordinationMgr.java    |  364 --
 .../felix/coordinator/impl/CoordinatorImpl.java    |  313 --
 .../apache/felix/coordinator/impl/LogWrapper.java  |  391 --
 .../coordinator/impl/CoordinatorImplTest.java      |  404 --
 dependencymanager/.gitignore                       |    8 -
 .../.gradle-wrapper/gradle-wrapper.properties      |   23 -
 dependencymanager/README                           |   44 -
 dependencymanager/build.gradle                     |   22 -
 dependencymanager/changelog.txt                    |  303 --
 dependencymanager/cnf/.classpath                   |    6 -
 dependencymanager/cnf/.gitignore                   |    3 -
 dependencymanager/cnf/.project                     |   11 -
 dependencymanager/cnf/build.bnd                    |   75 -
 dependencymanager/cnf/ext/junit.bnd                |   19 -
 dependencymanager/cnf/ext/libraries.bnd            |   77 -
 dependencymanager/cnf/repository.mvn               |   53 -
 dependencymanager/docs/.project                    |   11 -
 .../docs/A_Glance_At_DependencyManager.odp         |  Bin 413951 -> 0 bytes
 dependencymanager/docs/migrating.mdtext            |   14 -
 dependencymanager/docs/shell.mdtext                |  102 -
 dependencymanager/docs/whatsnew.mdtext             |   58 -
 dependencymanager/gradle.properties                |   26 -
 dependencymanager/gradlew                          |  178 -
 .../.classpath                                     |   12 -
 .../.gitignore                                     |    3 -
 .../.project                                       |   23 -
 .../bnd.bnd                                        |   30 -
 .../changelog.txt                                  |  281 -
 .../resources/DEPENDENCIES                         |   24 -
 .../resources/LICENSE                              |  203 -
 .../resources/NOTICE                               |    6 -
 .../src/.gitignore                                 |    0
 .../felix/dm/annotation/api/AdapterService.java    |  197 -
 .../felix/dm/annotation/api/AspectService.java     |  174 -
 .../dm/annotation/api/BundleAdapterService.java    |  112 -
 .../felix/dm/annotation/api/BundleDependency.java  |  115 -
 .../apache/felix/dm/annotation/api/Component.java  |  177 -
 .../felix/dm/annotation/api/Composition.java       |   81 -
 .../dm/annotation/api/ConfigurationDependency.java |  256 -
 .../apache/felix/dm/annotation/api/Destroy.java    |   53 -
 .../org/apache/felix/dm/annotation/api/Init.java   |  188 -
 .../org/apache/felix/dm/annotation/api/Inject.java |   79 -
 .../dm/annotation/api/LifecycleController.java     |   97 -
 .../apache/felix/dm/annotation/api/Property.java   |  154 -
 .../felix/dm/annotation/api/PropertyType.java      |  150 -
 .../apache/felix/dm/annotation/api/Registered.java |   57 -
 .../dm/annotation/api/RepeatableProperty.java      |   41 -
 .../felix/dm/annotation/api/ServiceDependency.java |  264 -
 .../felix/dm/annotation/api/ServiceScope.java      |   47 -
 .../org/apache/felix/dm/annotation/api/Start.java  |   62 -
 .../org/apache/felix/dm/annotation/api/Stop.java   |   53 -
 .../felix/dm/annotation/api/Unregistered.java      |   56 -
 .../org/apache/felix/dm/annotation/api/packageinfo |    1 -
 .../annotation/plugin/bnd/AnnotationCollector.java | 1891 -------
 .../dm/annotation/plugin/bnd/AnnotationPlugin.java |  164 -
 .../felix/dm/annotation/plugin/bnd/BndLogger.java  |  203 -
 .../annotation/plugin/bnd/DescriptorGenerator.java |  226 -
 .../felix/dm/annotation/plugin/bnd/EntryParam.java |   75 -
 .../felix/dm/annotation/plugin/bnd/EntryType.java  |   38 -
 .../dm/annotation/plugin/bnd/EntryWriter.java      |  255 -
 .../dm/annotation/plugin/bnd/FieldTypeGetter.java  |  102 -
 .../felix/dm/annotation/plugin/bnd/JsonWriter.java |  131 -
 .../felix/dm/annotation/plugin/bnd/Logger.java     |   40 -
 .../felix/dm/annotation/plugin/bnd/Patterns.java   |  212 -
 .../test/.gitignore                                |    0
 .../.classpath                                     |   12 -
 .../.gitignore                                     |    3 -
 .../.project                                       |   23 -
 .../README                                         |  182 -
 .../bnd.bnd                                        |   32 -
 .../controller.bnd                                 |   21 -
 .../dependencymanager.bnd                          |   19 -
 .../dependencymanager.parallel.bnd                 |   19 -
 .../index.bndrun                                   |   37 -
 .../noindex.bndrun                                 |   37 -
 .../scenario.bnd                                   |   19 -
 .../src/.gitignore                                 |    0
 .../benchmark/controller/ScenarioController.java   |   64 -
 .../dm/benchmark/controller/impl/Activator.java    |   36 -
 .../controller/impl/ScenarioControllerImpl.java    |  313 --
 .../felix/dm/benchmark/controller/packageinfo      |    1 -
 .../dm/benchmark/dependencymanager/Activator.java  |   39 -
 .../dm/benchmark/dependencymanager/Benchmark.java  |  100 -
 .../dependencymanager/ParallelActivator.java       |   44 -
 .../apache/felix/dm/benchmark/scenario/Album.java  |   38 -
 .../apache/felix/dm/benchmark/scenario/Artist.java |   56 -
 .../apache/felix/dm/benchmark/scenario/Helper.java |   69 -
 .../apache/felix/dm/benchmark/scenario/Track.java  |   31 -
 .../felix/dm/benchmark/scenario/Unchecked.java     |  103 -
 .../dm/benchmark/scenario/impl/AlbumImpl.java      |   64 -
 .../dm/benchmark/scenario/impl/ArtistImpl.java     |   63 -
 .../dm/benchmark/scenario/impl/TrackImpl.java      |   47 -
 .../felix/dm/benchmark/scenario/impl/packageinfo   |    1 -
 .../apache/felix/dm/benchmark/scenario/packageinfo |    1 -
 .../test/.gitignore                                |    0
 .../.classpath                                     |   12 -
 .../.gitignore                                     |    3 -
 .../.project                                       |   23 -
 .../bnd.bnd                                        |   54 -
 .../dynamic.customindex.bnd                        |   24 -
 .../DynamicCustomFilterIndex.java                  |   54 -
 .../staticcustomindex/StaticCustomFilterIndex.java |   49 -
 .../index/itest/tests/DynamicCustomIndexTest.java  |  150 -
 .../apache/felix/dm/index/itest/tests/Ensure.java  |  174 -
 .../tests/FELIX3008_FilterIndexStartupTest.java    |   87 -
 .../FELIX3057_EmptyServiceReferenceArray.java      |   68 -
 .../tests/FilterIndexResourceAdapterTest.java      |   85 -
 .../dm/index/itest/tests/ResourceProvider.java     |  122 -
 .../index/itest/tests/StaticCustomIndexTest.java   |  122 -
 .../felix/dm/index/itest/tests/TestBase.java       |  365 --
 .../static.customindex.bnd                         |   23 -
 .../test/.gitignore                                |    0
 .../tests.bnd                                      |   21 -
 .../.classpath                                     |   12 -
 .../.gitignore                                     |    3 -
 .../.project                                       |   23 -
 .../api.bnd                                        |   25 -
 .../bnd.bnd                                        |   53 -
 .../bundle.bnd                                     |   25 -
 .../bundle2.bnd                                    |   19 -
 .../itest/api/AbstractServiceDependencyTest.java   |  107 -
 .../felix/dm/itest/api/AdapterAndConsumerTest.java |  113 -
 ...dapterNoAutoConfigIfInstanceCallbackIsUsed.java |   77 -
 .../org/apache/felix/dm/itest/api/AdapterTest.java |   85 -
 .../itest/api/AdapterWithCallbackInstanceTest.java |  161 -
 .../api/AdapterWithConfigurationAndMetaType.java   |  183 -
 .../api/AdapterWithExtraDependenciesTest.java      |  106 -
 ...terWithInstanceBoundDependencyParallelTest.java |   28 -
 .../AdapterWithInstanceBoundDependencyTest.java    |  155 -
 ...terWithModifiedInstanceBoundDependencyTest.java |  155 -
 .../dm/itest/api/AdapterWithPropagationTest.java   |  141 -
 .../itest/api/AdapterWithoutPropagationTest.java   |  137 -
 .../apache/felix/dm/itest/api/AspectBaseTest.java  |  227 -
 .../apache/felix/dm/itest/api/AspectChainTest.java |  111 -
 .../felix/dm/itest/api/AspectDynamicsTest.java     |  194 -
 ...tNotAlwaysInjectedWithRequiredDependencies.java |   97 -
 .../felix/dm/itest/api/AspectRaceParallelTest.java |   28 -
 .../apache/felix/dm/itest/api/AspectRaceTest.java  |  323 --
 .../dm/itest/api/AspectServiceDependencyTest.java  |  122 -
 ...spectServiceDependencyWithSwapCallbackTest.java |  124 -
 .../felix/dm/itest/api/AspectWhiteboardTest.java   |  201 -
 .../AspectWithCallbacksServiceDependencyTest.java  |  179 -
 .../dm/itest/api/AspectWithPropagationTest.java    |  763 ---
 .../apache/felix/dm/itest/api/AutoConfigTest.java  |  258 -
 .../felix/dm/itest/api/BundleAdapterTest.java      |  146 -
 ...eAdapterWithCallbacksNotAutoConfiguredTest.java |   69 -
 .../felix/dm/itest/api/BundleDependencyTest.java   |  177 -
 .../dm/itest/api/ComponentStateListenerTest.java   |  255 -
 .../apache/felix/dm/itest/api/ComponentTest.java   |  106 -
 .../felix/dm/itest/api/ComponentTracker.java       |   66 -
 .../apache/felix/dm/itest/api/CompositionTest.java |  108 -
 .../felix/dm/itest/api/ConfigurationCreator.java   |   75 -
 .../dm/itest/api/ConfigurationDependencyTest.java  |  399 --
 .../apache/felix/dm/itest/api/DiagnosticsTest.java |  546 --
 .../felix/dm/itest/api/DynamicProxyAspectTest.java |  199 -
 .../dm/itest/api/DynamicScopedServiceTest.java     |  216 -
 ...ELI5155_AdapterCallbackInstanceCalledTwice.java |   97 -
 .../itest/api/FELIX2078_ServiceDependencyTest.java |   97 -
 ...ELIX2344_ExtraDependencyWithAutoConfigTest.java |  107 -
 .../FELIX2344_ExtraDependencyWithCallbackTest.java |  114 -
 .../itest/api/FELIX2348_ResourceAdapterTest.java   |   71 -
 .../itest/api/FELIX2369_ExtraDependencyTest.java   |  111 -
 ...2696_ConfigurationAndServiceDependencyTest.java |  133 -
 ...75_ServiceDependencyWithoutServiceNameTest.java |  101 -
 .../dm/itest/api/FELIX2955_ShellCommandTest.java   |  165 -
 ...ConfigurationDependencyWithPropagationTest.java |  151 -
 .../api/FELIX4158_DependencyDeclarationTest.java   |  161 -
 .../FELIX4361_ConcurrentComponentListingTest.java  |  109 -
 ...ELIX4614_FactoryWithComponentInCreateParam.java |   74 -
 .../dm/itest/api/FELIX4869_CallbackNotCalled.java  |   89 -
 ...FELIX4913_OptionalCallbackInvokedTwiceTest.java |  152 -
 ..._OptionalDependencyCBCalledBeforeStartTest.java |  117 -
 ..._CleanupInstanceBoundDependenciesInDestroy.java |  106 -
 .../api/FELIX5153_StopBeforeUngetServiceTest.java  |   59 -
 .../api/FELIX5200_FactoryPidNotRestartedTest.java  |  135 -
 ...IX5238_TypeSafeConfigWithDefaultMethodTest.java |  155 -
 ...figUpdateMissedIfComponentIsRestartingTest.java |  182 -
 .../itest/api/FELIX5268_AddRemoveServiceTest.java  |   58 -
 ..._CleanupInstanceBoundDependenciesInDestroy.java |  110 -
 ...305_DirectInjectionShouldSeeServiceUpdates.java |  175 -
 .../api/FELIX5355_ConfigTypesWithDotsTest.java     |  111 -
 .../itest/api/FELIX5399_DefaultListConfigType.java |   68 -
 .../itest/api/FELIX5399_DefaultMapConfigType.java  |   70 -
 ..._OverrideDefaultMapConfigTypeWithEmptyList.java |   80 -
 ..._OverrideDefaultListConfigTypeWithEmptyMap.java |   85 -
 .../FELIX5426_OptionalCallbackNotCalledTest.java   |  125 -
 ...IX5426_OptionalChangeCallbackNotCalledTest.java |  133 -
 ..._CleanupDependenciesWhenComponentIsStopped.java |   94 -
 ...tSwapCallbackNotCalledForOptionalDepenency.java |  139 -
 .../itest/api/FELIX5471_CyclicDependencyTest.java  |  110 -
 .../itest/api/FELIX5471_SynchronousUnbindTest.java |  154 -
 .../dm/itest/api/FELIX5630_NullObjectTest.java     |  155 -
 ...agateServicePropertiesToAspectInitCallback.java |   85 -
 ...IX5683_GetServicePropertiesReturnsNullTest.java |   48 -
 ...168AdapterWithDynamicallyAddedDependencies.java |  110 -
 .../api/FactoryComponentWithMetaTypeTest.java      |  175 -
 .../itest/api/FactoryConfigurationAdapterTest.java |  194 -
 .../dm/itest/api/FactoryConfigurationCreator.java  |   80 -
 ...ctedWithConfigurationBeforeTheCreateMethod.java |  109 -
 .../dm/itest/api/InstanceBoundDependencyTest.java  |  159 -
 .../dm/itest/api/ModifiedBundleDependencyTest.java |  140 -
 .../itest/api/MultipleExtraDependenciesTest.java   |  222 -
 .../dm/itest/api/MultipleExtraDependencyTest.java  |  226 -
 .../dm/itest/api/MultipleExtraDependencyTest2.java |  257 -
 .../itest/api/MultipleServiceDependencyTest.java   |  150 -
 .../api/OptionalConfigurationDependencyTest.java   |  110 -
 .../felix/dm/itest/api/RemovedDependencyTest.java  |  170 -
 .../ResourceAdapterDependencyAddAndRemoveTest.java |  167 -
 ...ResourceAdapterDependencyAddAndRemoveTest2.java |  186 -
 .../felix/dm/itest/api/ResourceAdapterTest.java    |   84 -
 .../felix/dm/itest/api/ResourceDependencyTest.java |  151 -
 .../felix/dm/itest/api/ResourceProvider.java       |  122 -
 .../itest/api/ScopedAspectAdaptersServiceTest.java |  247 -
 ...copedServiceReferenceAndServiceObjectsTest.java |  109 -
 .../felix/dm/itest/api/ScopedServiceTest.java      |  183 -
 .../ScopedServiceUnexpectedlyInstantiatedTest.java |   86 -
 .../ServiceDependencyCallbackSignaturesTest.java   |  294 -
 .../itest/api/ServiceDependencyInjectionTest.java  |  156 -
 .../itest/api/ServiceDependencyPropagateTest.java  |  133 -
 .../felix/dm/itest/api/ServiceDependencyTest.java  |   95 -
 ...rviceDependencyThroughCallbackInstanceTest.java |   91 -
 .../dm/itest/api/ServiceRaceParallelTest.java      |   28 -
 .../ServiceRaceParallelWithOrderedUnbindTest.java  |   38 -
 .../apache/felix/dm/itest/api/ServiceRaceTest.java |  303 --
 .../api/ServiceRaceWithOrderedUnbindTest.java      |  255 -
 .../felix/dm/itest/api/ServiceTrackerTest.java     |  114 -
 .../felix/dm/itest/api/ServiceUpdateTest.java      |  155 -
 .../itest/api/TemporalServiceDependencyTest.java   |  270 -
 .../felix/dm/itest/api/UngetAspectServiceTest.java |  111 -
 .../felix/dm/itest/api/UngetServiceTest.java       |   75 -
 .../apache/felix/dm/itest/bundle/Activator.java    |   45 -
 .../apache/felix/dm/itest/bundle/HelloWorld.java   |   24 -
 .../felix/dm/itest/bundle/HelloWorldService.java   |   27 -
 .../dm/itest/bundle/HelloWorldServiceFactory.java  |   57 -
 .../felix/dm/itest/bundle/TestComponent.java       |   28 -
 .../apache/felix/dm/itest/bundle/TestService.java  |   26 -
 .../apache/felix/dm/itest/bundle2/Activator.java   |   41 -
 .../felix/dm/itest/bundle2/AddRemoveService.java   |   26 -
 .../org/apache/felix/dm/itest/bundle2/packageinfo  |    1 -
 .../src/org/apache/felix/dm/itest/util/Ensure.java |  174 -
 .../apache/felix/dm/itest/util/ServiceUtil.java    |  176 -
 .../org/apache/felix/dm/itest/util/TestBase.java   |  364 --
 .../src/org/apache/felix/dm/itest/util/packageinfo |    1 -
 .../test/.gitignore                                |    0
 .../.classpath                                     |   12 -
 .../.gitignore                                     |    3 -
 .../.project                                       |   23 -
 .../.settings/org.eclipse.jdt.core.prefs           |   12 -
 .../bnd.bnd                                        |   56 -
 .../build.gradle                                   |   22 -
 .../lifecycle.bnd                                  |   18 -
 .../itest/AbstractServiceDependencyTest.java       |  101 -
 .../dm/lambda/itest/AdapterAndConsumerTest.java    |  103 -
 ...dapterNoAutoConfigIfInstanceCallbackIsUsed.java |   93 -
 .../itest/AdapterWithCallbackInstanceTest.java     |  195 -
 .../itest/AdapterWithExtraDependenciesTest.java    |  141 -
 ...terWithInstanceBoundDependencyParallelTest.java |   28 -
 .../AdapterWithInstanceBoundDependencyTest.java    |  147 -
 ...terWithModifiedInstanceBoundDependencyTest.java |  169 -
 .../lambda/itest/AdapterWithPropagationTest.java   |  123 -
 .../itest/AdapterWithoutPropagationTest.java       |  163 -
 .../felix/dm/lambda/itest/AspectBaseTest.java      |  342 --
 .../felix/dm/lambda/itest/AspectChainTest.java     |  113 -
 .../felix/dm/lambda/itest/AspectDynamicsTest.java  |  252 -
 .../lambda/itest/AspectServiceDependencyTest.java  |  120 -
 ...spectServiceDependencyWithSwapCallbackTest.java |  141 -
 .../dm/lambda/itest/AspectWhiteboardTest.java      |  290 -
 .../AspectWithCallbacksServiceDependencyTest.java  |  198 -
 .../dm/lambda/itest/AspectWithPropagationTest.java |  716 ---
 .../felix/dm/lambda/itest/AutoConfigTest.java      |  251 -
 .../felix/dm/lambda/itest/BundleAdapterTest.java   |  196 -
 ...eAdapterWithCallbacksNotAutoConfiguredTest.java |   67 -
 .../dm/lambda/itest/BundleDependencyTest.java      |  232 -
 .../felix/dm/lambda/itest/CFDependencyTest.java    |   94 -
 .../felix/dm/lambda/itest/ComponentTest.java       |  114 -
 .../felix/dm/lambda/itest/CompositionTest.java     |  123 -
 .../dm/lambda/itest/DynamicProxyAspectTest.java    |  254 -
 .../dm/lambda/itest/DynamicScopedServiceTest.java  |  227 -
 .../org/apache/felix/dm/lambda/itest/Ensure.java   |  174 -
 .../itest/FELIX5406_FluentPropertyWithDotTest.java |   88 -
 .../felix/dm/lambda/itest/FELIX5516Test.java       |  107 -
 .../itest/FactoryConfigurationAdapterTest.java     |  276 -
 .../lambda/itest/FactoryConfigurationCreator.java  |   79 -
 ...ctedWithConfigurationBeforeTheCreateMethod.java |  132 -
 .../felix/dm/lambda/itest/Felix5244Test.java       |   54 -
 .../lambda/itest/InstanceBoundDependencyTest.java  |  158 -
 .../lambda/itest/ModifiedBundleDependencyTest.java |  168 -
 .../itest/MultipleExtraDependenciesTest.java       |  153 -
 .../lambda/itest/MultipleExtraDependencyTest.java  |  208 -
 .../lambda/itest/MultipleExtraDependencyTest2.java |  235 -
 .../itest/MultipleServiceDependencyTest.java       |  143 -
 .../dm/lambda/itest/OptionalConfigurationTest.java |  151 -
 .../dm/lambda/itest/RemovedDependencyTest.java     |  173 -
 .../felix/dm/lambda/itest/ResourceProvider.java    |  122 -
 ...copedServiceReferenceAndServiceObjectsTest.java |  110 -
 .../felix/dm/lambda/itest/ScopedServiceTest.java   |  181 -
 .../ServiceDependencyCallbackSignaturesTest.java   |  374 --
 .../itest/ServiceDependencyInjectionTest.java      |  157 -
 .../itest/ServiceDependencyPropagateTest.java      |  160 -
 .../dm/lambda/itest/ServiceDependencyTest.java     |   98 -
 ...rviceDependencyThroughCallbackInstanceTest.java |   82 -
 .../felix/dm/lambda/itest/ServiceUpdateTest.java   |  148 -
 .../apache/felix/dm/lambda/itest/ServiceUtil.java  |  176 -
 .../felix/dm/lambda/itest/StopCallbackTest.java    |   54 -
 .../itest/TemporalServiceDependencyTest.java       |  268 -
 .../org/apache/felix/dm/lambda/itest/TestBase.java |  360 --
 .../felix/dm/lambda/itest/lifecycle/Activator.java |   38 -
 .../dm/lambda/itest/lifecycle/SimpleComponent.java |   36 -
 .../test/.keepme                                   |    0
 .../tests.bnd                                      |   18 -
 .../.classpath                                     |   12 -
 .../.gitignore                                     |    3 -
 .../.project                                       |   23 -
 .../.settings/org.eclipse.jdt.core.prefs           |   12 -
 .../bnd.bnd                                        |   18 -
 .../build.gradle                                   |   22 -
 .../compositefactory.bnd                           |   18 -
 .../compositefactory.bndrun                        |   36 -
 .../device.bnd                                     |   18 -
 .../device.bndrun                                  |   36 -
 .../dictionary.bnd                                 |   18 -
 .../dictionary.bndrun                              |   38 -
 .../factory.bnd                                    |   18 -
 .../factory.bndrun                                 |   37 -
 .../future.bnd                                     |   18 -
 .../future.bndrun                                  |   37 -
 .../hello.bnd                                      |   18 -
 .../hello.bndrun                                   |   37 -
 .../src/.gitignore                                 |    0
 .../lambda/samples/compositefactory/Activator.java |   63 -
 .../samples/compositefactory/Configurator.java     |   38 -
 .../lambda/samples/compositefactory/MyConfig.java  |   27 -
 .../lambda/samples/compositefactory/Provider.java  |   26 -
 .../compositefactory/ProviderComposite1.java       |   40 -
 .../compositefactory/ProviderComposite2.java       |   28 -
 .../samples/compositefactory/ProviderFactory.java  |   59 -
 .../samples/compositefactory/ProviderImpl.java     |   49 -
 .../dm/lambda/samples/compositefactory/README      |   33 -
 .../felix/dm/lambda/samples/device/Activator.java  |   60 -
 .../felix/dm/lambda/samples/device/Device.java     |   26 -
 .../dm/lambda/samples/device/DeviceAccess.java     |   30 -
 .../samples/device/DeviceAccessConsumer.java       |   37 -
 .../dm/lambda/samples/device/DeviceAccessImpl.java |   50 -
 .../felix/dm/lambda/samples/device/DeviceImpl.java |   41 -
 .../dm/lambda/samples/device/DeviceParameter.java  |   26 -
 .../lambda/samples/device/DeviceParameterImpl.java |   40 -
 .../apache/felix/dm/lambda/samples/device/README   |   30 -
 .../dm/lambda/samples/dictionary/Activator.java    |   62 -
 .../samples/dictionary/DictionaryAspect.java       |   81 -
 .../dictionary/DictionaryAspectConfiguration.java  |   39 -
 .../dictionary/DictionaryConfiguration.java        |   41 -
 .../lambda/samples/dictionary/DictionaryImpl.java  |   88 -
 .../samples/dictionary/DictionaryService.java      |   35 -
 .../felix/dm/lambda/samples/dictionary/README      |   41 -
 .../dm/lambda/samples/dictionary/SpellChecker.java |   76 -
 .../felix/dm/lambda/samples/factory/Activator.java |   41 -
 .../felix/dm/lambda/samples/factory/Provider.java  |   25 -
 .../dm/lambda/samples/factory/ProviderFactory.java |   25 -
 .../dm/lambda/samples/factory/ProviderImpl.java    |   38 -
 .../apache/felix/dm/lambda/samples/factory/README  |   23 -
 .../felix/dm/lambda/samples/future/Activator.java  |   66 -
 .../felix/dm/lambda/samples/future/PageLinks.java  |   28 -
 .../dm/lambda/samples/future/PageLinksImpl.java    |   95 -
 .../apache/felix/dm/lambda/samples/future/README   |   16 -
 .../felix/dm/lambda/samples/hello/Activator.java   |   44 -
 .../felix/dm/lambda/samples/hello/HelloClient.java |   59 -
 .../dm/lambda/samples/hello/HelloService.java      |   23 -
 .../dm/lambda/samples/hello/HelloServiceImpl.java  |   37 -
 .../apache/felix/dm/lambda/samples/hello/README    |   28 -
 .../test/.gitignore                                |    0
 .../.classpath                                     |   12 -
 .../.gitignore                                     |    3 -
 .../.project                                       |   23 -
 .../bnd.bnd                                        |   31 -
 .../changelog.txt                                  |  278 -
 .../resources/DEPENDENCIES                         |   21 -
 .../resources/LICENSE                              |  202 -
 .../resources/NOTICE                               |   12 -
 .../src/.gitignore                                 |    0
 .../felix/dm/lambda/BundleAdapterBuilder.java      |  298 -
 .../felix/dm/lambda/BundleDependencyBuilder.java   |  315 --
 .../apache/felix/dm/lambda/ComponentBuilder.java   |  798 ---
 .../dm/lambda/ConfigurationDependencyBuilder.java  |  371 --
 .../apache/felix/dm/lambda/DependencyBuilder.java  |   33 -
 .../dm/lambda/DependencyManagerActivator.java      |  444 --
 .../felix/dm/lambda/FactoryPidAdapterBuilder.java  |  253 -
 .../org/apache/felix/dm/lambda/FluentProperty.java |   71 -
 .../felix/dm/lambda/FutureDependencyBuilder.java   |  150 -
 .../felix/dm/lambda/ServiceAdapterBuilder.java     |   77 -
 .../felix/dm/lambda/ServiceAspectBuilder.java      |   91 -
 .../felix/dm/lambda/ServiceCallbacksBuilder.java   |  895 ---
 .../felix/dm/lambda/ServiceDependencyBuilder.java  |  163 -
 .../org/apache/felix/dm/lambda/callbacks/Cb.java   |   43 -
 .../apache/felix/dm/lambda/callbacks/CbBundle.java |   47 -
 .../dm/lambda/callbacks/CbBundleComponent.java     |   49 -
 .../felix/dm/lambda/callbacks/CbComponent.java     |   48 -
 .../felix/dm/lambda/callbacks/CbConfiguration.java |   55 -
 .../lambda/callbacks/CbConfigurationComponent.java |   57 -
 .../felix/dm/lambda/callbacks/CbDictionary.java    |   46 -
 .../dm/lambda/callbacks/CbDictionaryComponent.java |   49 -
 .../apache/felix/dm/lambda/callbacks/CbFuture.java |   46 -
 .../apache/felix/dm/lambda/callbacks/CbRef.java    |   47 -
 .../felix/dm/lambda/callbacks/CbRefComponent.java  |   49 -
 .../apache/felix/dm/lambda/callbacks/CbRefRef.java |   48 -
 .../dm/lambda/callbacks/CbRefRefComponent.java     |   50 -
 .../lambda/callbacks/CbRefServiceRefService.java   |   50 -
 .../callbacks/CbRefServiceRefServiceComponent.java |   52 -
 .../felix/dm/lambda/callbacks/CbService.java       |   45 -
 .../dm/lambda/callbacks/CbServiceComponent.java    |   48 -
 .../dm/lambda/callbacks/CbServiceComponentRef.java |   50 -
 .../felix/dm/lambda/callbacks/CbServiceDict.java   |   47 -
 .../felix/dm/lambda/callbacks/CbServiceMap.java    |   47 -
 .../dm/lambda/callbacks/CbServiceObjects.java      |   47 -
 .../callbacks/CbServiceObjectsServiceObjects.java  |   48 -
 .../felix/dm/lambda/callbacks/CbServiceRef.java    |   48 -
 .../dm/lambda/callbacks/CbServiceService.java      |   46 -
 .../callbacks/CbServiceServiceComponent.java       |   49 -
 .../felix/dm/lambda/callbacks/InstanceCb.java      |   42 -
 .../dm/lambda/callbacks/InstanceCbBundle.java      |   45 -
 .../callbacks/InstanceCbBundleComponent.java       |   47 -
 .../dm/lambda/callbacks/InstanceCbComponent.java   |   45 -
 .../lambda/callbacks/InstanceCbConfiguration.java  |   52 -
 .../InstanceCbConfigurationComponent.java          |   54 -
 .../dm/lambda/callbacks/InstanceCbDictionary.java  |   44 -
 .../callbacks/InstanceCbDictionaryComponent.java   |   47 -
 .../dm/lambda/callbacks/InstanceCbFuture.java      |   43 -
 .../felix/dm/lambda/callbacks/InstanceCbRef.java   |   48 -
 .../lambda/callbacks/InstanceCbRefComponent.java   |   49 -
 .../dm/lambda/callbacks/InstanceCbRefRef.java      |   48 -
 .../callbacks/InstanceCbRefRefComponent.java       |   50 -
 .../callbacks/InstanceCbRefServiceRefService.java  |   48 -
 .../InstanceCbRefServiceRefServiceComponent.java   |   50 -
 .../dm/lambda/callbacks/InstanceCbService.java     |   45 -
 .../callbacks/InstanceCbServiceComponent.java      |   48 -
 .../callbacks/InstanceCbServiceComponentRef.java   |   50 -
 .../dm/lambda/callbacks/InstanceCbServiceDict.java |   47 -
 .../dm/lambda/callbacks/InstanceCbServiceMap.java  |   47 -
 .../lambda/callbacks/InstanceCbServiceObjects.java |   48 -
 .../InstanceCbServiceObjectsServiceObjects.java    |   48 -
 .../dm/lambda/callbacks/InstanceCbServiceRef.java  |   48 -
 .../lambda/callbacks/InstanceCbServiceService.java |   46 -
 .../InstanceCbServiceServiceComponent.java         |   49 -
 .../dm/lambda/callbacks/SerializableLambda.java    |   27 -
 .../apache/felix/dm/lambda/callbacks/packageinfo   |    1 -
 .../apache/felix/dm/lambda/impl/AdapterBase.java   |  323 --
 .../dm/lambda/impl/BundleAdapterBuilderImpl.java   |  286 -
 .../lambda/impl/BundleDependencyBuilderImpl.java   |  399 --
 .../impl/CompletableFutureDependencyImpl.java      |  259 -
 .../felix/dm/lambda/impl/ComponentBuilderImpl.java |  703 ---
 .../impl/ConfigurationDependencyBuilderImpl.java   |  250 -
 .../lambda/impl/FactoryPidAdapterBuilderImpl.java  |  236 -
 .../org/apache/felix/dm/lambda/impl/Helpers.java   |  191 -
 .../felix/dm/lambda/impl/SRefAsDictionary.java     |  112 -
 .../org/apache/felix/dm/lambda/impl/SRefAsMap.java |  102 -
 .../dm/lambda/impl/ServiceAdapterBuilderImpl.java  |  101 -
 .../dm/lambda/impl/ServiceAspectBuilderImpl.java   |  104 -
 .../lambda/impl/ServiceCallbacksBuilderImpl.java   |  812 ---
 .../lambda/impl/ServiceDependencyBuilderImpl.java  |  177 -
 .../src/org/apache/felix/dm/lambda/packageinfo     |    1 -
 .../test/.gitignore                                |    0
 .../.classpath                                     |   12 -
 .../.gitignore                                     |    3 -
 .../.project                                       |   23 -
 .../bnd.bnd                                        |   64 -
 .../itest/components/AdapterAnnotation.java        |  204 -
 .../AdapterServiceTestWithPublisher.java           |  126 -
 .../runtime/itest/components/AspectAnnotation.java |  238 -
 .../components/AspectLifecycleAnnotation.java      |  102 -
 .../AspectLifecycleWithDynamicProxyAnnotation.java |  119 -
 .../BundleAdapterServiceTestWithPublisher.java     |  106 -
 .../components/BundleDependencyAnnotation.java     |  163 -
 .../CollectionFieldDependencyAnnotation.java       |  125 -
 .../ComponentDMPropertyTypeAnnotation.java         |   65 -
 .../ComponentDMPropertyTypeArrayAnnotation.java    |   79 -
 ...ponentDMSingleValuedPropertyTypeAnnotation.java |   73 -
 .../ComponentJaxrsResourceAnnotation.java          |   55 -
 ...tyTypeWithDictionaryPassedInUpdateCallback.java |  111 -
 .../itest/components/CompositeAnnotations.java     |  197 -
 .../ConfigurationDependencyAnnotation.java         |  118 -
 .../itest/components/ConfigurationProxy.java       |  111 -
 .../components/ExtraAdapterServiceProperties.java  |   95 -
 .../itest/components/ExtraServiceProperties.java   |   80 -
 .../dm/runtime/itest/components/FELIX5337.java     |  138 -
 .../FELIX5337_MatchAllServicesWithFilter.java      |   83 -
 .../dm/runtime/itest/components/FELIX5956.java     |   99 -
 .../FactoryConfigurationAdapterAnnotation.java     |  160 -
 ...nfigurationAdapterServiceTestWithPublisher.java |  139 -
 .../FactoryPidWithPropertyTypeAnnotation.java      |  130 -
 .../dm/runtime/itest/components/Felix4050.java     |  150 -
 .../dm/runtime/itest/components/Felix4357.java     |  109 -
 .../dm/runtime/itest/components/Felix5236.java     |   48 -
 .../itest/components/InheritedAnnotations.java     |   82 -
 .../JaxrsComponentPropertyTypeAnnotation.java      |   61 -
 .../runtime/itest/components/MethodSignatures.java |  338 --
 .../itest/components/MultipleAnnotations.java      |  137 -
 ...ultipleReconfigurableComponentPropertyType.java |  107 -
 .../itest/components/OptionalConfiguration.java    |  117 -
 .../itest/components/PropagateAnnotation.java      |   73 -
 .../itest/components/ProviderSwappedByAspect.java  |   99 -
 ...ntPropertyTypeWithOptionalConfigAnnotation.java |  111 -
 .../itest/components/ScopedServiceAnnotation.java  |  110 -
 .../ScopedServiceWithInitAnnotation.java           |  154 -
 .../itest/components/ServiceTestWthPublisher.java  |   97 -
 .../itest/components/SimpleAnnotations.java        |  186 -
 .../itest/components/TemporalAnnotations.java      |   69 -
 .../felix/dm/runtime/itest/components/Utils.java   |   68 -
 .../felix/dm/runtime/itest/components/packageinfo  |    1 -
 .../itest/tests/AdapterAnnotationParallelTest.java |   28 -
 .../runtime/itest/tests/AdapterAnnotationTest.java |   82 -
 .../runtime/itest/tests/AspectAnnotationTest.java  |   65 -
 .../AspectLifecycleAnnotationParallelTest.java     |   28 -
 .../itest/tests/AspectLifecycleAnnotationTest.java |   52 -
 ...cycleWithDynamicProxyAnnotationParalleTest.java |   28 -
 ...ycleWithDynamicProxyAnnotationParallelTest.java |   28 -
 ...ectLifecycleWithDynamicProxyAnnotationTest.java |   51 -
 .../BundleDependencyAnnotationParallelTest.java    |   28 -
 .../tests/BundleDependencyAnnotationTest.java      |   60 -
 .../CollectionFieldDependencyAnnotationTest.java   |   56 -
 .../tests/ComponentPropertyTypeAnnotationTest.java |  114 -
 .../tests/CompositeAnnotationsParallelTest.java    |   28 -
 .../itest/tests/CompositeAnnotationsTest.java      |   47 -
 .../ConfigurationDependencyAnnotationTest.java     |  102 -
 .../itest/tests/ConfigurationProxyTest.java        |   43 -
 .../tests/ExtraServicePropertiesParallelTest.java  |   28 -
 .../itest/tests/ExtraServicePropertiesTest.java    |   65 -
 .../dm/runtime/itest/tests/FELIX5337Test.java      |   50 -
 .../dm/runtime/itest/tests/FELIX5956Test.java      |   38 -
 ...ConfigurationAdapterAnnotationParallelTest.java |   28 -
 .../FactoryConfigurationAdapterAnnotationTest.java |   78 -
 .../dm/runtime/itest/tests/Felix4050Test.java      |   45 -
 .../runtime/itest/tests/Felix4357ParallelTest.java |   28 -
 .../dm/runtime/itest/tests/Felix4357Test.java      |   43 -
 .../dm/runtime/itest/tests/Felix5236Test.java      |   41 -
 .../itest/tests/InheritedAnnotationsTest.java      |   42 -
 .../runtime/itest/tests/MethodSignaturesTest.java  |   56 -
 .../tests/MultipleAnnotationsParallelTest.java     |   28 -
 .../itest/tests/MultipleAnnotationsTest.java       |   41 -
 .../itest/tests/OptionalConfigurationTest.java     |   46 -
 .../tests/PropagateAnnotationParallelTest.java     |   28 -
 .../itest/tests/PropagateAnnotationTest.java       |   40 -
 .../itest/tests/ProviderSwappedByAspectTest.java   |   60 -
 .../itest/tests/PublisherAnnotationTest.java       |   74 -
 .../itest/tests/ScopedServiceAnnotationTest.java   |   69 -
 .../itest/tests/SimpleAnnotationsParallelTest.java |   28 -
 .../runtime/itest/tests/SimpleAnnotationsTest.java |   48 -
 .../tests/TemporalAnnotationsParallelTest.java     |   28 -
 .../itest/tests/TemporalAnnotationsTest.java       |   61 -
 .../annotations/ComponentPropertyType.java         |   51 -
 .../jaxrs/whiteboard/JaxRSWhiteboardConstants.java |   27 -
 .../annotations/RequireJaxRSWhiteboard.java        |   41 -
 .../jaxrs/whiteboard/propertytypes/JaxrsName.java  |   55 -
 .../whiteboard/propertytypes/JaxrsResource.java    |   56 -
 .../test/.gitignore                                |    0
 .../.classpath                                     |   12 -
 .../.gitignore                                     |    3 -
 .../.project                                       |   23 -
 .../.settings/org.eclipse.jdt.core.prefs           |  326 --
 .../.settings/org.eclipse.jdt.ui.prefs             |    3 -
 .../bnd.bnd                                        |   36 -
 .../changelog.txt                                  |  278 -
 .../resources/DEPENDENCIES                         |   19 -
 .../resources/LICENSE                              |  204 -
 .../resources/NOTICE                               |    6 -
 .../src/.gitignore                                 |    0
 .../apache/felix/dm/runtime/AbstractBuilder.java   |  214 -
 .../src/org/apache/felix/dm/runtime/Activator.java |   94 -
 .../felix/dm/runtime/AdapterServiceBuilder.java    |  104 -
 .../felix/dm/runtime/AspectServiceBuilder.java     |  103 -
 .../dm/runtime/BundleAdapterServiceBuilder.java    |   75 -
 .../apache/felix/dm/runtime/ComponentBuilder.java  |  127 -
 .../felix/dm/runtime/ComponentFactoryImpl.java     |  121 -
 .../felix/dm/runtime/ComponentInstanceImpl.java    |  207 -
 .../apache/felix/dm/runtime/DependencyBuilder.java |  254 -
 .../felix/dm/runtime/DependencyManagerRuntime.java |  227 -
 .../apache/felix/dm/runtime/DescriptorParser.java  |   75 -
 .../FactoryConfigurationAdapterServiceBuilder.java |  104 -
 .../org/apache/felix/dm/runtime/FactorySet.java    |  528 --
 .../apache/felix/dm/runtime/InvocationUtil.java    |  111 -
 .../org/apache/felix/dm/runtime/JSONMetaData.java  |  479 --
 .../org/apache/felix/dm/runtime/JsonReader.java    |  290 -
 .../src/org/apache/felix/dm/runtime/Log.java       |   92 -
 .../src/org/apache/felix/dm/runtime/MetaData.java  |   94 -
 .../src/org/apache/felix/dm/runtime/Params.java    |   74 -
 .../dm/runtime/ResourceAdapterServiceBuilder.java  |   74 -
 .../apache/felix/dm/runtime/SerialExecutor.java    |   92 -
 .../felix/dm/runtime/ServiceLifecycleHandler.java  |  453 --
 .../felix/dm/runtime/ToggleServiceDependency.java  |   66 -
 .../felix/dm/runtime/api/ComponentException.java   |   32 -
 .../felix/dm/runtime/api/ComponentFactory.java     |   39 -
 .../felix/dm/runtime/api/ComponentInstance.java    |   39 -
 .../org/apache/felix/dm/runtime/api/packageinfo    |    1 -
 .../test/.gitignore                                |    0
 .../.classpath                                     |   12 -
 .../.gitignore                                     |    3 -
 .../.project                                       |   23 -
 .../README.samples                                 |   35 -
 .../bnd.bnd                                        |   38 -
 .../composite.bnd                                  |   21 -
 .../composite.bndrun                               |   40 -
 .../compositefactory.bnd                           |   21 -
 .../compositefactory.bndrun                        |   40 -
 .../conf.bnd                                       |   21 -
 .../customdep.bnd                                  |   21 -
 .../customdep.bndrun                               |   39 -
 .../device.annot.bnd                               |   20 -
 .../device.annot.bndrun                            |   40 -
 .../device.api.bnd                                 |   21 -
 .../device.api.bndrun                              |   39 -
 .../dictionary.annot.bnd                           |   20 -
 .../dictionary.annot.bndrun                        |   43 -
 .../dictionary.api.bnd                             |   21 -
 .../dictionary.api.bndrun                          |   43 -
 .../dictionary.metatype.bnd                        |   21 -
 .../dictionary.metatype.bndrun                     |   43 -
 .../dynamicdep.annot.bnd                           |   20 -
 .../dynamicdep.annot.bndrun                        |   41 -
 .../dynamicdep.api.bnd                             |   21 -
 .../dynamicdep.api.bndrun                          |   42 -
 .../hello.annot.bnd                                |   20 -
 .../hello.annot.bndrun                             |   41 -
 .../hello.api.bnd                                  |   20 -
 .../hello.api.bndrun                               |   41 -
 .../src/.gitignore                                 |    0
 .../samples/composite/Activator.java               |   38 -
 .../samples/composite/Provider.java                |   25 -
 .../samples/composite/ProviderImpl.java            |   51 -
 .../samples/composite/ProviderParticipant1.java    |   37 -
 .../samples/composite/ProviderParticipant2.java    |   37 -
 .../dependencymanager/samples/composite/README     |   33 -
 .../samples/compositefactory/Activator.java        |   43 -
 .../compositefactory/CompositionManager.java       |   60 -
 .../samples/compositefactory/Provider.java         |   26 -
 .../samples/compositefactory/ProviderImpl.java     |   46 -
 .../compositefactory/ProviderParticipant1.java     |   37 -
 .../compositefactory/ProviderParticipant2.java     |   37 -
 .../samples/compositefactory/README                |   33 -
 .../dependencymanager/samples/conf/Activator.java  |   38 -
 .../samples/conf/Configurator.java                 |   76 -
 .../felix/dependencymanager/samples/conf/README    |   19 -
 .../samples/customdep/Activator.java               |   41 -
 .../samples/customdep/PathDependency.java          |   33 -
 .../samples/customdep/PathDependencyImpl.java      |  179 -
 .../samples/customdep/PathTracker.java             |   41 -
 .../dependencymanager/samples/customdep/README     |   34 -
 .../samples/device/annot/Device.java               |   26 -
 .../samples/device/annot/DeviceAccess.java         |   30 -
 .../samples/device/annot/DeviceAccessConsumer.java |   43 -
 .../samples/device/annot/DeviceAccessImpl.java     |   72 -
 .../device/annot/DeviceAndParameterFactory.java    |   66 -
 .../samples/device/annot/DeviceImpl.java           |   46 -
 .../samples/device/annot/DeviceParameter.java      |   26 -
 .../samples/device/annot/DeviceParameterImpl.java  |   45 -
 .../dependencymanager/samples/device/annot/README  |   44 -
 .../samples/device/api/Activator.java              |   59 -
 .../samples/device/api/Device.java                 |   26 -
 .../samples/device/api/DeviceAccess.java           |   30 -
 .../samples/device/api/DeviceAccessConsumer.java   |   37 -
 .../samples/device/api/DeviceAccessImpl.java       |   54 -
 .../samples/device/api/DeviceImpl.java             |   40 -
 .../samples/device/api/DeviceParameter.java        |   26 -
 .../samples/device/api/DeviceParameterImpl.java    |   40 -
 .../dependencymanager/samples/device/api/README    |   40 -
 .../samples/dictionary/annot/DictionaryAspect.java |   92 -
 .../annot/DictionaryAspectConfiguration.java       |   39 -
 .../dictionary/annot/DictionaryConfiguration.java  |   42 -
 .../samples/dictionary/annot/DictionaryImpl.java   |  104 -
 .../dictionary/annot/DictionaryService.java        |   35 -
 .../samples/dictionary/annot/README                |   43 -
 .../samples/dictionary/annot/SpellChecker.java     |   89 -
 .../samples/dictionary/api/Activator.java          |   65 -
 .../samples/dictionary/api/DictionaryAspect.java   |   79 -
 .../api/DictionaryAspectConfiguration.java         |   39 -
 .../dictionary/api/DictionaryConfiguration.java    |   41 -
 .../samples/dictionary/api/DictionaryImpl.java     |   88 -
 .../samples/dictionary/api/DictionaryService.java  |   35 -
 .../samples/dictionary/api/README                  |   45 -
 .../samples/dictionary/api/SpellChecker.java       |   75 -
 .../samples/dictionary/metatype/Activator.java     |   76 -
 .../dictionary/metatype/DictionaryAspect.java      |   79 -
 .../metatype/DictionaryAspectConfiguration.java    |   30 -
 .../metatype/DictionaryConfiguration.java          |   32 -
 .../dictionary/metatype/DictionaryImpl.java        |   88 -
 .../dictionary/metatype/DictionaryService.java     |   35 -
 .../samples/dictionary/metatype/README             |   21 -
 .../samples/dictionary/metatype/SpellChecker.java  |   75 -
 .../dynamicdep/annot/DynamicDependency.java        |   92 -
 .../annot/DynamicDependencyConfiguration.java      |   49 -
 .../samples/dynamicdep/annot/FileStorage.java      |   48 -
 .../samples/dynamicdep/annot/MapDBStorage.java     |   47 -
 .../samples/dynamicdep/annot/README                |   52 -
 .../samples/dynamicdep/annot/Storage.java          |   29 -
 .../samples/dynamicdep/api/Activator.java          |   55 -
 .../samples/dynamicdep/api/DynamicDependency.java  |   76 -
 .../api/DynamicDependencyConfiguration.java        |   50 -
 .../samples/dynamicdep/api/FileStorage.java        |   42 -
 .../samples/dynamicdep/api/MapDBStorage.java       |   41 -
 .../samples/dynamicdep/api/README                  |   43 -
 .../samples/dynamicdep/api/Storage.java            |   29 -
 .../dependencymanager/samples/hello/annot/README   |   30 -
 .../samples/hello/annot/ServiceConsumer.java       |   53 -
 .../samples/hello/annot/ServiceConsumerConf.java   |   28 -
 .../samples/hello/annot/ServiceProvider.java       |   28 -
 .../samples/hello/annot/ServiceProviderImpl.java   |   39 -
 .../samples/hello/api/Activator.java               |   43 -
 .../dependencymanager/samples/hello/api/README     |   29 -
 .../samples/hello/api/ServiceConsumer.java         |   43 -
 .../samples/hello/api/ServiceConsumerConf.java     |   28 -
 .../samples/hello/api/ServiceProvider.java         |   28 -
 .../samples/hello/api/ServiceProviderImpl.java     |   35 -
 .../dependencymanager/samples/tpool/Activator.java |   52 -
 .../samples/tpool/MyComponent.java                 |   35 -
 .../felix/dependencymanager/samples/tpool/README   |   63 -
 .../executor/ComponentExecutorFactoryImpl.java     |   50 -
 .../test/.gitignore                                |    0
 .../tpool.bnd                                      |   22 -
 .../tpool.bndrun                                   |   41 -
 .../.classpath                                     |   12 -
 .../.gitignore                                     |    3 -
 .../.project                                       |   23 -
 .../bnd.bnd                                        |   37 -
 .../changelog.txt                                  |  278 -
 .../resources/DEPENDENCIES                         |   22 -
 .../resources/LICENSE                              |  202 -
 .../resources/NOTICE                               |    7 -
 .../src/.gitignore                                 |    0
 .../src/org/apache/felix/dm/shell/Activator.java   |   57 -
 .../src/org/apache/felix/dm/shell/ComponentId.java |  100 -
 .../src/org/apache/felix/dm/shell/DMCommand.java   |  682 ---
 .../test/.gitignore                                |    0
 .../test/test/DMCommandTest.java                   |  304 --
 .../org.apache.felix.dependencymanager/.classpath  |   12 -
 .../org.apache.felix.dependencymanager/.gitignore  |    3 -
 .../org.apache.felix.dependencymanager/.project    |   23 -
 .../org.apache.felix.dependencymanager/bnd.bnd     |   53 -
 .../changelog.txt                                  |  297 -
 .../org.apache.felix.dependencymanager/design.txt  |   47 -
 .../resources/DEPENDENCIES                         |   24 -
 .../resources/LICENSE                              |  202 -
 .../resources/NOTICE                               |   12 -
 .../src/.gitignore                                 |    0
 .../src/org/apache/felix/dm/AdapterComponent.java  |  391 --
 .../src/org/apache/felix/dm/AspectComponent.java   |  383 --
 .../src/org/apache/felix/dm/BundleComponent.java   |  363 --
 .../src/org/apache/felix/dm/BundleDependency.java  |  143 -
 .../src/org/apache/felix/dm/Component.java         |  354 --
 .../org/apache/felix/dm/ComponentDeclaration.java  |   61 -
 .../felix/dm/ComponentDependencyDeclaration.java   |   61 -
 .../apache/felix/dm/ComponentExecutorFactory.java  |  171 -
 .../src/org/apache/felix/dm/ComponentState.java    |   76 -
 .../apache/felix/dm/ComponentStateListener.java    |   36 -
 .../apache/felix/dm/ConfigurationDependency.java   |  293 -
 .../src/org/apache/felix/dm/Dependency.java        |   93 -
 .../apache/felix/dm/DependencyActivatorBase.java   |  235 -
 .../src/org/apache/felix/dm/DependencyManager.java |  322 --
 .../src/org/apache/felix/dm/FactoryComponent.java  |  391 --
 .../src/org/apache/felix/dm/FilterIndex.java       |   49 -
 .../src/org/apache/felix/dm/Logger.java            |  327 --
 .../src/org/apache/felix/dm/PropertyMetaData.java  |  105 -
 .../src/org/apache/felix/dm/ResourceComponent.java |  370 --
 .../org/apache/felix/dm/ResourceDependency.java    |  153 -
 .../src/org/apache/felix/dm/ResourceHandler.java   |   76 -
 .../src/org/apache/felix/dm/ResourceUtil.java      |   45 -
 .../src/org/apache/felix/dm/ServiceDependency.java |  345 --
 .../dm/compat/DependencyActivatorBaseCompat.java   |  269 -
 .../felix/dm/compat/DependencyManagerCompat.java   |  724 ---
 .../src/org/apache/felix/dm/compat/packageinfo     |    1 -
 .../felix/dm/context/AbstractDependency.java       |  579 --
 .../apache/felix/dm/context/ComponentContext.java  |  202 -
 .../apache/felix/dm/context/DependencyContext.java |  129 -
 .../src/org/apache/felix/dm/context/Event.java     |   79 -
 .../src/org/apache/felix/dm/context/EventType.java |   46 -
 .../src/org/apache/felix/dm/context/packageinfo    |    1 -
 .../felix/dm/diagnostics/CircularDependency.java   |   48 -
 .../apache/felix/dm/diagnostics/ComponentNode.java |   40 -
 .../felix/dm/diagnostics/DependencyGraph.java      |  415 --
 .../felix/dm/diagnostics/DependencyGraphNode.java  |   71 -
 .../felix/dm/diagnostics/DependencyNode.java       |   53 -
 .../felix/dm/diagnostics/MissingDependency.java    |   62 -
 .../org/apache/felix/dm/diagnostics/packageinfo    |    1 -
 .../apache/felix/dm/impl/AbstractDecorator.java    |  236 -
 .../src/org/apache/felix/dm/impl/Activator.java    |  103 -
 .../apache/felix/dm/impl/AdapterServiceImpl.java   |  177 -
 .../apache/felix/dm/impl/AspectServiceImpl.java    |  222 -
 .../apache/felix/dm/impl/BundleAdapterImpl.java    |  132 -
 .../apache/felix/dm/impl/BundleDependencyImpl.java |  300 -
 .../org/apache/felix/dm/impl/BundleEventImpl.java  |   70 -
 .../org/apache/felix/dm/impl/CallbackTypeDef.java  |   39 -
 .../org/apache/felix/dm/impl/ComponentImpl.java    | 1993 -------
 .../apache/felix/dm/impl/ComponentScheduler.java   |  147 -
 .../src/org/apache/felix/dm/impl/Configurable.java |  751 ---
 .../felix/dm/impl/ConfigurationDependencyImpl.java |  474 --
 .../felix/dm/impl/ConfigurationEventImpl.java      |   62 -
 .../apache/felix/dm/impl/DefaultNullObject.java    |   71 -
 .../org/apache/felix/dm/impl/DispatchExecutor.java |  187 -
 .../dm/impl/FactoryConfigurationAdapterImpl.java   |  396 --
 .../src/org/apache/felix/dm/impl/FieldUtil.java    |  352 --
 .../org/apache/felix/dm/impl/FilterComponent.java  |  402 --
 .../org/apache/felix/dm/impl/InvocationUtil.java   |  514 --
 .../apache/felix/dm/impl/ResourceAdapterImpl.java  |  140 -
 .../felix/dm/impl/ResourceDependencyImpl.java      |  265 -
 .../apache/felix/dm/impl/ResourceEventImpl.java    |   87 -
 .../org/apache/felix/dm/impl/SerialExecutor.java   |  153 -
 .../felix/dm/impl/ServiceDependencyImpl.java       |  607 ---
 .../org/apache/felix/dm/impl/ServiceEventImpl.java |  196 -
 .../felix/dm/impl/ServiceRegistrationImpl.java     |   99 -
 .../src/org/apache/felix/dm/impl/ServiceUtil.java  |  306 --
 .../dm/impl/TemporalServiceDependencyImpl.java     |  193 -
 .../dm/impl/index/AbstractFactoryFilterIndex.java  |  102 -
 .../felix/dm/impl/index/AdapterFilterIndex.java    |  225 -
 .../felix/dm/impl/index/AspectFilterIndex.java     |  267 -
 .../dm/impl/index/BundleContextInterceptor.java    |  179 -
 .../impl/index/BundleContextInterceptorBase.java   |  198 -
 .../dm/impl/index/FilterIndexBundleContext.java    |   64 -
 .../felix/dm/impl/index/ServiceRegistryCache.java  |  129 -
 .../dm/impl/index/ServiceRegistryCacheManager.java |  216 -
 .../felix/dm/impl/index/multiproperty/Filter.java  |  137 -
 .../multiproperty/MultiPropertyFilterIndex.java    |  519 --
 .../impl/index/multiproperty/MultiPropertyKey.java |  141 -
 .../dm/impl/index/multiproperty/Property.java      |  108 -
 .../dm/impl/metatype/AttributeDefinitionImpl.java  |   76 -
 .../dm/impl/metatype/MetaTypeProviderImpl.java     |  273 -
 .../impl/metatype/ObjectClassDefinitionImpl.java   |  103 -
 .../dm/impl/metatype/PropertyMetaDataImpl.java     |  205 -
 .../apache/felix/dm/impl/metatype/Resource.java    |   42 -
 .../src/org/apache/felix/dm/packageinfo            |    1 -
 .../dm/tracker/AbstractCustomizerActionSet.java    |  100 -
 .../apache/felix/dm/tracker/AbstractTracked.java   |  480 --
 .../org/apache/felix/dm/tracker/BundleTracker.java |  505 --
 .../felix/dm/tracker/BundleTrackerCustomizer.java  |  106 -
 .../apache/felix/dm/tracker/ServiceTracker.java    | 1482 -----
 .../felix/dm/tracker/ServiceTrackerCustomizer.java |  116 -
 .../src/org/apache/felix/dm/tracker/packageinfo    |    1 -
 .../test/.gitignore                                |    0
 .../org/apache/felix/dm/impl/ConfigurableTest.java |  271 -
 .../dm/impl/ConfigurationDependencyImplTest.java   |  258 -
 .../impl/FactoryConfigurationAdapterImplTest.java  |  158 -
 .../org/apache/felix/dm/tracker/TrackedTest.java   |  315 --
 .../test/test/ComponentTest.java                   |  697 ---
 .../test/test/ConcurrencyTest.java                 |  120 -
 .../test/test/ConfigurationTest.java               |  132 -
 .../test/test/Ensure.java                          |  186 -
 .../test/test/EventImpl.java                       |   71 -
 .../MultiPropertyFilterIndexPerformanceTest.java   |  102 -
 .../MultiPropertyFilterIndexReferencedTest.java    |  301 -
 .../test/test/MultiPropertyKeyTest.java            |  116 -
 .../test/test/SerialExecutorTest.java              |  135 -
 .../test/test/ServiceRaceTest.java                 |  253 -
 .../test/test/SimpleServiceDependency.java         |   94 -
 .../test/test/TestBase.java                        |   70 -
 .../test/test/TestReference.java                   |   88 -
 dependencymanager/release/.classpath               |   12 -
 dependencymanager/release/.gitignore               |    3 -
 dependencymanager/release/.project                 |   23 -
 dependencymanager/release/README.release           |  136 -
 dependencymanager/release/bnd.bnd                  |   27 -
 dependencymanager/release/build.gradle             |  302 --
 dependencymanager/release/check_staged_release.sh  |  119 -
 dependencymanager/release/rat.gradle               |   93 -
 dependencymanager/release/resources/bin/LICENSE    |  203 -
 dependencymanager/release/resources/bin/NOTICE     |   11 -
 dependencymanager/release/resources/bin/README.bin |   53 -
 dependencymanager/release/resources/src/LICENSE    |  202 -
 dependencymanager/release/resources/src/NOTICE     |   11 -
 dependencymanager/release/resources/src/README.src |  109 -
 dependencymanager/release/src/.gitignore           |    0
 dependencymanager/release/test/.gitignore          |    0
 dependencymanager/settings.gradle                  |   25 -
 deploymentadmin/autoconf/DEPENDENCIES              |   29 -
 deploymentadmin/autoconf/LICENSE                   |  202 -
 deploymentadmin/autoconf/LICENSE.kxml2             |   19 -
 deploymentadmin/autoconf/NOTICE                    |   15 -
 deploymentadmin/autoconf/changelog.txt             |   26 -
 deploymentadmin/autoconf/pom.xml                   |  113 -
 .../felix/deployment/rp/autoconf/Activator.java    |   58 -
 .../rp/autoconf/AttributeDefinitionImpl.java       |   68 -
 .../deployment/rp/autoconf/AutoConfResource.java   |  163 -
 .../rp/autoconf/AutoConfResourceProcessor.java     |  782 ---
 .../felix/deployment/rp/autoconf/MetaTypeUtil.java |  233 -
 .../rp/autoconf/ObjectClassDefinitionImpl.java     |   81 -
 .../deployment/rp/autoconf/PersistencyManager.java |  183 -
 .../rp/autoconf/AutoConfResourceProcessorTest.java |  627 ---
 .../deployment/rp/autoconf/DefaultNullObject.java  |   80 -
 .../rp/autoconf/PersistencyManagerTest.java        |   99 -
 .../apache/felix/deployment/rp/autoconf/Utils.java |  148 -
 deploymentadmin/deploymentadmin/DEPENDENCIES       |   24 -
 deploymentadmin/deploymentadmin/LICENSE            |  202 -
 deploymentadmin/deploymentadmin/NOTICE             |   11 -
 deploymentadmin/deploymentadmin/changelog.txt      |   39 -
 deploymentadmin/deploymentadmin/pom.xml            |   96 -
 .../deploymentadmin/AbstractDeploymentPackage.java |  516 --
 .../apache/felix/deploymentadmin/AbstractInfo.java |  139 -
 .../apache/felix/deploymentadmin/Activator.java    |   54 -
 .../felix/deploymentadmin/BundleInfoImpl.java      |  112 -
 .../apache/felix/deploymentadmin/Constants.java    |   75 -
 .../ContentCopyingJarInputStream.java              |  151 -
 .../deploymentadmin/DeploymentAdminConfig.java     |   92 -
 .../felix/deploymentadmin/DeploymentAdminImpl.java |  617 ---
 .../deploymentadmin/DeploymentPackageManifest.java |  167 -
 .../deploymentadmin/FileDeploymentPackage.java     |   96 -
 .../felix/deploymentadmin/NonCloseableStream.java  |   95 -
 .../felix/deploymentadmin/ResourceInfoImpl.java    |   66 -
 .../apache/felix/deploymentadmin/Semaphore.java    |  121 -
 .../deploymentadmin/StreamDeploymentPackage.java   |  117 -
 .../org/apache/felix/deploymentadmin/Utils.java    |  241 -
 .../apache/felix/deploymentadmin/VersionRange.java |  156 -
 .../felix/deploymentadmin/spi/AbstractAction.java  |   44 -
 .../apache/felix/deploymentadmin/spi/Command.java  |  186 -
 .../deploymentadmin/spi/CommitResourceCommand.java |  105 -
 .../deploymentadmin/spi/DeploymentSessionImpl.java |  214 -
 .../deploymentadmin/spi/DropAllBundlesCommand.java |   86 -
 .../spi/DropAllResourcesCommand.java               |  115 -
 .../deploymentadmin/spi/DropBundleCommand.java     |   88 -
 .../deploymentadmin/spi/DropResourceCommand.java   |   97 -
 .../deploymentadmin/spi/GetStorageAreaCommand.java |   70 -
 .../spi/ProcessResourceCommand.java                |  151 -
 .../felix/deploymentadmin/spi/SnapshotCommand.java |  226 -
 .../deploymentadmin/spi/StartBundleCommand.java    |  131 -
 .../spi/StartCustomizerCommand.java                |   97 -
 .../deploymentadmin/spi/StopBundleCommand.java     |  124 -
 .../felix/deploymentadmin/spi/UpdateCommand.java   |  203 -
 .../ContentCopyingJarInputStreamTest.java          |  257 -
 .../deploymentadmin/DeploymentAdminConfigTest.java |  139 -
 .../deploymentadmin/spi/SnapshotCommandTest.java   |  229 -
 deploymentadmin/itest/pom.xml                      |  214 -
 .../deploymentadmin/itest/BaseIntegrationTest.java |  317 --
 .../deploymentadmin/itest/CustomizerTest.java      |  254 -
 .../felix/deploymentadmin/itest/DPSignerTest.java  |   84 -
 .../itest/DeploymentAdminEventTest.java            |  303 --
 .../deploymentadmin/itest/DeploymentAdminTest.java |  158 -
 .../itest/DeploymentPackageBuilderTest.java        |  301 -
 .../itest/InstallDeploymentPackageTest.java        |  609 ---
 .../itest/InstallFixPackageTest.java               |  603 ---
 .../deploymentadmin/itest/ResourceSharingTest.java |  132 -
 .../itest/UninstallDeploymentPackageTest.java      |  311 --
 .../deploymentadmin/itest/util/ArtifactData.java   |  120 -
 .../itest/util/ArtifactDataBuilder.java            |   86 -
 .../itest/util/BundleDataBuilder.java              |  120 -
 .../itest/util/CertificateUtil.java                |  123 -
 .../felix/deploymentadmin/itest/util/DPSigner.java |  273 -
 .../itest/util/DeploymentPackageBuilder.java       |  437 --
 .../util/LocalizationResourceDataBuilder.java      |   43 -
 .../itest/util/ResourceDataBuilder.java            |   68 -
 .../deploymentadmin/itest/util/ResourceFilter.java |   29 -
 .../itest/util/ResourceProcessorDataBuilder.java   |   66 -
 deploymentadmin/itest/src/test/resources/LICENSE   |  202 -
 .../itest/src/test/resources/dp.properties         |   18 -
 .../itest/src/test/resources/logback.xml           |   30 -
 deploymentadmin/itest/src/test/resources/logo.png  |  Bin 14927 -> 0 bytes
 .../itest/src/test/resources/test-config1.xml      |   30 -
 deploymentadmin/pom.xml                            |   38 -
 deploymentadmin/testbundles/bundle1/bnd.bnd        |   21 -
 deploymentadmin/testbundles/bundle1/pom.xml        |   46 -
 .../deploymentadmin/test/bundle1/TestService.java  |   31 -
 .../test/bundle1/impl/Activator.java               |   34 -
 .../test/bundle1/impl/TestServiceImpl.java         |   31 -
 deploymentadmin/testbundles/bundle2/bnd.bnd        |   21 -
 deploymentadmin/testbundles/bundle2/pom.xml        |   55 -
 .../test/bundle2/impl/Activator.java               |   56 -
 deploymentadmin/testbundles/bundle3/bnd.bnd        |   20 -
 deploymentadmin/testbundles/bundle3/pom.xml        |   46 -
 .../test/bundle3/impl/Activator.java               |   48 -
 deploymentadmin/testbundles/bundleapi1/bnd.bnd     |   19 -
 deploymentadmin/testbundles/bundleapi1/pom.xml     |   46 -
 .../deploymentadmin/test/bundleapi/MyService.java  |   24 -
 deploymentadmin/testbundles/bundleapi2/bnd.bnd     |   19 -
 deploymentadmin/testbundles/bundleapi2/pom.xml     |   46 -
 .../deploymentadmin/test/bundleapi/MyService.java  |   24 -
 deploymentadmin/testbundles/bundleimpl1/bnd.bnd    |   20 -
 deploymentadmin/testbundles/bundleimpl1/pom.xml    |   51 -
 .../test/bundleimpl/MyServiceImpl.java             |   26 -
 deploymentadmin/testbundles/bundleimpl2/bnd.bnd    |   20 -
 deploymentadmin/testbundles/bundleimpl2/pom.xml    |   51 -
 .../test/bundleimpl/MyServiceImpl.java             |   26 -
 deploymentadmin/testbundles/fragment1/bnd.bnd      |   20 -
 deploymentadmin/testbundles/fragment1/pom.xml      |   46 -
 .../deploymentadmin/test/fragment1/impl/Pojo.java  |   27 -
 deploymentadmin/testbundles/pom.xml                |   54 -
 deploymentadmin/testbundles/rp1/bnd.bnd            |   22 -
 deploymentadmin/testbundles/rp1/pom.xml            |   50 -
 .../deploymentadmin/test/rp1/impl/Activator.java   |   97 -
 deploymentadmin/testbundles/rp2/bnd.bnd            |   22 -
 deploymentadmin/testbundles/rp2/pom.xml            |   53 -
 .../deploymentadmin/test/rp2/impl/Activator.java   |  100 -
 deviceaccess/pom.xml                               |   95 -
 .../main/java/org/apache/felix/das/Activator.java  |  115 -
 .../java/org/apache/felix/das/DeviceManager.java   |  728 ---
 .../org/apache/felix/das/DriverAttributes.java     |  114 -
 .../src/main/java/org/apache/felix/das/Log.java    |   41 -
 .../org/apache/felix/das/NamedThreadFactory.java   |   47 -
 .../org/apache/felix/das/util/DeviceAnalyzer.java  |   99 -
 .../org/apache/felix/das/util/DriverAnalyzer.java  |   60 -
 .../org/apache/felix/das/util/DriverLoader.java    |  194 -
 .../org/apache/felix/das/util/DriverMatcher.java   |  209 -
 .../main/java/org/apache/felix/das/util/Util.java  |  179 -
 .../org/apache/felix/das/DeviceManagerTest.java    |  913 ----
 .../org/apache/felix/das/DriverAttributesTest.java |  174 -
 .../test/java/org/apache/felix/das/OSGiMock.java   |  168 -
 .../src/test/java/org/apache/felix/das/Utils.java  |   78 -
 .../apache/felix/das/util/DriverAnalyzerTest.java  |  131 -
 .../apache/felix/das/util/DriverLoaderTest.java    |  263 -
 .../apache/felix/das/util/DriverMatcherTest.java   |  329 --
 .../java/org/apache/felix/das/util/UtilTest.java   |  221 -
 doap/doap_Felix.rdf                                |   47 -
 eventadmin/bridge.configuration/pom.xml            |   84 -
 .../bridge/configuration/impl/Activator.java       |   56 -
 .../impl/ConfigurationEventToEventAdminBridge.java |  128 -
 eventadmin/bridge.upnp/pom.xml                     |   71 -
 .../felix/eventadmin/bridge/upnp/Activator.java    |   55 -
 .../bridge/upnp/UPnPEventToEventAdminBridge.java   |  424 --
 eventadmin/bridge.upnp/src/main/resources/LICENSE  |  202 -
 eventadmin/bridge.upnp/src/main/resources/NOTICE   |    5 -
 eventadmin/bridge.useradmin/pom.xml                |   64 -
 .../eventadmin/bridge/useradmin/Activator.java     |   55 -
 .../UserAdminEventToEventAdminBridge.java          |  124 -
 .../bridge.useradmin/src/main/resources/LICENSE    |  202 -
 .../bridge.useradmin/src/main/resources/NOTICE     |    5 -
 eventadmin/bridge.wireadmin/pom.xml                |   64 -
 .../eventadmin/bridge/wireadmin/Activator.java     |   55 -
 .../WireAdminEventToEventAdminBridge.java          |  161 -
 .../bridge.wireadmin/src/main/resources/LICENSE    |  202 -
 .../bridge.wireadmin/src/main/resources/NOTICE     |    5 -
 eventadmin/impl/changelog.txt                      |  160 -
 eventadmin/impl/pom.xml                            |  245 -
 .../main/appended-resources/META-INF/DEPENDENCIES  |   16 -
 .../apache/felix/eventadmin/impl/Activator.java    |   92 -
 .../felix/eventadmin/impl/Configuration.java       |  667 ---
 .../eventadmin/impl/MetaTypeProviderImpl.java      |  301 -
 .../eventadmin/impl/adapter/AbstractAdapter.java   |   55 -
 .../impl/adapter/BundleEventAdapter.java           |  119 -
 .../impl/adapter/FrameworkEventAdapter.java        |  142 -
 .../eventadmin/impl/adapter/LogEventAdapter.java   |  254 -
 .../impl/adapter/ServiceEventAdapter.java          |  112 -
 .../eventadmin/impl/handler/EventAdminImpl.java    |  219 -
 .../eventadmin/impl/handler/EventHandlerProxy.java |  467 --
 .../impl/handler/EventHandlerTracker.java          |  303 --
 .../impl/security/EventAdminSecurityDecorator.java |  161 -
 .../eventadmin/impl/security/PermissionsUtil.java  |   89 -
 .../impl/security/SecureEventAdminFactory.java     |  105 -
 .../eventadmin/impl/tasks/AsyncDeliverTasks.java   |  194 -
 .../eventadmin/impl/tasks/DefaultThreadPool.java   |  151 -
 .../felix/eventadmin/impl/tasks/DenylistLatch.java |  107 -
 .../felix/eventadmin/impl/tasks/HandlerTask.java   |  133 -
 .../eventadmin/impl/tasks/SyncDeliverTasks.java    |  131 -
 .../felix/eventadmin/impl/tasks/SyncThread.java    |   39 -
 .../felix/eventadmin/impl/util/LogWrapper.java     |  509 --
 .../felix/eventadmin/impl/util/Matchers.java       |  192 -
 .../felix/eventadmin/impl/util/MatchersTest.java   |  124 -
 .../felix/eventadmin/ittests/AbstractTest.java     |  361 --
 .../apache/felix/eventadmin/ittests/Listener.java  |   62 -
 .../felix/eventadmin/ittests/StressTestIT.java     |   56 -
 .../eventadmin/perftests/PerformanceTestIT.java    |  339 --
 eventadmin/pom.xml                                 |   45 -
 examples/README.txt                                |   12 -
 examples/dictionaryclient/pom.xml                  |   71 -
 .../felix/examples/dictionaryclient/Activator.java |  119 -
 examples/dictionaryclient2/pom.xml                 |   71 -
 .../examples/dictionaryclient2/Activator.java      |  200 -
 examples/dictionaryservice.itest/pom.xml           |  101 -
 .../dictionaryservice/itest/Activator.java         |   93 -
 examples/dictionaryservice/pom.xml                 |   68 -
 .../dictionaryservice/DictionaryService.java       |   36 -
 .../examples/dictionaryservice/impl/Activator.java |   99 -
 examples/eventlistener/pom.xml                     |   65 -
 .../felix/examples/eventlistener/Activator.java    |   87 -
 examples/extenderbased.circle/pom.xml              |   69 -
 .../felix/example/extenderbased/circle/Circle.java |   54 -
 .../src/main/resources/META-INF/LICENSE            |  202 -
 .../src/main/resources/META-INF/NOTICE             |    5 -
 .../felix/example/extenderbased/circle/circle.png  |  Bin 1664 -> 0 bytes
 examples/extenderbased.host/pom.xml                |   72 -
 .../example/extenderbased/host/Activator.java      |  116 -
 .../example/extenderbased/host/DefaultShape.java   |  126 -
 .../example/extenderbased/host/DrawingFrame.java   |  285 -
 .../extenderbased/host/ShapeBundleTracker.java     |  162 -
 .../example/extenderbased/host/ShapeComponent.java |   67 -
 .../extenderbased/host/extension/SimpleShape.java  |   59 -
 .../extenderbased/host/launch/Application.java     |  127 -
 .../extenderbased/host/launch/ConfigUtil.java      |  116 -
 .../src/main/resources/META-INF/LICENSE            |  202 -
 .../src/main/resources/META-INF/NOTICE             |    5 -
 .../felix/example/extenderbased/host/underc.png    |  Bin 526 -> 0 bytes
 examples/extenderbased.square/pom.xml              |   69 -
 .../felix/example/extenderbased/square/Square.java |   54 -
 .../src/main/resources/META-INF/LICENSE            |  202 -
 .../src/main/resources/META-INF/NOTICE             |    5 -
 .../felix/example/extenderbased/square/square.png  |  Bin 351 -> 0 bytes
 examples/extenderbased.triangle/pom.xml            |   69 -
 .../example/extenderbased/triangle/Triangle.java   |   63 -
 .../src/main/resources/META-INF/LICENSE            |  202 -
 .../src/main/resources/META-INF/NOTICE             |    5 -
 .../example/extenderbased/triangle/triangle.png    |  Bin 1375 -> 0 bytes
 examples/frenchdictionary/pom.xml                  |   71 -
 .../felix/examples/frenchdictionary/Activator.java |   98 -
 examples/jaas/app/pom.xml                          |   95 -
 .../app/internal/BootClasspathDemoServlet.java     |   82 -
 .../jaas/app/internal/FactoryDemoServlet.java      |   83 -
 .../jaas/app/internal/GlobalConfigDemoServlet.java |   86 -
 .../internal/ServletRequestCallbackHandler.java    |   68 -
 .../example/jaas/app/internal/TCCLDemoServlet.java |  100 -
 examples/jaas/jdbc-h2/pom.xml                      |  120 -
 .../example/jaas/jdbc/internal/H2Activator.java    |   96 -
 examples/jaas/jdbc-h2/src/main/resources/roles.csv |    5 -
 examples/jaas/jdbc-h2/src/main/resources/users.csv |    4 -
 examples/jaas/launcher/pom.xml                     |  112 -
 examples/jaas/launcher/src/main/bundles/list.xml   |  167 -
 ...g.apache.felix.example.jaas.jdbc.factory-h2.cfg |   22 -
 ...che.felix.jaas.Configuration.factory-simple.cfg |   23 -
 .../jaas/launcher/src/main/sling/common.properties |   22 -
 examples/jaas/lm-config/pom.xml                    |   51 -
 .../config/internal/SampleConfigLoginModule.java   |  105 -
 .../jaas/config/internal/SamplePrincipal.java      |   68 -
 examples/jaas/lm-jdbc/pom.xml                      |  101 -
 .../felix/example/jaas/jdbc/JdbcLoginModule.java   |  187 -
 .../example/jaas/jdbc/JdbcLoginModuleFactory.java  |  139 -
 .../felix/example/jaas/jdbc/RolePrincipal.java     |   58 -
 .../felix/example/jaas/jdbc/UserPrincipal.java     |   58 -
 .../OSGI-INF/metatype/metatype.properties          |   50 -
 examples/jaas/pom.xml                              |   42 -
 examples/pom.xml                                   |   70 -
 examples/servicebased.circle/pom.xml               |   59 -
 .../example/servicebased/circle/Activator.java     |   95 -
 .../src/main/resources/META-INF/LICENSE            |  202 -
 .../src/main/resources/META-INF/NOTICE             |    5 -
 .../felix/example/servicebased/circle/circle.png   |  Bin 1664 -> 0 bytes
 examples/servicebased.host/pom.xml                 |   64 -
 .../felix/example/servicebased/host/Activator.java |  115 -
 .../example/servicebased/host/DefaultShape.java    |  143 -
 .../example/servicebased/host/DrawingFrame.java    |  293 -
 .../example/servicebased/host/ShapeComponent.java  |   68 -
 .../example/servicebased/host/ShapeTracker.java    |  195 -
 .../servicebased/host/launch/Application.java      |  131 -
 .../servicebased/host/launch/ConfigUtil.java       |  115 -
 .../servicebased/host/service/SimpleShape.java     |   52 -
 .../src/main/resources/META-INF/LICENSE            |  202 -
 .../src/main/resources/META-INF/NOTICE             |    5 -
 .../felix/example/servicebased/host/underc.png     |  Bin 526 -> 0 bytes
 examples/servicebased.square/pom.xml               |   59 -
 .../example/servicebased/square/Activator.java     |   95 -
 .../src/main/resources/META-INF/LICENSE            |  202 -
 .../src/main/resources/META-INF/NOTICE             |    5 -
 .../felix/example/servicebased/square/square.png   |  Bin 351 -> 0 bytes
 examples/servicebased.trapezoid/pom.xml            |   58 -
 .../example/servicebased/trapezoid/Activator.java  |  104 -
 .../src/main/resources/META-INF/LICENSE            |  202 -
 .../src/main/resources/META-INF/NOTICE             |    5 -
 .../example/servicebased/trapezoid/trapezoid.png   |  Bin 1349 -> 0 bytes
 examples/servicebased.triangle/pom.xml             |   59 -
 .../example/servicebased/triangle/Activator.java   |  104 -
 .../src/main/resources/META-INF/LICENSE            |  202 -
 .../src/main/resources/META-INF/NOTICE             |    5 -
 .../example/servicebased/triangle/triangle.png     |  Bin 1375 -> 0 bytes
 examples/simple/LICENSE                            |  202 -
 examples/simple/NOTICE                             |    5 -
 examples/simple/build.xml                          |   94 -
 examples/simple/doc/index.html                     |   36 -
 .../simple/lib/org.osgi.core-0.8.0-SNAPSHOT.jar    |  Bin 57189 -> 0 bytes
 examples/simple/lib/servlet-incomplete.jar         |  Bin 1646 -> 0 bytes
 examples/simple/native/build.txt                   |    6 -
 examples/simple/native/libfoo.so                   |  Bin 1735 -> 0 bytes
 .../org_apache_felix_examples_simple_Activator.h   |   21 -
 examples/simple/native/simple_bundle_foo_method.c  |   29 -
 .../apache/felix/examples/simple/Activator.java    |   86 -
 .../felix/examples/simple/embedded/Embedded.java   |   27 -
 .../org/apache/felix/examples/simple/manifest.mf   |   10 -
 examples/spellcheckbinder/pom.xml                  |   84 -
 .../felix/examples/spellcheckbinder/Activator.java |   39 -
 .../spellcheckbinder/SpellCheckServiceImpl.java    |  141 -
 .../src/main/resources/metadata.xml                |   31 -
 examples/spellcheckclient/pom.xml                  |   71 -
 .../felix/examples/spellcheckclient/Activator.java |  180 -
 examples/spellcheckscr/pom.xml                     |   76 -
 .../spellcheckscr/SpellCheckServiceImpl.java       |  117 -
 examples/spellcheckservice/pom.xml                 |   71 -
 .../spellcheckservice/SpellCheckService.java       |   40 -
 .../examples/spellcheckservice/impl/Activator.java |  265 -
 features/pom.xml                                   |  146 -
 .../org/apache/felix/feature/impl/Activator.java   |   34 -
 .../felix/feature/impl/ArtifactBuilderImpl.java    |  134 -
 .../felix/feature/impl/BuilderFactoryImpl.java     |   59 -
 .../felix/feature/impl/BundleBuilderImpl.java      |  134 -
 .../feature/impl/ConfigurationBuilderImpl.java     |  112 -
 .../felix/feature/impl/ExtensionBuilderImpl.java   |  151 -
 .../felix/feature/impl/FeatureBuilderImpl.java     |  275 -
 .../felix/feature/impl/FeatureServiceImpl.java     |  460 --
 .../java/org/apache/felix/feature/impl/IDImpl.java |  221 -
 .../org.osgi.service.feature.FeatureService        |    1 -
 .../felix/feature/impl/BundleBuilderImplTest.java  |  105 -
 .../felix/feature/impl/FeatureServiceImplTest.java |  314 --
 .../src/test/resources/features/test-exfeat1.json  |   26 -
 .../src/test/resources/features/test-exfeat2.json  |    9 -
 .../src/test/resources/features/test-feature.json  |   38 -
 .../src/test/resources/features/test-feature2.json |   19 -
 fileinstall-plugins/installer.test/.gitignore      |    1 -
 fileinstall-plugins/installer.test/README.md       |    6 -
 fileinstall-plugins/installer.test/pom.xml         |  206 -
 .../installer/test/InstallerIntegrationTest.java   |  460 --
 .../src/test/resources/org.example.a.jar           |  Bin 2217 -> 0 bytes
 .../src/test/resources/org.example.b.jar           |  Bin 2212 -> 0 bytes
 .../src/test/resources/org.example.c.jar           |  Bin 2212 -> 0 bytes
 .../resources/org.example.invalid-missing-rb.bar   |  Bin 621 -> 0 bytes
 .../installer.test/src/test/resources/valid1.bar   |  Bin 1804 -> 0 bytes
 .../installer.test/src/test/resources/valid2.bar   |  Bin 3683 -> 0 bytes
 fileinstall-plugins/installer/.gitignore           |    1 -
 fileinstall-plugins/installer/README.md            |   50 -
 fileinstall-plugins/installer/bnd.bnd              |    6 -
 fileinstall-plugins/installer/pom.xml              |  137 -
 .../fileinstall/plugins/installer/Artifact.java    |   41 -
 .../plugins/installer/FrameworkInstaller.java      |   66 -
 .../felix/fileinstall/plugins/installer/Hash.java  |   93 -
 .../plugins/installer/InstallableListener.java     |   35 -
 .../plugins/installer/InstallableManager.java      |   28 -
 .../plugins/installer/InstallableUnit.java         |   75 -
 .../plugins/installer/InstallableUnitEvent.java    |   49 -
 .../felix/fileinstall/plugins/installer/State.java |   21 -
 .../plugins/installer/impl/ArtifactImpl.java       |   69 -
 .../plugins/installer/impl/Constants.java          |   32 -
 .../installer/impl/DeploymentInstaller.java        |  715 ---
 .../impl/FrameworkInstallerComponent.java          |  144 -
 .../installer/impl/InstallableUnitImpl.java        |  116 -
 .../fileinstall/plugins/installer/impl/Job.java    |   53 -
 .../plugins/installer/impl/Locking.java            |   52 -
 .../plugins/installer/impl/RequirementParser.java  |  130 -
 .../plugins/installer/package-info.java            |   18 -
 .../impl/CompositeBundleInstallerTest.java         |  107 -
 .../installer/impl/RequirementParserTest.java      |   49 -
 .../plugins/installer/impl/TestLogService.java     |   69 -
 .../test/resources/invalid-missing-index-path.bar  |  Bin 398 -> 0 bytes
 .../test/resources/invalid-missing-requires.bar    |  Bin 547 -> 0 bytes
 .../src/test/resources/invalid-no-index.bar        |  Bin 377 -> 0 bytes
 .../src/test/resources/invalid-wrong-extension.xxx |  Bin 571 -> 0 bytes
 .../installer/src/test/resources/valid1.bar        |  Bin 563 -> 0 bytes
 .../installer/src/test/resources/valid2.bar        |  Bin 583 -> 0 bytes
 fileinstall-plugins/pom.xml                        |   20 -
 fileinstall-plugins/resolver/.gitignore            |    1 -
 fileinstall-plugins/resolver/bnd.bnd               |    4 -
 fileinstall-plugins/resolver/pom.xml               |  128 -
 .../plugins/resolver/PluginResolver.java           |   31 -
 .../plugins/resolver/ResolveRequest.java           |   75 -
 .../plugins/resolver/ResolveResult.java            |   37 -
 .../plugins/resolver/impl/BasicRegistry.java       |   54 -
 .../plugins/resolver/impl/CapReqBase.java          |   55 -
 .../plugins/resolver/impl/CapabilityImpl.java      |   59 -
 .../plugins/resolver/impl/JarURLConnector.java     |   49 -
 .../fileinstall/plugins/resolver/impl/Path.java    |  119 -
 .../resolver/impl/PluginResolveContext.java        |  338 --
 .../resolver/impl/PluginResolverComponent.java     |   70 -
 .../plugins/resolver/impl/RequirementImpl.java     |   59 -
 .../plugins/resolver/impl/ResolveResultImpl.java   |   51 -
 .../plugins/resolver/impl/ResourceImpl.java        |  102 -
 .../plugins/resolver/impl/URIUtils.java            |  166 -
 .../fileinstall/plugins/resolver/package-info.java |   19 -
 .../resolver/impl/PluginResolveContextTest.java    |  137 -
 .../plugins/resolver/impl/URIUtilsTest.java        |   87 -
 fileinstall/doc/changelog.txt                      |  364 --
 fileinstall/pom.xml                                |  214 -
 .../main/appended-resources/META-INF/DEPENDENCIES  |   13 -
 .../felix/fileinstall/ArtifactInstaller.java       |   57 -
 .../apache/felix/fileinstall/ArtifactListener.java |   45 -
 .../felix/fileinstall/ArtifactTransformer.java     |   36 -
 .../felix/fileinstall/ArtifactUrlTransformer.java  |   38 -
 .../felix/fileinstall/internal/Artifact.java       |  120 -
 .../fileinstall/internal/BundleTransformer.java    |   83 -
 .../fileinstall/internal/ConfigInstaller.java      |  667 ---
 .../fileinstall/internal/DirectoryWatcher.java     | 1498 -----
 .../felix/fileinstall/internal/FileInstall.java    |  441 --
 .../fileinstall/internal/JarDirUrlHandler.java     |  105 -
 .../apache/felix/fileinstall/internal/Scanner.java |  277 -
 .../apache/felix/fileinstall/internal/Util.java    |  393 --
 .../apache/felix/fileinstall/internal/Watcher.java |  328 --
 .../felix/fileinstall/internal/WatcherScanner.java |  169 -
 .../main/resources/OSGI-INF/metatype/metatype.xml  |   42 -
 .../internal/BundleTransformerTest.java            |   37 -
 .../fileinstall/internal/ConfigInstallerTest.java  |  613 ---
 .../fileinstall/internal/DirectoryWatcherTest.java |  451 --
 .../fileinstall/internal/ScannerSubDirTest.java    |  124 -
 .../src/test/resources/watched/firstcfg.cfg        |   19 -
 .../src/test/resources/watched/firstjar.jar        |    1 -
 .../src/test/resources/watched/secondjar.jar       |    1 -
 framework.security/doc/changelog.txt               |   97 -
 framework.security/pom.xml                         |  103 -
 .../main/appended-resources/META-INF/DEPENDENCIES  |   16 -
 .../src/main/appended-resources/META-INF/LICENSE   |  202 -
 .../src/main/appended-resources/META-INF/NOTICE    |    4 -
 .../org/apache/felix/framework/FakeBundle.java     |  197 -
 .../apache/felix/framework/SecurityActivator.java  |  268 -
 .../felix/framework/SecurityProviderImpl.java      |  135 -
 .../framework/security/SecurityConstants.java      |   46 -
 .../ConditionalPermissionAdminImpl.java            |  946 ----
 .../ConditionalPermissionInfoImpl.java             |  486 --
 .../security/condpermadmin/DomainGripper.java      |  134 -
 .../permissionadmin/PermissionAdminImpl.java       |  296 -
 .../framework/security/util/BundleInputStream.java |  227 -
 .../felix/framework/security/util/Conditions.java  |  404 --
 .../framework/security/util/LocalPermissions.java  |  139 -
 .../felix/framework/security/util/Permissions.java |  634 ---
 .../framework/security/util/PropertiesCache.java   |  242 -
 .../framework/security/util/TrustManager.java      |  193 -
 .../security/verifier/BundleDNParser.java          |  550 --
 framework/doc/README.txt                           |    6 -
 framework/doc/changelog.txt                        | 1241 -----
 framework/pom.xml                                  |  243 -
 .../main/appended-resources/META-INF/DEPENDENCIES  |   22 -
 .../src/main/appended-resources/META-INF/LICENSE   |  202 -
 .../src/main/appended-resources/META-INF/NOTICE    |    4 -
 .../apache/felix/framework/BundleContextImpl.java  |  574 --
 .../org/apache/felix/framework/BundleImpl.java     | 1418 -----
 .../felix/framework/BundleProtectionDomain.java    |  477 --
 .../framework/BundleRevisionDependencies.java      |  328 --
 .../apache/felix/framework/BundleRevisionImpl.java |  722 ---
 .../apache/felix/framework/BundleWiringImpl.java   | 2889 ----------
 .../org/apache/felix/framework/DTOFactory.java     |  578 --
 .../felix/framework/EntryFilterEnumeration.java    |  245 -
 .../apache/felix/framework/EventDispatcher.java    | 1174 ----
 .../felix/framework/ExportedPackageImpl.java       |   96 -
 .../apache/felix/framework/ExtensionManager.java   | 1240 -----
 .../felix/framework/FakeURLStreamHandler.java      |   41 -
 .../java/org/apache/felix/framework/Felix.java     | 5723 --------------------
 .../org/apache/felix/framework/FilterImpl.java     |  258 -
 .../apache/felix/framework/FrameworkFactory.java   |   38 -
 .../felix/framework/FrameworkStartLevelImpl.java   |  368 --
 .../felix/framework/FrameworkWiringImpl.java       |  203 -
 .../org/apache/felix/framework/HookRegistry.java   |  237 -
 .../java/org/apache/felix/framework/Logger.java    |  185 -
 .../apache/felix/framework/PackageAdminImpl.java   |  269 -
 .../apache/felix/framework/RequiredBundleImpl.java |   79 -
 .../apache/felix/framework/ResolveContextImpl.java |  199 -
 .../felix/framework/ServiceRegistrationImpl.java   |  796 ---
 .../apache/felix/framework/ServiceRegistry.java    |  794 ---
 .../org/apache/felix/framework/StartLevelImpl.java |  103 -
 .../apache/felix/framework/StatefulResolver.java   | 1787 ------
 .../org/apache/felix/framework/URLHandlers.java    |  861 ---
 .../felix/framework/URLHandlersActivator.java      |  122 -
 .../framework/URLHandlersBundleStreamHandler.java  |  186 -
 .../framework/URLHandlersBundleURLConnection.java  |  266 -
 .../framework/URLHandlersContentHandlerProxy.java  |  189 -
 .../framework/URLHandlersStreamHandlerProxy.java   |  632 ---
 .../apache/felix/framework/VersionConverter.java   |  128 -
 .../org/apache/felix/framework/WovenClassImpl.java |  442 --
 .../felix/framework/cache/BundleArchive.java       |  965 ----
 .../framework/cache/BundleArchiveRevision.java     |  141 -
 .../apache/felix/framework/cache/BundleCache.java  |  636 ---
 .../framework/cache/ConnectContentContent.java     |  224 -
 .../felix/framework/cache/ConnectRevision.java     |   90 -
 .../org/apache/felix/framework/cache/Content.java  |  138 -
 .../framework/cache/ContentDirectoryContent.java   |  171 -
 .../felix/framework/cache/DirectoryContent.java    |  473 --
 .../felix/framework/cache/DirectoryRevision.java   |   89 -
 .../apache/felix/framework/cache/JarContent.java   |  454 --
 .../apache/felix/framework/cache/JarRevision.java  |  189 -
 .../framework/capabilityset/CapabilitySet.java     |  663 ---
 .../framework/capabilityset/SimpleFilter.java      |  669 ---
 .../framework/ext/ClassPathExtenderFactory.java    |  155 -
 .../felix/framework/ext/SecurityProvider.java      |   33 -
 .../framework/resolver/CandidateComparator.java    |  114 -
 .../felix/framework/resolver/ResolveException.java |   50 -
 .../resolver/ResourceNotFoundException.java        |   32 -
 .../felix/framework/util/ClassFileVisitor.java     |   85 -
 .../apache/felix/framework/util/ClassParser.java   | 2808 ----------
 .../felix/framework/util/CompoundEnumeration.java  |  109 -
 .../felix/framework/util/FelixConstants.java       |   76 -
 .../apache/felix/framework/util/ListenerInfo.java  |  141 -
 .../felix/framework/util/MapToDictionary.java      |   83 -
 .../felix/framework/util/MultiReleaseContent.java  |  194 -
 .../apache/felix/framework/util/SecureAction.java  | 2120 --------
 .../felix/framework/util/SecurityManagerEx.java    |   37 -
 .../felix/framework/util/ShrinkableCollection.java |  125 -
 .../apache/felix/framework/util/ShrinkableMap.java |   94 -
 .../felix/framework/util/StringComparator.java     |   73 -
 .../org/apache/felix/framework/util/StringMap.java |   49 -
 .../apache/felix/framework/util/ThreadGate.java    |   93 -
 .../java/org/apache/felix/framework/util/Util.java | 1105 ----
 .../felix/framework/util/WeakZipFileFactory.java   |  737 ---
 .../util/manifestparser/ManifestParser.java        | 2276 --------
 .../util/manifestparser/NativeLibrary.java         |  187 -
 .../util/manifestparser/NativeLibraryClause.java   |  787 ---
 .../util/manifestparser/ParsedHeaderClause.java    |   40 -
 .../framework/wiring/BundleCapabilityImpl.java     |  161 -
 .../framework/wiring/BundleRequirementImpl.java    |  135 -
 .../felix/framework/wiring/BundleWireImpl.java     |   79 -
 framework/src/main/java/org/osgi/dto/DTO.java      |  293 -
 .../src/main/java/org/osgi/dto/package-info.java   |   40 -
 .../java/org/osgi/framework/AdaptPermission.java   |  621 ---
 .../java/org/osgi/framework/AdminPermission.java   | 1016 ----
 .../org/osgi/framework/AllServiceListener.java     |   63 -
 .../src/main/java/org/osgi/framework/Bundle.java   | 1214 -----
 .../java/org/osgi/framework/BundleActivator.java   |   88 -
 .../java/org/osgi/framework/BundleContext.java     |  945 ----
 .../main/java/org/osgi/framework/BundleEvent.java  |  235 -
 .../java/org/osgi/framework/BundleException.java   |  237 -
 .../java/org/osgi/framework/BundleListener.java    |   49 -
 .../java/org/osgi/framework/BundlePermission.java  |  593 --
 .../java/org/osgi/framework/BundleReference.java   |   38 -
 .../org/osgi/framework/CapabilityPermission.java   |  785 ---
 .../main/java/org/osgi/framework/Configurable.java |   50 -
 .../main/java/org/osgi/framework/Constants.java    | 1882 -------
 .../src/main/java/org/osgi/framework/Filter.java   |  141 -
 .../main/java/org/osgi/framework/FilterImpl.java   | 1385 -----
 .../java/org/osgi/framework/FrameworkEvent.java    |  257 -
 .../java/org/osgi/framework/FrameworkListener.java |   50 -
 .../java/org/osgi/framework/FrameworkUtil.java     | 1059 ----
 .../org/osgi/framework/InvalidSyntaxException.java |  122 -
 .../java/org/osgi/framework/PackagePermission.java |  785 ---
 .../osgi/framework/PrototypeServiceFactory.java    |  126 -
 .../main/java/org/osgi/framework/ServiceEvent.java |  143 -
 .../java/org/osgi/framework/ServiceException.java  |  137 -
 .../java/org/osgi/framework/ServiceFactory.java    |  123 -
 .../java/org/osgi/framework/ServiceListener.java   |   64 -
 .../java/org/osgi/framework/ServiceObjects.java    |  144 -
 .../java/org/osgi/framework/ServicePermission.java |  926 ----
 .../java/org/osgi/framework/ServiceReference.java  |  250 -
 .../org/osgi/framework/ServiceRegistration.java    |  113 -
 .../java/org/osgi/framework/SignerProperty.java    |  112 -
 .../osgi/framework/SynchronousBundleListener.java  |   68 -
 .../osgi/framework/UnfilteredServiceListener.java  |   75 -
 .../src/main/java/org/osgi/framework/Version.java  |  426 --
 .../main/java/org/osgi/framework/VersionRange.java |  542 --
 .../org/osgi/framework/connect/ConnectContent.java |  218 -
 .../framework/connect/ConnectFrameworkFactory.java |   79 -
 .../org/osgi/framework/connect/ConnectModule.java  |   47 -
 .../framework/connect/FrameworkUtilHelper.java     |   48 -
 .../osgi/framework/connect/ModuleConnector.java    |  105 -
 .../org/osgi/framework/connect/package-info.java   |   33 -
 .../java/org/osgi/framework/dto/BundleDTO.java     |   66 -
 .../java/org/osgi/framework/dto/FrameworkDTO.java  |   60 -
 .../osgi/framework/dto/ServiceReferenceDTO.java    |   70 -
 .../java/org/osgi/framework/dto/package-info.java  |   42 -
 .../osgi/framework/hooks/bundle/CollisionHook.java |   87 -
 .../org/osgi/framework/hooks/bundle/EventHook.java |   63 -
 .../org/osgi/framework/hooks/bundle/FindHook.java  |   65 -
 .../osgi/framework/hooks/bundle/package-info.java  |   36 -
 .../framework/hooks/resolver/ResolverHook.java     |  204 -
 .../hooks/resolver/ResolverHookFactory.java        |  106 -
 .../framework/hooks/resolver/package-info.java     |   36 -
 .../osgi/framework/hooks/service/EventHook.java    |   54 -
 .../framework/hooks/service/EventListenerHook.java |   60 -
 .../org/osgi/framework/hooks/service/FindHook.java |   61 -
 .../osgi/framework/hooks/service/ListenerHook.java |  133 -
 .../osgi/framework/hooks/service/package-info.java |   36 -
 .../framework/hooks/weaving/WeavingException.java  |   50 -
 .../osgi/framework/hooks/weaving/WeavingHook.java  |   64 -
 .../osgi/framework/hooks/weaving/WovenClass.java   |  238 -
 .../hooks/weaving/WovenClassListener.java          |   71 -
 .../osgi/framework/hooks/weaving/package-info.java |   38 -
 .../java/org/osgi/framework/launch/Framework.java  |  418 --
 .../osgi/framework/launch/FrameworkFactory.java    |   74 -
 .../org/osgi/framework/launch/package-info.java    |   36 -
 .../namespace/AbstractWiringNamespace.java         |   58 -
 .../osgi/framework/namespace/BundleNamespace.java  |  153 -
 .../namespace/ExecutionEnvironmentNamespace.java   |   55 -
 .../osgi/framework/namespace/HostNamespace.java    |  174 -
 .../framework/namespace/IdentityNamespace.java     |  172 -
 .../osgi/framework/namespace/NativeNamespace.java  |   82 -
 .../osgi/framework/namespace/PackageNamespace.java |  112 -
 .../org/osgi/framework/namespace/package-info.java |   32 -
 .../main/java/org/osgi/framework/package-info.java |   34 -
 .../framework/startlevel/BundleStartLevel.java     |  107 -
 .../framework/startlevel/FrameworkStartLevel.java  |  162 -
 .../startlevel/dto/BundleStartLevelDTO.java        |   61 -
 .../startlevel/dto/FrameworkStartLevelDTO.java     |   47 -
 .../framework/startlevel/dto/package-info.java     |   42 -
 .../osgi/framework/startlevel/package-info.java    |   83 -
 .../osgi/framework/wiring/BundleCapability.java    |   85 -
 .../osgi/framework/wiring/BundleRequirement.java   |  101 -
 .../org/osgi/framework/wiring/BundleRevision.java  |  307 --
 .../org/osgi/framework/wiring/BundleRevisions.java |   67 -
 .../java/org/osgi/framework/wiring/BundleWire.java |  112 -
 .../org/osgi/framework/wiring/BundleWiring.java    |  509 --
 .../org/osgi/framework/wiring/FrameworkWiring.java |  202 -
 .../framework/wiring/dto/BundleRevisionDTO.java    |   62 -
 .../osgi/framework/wiring/dto/BundleWireDTO.java   |   48 -
 .../osgi/framework/wiring/dto/BundleWiringDTO.java |   97 -
 .../framework/wiring/dto/FrameworkWiringDTO.java   |   48 -
 .../osgi/framework/wiring/dto/package-info.java    |   40 -
 .../org/osgi/framework/wiring/package-info.java    |   35 -
 .../main/java/org/osgi/resource/Capability.java    |   90 -
 .../src/main/java/org/osgi/resource/Namespace.java |  157 -
 .../main/java/org/osgi/resource/Requirement.java   |   94 -
 .../src/main/java/org/osgi/resource/Resource.java  |   86 -
 .../src/main/java/org/osgi/resource/Wire.java      |   92 -
 .../src/main/java/org/osgi/resource/Wiring.java    |  145 -
 .../java/org/osgi/resource/dto/CapabilityDTO.java  |   70 -
 .../org/osgi/resource/dto/CapabilityRefDTO.java    |   41 -
 .../java/org/osgi/resource/dto/RequirementDTO.java |   70 -
 .../org/osgi/resource/dto/RequirementRefDTO.java   |   41 -
 .../java/org/osgi/resource/dto/ResourceDTO.java    |   51 -
 .../main/java/org/osgi/resource/dto/WireDTO.java   |   58 -
 .../main/java/org/osgi/resource/dto/WiringDTO.java |   73 -
 .../java/org/osgi/resource/dto/package-info.java   |   42 -
 .../main/java/org/osgi/resource/package-info.java  |   35 -
 .../java/org/osgi/service/condition/Condition.java |   77 -
 .../org/osgi/service/condition/package-info.java   |   39 -
 .../osgi/service/packageadmin/ExportedPackage.java |  113 -
 .../osgi/service/packageadmin/PackageAdmin.java    |  300 -
 .../osgi/service/packageadmin/RequiredBundle.java  |  100 -
 .../osgi/service/packageadmin/package-info.java    |   40 -
 .../org/osgi/service/startlevel/StartLevel.java    |  275 -
 .../org/osgi/service/startlevel/package-info.java  |   40 -
 .../url/AbstractURLStreamHandlerService.java       |  159 -
 .../java/org/osgi/service/url/URLConstants.java    |   45 -
 .../osgi/service/url/URLStreamHandlerService.java  |  102 -
 .../osgi/service/url/URLStreamHandlerSetter.java   |   53 -
 .../java/org/osgi/service/url/package-info.java    |   36 -
 .../org/osgi/util/tracker/AbstractTracked.java     |  466 --
 .../java/org/osgi/util/tracker/BundleTracker.java  |  504 --
 .../osgi/util/tracker/BundleTrackerCustomizer.java |  102 -
 .../java/org/osgi/util/tracker/ServiceTracker.java |  989 ----
 .../util/tracker/ServiceTrackerCustomizer.java     |   95 -
 .../java/org/osgi/util/tracker/package-info.java   |   36 -
 .../native-image.properties                        |    5 -
 .../org.apache.felix.framework/reflect-config.json |   27 -
 .../resource-config.json                           |    9 -
 ....osgi.framework.connect.ConnectFrameworkFactory |    1 -
 .../org.osgi.framework.launch.FrameworkFactory     |    1 -
 framework/src/main/resources/default.properties    |  383 --
 .../org/apache/felix/framework/Felix.properties    |    1 -
 .../org/apache/felix/framework/util/accessor.bytes |  Bin 816 -> 0 bytes
 .../org/apache/felix/framework/util/accessor.src   |   31 -
 .../org/apache/felix/framework/BootLoaderTest.java |  119 -
 .../felix/framework/BundleRevisionImplTest.java    |   42 -
 .../felix/framework/BundleWiringImplTest.java      | 1213 -----
 .../apache/felix/framework/CollisionHookTest.java  |  311 --
 .../apache/felix/framework/ConcurrencyTest.java    |  350 --
 .../framework/ConcurrentBundleUpdateTest.java      |  412 --
 .../felix/framework/ConcurrentClassLoaderTest.java |  152 -
 .../org/apache/felix/framework/ConnectTest.java    |  369 --
 .../CycleDetectionWithWovenClassTest.java          |  267 -
 .../org/apache/felix/framework/DTOFactoryTest.java |  290 -
 .../felix/framework/EventDispatcherTest.java       |  157 -
 .../felix/framework/ExtensionManagerTest.java      |  276 -
 .../org/apache/felix/framework/FilterTest.java     |  103 -
 .../framework/ImplicitBootDelegationTest.java      |  333 --
 .../org/apache/felix/framework/LaunchTest.java     |  156 -
 .../felix/framework/MultiReleaseVersionTest.java   |  138 -
 .../felix/framework/PackageAdminImplTest.java      |  163 -
 .../framework/RequirementsCapabilitiesTest.java    |  291 -
 .../org/apache/felix/framework/ResolveTest.java    |  300 -
 .../felix/framework/ResourceLoadingTest.java       |  246 -
 .../apache/felix/framework/ServiceObjectsTest.java |   90 -
 .../framework/ServiceRegistrationImplTest.java     |   97 -
 .../felix/framework/ServiceRegistryTest.java       | 1341 -----
 .../apache/felix/framework/StartBundleTest.java    |   57 -
 .../felix/framework/StartStopBundleTest.java       |  172 -
 .../apache/felix/framework/URLHandlersTest.java    |  524 --
 .../felix/framework/UninstallBundleTest.java       |  166 -
 .../felix/framework/VersionConverterTest.java      |   48 -
 .../felix/framework/cache/BundleCacheTest.java     |  378 --
 .../framework/capabilityset/SimpleFilterTest.java  |   86 -
 .../org/apache/felix/framework/util/UtilTest.java  |  112 -
 .../felix/framework/util/WeakZipFileTest.java      |   97 -
 .../util/manifestparser/ManifestParserTest.java    |  223 -
 .../manifestparser/NativeLibraryClauseTest.java    |  178 -
 .../org/osgi/util/tracker/BundleTrackerTest.java   |   65 -
 .../org/osgi/util/tracker/ServiceTrackerTest.java  |   74 -
 gogo/LICENSE                                       |  202 -
 gogo/NOTICE                                        |   11 -
 gogo/bom/pom.xml                                   |   72 -
 gogo/command/DEPENDENCIES                          |   23 -
 gogo/command/LICENSE                               |  202 -
 gogo/command/NOTICE                                |   11 -
 gogo/command/doc/changelog.txt                     |  112 -
 gogo/command/pom.xml                               |   95 -
 .../org/apache/felix/gogo/command/Activator.java   |   56 -
 .../java/org/apache/felix/gogo/command/Basic.java  |  995 ----
 .../java/org/apache/felix/gogo/command/Files.java  |  291 -
 .../org/apache/felix/gogo/command/Inspect.java     |  461 --
 .../java/org/apache/felix/gogo/command/Util.java   |  424 --
 .../apache/felix/gogo/command/package-info.java    |   32 -
 .../org/apache/felix/gogo/command/UtilTest.java    |   49 -
 gogo/gogo-parent/LICENSE                           |  202 -
 gogo/gogo-parent/NOTICE                            |   11 -
 gogo/gogo-parent/pom.xml                           |  130 -
 gogo/itest-jline/DEPENDENCIES                      |   23 -
 gogo/itest-jline/LICENSE                           |  202 -
 gogo/itest-jline/NOTICE                            |   11 -
 gogo/itest-jline/itest.bndrun                      |   28 -
 gogo/itest-jline/pom.xml                           |  118 -
 .../felix/gogo/itest/jline/package-info.java       |   25 -
 gogo/itest-shell/DEPENDENCIES                      |   23 -
 gogo/itest-shell/LICENSE                           |  202 -
 gogo/itest-shell/NOTICE                            |   11 -
 gogo/itest-shell/itest.bndrun                      |   27 -
 gogo/itest-shell/pom.xml                           |  118 -
 .../felix/gogo/itest/shell/package-info.java       |   23 -
 gogo/jline/DEPENDENCIES                            |   20 -
 gogo/jline/LICENSE                                 |  202 -
 gogo/jline/NOTICE                                  |    6 -
 gogo/jline/doc/changelog.txt                       |  159 -
 gogo/jline/pom.xml                                 |  114 -
 .../org/apache/felix/gogo/jline/Activator.java     |  202 -
 .../apache/felix/gogo/jline/BaseConverters.java    |  145 -
 .../java/org/apache/felix/gogo/jline/Builtin.java  |  771 ---
 .../org/apache/felix/gogo/jline/Converters.java    |  180 -
 .../java/org/apache/felix/gogo/jline/Expander.java |   58 -
 .../org/apache/felix/gogo/jline/Highlighter.java   |  226 -
 .../java/org/apache/felix/gogo/jline/Main.java     |  108 -
 .../apache/felix/gogo/jline/ParsedLineImpl.java    |  202 -
 .../java/org/apache/felix/gogo/jline/Parser.java   |   93 -
 .../java/org/apache/felix/gogo/jline/Posix.java    | 2131 --------
 .../org/apache/felix/gogo/jline/Procedural.java    |  604 ---
 .../java/org/apache/felix/gogo/jline/Shell.java    |  728 ---
 .../felix/gogo/jline/SingleServiceTracker.java     |  191 -
 .../org/apache/felix/gogo/jline/package-info.java  |   34 -
 gogo/jline/src/main/resources/gosh_profile         |  344 --
 gogo/jline/src/main/resources/motd                 |    3 -
 .../felix/gogo/jline/AbstractParserTest.java       |   75 -
 .../felix/gogo/jline/BaseConvertersTest.java       |   61 -
 .../java/org/apache/felix/gogo/jline/Context.java  |  103 -
 .../org/apache/felix/gogo/jline/ParserTest.java    |   59 -
 .../org/apache/felix/gogo/jline/PosixTest.java     |  114 -
 .../org/apache/felix/gogo/jline/ShellTest.java     |   54 -
 .../apache/felix/gogo/jline/ssh/ShellCommand.java  |  136 -
 .../felix/gogo/jline/ssh/ShellCommandFactory.java  |   37 -
 .../felix/gogo/jline/ssh/ShellFactoryImpl.java     |  274 -
 .../java/org/apache/felix/gogo/jline/ssh/Ssh.java  |  114 -
 .../felix/gogo/jline/telnet/BootException.java     |   74 -
 .../apache/felix/gogo/jline/telnet/Connection.java |  255 -
 .../felix/gogo/jline/telnet/ConnectionData.java    |  464 --
 .../felix/gogo/jline/telnet/ConnectionEvent.java   |  137 -
 .../felix/gogo/jline/telnet/ConnectionFilter.java  |   82 -
 .../gogo/jline/telnet/ConnectionListener.java      |  106 -
 .../felix/gogo/jline/telnet/ConnectionManager.java |  393 --
 .../felix/gogo/jline/telnet/PortListener.java      |  222 -
 .../org/apache/felix/gogo/jline/telnet/Telnet.java |  203 -
 .../apache/felix/gogo/jline/telnet/TelnetIO.java   | 1532 ------
 gogo/pom.xml                                       |   54 -
 gogo/runtime/DEPENDENCIES                          |   23 -
 gogo/runtime/LICENSE                               |  202 -
 gogo/runtime/NOTICE                                |   10 -
 .../doc/apache-felix-gogo-Dateien/apache.png       |  Bin 12242 -> 0 bytes
 .../doc/apache-felix-gogo-Dateien/button.html      |    5 -
 .../button_data/2010-na-125x125.png                |  Bin 6119 -> 0 bytes
 .../runtime/doc/apache-felix-gogo-Dateien/logo.png |  Bin 14927 -> 0 bytes
 .../runtime/doc/apache-felix-gogo-Dateien/site.css |   25 -
 gogo/runtime/doc/apache-felix-gogo.html            |   70 -
 gogo/runtime/doc/changelog.txt                     |  199 -
 gogo/runtime/pom.xml                               |   98 -
 .../org/apache/felix/gogo/runtime/ArgList.java     |   69 -
 .../apache/felix/gogo/runtime/BaseTokenizer.java   |  290 -
 .../org/apache/felix/gogo/runtime/Closure.java     |  778 ---
 .../gogo/runtime/CommandNotFoundException.java     |   38 -
 .../felix/gogo/runtime/CommandProcessorImpl.java   |  422 --
 .../apache/felix/gogo/runtime/CommandProxy.java    |   99 -
 .../felix/gogo/runtime/CommandSessionImpl.java     |  881 ---
 .../org/apache/felix/gogo/runtime/EOFError.java    |   45 -
 .../org/apache/felix/gogo/runtime/Evaluate.java    |   36 -
 .../org/apache/felix/gogo/runtime/Expander.java    | 2628 ---------
 .../org/apache/felix/gogo/runtime/Expression.java  | 1365 -----
 .../apache/felix/gogo/runtime/GlobPathMatcher.java |  304 --
 .../java/org/apache/felix/gogo/runtime/Parser.java |  580 --
 .../java/org/apache/felix/gogo/runtime/Pipe.java   |  671 ---
 .../org/apache/felix/gogo/runtime/Reflective.java  |  660 ---
 .../org/apache/felix/gogo/runtime/SyntaxError.java |   55 -
 .../org/apache/felix/gogo/runtime/ThreadUtils.java |   58 -
 .../java/org/apache/felix/gogo/runtime/Token.java  |  130 -
 .../org/apache/felix/gogo/runtime/Tokenizer.java   |  282 -
 .../felix/gogo/runtime/activator/Activator.java    |  216 -
 .../gogo/runtime/activator/EventAdminListener.java |   61 -
 .../apache/felix/gogo/runtime/package-info.java    |   32 -
 .../apache/felix/gogo/runtime/threadio/Marker.java |   63 -
 .../felix/gogo/runtime/threadio/ThreadIOImpl.java  |  138 -
 .../gogo/runtime/threadio/ThreadInputStream.java   |   98 -
 .../gogo/runtime/threadio/ThreadPrintStream.java   |  226 -
 .../gogo/runtime/util/function/BiFunction.java     |   26 -
 .../felix/gogo/runtime/util/function/Function.java |   27 -
 .../felix/service/command/CommandProcessor.java    |   65 -
 .../felix/service/command/CommandSession.java      |  148 -
 .../service/command/CommandSessionListener.java    |   36 -
 .../apache/felix/service/command/Converter.java    |   85 -
 .../apache/felix/service/command/Descriptor.java   |   31 -
 .../org/apache/felix/service/command/Function.java |   38 -
 .../java/org/apache/felix/service/command/Job.java |   71 -
 .../apache/felix/service/command/JobListener.java  |   32 -
 .../apache/felix/service/command/Parameter.java    |   57 -
 .../org/apache/felix/service/command/Process.java  |   60 -
 .../org/apache/felix/service/command/Result.java   |   31 -
 .../service/command/annotations/GogoCommand.java   |   48 -
 .../service/command/annotations/RequireGogo.java   |   45 -
 .../command/annotations/RequireGogoWhiteboard.java |   40 -
 .../service/command/annotations/package-info.java  |   23 -
 .../apache/felix/service/command/package-info.java |   23 -
 .../apache/felix/service/threadio/ThreadIO.java    |   57 -
 .../felix/service/threadio/package-info.java       |   23 -
 .../felix/gogo/runtime/AbstractParserTest.java     |   75 -
 .../org/apache/felix/gogo/runtime/ClosureTest.java |   44 -
 .../org/apache/felix/gogo/runtime/Context.java     |   80 -
 .../apache/felix/gogo/runtime/ExpanderTest.java    |  135 -
 .../felix/gogo/runtime/GlobPathMatcherTest.java    |  343 --
 .../apache/felix/gogo/runtime/ReflectiveTest.java  |  119 -
 .../apache/felix/gogo/runtime/TestCoercion.java    |  262 -
 .../apache/felix/gogo/runtime/TestEvaluate.java    |   53 -
 .../org/apache/felix/gogo/runtime/TestParser.java  |  523 --
 .../org/apache/felix/gogo/runtime/TestParser2.java |  120 -
 .../org/apache/felix/gogo/runtime/TestParser3.java |   62 -
 .../org/apache/felix/gogo/runtime/TestParser4.java |  222 -
 .../apache/felix/gogo/runtime/TestTokenizer.java   |  560 --
 .../felix/gogo/runtime/expr/ExpressionTest.java    |   60 -
 .../felix/gogo/runtime/threadio/TestThreadIO.java  |   91 -
 gogo/shell/DEPENDENCIES                            |   20 -
 gogo/shell/LICENSE                                 |  202 -
 gogo/shell/NOTICE                                  |    6 -
 gogo/shell/doc/changelog.txt                       |  117 -
 gogo/shell/pom.xml                                 |   95 -
 .../java/org/apache/felix/gogo/options/Option.java |  168 -
 .../org/apache/felix/gogo/options/Options.java     |  637 ---
 .../org/apache/felix/gogo/shell/Activator.java     |  250 -
 .../java/org/apache/felix/gogo/shell/Builtin.java  |  598 --
 .../java/org/apache/felix/gogo/shell/Console.java  |  198 -
 .../org/apache/felix/gogo/shell/Converters.java    |  274 -
 .../java/org/apache/felix/gogo/shell/History.java  |  177 -
 .../java/org/apache/felix/gogo/shell/Posix.java    |  203 -
 .../org/apache/felix/gogo/shell/Procedural.java    |  171 -
 .../java/org/apache/felix/gogo/shell/Shell.java    |  298 -
 .../java/org/apache/felix/gogo/shell/Telnet.java   |  189 -
 .../org/apache/felix/gogo/shell/package-info.java  |   34 -
 gogo/shell/src/main/resources/gosh_profile         |   57 -
 gogo/shell/src/main/resources/motd                 |    3 -
 .../org/apache/felix/gogo/shell/HistoryTest.java   |  240 -
 io/pom.xml                                         |  107 -
 .../main/java/org/apache/felix/io/Activator.java   |   63 -
 .../org/apache/felix/io/ConnectorServiceImpl.java  |  342 --
 .../org/apache/felix/io/ConnectionFactoryMock.java |  131 -
 .../org/apache/felix/io/ConnectorServiceTest.java  |  294 -
 ipojo/.gitignore                                   |    4 -
 ipojo/arch/changelog.txt                           |   26 -
 ipojo/arch/obr.xml                                 |   24 -
 ipojo/arch/pom.xml                                 |  118 -
 .../main/appended-resources/META-INF/DEPENDENCIES  |   11 -
 .../src/main/appended-resources/META-INF/NOTICE    |    0
 .../apache/felix/ipojo/arch/ArchCommandImpl.java   |  233 -
 .../handler-tutorial/FooService-And-Impl/pom.xml   |   65 -
 .../org/apache/felix/ipojo/foo/FooService.java     |   29 -
 .../felix/ipojo/foo/impl/FooServiceImpl.java       |   41 -
 .../handler-tutorial/Log-Handler-Consumer/pom.xml  |   57 -
 .../ipojo/log/handler/example/SimpleComponent.java |   26 -
 .../handler-tutorial/Log-Handler-In-Felix/pom.xml  |  107 -
 .../handler-tutorial/Log-Handler/pom.xml           |   76 -
 .../org/apache/felix/ipojo/log/handler/Log.java    |   35 -
 .../apache/felix/ipojo/log/handler/LogHandler.java |  109 -
 .../Property-Handler-Consumer/pom.xml              |   68 -
 .../src/main/ipojo/metadata.xml                    |    9 -
 .../properties/example/PropertiesTester.java       |   78 -
 .../Property-Handler-In-Felix/pom.xml              |  120 -
 .../main/resources/props/my-properties.properties  |   21 -
 .../main/resources/props/properties-i1.properties  |   21 -
 .../handler-tutorial/Property-Handler/pom.xml      |   61 -
 .../felix/ipojo/handler/properties/Properties.java |   33 -
 .../handler/properties/PropertiesHandler.java      |  295 -
 ipojo/distributions/handler-tutorial/pom.xml       |  139 -
 .../ipojo-webconsole-quicktart/pom.xml             |  148 -
 .../src/main/assembly/distribution.xml             |   59 -
 ipojo/distributions/pom.xml                        |   92 -
 ipojo/handler/eventadmin/changelog.txt             |   32 -
 .../eventadmin/eventadmin-handler-it/pom.xml       |  378 --
 .../src/it/event-admin-it/pom.xml                  |   46 -
 .../test/donut/AsyncEventProviderImpl.java         |   74 -
 .../ipojo/handler/eventadmin/test/donut/Donut.java |  100 -
 .../eventadmin/test/donut/DonutConsumer.java       |   81 -
 .../eventadmin/test/donut/DonutConsumerImpl.java   |  194 -
 .../test/donut/DonutEventProviderImpl.java         |   74 -
 .../eventadmin/test/donut/DonutProvider.java       |   35 -
 .../eventadmin/test/donut/DonutProviderImpl.java   |   76 -
 .../eventadmin/test/donut/EventConsumerImpl.java   |  199 -
 .../eventadmin/test/donut/EventTracker.java        |   63 -
 .../eventadmin/test/donut/EventTrackerImpl.java    |  152 -
 .../test/donut/SyncEventProviderImpl.java          |   74 -
 .../event-admin-it/src/main/resources/metadata.xml |  199 -
 .../ipojo/handler/eventadmin/test/Common.java      |   76 -
 .../handler/eventadmin/test/EahTestUtils.java      |  226 -
 .../eventadmin/test/TestBadConfigurations.java     |  958 ----
 .../eventadmin/test/TestEventAdminHandler.java     |  714 ---
 .../TestEventAdminHandlerWithNewAttributes.java    |  715 ---
 .../handler/eventadmin/test/TestPublisher.java     |  714 ---
 .../src/main/appended-resources/META-INF/NOTICE    |    0
 .../eventadmin/eventadmin-handler/changelog.txt    |   32 -
 .../eventadmin/eventadmin-handler/metadata.xml     |   41 -
 .../handler/eventadmin/eventadmin-handler/obr.xml  |   31 -
 .../handler/eventadmin/eventadmin-handler/pom.xml  |  113 -
 .../main/appended-resources/META-INF/DEPENDENCIES  |   11 -
 .../src/main/appended-resources/META-INF/NOTICE    |    0
 .../felix/ipojo/handlers/event/EventUtil.java      |  173 -
 .../publisher/EventAdminPublisherHandler.java      |  282 -
 .../EventAdminPublisherHandlerDescription.java     |  102 -
 .../publisher/EventAdminPublisherMetadata.java     |  242 -
 .../ipojo/handlers/event/publisher/Publisher.java  |   70 -
 .../event/publisher/PublisherDescription.java      |   76 -
 .../handlers/event/publisher/PublisherImpl.java    |  145 -
 .../subscriber/EventAdminSubscriberHandler.java    |  421 --
 .../EventAdminSubscriberHandlerDescription.java    |   61 -
 .../subscriber/EventAdminSubscriberMetadata.java   |  305 --
 .../src/main/resources/event-admin.xsd             |   90 -
 ipojo/handler/eventadmin/pom.xml                   |   37 -
 .../main/appended-resources/META-INF/DEPENDENCIES  |   11 -
 .../src/main/appended-resources/META-INF/NOTICE    |    0
 ipojo/handler/extender/changelog.txt               |   26 -
 ipojo/handler/extender/metadata.xml                |   24 -
 ipojo/handler/extender/obr.xml                     |   25 -
 ipojo/handler/extender/pom.xml                     |  102 -
 .../main/appended-resources/META-INF/DEPENDENCIES  |   11 -
 .../src/main/appended-resources/META-INF/NOTICE    |    0
 .../ipojo/handler/extender/BundleTracker.java      |  157 -
 .../ipojo/handler/extender/ExtenderManager.java    |  135 -
 .../handler/extender/ExtenderModelHandler.java     |   95 -
 .../src/main/resources/extender-pattern.xsd        |   42 -
 ipojo/handler/jmx/changelog.txt                    |   23 -
 ipojo/handler/jmx/jmx-handler-it/pom.xml           |  389 --
 .../jmx/jmx-handler-it/src/it/jmx-it/pom.xml       |   52 -
 .../jmx/components/SimpleManagedComponent.java     |   55 -
 .../SimpleManagedComponentAnnotated.java           |   69 -
 .../SimpleManagedComponentAnnotatedDeprecated.java |   70 -
 .../src/it/jmx-it/src/main/resources/metadata.xml  |   46 -
 .../felix/ipojo/handler/jmx/test/Common.java       |  216 -
 .../felix/ipojo/handler/jmx/test/TestMBean.java    |  224 -
 .../src/main/appended-resources/META-INF/NOTICE    |    0
 ipojo/handler/jmx/jmx-handler/changelog.txt        |   23 -
 ipojo/handler/jmx/jmx-handler/metadata.xml         |   22 -
 ipojo/handler/jmx/jmx-handler/obr.xml              |   30 -
 ipojo/handler/jmx/jmx-handler/pom.xml              |  105 -
 .../main/appended-resources/META-INF/DEPENDENCIES  |   11 -
 .../src/main/appended-resources/META-INF/NOTICE    |    0
 .../felix/ipojo/handlers/jmx/DynamicMBeanImpl.java |  408 --
 .../handlers/jmx/DynamicMBeanWRegisterImpl.java    |  165 -
 .../ipojo/handlers/jmx/JMXHandlerDescription.java  |   71 -
 .../ipojo/handlers/jmx/JmxConfigFieldMap.java      |  297 -
 .../felix/ipojo/handlers/jmx/MBeanHandler.java     |  664 ---
 .../felix/ipojo/handlers/jmx/MethodField.java      |  101 -
 .../ipojo/handlers/jmx/NotificationField.java      |   69 -
 .../felix/ipojo/handlers/jmx/PropertyField.java    |  196 -
 .../jmx/jmx-handler/src/main/resources/jmx.xsd     |  177 -
 ipojo/handler/jmx/pom.xml                          |  115 -
 .../main/appended-resources/META-INF/DEPENDENCIES  |   11 -
 .../src/main/appended-resources/META-INF/NOTICE    |    0
 ipojo/handler/temporal/changelog.txt               |   42 -
 ipojo/handler/temporal/pom.xml                     |  115 -
 .../main/appended-resources/META-INF/DEPENDENCIES  |   17 -
 .../src/main/appended-resources/META-INF/LICENSE   |   42 -
 .../src/main/appended-resources/META-INF/NOTICE    |    4 -
 .../temporal-dependency-handler-it/pom.xml         |  390 --
 .../src/it/temporal-it/pom.xml                     |   46 -
 .../temporal/components/CheckServiceProvider.java  |   47 -
 .../components/CollectionCheckServiceProvider.java |   58 -
 .../handler/temporal/components/FooProvider.java   |   55 -
 .../components/MultipleCheckServiceProvider.java   |   48 -
 .../temporal/components/NullableFooProvider.java   |   55 -
 .../proxy/CheckServiceProviderHelper.java          |   64 -
 .../CollectionCheckServiceProviderHelper.java      |   62 -
 .../proxy/HelpedCheckServiceProvider.java          |   43 -
 .../HelpedCollectionCheckServiceProvider.java      |   43 -
 .../handler/temporal/services/BarService.java      |   29 -
 .../handler/temporal/services/CheckService.java    |   31 -
 .../handler/temporal/services/ChildInterface.java  |   25 -
 .../handler/temporal/services/FooService.java      |   39 -
 .../temporal/services/ParentInterface1.java        |   25 -
 .../temporal/services/ParentInterface2.java        |   25 -
 .../temporal/services/ParentParentInterface.java   |   25 -
 .../it/temporal-it/src/main/resources/metadata.xml |  262 -
 .../felix/ipojo/handler/temporal/test/Common.java  |   40 -
 .../temporal/test/DefaultImplementationTest.java   |  535 --
 .../ipojo/handler/temporal/test/DelayTest.java     |  494 --
 .../handler/temporal/test/DelayedProvider.java     |   71 -
 .../ipojo/handler/temporal/test/EmptyTest.java     |  303 --
 .../ipojo/handler/temporal/test/FilterTest.java    |  264 -
 .../ipojo/handler/temporal/test/NoDelayTest.java   |  146 -
 .../ipojo/handler/temporal/test/NullTest.java      |  536 --
 .../ipojo/handler/temporal/test/NullableTest.java  |  535 --
 .../ipojo/handler/temporal/test/TemporalTest.java  |  345 --
 .../src/main/appended-resources/META-INF/NOTICE    |    0
 .../temporal-dependency-handler/changelog.txt      |   42 -
 .../temporal/temporal-dependency-handler/obr.xml   |   25 -
 .../temporal/temporal-dependency-handler/pom.xml   |  122 -
 .../main/appended-resources/META-INF/DEPENDENCIES  |   17 -
 .../src/main/appended-resources/META-INF/LICENSE   |   42 -
 .../src/main/appended-resources/META-INF/NOTICE    |    4 -
 .../ipojo/handler/temporal/ProxyGenerator.java     |  183 -
 .../ipojo/handler/temporal/ServiceCollection.java  |  334 --
 .../felix/ipojo/handler/temporal/ServiceUsage.java |   77 -
 .../ipojo/handler/temporal/TemporalDependency.java |  555 --
 .../ipojo/handler/temporal/TemporalHandler.java    |  317 --
 .../src/main/resources/metadata.xml                |   28 -
 .../src/main/resources/temporal.xsd                |   63 -
 ipojo/handler/transaction/pom.xml                  |  115 -
 .../transaction/transaction-handler-it/pom.xml     |  413 --
 .../src/it/transaction-it/pom.xml                  |   52 -
 .../components/ComponentUsingAnnotations.java      |   53 -
 .../transaction/components/FooDelegator.java       |   96 -
 .../handler/transaction/components/FooImpl.java    |   47 -
 .../handler/transaction/services/CheckService.java |   44 -
 .../ipojo/handler/transaction/services/Foo.java    |   32 -
 .../src/main/resources/annotation.xml              |   22 -
 .../it/transaction-it/src/main/resources/foo.xml   |   24 -
 .../src/main/resources/mandatory.xml               |   44 -
 .../it/transaction-it/src/main/resources/never.xml |   44 -
 .../src/main/resources/notsupported.xml            |   44 -
 .../transaction-it/src/main/resources/requires.xml |   44 -
 .../src/main/resources/requiresnew.xml             |   44 -
 .../src/main/resources/supported.xml               |   44 -
 .../ipojo/handler/transaction/test/Common.java     |  217 -
 .../handler/transaction/test/TestAnnotations.java  |  138 -
 .../handler/transaction/test/TestInstallation.java |  128 -
 .../handler/transaction/test/TestInvalidation.java |  121 -
 .../handler/transaction/test/TestMandatory.java    |  397 --
 .../ipojo/handler/transaction/test/TestNever.java  |  169 -
 .../handler/transaction/test/TestNotSupported.java |  403 --
 .../handler/transaction/test/TestRequires.java     |  406 --
 .../handler/transaction/test/TestRequiresNew.java  |  219 -
 .../handler/transaction/test/TestSupported.java    |  411 --
 .../src/main/appended-resources/META-INF/NOTICE    |    0
 .../transaction/transaction-handler/pom.xml        |   99 -
 .../main/appended-resources/META-INF/DEPENDENCIES  |   11 -
 .../src/main/appended-resources/META-INF/NOTICE    |    0
 .../ipojo/transaction/TransactionHandler.java      |  310 --
 .../ipojo/transaction/TransactionalMethod.java     |  306 --
 .../src/main/resources/metadata.xml                |   32 -
 ipojo/handler/whiteboard/changelog.txt             |   33 -
 ipojo/handler/whiteboard/pom.xml                   |  115 -
 .../main/appended-resources/META-INF/DEPENDENCIES  |   12 -
 .../src/main/appended-resources/META-INF/NOTICE    |    0
 .../whiteboard/whiteboard-handler-it/pom.xml       |  385 --
 .../src/it/whiteboard-it/pom.xml                   |   52 -
 .../handler/whiteboard/components/FooProvider.java |   36 -
 .../components/FooWhiteBoardPattern.java           |   94 -
 .../handler/whiteboard/services/FooService.java    |   26 -
 .../handler/whiteboard/services/Observable.java    |   28 -
 .../whiteboard-it/src/main/resources/metadata.xml  |   65 -
 .../ipojo/handler/whiteboard/test/Common.java      |  216 -
 .../test/TestWhiteboardPatternHandler.java         |  302 --
 .../main/appended-resources/META-INF/DEPENDENCIES  |   11 -
 .../src/main/appended-resources/META-INF/NOTICE    |    0
 .../whiteboard/whiteboard-handler/changelog.txt    |   33 -
 .../whiteboard/whiteboard-handler/metadata.xml     |   30 -
 .../handler/whiteboard/whiteboard-handler/obr.xml  |   25 -
 .../handler/whiteboard/whiteboard-handler/pom.xml  |  103 -
 .../main/appended-resources/META-INF/DEPENDENCIES  |   11 -
 .../src/main/appended-resources/META-INF/NOTICE    |    0
 .../felix/ipojo/handler/wbp/WhiteBoardManager.java |  174 -
 .../handler/wbp/WhiteBoardPatternHandler.java      |  131 -
 .../src/main/resources/whiteboard-pattern.xsd      |   45 -
 ipojo/junit4osgi/felix-command/LICENSE             |  202 -
 ipojo/junit4osgi/felix-command/NOTICE              |   28 -
 ipojo/junit4osgi/felix-command/doc/changelog.txt   |    3 -
 ipojo/junit4osgi/felix-command/metadata.xml        |   28 -
 ipojo/junit4osgi/felix-command/pom.xml             |  111 -
 .../ipojo/junit4osgi/command/JunitCommand.java     |  140 -
 ipojo/junit4osgi/immediate-launcher/LICENSE        |  202 -
 ipojo/junit4osgi/immediate-launcher/NOTICE         |   27 -
 ipojo/junit4osgi/immediate-launcher/metadata.xml   |   29 -
 ipojo/junit4osgi/immediate-launcher/pom.xml        |  111 -
 .../ipojo/junit4osgi/command/ImmediateRunner.java  |   42 -
 ipojo/junit4osgi/junit4osgi/LICENSE                |  202 -
 ipojo/junit4osgi/junit4osgi/LICENSE.junit          |   86 -
 ipojo/junit4osgi/junit4osgi/NOTICE                 |   27 -
 ipojo/junit4osgi/junit4osgi/doc/changelog.txt      |    3 -
 ipojo/junit4osgi/junit4osgi/metadata.xml           |   36 -
 ipojo/junit4osgi/junit4osgi/pom.xml                |  152 -
 .../org/apache/felix/ipojo/junit4osgi/Helper.java  |   58 -
 .../felix/ipojo/junit4osgi/OSGiJunitRunner.java    |   72 -
 .../felix/ipojo/junit4osgi/OSGiTestCase.java       |  782 ---
 .../felix/ipojo/junit4osgi/OSGiTestSuite.java      |  127 -
 .../ipojo/junit4osgi/helpers/IPOJOHelper.java      |  737 ---
 .../felix/ipojo/junit4osgi/impl/JunitExtender.java |  399 --
 .../ipojo/junit4osgi/impl/LogServiceImpl.java      |  107 -
 .../felix/ipojo/junit4osgi/impl/ResultPrinter.java |  227 -
 .../ipojo/junit4osgi/test/TestOSGiTestCase.java    |   37 -
 .../ipojo/junit4osgi/test/TestOSGiTestSuite.java   |   48 -
 .../felix/ipojo/junit4osgi/test/TestTestCase.java  |   49 -
 .../felix/ipojo/junit4osgi/test/TestTestSuite.java |   41 -
 ipojo/junit4osgi/maven-junit4osgi-plugin/LICENSE   |  202 -
 ipojo/junit4osgi/maven-junit4osgi-plugin/NOTICE    |   31 -
 .../maven-junit4osgi-plugin/doc/changelog.txt      |    3 -
 ipojo/junit4osgi/maven-junit4osgi-plugin/pom.xml   |  113 -
 .../felix/ipojo/junit4osgi/plugin/Installer.java   |  207 -
 .../ipojo/junit4osgi/plugin/Junit4osgiPlugin.java  |  755 ---
 .../felix/ipojo/junit4osgi/plugin/Report.java      |  239 -
 .../ipojo/junit4osgi/plugin/ReportPrintStream.java |  101 -
 .../junit4osgi/plugin/StringOutputStream.java      |  121 -
 .../felix/ipojo/junit4osgi/plugin/XMLReport.java   |  359 --
 .../junit4osgi/plugin/log/LogServiceImpl.java      |  187 -
 ipojo/junit4osgi/pom.xml                           |   59 -
 ipojo/junit4osgi/swing-runner/LICENSE              |  202 -
 ipojo/junit4osgi/swing-runner/NOTICE               |   27 -
 ipojo/junit4osgi/swing-runner/doc/changelog.txt    |    3 -
 ipojo/junit4osgi/swing-runner/metadata.xml         |   28 -
 ipojo/junit4osgi/swing-runner/pom.xml              |  104 -
 .../junit4osgi/command/ResultCellRenderer.java     |   69 -
 .../ipojo/junit4osgi/command/ResultTableModel.java |  278 -
 .../ipojo/junit4osgi/command/SwingRunner.form      |  317 --
 .../ipojo/junit4osgi/command/SwingRunner.java      |  543 --
 .../ipojo/junit4osgi/command/TestListModel.java    |  129 -
 ipojo/manipulator/annotations/changelog.txt        |  225 -
 ipojo/manipulator/annotations/pom.xml              |   51 -
 .../annotations/src/main/appended-resources/NOTICE |    0
 .../org/apache/felix/ipojo/annotations/Bind.java   |   87 -
 .../felix/ipojo/annotations/BindingPolicy.java     |   29 -
 .../apache/felix/ipojo/annotations/Component.java  |  178 -
 .../apache/felix/ipojo/annotations/Context.java    |   54 -
 .../apache/felix/ipojo/annotations/Controller.java |   52 -
 .../apache/felix/ipojo/annotations/Handler.java    |   63 -
 .../felix/ipojo/annotations/HandlerBinding.java    |   85 -
 .../ipojo/annotations/HandlerDeclaration.java      |   44 -
 .../org/apache/felix/ipojo/annotations/Ignore.java |   42 -
 .../felix/ipojo/annotations/Instantiate.java       |   55 -
 .../apache/felix/ipojo/annotations/Invalidate.java |   38 -
 .../apache/felix/ipojo/annotations/Modified.java   |   81 -
 .../felix/ipojo/annotations/PostRegistration.java  |   40 -
 .../ipojo/annotations/PostUnregistration.java      |   40 -
 .../apache/felix/ipojo/annotations/Property.java   |   56 -
 .../apache/felix/ipojo/annotations/Provides.java   |   92 -
 .../apache/felix/ipojo/annotations/Requires.java   |  112 -
 .../felix/ipojo/annotations/ServiceController.java |   43 -
 .../felix/ipojo/annotations/ServiceProperty.java   |   57 -
 .../ipojo/annotations/StaticServiceProperty.java   |   61 -
 .../apache/felix/ipojo/annotations/Stereotype.java |   72 -
 .../org/apache/felix/ipojo/annotations/Unbind.java |   88 -
 .../apache/felix/ipojo/annotations/Updated.java    |   47 -
 .../apache/felix/ipojo/annotations/Validate.java   |   38 -
 .../org/apache/felix/ipojo/extender/Extender.java  |   49 -
 .../felix/ipojo/handler/temporal/Requires.java     |   70 -
 .../felix/ipojo/handler/temporal/Temporal.java     |   75 -
 .../felix/ipojo/handlers/event/Publisher.java      |   69 -
 .../felix/ipojo/handlers/event/Publishes.java      |   60 -
 .../felix/ipojo/handlers/event/Subscriber.java     |   83 -
 .../apache/felix/ipojo/handlers/jmx/Config.java    |   62 -
 .../apache/felix/ipojo/handlers/jmx/JMXBean.java   |   61 -
 .../apache/felix/ipojo/handlers/jmx/JMXMethod.java |   42 -
 .../felix/ipojo/handlers/jmx/JMXProperty.java      |   55 -
 .../apache/felix/ipojo/handlers/jmx/Method.java    |   43 -
 .../apache/felix/ipojo/handlers/jmx/Property.java  |   56 -
 .../felix/ipojo/transaction/Transaction.java       |   51 -
 .../felix/ipojo/transaction/Transactional.java     |   56 -
 .../org/apache/felix/ipojo/whiteboard/Wbp.java     |   54 -
 .../apache/felix/ipojo/whiteboard/Whiteboards.java |   38 -
 ipojo/manipulator/bnd-ipojo-plugin/changelog.txt   |  152 -
 ipojo/manipulator/bnd-ipojo-plugin/pom.xml         |  103 -
 .../main/appended-resources/META-INF/DEPENDENCIES  |   11 -
 .../src/main/appended-resources/META-INF/NOTICE    |    1 -
 .../felix/ipojo/bnd/BndJarResourceStore.java       |  243 -
 .../org/apache/felix/ipojo/bnd/BndReporter.java    |   84 -
 .../apache/felix/ipojo/bnd/ByteArrayResource.java  |   43 -
 .../java/org/apache/felix/ipojo/bnd/Manifests.java |   56 -
 .../apache/felix/ipojo/bnd/PojoizationPlugin.java  |  191 -
 .../felix/ipojo/bnd/ResourceMetadataProvider.java  |   75 -
 .../ipojo/bnd/BndJarResourceStoreTestCase.java     |  170 -
 .../org/apache/felix/ipojo/bnd/EmptyComponent.java |   31 -
 .../felix/ipojo/bnd/PojoizationPluginTestCase.java |  110 -
 .../src/test/resources/EMBED-MANIFEST-EMPTY.MF     |    6 -
 .../src/test/resources/EMBED-MANIFEST.MF           |   21 -
 .../metadata-components-and-instances.xml          |   24 -
 .../test/resources/metadata-components-only.xml    |   22 -
 .../src/test/resources/metadata-instances-only.xml |   22 -
 .../src/test/resources/metadata-test-component.xml |   22 -
 ipojo/manipulator/changelog.txt                    |  152 -
 ipojo/manipulator/ipojo-ant-task/changelog.txt     |  197 -
 ipojo/manipulator/ipojo-ant-task/pom.xml           |  166 -
 .../main/appended-resources/META-INF/DEPENDENCIES  |   11 -
 .../src/main/appended-resources/META-INF/LICENSE   |   42 -
 .../src/main/appended-resources/META-INF/NOTICE    |    3 -
 .../org/apache/felix/ipojo/task/AntReporter.java   |   68 -
 .../org/apache/felix/ipojo/task/IPojoTask.java     |  348 --
 .../java/org/apache/felix/ipojo/task/IPojoc.java   |  247 -
 .../main/resources/META-INF/constants.properties   |   22 -
 .../org.apache.felix.ipojo.manipulator.spi.Module  |    1 -
 .../src/main/resources/META-INF/xsd/composite.xsd  |  147 -
 .../src/main/resources/META-INF/xsd/core.xsd       |  704 ---
 .../main/resources/META-INF/xsd/event-admin.xsd    |   90 -
 .../resources/META-INF/xsd/extender-pattern.xsd    |   42 -
 .../src/main/resources/META-INF/xsd/jmx.xsd        |  177 -
 .../src/main/resources/META-INF/xsd/temporal.xsd   |   61 -
 .../resources/META-INF/xsd/whiteboard-pattern.xsd  |   45 -
 ipojo/manipulator/manipulator-bom/pom.xml          |   70 -
 .../ipojo-manipulator-creation-test/pom.xml        |   33 -
 .../core/components/ASimpleParentClass.java        |   30 -
 .../core/components/CallSuperConstructor.java      |   29 -
 .../components/CallSuperConstructorWithBC.java     |   32 -
 .../components/CallSuperConstructorWithNew.java    |   29 -
 .../CallSuperSuperConstructorWithNew.java          |   29 -
 .../runtime/core/components/FooProviderType1.java  |  118 -
 .../core/components/NoEmptyConstructor.java        |   50 -
 .../NoEmptyConstructorWithParentClass.java         |   46 -
 .../ipojo/runtime/core/components/ParentClass.java |   34 -
 .../runtime/core/components/ParentClass2.java      |   28 -
 .../runtime/core/components/ParentClassWithBC.java |   33 -
 .../core/components/SeveralConstructors.java       |   50 -
 .../runtime/core/components/SuperParentClass.java  |   36 -
 .../runtime/core/services/A123/CheckService2.java  |   26 -
 .../ipojo/runtime/core/services/BarService.java    |   30 -
 .../ipojo/runtime/core/services/CheckService.java  |   32 -
 .../ipojo/runtime/core/services/FooService.java    |   40 -
 .../felix/ipojo/runtime/core/services/Plop.java    |   26 -
 .../services/PrimitiveManipulationTestService.java |   76 -
 .../src/main/resources/metadata.xml                |   95 -
 .../felix/ipojo/runtime/core/TestPOJOCreation.java |  283 -
 .../ipojo/runtime/core/TestSeveralConstructor.java |   72 -
 .../pom.xml                                        |   35 -
 .../felix/ipojo/runtime/core/components/Child.java |   28 -
 .../core/components/ComponentWithInnerClasses.java |   75 -
 .../core/components/FooBarProviderType1.java       |   65 -
 .../runtime/core/components/FooProviderType1.java  |  129 -
 .../core/components/FooProviderTypeDyn.java        |   77 -
 .../core/components/Manipulation23Tester.java      |  189 -
 .../runtime/core/components/Multiconstructor.java  |   36 -
 .../core/components/MultipleCheckService.java      |  159 -
 .../ipojo/runtime/core/components/Parent.java      |   34 -
 .../runtime/core/services/A123/CheckService2.java  |   26 -
 .../ipojo/runtime/core/services/BarService.java    |   30 -
 .../ipojo/runtime/core/services/CheckService.java  |   32 -
 .../ipojo/runtime/core/services/FooService.java    |   40 -
 .../felix/ipojo/runtime/core/services/Plop.java    |   26 -
 .../services/PrimitiveManipulationTestService.java |   76 -
 .../src/main/resources/metadata.xml                |   76 -
 .../runtime/core/TestManipulationMetadata.java     |  295 -
 .../runtime/core/TestManipulationMetadataAPI.java  |  330 --
 .../ipojo-manipulator-manipulation-test/pom.xml    |   35 -
 .../core/components/A123/Manipulation23Tester.java |  189 -
 .../ipojo/runtime/core/components/Annotation.java  |   63 -
 .../runtime/core/components/FooProviderType1.java  |  129 -
 .../runtime/core/components/FooServiceImpl.java    |   63 -
 .../components/HandlerBindingTestComponent.java    |   61 -
 .../core/components/ImmediateComponent.java        |   40 -
 .../runtime/core/components/InnerClasses.java      |  213 -
 .../ipojo/runtime/core/components/Invisible.java   |   24 -
 .../core/components/Manipulation23Tester.java      |  130 -
 .../ipojo/runtime/core/components/Marker.java      |   40 -
 .../ipojo/runtime/core/components/MultiBind.java   |   39 -
 .../ipojo/runtime/core/components/PlopImpl.java    |   31 -
 .../core/components/StereotypedBazComponent.java   |   35 -
 .../core/components/StereotypedMultiBind.java      |   37 -
 .../ipojo/runtime/core/components/SubMarker.java   |   31 -
 .../ipojo/runtime/core/components/Switches.java    |   88 -
 .../runtime/core/components/TestTypedList.java     |   51 -
 .../core/components/nativ/NativeComponent.java     |   46 -
 .../felix/ipojo/runtime/core/handlers/Foo.java     |   39 -
 .../ipojo/runtime/core/handlers/FooHandler.java    |   84 -
 .../ipojo/runtime/core/handlers/IgnoredFoo.java    |   40 -
 .../runtime/core/services/A123/CheckService2.java  |   26 -
 .../ipojo/runtime/core/services/BarService.java    |   30 -
 .../ipojo/runtime/core/services/BazService.java    |   29 -
 .../ipojo/runtime/core/services/CheckService.java  |   32 -
 .../felix/ipojo/runtime/core/services/Color.java   |   30 -
 .../ipojo/runtime/core/services/FooService.java    |   40 -
 .../core/services/HandlerBindingTestService.java   |   29 -
 .../felix/ipojo/runtime/core/services/Job.java     |   29 -
 .../felix/ipojo/runtime/core/services/Plop.java    |   26 -
 .../services/PrimitiveManipulationTestService.java |   76 -
 .../src/main/resources/libs/linux32/libfoo.so      |  Bin 7011 -> 0 bytes
 .../src/main/resources/libs/linux64/libfoo.so      |  Bin 6629 -> 0 bytes
 .../src/main/resources/libs/mac/libfoo.jnilib      |  Bin 8696 -> 0 bytes
 .../src/main/resources/metadata-java5.xml          |   50 -
 .../src/main/resources/metadata-primitives.xml     |   41 -
 .../src/main/resources/metadata.xml                |   61 -
 .../runtime/core/TestAnnotationProcessing.java     |  193 -
 .../ipojo/runtime/core/TestDuplicateMethods.java   |   51 -
 .../ipojo/runtime/core/TestExceptionHandling.java  |  100 -
 .../felix/ipojo/runtime/core/TestGenericList.java  |   86 -
 .../runtime/core/TestGetComponentInstance.java     |  112 -
 .../TestHandlerBindingAndIgnoreAnnotation.java     |   84 -
 .../felix/ipojo/runtime/core/TestNativeMethod.java |  169 -
 .../ipojo/runtime/core/TestNestedClasses.java      |  228 -
 .../ipojo/runtime/core/TestPrimitiveTypes.java     |  117 -
 .../core/TestPrimitiveTypesWithNumberInNames.java  |  121 -
 .../runtime/core/TestStereotypeAnnotation.java     |   86 -
 .../felix/ipojo/runtime/core/TestSwitches.java     |   87 -
 .../felix/ipojo/runtime/core/TestTypeBoxing.java   |   84 -
 .../manipulator-it/online-manipulator-it/pom.xml   |   35 -
 .../ipojo/test/online/components/Consumer.java     |   36 -
 .../test/online/components/FrenchHelloService.java |   40 -
 .../test/online/components/GermanHelloService.java |   40 -
 .../ipojo/test/online/components/MyProvider.java   |   31 -
 .../components/MyProviderWithAnnotations.java      |   37 -
 .../felix/ipojo/test/online/module/Activator.java  |   45 -
 .../felix/ipojo/test/online/module/Type.java       |   36 -
 .../felix/ipojo/test/online/module/Type2.java      |   38 -
 .../felix/ipojo/test/online/module/TypeModule.java |   84 -
 .../felix/ipojo/test/online/services/Hello.java    |   26 -
 .../src/main/resources/consumer.xml                |   22 -
 .../src/main/resources/provider.xml                |   25 -
 .../ipojo/test/online/OnlineManipulatorTest.java   |  593 --
 ipojo/manipulator/manipulator-it/pom.xml           |  407 --
 .../src/main/appended-resources/META-INF/NOTICE    |    0
 ipojo/manipulator/manipulator/changelog.txt        |  249 -
 ipojo/manipulator/manipulator/pom.xml              |  166 -
 .../main/appended-resources/META-INF/DEPENDENCIES  |   11 -
 .../src/main/appended-resources/META-INF/LICENSE   |   42 -
 .../src/main/appended-resources/META-INF/NOTICE    |    3 -
 .../felix/ipojo/manipulation/ClassChecker.java     |  846 ---
 .../manipulation/ClassLoaderAwareClassWriter.java  |   92 -
 .../felix/ipojo/manipulation/ClassManipulator.java | 1172 ----
 .../ipojo/manipulation/ConstructorCodeAdapter.java |  287 -
 .../ipojo/manipulation/InnerClassAdapter.java      |  341 --
 .../ipojo/manipulation/InnerClassChecker.java      |   61 -
 .../ipojo/manipulation/ManipulationProperty.java   |  124 -
 .../felix/ipojo/manipulation/Manipulator.java      |  304 --
 .../ipojo/manipulation/MethodCodeAdapter.java      |  122 -
 .../felix/ipojo/manipulation/MethodDescriptor.java |  264 -
 .../ipojo/manipulator/ManifestAttributeFilter.java |   39 -
 .../felix/ipojo/manipulator/ManifestProvider.java  |   37 -
 .../ipojo/manipulator/ManipulationEngine.java      |  185 -
 .../manipulator/ManipulationResultVisitor.java     |   48 -
 .../felix/ipojo/manipulator/ManipulationUnit.java  |   70 -
 .../ipojo/manipulator/ManipulationVisitor.java     |   48 -
 .../felix/ipojo/manipulator/MetadataProvider.java  |   40 -
 .../felix/ipojo/manipulator/Pojoization.java       |  388 --
 .../felix/ipojo/manipulator/QuotedTokenizer.java   |  200 -
 .../apache/felix/ipojo/manipulator/Reporter.java   |   74 -
 .../felix/ipojo/manipulator/ResourceStore.java     |   76 -
 .../felix/ipojo/manipulator/ResourceVisitor.java   |   34 -
 .../manifest/DirectManifestProvider.java           |   49 -
 .../manipulator/manifest/FileManifestProvider.java |   63 -
 .../metadata/AnnotationMetadataProvider.java       |  126 -
 .../metadata/CacheableMetadataProvider.java        |   62 -
 .../metadata/CompositeMetadataProvider.java        |   99 -
 .../metadata/EmptyMetadataProvider.java            |   42 -
 .../manipulator/metadata/FileMetadataProvider.java |  109 -
 .../metadata/StreamMetadataProvider.java           |  113 -
 .../annotation/ClassMetadataCollector.java         |  196 -
 .../metadata/annotation/ComponentWorkbench.java    |  176 -
 .../annotation/FieldMetadataCollector.java         |   73 -
 .../annotation/MethodMetadataCollector.java        |   95 -
 .../annotation/model/AnnotationDiscovery.java      |   31 -
 .../metadata/annotation/model/AnnotationType.java  |   54 -
 .../metadata/annotation/model/Playback.java        |   42 -
 .../discovery/ChainedAnnotationDiscovery.java      |   57 -
 .../model/discovery/HandlerBindingDiscovery.java   |   76 -
 .../model/discovery/IgnoredDiscovery.java          |   48 -
 .../model/discovery/StereotypeDiscovery.java       |   48 -
 .../model/literal/AnnotationPlayback.java          |  264 -
 .../annotation/model/parser/AnnotationParser.java  |   38 -
 .../model/parser/AnnotationTypeVisitor.java        |   58 -
 .../model/parser/replay/AnnotationRecorder.java    |   68 -
 .../parser/replay/AnnotationVisitorPlayback.java   |   77 -
 .../annotation/model/parser/replay/Replay.java     |   31 -
 .../annotation/model/parser/replay/Visit.java      |   41 -
 .../model/parser/replay/VisitAnnotation.java       |   46 -
 .../annotation/model/parser/replay/VisitArray.java |   44 -
 .../annotation/model/parser/replay/VisitEnd.java   |   34 -
 .../annotation/model/parser/replay/VisitEnum.java  |   42 -
 .../annotation/module/DefaultBindingModule.java    |  290 -
 .../metadata/annotation/registry/Binding.java      |   67 -
 .../annotation/registry/BindingRegistry.java       |   43 -
 .../registry/CompletableBindingRegistry.java       |   62 -
 .../registry/DefaultBindingRegistry.java           |   79 -
 .../registry/IgnoreAllBindingRegistry.java         |   46 -
 .../registry/LegacyGenericBindingRegistry.java     |   95 -
 .../registry/MetaAnnotationBindingRegistry.java    |  164 -
 .../metadata/annotation/registry/Selection.java    |  150 -
 .../annotation/visitor/ComponentVisitor.java       |  139 -
 .../annotation/visitor/ControllerVisitor.java      |   54 -
 .../annotation/visitor/FieldPropertyVisitor.java   |  164 -
 .../visitor/HandlerDeclarationVisitor.java         |  160 -
 .../annotation/visitor/HandlerVisitor.java         |   94 -
 .../annotation/visitor/InstantiateVisitor.java     |   71 -
 .../annotation/visitor/LifecycleVisitor.java       |   58 -
 .../annotation/visitor/MethodPropertyVisitor.java  |  177 -
 .../visitor/ParameterPropertyVisitor.java          |   66 -
 .../visitor/PostRegistrationVisitor.java           |   52 -
 .../visitor/PostUnregistrationVisitor.java         |   52 -
 .../annotation/visitor/ProvidesVisitor.java        |  138 -
 .../annotation/visitor/RequiresVisitor.java        |  268 -
 .../visitor/ServiceControllerVisitor.java          |   81 -
 .../annotation/visitor/UpdatedVisitor.java         |   51 -
 .../visitor/bind/AbstractBindVisitor.java          |  223 -
 .../metadata/annotation/visitor/bind/Action.java   |   27 -
 .../annotation/visitor/bind/MethodBindVisitor.java |   89 -
 .../visitor/bind/ParameterBindVisitor.java         |   63 -
 .../visitor/generic/FieldGenericVisitor.java       |   37 -
 .../annotation/visitor/generic/GenericVisitor.java |  114 -
 .../visitor/generic/GenericVisitorFactory.java     |   70 -
 .../visitor/generic/MethodGenericVisitor.java      |   39 -
 .../visitor/generic/ParameterGenericVisitor.java   |   54 -
 .../visitor/generic/RootGenericVisitor.java        |  109 -
 .../visitor/generic/SubArrayVisitor.java           |  130 -
 .../visitor/generic/TypeGenericVisitor.java        |   34 -
 .../annotation/visitor/ignore/NullBinding.java     |   40 -
 .../visitor/ignore/NullVisitorFactory.java         |   42 -
 .../visitor/stereotype/FieldStereotypeVisitor.java |   49 -
 .../stereotype/MethodStereotypeVisitor.java        |   49 -
 .../stereotype/ParameterStereotypeVisitor.java     |   53 -
 .../stereotype/StereotypeVisitorFactory.java       |   68 -
 .../visitor/stereotype/TypeStereotypeVisitor.java  |   51 -
 .../metadata/annotation/visitor/util/Bindings.java |   56 -
 .../metadata/annotation/visitor/util/Elements.java |   94 -
 .../metadata/annotation/visitor/util/Names.java    |  136 -
 .../render/ManipulatedMetadataFilter.java          |   53 -
 .../ipojo/manipulator/render/MetadataFilter.java   |   39 -
 .../ipojo/manipulator/render/MetadataRenderer.java |  140 -
 .../ipojo/manipulator/reporter/EmptyReporter.java  |   84 -
 .../ipojo/manipulator/reporter/SystemReporter.java |  112 -
 .../ipojo/manipulator/spi/AbsBindingModule.java    |  212 -
 .../ipojo/manipulator/spi/AnnotationLiteral.java   |   84 -
 .../manipulator/spi/AnnotationVisitorFactory.java  |   34 -
 .../ipojo/manipulator/spi/BindingContext.java      |  162 -
 .../apache/felix/ipojo/manipulator/spi/Module.java |   37 -
 .../ipojo/manipulator/spi/ModuleProvider.java      |   38 -
 .../felix/ipojo/manipulator/spi/Predicate.java     |   39 -
 .../ipojo/manipulator/spi/helper/Predicates.java   |  224 -
 .../spi/provider/CompositeModuleProvider.java      |   55 -
 .../spi/provider/CoreModuleProvider.java           |   33 -
 .../spi/provider/DefaultModuleProvider.java        |   53 -
 .../spi/provider/ServiceLoaderModuleProvider.java  |   52 -
 .../manipulator/store/DirectoryResourceStore.java  |  170 -
 .../manipulator/store/JarFileResourceStore.java    |  250 -
 .../ipojo/manipulator/store/ManifestBuilder.java   |   52 -
 .../ipojo/manipulator/store/ResourceMapper.java    |   43 -
 .../store/builder/DefaultManifestBuilder.java      |  262 -
 .../store/mapper/FileSystemResourceMapper.java     |   75 -
 .../store/mapper/IdentityResourceMapper.java       |   37 -
 .../store/mapper/WABResourceMapper.java            |   58 -
 .../manipulator/util/ChainedAnnotationVisitor.java |   92 -
 .../felix/ipojo/manipulator/util/Classpath.java    |  180 -
 .../felix/ipojo/manipulator/util/Collections5.java |   85 -
 .../felix/ipojo/manipulator/util/Constants.java    |   60 -
 .../manipulator/util/IsolatedClassLoader.java      |   85 -
 .../felix/ipojo/manipulator/util/Metadatas.java    |  120 -
 .../felix/ipojo/manipulator/util/Streams.java      |  101 -
 .../felix/ipojo/manipulator/util/Strings.java      |   55 -
 .../manipulator/visitor/ManipulationAdapter.java   |   51 -
 .../visitor/ManipulationResultAdapter.java         |   50 -
 .../check/CheckFieldConsistencyResultVisitor.java  |  104 -
 .../check/CheckFieldConsistencyVisitor.java        |   52 -
 .../visitor/writer/ManipulatedResourcesWriter.java |   81 -
 .../visitor/writer/ManipulatedResultWriter.java    |   60 -
 .../felix/ipojo/xml/parser/ParseException.java     |   40 -
 .../felix/ipojo/xml/parser/SchemaResolver.java     |   81 -
 .../felix/ipojo/xml/parser/XMLMetadataParser.java  |  295 -
 .../main/resources/META-INF/constants.properties   |   22 -
 .../org.apache.felix.ipojo.manipulator.spi.Module  |    1 -
 .../src/main/resources/xsd/composite.xsd           |  147 -
 .../manipulator/src/main/resources/xsd/core.xsd    |  704 ---
 .../src/main/resources/xsd/event-admin.xsd         |   90 -
 .../src/main/resources/xsd/extender-pattern.xsd    |   42 -
 .../manipulator/src/main/resources/xsd/jmx.xsd     |  177 -
 .../src/main/resources/xsd/temporal.xsd            |   61 -
 .../src/main/resources/xsd/whiteboard-pattern.xsd  |   45 -
 .../org/apache/felix/ipojo/ComponentInstance.java  |   31 -
 .../org/apache/felix/ipojo/InstanceManager.java    |   51 -
 .../src/test/java/org/apache/felix/ipojo/Pojo.java |   29 -
 .../ipojo/manipulation/ClassCheckerTestCase.java   |  129 -
 .../ipojo/manipulation/DirManipulationTest.java    |  101 -
 .../ipojo/manipulation/InnerClassAdapterTest.java  |  399 --
 .../ipojo/manipulation/ManipulatedClassLoader.java |   97 -
 .../felix/ipojo/manipulation/ManipulatorTest.java  |  460 --
 .../felix/ipojo/manipulation/PojoizationTest.java  |   65 -
 .../ipojo/manipulation/RemanipulationTest.java     |  162 -
 .../manipulator/ManipulationEngineTestCase.java    |  113 -
 .../manifest/DirectManifestProviderTestCase.java   |   33 -
 .../manifest/FileManifestProviderTestCase.java     |   37 -
 .../AnnotationMetadataProviderTestCase.java        |   94 -
 .../CacheableMetadataProviderTestCase.java         |   46 -
 .../CompositeMetadataProviderTestCase.java         |  112 -
 .../metadata/EmptyMetadataProviderTestCase.java    |   29 -
 .../metadata/FileMetadataProviderTestCase.java     |   51 -
 .../metadata/StreamMetadataProviderTestCase.java   |   60 -
 .../annotation/ComponentWorkbenchTestCase.java     |   90 -
 .../model/literal/AnnotationPlaybackTestCase.java  |  196 -
 .../model/literal/types/AnnotationAnnotation.java  |   36 -
 .../model/literal/types/ArrayAnnotation.java       |   40 -
 .../model/literal/types/EnumAnnotation.java        |   38 -
 .../model/literal/types/InnerAnnotation.java       |   37 -
 .../annotation/model/literal/types/Mode.java       |   29 -
 .../model/literal/types/SimpleTypes.java           |   56 -
 .../annotation/model/literal/types/Support.java    |   44 -
 .../parser/replay/AnnotationRecorderTestCase.java  |   92 -
 .../CompletableBindingRegistryTestCase.java        |   83 -
 .../registry/DefaultBindingRegistryTestCase.java   |   82 -
 .../registry/IgnoreAllBindingRegistryTestCase.java |   58 -
 .../LegacyGenericBindingRegistryTestCase.java      |   95 -
 .../MetaAnnotationBindingRegistryTestCase.java     |  174 -
 .../annotation/registry/SelectionTestCase.java     |  237 -
 .../visitor/ComponentVisitorTestCase.java          |   91 -
 .../visitor/HandlerDeclarationVisitorTestCase.java |  103 -
 .../visitor/bind/MethodBindVisitorTestCase.java    |   87 -
 .../annotation/visitor/util/NamesTestCase.java     |  145 -
 .../render/ManipulatedMetadataFilterTestCase.java  |   65 -
 .../render/MetadataRendererTestCase.java           |  100 -
 .../manipulator/spi/AbsBindingModuleTestCase.java  |  259 -
 .../manipulator/spi/AnnotationLiteralTestCase.java |   50 -
 .../store/DirectoryResourceStoreTestCase.java      |   88 -
 .../store/JarFileResourceStoreTestCase.java        |   82 -
 .../builder/DefaultManifestBuilderTestCase.java    |   99 -
 .../mapper/FileSystemResourceMapperTestCase.java   |   75 -
 .../mapper/IdentityResourceMapperTestCase.java     |   37 -
 .../store/mapper/WABResourceMapperTestCase.java    |   65 -
 .../ipojo/manipulator/util/StreamsTestCase.java    |   59 -
 .../ipojo/manipulator/util/StringsTestCase.java    |   37 -
 ...CheckFieldConsistencyResultVisitorTestCase.java |   91 -
 .../writer/ManipulatedResourcesWriterTestCase.java |   64 -
 .../writer/ManipulatedResultWriterTestCase.java    |   56 -
 .../src/test/java/test/AnnotatedComponent.java     |   39 -
 .../manipulator/src/test/java/test/Child.java      |   36 -
 .../src/test/java/test/ClusterDaemon.java          |   41 -
 .../src/test/java/test/ConstructorCheck.java       |   31 -
 .../src/test/java/test/DoubleArray.java            |   44 -
 .../src/test/java/test/FakeAnnotation.java         |   35 -
 .../src/test/java/test/NoValidConstructor.java     |   34 -
 .../src/test/java/test/NonSunClass.java            |   38 -
 .../manipulator/src/test/java/test/Parent.java     |   34 -
 .../src/test/java/test/PlentyOfAnnotations.java    |   63 -
 .../src/test/java/test/PojoWithInner.java          |   40 -
 .../manipulator/src/test/java/test/SimplePojo.java |   32 -
 .../java/test/frames/CryptoServiceSingleton.java   |  434 --
 .../src/test/java/test/frames/Hash.java            |   42 -
 .../java/test/inner/ComponentWithInnerClasses.java |  105 -
 .../src/test/java/test/inner/Computation.java      |   28 -
 .../src/test/java/test/inner/Example.java          |   80 -
 .../src/test/java/test/ipojo/ExternalHandler.java  |   23 -
 .../manipulator/src/test/resources/MANIFEST.MF     |   19 -
 .../src/test/resources/empty-metadata.xml          |   23 -
 .../manipulator/src/test/resources/metadata.xml    |   56 -
 .../tests.manipulation-no-annotations.jar          |  Bin 26078 -> 0 bytes
 .../test/resources/tests.manipulation.java5.jar    |  Bin 22366 -> 0 bytes
 .../resources/tests.manipulator-annotations.jar    |  Bin 83285 -> 0 bytes
 ipojo/manipulator/maven-ipojo-plugin/changelog.txt |  203 -
 ipojo/manipulator/maven-ipojo-plugin/pom.xml       |  157 -
 .../main/appended-resources/META-INF/DEPENDENCIES  |   10 -
 .../src/main/appended-resources/META-INF/NOTICE    |    1 -
 .../apache/felix/ipojo/plugin/ManipulatorMojo.java |  310 --
 .../apache/felix/ipojo/plugin/MavenReporter.java   |   86 -
 .../META-INF/maven/archetype-metadata.xml          |   45 -
 .../archetype-resources/bundle.properties          |    4 -
 .../src/main/resources/archetype-resources/pom.xml |   75 -
 .../src/main/java/HelloComponent.java              |   14 -
 .../archetype-resources/src/main/java/source.txt   |    1 -
 .../src/main/resources/metadata.xml                |   16 -
 ipojo/manipulator/online-manipulator/changelog.txt |  133 -
 ipojo/manipulator/online-manipulator/pom.xml       |  189 -
 .../main/appended-resources/META-INF/DEPENDENCIES  |   21 -
 .../src/main/appended-resources/META-INF/LICENSE   |   42 -
 .../src/main/appended-resources/META-INF/NOTICE    |    3 -
 .../online/manipulator/BridgeClassLoader.java      |   65 -
 .../BundleAwareJarFileResourceStore.java           |   91 -
 .../felix/ipojo/online/manipulator/Files.java      |   54 -
 .../ipojo/online/manipulator/IPOJOURLHandler.java  |  313 --
 .../ipojo/online/manipulator/SystemLogService.java |   83 -
 .../main/resources/META-INF/constants.properties   |   22 -
 ipojo/manipulator/pom.xml                          |   69 -
 .../src/main/appended-resources/META-INF/NOTICE    |    0
 ipojo/metadata/changelog.txt                       |   29 -
 ipojo/metadata/pom.xml                             |   67 -
 .../main/appended-resources/META-INF/DEPENDENCIES  |   10 -
 .../org/apache/felix/ipojo/metadata/Attribute.java |   91 -
 .../org/apache/felix/ipojo/metadata/Element.java   |  400 --
 ipojo/pom.xml                                      |   85 -
 ipojo/runtime/api/changelog.txt                    |  219 -
 ipojo/runtime/api/pom.xml                          |  137 -
 .../main/appended-resources/META-INF/DEPENDENCIES  |   16 -
 .../src/main/appended-resources/META-INF/LICENSE   |   42 -
 .../src/main/appended-resources/META-INF/NOTICE    |    3 -
 .../org/apache/felix/ipojo/api/ComponentType.java  |  195 -
 .../org/apache/felix/ipojo/api/Dependency.java     |  412 --
 .../felix/ipojo/api/HandlerConfiguration.java      |   36 -
 .../felix/ipojo/api/PrimitiveComponentType.java    |  560 --
 .../java/org/apache/felix/ipojo/api/Property.java  |  205 -
 .../java/org/apache/felix/ipojo/api/Service.java   |  320 --
 .../apache/felix/ipojo/api/ServiceProperty.java    |  192 -
 .../felix/ipojo/api/SingletonComponentType.java    |  140 -
 .../apache/felix/ipojo/api/TemporalDependency.java |  195 -
 .../api/composite/CompositeComponentType.java      |  329 --
 .../felix/ipojo/api/composite/ExportedService.java |  188 -
 .../felix/ipojo/api/composite/ImportedService.java |  237 -
 .../apache/felix/ipojo/api/composite/Instance.java |  246 -
 .../ipojo/api/composite/InstantiatedService.java   |  362 --
 .../felix/ipojo/api/composite/ProvidedService.java |  112 -
 .../org/apache/felix/ipojo/api/DependencyTest.java |  149 -
 .../org/apache/felix/ipojo/api/PropertyTest.java   |   60 -
 .../org/apache/felix/ipojo/api/ServiceTest.java    |   81 -
 .../ipojo/api/composite/ExportedServiceTest.java   |  161 -
 .../ipojo/api/composite/ImportedServiceTest.java   |  192 -
 .../felix/ipojo/api/composite/InstanceTest.java    |  274 -
 .../api/composite/InstantiatedServiceTest.java     |  210 -
 ipojo/runtime/changelog.txt                        |  223 -
 .../ipojo-composite-import-export-test/pom.xml     |   36 -
 .../runtime/core/components/Baz2CheckProvider.java |   81 -
 .../runtime/core/components/BazProviderType1.java  |   51 -
 .../core/components/CheckProviderParentClass.java  |   51 -
 .../core/components/CheckServiceProvider.java      |   83 -
 .../core/components/FooBarProviderType1.java       |   54 -
 .../runtime/core/components/FooProviderType1.java  |   92 -
 .../core/components/FooProviderTypeDyn.java        |   63 -
 .../core/components/FooProviderTypeDyn2.java       |   58 -
 .../runtime/core/components/TataProvider.java      |  222 -
 .../runtime/core/components/TotoProvider.java      |   73 -
 .../runtime/core/components/TotoProviderGlue.java  |   81 -
 .../runtime/core/services/A123/CheckService2.java  |   25 -
 .../ipojo/runtime/core/services/BarService.java    |   29 -
 .../ipojo/runtime/core/services/BazService.java    |   39 -
 .../ipojo/runtime/core/services/CheckService.java  |   31 -
 .../ipojo/runtime/core/services/FooService.java    |   39 -
 .../felix/ipojo/runtime/core/services/Tata.java    |   62 -
 .../felix/ipojo/runtime/core/services/Tota.java    |   78 -
 .../felix/ipojo/runtime/core/services/Toto.java    |   37 -
 .../src/main/resources/metadata-import-export.xml  |  106 -
 .../src/main/resources/metadata.xml                |  131 -
 .../apache/felix/ipojo/runtime/core/Common.java    |   61 -
 .../runtime/core/exporter/TestFilteredExport.java  |  237 -
 .../runtime/core/exporter/TestMultipleExport.java  |  260 -
 .../runtime/core/exporter/TestOptionalExport.java  |  241 -
 .../core/exporter/TestOptionalMultipleExport.java  |  260 -
 .../runtime/core/exporter/TestSimpleExport.java    |  241 -
 .../core/importer/TestDelayedFilteredImport.java   |  157 -
 .../core/importer/TestDelayedMultipleImport.java   |  163 -
 .../core/importer/TestDelayedOptionalImport.java   |  163 -
 .../TestDelayedOptionalMultipleImport.java         |  169 -
 .../core/importer/TestDelayedSimpleImport.java     |  158 -
 .../runtime/core/importer/TestFilteredImport.java  |  157 -
 .../runtime/core/importer/TestMultipleImport.java  |  199 -
 .../runtime/core/importer/TestOptionalImport.java  |  193 -
 .../core/importer/TestOptionalMultipleImport.java  |  210 -
 .../runtime/core/importer/TestSimpleImport.java    |  193 -
 .../ipojo-composite-instance-test/pom.xml          |   36 -
 .../runtime/core/components/Baz2CheckProvider.java |   81 -
 .../runtime/core/components/BazProviderType1.java  |   51 -
 .../core/components/CheckProviderParentClass.java  |   51 -
 .../core/components/CheckServiceProvider.java      |   83 -
 .../core/components/FooBarProviderType1.java       |   54 -
 .../runtime/core/components/FooProviderType1.java  |   92 -
 .../core/components/FooProviderTypeDyn.java        |   63 -
 .../core/components/FooProviderTypeDyn2.java       |   58 -
 .../runtime/core/components/ServiceConsumer.java   |   46 -
 .../runtime/core/components/ServiceProvider.java   |   34 -
 .../runtime/core/components/TataProvider.java      |  222 -
 .../runtime/core/components/TotoProvider.java      |   73 -
 .../runtime/core/components/TotoProviderGlue.java  |   81 -
 .../runtime/core/services/A123/CheckService2.java  |   25 -
 .../ipojo/runtime/core/services/BarService.java    |   29 -
 .../ipojo/runtime/core/services/BazService.java    |   39 -
 .../ipojo/runtime/core/services/CheckService.java  |   31 -
 .../ipojo/runtime/core/services/FooService.java    |   39 -
 .../felix/ipojo/runtime/core/services/Service.java |   26 -
 .../felix/ipojo/runtime/core/services/Tata.java    |   62 -
 .../felix/ipojo/runtime/core/services/Tota.java    |   78 -
 .../felix/ipojo/runtime/core/services/Toto.java    |   37 -
 .../src/main/resources/metadata-instance.xml       |  108 -
 .../src/main/resources/metadata.xml                |  131 -
 .../apache/felix/ipojo/runtime/core/Common.java    |   47 -
 .../runtime/core/instance/TestInstanceScope.java   |  105 -
 .../runtime/core/instance/TestSimpleInstance.java  |  279 -
 .../TestConfigurableInstantiation.java             |  112 -
 .../core/instantiator/TestConfiguration.java       |   98 -
 .../instantiator/TestMultipleInstantiation.java    |  287 -
 .../instantiator/TestOptionalInstantiation.java    |  273 -
 .../TestOptionalMultipleInstantiation.java         |  214 -
 .../core/instantiator/TestSimpleInstantiation.java |  274 -
 .../ipojo-composite-runtime-test/pom.xml           |   36 -
 .../runtime/core/components/Baz2CheckProvider.java |   81 -
 .../runtime/core/components/BazProviderType1.java  |   51 -
 .../core/components/CheckProviderParentClass.java  |   51 -
 .../core/components/CheckServiceProvider.java      |   83 -
 .../core/components/FooBarProviderType1.java       |   54 -
 .../runtime/core/components/FooProviderType1.java  |   92 -
 .../core/components/FooProviderTypeDyn.java        |   63 -
 .../core/components/FooProviderTypeDyn2.java       |   58 -
 .../runtime/core/components/TataProvider.java      |  222 -
 .../runtime/core/components/TotoProvider.java      |   73 -
 .../runtime/core/components/TotoProviderGlue.java  |   81 -
 .../runtime/core/services/A123/CheckService2.java  |   25 -
 .../ipojo/runtime/core/services/BarService.java    |   29 -
 .../ipojo/runtime/core/services/BazService.java    |   39 -
 .../ipojo/runtime/core/services/CheckService.java  |   31 -
 .../ipojo/runtime/core/services/FooService.java    |   39 -
 .../felix/ipojo/runtime/core/services/Tata.java    |   62 -
 .../felix/ipojo/runtime/core/services/Tota.java    |   78 -
 .../felix/ipojo/runtime/core/services/Toto.java    |   37 -
 .../src/main/resources/metadata.xml                |  131 -
 .../apache/felix/ipojo/runtime/core/Common.java    |   48 -
 .../ipojo/runtime/core/EmptyCompositeTest.java     |  228 -
 .../ipojo/runtime/core/FactoryManagementTest.java  |  330 --
 .../felix/ipojo/runtime/core/ServiceRangeTest.java |  510 --
 .../ipojo/runtime/core/ServiceRegistryTest.java    |  282 -
 .../ipojo-composite-service-providing-test/pom.xml |   36 -
 .../runtime/core/components/Baz2CheckProvider.java |   81 -
 .../runtime/core/components/BazProviderType1.java  |   51 -
 .../core/components/CheckProviderParentClass.java  |   51 -
 .../core/components/CheckServiceProvider.java      |   83 -
 .../core/components/FooBarProviderType1.java       |   54 -
 .../runtime/core/components/FooProviderType1.java  |   92 -
 .../core/components/FooProviderTypeDyn.java        |   63 -
 .../core/components/FooProviderTypeDyn2.java       |   58 -
 .../runtime/core/components/ServiceConsumer.java   |   46 -
 .../runtime/core/components/ServiceProvider.java   |   34 -
 .../runtime/core/components/TataProvider.java      |  222 -
 .../runtime/core/components/TotoProvider.java      |   73 -
 .../runtime/core/components/TotoProviderGlue.java  |   81 -
 .../runtime/core/services/A123/CheckService2.java  |   25 -
 .../ipojo/runtime/core/services/BarService.java    |   29 -
 .../ipojo/runtime/core/services/BazService.java    |   39 -
 .../ipojo/runtime/core/services/CheckService.java  |   31 -
 .../ipojo/runtime/core/services/FooService.java    |   39 -
 .../felix/ipojo/runtime/core/services/Service.java |   26 -
 .../felix/ipojo/runtime/core/services/Tata.java    |   62 -
 .../felix/ipojo/runtime/core/services/Tota.java    |   78 -
 .../felix/ipojo/runtime/core/services/Toto.java    |   37 -
 .../src/main/resources/metadata-providing.xml      |  174 -
 .../src/main/resources/metadata.xml                |  131 -
 .../apache/felix/ipojo/runtime/core/Common.java    |   57 -
 .../felix/ipojo/runtime/core/TestCompositeAPI.java |  184 -
 .../ipojo/runtime/core/providing/TestComp0.java    |  343 --
 .../ipojo/runtime/core/providing/TestComp1.java    |  341 --
 .../ipojo/runtime/core/providing/TestComp2.java    |  238 -
 .../ipojo/runtime/core/providing/TestComp3.java    |  271 -
 .../ipojo/runtime/core/providing/TestComp4.java    |  270 -
 .../ipojo/runtime/core/providing/TestComp5.java    |  272 -
 .../ipojo/runtime/core/providing/TestComp6.java    |  295 -
 .../ipojo/runtime/core/providing/TestComp7.java    |  339 --
 .../ipojo/runtime/core/providing/TestComp8.java    |  369 --
 ipojo/runtime/composite-it/pom.xml                 |  354 --
 .../src/main/appended-resources/META-INF/NOTICE    |    0
 ipojo/runtime/composite/changelog.txt              |  268 -
 ipojo/runtime/composite/obr.xml                    |   40 -
 ipojo/runtime/composite/pom.xml                    |  189 -
 .../main/appended-resources/META-INF/DEPENDENCIES  |   16 -
 .../src/main/appended-resources/META-INF/LICENSE   |   42 -
 .../src/main/appended-resources/META-INF/NOTICE    |    4 -
 .../felix/ipojo/composite/CompositeFactory.java    |  180 -
 .../felix/ipojo/composite/CompositeHandler.java    |   83 -
 .../composite/CompositeInstanceDescription.java    |  130 -
 .../felix/ipojo/composite/CompositeManager.java    |  442 --
 .../ipojo/composite/CompositeServiceContext.java   |  506 --
 .../apache/felix/ipojo/composite/FactoryProxy.java |  189 -
 .../architecture/ArchitectureHandler.java          |  111 -
 .../ipojo/composite/instance/InstanceHandler.java  |  441 --
 .../instance/InstanceHandlerDescription.java       |   90 -
 .../instantiator/ServiceDependencyHandler.java     |  393 --
 .../service/instantiator/ServiceImporter.java      |  326 --
 .../ServiceInstantiatorDescription.java            |  117 -
 .../service/instantiator/SvcInstance.java          |  295 -
 .../service/provides/CompositionException.java     |   44 -
 .../service/provides/CompositionMetadata.java      |  361 --
 .../composite/service/provides/FieldMetadata.java  |  105 -
 .../composite/service/provides/MethodMetadata.java |  138 -
 .../composite/service/provides/POJOWriter.java     |  323 --
 .../service/provides/ProvidedService.java          |  238 -
 .../service/provides/ProvidedServiceHandler.java   |  504 --
 .../ProvidedServiceHandlerDescription.java         |   96 -
 .../service/provides/ServiceExporter.java          |  176 -
 .../service/provides/SpecificationMetadata.java    |  158 -
 .../felix/ipojo/composite/util/SourceManager.java  |  376 --
 .../composite/src/main/resources/composite.xsd     |  147 -
 .../composite/src/main/resources/metadata.xml      |   43 -
 ipojo/runtime/core-it/ipojo-api-test/pom.xml       |   67 -
 .../ipojo/runtime/core/api/components/FooImpl.java |   41 -
 .../runtime/core/api/components/HostImpl.java      |   38 -
 .../core/api/components/MyComponentImpl.java       |   50 -
 .../runtime/core/api/components/MyServiceImpl.java |   28 -
 .../core/api/components/PlainHelloImpl.java        |   46 -
 .../runtime/core/api/services/BarService.java      |   27 -
 .../felix/ipojo/runtime/core/api/services/Foo.java |   27 -
 .../ipojo/runtime/core/api/services/MyService.java |   24 -
 .../runtime/core/api/services/PlainHello.java      |   24 -
 .../felix/ipojo/runtime/core/api/Common.java       |   73 -
 .../ipojo/runtime/core/api/CompositeTest.java      |  247 -
 .../runtime/core/api/ExternalHandlerTest.java      |   91 -
 .../runtime/core/api/PrimitiveComponentTest.java   |  181 -
 .../runtime/core/api/SingletonComponentTest.java   |  177 -
 .../felix/ipojo/runtime/core/api/Whiteboard.java   |   90 -
 .../core-it/ipojo-compatibility-test/pom.xml       |   35 -
 .../compatibility/ipojo/HelloServiceConsumer.java  |   50 -
 .../compatibility/ipojo/HelloServiceProvider.java  |   44 -
 .../compatibility/scr/HelloServiceConsumer.java    |   67 -
 .../compatibility/scr/HelloServiceProvider.java    |   41 -
 .../test/compatibility/service/CheckService.java   |   31 -
 .../test/compatibility/service/HelloService.java   |   28 -
 .../src/main/resources/blueprint/HelloConsumer.xml |   32 -
 .../src/main/resources/blueprint/HelloProvider.xml |   29 -
 .../src/main/resources/scr/HelloConsumer.xml       |   33 -
 .../src/main/resources/scr/HelloProvider.xml       |   26 -
 .../felix/ipojo/test/compatibility/Common.java     |  307 --
 .../TestBeingConsumedByAriesBlueprint1_1_0.java    |   60 -
 .../TestBeingConsumedByEquinoxSCR1_4_100.java      |   66 -
 .../TestBeingConsumedByFelixSCR1_6_2.java          |   57 -
 .../TestBeingConsumedByKnopflerfishSCR4_0_2.java   |   65 -
 ...tConsumingProviderUsingAriesBlueprint1_1_0.java |   61 -
 ...estConsumingProviderUsingEquinoxSCR1_4_100.java |   68 -
 .../TestConsumingProviderUsingFelixSCR1_6_2.java   |   58 -
 ...ConsumingProviderUsingKnopflerfishSCR4_0_2.java |   64 -
 .../ipojo/test/compatibility/TestiPOJOOnly.java    |   49 -
 .../core-it/ipojo-core-annotations-test/pom.xml    |   35 -
 .../src/main/java/foo/Foo.java                     |   29 -
 .../src/main/java/foo/RGB.java                     |   28 -
 .../src/main/java/foo/ipojo/IPOJOFoo.java          |   35 -
 .../core/test/components/AggregateDependency.java  |   44 -
 .../ipojo/runtime/core/test/components/Arch.java   |   26 -
 .../core/test/components/ComponentTypeVersion.java |   28 -
 .../test/components/CustomAnnotationWithEnum.java  |   30 -
 .../DefaultImplementationDependency.java           |   32 -
 .../runtime/core/test/components/Dependency.java   |  103 -
 .../components/DependencyUsingSpecification.java   |   55 -
 .../runtime/core/test/components/Factory.java      |   26 -
 .../core/test/components/FactoryDeprecated.java    |   26 -
 .../core/test/components/FactoryMethod.java        |   30 -
 .../test/components/FactoryMethodDeprecated.java   |   30 -
 .../core/test/components/FilteredDependency.java   |   56 -
 .../core/test/components/FromDependency.java       |   83 -
 .../runtime/core/test/components/Immediate.java    |   26 -
 .../core/test/components/InstantiateSimple.java    |   30 -
 .../core/test/components/InstantiateWithName.java  |   30 -
 .../runtime/core/test/components/Lifecycle.java    |   41 -
 .../core/test/components/ManagedServicePID.java    |   93 -
 .../runtime/core/test/components/MyComparator.java |   30 -
 .../runtime/core/test/components/NoAnnotation.java |   24 -
 .../ipojo/runtime/core/test/components/NoArch.java |   26 -
 .../runtime/core/test/components/NoFactory.java    |   26 -
 .../runtime/core/test/components/NoImmediate.java  |   26 -
 .../core/test/components/NoPropagation.java        |   93 -
 .../core/test/components/NullableDependency.java   |   36 -
 .../runtime/core/test/components/OnlyFoo.java      |   27 -
 .../runtime/core/test/components/OnlyiPOJOFoo.java |   27 -
 .../core/test/components/OptionalDependency.java   |   60 -
 .../core/test/components/PIDandPropagation.java    |   94 -
 .../core/test/components/PSServiceController.java  |   75 -
 .../test/components/PSServiceControllerSpec.java   |   78 -
 .../core/test/components/PolicyDependency.java     |   56 -
 .../runtime/core/test/components/Propagation.java  |   94 -
 .../core/test/components/PropagationandPID.java    |   94 -
 .../runtime/core/test/components/Properties.java   |   93 -
 .../core/test/components/ProvidesDouble.java       |   61 -
 .../core/test/components/ProvidesProperties.java   |   86 -
 .../core/test/components/ProvidesQuatro.java       |   77 -
 .../core/test/components/ProvidesSimple.java       |   70 -
 .../test/components/ProvidesStaticProperties.java  |   94 -
 .../core/test/components/ProvidesTriple.java       |   76 -
 .../core/test/components/RankedDependency.java     |   69 -
 .../test/components/UpdatedWithManagedService.java |  102 -
 .../test/components/UpdatedWithProperties.java     |  104 -
 .../components/ComponentWithProperties.java        |   79 -
 .../components/InstantiatedComponent.java          |   33 -
 .../components/context/ComponentUsingContext.java  |   46 -
 .../core/test/components/error/AbstractClass.java  |   29 -
 .../runtime/core/test/components/event/PubSub.java |   56 -
 .../test/components/event/PubSubDeprecated.java    |   56 -
 .../test/components/event/PubSubWithPublishes.java |   57 -
 .../core/test/components/extender/Extender.java    |   37 -
 .../core/test/components/jmx/JMXDeprecated.java    |   44 -
 .../core/test/components/jmx/JMXSimple.java        |   44 -
 .../core/test/components/temporal/Temporal.java    |   33 -
 .../components/temporal/TemporalCollection.java    |   44 -
 .../test/components/temporal/TemporalSimple.java   |   32 -
 .../test/components/temporal/TemporalWithDI.java   |   32 -
 .../temporal/TemporalWithEmptyArray.java           |   32 -
 .../components/temporal/TemporalWithFilter.java    |   32 -
 .../test/components/temporal/TemporalWithNull.java |   32 -
 .../components/temporal/TemporalWithNullable.java  |   33 -
 .../components/temporal/TemporalWithTimeout.java   |   35 -
 .../whiteboard/WhiteBoardWIModification.java       |   44 -
 .../whiteboard/WhiteBoardWOModification.java       |   37 -
 .../test/components/whiteboard/WhiteBoards.java    |   46 -
 .../runtime/core/test/services/BarService.java     |   29 -
 .../runtime/core/test/services/CheckService.java   |   31 -
 .../runtime/core/test/services/ChildInterface.java |   25 -
 .../runtime/core/test/services/FooService.java     |   39 -
 .../core/test/services/ParentInterface1.java       |   25 -
 .../core/test/services/ParentInterface2.java       |   25 -
 .../core/test/services/ParentParentInterface.java  |   25 -
 .../runtime/core/test/annotations/Common.java      |   49 -
 .../test/annotations/TestAggregateDependency.java  |   83 -
 .../core/test/annotations/TestArchitecture.java    |   50 -
 .../runtime/core/test/annotations/TestContext.java |   95 -
 .../test/annotations/TestCustomAnnotations.java    |   55 -
 .../core/test/annotations/TestDependency.java      |  187 -
 .../test/annotations/TestDependencyPolicy.java     |  104 -
 .../core/test/annotations/TestEventAdmin.java      |  287 -
 .../core/test/annotations/TestExtender.java        |   49 -
 .../runtime/core/test/annotations/TestFactory.java |   98 -
 .../test/annotations/TestFilteredDependency.java   |  132 -
 .../core/test/annotations/TestInstantiate.java     |  128 -
 .../annotations/TestInstantiatedComponent.java     |   45 -
 .../runtime/core/test/annotations/TestJMX.java     |   85 -
 .../test/annotations/TestLifecycleCallbacks.java   |   74 -
 .../test/annotations/TestLifecycleController.java  |   42 -
 .../test/annotations/TestOptionalDependency.java   |  136 -
 .../core/test/annotations/TestProperties.java      |  189 -
 .../test/annotations/TestRankedDependency.java     |   98 -
 .../test/annotations/TestServiceProviding.java     |  204 -
 .../test/annotations/TestTemporalDependencies.java |  197 -
 .../core/test/annotations/TestWhiteBoard.java      |  108 -
 .../ipojo-core-bad-configuration-test/pom.xml      |   35 -
 .../runtime/bad/components/BadConstructors.java    |   40 -
 .../bad/components/CallbackCheckService.java       |   68 -
 .../bad/components/CheckProviderParentClass.java   |   51 -
 .../bad/components/CheckServiceProvider.java       |   83 -
 .../bad/components/LifecycleControllerTest.java    |   49 -
 .../ipojo/runtime/bad/components/ParentClass.java  |   51 -
 .../ipojo/runtime/bad/services/BarService.java     |   29 -
 .../ipojo/runtime/bad/services/CheckService.java   |   31 -
 .../ipojo/runtime/bad/services/FooService.java     |   39 -
 .../src/main/resources/metadata.xml                |   71 -
 .../felix/ipojo/runtime/bad/test/Common.java       |   31 -
 .../ipojo/runtime/bad/test/TestBadFactories.java   |  140 -
 .../ipojo/runtime/bad/test/TestBadLFCCallback.java |  262 -
 .../runtime/bad/test/TestBadLFCController.java     |  106 -
 .../bad/test/TestBadServiceDependencies.java       |  370 --
 .../src/test/resources/exam.properties             |   19 -
 .../ipojo-core-configuration-admin-test/pom.xml    |   34 -
 .../core/components/ConfigurableFooProvider.java   |   72 -
 .../ConfigurableFooProviderWithPropagation.java    |   73 -
 .../ImmediateConfigurableFooProvider.java          |   87 -
 .../ipojo/runtime/core/services/CheckService.java  |   31 -
 .../ipojo/runtime/core/services/FooService.java    |   39 -
 .../src/main/resources/metadata.xml                |   40 -
 .../apache/felix/ipojo/runtime/core/Common.java    |   59 -
 .../TestManagedServiceFactoryTestForImmediate.java |  346 --
 .../TestManagedServiceFactoryTestForServices.java  |  356 --
 .../core/TestManagedServiceTestForImmediate.java   |  368 --
 .../core/TestManagedServiceTestForService.java     |  362 --
 .../felix/ipojo/runtime/core/TestPropagation.java  |   91 -
 .../felix/ipojo/runtime/core/TestUpdated.java      |  121 -
 .../pom.xml                                        |   35 -
 .../felix/ipojo/runtime/core/components/Bean.java  |   46 -
 .../core/components/ConfigureAnotherInstance.java  |   43 -
 .../runtime/core/components/ConfigureNothing.java  |   32 -
 .../core/components/ConfigureOneInstance.java      |   43 -
 .../ConfigureThreeInstancesUsingMethods.java       |   66 -
 .../core/components/ConfigureTwoInstances.java     |   53 -
 .../ConfigureTwoInstancesWithInheritance.java      |   43 -
 .../ConfigureTwoInstancesWithOverridding.java      |   52 -
 .../core/components/MyComplexComponent.java        |  106 -
 .../ipojo/runtime/core/components/MyComponent.java |   89 -
 .../core/components/ParentConfiguration.java       |   54 -
 .../core/components/SimpleConfiguration.java       |   38 -
 .../configuration/MyComplexConfiguration.java      |   77 -
 .../components/configuration/MyConfiguration.java  |   45 -
 .../ipojo/runtime/core/services/FooService.java    |   39 -
 .../apache/felix/ipojo/runtime/core/Common.java    |   45 -
 .../runtime/core/TestComplexConfigurations.java    |  145 -
 .../core/TestConfigurationInAnotherBundle.java     |  112 -
 .../core/TestConfigurationOfMyComponent.java       |   87 -
 ...tConfigurationOfThreeInstancesUsingMethods.java |   99 -
 .../core/TestConfigurationOfTwoInstances.java      |   97 -
 .../TestConfigurationWithInheritedInstance.java    |   99 -
 .../TestConfigurationWithOverriddenInstance.java   |   99 -
 .../ipojo/runtime/core/TestEmptyConfiguration.java |   77 -
 .../runtime/core/TestSeveralConfigurations.java    |   99 -
 .../runtime/core/TestSimpleConfiguration.java      |   80 -
 .../core-it/ipojo-core-configuration-test/pom.xml  |   34 -
 .../core/components/CheckProviderParentClass.java  |   51 -
 .../core/components/CheckServiceProvider.java      |   83 -
 .../core/components/ComplexConfiguration.java      |   57 -
 .../ConfigurableCheckServiceProvider.java          |  223 -
 .../runtime/core/components/FooProviderType1.java  |  134 -
 .../runtime/core/components/FooProviderType2.java  |  115 -
 .../core/components/FooProviderTypeDyn.java        |   83 -
 .../ipojo/runtime/core/components/ParentClass.java |   51 -
 .../ParentConfigurableCheckServiceProvider.java    |  194 -
 .../runtime/core/components/PropertyModifier.java  |   60 -
 .../components/arch/MyComponentToIntrospect.java   |   95 -
 ...erviceProviderWithBundleContextAndProperty.java |   54 -
 ...eckServiceProviderWithDefaultValueProperty.java |   51 -
 .../CheckServiceProviderWithNamedProperty.java     |   51 -
 .../CheckServiceProviderWithTwoProperties.java     |   54 -
 .../CheckServiceProviderWithUnnamedProperty.java   |   51 -
 .../ipojo/runtime/core/services/CheckService.java  |   31 -
 .../ipojo/runtime/core/services/FooService.java    |   39 -
 .../src/main/resources/metadata.xml                |  267 -
 .../src/main/resources/updated.xml                 |  103 -
 .../apache/felix/ipojo/runtime/core/Common.java    |   61 -
 .../felix/ipojo/runtime/core/TestArchitecture.java |  236 -
 .../ipojo/runtime/core/TestBothProperties.java     |  870 ---
 .../ipojo/runtime/core/TestComplexProperties.java  |  234 -
 .../core/TestConstructorInjectionOfProperties.java |  120 -
 ...allyConfigurablePropertiesUsingConfigAdmin.java |  399 --
 .../ipojo/runtime/core/TestFieldProperties.java    |  768 ---
 .../felix/ipojo/runtime/core/TestListeners.java    |  205 -
 .../TestManagedServiceConfigurableProperties.java  |  618 ---
 .../ipojo/runtime/core/TestMethodProperties.java   | 1647 ------
 .../ipojo/runtime/core/TestPropertyModifier.java   |  108 -
 .../ipojo/runtime/core/TestSimpleProperties.java   |  261 -
 .../runtime/core/TestSuperMethodProperties.java    |  631 ---
 .../ipojo/runtime/core/TestUpdatedMethod.java      |  218 -
 .../core/TestUpdatedMethodAndConfigAdmin.java      |  330 --
 .../core/TestUpdatedMethodAndManagedService.java   |  405 --
 .../core/TestUpdatedNoArgMethodAndConfigAdmin.java |  319 --
 .../TestUpdatedNoArgMethodAndManagedService.java   |  325 --
 .../ipojo-core-context-injection-test/pom.xml      |   35 -
 .../core/components/ComponentUsingConstructor.java |   52 -
 .../core/components/ComponentUsingField.java       |   49 -
 .../core/components/ComponentUsingMethod.java      |   51 -
 ...mponentBundleContextInjectionInConstructor.java |   60 -
 .../ComponentBundleContextInjectionInField.java    |   54 -
 .../ComponentBundleContextInjectionInMethod.java   |   57 -
 .../ComponentWithThreeConstructorParams.java       |   69 -
 .../ComponentWithTwoConstructorParams.java         |   63 -
 .../annotations/ComponentWithTwoFields.java        |   60 -
 .../annotations/ComponentWithTwoSetters.java       |   66 -
 ...nstanceBundleContextInjectionInConstructor.java |   57 -
 .../InstanceBundleContextInjectionInField.java     |   54 -
 .../InstanceBundleContextInjectionInMethod.java    |   57 -
 .../components/configuration/MyConfiguration.java  |   31 -
 .../core/components/mix/MixWithProperties1.java    |   64 -
 .../core/components/mix/MixWithProperties2.java    |   64 -
 .../ipojo/runtime/core/services/CheckService.java  |   29 -
 .../src/main/resources/metadata.xml                |   65 -
 .../apache/felix/ipojo/runtime/core/Common.java    |   30 -
 .../core/TestContextInjectionFromAnnotations.java  |  129 -
 .../runtime/core/TestContextInjectionFromXML.java  |  113 -
 .../TestInjectingComponentAndInstanceContext.java  |  128 -
 .../core/TestInjectingContextAndProperties.java    |   76 -
 .../src/test/resources/exam.properties             |   19 -
 .../core-it/ipojo-core-declaration-test/pom.xml    |   47 -
 .../core/test/components/EnglishHelloService.java  |   43 -
 .../core/test/components/EnglishHelloService2.java |   43 -
 .../core/test/components/FrenchHelloService.java   |   43 -
 .../core/test/components/GermanHelloService.java   |   40 -
 .../runtime/core/test/services/HelloService.java   |   29 -
 .../runtime/core/test/declaration/Common.java      |   45 -
 .../declaration/TestDeclarationBuilderService.java |  209 -
 .../ipojo-core-external-handlers-test/pom.xml      |   33 -
 .../CheckServiceAndFieldInterceptorHandler.java    |  131 -
 .../components/CheckServiceHandler.java            |  106 -
 .../components/FooProviderType1.java               |   74 -
 .../externalhandlers/services/CheckService.java    |   32 -
 .../services/CheckServiceHandlerDescription.java   |   38 -
 .../externalhandlers/services/FooService.java      |   42 -
 .../src/main/resources/metadata.xml                |   77 -
 .../externalhandlers/test/AutoHandlerTest.java     |  109 -
 .../runtime/externalhandlers/test/Common.java      |   29 -
 .../runtime/externalhandlers/test/HandlerTest.java |  213 -
 .../test/HandlerWithFieldInterceptorTest.java      |   84 -
 .../core-it/ipojo-core-factory-test/pom.xml        |   35 -
 .../core/components/CheckProviderParentClass.java  |   51 -
 .../core/components/CheckServiceProvider.java      |   83 -
 .../runtime/core/components/FiveInstances.java     |   27 -
 .../core/components/FooBarProviderType1.java       |   54 -
 .../runtime/core/components/FooProviderType1.java  |  117 -
 .../core/components/FooProviderTypeDyn.java        |   64 -
 .../core/components/FooProviderTypeDyn2.java       |   58 -
 .../ipojo/runtime/core/components/NoInstances.java |   27 -
 .../core/components/OneDuplicateInstance.java      |   27 -
 .../core/components/ReconfigurableSimpleType.java  |   63 -
 .../ipojo/runtime/core/components/SimpleType.java  |   26 -
 .../ipojo/runtime/core/services/BarService.java    |   29 -
 .../ipojo/runtime/core/services/CheckService.java  |   31 -
 .../ipojo/runtime/core/services/FooService.java    |   39 -
 .../ipojo/runtime/core/services/NoService.java     |   23 -
 .../src/main/resources/metadata.xml                |  174 -
 .../apache/felix/ipojo/runtime/core/Common.java    |   70 -
 .../ipojo/runtime/core/TestComponentDesc.java      |  345 --
 .../felix/ipojo/runtime/core/TestConfigAdmin.java  |  174 -
 .../ipojo/runtime/core/TestFactoryProperties.java  |   86 -
 .../felix/ipojo/runtime/core/TestInstances.java    |  176 -
 .../felix/ipojo/runtime/core/TestObedience.java    |  117 -
 .../ipojo/runtime/core/TestReconfiguration.java    |  287 -
 .../core/TestUnacceptableConfiguration.java        |  836 ---
 .../src/test/resources/exam.properties             |   19 -
 .../ipojo-core-factory-version-test/pom.xml        |   33 -
 .../ipojo/core/tests/components/MyComponent.java   |   30 -
 .../felix/ipojo/core/tests/components/MyCons.java  |   32 -
 .../felix/ipojo/core/tests/services/MyService.java |   26 -
 .../src/main/resources/cons.xml                    |   27 -
 .../src/main/resources/instances.xml               |   41 -
 .../src/main/resources/provider-v1.1.xml           |   26 -
 .../src/main/resources/provider-v1.xml             |   31 -
 .../src/main/resources/vprovider-v1.xml            |   27 -
 .../src/main/resources/vprovider-v2.xml            |   28 -
 .../org/apache/felix/ipojo/tests/core/Common.java  |   91 -
 .../felix/ipojo/tests/core/FactoryVersionTest.java |  176 -
 .../ipojo/tests/core/VersionConflictTest.java      |  279 -
 .../core-it/ipojo-core-handler-test/pom.xml        |   35 -
 .../ipojo/runtime/core/components/DummyImpl.java   |   35 -
 .../ipojo/runtime/core/components/MyComponent.java |   30 -
 .../ipojo/runtime/core/handlers/DummyHandler.java  |   74 -
 .../ipojo/runtime/core/handlers/EmptyHandler.java  |   46 -
 .../felix/ipojo/runtime/core/services/Dummy.java   |   24 -
 .../ipojo/runtime/core/services/MyService.java     |   26 -
 .../felix/ipojo/runtime/core/services/User.java    |   30 -
 .../src/main/resources/dummy-component.xml         |   28 -
 .../src/main/resources/dummy-handler.xml           |   36 -
 .../src/main/resources/ignorecase.xml              |   39 -
 .../apache/felix/ipojo/runtime/core/Common.java    |   39 -
 .../felix/ipojo/runtime/core/DummyHandlerTest.java |  218 -
 .../core/IgnoreCaseHandlerSelectionTest.java       |  159 -
 .../org/apache/felix/ipojo/runtime/core/Tools.java |   51 -
 .../ipojo-core-lifecycle-callback-test/pom.xml     |   35 -
 .../components/CallbackWithErrorCheckService.java  |   44 -
 .../runtime/core/components/FooProviderType1.java  |  109 -
 .../core/components/FooProviderTypeDyn2.java       |   58 -
 .../core/components/LifecycleControllerTest.java   |   49 -
 .../ipojo/runtime/core/components/ParentClass.java |   51 -
 .../core/services/CallbackCheckService.java        |   67 -
 .../ipojo/runtime/core/services/CheckService.java  |   31 -
 .../ipojo/runtime/core/services/FooService.java    |   39 -
 .../src/main/resources/metadata.xml                |  108 -
 .../apache/felix/ipojo/runtime/core/Common.java    |   30 -
 .../felix/ipojo/runtime/core/TestCallback.java     |  118 -
 .../ipojo/runtime/core/TestErrorCallback.java      |   60 -
 .../ipojo/runtime/core/TestImmediateCallback.java  |  117 -
 .../TestImmediateCallbackSeveralFactories.java     |  124 -
 .../TestImmediateCallbackSingletonFactory.java     |  120 -
 .../core/TestImmediateLifeCycleController.java     |  114 -
 .../ipojo/runtime/core/TestParentCallback.java     |  108 -
 .../src/test/resources/exam.properties             |   19 -
 .../ipojo-core-lifecycle-controller-test/pom.xml   |   35 -
 .../ConfigurableLifecycleControllerTest.java       |   42 -
 .../core/components/LifecycleControllerTest.java   |   49 -
 .../ipojo/runtime/core/services/CheckService.java  |   31 -
 .../src/main/resources/metadata.xml                |   54 -
 .../apache/felix/ipojo/runtime/core/Common.java    |   31 -
 .../core/TestConfigurableLifeCycleController.java  |  151 -
 .../core/TestImmediateLifeCycleController.java     |  118 -
 .../runtime/core/TestLifeCycleController.java      |  137 -
 .../src/test/resources/exam.properties             |   19 -
 .../runtime/core-it/ipojo-core-logger-test/pom.xml |   65 -
 .../ipojo/runtime/core/components/MyComponent.java |   30 -
 .../core/components/MyErroneousComponent.java      |   34 -
 .../ipojo/runtime/core/services/MyService.java     |   26 -
 .../src/main/resources/component.xml               |   25 -
 .../src/main/resources/erroneous-component.xml     |   24 -
 .../apache/felix/ipojo/runtime/core/Common.java    |   34 -
 .../runtime/core/TestBNDManifestLoggerInfo.java    |  111 -
 .../felix/ipojo/runtime/core/TestErrorHandler.java |  147 -
 .../ipojo/runtime/core/TestManifestLoggerInfo.java |  127 -
 .../ipojo/runtime/core/TestSystemLoggerInfo.java   |  102 -
 .../runtime/core/TestSystemLoggerWarning.java      |  102 -
 .../pom.xml                                        |   35 -
 .../core/test/components/AdvancedFooConsumer.java  |   82 -
 .../runtime/core/test/components/FooConsumer.java  |   68 -
 .../runtime/core/test/components/FooProvider.java  |   56 -
 .../AddLocationTrackingInterceptor.java            |   50 -
 .../AdvancedTrackerAndRankerInterceptor.java       |  126 -
 .../interceptors/EnhancingBindingInterceptor.java  |   77 -
 .../interceptors/FilterRankingInterceptor.java     |   75 -
 .../core/test/interceptors/GradeComparator.java    |   37 -
 .../interceptors/HidingTrackingInterceptor.java    |   60 -
 .../interceptors/PropertyTrackingInterceptor.java  |   56 -
 .../test/interceptors/ProxyBindingInterceptor.java |  100 -
 .../interceptors/TrackerAndRankerInterceptor.java  |  146 -
 .../runtime/core/test/services/CheckService.java   |   32 -
 .../ipojo/runtime/core/test/services/Enhanced.java |   27 -
 .../runtime/core/test/services/FooService.java     |   32 -
 .../ipojo/runtime/core/test/services/Setter.java   |   28 -
 .../runtime/core/test/dependencies/Common.java     |   40 -
 .../test/dependencies/TestBindingInterceptors.java |  203 -
 .../TestCombinationOfInterceptors.java             |  129 -
 .../core/test/dependencies/TestHidingServices.java |  133 -
 .../TestInterceptorsOnSeveralDependencies.java     |   94 -
 .../test/dependencies/TestRankingServices.java     |  221 -
 .../dependencies/TestTransformingServices.java     |  177 -
 .../pom.xml                                        |   35 -
 .../test/components/CheckProviderParentClass.java  |   65 -
 .../core/test/components/CheckServiceProvider.java |  145 -
 .../test/components/CollectionCheckService.java    |  183 -
 .../test/components/DynCheckServiceProvider.java   |   97 -
 .../core/test/components/FooProviderType1.java     |  109 -
 .../core/test/components/FooProviderType2.java     |   68 -
 .../test/components/FooServiceDefaultImpl.java     |   55 -
 .../core/test/components/ListCheckService.java     |  184 -
 .../components/MethodCheckServiceProvider.java     |  134 -
 .../components/MethodMultipleCheckService.java     |  178 -
 .../core/test/components/MultipleCheckService.java |  183 -
 .../components/MultipleFilterCheckSubscriber.java  |   56 -
 .../runtime/core/test/components/ParentClass.java  |   51 -
 .../test/components/RankedFooProviderType1.java    |   52 -
 .../core/test/components/SetCheckService.java      |  164 -
 .../core/test/components/VectorCheckService.java   |  159 -
 .../comparator/CheckServiceProvider.java           |   64 -
 .../components/comparator/GradeComparator.java     |   50 -
 .../comparator/GradedFooServiceProvider.java       |   59 -
 .../ExceptionAwareCheckServiceProvider.java        |   73 -
 .../components/exceptions/NoServiceException.java  |   31 -
 .../components/filter/FilterCheckProvider.java     |   90 -
 .../components/filter/FilterCheckSubscriber.java   |   56 -
 .../filter/MultipleFilterCheckSubscriber.java      |   57 -
 .../runtime/core/test/components/inner/C1.java     |   30 -
 .../runtime/core/test/components/inner/C2.java     |   32 -
 .../runtime/core/test/components/inner/C3.java     |   38 -
 .../core/test/components/inner/MyFilter.java       |   26 -
 .../core/test/components/optional/MyComponent.java |   42 -
 .../policies/CheckProviderParentClass.java         |   51 -
 .../components/policies/CheckServiceProvider.java  |   91 -
 .../policies/DynCheckServiceProvider.java          |   87 -
 .../policies/MethodCheckServiceProvider.java       |  123 -
 .../policies/MethodMultipleCheckService.java       |  165 -
 .../components/policies/MultipleCheckService.java  |  158 -
 .../policies/RankedFooProviderType1.java           |   61 -
 .../components/proxy/CheckServiceDelegator.java    |   50 -
 .../proxy/CheckServiceGetAndDelegate.java          |   48 -
 .../components/proxy/CheckServiceNoDelegate.java   |   61 -
 .../proxy/CheckServiceUsingStringService.java      |   47 -
 .../runtime/core/test/components/proxy/Helper.java |   69 -
 .../ipojo/runtime/core/test/services/Call.java     |   27 -
 .../runtime/core/test/services/CheckService.java   |   31 -
 .../runtime/core/test/services/FooService.java     |   39 -
 .../src/main/resources/metadata-comparator.xml     |   55 -
 .../src/main/resources/metadata-filter.xml         |  141 -
 .../src/main/resources/metadata-policies.xml       |  283 -
 .../src/main/resources/metadata.xml                | 1083 ----
 .../runtime/core/test/dependencies/Common.java     |   59 -
 .../di/TestDelayedOptionalDependencies.java        |  365 --
 .../di/TestMethodDelayedOptionalDependencies.java  |  235 -
 .../di/TestMethodOptionalDependencies.java         |  275 -
 .../dependencies/di/TestOptionalDependencies.java  |  399 --
 .../exceptions/TestDependenciesWithExceptions.java |   95 -
 .../optional/TestDelayedOptionalDependencies.java  |  498 --
 .../TestDelayedOptionalMultipleDependencies.java   |  368 --
 .../TestMethodDelayedOptionalDependencies.java     |  369 --
 ...tMethodDelayedOptionalMultipleDependencies.java |  215 -
 .../optional/TestMethodOptionalDependencies.java   |  436 --
 .../TestMethodOptionalMultipleDependencies.java    |  288 -
 .../TestNullableTransitiveClassloading.java        |   41 -
 .../optional/TestOptionalDependencies.java         |  551 --
 .../optional/TestOptionalMultipleDependencies.java |  485 --
 .../TestOptionalNoNullableDependencies.java        |  550 --
 .../TestProxiedDelayedOptionalDependencies.java    |  498 --
 ...ProxiedDelayedOptionalMultipleDependencies.java |  364 --
 .../optional/TestProxiedOptionalDependencies.java  |  554 --
 .../ipojo-core-service-dependency-policies/pom.xml |   35 -
 .../test/components/CheckProviderParentClass.java  |   65 -
 .../core/test/components/CheckServiceProvider.java |  145 -
 .../test/components/CollectionCheckService.java    |  183 -
 .../test/components/DynCheckServiceProvider.java   |   97 -
 .../core/test/components/FooProviderType1.java     |  109 -
 .../core/test/components/FooProviderType2.java     |   68 -
 .../test/components/FooServiceDefaultImpl.java     |   55 -
 .../core/test/components/ListCheckService.java     |  184 -
 .../components/MethodCheckServiceProvider.java     |  134 -
 .../components/MethodMultipleCheckService.java     |  178 -
 .../core/test/components/MultipleCheckService.java |  183 -
 .../components/MultipleFilterCheckSubscriber.java  |   56 -
 .../runtime/core/test/components/ParentClass.java  |   51 -
 .../test/components/RankedFooProviderType1.java    |   52 -
 .../core/test/components/SetCheckService.java      |  164 -
 .../core/test/components/VectorCheckService.java   |  159 -
 .../comparator/CheckServiceProvider.java           |   64 -
 .../components/comparator/GradeComparator.java     |   50 -
 .../comparator/GradedFooServiceProvider.java       |   59 -
 .../components/filter/FilterCheckProvider.java     |   90 -
 .../components/filter/FilterCheckSubscriber.java   |   56 -
 .../filter/MultipleFilterCheckSubscriber.java      |   57 -
 .../runtime/core/test/components/inner/C1.java     |   30 -
 .../runtime/core/test/components/inner/C2.java     |   32 -
 .../runtime/core/test/components/inner/C3.java     |   38 -
 .../core/test/components/inner/MyFilter.java       |   26 -
 .../core/test/components/optional/MyComponent.java |   42 -
 .../policies/CheckProviderParentClass.java         |   51 -
 .../components/policies/CheckServiceProvider.java  |   91 -
 .../policies/DynCheckServiceProvider.java          |   87 -
 .../policies/MethodCheckServiceProvider.java       |  123 -
 .../policies/MethodMultipleCheckService.java       |  165 -
 .../components/policies/MultipleCheckService.java  |  158 -
 .../policies/RankedFooProviderType1.java           |   61 -
 .../components/proxy/CheckServiceDelegator.java    |   50 -
 .../proxy/CheckServiceGetAndDelegate.java          |   48 -
 .../components/proxy/CheckServiceNoDelegate.java   |   61 -
 .../proxy/CheckServiceUsingStringService.java      |   47 -
 .../runtime/core/test/components/proxy/Helper.java |   69 -
 .../ipojo/runtime/core/test/services/Call.java     |   27 -
 .../runtime/core/test/services/CheckService.java   |   31 -
 .../runtime/core/test/services/FooService.java     |   39 -
 .../src/main/resources/metadata-comparator.xml     |   55 -
 .../src/main/resources/metadata-filter.xml         |  141 -
 .../src/main/resources/metadata-policies.xml       |  283 -
 .../src/main/resources/metadata.xml                | 1083 ----
 .../runtime/core/test/dependencies/Common.java     |   60 -
 .../dependencies/comparator/TestComparator.java    |  159 -
 .../dependencies/policies/TestDynamicPriority.java |  165 -
 .../TestStaticMethodOptionalDependencies.java      |  275 -
 .../TestStaticMethodSimpleDependencies.java        |  198 -
 .../policies/TestStaticMultipleDependencies.java   |  325 --
 .../policies/TestStaticOptionalDependencies.java   |  521 --
 .../policies/TestStaticSimpleDependencies.java     |  351 --
 .../ipojo-core-service-dependency-proxies/pom.xml  |   35 -
 .../test/components/CheckProviderParentClass.java  |   65 -
 .../core/test/components/CheckServiceProvider.java |  145 -
 .../test/components/CollectionCheckService.java    |  183 -
 .../test/components/DynCheckServiceProvider.java   |   97 -
 .../core/test/components/FooProviderType1.java     |  109 -
 .../core/test/components/FooProviderType2.java     |   68 -
 .../test/components/FooServiceDefaultImpl.java     |   55 -
 .../core/test/components/ListCheckService.java     |  184 -
 .../components/MethodCheckServiceProvider.java     |  134 -
 .../components/MethodMultipleCheckService.java     |  178 -
 .../core/test/components/MultipleCheckService.java |  183 -
 .../components/MultipleFilterCheckSubscriber.java  |   56 -
 .../runtime/core/test/components/ParentClass.java  |   51 -
 .../test/components/RankedFooProviderType1.java    |   52 -
 .../core/test/components/SetCheckService.java      |  164 -
 .../core/test/components/VectorCheckService.java   |  159 -
 .../comparator/CheckServiceProvider.java           |   64 -
 .../components/comparator/GradeComparator.java     |   50 -
 .../comparator/GradedFooServiceProvider.java       |   59 -
 .../components/filter/FilterCheckProvider.java     |   90 -
 .../components/filter/FilterCheckSubscriber.java   |   56 -
 .../filter/MultipleFilterCheckSubscriber.java      |   57 -
 .../runtime/core/test/components/inner/C1.java     |   30 -
 .../runtime/core/test/components/inner/C2.java     |   32 -
 .../runtime/core/test/components/inner/C3.java     |   38 -
 .../core/test/components/inner/MyFilter.java       |   26 -
 .../core/test/components/optional/MyComponent.java |   42 -
 .../policies/CheckProviderParentClass.java         |   51 -
 .../components/policies/CheckServiceProvider.java  |   91 -
 .../policies/DynCheckServiceProvider.java          |   87 -
 .../policies/MethodCheckServiceProvider.java       |  123 -
 .../policies/MethodMultipleCheckService.java       |  165 -
 .../components/policies/MultipleCheckService.java  |  158 -
 .../policies/RankedFooProviderType1.java           |   61 -
 .../components/proxy/CheckServiceDelegator.java    |   50 -
 .../proxy/CheckServiceGetAndDelegate.java          |   48 -
 .../components/proxy/CheckServiceNoDelegate.java   |   61 -
 .../proxy/CheckServiceUsingStringService.java      |   47 -
 .../runtime/core/test/components/proxy/Helper.java |   68 -
 .../ipojo/runtime/core/test/services/Call.java     |   27 -
 .../runtime/core/test/services/CheckService.java   |   31 -
 .../runtime/core/test/services/FooService.java     |   39 -
 .../src/main/resources/metadata-comparator.xml     |   55 -
 .../src/main/resources/metadata-filter.xml         |  141 -
 .../src/main/resources/metadata-policies.xml       |  283 -
 .../src/main/resources/metadata.xml                | 1083 ----
 .../runtime/core/test/dependencies/Common.java     |   59 -
 .../TestProxiedCollectionMultipleDependencies.java |  256 -
 .../TestProxiedDelayedMultipleDependencies.java    |  525 --
 .../TestProxiedDelayedSimpleDependencies.java      |  374 --
 .../TestProxiedListMultipleDependencies.java       |  256 -
 .../TestProxiedSetMultipleDependencies.java        |  256 -
 .../proxies/TestProxiedSimpleDependencies.java     |  418 --
 .../test/dependencies/proxies/TestProxyTest.java   |  270 -
 .../ipojo-core-service-dependency-test/pom.xml     |   35 -
 .../test/components/CheckProviderParentClass.java  |   65 -
 .../core/test/components/CheckServiceProvider.java |  145 -
 .../test/components/CollectionCheckService.java    |  183 -
 .../test/components/DynCheckServiceProvider.java   |   97 -
 .../core/test/components/FooProviderType1.java     |  109 -
 .../core/test/components/FooProviderType2.java     |   68 -
 .../test/components/FooServiceDefaultImpl.java     |   55 -
 .../core/test/components/ListCheckService.java     |  184 -
 .../components/MethodCheckServiceProvider.java     |  134 -
 .../components/MethodMultipleCheckService.java     |  178 -
 .../core/test/components/MultipleCheckService.java |  183 -
 .../components/MultipleFilterCheckSubscriber.java  |   56 -
 .../runtime/core/test/components/ParentClass.java  |   51 -
 .../test/components/RankedFooProviderType1.java    |   52 -
 .../core/test/components/SetCheckService.java      |  164 -
 .../core/test/components/VectorCheckService.java   |  159 -
 .../comparator/CheckServiceProvider.java           |   64 -
 .../components/comparator/GradeComparator.java     |   50 -
 .../comparator/GradedFooServiceProvider.java       |   59 -
 .../context/ContextualFilterConsumer.java          |   53 -
 .../core/test/components/context/Provider1.java    |   75 -
 .../core/test/components/context/Provider2.java    |   75 -
 .../error/NullPointerExceptionBinder.java          |   37 -
 .../components/filter/FilterCheckProvider.java     |   90 -
 .../components/filter/FilterCheckSubscriber.java   |   56 -
 .../filter/MultipleFilterCheckSubscriber.java      |   57 -
 .../identification/ComponentWithCustomMethods.java |   64 -
 .../runtime/core/test/components/inner/C1.java     |   30 -
 .../runtime/core/test/components/inner/C2.java     |   32 -
 .../runtime/core/test/components/inner/C3.java     |   38 -
 .../core/test/components/inner/MyFilter.java       |   26 -
 .../test/components/leak/DefaultHelloService.java  |   39 -
 .../components/leak/DefaultLeakingService.java     |   63 -
 .../core/test/components/optional/MyComponent.java |   42 -
 .../policies/CheckProviderParentClass.java         |   51 -
 .../components/policies/CheckServiceProvider.java  |   91 -
 .../policies/DynCheckServiceProvider.java          |   87 -
 .../policies/MethodCheckServiceProvider.java       |  123 -
 .../policies/MethodMultipleCheckService.java       |  165 -
 .../components/policies/MultipleCheckService.java  |  158 -
 .../policies/RankedFooProviderType1.java           |   61 -
 .../components/proxy/CheckServiceDelegator.java    |   50 -
 .../proxy/CheckServiceGetAndDelegate.java          |   48 -
 .../components/proxy/CheckServiceNoDelegate.java   |   61 -
 .../proxy/CheckServiceUsingStringService.java      |   47 -
 .../runtime/core/test/components/proxy/Helper.java |   69 -
 .../ipojo/runtime/core/test/services/Call.java     |   27 -
 .../runtime/core/test/services/CheckService.java   |   31 -
 .../runtime/core/test/services/FooService.java     |   39 -
 .../runtime/core/test/services/HelloService.java   |   28 -
 .../runtime/core/test/services/LeakingService.java |   29 -
 .../ipojo/runtime/core/test/services/Listener.java |   28 -
 .../src/main/resources/metadata-comparator.xml     |   55 -
 .../src/main/resources/metadata-filter.xml         |  141 -
 .../src/main/resources/metadata.xml                |  519 --
 .../runtime/core/test/dependencies/Common.java     |   52 -
 .../TestCollectionMultipleDependencies.java        |  245 -
 .../TestDelayedMultipleDependencies.java           |  507 --
 .../TestDelayedSimpleDependencies.java             |  373 --
 .../dependencies/TestDependencyArchitecture.java   |  702 ---
 .../dependencies/TestListMultipleDependencies.java |  255 -
 .../TestMethodDelayedMultipleDependencies.java     |  397 --
 .../TestMethodDelayedSimpleDependencies.java       |  286 -
 .../TestMethodMultipleDependencies.java            |  512 --
 .../dependencies/TestMethodSimpleDependencies.java |  286 -
 .../test/dependencies/TestModifyDependencies.java  |  411 --
 .../dependencies/TestMultipleDependencies.java     |  389 --
 .../TestNonProxiedNotInterfaceDependencies.java    |   66 -
 .../dependencies/TestSetMultipleDependencies.java  |  255 -
 .../test/dependencies/TestSimpleDependencies.java  |  422 --
 .../TestVectorMultipleDependencies.java            |  255 -
 .../context/TestContextualFilters.java             |  200 -
 .../TestContextualFiltersAndExternalSources.java   |  208 -
 .../dependencies/error/TestNPEInBindMethod.java    |   46 -
 .../dependencies/filter/TestFromDependencies.java  |  320 --
 .../filter/TestMultipleFilterDependencies.java     |  595 --
 .../TestOptionalMultipleFilterDependencies.java    |  621 ---
 .../TestOptionalSimpleFilterDependencies.java      |  591 --
 .../filter/TestSimpleFilterDependencies.java       |  526 --
 .../identification/TestDependencyIdDetection.java  |  108 -
 .../test/dependencies/inner/TestInnerProxyMix.java |   85 -
 .../dependencies/leak/ListenerStyleLeakTest.java   |  106 -
 .../pom.xml                                        |   33 -
 .../timeout/components/CheckServiceProvider.java   |   44 -
 .../components/CollectionCheckServiceProvider.java |   56 -
 .../timeout/components/FooProvider.java            |   56 -
 .../components/MultipleCheckServiceProvider.java   |   48 -
 .../timeout/components/NullableFooProvider.java    |   56 -
 .../timeout/services/CheckService.java             |   30 -
 .../dependencies/timeout/services/FooService.java  |   40 -
 .../src/main/resources/metadata.xml                |  142 -
 .../runtime/test/dependencies/timeout/Common.java  |   31 -
 .../timeout/DefaultImplementationTest.java         |  111 -
 .../test/dependencies/timeout/DelayTest.java       |  228 -
 .../test/dependencies/timeout/DelayedProvider.java |   74 -
 .../test/dependencies/timeout/EmptyTest.java       |  232 -
 .../test/dependencies/timeout/NullTest.java        |   71 -
 .../test/dependencies/timeout/NullableTest.java    |  110 -
 .../test/dependencies/timeout/TimeoutTest.java     |  128 -
 .../ipojo-core-service-providing-test/pom.xml      |   35 -
 .../core/components/CheckProviderParentClass.java  |   51 -
 .../core/components/CheckServiceProvider.java      |   83 -
 .../core/components/FooBarProviderType1.java       |   54 -
 .../runtime/core/components/FooProviderType1.java  |  117 -
 .../core/components/FooProviderTypeDyn.java        |   64 -
 .../core/components/FooProviderTypeDyn2.java       |   58 -
 .../components/FooProviderWithAnonymousClass.java  |  114 -
 .../core/components/NullCheckServiceProvider.java  |   76 -
 .../ipojo/runtime/core/components/SimpleClass.java |   30 -
 .../callbacks/CallbacksCheckService.java           |  111 -
 .../controller/ControllerCheckService.java         |   75 -
 .../controller/DoubleControllerCheckService.java   |   85 -
 .../runtime/core/components/inheritance/a/IA.java  |   26 -
 .../runtime/core/components/inheritance/b/IB.java  |   27 -
 .../runtime/core/components/inheritance/c/C.java   |   38 -
 .../runtime/core/components/inheritance/d/D.java   |   59 -
 .../inherited/ProcessImplementation1.java          |   45 -
 .../inherited/ProcessImplementation2.java          |   44 -
 .../inherited/ProcessImplementation3.java          |   82 -
 .../inherited/ProcessImplementation4.java          |   82 -
 .../inherited/ProcessParentImplementation.java     |   46 -
 .../core/components/strategies/BarConsumer.java    |   42 -
 .../core/components/strategies/Consumer.java       |   42 -
 .../strategies/DummyCreationStrategy.java          |  191 -
 .../strategies/DummyCreationStrategy2.java         |   34 -
 .../components/strategies/DummyServiceFactory.java |   80 -
 .../components/strategies/FooBarProviderType1.java |   86 -
 .../components/strategies/FooProviderType1.java    |   86 -
 .../ipojo/runtime/core/services/BarService.java    |   29 -
 .../ipojo/runtime/core/services/CheckService.java  |   31 -
 .../runtime/core/services/ChildInterface.java      |   25 -
 .../ipojo/runtime/core/services/FooService.java    |   39 -
 .../runtime/core/services/ParentInterface1.java    |   25 -
 .../runtime/core/services/ParentInterface2.java    |   25 -
 .../core/services/ParentParentInterface.java       |   25 -
 .../src/main/resources/basics.xml                  |  140 -
 .../src/main/resources/callbacks/callbacks.xml     |   60 -
 .../src/main/resources/concrete-abstract.xml       |   52 -
 .../resources/controller/service-controller.xml    |  105 -
 .../src/main/resources/inheritance/cons.xml        |   22 -
 .../src/main/resources/inheritance/inheritance.xml |   64 -
 .../src/main/resources/inheritance/provider.xml    |   22 -
 .../resources/strategies/metadata-strategies.xml   |   77 -
 .../apache/felix/ipojo/runtime/core/Common.java    |   60 -
 .../felix/ipojo/runtime/core/TestCallbacks.java    |  174 -
 .../apache/felix/ipojo/runtime/core/TestClass.java |   93 -
 .../felix/ipojo/runtime/core/TestDynamicProps.java |  294 -
 .../core/TestDynamicPropsReconfiguration.java      |  758 ---
 .../felix/ipojo/runtime/core/TestExposition.java   |  159 -
 .../ipojo/runtime/core/TestInheritedClasses.java   |  204 -
 .../felix/ipojo/runtime/core/TestListeners.java    |  272 -
 .../felix/ipojo/runtime/core/TestNullCheck.java    |   77 -
 .../ipojo/runtime/core/TestOSGiProperties.java     |   85 -
 .../core/TestPropertiesInAnonymousClass.java       |  166 -
 .../core/TestProvidedServiceArchitecture.java      |  231 -
 .../ipojo/runtime/core/TestServiceController.java  |  260 -
 .../felix/ipojo/runtime/core/TestSimplePS.java     |   81 -
 .../felix/ipojo/runtime/core/TestStaticProps.java  |  115 -
 .../core/TestStaticPropsReconfiguration.java       |  349 --
 .../runtime/core/inheritence/InheritanceTest.java  |  170 -
 .../core/strategies/CustomStrategy2Test.java       |  228 -
 .../core/strategies/CustomStrategyTest.java        |  229 -
 .../core/strategies/PerInstanceStrategyTest.java   |  227 -
 ipojo/runtime/core-it/pom.xml                      |  430 --
 .../src/main/appended-resources/META-INF/NOTICE    |    0
 ipojo/runtime/core/changelog.txt                   |  398 --
 ipojo/runtime/core/obr.xml                         |   44 -
 ipojo/runtime/core/pom.xml                         |  375 --
 .../main/appended-resources/META-INF/DEPENDENCIES  |   21 -
 .../src/main/appended-resources/META-INF/LICENSE   |   42 -
 .../src/main/appended-resources/META-INF/NOTICE    |    8 -
 .../org/apache/felix/ipojo/ComponentFactory.java   |  461 --
 .../org/apache/felix/ipojo/ComponentInstance.java  |  128 -
 .../apache/felix/ipojo/ConfigurationException.java |   81 -
 .../apache/felix/ipojo/ConfigurationTracker.java   |  327 --
 .../apache/felix/ipojo/ConstructorInjector.java    |   53 -
 .../org/apache/felix/ipojo/ContextListener.java    |   38 -
 .../java/org/apache/felix/ipojo/ContextSource.java |   58 -
 .../java/org/apache/felix/ipojo/ErrorHandler.java  |   45 -
 .../org/apache/felix/ipojo/EventDispatcher.java    |  181 -
 .../main/java/org/apache/felix/ipojo/Factory.java  |  205 -
 .../org/apache/felix/ipojo/FactoryClassloader.java |   88 -
 .../apache/felix/ipojo/FactoryStateListener.java   |   36 -
 .../org/apache/felix/ipojo/FieldInterceptor.java   |   49 -
 .../main/java/org/apache/felix/ipojo/Handler.java  |  264 -
 .../org/apache/felix/ipojo/HandlerFactory.java     |   65 -
 .../org/apache/felix/ipojo/HandlerManager.java     |  244 -
 .../apache/felix/ipojo/HandlerManagerFactory.java  |  223 -
 .../apache/felix/ipojo/IPOJOServiceFactory.java    |   43 -
 .../java/org/apache/felix/ipojo/IPojoContext.java  |  511 --
 .../java/org/apache/felix/ipojo/IPojoFactory.java  | 1184 ----
 .../org/apache/felix/ipojo/InstanceManager.java    | 1578 ------
 .../apache/felix/ipojo/InstanceStateListener.java  |   43 -
 .../org/apache/felix/ipojo/MethodInterceptor.java  |   80 -
 .../felix/ipojo/MissingHandlerException.java       |   65 -
 .../main/java/org/apache/felix/ipojo/Nullable.java |   33 -
 .../src/main/java/org/apache/felix/ipojo/Pojo.java |   35 -
 .../apache/felix/ipojo/PolicyServiceContext.java   |  498 --
 .../org/apache/felix/ipojo/PrimitiveHandler.java   |  257 -
 .../felix/ipojo/PrimitiveInstanceDescription.java  |  178 -
 .../felix/ipojo/PrimitiveTypeDescription.java      |  228 -
 .../org/apache/felix/ipojo/ServiceContext.java     |  149 -
 .../felix/ipojo/UnacceptableConfiguration.java     |   47 -
 .../felix/ipojo/architecture/Architecture.java     |   40 -
 .../architecture/ComponentTypeDescription.java     |  318 --
 .../ipojo/architecture/CustomHandlerInfo.java      |   37 -
 .../ipojo/architecture/HandlerDescription.java     |   86 -
 .../ipojo/architecture/InstanceDescription.java    |  203 -
 .../ipojo/architecture/PropertyDescription.java    |  215 -
 .../felix/ipojo/configuration/Configuration.java   |   32 -
 .../apache/felix/ipojo/configuration/Instance.java |  189 -
 .../felix/ipojo/context/ServiceReferenceImpl.java  |  156 -
 .../ipojo/context/ServiceRegistrationImpl.java     |  272 -
 .../felix/ipojo/context/ServiceRegistry.java       |  346 --
 .../org/apache/felix/ipojo/context/StringMap.java  |  148 -
 .../ComparatorBasedServiceRankingInterceptor.java  |   65 -
 .../dependency/impl/DependencyProperties.java      |  109 -
 .../impl/EmptyBasedServiceRankingInterceptor.java  |   56 -
 .../FilterBasedServiceTrackingInterceptor.java     |   63 -
 .../dependency/impl/ServiceReferenceManager.java   |  982 ----
 .../dependency/impl/ServiceReferenceUtils.java     |  145 -
 .../impl/TransformedServiceReferenceImpl.java      |  170 -
 .../interceptors/DefaultDependencyInterceptor.java |   59 -
 .../DefaultServiceRankingInterceptor.java          |   71 -
 .../DefaultServiceTrackingInterceptor.java         |   65 -
 .../interceptors/DependencyInterceptor.java        |   56 -
 .../interceptors/ServiceBindingInterceptor.java    |   70 -
 .../interceptors/ServiceRankingInterceptor.java    |   81 -
 .../interceptors/ServiceTrackingInterceptor.java   |   64 -
 .../interceptors/TransformedServiceReference.java  |   88 -
 .../felix/ipojo/extender/ConfigurationBuilder.java |   61 -
 .../apache/felix/ipojo/extender/Declaration.java   |   57 -
 .../ipojo/extender/DeclarationBuilderService.java  |  127 -
 .../felix/ipojo/extender/DeclarationHandle.java    |   50 -
 .../felix/ipojo/extender/ExtensionDeclaration.java |   48 -
 .../felix/ipojo/extender/InstanceBuilder.java      |  105 -
 .../felix/ipojo/extender/InstanceDeclaration.java  |   80 -
 .../org/apache/felix/ipojo/extender/Status.java    |   49 -
 .../felix/ipojo/extender/TypeDeclaration.java      |   63 -
 .../ipojo/extender/builder/FactoryBuilder.java     |   41 -
 .../extender/builder/FactoryBuilderException.java  |   46 -
 .../ipojo/extender/internal/AbstractService.java   |  104 -
 .../ipojo/extender/internal/BundleProcessor.java   |   45 -
 .../felix/ipojo/extender/internal/DefaultJob.java  |   67 -
 .../felix/ipojo/extender/internal/Extender.java    |  340 --
 .../felix/ipojo/extender/internal/Lifecycle.java   |   36 -
 .../extender/internal/LifecycleQueueService.java   |   29 -
 .../internal/builder/ReflectiveFactoryBuilder.java |   75 -
 .../internal/declaration/AbstractDeclaration.java  |  148 -
 .../declaration/DefaultExtensionDeclaration.java   |   64 -
 .../declaration/DefaultInstanceDeclaration.java    |  107 -
 .../declaration/DefaultTypeDeclaration.java        |   96 -
 .../service/DeclarationServiceFactory.java         |   65 -
 .../service/DefaultConfigurationBuilder.java       |   60 -
 .../service/DefaultDeclarationBuilderService.java  |   60 -
 .../service/DefaultInstanceBuilder.java            |  114 -
 .../internal/linker/DeclarationLinker.java         |  109 -
 .../linker/InstanceBundleContextAware.java         |   44 -
 .../extender/internal/linker/ManagedType.java      |  384 --
 .../internal/processor/ChainedBundleProcessor.java |  127 -
 .../processor/ComponentsBundleProcessor.java       |  231 -
 .../processor/ConfigurationAnnotationScanner.java  |   71 -
 .../internal/processor/ConfigurationProcessor.java |  331 --
 .../processor/ExtensionBundleProcessor.java        |  176 -
 .../processor/ForwardingBundleProcessor.java       |   52 -
 .../processor/QueuingActivationProcessor.java      |   83 -
 .../internal/processor/ReverseBundleProcessor.java |   96 -
 .../internal/queue/AbstractQueueService.java       |   86 -
 .../internal/queue/ExecutorQueueService.java       |  250 -
 .../internal/queue/GroupThreadFactory.java         |   67 -
 .../extender/internal/queue/JobInfoCallable.java   |  198 -
 .../internal/queue/NamingThreadFactory.java        |   92 -
 .../internal/queue/PrefixedThreadFactory.java      |   74 -
 .../extender/internal/queue/QueueNotifier.java     |   32 -
 .../ipojo/extender/internal/queue/Statistic.java   |   70 -
 .../internal/queue/SynchronousQueueService.java    |  131 -
 .../queue/debug/ReplayQueueEventProxy.java         |  157 -
 .../queue/pref/HeaderPreferenceSelection.java      |   55 -
 .../extender/internal/queue/pref/Preference.java   |   36 -
 .../queue/pref/PreferenceQueueService.java         |  167 -
 .../internal/queue/pref/PreferenceSelection.java   |   29 -
 .../queue/pref/enforce/EnforcedQueueService.java   |  131 -
 .../queue/pref/enforce/ForwardingQueueService.java |   82 -
 .../felix/ipojo/extender/queue/Callback.java       |   42 -
 .../org/apache/felix/ipojo/extender/queue/Job.java |   36 -
 .../apache/felix/ipojo/extender/queue/JobInfo.java |   74 -
 .../felix/ipojo/extender/queue/QueueListener.java  |   67 -
 .../felix/ipojo/extender/queue/QueueService.java   |  125 -
 .../extender/queue/debug/QueueEventProxy.java      |   42 -
 .../handlers/architecture/ArchitectureHandler.java |  116 -
 .../configuration/ConfigurationHandler.java        |  909 ----
 .../ConfigurationHandlerDescription.java           |  152 -
 .../configuration/ConfigurationListener.java       |   38 -
 .../handlers/context/BundleContextHandler.java     |  192 -
 .../AggregateDependencyInjectionType.java          |   41 -
 .../ipojo/handlers/dependency/Dependency.java      | 1259 -----
 .../handlers/dependency/DependencyCallback.java    |  319 --
 .../dependency/DependencyConfigurationChecker.java |  465 --
 .../handlers/dependency/DependencyDescription.java |  174 -
 .../handlers/dependency/DependencyHandler.java     |  558 --
 .../dependency/DependencyHandlerDescription.java   |  208 -
 .../ipojo/handlers/dependency/NullableObject.java  |   94 -
 .../ipojo/handlers/dependency/ProxyGenerator.java  |  213 -
 .../ipojo/handlers/dependency/ServiceList.java     |  456 --
 .../ipojo/handlers/dependency/ServiceSet.java      |  453 --
 .../ipojo/handlers/dependency/ServiceUsage.java    |  100 -
 .../lifecycle/callback/LifecycleCallback.java      |  101 -
 .../callback/LifecycleCallbackHandler.java         |  178 -
 .../lifecycle/controller/ControllerHandler.java    |  162 -
 .../handlers/providedservice/CreationStrategy.java |   76 -
 .../handlers/providedservice/ProvidedService.java  | 1160 ----
 .../ProvidedServiceDescription.java                |  195 -
 .../providedservice/ProvidedServiceHandler.java    |  682 ---
 .../ProvidedServiceHandlerDescription.java         |  119 -
 .../providedservice/ProvidedServiceListener.java   |   52 -
 .../strategy/ConfigurableCreationStrategy.java     |  142 -
 .../strategy/ErrorPrintingServiceFactoryProxy.java |  109 -
 .../strategy/ServiceObjectFactory.java             |   36 -
 .../apache/felix/ipojo/parser/FieldMetadata.java   |  159 -
 .../felix/ipojo/parser/ManifestMetadataParser.java |  561 --
 .../apache/felix/ipojo/parser/MethodMetadata.java  |  246 -
 .../apache/felix/ipojo/parser/ParseException.java  |   40 -
 .../org/apache/felix/ipojo/parser/ParseUtils.java  |   85 -
 .../apache/felix/ipojo/parser/PojoMetadata.java    |  306 --
 .../java/org/apache/felix/ipojo/util/Callback.java |  278 -
 .../felix/ipojo/util/ContextSourceManager.java     |  332 --
 .../felix/ipojo/util/DependencyMetadataHelper.java |  109 -
 .../apache/felix/ipojo/util/DependencyModel.java   | 1277 -----
 .../felix/ipojo/util/DependencyModelListener.java  |   40 -
 .../felix/ipojo/util/DependencyStateListener.java  |   39 -
 .../java/org/apache/felix/ipojo/util/Fields.java   |  134 -
 .../ipojo/util/InstanceConfigurationSource.java    |  115 -
 .../apache/felix/ipojo/util/InvocationResult.java  |   76 -
 .../main/java/org/apache/felix/ipojo/util/Log.java |   47 -
 .../java/org/apache/felix/ipojo/util/Logger.java   |  318 --
 .../java/org/apache/felix/ipojo/util/Methods.java  |  189 -
 .../java/org/apache/felix/ipojo/util/Property.java |  689 ---
 .../org/apache/felix/ipojo/util/Reflection.java    |   35 -
 .../apache/felix/ipojo/util/SecurityHelper.java    |  218 -
 .../apache/felix/ipojo/util/ServiceLocator.java    |   63 -
 .../util/ServiceReferenceRankingComparator.java    |   90 -
 .../org/apache/felix/ipojo/util/StreamUtils.java   |   43 -
 .../felix/ipojo/util/SystemPropertiesSource.java   |   47 -
 .../java/org/apache/felix/ipojo/util/Tracker.java  |  753 ---
 .../apache/felix/ipojo/util/TrackerCustomizer.java |   69 -
 ipojo/runtime/core/src/main/resources/core.xsd     |  704 ---
 ipojo/runtime/core/src/main/resources/metadata.xml |   49 -
 .../apache/felix/ipojo/IPojoFactoryTestCase.java   |  118 -
 .../apache/felix/ipojo/InstanceManagerTest.java    |  177 -
 .../felix/ipojo/configuration/InstanceDSLTest.java |  102 -
 .../dependency/impl/DependencyPropertiesTest.java  |   85 -
 .../TransformedServiceReferenceTest.java           |   95 -
 .../DefaultExtensionDeclarationTestCase.java       |   66 -
 .../DefaultInstanceDeclarationTestCase.java        |  132 -
 .../DefaultTypeDeclarationTestCase.java            |   81 -
 .../DefaultConfigurationBuilderTestCase.java       |  100 -
 .../DefaultDeclarationBuilderServiceTestCase.java  |   96 -
 .../service/DefaultInstanceBuilderTestCase.java    |  111 -
 .../internal/linker/DeclarationLinkerTestCase.java |  116 -
 .../internal/linker/ManagedTypeTestCase.java       |   99 -
 .../processor/ChainedBundleProcessorTestCase.java  |   76 -
 .../ExtensionBundleProcessorTestCase.java          |   79 -
 .../processor/ReverseBundleProcessorTestCase.java  |   84 -
 .../queue/AbstractQueueServiceTestCase.java        |  133 -
 .../queue/ExecutorQueueServiceTestCase.java        |  205 -
 .../internal/queue/GroupThreadFactoryTestCase.java |   45 -
 .../internal/queue/JobInfoCallableTestCase.java    |  101 -
 .../queue/NamingThreadFactoryTestCase.java         |   89 -
 .../queue/PrefixedThreadFactoryTestCase.java       |   48 -
 .../queue/SynchronousQueueServiceTestCase.java     |   96 -
 .../extender/internal/queue/callable/EmptyJob.java |   59 -
 .../internal/queue/callable/ExceptionCallable.java |   38 -
 .../internal/queue/callable/SleepingCallable.java  |   40 -
 .../internal/queue/callable/StringCallable.java    |   63 -
 .../queue/debug/ReplayQueueEventProxyTestCase.java |  122 -
 .../pref/HeaderPreferenceSelectionTestCase.java    |   79 -
 .../pref/enforce/EnforcedQueueServiceTestCase.java |   88 -
 .../dependency/DependencyIdentifierTest.java       |  158 -
 .../ipojo/handlers/dependency/NullableTest.java    |   67 -
 .../ipojo/handlers/dependency/SmartProxyTest.java  |  132 -
 .../handlers/dependency/TestSpecification.java     |   24 -
 .../ComponentTestWithAnotherSuperClass.java        |   30 -
 .../ComponentTestWithSuperClass.java               |   25 -
 .../ProvidedServiceHandlerTest.java                |  178 -
 .../ipojo/parser/ManipulationMetadataTest.java     |  257 -
 .../felix/ipojo/parser/MethodMetadataTest.java     |  127 -
 .../felix/ipojo/parser/PojoMetadataTest.java       |  322 --
 .../org/apache/felix/ipojo/test/MockBundle.java    |  190 -
 .../felix/ipojo/util/ContextSourceManagerTest.java |  115 -
 .../util/InstanceConfigurationSourceTest.java      |  169 -
 .../ipojo/util/ManifestMetadataParserTest.java     |  111 -
 .../ipojo/util/SystemPropertiesSourceTest.java     |   57 -
 .../src/test/resources/manipulation/MANIFEST.MF    |  142 -
 ipojo/runtime/distributions/maven-tutorial/pom.xml |  100 -
 .../main/appended-resources/META-INF/DEPENDENCIES  |   27 -
 .../src/main/appended-resources/META-INF/NOTICE    |    8 -
 .../src/main/assembly/distribution.xml             |   45 -
 .../annotations/hello.client.annotations/pom.xml   |   72 -
 .../ipojo/example/hello/client/HelloClient.java    |   88 -
 .../ipojo/example/hello/client/MyDummyHello.java   |   30 -
 .../annotations/hello.felix.annotations/pom.xml    |  123 -
 .../annotations/hello.impl.annotations/pom.xml     |   72 -
 .../java/ipojo/example/hello/impl/HelloImpl.java   |   53 -
 .../src/main/skeleton/hello.service/pom.xml        |   48 -
 .../src/main/java/ipojo/example/hello/Hello.java   |   33 -
 .../maven-tutorial/src/main/skeleton/pom.xml       |   94 -
 .../src/main/skeleton/xml/hello.client.xml/pom.xml |   72 -
 .../ipojo/example/hello/client/HelloClient.java    |   90 -
 .../src/main/resources/metadata.xml                |   47 -
 .../src/main/skeleton/xml/hello.felix.xml/pom.xml  |  124 -
 .../src/main/skeleton/xml/hello.impl.xml/pom.xml   |   72 -
 .../java/ipojo/example/hello/impl/HelloImpl.java   |   36 -
 .../hello.impl.xml/src/main/resources/metadata.xml |   28 -
 ipojo/runtime/distributions/quickstart/pom.xml     |  144 -
 .../main/appended-resources/META-INF/DEPENDENCIES  |   27 -
 .../src/main/appended-resources/META-INF/NOTICE    |    8 -
 .../quickstart/src/main/assembly/distribution.xml  |   61 -
 .../distributions/ten-minutes-tutorial/pom.xml     |  256 -
 .../src/main/skeleton/build.xml                    |   53 -
 .../src/main/skeleton/spell.checker.gui/build.xml  |   75 -
 .../spell.checker.gui/spell.checker.gui.bnd        |   19 -
 .../src/spell/gui/SpellCheckerGui.java             |  133 -
 .../src/main/skeleton/spell.checker/build.xml      |   75 -
 .../main/skeleton/spell.checker/spell.checker.bnd  |   19 -
 .../src/spell/checker/SpellCheck.java              |   48 -
 .../src/main/skeleton/spell.english/build.xml      |   75 -
 .../main/skeleton/spell.english/spell.english.bnd  |   19 -
 .../src/spell/english/EnglishDictionary.java       |   46 -
 .../src/main/skeleton/spell.services/build.xml     |   55 -
 .../skeleton/spell.services/spell.services.bnd     |   19 -
 .../src/spell/services/DictionaryService.java      |   30 -
 .../src/spell/services/SpellChecker.java           |   24 -
 .../src/main/solution/build.xml                    |   38 -
 .../src/main/solution/spell.checker.gui/build.xml  |   75 -
 .../spell.checker.gui/spell.checker.gui.bnd        |   19 -
 .../src/spell/gui/SpellCheckerGui.java             |  138 -
 .../src/main/solution/spell.checker/build.xml      |   75 -
 .../main/solution/spell.checker/spell.checker.bnd  |   19 -
 .../src/spell/checker/SpellCheck.java              |   78 -
 .../src/main/solution/spell.english/build.xml      |   75 -
 .../main/solution/spell.english/spell.english.bnd  |   19 -
 .../src/spell/english/EnglishDictionary.java       |   56 -
 .../src/main/solution/spell.services/build.xml     |   55 -
 .../solution/spell.services/spell.services.bnd     |   19 -
 .../src/spell/services/DictionaryService.java      |   31 -
 .../src/spell/services/SpellChecker.java           |   40 -
 ipojo/runtime/ipojo-gogo-commands/changelog.txt    |  176 -
 ipojo/runtime/ipojo-gogo-commands/obr.xml          |   24 -
 ipojo/runtime/ipojo-gogo-commands/pom.xml          |  126 -
 .../main/appended-resources/META-INF/DEPENDENCIES  |   11 -
 .../src/main/appended-resources/META-INF/NOTICE    |    0
 .../org/apache/felix/ipojo/arch/gogo/Arch.java     |  355 --
 ipojo/runtime/karaf-feature/changelog.txt          |  398 --
 ipojo/runtime/karaf-feature/pom.xml                |  126 -
 .../main/appended-resources/META-INF/DEPENDENCIES  |   10 -
 .../karaf-feature/src/main/assembly/assembly.xml   |   54 -
 .../karaf-feature/src/main/features/features.xml   |   46 -
 ipojo/runtime/pom.xml                              |   81 -
 .../main/appended-resources/META-INF/DEPENDENCIES  |   21 -
 .../src/main/appended-resources/META-INF/NOTICE    |    8 -
 ipojo/webconsole-plugin/changelog.txt              |   37 -
 ipojo/webconsole-plugin/obr.xml                    |   29 -
 ipojo/webconsole-plugin/pom.xml                    |  133 -
 .../main/appended-resources/META-INF/DEPENDENCIES  |   17 -
 .../src/main/appended-resources/META-INF/LICENSE   |   33 -
 .../src/main/appended-resources/META-INF/NOTICE    |    4 -
 .../apache/felix/ipojo/webconsole/IPOJOPlugin.java |  821 ---
 .../apache/felix/ipojo/webconsole/StateUtils.java  |  233 -
 .../src/main/resources/res/factories.html          |   66 -
 .../src/main/resources/res/factory.html            |  114 -
 .../src/main/resources/res/handlers.html           |   70 -
 .../src/main/resources/res/instance.html           |  127 -
 .../src/main/resources/res/instances.html          |   66 -
 .../src/main/resources/res/ui/factory.js           |   87 -
 .../src/main/resources/res/ui/factory_detail.js    |  161 -
 .../src/main/resources/res/ui/handler.js           |   95 -
 .../src/main/resources/res/ui/instance_detail.js   |  189 -
 .../src/main/resources/res/ui/ipojo.css            |   33 -
 .../src/main/resources/res/ui/ipojo.js             |   84 -
 jaas/changelog.txt                                 |   51 -
 jaas/pom.xml                                       |  393 --
 .../org/apache/felix/jaas/LoginContextFactory.java |   58 -
 .../org/apache/felix/jaas/LoginModuleFactory.java  |   63 -
 .../apache/felix/jaas/boot/ProxyLoginModule.java   |   78 -
 .../org/apache/felix/jaas/boot/package-info.java   |   30 -
 .../org/apache/felix/jaas/internal/Activator.java  |   96 -
 .../jaas/internal/BundleLoginModuleCreator.java    |  226 -
 .../jaas/internal/ConfigLoginModuleProvider.java   |   90 -
 .../apache/felix/jaas/internal/ConfigSpiOsgi.java  |  646 ---
 .../apache/felix/jaas/internal/ControlFlag.java    |   80 -
 .../felix/jaas/internal/JaasConfigFactory.java     |  167 -
 .../felix/jaas/internal/JaasWebConsolePlugin.java  |  282 -
 .../org/apache/felix/jaas/internal/Logger.java     |   58 -
 .../felix/jaas/internal/LoginModuleCreator.java    |   30 -
 .../felix/jaas/internal/LoginModuleProvider.java   |   45 -
 .../jaas/internal/OsgiLoginModuleProvider.java     |  104 -
 .../java/org/apache/felix/jaas/internal/Util.java  |   39 -
 .../java/org/apache/felix/jaas/package-info.java   |   30 -
 .../main/resources/OSGI-INF/l10n/bundle.properties |   19 -
 .../OSGI-INF/metatype/metatype.properties          |   62 -
 .../jaas/integration/ITJaasWebConsolePlugin.java   |   77 -
 .../jaas/integration/ITJaasWithBootClasspath.java  |  133 -
 .../ITJaasWithConfigBasedLoginModule.java          |  258 -
 .../jaas/integration/ITJaasWithGlobalConfig.java   |  102 -
 .../felix/jaas/integration/JaasTestBase.java       |  172 -
 .../integration/common/SimpleCallbackHandler.java  |   57 -
 .../jaas/integration/common/SimplePrincipal.java   |   66 -
 .../integration/sample1/ConfigLoginModule.java     |  130 -
 .../ITConcurrentLoginModuleFactoryTest.java        |  213 -
 .../org/apache/felix/jaas/internal/UtilTest.java   |   51 -
 jmood/QUICKSTART.txt                               |   31 -
 jmood/pom.xml                                      |  122 -
 .../java/org/apache/felix/jmood/Activator.java     |  114 -
 .../org/apache/felix/jmood/AgentConstants.java     |   31 -
 .../java/org/apache/felix/jmood/AgentContext.java  |  214 -
 .../org/apache/felix/jmood/CompendiumHandler.java  |  213 -
 .../java/org/apache/felix/jmood/RMIHandler.java    |   97 -
 .../apache/felix/jmood/SecurityManagerHandler.java |   88 -
 .../felix/jmood/compendium/ConfigAdminManager.java |  357 --
 .../jmood/compendium/ConfigAdminManagerMBean.java  |   77 -
 .../jmood/compendium/ConfigurationDelegate.java    |  170 -
 .../compendium/ConfigurationDelegateMBean.java     |   64 -
 .../apache/felix/jmood/compendium/LogManager.java  |  227 -
 .../felix/jmood/compendium/LogManagerMBean.java    |   32 -
 .../apache/felix/jmood/compendium/UserManager.java |  482 --
 .../felix/jmood/compendium/UserManagerMBean.java   |   55 -
 .../jmood/core/BundleNotAvailableException.java    |   42 -
 .../apache/felix/jmood/core/CoreController.java    |  341 --
 .../felix/jmood/core/CoreControllerMBean.java      |  101 -
 .../org/apache/felix/jmood/core/Framework.java     |  386 --
 .../apache/felix/jmood/core/FrameworkMBean.java    |   95 -
 .../org/apache/felix/jmood/core/ManagedBundle.java |  206 -
 .../felix/jmood/core/ManagedBundleMBean.java       |   77 -
 .../apache/felix/jmood/core/ManagedPackage.java    |   60 -
 .../felix/jmood/core/ManagedPackageMBean.java      |   53 -
 .../apache/felix/jmood/core/ManagedService.java    |   59 -
 .../felix/jmood/core/ManagedServiceMBean.java      |   48 -
 .../felix/jmood/core/NotImplementedException.java  |   41 -
 .../jmood/core/ServiceNotAvailableException.java   |   42 -
 .../jmood/core/instrumentation/BundleInfo.java     |  171 -
 .../core/instrumentation/FrameworkSnapshot.java    |  245 -
 .../jmood/core/instrumentation/PackageInfo.java    |   72 -
 .../jmood/core/instrumentation/ServiceInfo.java    |   49 -
 .../felix/jmood/utils/CompositeDataItemNames.java  |   64 -
 .../felix/jmood/utils/InstrumentationSupport.java  |  293 -
 .../apache/felix/jmood/utils/OSGi2JMXCodec.java    |  305 --
 .../org/apache/felix/jmood/utils/OSGiTypes.java    |  482 --
 .../org/apache/felix/jmood/utils/ObjectNames.java  |   51 -
 jmood/src/main/resources/agent.properties          |    3 -
 jmood/src/main/resources/simple.policy             |    4 -
 jmood/src/site/site.xml                            |   28 -
 .../java/org/apache/felix/jmood/FelixLauncher.java |  168 -
 .../felix/jmood/core/BundleMBeanTestCase.java      |   92 -
 .../org/apache/felix/jmood/core/CoreTestCase.java  |  292 -
 .../org/apache/felix/jmood/core/TestHarness.java   |   51 -
 jmxintrospector/README.txt                         |   18 -
 jmxintrospector/pom.xml                            |   83 -
 .../apache/felix/jmxintrospector/JmxAsmHelper.java |   48 -
 .../org/apache/felix/jmxintrospector/MBean.java    |   32 -
 .../felix/jmxintrospector/MBeanProxyFactory.java   |  261 -
 .../felix/jmxintrospector/MBeanProxyManager.java   |  181 -
 .../org/apache/felix/jmxintrospector/Server.java   |  126 -
 log.extension/DEPENDENCIES                         |   17 -
 log.extension/LICENSE                              |  202 -
 log.extension/NOTICE                               |    6 -
 log.extension/doc/changelog.txt                    |    3 -
 log.extension/pom.xml                              |   95 -
 .../org/apache/felix/log/extension/Activator.java  |   64 -
 log/DEPENDENCIES                                   |   23 -
 log/LICENSE                                        |  202 -
 log/NOTICE                                         |   11 -
 log/README.md                                      |  198 -
 log/doc/changelog.txt                              |   18 -
 log/pom.xml                                        |  102 -
 .../main/java/org/apache/felix/log/Activator.java  |  182 -
 .../felix/log/ConfigurationListenerImpl.java       |  254 -
 .../org/apache/felix/log/FormatterLoggerImpl.java  |   45 -
 log/src/main/java/org/apache/felix/log/Log.java    |  333 --
 .../java/org/apache/felix/log/LogEntryImpl.java    |  265 -
 .../java/org/apache/felix/log/LogException.java    |  109 -
 .../org/apache/felix/log/LogListenerThread.java    |  171 -
 .../main/java/org/apache/felix/log/LogNode.java    |   88 -
 .../org/apache/felix/log/LogNodeEnumeration.java   |   77 -
 .../apache/felix/log/LogReaderServiceFactory.java  |   69 -
 .../org/apache/felix/log/LogReaderServiceImpl.java |  108 -
 .../org/apache/felix/log/LogServiceFactory.java    |   69 -
 .../java/org/apache/felix/log/LogServiceImpl.java  |  145 -
 .../java/org/apache/felix/log/LoggerAdminImpl.java |  186 -
 .../org/apache/felix/log/LoggerContextImpl.java    |  163 -
 .../main/java/org/apache/felix/log/LoggerImpl.java |  383 --
 .../apache/felix/log/RootLoggerContextImpl.java    |   86 -
 logback/doc/changelog.txt                          |    3 -
 logback/itests/base.bndrun                         |    8 -
 .../immediate-equinox-logservice/itest.bndrun      |   16 -
 .../itests/immediate-equinox-logservice/pom.xml    |   40 -
 .../apache/felix/logback/test/LogServiceTest.java  |   77 -
 .../itests/immediate-felix-logservice/itest.bndrun |   19 -
 logback/itests/immediate-felix-logservice/pom.xml  |   39 -
 .../apache/felix/logback/test/LogServiceTest.java  |   77 -
 logback/itests/immediate-jbl/itest.bndrun          |   28 -
 logback/itests/immediate-jbl/pom.xml               |   39 -
 .../org/apache/felix/logback/test/JBLTest.java     |   37 -
 logback/itests/immediate-jcl/itest.bndrun          |   27 -
 logback/itests/immediate-jcl/pom.xml               |   39 -
 .../org/apache/felix/logback/test/JCLTest.java     |   38 -
 logback/itests/immediate-jul-felix/itest.bndrun    |   19 -
 logback/itests/immediate-jul-felix/pom.xml         |   39 -
 .../org/apache/felix/logback/test/JULTest.java     |   39 -
 logback/itests/immediate-jul/itest.bndrun          |   21 -
 logback/itests/immediate-jul/pom.xml               |   39 -
 .../org/apache/felix/logback/test/JULTest.java     |   39 -
 logback/itests/immediate-log4j1/itest.bndrun       |   25 -
 logback/itests/immediate-log4j1/pom.xml            |   39 -
 .../org/apache/felix/logback/test/Log4j1Test.java  |   38 -
 logback/itests/immediate-log4j2/itest.bndrun       |   27 -
 logback/itests/immediate-log4j2/pom.xml            |   39 -
 .../org/apache/felix/logback/test/Log4j2Test.java  |   38 -
 logback/itests/immediate-slf4j/itest.bndrun        |   24 -
 logback/itests/immediate-slf4j/pom.xml             |   39 -
 .../org/apache/felix/logback/test/SLF4JTest.java   |   38 -
 logback/itests/itest-parent/pom.xml                |  305 --
 logback/itests/logback.xml                         |   40 -
 logback/itests/pom.xml                             |   55 -
 .../standard-equinox-logservice/itest.bndrun       |   19 -
 logback/itests/standard-equinox-logservice/pom.xml |   39 -
 .../apache/felix/logback/test/LogServiceTest.java  |   77 -
 .../itests/standard-felix-logservice/itest.bndrun  |   21 -
 logback/itests/standard-felix-logservice/pom.xml   |   45 -
 .../apache/felix/logback/test/LogServiceTest.java  |   77 -
 logback/itests/standard-jbl/itest.bndrun           |   23 -
 logback/itests/standard-jbl/pom.xml                |   39 -
 .../org/apache/felix/logback/test/JBLTest.java     |   37 -
 logback/itests/standard-jcl/itest.bndrun           |   17 -
 logback/itests/standard-jcl/pom.xml                |   39 -
 .../org/apache/felix/logback/test/JCLTest.java     |   38 -
 logback/itests/standard-jul/itest.bndrun           |   19 -
 logback/itests/standard-jul/pom.xml                |   39 -
 .../org/apache/felix/logback/test/JULTest.java     |   39 -
 logback/itests/standard-log4j1/itest.bndrun        |   15 -
 logback/itests/standard-log4j1/pom.xml             |   39 -
 .../org/apache/felix/logback/test/Log4j1Test.java  |   38 -
 logback/itests/standard-log4j2/itest.bndrun        |   17 -
 logback/itests/standard-log4j2/pom.xml             |   39 -
 .../org/apache/felix/logback/test/Activator.java   |   50 -
 .../org/apache/felix/logback/test/Log4j2Test.java  |   42 -
 logback/itests/standard-slf4j/itest.bndrun         |   14 -
 logback/itests/standard-slf4j/pom.xml              |   39 -
 .../org/apache/felix/logback/test/SLF4JTest.java   |   38 -
 logback/itests/test-helper/pom.xml                 |   64 -
 .../felix/logback/test/helper/LogTestHelper.java   |   91 -
 .../logback/test/helper/ls/LogServiceHelper.java   |   35 -
 logback/logback/DEPENDENCIES                       |   22 -
 logback/logback/LICENSE                            |  202 -
 logback/logback/NOTICE                             |    6 -
 logback/logback/README.md                          |  148 -
 logback/logback/pom.xml                            |  150 -
 .../apache/felix/logback/internal/Activator.java   |  139 -
 .../felix/logback/internal/EquinoxHookSupport.java |   34 -
 .../felix/logback/internal/LogbackLogListener.java |  311 --
 .../main/resources/hookconfigurators.properties    |   15 -
 logback/pom.xml                                    |   44 -
 main.distribution/DEPENDENCIES                     |   32 -
 main.distribution/LICENSE                          |  202 -
 main.distribution/LICENSE.kxml2                    |   19 -
 main.distribution/NOTICE                           |   15 -
 main.distribution/assembly.xml                     |   69 -
 main.distribution/conf/config.properties           |  100 -
 ...e-felix-framework-configuration-properties.html |  198 -
 .../apache.png                                     |  Bin 12242 -> 0 bytes
 .../button.html                                    |    5 -
 .../button_data/2010-na-125x125.png                |  Bin 6119 -> 0 bytes
 .../logo.png                                       |  Bin 14927 -> 0 bytes
 .../site.css                                       |   25 -
 ...he-felix-framework-launching-and-embedding.html | 1022 ----
 .../apache.png                                     |  Bin 12242 -> 0 bytes
 .../button.html                                    |    5 -
 .../button_data/2008-usa-125x125.png               |  Bin 32407 -> 0 bytes
 .../button_data/2009-europe-125x125.png            |  Bin 13647 -> 0 bytes
 .../button_data/2009-usa-125x125.png               |  Bin 13818 -> 0 bytes
 .../button_data/2010-na-125x125.png                |  Bin 6119 -> 0 bytes
 .../forbidden.gif                                  |  Bin 613 -> 0 bytes
 .../linkext7.gif                                   |  Bin 166 -> 0 bytes
 .../logo.png                                       |  Bin 14927 -> 0 bytes
 .../mail_small.gif                                 |  Bin 202 -> 0 bytes
 .../site.css                                       |   25 -
 ...apache-felix-framework-usage-documentation.html |  400 --
 .../apache.png                                     |  Bin 12242 -> 0 bytes
 .../button.html                                    |    5 -
 .../button_data/2008-usa-125x125.png               |  Bin 32407 -> 0 bytes
 .../button_data/2009-europe-125x125.png            |  Bin 13647 -> 0 bytes
 .../button_data/2009-usa-125x125.png               |  Bin 13818 -> 0 bytes
 .../button_data/2010-na-125x125.png                |  Bin 6119 -> 0 bytes
 .../information.gif                                |  Bin 1005 -> 0 bytes
 .../linkext7.gif                                   |  Bin 166 -> 0 bytes
 .../logo.png                                       |  Bin 14927 -> 0 bytes
 .../mail_small.gif                                 |  Bin 202 -> 0 bytes
 .../site.css                                       |   25 -
 .../doc/apache-felix-gogo-Dateien/apache.png       |  Bin 12242 -> 0 bytes
 .../doc/apache-felix-gogo-Dateien/button.html      |    5 -
 .../button_data/2010-na-125x125.png                |  Bin 6119 -> 0 bytes
 .../doc/apache-felix-gogo-Dateien/logo.png         |  Bin 14927 -> 0 bytes
 .../doc/apache-felix-gogo-Dateien/site.css         |   25 -
 main.distribution/doc/apache-felix-gogo.html       |   70 -
 .../doc/apache-felix-osgi-bundle-repository.html   |  524 --
 .../apache-felix-small.png                         |  Bin 6700 -> 0 bytes
 .../apache.png                                     |  Bin 12242 -> 0 bytes
 .../button.html                                    |    5 -
 .../button_data/2009-usa-125x125.png               |  Bin 13818 -> 0 bytes
 .../linkext7.gif                                   |  Bin 166 -> 0 bytes
 .../logo.png                                       |  Bin 14927 -> 0 bytes
 .../mail_small.gif                                 |  Bin 202 -> 0 bytes
 .../obr-entities.png                               |  Bin 30910 -> 0 bytes
 .../obr-high-level.png                             |  Bin 23175 -> 0 bytes
 .../site.css                                       |   25 -
 main.distribution/doc/changelog.txt                |  317 --
 .../doc/changelog_bundlerepository.txt             |  193 -
 main.distribution/doc/changelog_framework.txt      | 1241 -----
 main.distribution/doc/changelog_gogo.command.txt   |  112 -
 main.distribution/doc/changelog_gogo.runtime.txt   |  193 -
 main.distribution/doc/changelog_gogo.shell.txt     |   67 -
 main.distribution/doc/changelog_main.txt           |  461 --
 main.distribution/doc/changelog_resolver.txt       |  103 -
 main.distribution/pom.xml                          |  164 -
 ...e-felix-framework-configuration-properties.html |  198 -
 .../apache.png                                     |  Bin 12242 -> 0 bytes
 .../button.html                                    |    5 -
 .../button_data/2010-na-125x125.png                |  Bin 6119 -> 0 bytes
 .../logo.png                                       |  Bin 14927 -> 0 bytes
 .../site.css                                       |   25 -
 ...he-felix-framework-launching-and-embedding.html | 1022 ----
 .../apache.png                                     |  Bin 12242 -> 0 bytes
 .../button.html                                    |    5 -
 .../button_data/2008-usa-125x125.png               |  Bin 32407 -> 0 bytes
 .../button_data/2009-europe-125x125.png            |  Bin 13647 -> 0 bytes
 .../button_data/2009-usa-125x125.png               |  Bin 13818 -> 0 bytes
 .../button_data/2010-na-125x125.png                |  Bin 6119 -> 0 bytes
 .../forbidden.gif                                  |  Bin 613 -> 0 bytes
 .../linkext7.gif                                   |  Bin 166 -> 0 bytes
 .../logo.png                                       |  Bin 14927 -> 0 bytes
 .../mail_small.gif                                 |  Bin 202 -> 0 bytes
 .../site.css                                       |   25 -
 ...apache-felix-framework-usage-documentation.html |  400 --
 .../apache.png                                     |  Bin 12242 -> 0 bytes
 .../button.html                                    |    5 -
 .../button_data/2008-usa-125x125.png               |  Bin 32407 -> 0 bytes
 .../button_data/2009-europe-125x125.png            |  Bin 13647 -> 0 bytes
 .../button_data/2009-usa-125x125.png               |  Bin 13818 -> 0 bytes
 .../button_data/2010-na-125x125.png                |  Bin 6119 -> 0 bytes
 .../information.gif                                |  Bin 1005 -> 0 bytes
 .../linkext7.gif                                   |  Bin 166 -> 0 bytes
 .../logo.png                                       |  Bin 14927 -> 0 bytes
 .../mail_small.gif                                 |  Bin 202 -> 0 bytes
 .../site.css                                       |   25 -
 main/doc/changelog.txt                             |  461 --
 main/pom.xml                                       |  287 -
 .../main/appended-resources/META-INF/DEPENDENCIES  |   16 -
 main/src/main/appended-resources/META-INF/LICENSE  |  202 -
 main/src/main/appended-resources/META-INF/NOTICE   |    4 -
 .../java/org/apache/felix/main/AutoProcessor.java  |  412 --
 main/src/main/java/org/apache/felix/main/Main.java |  580 --
 main/src/main/resources/config.properties          |  109 -
 metatype/changelog.txt                             |  141 -
 metatype/obr.xml                                   |   34 -
 metatype/pom.xml                                   |  131 -
 .../main/appended-resources/META-INF/DEPENDENCIES  |   31 -
 .../src/main/appended-resources/META-INF/LICENSE   |   31 -
 .../src/main/appended-resources/META-INF/NOTICE    |    4 -
 .../main/java/org/apache/felix/metatype/AD.java    |  493 --
 .../org/apache/felix/metatype/ADValidator.java     |  433 --
 .../java/org/apache/felix/metatype/Attribute.java  |   81 -
 .../felix/metatype/DefaultMetaTypeProvider.java    |  208 -
 .../java/org/apache/felix/metatype/Designate.java  |  150 -
 .../org/apache/felix/metatype/DesignateObject.java |   68 -
 .../java/org/apache/felix/metatype/MetaData.java   |  107 -
 .../org/apache/felix/metatype/MetaDataReader.java  |  740 ---
 .../main/java/org/apache/felix/metatype/OCD.java   |  136 -
 .../apache/felix/metatype/OptionalAttributes.java  |   45 -
 .../apache/felix/metatype/internal/Activator.java  |  254 -
 .../metatype/internal/BaseProviderHolder.java      |  101 -
 .../internal/LocalizedAttributeDefinition.java     |  142 -
 .../felix/metatype/internal/LocalizedBase.java     |  166 -
 .../internal/LocalizedObjectClassDefinition.java   |  248 -
 .../metatype/internal/ManagedServiceHolder.java    |   90 -
 .../metatype/internal/ManagedServiceTracker.java   |   77 -
 .../metatype/internal/MetaTypeInformationImpl.java |  289 -
 .../metatype/internal/MetaTypeProviderHolder.java  |   69 -
 .../metatype/internal/MetaTypeProviderTracker.java |   65 -
 .../metatype/internal/MetaTypeServiceImpl.java     |  305 --
 .../internal/ServiceMetaTypeInformation.java       |   67 -
 .../metatype/internal/l10n/BundleResources.java    |  208 -
 .../felix/metatype/internal/l10n/Resources.java    |   60 -
 .../org/apache/felix/metatype/package-info.java    |   24 -
 .../java/org/apache/felix/metatype/ADTest.java     |  306 --
 .../org/apache/felix/metatype/ADValidatorTest.java |  378 --
 .../org/apache/felix/metatype/AttributeTest.java   |   63 -
 .../apache/felix/metatype/MetaDataReaderTest.java  |  449 --
 .../java/org/apache/felix/metatype/MockBundle.java |  234 -
 .../apache/felix/metatype/MockBundleContext.java   |  529 --
 .../metatype/internal/MetaTypeServiceImplTest.java |  227 -
 metrics/osgi/README.md                             |   70 -
 metrics/osgi/collector/bnd.bnd                     |    2 -
 metrics/osgi/collector/pom.xml                     |  157 -
 .../felix/metrics/osgi/BundleStartDuration.java    |   45 -
 .../felix/metrics/osgi/ServiceRestartCounter.java  |   39 -
 .../apache/felix/metrics/osgi/StartupMetrics.java  |  101 -
 .../felix/metrics/osgi/StartupMetricsListener.java |   38 -
 .../apache/felix/metrics/osgi/impl/Activator.java  |   51 -
 .../osgi/impl/BundleStartTimeCalculator.java       |  112 -
 .../org/apache/felix/metrics/osgi/impl/Log.java    |   39 -
 .../osgi/impl/ServiceRestartCountCalculator.java   |  239 -
 .../osgi/impl/ServiceTrackerCustomizerAdapter.java |   33 -
 .../metrics/osgi/impl/StartupTimeCalculator.java   |  136 -
 .../apache/felix/metrics/osgi/package-info.java    |   18 -
 .../apache/felix/metrics/osgi/impl/AbstractIT.java |  126 -
 .../osgi/impl/BundleStartTimeCalculatorTest.java   |   62 -
 .../metrics/osgi/impl/HealthCheckSmokeIT.java      |   61 -
 .../osgi/impl/ServiceRegistrationsTrackerTest.java |   76 -
 .../impl/ServiceRestartCountCalculatorTest.java    |  192 -
 .../metrics/osgi/impl/SystemReadySmokeIT.java      |   47 -
 .../impl/WaitForResultsStartupMetricsListener.java |   45 -
 metrics/osgi/consumers/bnd.bnd                     |    1 -
 metrics/osgi/consumers/pom.xml                     |  104 -
 .../impl/dropwizard/DropwizardMetricsListener.java |   85 -
 .../impl/json/JsonWritingMetricsListener.java      |   95 -
 .../consumers/impl/log/LoggingMetricsListener.java |   92 -
 .../impl/json/JsonWritingMetricsListenerTest.java  |   78 -
 metrics/osgi/pom.xml                               |   42 -
 mishell/README.txt                                 |   38 -
 mishell/pom.xml                                    |  112 -
 .../java/org/apache/felix/mishell/Activator.java   |   49 -
 .../felix/mishell/EngineNotFoundException.java     |   25 -
 .../org/apache/felix/mishell/JMXEngineContext.java |  114 -
 .../apache/felix/mishell/JMoodProxyManager.java    |   51 -
 .../org/apache/felix/mishell/OSGiScriptEngine.java |   77 -
 .../felix/mishell/OSGiScriptEngineFactory.java     |   82 -
 .../felix/mishell/OSGiScriptEngineManager.java     |  237 -
 .../org/apache/felix/mishell/console/Command.java  |   25 -
 .../mishell/console/CommandNotFoundException.java  |   21 -
 .../apache/felix/mishell/console/Commander.java    |   52 -
 .../org/apache/felix/mishell/console/Console.java  |  221 -
 .../org/apache/felix/mishell/logging.properties    |   54 -
 mishell/src/main/resources/logging.properties      |   54 -
 mishell/src/main/resources/scripts/hello.js        |    6 -
 mishell/src/main/resources/scripts/invoke.js       |   18 -
 mishell/src/main/resources/scripts/jtop.js         |   73 -
 mishell/src/main/resources/scripts/verbose.js      |   49 -
 .../felix/mishell/OSGiScriptEngineFinder.java      |  151 -
 .../java/org/apache/felix/mishell/TypeTest.java    |   19 -
 mosgi/console.component/pom.xml                    |   78 -
 .../felix/mosgi/console/component/Activator.java   |   68 -
 .../console/component/JtableCellRenderer.java      |   65 -
 .../mosgi/console/component/JtreeCellRenderer.java |  168 -
 .../felix/mosgi/console/component/MyTree.java      |   49 -
 .../console/component/RemoteLogger_jtable.java     |  195 -
 .../console/component/RemoteLogger_jtree.java      |  374 --
 .../src/main/resources/META-INF/LICENSE            |  202 -
 .../src/main/resources/META-INF/NOTICE             |   10 -
 .../src/main/resources/icons/Active.gif            |  Bin 973 -> 0 bytes
 .../src/main/resources/icons/Installed.gif         |  Bin 972 -> 0 bytes
 .../src/main/resources/icons/NEWLOG.gif            |  Bin 891 -> 0 bytes
 .../src/main/resources/icons/NULL.gif              |  Bin 873 -> 0 bytes
 .../src/main/resources/icons/OLDLOG.gif            |  Bin 985 -> 0 bytes
 .../src/main/resources/icons/Resolved.gif          |  Bin 973 -> 0 bytes
 .../src/main/resources/icons/Starting.gif          |  Bin 982 -> 0 bytes
 .../src/main/resources/icons/Stopping.gif          |  Bin 982 -> 0 bytes
 .../src/main/resources/icons/Uninstalled.gif       |  Bin 931 -> 0 bytes
 mosgi/console.gui/pom.xml                          |   84 -
 .../apache/felix/mosgi/console/gui/Activator.java  |  236 -
 .../felix/mosgi/console/gui/CommonPanel.java       |   47 -
 .../apache/felix/mosgi/console/gui/Gateway.java    |  212 -
 .../felix/mosgi/console/gui/NodeCellRenderer.java  |   59 -
 .../apache/felix/mosgi/console/gui/NodePanel.java  |  219 -
 .../apache/felix/mosgi/console/gui/NodesTree.java  |  341 --
 .../src/main/resources/META-INF/LICENSE            |  202 -
 .../console.gui/src/main/resources/META-INF/NOTICE |   10 -
 .../console.gui/src/main/resources/images/ADD.gif  |  Bin 93 -> 0 bytes
 .../src/main/resources/images/GraphSettings.gif    |  Bin 253 -> 0 bytes
 .../src/main/resources/images/REFRESH.gif          |  Bin 1279 -> 0 bytes
 .../src/main/resources/images/REMOVE.gif           |  Bin 82 -> 0 bytes
 .../src/main/resources/images/ServerBlocked.gif    |  Bin 1044 -> 0 bytes
 .../src/main/resources/images/ServerRunning.gif    |  Bin 1045 -> 0 bytes
 .../console.gui/src/main/resources/images/logo.gif |  Bin 10460 -> 0 bytes
 mosgi/console.ifc/pom.xml                          |   69 -
 .../felix/mosgi/console/ifc/CommonPlugin.java      |   24 -
 .../org/apache/felix/mosgi/console/ifc/Plugin.java |   42 -
 .../org/apache/felix/mosgi/console/ifc/TabIfc.java |   23 -
 .../src/main/resources/META-INF/LICENSE            |  202 -
 .../console.ifc/src/main/resources/META-INF/NOTICE |   10 -
 mosgi/doc/Readme.txt                               |   36 -
 mosgi/doc/config.properties.core                   |  521 --
 mosgi/doc/config.properties.jmxconsole             |  520 --
 mosgi/doc/core.sh                                  |   13 -
 mosgi/doc/jmxconsole.sh                            |   12 -
 mosgi/jmx.agent/pom.xml                            |   89 -
 .../felix/mosgi/jmx/agent/AgentActivator.java      |  258 -
 .../apache/felix/mosgi/jmx/agent/Constants.java    |   22 -
 .../mosgi/jmx/agent/mx4j/AbstractDynamicMBean.java |  514 --
 .../jmx/agent/mx4j/ImplementationException.java    |   32 -
 .../mosgi/jmx/agent/mx4j/MBeanDescription.java     |   79 -
 .../jmx/agent/mx4j/MBeanDescriptionAdapter.java    |   72 -
 .../felix/mosgi/jmx/agent/mx4j/MX4JSystemKeys.java |   95 -
 .../mx4j/loading/ClassLoaderObjectInputStream.java |   69 -
 .../jmx/agent/mx4j/loading/MLetParseException.java |   36 -
 .../mosgi/jmx/agent/mx4j/loading/MLetParser.java   |  361 --
 .../mosgi/jmx/agent/mx4j/loading/MLetTag.java      |  222 -
 .../apache/felix/mosgi/jmx/agent/mx4j/log/Log.java |  243 -
 .../felix/mosgi/jmx/agent/mx4j/log/Logger.java     |   76 -
 .../mx4j/server/DefaultClassLoaderRepository.java  |  128 -
 .../agent/mx4j/server/DefaultMBeanRepository.java  |   74 -
 .../jmx/agent/mx4j/server/MBeanIntrospector.java   |  602 --
 .../mosgi/jmx/agent/mx4j/server/MBeanInvoker.java  |   52 -
 .../mosgi/jmx/agent/mx4j/server/MBeanMetaData.java |   77 -
 .../jmx/agent/mx4j/server/MBeanRepository.java     |   65 -
 .../jmx/agent/mx4j/server/MX4JMBeanServer.java     | 1484 -----
 .../agent/mx4j/server/MX4JMBeanServerBuilder.java  |   66 -
 .../agent/mx4j/server/MX4JMBeanServerDelegate.java |   47 -
 .../server/ModifiableClassLoaderRepository.java    |   49 -
 .../agent/mx4j/server/ReflectedMBeanInvoker.java   |  297 -
 .../ContextClassLoaderMBeanServerInterceptor.java  |  323 --
 .../interceptor/DefaultMBeanServerInterceptor.java |  152 -
 .../DefaultMBeanServerInterceptorMBean.java        |   44 -
 .../interceptor/InvokerMBeanServerInterceptor.java |  394 --
 .../InvokerMBeanServerInterceptorMBean.java        |   37 -
 .../server/interceptor/MBeanServerInterceptor.java |  134 -
 .../MBeanServerInterceptorConfigurator.java        |  191 -
 .../MBeanServerInterceptorConfiguratorMBean.java   |   68 -
 ...NotificationListenerMBeanServerInterceptor.java |  145 -
 .../SecurityMBeanServerInterceptor.java            |  204 -
 .../SecurityMBeanServerInterceptorMBean.java       |   38 -
 .../mosgi/jmx/agent/mx4j/util/Base64Codec.java     |  404 --
 .../jmx/agent/mx4j/util/MethodTernaryTree.java     |  201 -
 .../felix/mosgi/jmx/agent/mx4j/util/Utils.java     |  289 -
 .../src/main/resources/META-INF/LICENCE-MX4J       |   51 -
 .../jmx.agent/src/main/resources/META-INF/LICENSE  |  202 -
 mosgi/jmx.agent/src/main/resources/META-INF/NOTICE |   13 -
 mosgi/jmx.httpconnector/pom.xml                    |   89 -
 .../jmx/httpconnector/HttpConnectorActivator.java  |  103 -
 .../tools/adaptor/AdaptorServerSocketFactory.java  |   39 -
 .../adaptor/PlainAdaptorServerSocketFactory.java   |   38 -
 .../tools/adaptor/http/CommandProcessorUtil.java   |  345 --
 .../adaptor/http/ConstructorsCommandProcessor.java |  123 -
 .../adaptor/http/CreateMBeanCommandProcessor.java  |  165 -
 .../mx4j/tools/adaptor/http/DefaultProcessor.java  |  331 --
 .../adaptor/http/DeleteMBeanCommandProcessor.java  |  100 -
 .../tools/adaptor/http/EmptyCommandProcessor.java  |   58 -
 .../adaptor/http/GetAttributeCommandProcessor.java |  190 -
 .../mx4j/tools/adaptor/http/HttpAdaptor.java       | 1024 ----
 .../mx4j/tools/adaptor/http/HttpAdaptorMBean.java  |  180 -
 .../tools/adaptor/http/HttpCommandProcessor.java   |   59 -
 .../adaptor/http/HttpCommandProcessorAdaptor.java  |   55 -
 .../mx4j/tools/adaptor/http/HttpConstants.java     |  104 -
 .../mx4j/tools/adaptor/http/HttpException.java     |   80 -
 .../mx4j/tools/adaptor/http/HttpInputStream.java   |  422 --
 .../mx4j/tools/adaptor/http/HttpOutputStream.java  |  136 -
 .../mx4j/tools/adaptor/http/HttpUtil.java          |  145 -
 .../http/InvokeOperationCommandProcessor.java      |  206 -
 .../tools/adaptor/http/MBeanCommandProcessor.java  |  254 -
 .../mx4j/tools/adaptor/http/ProcessorMBean.java    |   88 -
 .../http/ServerByDomainCommandProcessor.java       |  122 -
 .../tools/adaptor/http/ServerCommandProcessor.java |   94 -
 .../adaptor/http/SetAttributeCommandProcessor.java |  142 -
 .../http/SetAttributesCommandProcessor.java        |  195 -
 .../mx4j/tools/adaptor/http/XSLTProcessor.java     |  522 --
 .../tools/adaptor/http/XSLTProcessorMBean.java     |  109 -
 .../src/main/resources/META-INF/LICENCE-MX4J       |   51 -
 .../src/main/resources/META-INF/LICENSE            |  202 -
 .../src/main/resources/META-INF/NOTICE             |   13 -
 .../mx4j/tools/adaptor/http/xsl/about.xsl          |  124 -
 .../mx4j/tools/adaptor/http/xsl/common.xsl         |  452 --
 .../mx4j/tools/adaptor/http/xsl/constructors.xsl   |  243 -
 .../mx4j/tools/adaptor/http/xsl/create.xsl         |   85 -
 .../mx4j/tools/adaptor/http/xsl/delete.xsl         |   82 -
 .../mx4j/tools/adaptor/http/xsl/emptymbean.xsl     |   73 -
 .../mx4j/tools/adaptor/http/xsl/error.xsl          |   67 -
 .../mx4j/tools/adaptor/http/xsl/favicon.ico        |  Bin 1406 -> 0 bytes
 .../mx4j/tools/adaptor/http/xsl/identity.xsl       |   30 -
 .../mx4j/tools/adaptor/http/xsl/invoke.xsl         |  105 -
 .../resources/mx4j/tools/adaptor/http/xsl/logo.gif |  Bin 2135 -> 0 bytes
 .../mx4j/tools/adaptor/http/xsl/mbean.xsl          |  401 --
 .../tools/adaptor/http/xsl/mbean_attributes.xsl    |  388 --
 .../resources/mx4j/tools/adaptor/http/xsl/mlet.xsl |   92 -
 .../mx4j/tools/adaptor/http/xsl/monitor.xsl        |  158 -
 .../mx4j/tools/adaptor/http/xsl/monitor_create.xsl |  110 -
 .../mx4j/tools/adaptor/http/xsl/relation.xsl       |  189 -
 .../mx4j/tools/adaptor/http/xsl/server.xsl         |  100 -
 .../mx4j/tools/adaptor/http/xsl/serverbydomain.xsl |  145 -
 .../mx4j/tools/adaptor/http/xsl/setattribute.xsl   |   91 -
 .../mx4j/tools/adaptor/http/xsl/setattributes.xsl  |   99 -
 .../mx4j/tools/adaptor/http/xsl/strings_en.xml     |  223 -
 .../mx4j/tools/adaptor/http/xsl/stylesheet.css     |  436 --
 .../mx4j/tools/adaptor/http/xsl/timer.xsl          |  132 -
 .../mx4j/tools/adaptor/http/xsl/timer_create.xsl   |   93 -
 .../mx4j/tools/adaptor/http/xsl/viewarray.xsl      |  121 -
 .../mx4j/tools/adaptor/http/xsl/viewcollection.xsl |  130 -
 .../mx4j/tools/adaptor/http/xsl/viewmap.xsl        |  142 -
 .../mx4j/tools/adaptor/http/xsl/xalan-ext.xsl      |   45 -
 mosgi/jmx.registry/pom.xml                         |   83 -
 .../registry/mx4j/tools/naming/NamingService.java  |   93 -
 .../mx4j/tools/naming/NamingServiceIfc.java        |   21 -
 .../mx4j/tools/naming/NamingServiceMBean.java      |   47 -
 .../src/main/resources/META-INF/LICENCE-MX4J       |   51 -
 .../src/main/resources/META-INF/LICENSE            |  202 -
 .../src/main/resources/META-INF/NOTICE             |   13 -
 mosgi/jmx.remotelogger/pom.xml                     |   88 -
 .../felix/mosgi/jmx/remotelogger/Logger.java       |  216 -
 .../felix/mosgi/jmx/remotelogger/LoggerMBean.java  |   27 -
 .../src/main/resources/META-INF/LICENSE            |  202 -
 .../src/main/resources/META-INF/NOTICE             |   10 -
 mosgi/jmx.rmiconnector/pom.xml                     |  103 -
 .../jmx/rmiconnector/RmiConnectorActivator.java    |  212 -
 .../mx4j/remote/AbstractHeartBeat.java             |  113 -
 .../jmx/rmiconnector/mx4j/remote/ClientProxy.java  |   51 -
 .../mx4j/remote/ConnectionNotificationEmitter.java |   87 -
 .../mx4j/remote/ConnectionResolver.java            |  144 -
 .../DefaultRemoteNotificationServerHandler.java    |  334 --
 .../jmx/rmiconnector/mx4j/remote/HeartBeat.java    |   32 -
 .../mx4j/remote/MX4JRemoteConstants.java           |  107 -
 .../rmiconnector/mx4j/remote/MX4JRemoteUtils.java  |  339 --
 .../mx4j/remote/NotificationTuple.java             |  142 -
 .../rmiconnector/mx4j/remote/ProviderFactory.java  |  175 -
 .../rmiconnector/mx4j/remote/ProviderHelper.java   |   73 -
 .../remote/RemoteNotificationClientHandler.java    |  401 --
 .../remote/RemoteNotificationServerHandler.java    |   43 -
 .../mx4j/remote/provider/RMIClientProvider.java    |   39 -
 .../mx4j/remote/provider/RMIServerProvider.java    |   41 -
 .../mx4j/remote/provider/rmi/ServerProvider.java   |   29 -
 .../mx4j/remote/resolver/rmi/RMIResolver.java      |  303 --
 .../mx4j/remote/rmi/ClientExceptionCatcher.java    |   68 -
 .../mx4j/remote/rmi/ClientInvoker.java             |  255 -
 .../mx4j/remote/rmi/ClientUnmarshaller.java        |   91 -
 .../mx4j/remote/rmi/RMIConnectionInvoker.java      |  304 --
 .../mx4j/remote/rmi/RMIConnectionProxy.java        |   53 -
 .../remote/rmi/RMIConnectionSubjectInvoker.java    |  115 -
 .../rmiconnector/mx4j/remote/rmi/RMIHeartBeat.java |   47 -
 .../mx4j/remote/rmi/RMIMarshaller.java             |  181 -
 .../rmi/RMIRemoteNotificationServerHandler.java    |   60 -
 .../src/main/resources/META-INF/LICENCE-MX4J       |   51 -
 .../src/main/resources/META-INF/LICENSE            |  202 -
 .../src/main/resources/META-INF/NOTICE             |   13 -
 mosgi/managedelements.bundlesprobes.tab/pom.xml    |   89 -
 .../bundlesprobes/tab/BundlesProbesModelTabUI.java |  164 -
 .../bundlesprobes/tab/BundlesProbesTabUI.java      |  236 -
 .../src/main/resources/META-INF/LICENSE            |  202 -
 .../src/main/resources/META-INF/NOTICE             |   10 -
 mosgi/managedelements.bundlesprobes/pom.xml        |   93 -
 .../bundlesprobes/BundlesProbes.java               |  220 -
 .../bundlesprobes/BundlesProbesMBean.java          |   31 -
 .../src/main/resources/META-INF/LICENSE            |  202 -
 .../src/main/resources/META-INF/NOTICE             |   10 -
 mosgi/managedelements.memoryprobe/pom.xml          |   95 -
 .../managedelements/memoryprobe/MemoryProbe.java   |   66 -
 .../memoryprobe/MemoryProbeMBean.java              |   26 -
 .../src/main/resources/META-INF/LICENSE            |  202 -
 .../src/main/resources/META-INF/NOTICE             |   10 -
 mosgi/managedelements.obrprobe.tab/pom.xml         |   89 -
 .../obrprobe/tab/ObrProbeTabUI.java                |  411 --
 .../src/main/resources/META-INF/LICENSE            |  202 -
 .../src/main/resources/META-INF/NOTICE             |   10 -
 mosgi/managedelements.obrprobe/pom.xml             |  100 -
 .../mosgi/managedelements/obrprobe/ObrProbe.java   |  193 -
 .../managedelements/obrprobe/ObrProbeMBean.java    |   31 -
 .../src/main/resources/META-INF/LICENSE            |  202 -
 .../src/main/resources/META-INF/NOTICE             |   10 -
 mosgi/managedelements.osgiprobes.tab/pom.xml       |   83 -
 .../osgiprobes/tab/OsgiProbesTabUI.java            |  121 -
 .../src/main/resources/META-INF/LICENSE            |  202 -
 .../src/main/resources/META-INF/NOTICE             |   10 -
 mosgi/managedelements.osgiprobes/pom.xml           |   95 -
 .../managedelements/osgiprobes/OsgiProbes.java     |  140 -
 .../osgiprobes/OsgiProbesMBean.java                |   38 -
 .../src/main/resources/META-INF/LICENSE            |  202 -
 .../src/main/resources/META-INF/NOTICE             |   10 -
 mosgi/pom.xml                                      |   51 -
 org.apache.felix.daemon/pom.xml                    |   43 -
 .../java/org/apache/felix/daemon/FelixLayout.java  |   65 -
 .../main/java/org/apache/felix/daemon/Service.java |  296 -
 org.osgi.service.obr/LICENSE                       |  202 -
 org.osgi.service.obr/NOTICE                        |   22 -
 org.osgi.service.obr/pom.xml                       |   62 -
 .../main/java/org/osgi/service/obr/Capability.java |   48 -
 .../org/osgi/service/obr/CapabilityProvider.java   |   49 -
 .../obr/InterruptedResolutionException.java        |   45 -
 .../main/java/org/osgi/service/obr/Repository.java |   63 -
 .../java/org/osgi/service/obr/RepositoryAdmin.java |  169 -
 .../org/osgi/service/obr/RepositoryPermission.java |   40 -
 .../java/org/osgi/service/obr/Requirement.java     |   53 -
 .../main/java/org/osgi/service/obr/Resolver.java   |   85 -
 .../main/java/org/osgi/service/obr/Resource.java   |   89 -
 .../resources/org/osgi/service/obr/packageinfo     |    1 -
 prefs/obr.xml                                      |   34 -
 prefs/pom.xml                                      |  122 -
 .../main/appended-resources/META-INF/DEPENDENCIES  |   16 -
 prefs/src/main/appended-resources/META-INF/NOTICE  |    5 -
 .../java/org/apache/felix/prefs/BackingStore.java  |   76 -
 .../apache/felix/prefs/BackingStoreManager.java    |   33 -
 .../java/org/apache/felix/prefs/ChangeSet.java     |  150 -
 .../apache/felix/prefs/PreferencesDescription.java |   46 -
 .../org/apache/felix/prefs/PreferencesImpl.java    |  691 ---
 .../felix/prefs/impl/DataFileBackingStoreImpl.java |  255 -
 .../felix/prefs/impl/PreferencesManager.java       |  250 -
 .../felix/prefs/impl/PreferencesServiceImpl.java   |  123 -
 .../felix/prefs/impl/StreamBackingStoreImpl.java   |  208 -
 .../java/org/apache/felix/prefs/package-info.java  |   25 -
 .../apache/felix/prefs/PreferencesImplTest.java    |   60 -
 resolver/doc/changelog.txt                         |  103 -
 resolver/pom.xml                                   |  131 -
 .../main/appended-resources/META-INF/DEPENDENCIES  |   22 -
 .../src/main/appended-resources/META-INF/NOTICE    |    4 -
 .../java/org/apache/felix/resolver/Activator.java  |   52 -
 .../java/org/apache/felix/resolver/Candidates.java | 1346 -----
 .../java/org/apache/felix/resolver/Logger.java     |  134 -
 .../org/apache/felix/resolver/ResolutionError.java |   47 -
 .../org/apache/felix/resolver/ResolverImpl.java    | 2562 ---------
 .../felix/resolver/SimpleHostedCapability.java     |   61 -
 .../main/java/org/apache/felix/resolver/Util.java  |  118 -
 .../java/org/apache/felix/resolver/WireImpl.java   |  116 -
 .../apache/felix/resolver/WrappedCapability.java   |  130 -
 .../apache/felix/resolver/WrappedRequirement.java  |  102 -
 .../org/apache/felix/resolver/WrappedResource.java |  130 -
 .../felix/resolver/reason/ReasonException.java     |   96 -
 .../org/apache/felix/resolver/util/ArrayMap.java   |  184 -
 .../felix/resolver/util/CandidateSelector.java     |   90 -
 .../apache/felix/resolver/util/CopyOnWriteSet.java |  250 -
 .../apache/felix/resolver/util/OpenHashMap.java    | 1554 ------
 .../felix/resolver/util/OpenHashMapList.java       |   45 -
 .../apache/felix/resolver/util/OpenHashMapSet.java |   49 -
 .../org/apache/felix/resolver/util/ShadowList.java |   76 -
 .../osgi/service/resolver/HostedCapability.java    |   55 -
 .../osgi/service/resolver/ResolutionException.java |  104 -
 .../org/osgi/service/resolver/ResolveContext.java  |  332 --
 .../java/org/osgi/service/resolver/Resolver.java   |  132 -
 .../org/osgi/service/resolver/package-info.java    |   40 -
 .../org/apache/felix/resolver/reason/packageinfo   |    1 -
 .../felix/resolver/test/BigResolutionTest.java     |  447 --
 .../felix/resolver/test/FELIX_4914_Test.java       |  138 -
 .../java/org/apache/felix/resolver/test/Main.java  |  465 --
 .../apache/felix/resolver/test/ResolverTest.java   | 1719 ------
 .../felix/resolver/test/util/BundleCapability.java |   79 -
 .../resolver/test/util/BundleRequirement.java      |   71 -
 .../resolver/test/util/CandidateComparator.java    |  144 -
 .../felix/resolver/test/util/CapabilitySet.java    |  618 ---
 .../felix/resolver/test/util/ClauseParser.java     |  296 -
 .../resolver/test/util/GenericCapability.java      |   79 -
 .../resolver/test/util/GenericRequirement.java     |   92 -
 .../resolver/test/util/IdentityCapability.java     |   71 -
 .../resolver/test/util/IterativeResolver.java      |  200 -
 .../felix/resolver/test/util/JsonReader.java       |  349 --
 .../resolver/test/util/PackageCapability.java      |   78 -
 .../resolver/test/util/PackageRequirement.java     |   70 -
 .../resolver/test/util/ResolveContextImpl.java     |  117 -
 .../felix/resolver/test/util/ResourceImpl.java     |  112 -
 .../felix/resolver/test/util/SimpleFilter.java     |  651 ---
 resolver/src/test/resources/felix-4914.json        |   59 -
 resolver/src/test/resources/resolution.json        |    1 -
 rootcause/.travis.yml                              |    1 -
 rootcause/LICENSE                                  |  201 -
 rootcause/README.md                                |   29 -
 rootcause/docs/README.md                           |   50 -
 rootcause/pom.xml                                  |  203 -
 .../java/org/apache/felix/rootcause/DSComp.java    |   38 -
 .../java/org/apache/felix/rootcause/DSRef.java     |   38 -
 .../org/apache/felix/rootcause/DSRootCause.java    |  165 -
 .../apache/felix/rootcause/RootCauseCommand.java   |   49 -
 .../apache/felix/rootcause/RootCausePrinter.java   |   94 -
 .../org/apache/felix/rootcause/package-info.java   |   22 -
 .../apache/felix/rootcause/DSRootCauseTest.java    |  128 -
 .../rootcause/examples/CompWithCyclicRef.java      |   28 -
 .../rootcause/examples/CompWithMissingConfig.java  |   31 -
 .../rootcause/examples/CompWithMissingRef.java     |   32 -
 .../rootcause/examples/CompWithMissingRef2.java    |   31 -
 .../rootcause/examples/CompWithoutService.java     |   31 -
 .../org/apache/felix/rootcause/util/BaseTest.java  |   88 -
 .../apache/felix/rootcause/util/BndDSOptions.java  |   43 -
 rootcause/src/test/resources/exam.properties       |   17 -
 rootcause/src/test/resources/logback.xml           |   30 -
 scr-compat/changelog.txt                           |   11 -
 scr-compat/pom.xml                                 |   97 -
 .../main/java/org/apache/felix/scr/Component.java  |  403 --
 .../main/java/org/apache/felix/scr/Reference.java  |  150 -
 .../main/java/org/apache/felix/scr/ScrInfo.java    |   54 -
 .../main/java/org/apache/felix/scr/ScrService.java |   92 -
 .../apache/felix/scr/impl/compat/Activator.java    |  148 -
 .../apache/felix/scr/impl/compat/ScrCommand.java   |   58 -
 .../felix/scr/impl/compat/ScrServiceImpl.java      |  437 --
 scr-ext-anno/pom.xml                               |   51 -
 .../org/apache/felix/scr/ext/annotation/DSExt.java |   73 -
 .../felix/scr/ext/annotation/package-info.java     |   19 -
 scr/README.md                                      |  179 -
 scr/bnd.bnd                                        |   35 -
 scr/changelog.txt                                  |  696 ---
 scr/obr.xml                                        |   39 -
 scr/pom.xml                                        |  406 --
 .../main/appended-resources/META-INF/DEPENDENCIES  |   31 -
 scr/src/main/appended-resources/META-INF/LICENSE   |    8 -
 scr/src/main/appended-resources/META-INF/NOTICE    |    4 -
 .../felix/scr/component/ExtComponentContext.java   |   55 -
 .../scr/component/ExtFactoryComponentInstance.java |   30 -
 .../apache/felix/scr/impl/AbstractExtender.java    |  258 -
 .../java/org/apache/felix/scr/impl/Activator.java  |  706 ---
 .../felix/scr/impl/BundleComponentActivator.java   |  774 ---
 .../felix/scr/impl/ComponentActorThread.java       |  179 -
 .../apache/felix/scr/impl/ComponentCommands.java   |  651 ---
 .../felix/scr/impl/ComponentCommandsScrInfo.java   |  117 -
 .../apache/felix/scr/impl/ComponentRegistry.java   |  784 ---
 .../felix/scr/impl/ComponentRegistryKey.java       |   81 -
 .../scr/impl/config/ScrConfigurationImpl.java      |  451 --
 .../felix/scr/impl/config/ScrManagedService.java   |   53 -
 .../config/ScrManagedServiceServiceFactory.java    |   56 -
 .../felix/scr/impl/config/ScrMetaTypeProvider.java |  261 -
 .../config/ScrMetaTypeProviderServiceFactory.java  |   57 -
 .../apache/felix/scr/impl/helper/Coercions.java    |  493 --
 .../impl/helper/ComponentServiceObjectsHelper.java |  237 -
 .../felix/scr/impl/helper/ConfigAdminTracker.java  |   94 -
 .../felix/scr/impl/helper/ReadOnlyDictionary.java  |  212 -
 .../felix/scr/impl/inject/ActivatorParameter.java  |   35 -
 .../felix/scr/impl/inject/BaseParameter.java       |   35 -
 .../felix/scr/impl/inject/BindParameters.java      |   36 -
 .../scr/impl/inject/ComponentConstructor.java      |   43 -
 .../felix/scr/impl/inject/ComponentMethods.java    |   42 -
 .../felix/scr/impl/inject/InitReferenceMethod.java |   35 -
 .../felix/scr/impl/inject/LifecycleMethod.java     |   36 -
 .../apache/felix/scr/impl/inject/MethodResult.java |   68 -
 .../apache/felix/scr/impl/inject/OpenStatus.java   |   30 -
 .../org/apache/felix/scr/impl/inject/RefPair.java  |   77 -
 .../felix/scr/impl/inject/ReferenceMethod.java     |   63 -
 .../felix/scr/impl/inject/ReferenceMethods.java    |   83 -
 .../felix/scr/impl/inject/ScrComponentContext.java |   41 -
 .../apache/felix/scr/impl/inject/ValueUtils.java   |  429 --
 .../felix/scr/impl/inject/field/FieldHandler.java  |  592 --
 .../felix/scr/impl/inject/field/FieldMethods.java  |   72 -
 .../felix/scr/impl/inject/field/FieldUtils.java    |  315 --
 .../scr/impl/inject/internal/Annotations.java      |  451 --
 .../felix/scr/impl/inject/internal/ClassUtils.java |  252 -
 .../inject/internal/ComponentConstructorImpl.java  |  362 --
 .../impl/inject/internal/ComponentMethodsImpl.java |  142 -
 .../inject/internal/DuplexReferenceMethods.java    |  146 -
 .../scr/impl/inject/methods/ActivateMethod.java    |  322 --
 .../felix/scr/impl/inject/methods/BaseMethod.java  |  697 ---
 .../felix/scr/impl/inject/methods/BindMethod.java  |  704 ---
 .../felix/scr/impl/inject/methods/BindMethods.java |   79 -
 .../scr/impl/inject/methods/DeactivateMethod.java  |   44 -
 .../scr/impl/inject/methods/ModifiedMethod.java    |   44 -
 .../SuitableMethodNotAccessibleException.java      |   25 -
 .../scr/impl/inject/methods/UnbindMethod.java      |   44 -
 .../scr/impl/inject/methods/UpdatedMethod.java     |   44 -
 .../apache/felix/scr/impl/logger/BundleLogger.java |   33 -
 .../felix/scr/impl/logger/ComponentLogger.java     |   29 -
 .../felix/scr/impl/logger/ExtLogManager.java       |   93 -
 .../felix/scr/impl/logger/InternalLogger.java      |  118 -
 .../felix/scr/impl/logger/LogConfiguration.java    |   97 -
 .../apache/felix/scr/impl/logger/LogManager.java   |  323 --
 .../apache/felix/scr/impl/logger/NoOpLogger.java   |   71 -
 .../felix/scr/impl/logger/ScrLogManager.java       |  335 --
 .../apache/felix/scr/impl/logger/ScrLogger.java    |   39 -
 .../felix/scr/impl/logger/ScrLoggerFactory.java    |   71 -
 .../scr/impl/manager/AbstractComponentManager.java | 1512 ------
 .../scr/impl/manager/AbstractPrototypeRefPair.java |  110 -
 .../felix/scr/impl/manager/ComponentActivator.java |   64 -
 .../felix/scr/impl/manager/ComponentContainer.java |   45 -
 .../scr/impl/manager/ComponentContextImpl.java     |  342 --
 .../scr/impl/manager/ComponentFactoryImpl.java     |  433 --
 .../felix/scr/impl/manager/ComponentHolder.java    |  121 -
 .../felix/scr/impl/manager/ComponentManager.java   |   48 -
 .../impl/manager/ConfigurableComponentHolder.java  |  865 ---
 .../felix/scr/impl/manager/DependencyManager.java  | 2639 ---------
 .../apache/felix/scr/impl/manager/EdgeInfo.java    |  159 -
 .../scr/impl/manager/ExtendedServiceEvent.java     |   64 -
 .../scr/impl/manager/ExtendedServiceListener.java  |   26 -
 .../manager/ExtendedServiceListenerContext.java    |   31 -
 .../scr/impl/manager/MultiplePrototypeRefPair.java |   71 -
 .../PrototypeServiceFactoryComponentManager.java   |   32 -
 .../felix/scr/impl/manager/ReferenceManager.java   |   49 -
 .../impl/manager/RegionConfigurationSupport.java   |  859 ---
 .../scr/impl/manager/RegistrationManager.java      |  223 -
 .../felix/scr/impl/manager/ScrConfiguration.java   |   97 -
 .../manager/ServiceFactoryComponentManager.java    |  260 -
 .../felix/scr/impl/manager/ServiceTracker.java     | 1278 -----
 .../scr/impl/manager/ServiceTrackerCustomizer.java |  103 -
 .../scr/impl/manager/SingleComponentManager.java   | 1063 ----
 .../scr/impl/manager/SinglePrototypeRefPair.java   |   84 -
 .../felix/scr/impl/manager/SingleRefPair.java      |  116 -
 .../apache/felix/scr/impl/manager/ThreadDump.java  |   51 -
 .../felix/scr/impl/metadata/ComponentMetadata.java | 1647 ------
 .../apache/felix/scr/impl/metadata/DSVersion.java  |   69 -
 .../scr/impl/metadata/MetadataStoreHelper.java     |  174 -
 .../felix/scr/impl/metadata/PropertyMetadata.java  |  352 --
 .../felix/scr/impl/metadata/ReferenceMetadata.java |  890 ---
 .../felix/scr/impl/metadata/ServiceMetadata.java   |  192 -
 .../felix/scr/impl/metadata/TargetedPID.java       |  256 -
 .../impl/runtime/ServiceComponentRuntimeImpl.java  |  448 --
 .../apache/felix/scr/impl/xml/XmlConstants.java    |  121 -
 .../org/apache/felix/scr/impl/xml/XmlHandler.java  |  587 --
 .../java/org/apache/felix/scr/info/ScrInfo.java    |   53 -
 scr/src/test/java/DefaultPackageClass.java         |   28 -
 .../scr/impl/BundleComponentActivatorTest.java     |  183 -
 .../felix/scr/impl/ComponentRegistryKeyTest.java   |   72 -
 .../java/org/apache/felix/scr/impl/MockBundle.java |  236 -
 .../apache/felix/scr/impl/MockBundleContext.java   |  190 -
 .../felix/scr/impl/PackageIsolationTest.java       |  451 --
 .../scr/impl/inject/internal/AnnotationTest.java   |  707 ---
 .../impl/inject/methods/ActivateMethodTest.java    |  442 --
 .../scr/impl/inject/methods/BindMethodTest.java    |  504 --
 .../apache/felix/scr/impl/logger/LogService.java   |  347 --
 .../apache/felix/scr/impl/logger/LoggerTest.java   |  557 --
 .../felix/scr/impl/logger/MockBundleLogger.java    |   66 -
 .../felix/scr/impl/logger/MockComponentLogger.java |   40 -
 .../felix/scr/impl/logger/MockScrLogger.java       |   48 -
 .../impl/manager/AbstractComponentManagerTest.java |   56 -
 .../scr/impl/manager/ConfigurationSupportTest.java |   31 -
 .../manager/ConfiguredComponentHolderTest.java     |  240 -
 .../scr/impl/manager/RegistrationManagerTest.java  |  152 -
 .../impl/manager/SingleComponentManagerTest.java   |  262 -
 .../scr/impl/manager/components/FakeService.java   |   25 -
 .../impl/manager/components/SuperFakeService.java  |   24 -
 .../felix/scr/impl/manager/components/T1.java      |  405 --
 .../felix/scr/impl/manager/components/T1MapSR.java |   42 -
 .../felix/scr/impl/manager/components/T1a.java     |   27 -
 .../felix/scr/impl/manager/components/T3.java      |   30 -
 .../felix/scr/impl/manager/components2/T2.java     |  218 -
 .../felix/scr/impl/metadata/ComponentBase.java     |  112 -
 .../impl/metadata/ComponentMetaDataCacheTest.java  |  283 -
 .../scr/impl/metadata/ComponentMetadataTest.java   |  989 ----
 .../felix/scr/impl/metadata/XmlHandlerTest.java    |  399 --
 .../scr/impl/metadata/instances/AcceptMethod.java  |   73 -
 .../scr/impl/metadata/instances/BaseObject.java    |  116 -
 .../scr/impl/metadata/instances/Level1Object.java  |   42 -
 .../scr/impl/metadata/instances/Level3Object.java  |   52 -
 .../scr/impl/metadata/instances2/Level2Object.java |   68 -
 .../runtime/ServiceComponentRuntimeImplTest.java   |   87 -
 .../apache/felix/scr/impl/xml/XmlHandlerTest.java  |  143 -
 .../scr/integration/ActivateSignatureTest.java     |   76 -
 .../felix/scr/integration/AnnoConfigTest.java      |  315 --
 .../scr/integration/AnyServiceReferenceTest.java   |  254 -
 .../felix/scr/integration/CircularFactoryTest.java |   55 -
 .../scr/integration/CircularReferenceTest.java     |  328 --
 .../scr/integration/ComponentActivationTest.java   |  226 -
 .../scr/integration/ComponentConcurrencyTest.java  |   69 -
 .../integration/ComponentConfigurationPidTest.java |   94 -
 .../integration/ComponentConfigurationTest.java    |  591 --
 .../scr/integration/ComponentConstructorTest.java  |  318 --
 .../scr/integration/ComponentDisposeTest.java      |   83 -
 .../felix/scr/integration/ComponentEnableTest.java |   65 -
 .../scr/integration/ComponentFactoryTest.java      |  429 --
 .../integration/ComponentFieldActivationTest.java  |  125 -
 .../ComponentMetaDataCacheIntegrationTest.java     |  288 -
 .../scr/integration/ComponentOptionalTest.java     |  216 -
 .../felix/scr/integration/ComponentTestBase.java   | 1337 -----
 .../scr/integration/ConfigurationChangeTest.java   |  325 --
 .../ConfigurationComponentFactoryTest.java         |  106 -
 .../apache/felix/scr/integration/ExtenderTest.java |   60 -
 .../felix/scr/integration/Felix3680Test.java       |   83 -
 .../felix/scr/integration/Felix3680_2Test.java     |   87 -
 .../felix/scr/integration/Felix4188Test.java       |  166 -
 .../felix/scr/integration/Felix4350Test.java       |  160 -
 .../felix/scr/integration/Felix4984Test.java       |  107 -
 .../felix/scr/integration/Felix5248Test.java       |   65 -
 .../felix/scr/integration/Felix5276Test.java       |   81 -
 .../felix/scr/integration/Felix5356Test.java       |  122 -
 .../felix/scr/integration/Felix6161Test.java       |  148 -
 .../felix/scr/integration/Felix6274Test.java       |  166 -
 .../scr/integration/Felix6325OptionalLogTest.java  |  177 -
 .../apache/felix/scr/integration/LocateTest.java   |   72 -
 .../apache/felix/scr/integration/LocationTest.java |  187 -
 .../scr/integration/MinimumCardinalityTest.java    |  141 -
 .../scr/integration/MutablePropertiesTest.java     |  243 -
 .../PersistentComponentFactoryTest.java            |  399 --
 .../scr/integration/SatisfyingConditionTest.java   |  208 -
 .../scr/integration/ServiceBindGreedyTest.java     | 1386 -----
 .../felix/scr/integration/ServiceBindTest.java     | 1264 -----
 .../felix/scr/integration/ServiceChangedTest.java  |  571 --
 .../scr/integration/ServiceComponentTest.java      |  192 -
 .../felix/scr/integration/TargetPropertyTest.java  |  114 -
 .../felix/scr/integration/TargetedPIDTest.java     |  146 -
 .../integration/components/ActivatorComponent.java |  104 -
 .../components/AnyServiceComponent.java            |  108 -
 .../components/AnyServiceComponentInvalid.java     |   28 -
 .../components/AnyServiceComponentList.java        |   30 -
 .../components/AnyServiceComponentMap.java         |   30 -
 .../components/ConstructorComponent.java           |  210 -
 .../components/ConstructorMultiReference.java      |   40 -
 .../components/ConstructorSingleReference.java     |   52 -
 .../integration/components/EnableComponent.java    |   48 -
 .../integration/components/Felix4188Component.java |   44 -
 .../integration/components/Felix4350Component.java |   72 -
 .../components/FieldActivatorComponent.java        |  149 -
 .../components/InjectOptionalComponent.java        |  203 -
 .../integration/components/MutatingService.java    |   29 -
 .../components/MutatingServiceConsumer.java        |   61 -
 .../components/MutatingServiceImpl.java            |  110 -
 .../SatisfyingConditionComponentClass.java         |   35 -
 .../integration/components/SimpleComponent.java    |  180 -
 .../integration/components/SimpleComponent2.java   |   76 -
 .../scr/integration/components/SimpleService.java  |   26 -
 .../scr/integration/components/SimpleService2.java |   26 -
 .../integration/components/SimpleService2Impl.java |  133 -
 .../integration/components/SimpleServiceImpl.java  |  150 -
 .../AbstractActivateSignatureTestComponent.java    |   68 -
 .../Signature_Package_BundleContext.java           |   33 -
 .../Signature_Package_ComponentContext.java        |   32 -
 .../activatesignature/Signature_Package_Map.java   |   31 -
 .../Signature_Private_BundleContext.java           |   33 -
 .../Signature_Private_ComponentContext.java        |   33 -
 .../activatesignature/Signature_Private_Map.java   |   33 -
 .../Signature_Protected_BundleContext.java         |   33 -
 .../Signature_Protected_ComponentContext.java      |   32 -
 .../activatesignature/Signature_Protected_Map.java |   32 -
 .../Signature_Public_BundleContext.java            |   33 -
 .../Signature_Public_ComponentContext.java         |   32 -
 .../activatesignature/Signature_Public_Map.java    |   32 -
 .../components/annoconfig/AnnoComponent.java       |   90 -
 .../components/annoconfig/NestedAnnoComponent.java |   67 -
 .../scr/integration/components/circular/A.java     |   62 -
 .../scr/integration/components/circular/B.java     |   62 -
 .../components/circularFactory/FactoryClient.java  |   50 -
 .../circularFactory/FactoryInstance.java           |   24 -
 .../scr/integration/components/concurrency/A.java  |   22 -
 .../components/concurrency/AFactory.java           |   62 -
 .../scr/integration/components/concurrency/B.java  |   18 -
 .../scr/integration/components/concurrency/C.java  |   16 -
 .../components/concurrency/CFactory.java           |   61 -
 .../integration/components/deadlock/Consumer.java  |   44 -
 .../components/deadlock/TestComponent.java         |   91 -
 .../scr/integration/components/felix3680/A.java    |   46 -
 .../scr/integration/components/felix3680/B.java    |   31 -
 .../scr/integration/components/felix3680/C.java    |   30 -
 .../scr/integration/components/felix3680/D.java    |   30 -
 .../scr/integration/components/felix3680/E.java    |   30 -
 .../scr/integration/components/felix3680/F.java    |   34 -
 .../scr/integration/components/felix3680/G.java    |   34 -
 .../scr/integration/components/felix3680/H.java    |   34 -
 .../scr/integration/components/felix3680/I.java    |   34 -
 .../scr/integration/components/felix3680/J.java    |   34 -
 .../scr/integration/components/felix3680/K.java    |   30 -
 .../scr/integration/components/felix3680/Main.java |  262 -
 .../scr/integration/components/felix3680_2/A.java  |   75 -
 .../scr/integration/components/felix3680_2/B.java  |   22 -
 .../scr/integration/components/felix3680_2/C.java  |   22 -
 .../scr/integration/components/felix3680_2/D.java  |   22 -
 .../scr/integration/components/felix3680_2/E.java  |   22 -
 .../scr/integration/components/felix3680_2/F.java  |   22 -
 .../scr/integration/components/felix3680_2/G.java  |   22 -
 .../scr/integration/components/felix3680_2/H.java  |   22 -
 .../scr/integration/components/felix3680_2/I.java  |   22 -
 .../scr/integration/components/felix3680_2/J.java  |   22 -
 .../scr/integration/components/felix3680_2/K.java  |   22 -
 .../integration/components/felix3680_2/Main.java   |  317 --
 .../components/felix4188/Felix4188Component.java   |   46 -
 .../scr/integration/components/felix4984/A.java    |   68 -
 .../scr/integration/components/felix4984/B.java    |   44 -
 .../components/felix5248/Component.java            |   34 -
 .../scr/integration/components/felix5276/A.java    |   24 -
 .../scr/integration/components/felix5276/B.java    |   46 -
 .../scr/integration/components/felix5276/C.java    |   47 -
 .../components/felix6274_1/Component.java          |   33 -
 .../components/felix6274_2/Component.java          |   34 -
 .../components/felix6274_hook/Activator.java       |   94 -
 .../components/metadata/cache/Activator.java       |   69 -
 .../components/metadata/cache/SimpleService.java   |   24 -
 .../metadata/cache/SimpleServiceImpl.java          |   30 -
 .../java/org/osgi/service/condition/Condition.java |   77 -
 scr/src/test/resources/components_10.xml           |   90 -
 scr/src/test/resources/components_11.xml           |   90 -
 scr/src/test/resources/components_12.xml           |   94 -
 scr/src/test/resources/components_13.xml           |   99 -
 scr/src/test/resources/components_14.xml           |  148 -
 scr/src/test/resources/components_activate_10.xml  |   39 -
 scr/src/test/resources/components_activate_11.xml  |   26 -
 .../components_all_elements_10.properties          |   20 -
 .../test/resources/components_all_elements_10.xml  |   96 -
 scr/src/test/resources/components_anonymous_10.xml |   24 -
 scr/src/test/resources/components_anonymous_11.xml |   24 -
 .../components_duplicate_implementation_10.xml     |   26 -
 .../components_duplicate_implementation_11.xml     |   26 -
 .../resources/components_duplicate_service_10.xml  |   31 -
 .../resources/components_duplicate_service_11.xml  |   31 -
 scr/src/test/resources/components_no_namespace.xml |   22 -
 .../test/resources/components_properties_11.xml    |   26 -
 scr/src/test/resources/factory_14.properties       |   19 -
 .../test/resources/integration_test_FELIX_3680.xml |  155 -
 .../resources/integration_test_FELIX_3880_2.xml    |   65 -
 .../test/resources/integration_test_FELIX_4188.xml |   13 -
 .../resources/integration_test_FELIX_4188_1.xml    |   20 -
 .../resources/integration_test_FELIX_4188_2.xml    |   20 -
 .../test/resources/integration_test_FELIX_4350.xml |   74 -
 .../test/resources/integration_test_FELIX_4984.xml |   63 -
 .../test/resources/integration_test_FELIX_5248.xml |   27 -
 .../test/resources/integration_test_FELIX_5276.xml |   61 -
 .../test/resources/integration_test_FELIX_6161.xml |  108 -
 .../resources/integration_test_FELIX_6274_1.xml    |   27 -
 .../resources/integration_test_FELIX_6274_2.xml    |   27 -
 .../integration_test_activation_components.xml     |  233 -
 .../test/resources/integration_test_annoconfig.xml |   38 -
 .../resources/integration_test_any_service.xml     |  211 -
 .../test/resources/integration_test_circular.xml   |  340 --
 .../resources/integration_test_circularFactory.xml |   55 -
 .../integration_test_component_concurrency.xml     |   64 -
 .../integration_test_component_metadata_cache.xml  |   94 -
 .../integration_test_component_metadata_cache2.xml |   36 -
 .../resources/integration_test_constructor.xml     |  131 -
 scr/src/test/resources/integration_test_enable.xml |   30 -
 ...ntegration_test_field_activation_components.xml |   58 -
 .../resources/integration_test_inject_optional.xml |  146 -
 scr/src/test/resources/integration_test_locate.xml |   45 -
 .../resources/integration_test_min_cardinality.xml |   48 -
 .../integration_test_mutable_properties.xml        |  131 -
 ...egration_test_persistent_factory_components.xml |  130 -
 .../integration_test_satisfying_condition.xml      |  147 -
 .../integration_test_signature_components.xml      |   69 -
 .../integration_test_simple_components.xml         |  150 -
 ...test_simple_components_configuration_change.xml |  293 -
 ...on_test_simple_components_configuration_pid.xml |   31 -
 ...integration_test_simple_components_location.xml |   31 -
 ...tion_test_simple_components_service_binding.xml |  294 -
 ...st_simple_components_service_binding_greedy.xml |  313 --
 .../integration_test_simple_factory_components.xml |  130 -
 .../integration_test_target_properties.xml         |  133 -
 scr/src/test/resources/parsertest-nopropvalue.xml  |   34 -
 scr/src/test/resources/reference_anonymous_10.xml  |   26 -
 scr/src/test/resources/reference_anonymous_11.xml  |   26 -
 .../resources/satisfying-condition-specified.xml   |   23 -
 shell.gui.plugin/pom.xml                           |   79 -
 .../apache/felix/shell/gui/plugin/Activator.java   |   51 -
 .../felix/shell/gui/plugin/BundleListPlugin.java   |  362 --
 .../apache/felix/shell/gui/plugin/OBRPlugin.java   |  730 ---
 .../felix/shell/gui/plugin/OutputAreaStream.java   |   49 -
 .../shell/gui/plugin/ScrollableOutputArea.java     |   80 -
 .../apache/felix/shell/gui/plugin/ShellPlugin.java |  185 -
 shell.gui/pom.xml                                  |   60 -
 .../java/org/apache/felix/shell/gui/Plugin.java    |   40 -
 .../org/apache/felix/shell/gui/impl/Activator.java |  248 -
 .../apache/felix/shell/gui/impl/ShellPanel.java    |  170 -
 shell.remote/DEPENDENCIES                          |   20 -
 shell.remote/LICENSE                               |  202 -
 shell.remote/NOTICE                                |    6 -
 shell.remote/doc/changelog.txt                     |   16 -
 shell.remote/obr.xml                               |   31 -
 shell.remote/pom.xml                               |   89 -
 .../org/apache/felix/shell/remote/Activator.java   |   52 -
 .../apache/felix/shell/remote/AtomicInteger.java   |   81 -
 .../org/apache/felix/shell/remote/Listener.java    |  255 -
 .../apache/felix/shell/remote/ReentrantLock.java   |  189 -
 .../apache/felix/shell/remote/ServiceMediator.java |  234 -
 .../java/org/apache/felix/shell/remote/Shell.java  |  197 -
 .../felix/shell/remote/TerminalPrintStream.java    |   89 -
 .../apache/felix/shell/remote/TerminalReader.java  |  222 -
 shell.tui/LICENSE                                  |  202 -
 shell.tui/NOTICE                                   |   24 -
 shell.tui/doc/apache-felix-shell-tui.html          |   40 -
 .../apache-felix-small.png                         |  Bin 6700 -> 0 bytes
 .../doc/apache-felix-shell-tui_files/apache.png    |  Bin 12242 -> 0 bytes
 .../doc/apache-felix-shell-tui_files/button.html   |    3 -
 .../button_data/2008-usa-125x125.png               |  Bin 13952 -> 0 bytes
 .../doc/apache-felix-shell-tui_files/linkext7.gif  |  Bin 166 -> 0 bytes
 .../doc/apache-felix-shell-tui_files/logo.png      |  Bin 14927 -> 0 bytes
 .../doc/apache-felix-shell-tui_files/site.css      |   25 -
 shell.tui/doc/changelog.txt                        |   37 -
 shell.tui/obr.xml                                  |   21 -
 shell.tui/pom.xml                                  |   79 -
 .../java/org/apache/felix/shell/tui/Activator.java |  201 -
 shell/doc/apache-felix-shell-service.html          |  439 --
 .../apache-felix-small.png                         |  Bin 6700 -> 0 bytes
 .../apache-felix-shell-service_files/apache.png    |  Bin 12242 -> 0 bytes
 .../apache-felix-shell-service_files/button.html   |    3 -
 .../button_data/2008-usa-125x125.png               |  Bin 13952 -> 0 bytes
 .../apache-felix-shell-service_files/linkext7.gif  |  Bin 166 -> 0 bytes
 .../doc/apache-felix-shell-service_files/logo.png  |  Bin 14927 -> 0 bytes
 .../mail_small.gif                                 |  Bin 202 -> 0 bytes
 .../doc/apache-felix-shell-service_files/site.css  |   25 -
 shell/doc/changelog.txt                            |   82 -
 shell/obr.xml                                      |   31 -
 shell/pom.xml                                      |   84 -
 shell/src/main/appended-resources/META-INF/NOTICE  |    4 -
 .../java/org/apache/felix/shell/CdCommand.java     |   51 -
 .../main/java/org/apache/felix/shell/Command.java  |   70 -
 .../java/org/apache/felix/shell/ShellService.java  |   97 -
 .../org/apache/felix/shell/impl/Activator.java     |  333 --
 .../felix/shell/impl/BundleLevelCommandImpl.java   |  198 -
 .../org/apache/felix/shell/impl/CdCommandImpl.java |   88 -
 .../apache/felix/shell/impl/FindCommandImpl.java   |  115 -
 .../felix/shell/impl/HeadersCommandImpl.java       |  113 -
 .../apache/felix/shell/impl/HelpCommandImpl.java   |  118 -
 .../felix/shell/impl/InspectCommandImpl.java       |  841 ---
 .../felix/shell/impl/InstallCommandImpl.java       |  166 -
 .../apache/felix/shell/impl/LogCommandImpl.java    |  130 -
 .../org/apache/felix/shell/impl/LogOptions.java    |   86 -
 .../org/apache/felix/shell/impl/PsCommandImpl.java |  215 -
 .../felix/shell/impl/RefreshCommandImpl.java       |  115 -
 .../felix/shell/impl/ResolveCommandImpl.java       |  110 -
 .../felix/shell/impl/ShutdownCommandImpl.java      |   64 -
 .../apache/felix/shell/impl/StartCommandImpl.java  |  148 -
 .../felix/shell/impl/StartLevelCommandImpl.java    |   95 -
 .../apache/felix/shell/impl/StopCommandImpl.java   |  126 -
 .../shell/impl/SystemPropertiesCommandImpl.java    |  102 -
 .../felix/shell/impl/UninstallCommandImpl.java     |   93 -
 .../apache/felix/shell/impl/UpdateCommandImpl.java |  175 -
 .../java/org/apache/felix/shell/impl/Util.java     |  103 -
 .../felix/shell/impl/VersionCommandImpl.java       |   55 -
 .../ungoverned/osgi/service/shell/CdCommand.java   |   51 -
 .../org/ungoverned/osgi/service/shell/Command.java |   70 -
 .../osgi/service/shell/ShellService.java           |   97 -
 .../apache/felix/shell/impl/LogOptionsTest.java    |  130 -
 .../felix/shell/impl/SystemPropertiesTest.java     |   68 -
 stage_existing_artifact.sh                         |   55 -
 systemready/.travis.yml                            |    1 -
 systemready/LICENSE                                |  201 -
 systemready/README.md                              |   33 -
 systemready/bnd.bnd                                |    4 -
 systemready/docs/README.md                         |  125 -
 systemready/docs/why_systemready.md                |   33 -
 systemready/pom.xml                                |  247 -
 .../org/apache/felix/systemready/CheckStatus.java  |   81 -
 .../org/apache/felix/systemready/StateType.java    |   28 -
 .../org/apache/felix/systemready/SystemReady.java  |   30 -
 .../apache/felix/systemready/SystemReadyCheck.java |   47 -
 .../felix/systemready/SystemReadyMonitor.java      |   37 -
 .../org/apache/felix/systemready/SystemStatus.java |   49 -
 .../felix/systemready/impl/ComponentsCheck.java    |  168 -
 .../systemready/impl/FrameworkStartCheck.java      |  124 -
 .../felix/systemready/impl/ServicesCheck.java      |  134 -
 .../systemready/impl/SystemReadyMonitorImpl.java   |  191 -
 .../org/apache/felix/systemready/impl/Tracker.java |   53 -
 .../systemready/impl/servlet/StatusReporter.java   |   51 -
 .../systemready/impl/servlet/StatusWriterJson.java |   55 -
 .../impl/servlet/SystemAliveServlet.java           |   96 -
 .../impl/servlet/SystemReadyServlet.java           |   96 -
 .../org/apache/felix/systemready/package-info.java |   22 -
 .../org/apache/felix/systemready/StateTest.java    |   39 -
 .../systemready/osgi/ComponentsCheckTest.java      |   95 -
 .../systemready/osgi/FrameworkStartTestGreen.java  |   58 -
 .../systemready/osgi/FrameworkStartTestYellow.java |   59 -
 .../felix/systemready/osgi/ServicesCheckTest.java  |   68 -
 .../apache/felix/systemready/osgi/ServletTest.java |  123 -
 .../systemready/osgi/SystemReadyMonitorTest.java   |  119 -
 .../osgi/examples/CompWithoutService.java          |   31 -
 .../osgi/examples/CompWithoutService2.java         |   31 -
 .../osgi/examples/TestSystemReadyCheck.java        |   61 -
 .../felix/systemready/osgi/util/BaseTest.java      |  168 -
 .../felix/systemready/osgi/util/BndDSOptions.java  |   43 -
 systemready/src/test/resources/exam.properties     |   17 -
 systemready/src/test/resources/logback.xml         |   30 -
 threaddump/pom.xml                                 |  144 -
 .../threaddump/internal/Jdk14ThreadDumper.java     |   90 -
 .../threaddump/internal/ThreadDumpActivator.java   |   69 -
 .../internal/ThreadDumpInventoryPrinter.java       |   85 -
 .../felix/threaddump/internal/ThreadDumper.java    |   34 -
 .../felix/threaddump/internal/ThreadWriter.java    |  128 -
 .../internal/jdk5/Jdk15ThreadDumper.java           |  202 -
 .../internal/jdk5/ThreadStateConverter.java        |   61 -
 .../internal/jdk6/Jdk16ThreadDumper.java           |  118 -
 tools/maven-bundle-plugin/DEPENDENCIES             |   30 -
 tools/maven-bundle-plugin/LICENSE                  |  202 -
 tools/maven-bundle-plugin/NOTICE                   |    6 -
 tools/maven-bundle-plugin/changelog.txt            |  506 --
 tools/maven-bundle-plugin/pom.xml                  |  352 --
 tools/maven-bundle-plugin/src/it/archiver/pom.xml  |   50 -
 .../src/it/archiver/verify.groovy                  |   22 -
 .../maven-bundle-plugin/src/it/dep-reduced/pom.xml |   55 -
 .../src/it/dep-reduced/verify.groovy               |   27 -
 .../src/it/embed-multiple-artifacts/pom.xml        |   54 -
 .../src/it/embed-multiple-artifacts/verify.groovy  |   25 -
 .../src/it/existing-metadata-no-update/.gitignore  |    1 -
 .../src/it/existing-metadata-no-update/pom.xml     |   55 -
 .../it/existing-metadata-no-update/prebuild.groovy |   24 -
 .../target/classes/META-INF/MANIFEST.MF            |    0
 ...rg.apache.felix_maven-bundle-plugin_manifest_xx |    1 -
 .../it/existing-metadata-no-update/verify.groovy   |   22 -
 .../src/it/no-test-scoped-imports/pom.xml          |   59 -
 .../src/main/java/org/apache/felix/test/Dummy.java |   25 -
 .../src/it/no-test-scoped-imports/verify.groovy    |   25 -
 .../src/it/reproducible-manifest/pom.xml           |   70 -
 .../src/it/reproducible-manifest/verify.groovy     |   27 -
 .../src/it/reproducible/pom.xml                    |   52 -
 .../src/it/reproducible/verify.groovy              |   27 -
 .../bundleplugin/AbstractDependencyFilter.java     |  267 -
 .../org/apache/felix/bundleplugin/AntPlugin.java   |   96 -
 .../apache/felix/bundleplugin/BlueprintPlugin.java |  389 --
 .../apache/felix/bundleplugin/BundleAllPlugin.java |  580 --
 .../org/apache/felix/bundleplugin/BundleInfo.java  |  113 -
 .../apache/felix/bundleplugin/BundlePlugin.java    | 2263 --------
 .../felix/bundleplugin/DependencyEmbedder.java     |  303 --
 .../felix/bundleplugin/DependencyExcluder.java     |   72 -
 .../felix/bundleplugin/InstructionsPlugin.java     |   71 -
 .../felix/bundleplugin/JarPluginConfiguration.java |   94 -
 .../org/apache/felix/bundleplugin/JpaPlugin.java   |  166 -
 .../apache/felix/bundleplugin/ManifestPlugin.java  |  617 ---
 .../apache/felix/bundleplugin/ManifestWriter.java  |  201 -
 .../apache/felix/bundleplugin/RelativizePath.java  |  111 -
 .../org/apache/felix/bundleplugin/ScrPlugin.java   |  164 -
 .../felix/bundleplugin/VerifyBundlePlugin.java     |  186 -
 .../felix/bundleplugin/VersionCleanerPlugin.java   |   78 -
 .../org/apache/felix/bundleplugin/WrapPlugin.java  |   47 -
 .../baseline/AbstractBaselinePlugin.java           |  603 ---
 .../bundleplugin/baseline/BaselinePlugin.java      |  290 -
 .../bundleplugin/baseline/BaselineReport.java      |  384 --
 .../felix/bundleplugin/baseline/DiffMessage.java   |   52 -
 .../bundleplugin/baseline/InfoComparator.java      |   34 -
 .../apache/felix/obrplugin/AbstractFileMojo.java   |  126 -
 .../java/org/apache/felix/obrplugin/Config.java    |  101 -
 .../org/apache/felix/obrplugin/ObrCleanRepo.java   |  315 --
 .../java/org/apache/felix/obrplugin/ObrDeploy.java |  329 --
 .../org/apache/felix/obrplugin/ObrDeployFile.java  |  216 -
 .../java/org/apache/felix/obrplugin/ObrIndex.java  |  262 -
 .../org/apache/felix/obrplugin/ObrInstall.java     |  176 -
 .../org/apache/felix/obrplugin/ObrInstallFile.java |  107 -
 .../org/apache/felix/obrplugin/ObrRemoteClean.java |  481 --
 .../java/org/apache/felix/obrplugin/ObrUpdate.java |  384 --
 .../java/org/apache/felix/obrplugin/ObrUtils.java  |  173 -
 .../java/org/apache/felix/obrplugin/PomHelper.java |   84 -
 .../apache/felix/obrplugin/RemoteFileManager.java  |  373 --
 .../java/org/apache/felix/obrplugin/XmlHelper.java |  110 -
 .../shared/osgi/DefaultMaven2OsgiConverter.java    |  335 --
 .../shared/osgi/ManifestReadingException.java      |   53 -
 .../maven/shared/osgi/Maven2OsgiConverter.java     |   63 -
 .../META-INF/m2e/lifecycle-mapping-metadata.xml    |   40 -
 .../main/resources/META-INF/plexus/components.xml  |   65 -
 .../src/main/resources/SchemaObr.xsd               |   99 -
 .../src/main/resources/baseline-report.properties  |   26 -
 .../src/main/resources/build.xml                   |   65 -
 .../apache/felix/bundleplugin/baseline/access.gif  |    1 -
 .../felix/bundleplugin/baseline/annotated.gif      |    1 -
 .../felix/bundleplugin/baseline/annotation.gif     |    1 -
 .../apache/felix/bundleplugin/baseline/bundle.gif  |    1 -
 .../apache/felix/bundleplugin/baseline/class.gif   |    4 -
 .../felix/bundleplugin/baseline/constant.gif       |    3 -
 .../apache/felix/bundleplugin/baseline/enum.gif    |    3 -
 .../apache/felix/bundleplugin/baseline/error.gif   |    1 -
 .../apache/felix/bundleplugin/baseline/extends.gif |    3 -
 .../apache/felix/bundleplugin/baseline/field.gif   |    1 -
 .../felix/bundleplugin/baseline/implements.gif     |    1 -
 .../apache/felix/bundleplugin/baseline/info.gif    |    1 -
 .../felix/bundleplugin/baseline/interface.gif      |    2 -
 .../apache/felix/bundleplugin/baseline/method.gif  |    1 -
 .../apache/felix/bundleplugin/baseline/package.gif |    1 -
 .../felix/bundleplugin/baseline/resource.gif       |    1 -
 .../apache/felix/bundleplugin/baseline/return.gif  |    1 -
 .../apache/felix/bundleplugin/baseline/version.gif |    1 -
 .../apache/felix/bundleplugin/baseline/warning.gif |    2 -
 .../org/apache/felix/bundleplugin/blueprint.xsl    |  195 -
 .../org/apache/felix/bundleplugin/jpa.xsl          |  167 -
 .../org/apache/felix/bundleplugin/scr.xsl          |   97 -
 tools/maven-bundle-plugin/src/site/apt/index.apt   |   85 -
 tools/maven-bundle-plugin/src/site/site.xml        |   38 -
 .../bundleplugin/AbstractBundlePluginTest.java     |   89 -
 .../felix/bundleplugin/ArtifactStubFactory.java    |   75 -
 .../felix/bundleplugin/BlueprintComponentTest.java |  172 -
 .../felix/bundleplugin/BundleAllPluginTest.java    |  149 -
 .../felix/bundleplugin/BundlePluginTest.java       |  438 --
 .../apache/felix/bundleplugin/JpaPluginTest.java   |   73 -
 .../felix/bundleplugin/ManifestWriterTest.java     |   53 -
 .../java/org/apache/felix/bundleplugin/packageinfo |   19 -
 .../maven/shared/osgi/Maven2OsgiConverterTest.java |  177 -
 .../src/test/resources/OSGI-INF/blueprint/bp.xml   |   81 -
 .../src/test/resources/aopalliance-1.0.jar         |  Bin 4467 -> 0 bytes
 .../src/test/resources/commons-logging-1.1.jar     |  Bin 52915 -> 0 bytes
 .../src/test/resources/junit-3.8.2.jar             |  Bin 120640 -> 0 bytes
 ...org.apache.maven.maven-model_2.1.0.SNAPSHOT.jar |  Bin 106735 -> 0 bytes
 .../src/test/resources/test-1.jar                  |  Bin 2426 -> 0 bytes
 .../maven-bundle-plugin/src/test/resources/test.mf |  153 -
 .../src/test/resources/test2.mf                    |   44 -
 .../src/test/resources/xercesImpl-2.6.2.jar        |  Bin 1010675 -> 0 bytes
 .../src/test/resources/xml-apis-1.0.b2.jar         |  Bin 109318 -> 0 bytes
 tools/maven-bundle-plugin/upgrade_local_poms.sh    |   30 -
 tools/maven-scr-plugin/README.md                   |    5 -
 tools/maven-scr-plugin/changelog.txt               |  250 -
 tools/maven-scr-plugin/pom.xml                     |  124 -
 .../maven-scr-plugin/src/it/basic-build-it/pom.xml |   99 -
 .../org/apache/felix/scr/SimpleDSComponent.java    |   66 -
 .../src/it/external-annotations-it/pom.xml         |  104 -
 .../org/apache/felix/scr/SimpleDSComponent.java    |   71 -
 tools/maven-scr-plugin/src/it/settings.xml         |   53 -
 .../main/appended-resources/META-INF/DEPENDENCIES  |    8 -
 .../org/apache/felix/scrplugin/mojo/MavenLog.java  |  190 -
 .../felix/scrplugin/mojo/MavenProjectScanner.java  |  239 -
 .../felix/scrplugin/mojo/SCRDescriptorMojo.java    |  557 --
 .../META-INF/m2e/lifecycle-mapping-metadata.xml    |   34 -
 tools/org.apache.felix.scr.annotations/README.md   |    5 -
 .../org.apache.felix.scr.annotations/changelog.txt |  120 -
 tools/org.apache.felix.scr.annotations/pom.xml     |   58 -
 .../main/appended-resources/META-INF/DEPENDENCIES  |    8 -
 .../org/apache/felix/scr/annotations/Activate.java |   42 -
 .../apache/felix/scr/annotations/AutoDetect.java   |   33 -
 .../apache/felix/scr/annotations/Component.java    |  152 -
 .../felix/scr/annotations/ConfigurationPolicy.java |   43 -
 .../apache/felix/scr/annotations/Deactivate.java   |   41 -
 .../org/apache/felix/scr/annotations/Modified.java |   41 -
 .../apache/felix/scr/annotations/Properties.java   |   42 -
 .../org/apache/felix/scr/annotations/Property.java |  205 -
 .../felix/scr/annotations/PropertyOption.java      |   47 -
 .../felix/scr/annotations/PropertyUnbounded.java   |   37 -
 .../apache/felix/scr/annotations/Reference.java    |  123 -
 .../scr/annotations/ReferenceCardinality.java      |   69 -
 .../felix/scr/annotations/ReferencePolicy.java     |   38 -
 .../scr/annotations/ReferencePolicyOption.java     |   45 -
 .../felix/scr/annotations/ReferenceStrategy.java   |   31 -
 .../apache/felix/scr/annotations/References.java   |   42 -
 .../org/apache/felix/scr/annotations/Service.java  |   58 -
 .../org/apache/felix/scr/annotations/Services.java |   39 -
 .../apache/felix/scr/annotations/package-info.java |   25 -
 .../felix/scr/annotations/sling/SlingFilter.java   |  114 -
 .../scr/annotations/sling/SlingFilterScope.java    |   54 -
 .../felix/scr/annotations/sling/SlingServlet.java  |  131 -
 .../processing/SCRAnnotationProcessor.java         |  485 --
 .../processing/SlingAnnotationProcessor.java       |  251 -
 ...felix.scrplugin.annotations.AnnotationProcessor |   20 -
 tools/org.apache.felix.scr.ant/README.md           |    4 -
 tools/org.apache.felix.scr.ant/changelog.txt       |  206 -
 tools/org.apache.felix.scr.ant/pom.xml             |  110 -
 .../main/appended-resources/META-INF/DEPENDENCIES  |   18 -
 .../src/main/appended-resources/META-INF/LICENSE   |   31 -
 .../src/main/appended-resources/META-INF/NOTICE    |    7 -
 .../org/apache/felix/scrplugin/ant/AntLog.java     |  160 -
 .../felix/scrplugin/ant/SCRDescriptorTask.java     |  242 -
 .../src/main/resources/scrtask.properties          |   21 -
 tools/org.apache.felix.scr.bnd/README.md           |    5 -
 tools/org.apache.felix.scr.bnd/changelog.txt       |   94 -
 tools/org.apache.felix.scr.bnd/pom.xml             |  129 -
 .../main/appended-resources/META-INF/DEPENDENCIES  |   27 -
 .../src/main/appended-resources/META-INF/LICENSE   |   31 -
 .../src/main/appended-resources/META-INF/NOTICE    |    7 -
 .../org/apache/felix/scrplugin/bnd/BndLog.java     |  299 -
 .../scrplugin/bnd/SCRDescriptorBndPlugin.java      |  342 --
 .../org.apache.felix.scr.ds-annotations/README.md  |    5 -
 .../changelog.txt                                  |   23 -
 tools/org.apache.felix.scr.ds-annotations/pom.xml  |   83 -
 .../main/appended-resources/META-INF/DEPENDENCIES  |   13 -
 .../felix/scrplugin/ds/DSAnnotationProcessor.java  |  351 --
 ...felix.scrplugin.annotations.AnnotationProcessor |   19 -
 tools/org.apache.felix.scr.generator/README.md     |    4 -
 tools/org.apache.felix.scr.generator/changelog.txt |  218 -
 tools/org.apache.felix.scr.generator/pom.xml       |  123 -
 .../main/appended-resources/META-INF/DEPENDENCIES  |   18 -
 .../src/main/appended-resources/META-INF/LICENSE   |   31 -
 .../main/java/org/apache/felix/scrplugin/Log.java  |  214 -
 .../java/org/apache/felix/scrplugin/Options.java   |  194 -
 .../java/org/apache/felix/scrplugin/Project.java   |   69 -
 .../java/org/apache/felix/scrplugin/Result.java    |   88 -
 .../felix/scrplugin/SCRDescriptorException.java    |   49 -
 .../scrplugin/SCRDescriptorFailureException.java   |   35 -
 .../felix/scrplugin/SCRDescriptorGenerator.java    |  702 ---
 .../java/org/apache/felix/scrplugin/Source.java    |   39 -
 .../org/apache/felix/scrplugin/SpecVersion.java    |  111 -
 .../scrplugin/annotations/AnnotationProcessor.java |   57 -
 .../scrplugin/annotations/ClassAnnotation.java     |   40 -
 .../scrplugin/annotations/FieldAnnotation.java     |   76 -
 .../scrplugin/annotations/MethodAnnotation.java    |   52 -
 .../scrplugin/annotations/ScannedAnnotation.java   |  167 -
 .../felix/scrplugin/annotations/ScannedClass.java  |  126 -
 .../scrplugin/description/AbstractDescription.java |   76 -
 .../scrplugin/description/ClassDescription.java    |  122 -
 .../description/ComponentConfigurationPolicy.java  |   41 -
 .../description/ComponentDescription.java          |  305 --
 .../scrplugin/description/PropertyDescription.java |  177 -
 .../felix/scrplugin/description/PropertyType.java  |   63 -
 .../scrplugin/description/PropertyUnbounded.java   |   34 -
 .../description/ReferenceCardinality.java          |   75 -
 .../description/ReferenceDescription.java          |  216 -
 .../scrplugin/description/ReferencePolicy.java     |   36 -
 .../description/ReferencePolicyOption.java         |   43 -
 .../scrplugin/description/ReferenceStrategy.java   |   29 -
 .../scrplugin/description/ServiceDescription.java  |   82 -
 .../helper/AnnotationProcessorManager.java         |  111 -
 .../felix/scrplugin/helper/ClassModifier.java      |  152 -
 .../felix/scrplugin/helper/ClassScanner.java       |  672 ---
 .../felix/scrplugin/helper/ComponentContainer.java |  137 -
 .../scrplugin/helper/ComponentContainerUtil.java   |   71 -
 .../scrplugin/helper/DescriptionContainer.java     |   71 -
 .../apache/felix/scrplugin/helper/IssueLog.java    |  130 -
 .../helper/MetatypeAttributeDefinition.java        |  118 -
 .../felix/scrplugin/helper/MetatypeContainer.java  |   71 -
 .../apache/felix/scrplugin/helper/StringUtils.java |   29 -
 .../apache/felix/scrplugin/helper/Validator.java   |  693 ---
 .../felix/scrplugin/xml/ComponentDescriptorIO.java |  834 ---
 .../org/apache/felix/scrplugin/xml/IOUtils.java    |  135 -
 .../org/apache/felix/scrplugin/xml/MetaTypeIO.java |  416 --
 .../scrplugin/SCRDescriptorGeneratorTest.java      |  124 -
 .../org/apache/felix/scrplugin/SourceImpl.java     |   39 -
 ...onentWithClassReferenceAndMissingInterface.java |   28 -
 .../test/java/testComponents/SimpleComponent.java  |   25 -
 tools/osgicheck-maven-plugin/README.md             |   65 -
 tools/osgicheck-maven-plugin/pom.xml               |  175 -
 .../apache/felix/maven/osgicheck/impl/Check.java   |   28 -
 .../felix/maven/osgicheck/impl/CheckContext.java   |   48 -
 .../felix/maven/osgicheck/impl/CheckMojo.java      |  312 --
 .../impl/checks/ConsumerProviderTypeCheck.java     |  155 -
 .../osgicheck/impl/checks/ImportExportCheck.java   |   76 -
 .../maven/osgicheck/impl/checks/SCRCheck.java      |  359 --
 .../osgicheck/impl/featureutil/ManifestUtil.java   |   88 -
 .../osgicheck/impl/featureutil/PackageInfo.java    |  108 -
 .../impl/mddocgen/AbstractMarkdownMojo.java        |  165 -
 .../maven/osgicheck/impl/mddocgen/ClassName.java   |   74 -
 .../osgicheck/impl/mddocgen/MavenScrLogger.java    |  103 -
 .../mddocgen/MetatypeMarkdownGeneratorMojo.java    |  259 -
 .../mddocgen/ServicesMarkdownGeneratorMojo.java    |  173 -
 .../osgicheck/impl/mddocgen/SyntheticBundle.java   |  227 -
 .../org/apache/felix/scr/impl/metadata/Faker.java  |   31 -
 transaction/integration-test/pom.xml               |   92 -
 .../org/apache/felix/transaction/itests/Test.java  |  108 -
 .../org/apache/felix/transaction/MANIFEST.MF       |   30 -
 transaction/org.apache.felix.transaction/pom.xml   |  225 -
 .../felix/transaction/internal/Activator.java      |  101 -
 .../GeronimoPlatformTransactionManager.java        |  170 -
 .../internal/TransactionManagerService.java        |  220 -
 transaction/pom.xml                                |   39 -
 upnp/basedriver/LICENSE                            |  202 -
 upnp/basedriver/LICENSE.cgupnpjava                 |   25 -
 upnp/basedriver/LICENSE.cyberdomo                  |   24 -
 upnp/basedriver/LICENSE.kxml2                      |   19 -
 upnp/basedriver/NOTICE                             |   34 -
 upnp/basedriver/obr.xml                            |    9 -
 upnp/basedriver/pom.xml                            |  247 -
 .../apache/felix/upnp/basedriver/Activator.java    |  258 -
 .../upnp/basedriver/controller/DevicesInfo.java    |   59 -
 .../basedriver/controller/DriverController.java    |   79 -
 .../controller/impl/DriverControllerImpl.java      |  147 -
 .../upnp/basedriver/export/ActionDispatcher.java   |   47 -
 .../felix/upnp/basedriver/export/BuildDevice.java  |  294 -
 .../felix/upnp/basedriver/export/DeviceNode.java   |  183 -
 .../export/ExporterUPnPEventListener.java          |   82 -
 .../basedriver/export/GeneralActionListener.java   |  159 -
 .../export/RootDeviceExportingQueue.java           |   70 -
 .../upnp/basedriver/export/RootDeviceListener.java |  210 -
 .../upnp/basedriver/export/ThreadExporter.java     |  415 --
 .../upnp/basedriver/importer/core/MyCtrlPoint.java |  917 ----
 .../basedriver/importer/core/OSGiDeviceInfo.java   |   49 -
 .../importer/core/event/message/FirstMessage.java  |   69 -
 .../core/event/message/ListenerModified.java       |   45 -
 .../core/event/message/ListenerUnRegistration.java |   39 -
 .../importer/core/event/message/SidExipired.java   |   44 -
 .../importer/core/event/message/StateChanged.java  |   80 -
 .../importer/core/event/structs/Listener2Sids.java |   58 -
 .../importer/core/event/structs/Monitor.java       |  234 -
 .../importer/core/event/structs/NotifierQueue.java |   62 -
 .../importer/core/event/structs/Sid2Listeners.java |   85 -
 .../importer/core/event/structs/SidRenewer.java    |   50 -
 .../core/event/structs/SidsListenersMaps.java      |   76 -
 .../core/event/structs/StateVarsToNotify.java      |   68 -
 .../core/event/structs/SubscriptionQueue.java      |   63 -
 .../importer/core/event/thread/Notifier.java       |   64 -
 .../importer/core/event/thread/Renewer.java        |   83 -
 .../importer/core/event/thread/SubScriber.java     |   92 -
 .../importer/core/upnp/UPnPActionImpl.java         |  174 -
 .../importer/core/upnp/UPnPDeviceImpl.java         |  144 -
 .../importer/core/upnp/UPnPIconImpl.java           |  105 -
 .../importer/core/upnp/UPnPServiceImpl.java        |  159 -
 .../importer/core/upnp/UPnPStateVariableImpl.java  |  274 -
 .../upnp/basedriver/importer/util/DeviceSetup.java |  143 -
 .../importer/util/HTTPRequestForIcon.java          |   98 -
 .../basedriver/importer/util/ParseLocation.java    |   31 -
 .../upnp/basedriver/importer/util/ParseUSN.java    |   63 -
 .../basedriver/importer/util/StringSplitter.java   |   42 -
 .../apache/felix/upnp/basedriver/tool/Logger.java  |  253 -
 .../felix/upnp/basedriver/util/Constants.java      |   90 -
 .../felix/upnp/basedriver/util/Converter.java      |  254 -
 .../org/apache/xerces/impl/dv/util/Base64.java     |  307 --
 .../org/apache/xerces/impl/dv/util/HexBin.java     |  115 -
 .../upnp/basedriver/resources/upnp.properties      |   37 -
 upnp/doc/Felix UPnP Documentation (1.0).pdf        |  Bin 630844 -> 0 bytes
 upnp/doc/README                                    |   28 -
 upnp/doc/config.properties.upnp                    |  510 --
 upnp/doc/upnp.sh.bat                               |    8 -
 upnp/extra/LICENSE                                 |  202 -
 upnp/extra/NOTICE                                  |   23 -
 upnp/extra/doc/changelog.txt                       |    4 -
 upnp/extra/pom.xml                                 |   63 -
 .../apache/felix/upnp/extra/util/EventSource.java  |   33 -
 .../felix/upnp/extra/util/UPnPEventNotifier.java   |  259 -
 .../felix/upnp/extra/util/UPnPSubscriber.java      |  139 -
 upnp/pom.xml                                       |   85 -
 upnp/samples/binarylight/LICENSE                   |  202 -
 upnp/samples/binarylight/NOTICE                    |   25 -
 upnp/samples/binarylight/pom.xml                   |   95 -
 .../felix/upnp/sample/binaryLight/Activator.java   |  102 -
 .../felix/upnp/sample/binaryLight/LightModel.java  |  113 -
 .../felix/upnp/sample/binaryLight/LightUI.java     |  185 -
 .../sample/binaryLight/PresentationServlet.java    |   87 -
 .../binaryLight/actions/GetStatusAction.java       |   93 -
 .../binaryLight/actions/GetTargetAction.java       |   93 -
 .../binaryLight/actions/SetTargetAction.java       |   90 -
 .../sample/binaryLight/devices/LightDevice.java    |  153 -
 .../upnp/sample/binaryLight/icons/LightIcon.java   |   73 -
 .../binaryLight/services/PowerSwitchService.java   |  119 -
 .../statevariables/StatusStateVariable.java        |  102 -
 .../statevariables/TargetStateVariable.java        |   94 -
 .../upnp/sample/binaryLight/images/LightFail.gif   |  Bin 1050 -> 0 bytes
 .../upnp/sample/binaryLight/images/LightOff.gif    |  Bin 1062 -> 0 bytes
 .../upnp/sample/binaryLight/images/LightOn.gif     |  Bin 1072 -> 0 bytes
 .../felix/upnp/sample/binaryLight/images/logo.gif  |  Bin 339 -> 0 bytes
 upnp/samples/clock/LICENSE                         |  202 -
 upnp/samples/clock/LICENSE.cgupnpjava              |   25 -
 upnp/samples/clock/NOTICE                          |   30 -
 upnp/samples/clock/pom.xml                         |   89 -
 .../apache/felix/upnp/sample/clock/Activator.java  |   67 -
 .../org/apache/felix/upnp/sample/clock/Clock.java  |  156 -
 .../felix/upnp/sample/clock/ClockDevice.java       |  152 -
 .../apache/felix/upnp/sample/clock/ClockFrame.java |  123 -
 .../apache/felix/upnp/sample/clock/ClockIcon.java  |   69 -
 .../apache/felix/upnp/sample/clock/ClockPane.java  |  212 -
 .../felix/upnp/sample/clock/GetTimeAction.java     |   89 -
 .../upnp/sample/clock/ResultStateVariable.java     |   96 -
 .../felix/upnp/sample/clock/SetTimeAction.java     |   97 -
 .../felix/upnp/sample/clock/TimeStateVariable.java |  110 -
 .../felix/upnp/sample/clock/TimerService.java      |  107 -
 .../felix/upnp/sample/clock/images/clock.gif       |  Bin 2392 -> 0 bytes
 .../felix/upnp/sample/clock/images/clock.jpg       |  Bin 6910 -> 0 bytes
 .../apache/felix/upnp/sample/clock/images/logo.gif |  Bin 339 -> 0 bytes
 upnp/samples/pom.xml                               |   61 -
 upnp/samples/tv/LICENSE                            |  202 -
 upnp/samples/tv/LICENSE.cgupnpjava                 |   25 -
 upnp/samples/tv/NOTICE                             |   30 -
 upnp/samples/tv/pom.xml                            |   89 -
 .../org/apache/felix/upnp/sample/tv/Activator.java |   67 -
 .../felix/upnp/sample/tv/GetPowerAction.java       |   85 -
 .../apache/felix/upnp/sample/tv/PowerService.java  |  103 -
 .../felix/upnp/sample/tv/PowerStateVariable.java   |  120 -
 .../felix/upnp/sample/tv/ResultStateVariable.java  |   95 -
 .../felix/upnp/sample/tv/SetPowerAction.java       |   91 -
 .../org/apache/felix/upnp/sample/tv/TvDevice.java  |  325 --
 .../org/apache/felix/upnp/sample/tv/TvFrame.java   |  123 -
 .../org/apache/felix/upnp/sample/tv/TvIcon.java    |   69 -
 .../org/apache/felix/upnp/sample/tv/TvPane.java    |  214 -
 .../felix/upnp/sample/tv/UPnPSubscriber.java       |   63 -
 .../apache/felix/upnp/sample/tv/images/logo.gif    |  Bin 339 -> 0 bytes
 .../org/apache/felix/upnp/sample/tv/images/tv.gif  |  Bin 2392 -> 0 bytes
 .../org/apache/felix/upnp/sample/tv/images/tv.jpg  |  Bin 4043 -> 0 bytes
 .../apache/felix/upnp/sample/tv/images/tvon.jpg    |  Bin 16940 -> 0 bytes
 upnp/tester/LICENSE                                |  202 -
 upnp/tester/NOTICE                                 |   25 -
 upnp/tester/doc/changelog.txt                      |    4 -
 upnp/tester/pom.xml                                |   98 -
 .../org/apache/felix/upnp/tester/Activator.java    |   50 -
 .../org/apache/felix/upnp/tester/ControlPoint.java |  375 --
 .../org/apache/felix/upnp/tester/Mediator.java     |   93 -
 .../apache/felix/upnp/tester/UPnPSubscriber.java   |   90 -
 .../tester/discovery/DeviceChangeListener.java     |   31 -
 .../felix/upnp/tester/discovery/DeviceNode.java    |  215 -
 .../upnp/tester/discovery/DeviceNodeListener.java  |   28 -
 .../felix/upnp/tester/discovery/DevicesList.java   |   63 -
 .../felix/upnp/tester/discovery/DriverProxy.java   |  123 -
 .../upnp/tester/discovery/RootDeviceListener.java  |  302 --
 .../apache/felix/upnp/tester/gui/ActionPanel.java  |  366 --
 .../org/apache/felix/upnp/tester/gui/LogPanel.java |   74 -
 .../felix/upnp/tester/gui/PropertiesViewer.java    |  223 -
 .../felix/upnp/tester/gui/SubscriptionPanel.java   |  155 -
 .../apache/felix/upnp/tester/gui/TreeViewer.java   |  322 --
 .../felix/upnp/tester/gui/UPnPDeviceTreeNode.java  |  236 -
 .../org/apache/felix/upnp/tester/gui/Util.java     |  104 -
 .../java/org/apache/felix/upnp/tester/test.java    |   79 -
 .../tester/gui/IMAGES/AnimatedStateVariable.gif    |  Bin 4286 -> 0 bytes
 .../felix/upnp/tester/gui/IMAGES/DeviceNode.gif    |  Bin 874 -> 0 bytes
 .../tester/gui/IMAGES/EventedStateVariable.gif     |  Bin 870 -> 0 bytes
 .../upnp/tester/gui/IMAGES/RootDeviceNode.gif      |  Bin 891 -> 0 bytes
 .../tester/gui/IMAGES/SubscribedStateVariable.gif  |  Bin 890 -> 0 bytes
 .../felix/upnp/tester/gui/IMAGES/UPnPAction.gif    |  Bin 849 -> 0 bytes
 .../felix/upnp/tester/gui/IMAGES/UPnPService.gif   |  Bin 893 -> 0 bytes
 .../upnp/tester/gui/IMAGES/UPnPStateVariable.gif   |  Bin 850 -> 0 bytes
 .../apache/felix/upnp/tester/gui/IMAGES/logo.gif   |  Bin 339 -> 0 bytes
 useradmin/filestore/pom.xml                        |   96 -
 .../felix/useradmin/filestore/ResettableTimer.java |  123 -
 .../filestore/RoleRepositoryFileStore.java         |  263 -
 .../filestore/RoleRepositoryMemoryStore.java       |   86 -
 .../filestore/RoleRepositorySerializer.java        |  471 --
 .../felix/useradmin/filestore/StubGroupImpl.java   |  184 -
 .../felix/useradmin/filestore/osgi/Activator.java  |   54 -
 .../filestore/src/main/resources/DEPENDENCIES      |   21 -
 useradmin/filestore/src/main/resources/LICENSE     |  202 -
 useradmin/filestore/src/main/resources/NOTICE      |    7 -
 useradmin/filestore/src/main/resources/README      |   38 -
 .../useradmin/filestore/ResettableTimerTest.java   |  201 -
 .../RoleRepositoryFileStorePerformanceTest.java    |  168 -
 .../filestore/RoleRepositoryFileStoreTest.java     |  189 -
 .../filestore/RoleRepositorySerializerTest.java    |  405 --
 .../useradmin/filestore/StubGroupImplTest.java     |  125 -
 useradmin/itest/pom.xml                            |  173 -
 .../felix/useradmin/itest/BaseIntegrationTest.java |  191 -
 .../itest/FileStoreInitializationTest.java         |  103 -
 .../felix/useradmin/itest/MongoDBStoreTest.java    |  201 -
 .../useradmin/itest/UserAdminIntegrationTest.java  |  146 -
 useradmin/itest/src/test/resources/logback.xml     |   33 -
 useradmin/mongodb/pom.xml                          |  107 -
 .../apache/felix/useradmin/mongodb/KeyCodec.java   |  143 -
 .../apache/felix/useradmin/mongodb/MongoDB.java    |  155 -
 .../felix/useradmin/mongodb/MongoDBStore.java      |  381 --
 .../useradmin/mongodb/MongoSerializerHelper.java   |  267 -
 .../felix/useradmin/mongodb/RoleProvider.java      |   33 -
 .../felix/useradmin/mongodb/osgi/Activator.java    |   64 -
 .../useradmin/mongodb/osgi/LogServiceHelper.java   |   77 -
 useradmin/mongodb/src/main/resources/DEPENDENCIES  |   26 -
 useradmin/mongodb/src/main/resources/LICENSE       |  202 -
 useradmin/mongodb/src/main/resources/NOTICE        |    6 -
 useradmin/mongodb/src/main/resources/README        |   38 -
 .../felix/useradmin/mongodb/KeyCodecTest.java      |  202 -
 useradmin/pom.xml                                  |   37 -
 useradmin/useradmin/pom.xml                        |  111 -
 .../apache/felix/useradmin/BackendException.java   |   53 -
 .../org/apache/felix/useradmin/RoleFactory.java    |   89 -
 .../felix/useradmin/RoleRepositoryStore.java       |   82 -
 .../felix/useradmin/impl/AuthorizationImpl.java    |   95 -
 .../felix/useradmin/impl/EventDispatcher.java      |  226 -
 .../felix/useradmin/impl/RoleChangeListener.java   |   66 -
 .../apache/felix/useradmin/impl/RoleChecker.java   |  112 -
 .../felix/useradmin/impl/RoleRepository.java       |  394 --
 .../apache/felix/useradmin/impl/UserAdminImpl.java |  187 -
 .../useradmin/impl/UserAdminListenerList.java      |   33 -
 .../felix/useradmin/impl/role/GroupImpl.java       |  160 -
 .../useradmin/impl/role/ObservableDictionary.java  |  255 -
 .../felix/useradmin/impl/role/ObservableGroup.java |  111 -
 .../useradmin/impl/role/ObservableProperties.java  |   84 -
 .../felix/useradmin/impl/role/ObservableRole.java  |  173 -
 .../felix/useradmin/impl/role/ObservableUser.java  |   67 -
 .../apache/felix/useradmin/impl/role/RoleImpl.java |  131 -
 .../apache/felix/useradmin/impl/role/UserImpl.java |  112 -
 .../org/apache/felix/useradmin/osgi/Activator.java |   76 -
 .../felix/useradmin/osgi/EventAdminHelper.java     |   68 -
 .../useradmin/osgi/RoleRepositoryStoreHelper.java  |   87 -
 .../felix/useradmin/osgi/ServiceContext.java       |   66 -
 .../osgi/UserAdminListenerListHelper.java          |   57 -
 .../useradmin/src/main/resources/DEPENDENCIES      |   21 -
 useradmin/useradmin/src/main/resources/LICENSE     |  202 -
 useradmin/useradmin/src/main/resources/NOTICE      |    7 -
 useradmin/useradmin/src/main/resources/README      |   25 -
 .../useradmin/impl/AuthorizationImplTest.java      |  285 -
 .../felix/useradmin/impl/CustomRoleImplTest.java   |  484 --
 .../felix/useradmin/impl/EventDispatcherTest.java  |  300 -
 .../useradmin/impl/MemoryRoleRepositoryStore.java  |   85 -
 .../felix/useradmin/impl/RoleCheckerTest.java      |  217 -
 .../useradmin/impl/RoleRepositorySecurityTest.java |  144 -
 .../felix/useradmin/impl/RoleRepositoryTest.java   |  532 --
 .../felix/useradmin/impl/UserAdminImplTest.java    |  872 ---
 .../useradmin/impl/role/GroupImplSecurityTest.java |  160 -
 .../felix/useradmin/impl/role/GroupImplTest.java   |  196 -
 .../role/ObservableDictionarySecurityTest.java     |  173 -
 .../impl/role/ObservableDictionaryTest.java        |  247 -
 .../impl/role/ObservablePropertiesTest.java        |  119 -
 .../felix/useradmin/impl/role/RoleImplTest.java    |   96 -
 .../felix/useradmin/impl/role/UserImplTest.java    |  100 -
 utils/DEPENDENCIES                                 |   26 -
 utils/LICENSE                                      |  202 -
 utils/NOTICE                                       |    6 -
 utils/doc/changelog.txt                            |  136 -
 utils/pom.xml                                      |   92 -
 .../felix/utils/collections/DictionaryAsMap.java   |  110 -
 .../utils/collections/IteratorToEnumeration.java   |   50 -
 .../felix/utils/collections/MapToDictionary.java   |  100 -
 .../felix/utils/collections/StringArrayMap.java    |  339 --
 .../felix/utils/extender/AbstractExtender.java     |  328 --
 .../org/apache/felix/utils/extender/Extension.java |   38 -
 .../felix/utils/extender/SimpleExtension.java      |   70 -
 .../org/apache/felix/utils/filter/FilterImpl.java  | 1675 ------
 .../org/apache/felix/utils/json/JSONParser.java    |  358 --
 .../org/apache/felix/utils/json/JSONWriter.java    |  254 -
 .../java/org/apache/felix/utils/log/Logger.java    |  155 -
 .../org/apache/felix/utils/manifest/Attribute.java |   43 -
 .../org/apache/felix/utils/manifest/Clause.java    |  104 -
 .../org/apache/felix/utils/manifest/Directive.java |   43 -
 .../org/apache/felix/utils/manifest/Parser.java    |  211 -
 .../utils/properties/ConfigurationHandler.java     |  928 ----
 .../utils/properties/InterpolationHelper.java      |  454 --
 .../apache/felix/utils/properties/Properties.java  | 1244 -----
 .../felix/utils/properties/TypedProperties.java    |  459 --
 .../utils/repository/AggregateRepository.java      |   55 -
 .../felix/utils/repository/BaseRepository.java     |   93 -
 .../felix/utils/repository/JsonRepository.java     |  118 -
 .../apache/felix/utils/repository/StaxParser.java  |  451 --
 .../apache/felix/utils/repository/UrlLoader.java   |  163 -
 .../felix/utils/repository/XmlRepository.java      |  178 -
 .../resource/AbstractCapabilityRequirement.java    |   84 -
 .../felix/utils/resource/CapabilityImpl.java       |   78 -
 .../apache/felix/utils/resource/CapabilitySet.java |  476 --
 .../felix/utils/resource/RequirementImpl.java      |  136 -
 .../felix/utils/resource/ResourceBuilder.java      | 1204 ----
 .../apache/felix/utils/resource/ResourceImpl.java  |  135 -
 .../apache/felix/utils/resource/ResourceUtils.java |  102 -
 .../apache/felix/utils/resource/SimpleFilter.java  |  592 --
 .../utils/service/BaseManagedServiceFactory.java   |  208 -
 .../apache/felix/utils/version/VersionCleaner.java |  157 -
 .../apache/felix/utils/version/VersionRange.java   |  472 --
 .../apache/felix/utils/version/VersionTable.java   |   91 -
 .../utils/collections/StringArrayMapTest.java      |   38 -
 .../apache/felix/utils/filter/FilterImplTest.java  |  135 -
 .../apache/felix/utils/json/JSONParserTest.java    |  145 -
 .../apache/felix/utils/manifest/ParserTest.java    |   80 -
 .../utils/properties/ConfigurationHandlerTest.java |  344 --
 .../utils/properties/InterpolationHelperTest.java  |  202 -
 .../felix/utils/properties/MockBundleContext.java  |  151 -
 .../felix/utils/properties/PropertiesTest.java     |  355 --
 .../utils/properties/TypedPropertiesTest.java      |  175 -
 .../felix/utils/repository/RepositoryTest.java     |  101 -
 .../felix/utils/resource/CapabilityImplTest.java   |   74 -
 .../felix/utils/resource/CapabilitySetTest.java    |   59 -
 .../felix/utils/resource/RequirementImplTest.java  |  105 -
 .../felix/utils/resource/ResourceBuilderTest.java  |   33 -
 .../felix/utils/resource/SimpleFilterTest.java     |   87 -
 .../felix/utils/version/VersionCleanerTest.java    |   75 -
 .../felix/utils/version/VersionRangeTest.java      |  205 -
 .../org/apache/felix/utils/repository/repo.json    |    9 -
 .../org/apache/felix/utils/repository/repo.xml     |   53 -
 utils/src/test/resources/test.properties           |   21 -
 utils/src/test/resources/typed.properties          |   37 -
 utils/src/test/resources/typed2.properties         |   22 -
 utils/src/test/resources/typed3.properties         |   22 -
 wireadmin/pom.xml                                  |   70 -
 .../java/org/apache/felix/wireadmin/Activator.java |  128 -
 .../org/apache/felix/wireadmin/EventManager.java   |  269 -
 .../org/apache/felix/wireadmin/WireAdminImpl.java  | 1037 ----
 .../java/org/apache/felix/wireadmin/WireImpl.java  |  955 ----
 5807 files changed, 809028 deletions(-)

diff --git a/bundlerepository.osgi-ct/pom.xml b/bundlerepository.osgi-ct/pom.xml
deleted file mode 100644
index 7b4e13d9e8..0000000000
--- a/bundlerepository.osgi-ct/pom.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<!--
- 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:git:https://github.com/apache/felix-dev.git</connection>
-    <developerConnection>scm:git:https://github.com/apache/felix-dev.git</developerConnection>
-    <url>https://gitbox.apache.org/repos/asf?p=felix-dev.git</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>
diff --git a/bundlerepository.osgi-ct/src/main/java/org/apache/felix/bundlerepository/osgict/Activator.java b/bundlerepository.osgi-ct/src/main/java/org/apache/felix/bundlerepository/osgict/Activator.java
deleted file mode 100644
index d1d65b5681..0000000000
--- a/bundlerepository.osgi-ct/src/main/java/org/apache/felix/bundlerepository/osgict/Activator.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * 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();
-        }
-    }
-}
diff --git a/bundlerepository/DEPENDENCIES b/bundlerepository/DEPENDENCIES
deleted file mode 100644
index f91489810a..0000000000
--- a/bundlerepository/DEPENDENCIES
+++ /dev/null
@@ -1,32 +0,0 @@
-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
diff --git a/bundlerepository/LICENSE b/bundlerepository/LICENSE
deleted file mode 100644
index d645695673..0000000000
--- a/bundlerepository/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
diff --git a/bundlerepository/LICENSE.kxml2 b/bundlerepository/LICENSE.kxml2
deleted file mode 100644
index 1fe595b039..0000000000
--- a/bundlerepository/LICENSE.kxml2
+++ /dev/null
@@ -1,19 +0,0 @@
-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. 
diff --git a/bundlerepository/NOTICE b/bundlerepository/NOTICE
deleted file mode 100644
index 515c8d58fe..0000000000
--- a/bundlerepository/NOTICE
+++ /dev/null
@@ -1,16 +0,0 @@
-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.
-
diff --git a/bundlerepository/doc/apache-felix-osgi-bundle-repository.html b/bundlerepository/doc/apache-felix-osgi-bundle-repository.html
deleted file mode 100644
index 825a9ff451..0000000000
--- a/bundlerepository/doc/apache-felix-osgi-bundle-repository.html
+++ /dev/null
@@ -1,524 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html><head>
-
-
-  
-    <title>Apache Felix - Apache Felix OSGi Bundle Repository</title>
-    <link rel="stylesheet" href="apache-felix-osgi-bundle-repository_files/site.css" type="text/css" media="all">
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  </head><body>
-    <div class="title"><div class="logo"><a href="http://felix.apache.org/site/index.html"><img alt="Apache Felix" src="apache-felix-osgi-bundle-repository_files/logo.png" border="0"></a></div><div class="header"><a href="http://www.apache.org/"><img alt="Apache" src="apache-felix-osgi-bundle-repository_files/apache.png" border="0"></a></div></div>
-    <div class="menu">
-<ul>
-	<li><a href="http://cwiki.apache.org/FELIX/news.html" title="news">news</a></li>
-	<li><a href="http://cwiki.apache.org/FELIX/license.html" title="license">license</a></li>
-	<li><a href="http://felix.apache.org/site/downloads.cgi" rel="nofollow">downloads</a></li>
-	<li><a href="http://cwiki.apache.org/FELIX/documentation.html" title="documentation">documentation</a></li>
-	<li><a href="http://cwiki.apache.org/FELIX/mailinglists.html" title="mailinglists">mailing lists</a></li>
-	<li><a href="http://cwiki.apache.org/FELIX/contributing.html" title="Contributing">contributing</a></li>
-	<li><a href="http://www.apache.org/" rel="nofollow">asf</a></li>
-	<li><a href="http://www.apache.org/foundation/sponsorship.html" rel="nofollow">sponsorship</a></li>
-	<li><a href="http://www.apache.org/foundation/thanks.html" rel="nofollow">sponsors</a>
-<!-- ApacheCon Ad -->
-<iframe src="apache-felix-osgi-bundle-repository_files/button.html" style="border-width: 0pt; float: left;" frameborder="0" height="135" scrolling="no" width="135"></iframe>
-<p style="height: 100px;">
-<!-- ApacheCon Ad -->
-</p></li></ul> </div>
-    <div class="main">
-<h1><a name="ApacheFelixOSGiBundleRepository-ApacheFelixOSGiBundleRepository(OBR)"></a>Apache Felix OSGi Bundle Repository (OBR)</h1>
-
-<div>
-<ul>
-    <li><a href="#ApacheFelixOSGiBundleRepository-Motivation">Motivation</a></li>
-    <li><a href="#ApacheFelixOSGiBundleRepository-Overview">Overview</a></li>
-    <li><a href="#ApacheFelixOSGiBundleRepository-OBRRepositoryFile">OBR Repository File</a></li>
-    <li><a href="#ApacheFelixOSGiBundleRepository-OBRServiceAPI">OBR Service API</a></li>
-    <li><a href="#ApacheFelixOSGiBundleRepository-OBRShellCommand">OBR Shell Command</a></li>
-<ul>
-    <li><a href="#ApacheFelixOSGiBundleRepository-obrhelp">obr help</a></li>
-    <li><a href="#ApacheFelixOSGiBundleRepository-obrlisturl">obr list-url</a></li>
-    <li><a href="#ApacheFelixOSGiBundleRepository-obraddurl">obr add-url</a></li>
-    <li><a href="#ApacheFelixOSGiBundleRepository-obrremoveurl">obr remove-url</a></li>
-    <li><a href="#ApacheFelixOSGiBundleRepository-obrlist">obr list</a></li>
-    <li><a href="#ApacheFelixOSGiBundleRepository-obrinfo">obr info</a></li>
-    <li><a href="#ApacheFelixOSGiBundleRepository-obrdeploy">obr deploy</a></li>
-    <li><a href="#ApacheFelixOSGiBundleRepository-obrstart">obr start</a></li>
-    <li><a href="#ApacheFelixOSGiBundleRepository-obrsource">obr source</a></li>
-    <li><a href="#ApacheFelixOSGiBundleRepository-obrjavadoc">obr javadoc</a></li>
-</ul>
-    <li><a href="#ApacheFelixOSGiBundleRepository-UsingOBRwithaProxy">Using OBR with a Proxy</a></li>
-    <li><a href="#ApacheFelixOSGiBundleRepository-BundleSourcePackaging">Bundle Source Packaging</a></li>
-    <li><a href="#ApacheFelixOSGiBundleRepository-NoteonOSGiR3Bundles">Note on OSGi R3 Bundles</a></li>
-    <li><a href="#ApacheFelixOSGiBundleRepository-Feedback">Feedback</a></li>
-</ul></div>
-
-<p><a name="ApacheFelixOSGiBundleRepository-motivation"></a></p>
-
-<h2><a name="ApacheFelixOSGiBundleRepository-Motivation"></a>Motivation</h2>
-
-<p>The goal of the Apache Felix OSGi Bundle Repository (OBR) is two-fold:</p>
-
-<ol>
-	<li>To simplify deploying and using available bundles with Felix.</li>
-	<li>To encourage independent bundle development so that communities of interest can grow.</li>
-</ol>
-
-
-<p>OBR achieves the first goal by providing a service that can
-automatically install a bundle, with its deployment dependencies, from
-a bundle repository. This makes it easier for people to experiment with
-existing bundles. The second goal is achieved by raising the visibility
-of the available bundles and providing access to both the executable
-bundle and its source code. Hopefully, by making OBR and the bundles
-themselves more visible, community members will be encouraged to
-provide or improve service implementations.</p>
-
-<p>Note: OBR provides access to the Felix' default bundle repository,
-but you can also use it to deploy your own bundles by creating a bundle
-repository meta-data file for your local bundles; see the <tt>obr list-url</tt>, <tt>obr add-url</tt>, and <tt>obr remove-url</tt> commands for more details.</p>
-
-<p><a name="ApacheFelixOSGiBundleRepository-overview"></a></p>
-
-<h2><a name="ApacheFelixOSGiBundleRepository-Overview"></a>Overview</h2>
-
-<p>For the most part, OBR is quite simple. An OBR "repository server"
-is not necessary, since all functionality may reside on the client
-side. OBR is able to provide its functionality by reading an XML-based
-meta-data file that describes the bundles available to it. The
-meta-data file essentially contains an XML encoding of the bundles'
-manifest information. From the meta-data, OBR is able to construct
-dependency information for deploying (i.e., installing and updating)
-bundles.</p>
-
-<p>OBR defines the following entities:</p>
-
-<ul>
-	<li><em><b>Repository Admin</b></em> - a service to access a federation of repositories.</li>
-	<li><em><b>Repository</b></em> - provides access to a set of resources.</li>
-	<li><em><b>Resource</b></em> - a description of an artifact to be installed on a device.</li>
-	<li><em><b>Capability</b></em> - a named set of properties.</li>
-	<li><em><b>Requirement</b></em> - an assertion on a capability.</li>
-	<li><em><b>Resolver</b></em> - an object to resolve resource dependencies and to deploy them.</li>
-	<li><em><b>Repository file</b></em> - XML file containing resource meta-data.</li>
-</ul>
-
-
-<p>The following diagram illustrates the relationships among these entities:</p>
-
-<p><img src="apache-felix-osgi-bundle-repository_files/obr-entities.png" align="absmiddle" border="0"></p>
-
-<p>The client has access to a federated set of repositories via the Repository Admin service; such as depicted in this view:</p>
-
-<p><img src="apache-felix-osgi-bundle-repository_files/obr-high-level.png" align="absmiddle" border="0"></p>
-
-<p><a name="ApacheFelixOSGiBundleRepository-repositoryfile"></a></p>
-
-<h2><a name="ApacheFelixOSGiBundleRepository-OBRRepositoryFile"></a>OBR Repository File</h2>
-
-<p>The OBR repository file is an XML-based representation of bundle
-meta-data. The goal is provide a generic model for describing
-dependencies among resources; as such, the term <em><b>resource</b></em> is used instead of <em><b>bundle</b></em> in the OBR repository syntax; a detailed description of the OBR meta-data format is available in the <a href="http://www2.osgi.org/download/rfc-0112_BundleRepository.pdf" rel="nofollow">OSGi RFC 112</a>
-document; this document is not completely in sync with the
-implementation, but the concepts are still correct. The following XML
-snippet depicts the overall structure of a repository file:</p>
-
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>&lt;repository presentationname="..." symbolicname="..." ... &gt;
-    &lt;resource&gt;
-        &lt;description&gt;...&lt;/description&gt;
-        &lt;size&gt;...&lt;/size&gt;
-        &lt;documentation&gt;...&lt;/documentation&gt;
-        &lt;source&gt;...&lt;/source&gt;
-        &lt;category id="..."/&gt;
-        &lt;capability&gt;...&lt;/capability&gt;
-        ...
-        &lt;requirement&gt;...&lt;/requirement&gt;
-        ...
-    &lt;/resource&gt;
-    ...
-&lt;/repository&gt;
-</pre>
-</div></div>
-
-<p>The above repository defines a set of available resources, each
-described by a set of meta-data. Some resource meta-data is purely
-intended for human consumption; the most important aspects relate to
-the generic capability/requirement model.</p>
-
-<p>A resource can provide any number of capabilities. A capability is a
-typed set of properties. For example, the following is an exported
-package capability:</p>
-
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>&lt;capability name='package'&gt;
-    &lt;p n='package' v='org.foo.bar'/&gt;
-    &lt;p n='version' t='version' v='1.0.0'/&gt;
-&lt;/capability&gt;
-</pre>
-</div></div>
-
-<p>This capability is of type 'package' and exports 'org.foo.bar' at
-version '1.0.0'. Conversely, a requirement is a typed LDAP query over a
-set of capability properties. For example, the following is an imported
-package requirement:</p>
-
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>&lt;require name='package' extend='false'
-    multiple='false' optional='false'
-    filter='(&amp;amp;(package=org.foo.bar)(version&amp;gt;=1.0.0))'&gt;
-    Import package org.foo.bar
-&lt;/require&gt;
-</pre>
-</div></div>
-
-<p>This requirement is of type 'package' and imports 'org.foo.bar' at
-versions greater than '1.0.0'. Although this syntax looks rather
-complicated with the '\&amp;' and '\&gt;=' syntax, it is simply the
-standard OSGi LDAP query syntax in XML form (additionally, Peter Kriens
-has created a tool called <tt>bindex</tt> to generate this meta-data from a bundle's manifest).</p>
-
-<p>With this generic dependency model, OBR is able to provide mappings
-for the various OSGi bundle dependencies; e.g., import/export package,
-provide/require bundle, host/fragment, import/export service, execution
-environment, and native code. In addition, it is possible for bundles
-to introduce arbitrary dependencies for custom purposes.</p>
-
-<p>Two other important pieces of meta-data are <tt>Bundle-SymbolicName</tt> and <tt>Bundle-Version</tt>;
-these are standard OSGi bundle manifest attributes that OBR uses to
-uniquely identify a bundle. For example, if you want to use OBR to
-update a locally installed bundle, OBR gets its symbolic name and
-version and searches the repository metadata for a matching symbolic
-name. If the matching symbolic name is found, then OBR checks if there
-is a newer version than the local copy using the bundle version number.
-Thus, the symbolic name plus bundle version forms a unique key to match
-locally installed bundles to remotely available bundles.</p>
-
-<p><a name="ApacheFelixOSGiBundleRepository-serviceapi"></a></p>
-
-<h2><a name="ApacheFelixOSGiBundleRepository-OBRServiceAPI"></a>OBR Service API</h2>
-
-<p>Typically, OBR service clients only need to interact with the
-Repository Admin service, which provides the mechanisms necessary to
-discover available resources. The Repository Admin interface is defined
-as follows:</p>
-
-<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java"><span class="code-keyword">public</span> <span class="code-keyword">interface</span> RepositoryAdmin
-{
-    <span class="code-keyword">public</span> Resource[] discoverResources(<span class="code-object">String</span> filterExpr);
-    <span class="code-keyword">public</span> Resolver resolver();
-    <span class="code-keyword">public</span> Repository addRepository(URL repository)?
-        <span class="code-keyword">throws</span> Exception;
-    <span class="code-keyword">public</span> <span class="code-object">boolean</span> removeRepository(URL repository);
-    <span class="code-keyword">public</span> Repository[] listRepositories();
-    <span class="code-keyword">public</span> Resource getResource(<span class="code-object">String</span> respositoryId);
-}
-</pre>
-</div></div>
-
-<p>In order to resolve and deploy available resources, the Repository
-Admin provides Resolver instances, which are defined as follows:</p>
-
-<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java"><span class="code-keyword">public</span> <span class="code-keyword">interface</span> Resolver
-{
-    <span class="code-keyword">public</span> void add(Resource resource);
-    <span class="code-keyword">public</span> Requirement[] getUnsatisfiedRequirements();
-    <span class="code-keyword">public</span> Resource[] getOptionalResources();
-    <span class="code-keyword">public</span> Requirement[] getReason(Resource resource);
-    <span class="code-keyword">public</span> Resource[] getResources(Requirement requirement);
-    <span class="code-keyword">public</span> Resource[] getRequiredResources();
-    <span class="code-keyword">public</span> Resource[] getAddedResources();
-    <span class="code-keyword">public</span> <span class="code-object">boolean</span> resolve();
-    <span class="code-keyword">public</span> void deploy(<span class="code-object">boolean</span> start);
-}
-</pre>
-</div></div>
-
-<p>When desired resources are discovered via the query mechanisms of
-the Repository Admin, they are added to a Resolver instance which will
-can be used to resolve all transitive dependencies and to reflect on
-any resolution result. The following code snippet depicts a typical
-usage scenario:</p>
-
-<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">RepositoryAdmin repoAdmin = ... <span class="code-comment">// Get repo admin service
-</span>Resolver resolver = repoAdmin.resolver();
-Resource resource = repoAdmin.discoverResources(filterStr);
-resolver.add(resource);
-<span class="code-keyword">if</span> (resolver.resolve())
-{
-    resolver.deploy(<span class="code-keyword">true</span>);
-}
-<span class="code-keyword">else</span>
-{
-    Requirement[] reqs = resolver.getUnsatisfiedRequirements();
-    <span class="code-keyword">for</span> (<span class="code-object">int</span> i = 0; i &lt; reqs.length; i++)
-    {
-        <span class="code-object">System</span>.out.println(<span class="code-quote">"Unable to resolve: "</span> + reqs[i]);
-    }
-}
-</pre>
-</div></div>
-
-<p>This code gets the Repository Admin service and then gets a Resolver
-instance from it. It then discovers an available resource and adds it
-to the resolver. Then it tries to resolve the resources dependencies.
-If successful it deploys the resource to the local framework instance;
-if not successful it prints the unsatisfied requirements.</p>
-
-<p>OBR's deployment algorithm appears simple at first glance, but it is
-actually somewhat complex due to the nature of deploying independently
-developed bundles. For example, in an ideal world, if an update for a
-bundle is made available, then updates for all of the bundles
-satisfying its dependencies are also made available. Unfortunately,
-this may not be the case, thus the deployment algorithm might have to
-install new bundles during an update to satisfy either new dependencies
-or updated dependencies that can no longer be satisfied by existing
-local bundles. In response to this type of scenario, the OBR deployment
-algorithm tries to favor updating existing bundles, if possible, as
-opposed to installing new bundles to satisfy dependencies.</p>
-
-<p>In the general case, OBR user's will not use the OBR API directly,
-but will use its functionality indirectly from another tool or user
-interface. For example, interactive access to OBR is available via a
-command for Felix' <a href="http://cwiki.apache.org/confluence/display/FELIX/Apache%20Felix%20Shell%20Service" title="Apache Felix Shell Service">shell service</a>. The OBR shell command is discussed in the next section.</p>
-
-<p><a name="ApacheFelixOSGiBundleRepository-shellcommand"></a></p>
-
-<h2><a name="ApacheFelixOSGiBundleRepository-OBRShellCommand"></a>OBR Shell Command</h2>
-
-<p>Besides providing a service API, OBR implements a Felix shell
-command for accessing its functionality. For the end user, the OBR
-shell command is accessed using the text-based or GUI-based user
-interfaces for Felix' shell service. This section describes the syntax
-for the OBR shell command.</p>
-
-<p><a name="ApacheFelixOSGiBundleRepository-obrhelp"></a></p>
-
-<h3><a name="ApacheFelixOSGiBundleRepository-obrhelp"></a>obr help</h3>
-
-<p>Syntax:</p>
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>obr help [add-url | remove-url | list-url | list | info | deploy | start | source | javadoc]
-</pre>
-</div></div>
-<p>This command is used to display additional information about the other OBR commands.</p>
-
-<p><a name="ApacheFelixOSGiBundleRepository-obrlisturl"></a></p>
-
-<h3><a name="ApacheFelixOSGiBundleRepository-obrlisturl"></a>obr list-url</h3>
-
-<p>Syntax:</p>
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>obr list-url
-</pre>
-</div></div>
-<p>This command gets the URLs to the repository files used by the Repository Admin.</p>
-
-<p><a name="ApacheFelixOSGiBundleRepository-obraddurl"></a></p>
-
-<h3><a name="ApacheFelixOSGiBundleRepository-obraddurl"></a>obr add-url</h3>
-
-<p>Syntax:</p>
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>obr add-url [&lt;repository-file-url&gt; ...]
-</pre>
-</div></div>
-<p>This command adds a repository file to the set of repository files
-for which the Repository Admin service provides access. The repository
-file is represented as a URL. If the repository file URL is already in
-the Repository Admin's set of repository files, the request is treated
-like a reload operation.</p>
-
-<p><a name="ApacheFelixOSGiBundleRepository-obrremoveurl"></a></p>
-
-<h3><a name="ApacheFelixOSGiBundleRepository-obrremoveurl"></a>obr remove-url</h3>
-
-<p>Syntax:</p>
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>obr remove-url [&lt;repository-file-url&gt; ...]
-</pre>
-</div></div>
-<p>This command removes a repository file to the set of repository
-files for which the Repository Admin service provides access. The
-repository file is represented as a URL.</p>
-
-<p><a name="ApacheFelixOSGiBundleRepository-obrlist"></a></p>
-
-<h3><a name="ApacheFelixOSGiBundleRepository-obrlist"></a>obr list</h3>
-
-<p>Syntax:</p>
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>obr list [&lt;string&gt; ...]
-</pre>
-</div></div>
-<p>This command lists bundles available in the bundle repository. If no
-arguments are specified, then all available bundles are listed,
-otherwise any arguments are concatenated with spaces and used as a
-substring filter on the bundle names.</p>
-
-<p><a name="ApacheFelixOSGiBundleRepository-obrinfo"></a></p>
-
-<h3><a name="ApacheFelixOSGiBundleRepository-obrinfo"></a>obr info</h3>
-
-<p>Syntax:</p>
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>obr info &lt;bundle-name&gt;[;&lt;version&gt;] ...
-</pre>
-</div></div>
-<p>This command displays the meta-data for the specified bundles. If a
-bundle's name contains spaces, then it must be surrounded by quotes. It
-is also possible to specify a precise version if more than one version
-exists, such as:</p>
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>obr info "Bundle Repository";1.0.0
-</pre>
-</div></div>
-<p>The above example retrieves the meta-data for version "1.0.0" of the bundle named "Bundle Repository".</p>
-
-<p><a name="ApacheFelixOSGiBundleRepository-obrdeploy"></a></p>
-
-<h3><a name="ApacheFelixOSGiBundleRepository-obrdeploy"></a>obr deploy</h3>
-
-<p>Syntax:</p>
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>obr deploy &lt;bundle-name&gt;[;&lt;version&gt;] ... | &lt;bundle-id&gt; ...
-</pre>
-</div></div>
-<p>This command tries to install or update the specified bundles and
-all of their dependencies by default. You can specify either the bundle
-name or the bundle identifier. If a bundle's name contains spaces, then
-it must be surrounded by quotes. It is also possible to specify a
-precise version if more than one version exists, such as:</p>
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>obr deploy "Bundle Repository";1.0.0
-</pre>
-</div></div>
-<p>For the above example, if version "1.0.0" of "Bundle Repository" is
-already installed locally, then the command will attempt to update it
-and all of its dependencies; otherwise, the command will install it and
-all of its dependencies.</p>
-
-<p><a name="ApacheFelixOSGiBundleRepository-obrstart"></a></p>
-
-<h3><a name="ApacheFelixOSGiBundleRepository-obrstart"></a>obr start</h3>
-
-<p>Syntax:</p>
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>obr start [-nodeps] &lt;bundle-name&gt;[;&lt;version&gt;] ...
-</pre>
-</div></div>
-<p>This command installs and starts the specified bundles and all of
-their dependencies by default; use the "-nodeps" switch to ignore
-dependencies. If a bundle's name contains spaces, then it must be
-surrounded by quotes. If a specified bundle is already installed, then
-this command has no effect. It is also possible to specify a precise
-version if more than one version exists, such as:</p>
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>obr start "Bundle Repository";1.0.0
-</pre>
-</div></div>
-<p>The above example installs and starts the "1.0.0" version of the bundle named "Bundle Repository" and its dependencies.</p>
-
-<p><a name="ApacheFelixOSGiBundleRepository-obrsource"></a></p>
-
-<h3><a name="ApacheFelixOSGiBundleRepository-obrsource"></a>obr source</h3>
-
-<p>Syntax:</p>
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>obr source [-x] &lt;local-dir&gt; &lt;bundle-name&gt;[;&lt;version&gt;] ...
-</pre>
-</div></div>
-<p>This command retrieves the source archives of the specified bundles
-and saves them to the specified local directory; use the "-x" switch to
-automatically extract the source archives. If a bundle name contains
-spaces, then it must be surrounded by quotes. It is also possible to
-specify a precise version if more than one version exists, such as:</p>
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>obr source /home/rickhall/tmp "Bundle Repository";1.0.0
-</pre>
-</div></div>
-<p>The above example retrieves the source archive of version "1.0.0" of
-the bundle named "Bundle Repository" and saves it to the specified
-local directory.</p>
-
-<h3><a name="ApacheFelixOSGiBundleRepository-obrjavadoc"></a>obr javadoc</h3>
-
-<p>Syntax:</p>
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>obr javadoc [-x] &lt;local-dir&gt; &lt;bundle-name&gt;[;&lt;version&gt;] ...
-</pre>
-</div></div>
-<p>This command retrieves the javadoc archives of the specified bundles
-and saves them to the specified local directory; use the "-x" switch to
-automatically extract the javadoc archives. If a bundle name contains
-spaces, then it must be surrounded by quotes. It is also possible to
-specify a precise version if more than one version exists, such as:</p>
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>obr javadoc /home/rickhall/tmp "Bundle Repository";1.0.0
-</pre>
-</div></div>
-<p>The above example retrieves the javadoc archive of version "1.0.0"
-of the bundle named "Bundle Repository" and saves it to the specified
-local directory.</p>
-
-<p><a name="ApacheFelixOSGiBundleRepository-proxy"></a></p>
-
-<h2><a name="ApacheFelixOSGiBundleRepository-UsingOBRwithaProxy"></a>Using OBR with a Proxy</h2>
-
-<p>If you use a proxy for Web access, then OBR will not work for you in
-its default configuration; certain system properties must be set to
-enable OBR to work with a proxy. These properties are:</p>
-
-<ul>
-	<li>http.proxyHost - the name of the proxy host.</li>
-	<li>http.proxyPort - the port of the proxy host.</li>
-	<li>http.proxyAuth
-- the user name and password to use when connecting to the proxy; this
-string should be the user name and password separated by a colon (e.g.,
-rickhall:mypassword).</li>
-</ul>
-
-
-<p>These system properties can be set directly on the command line when
-starting the JVM using the standard "-D&lt;prop&gt;=&lt;value&gt;"
-syntax or you can put them in the lib/system.properties file of your
-Felix installation; see documentation on configuring Felix for more
-information.</p>
-
-<p><a name="ApacheFelixOSGiBundleRepository-sourcepackaging"></a></p>
-
-<h2><a name="ApacheFelixOSGiBundleRepository-BundleSourcePackaging"></a>Bundle Source Packaging</h2>
-
-<p>Coming soon...</p>
-
-<p><a name="ApacheFelixOSGiBundleRepository-r3note"></a></p>
-
-<h2><a name="ApacheFelixOSGiBundleRepository-NoteonOSGiR3Bundles"></a>Note on OSGi R3 Bundles</h2>
-
-<p>In contrast to OSGi R4 the previous specifications, most notably R3, allowed bundles without the <tt>Bundle-SymbolicName</tt>
-header. The Felix OSGi Bundle Repository implementation heavily relies
-on the symbolic name being defined in bundles. As a consequence bundles
-without a symbolic name are not fully supported by the Bundle
-Repository:</p>
-
-<ul>
-	<li>Bundles installed in the framework are used by the Bundle
-Repository implementation to resolve dependencies regardless of whether
-they have a <tt>Bundle-SymbolicName</tt> header or not. Resolution of dependencies against the installed bundles takes place based on the <tt>Export-Package</tt> headers.</li>
-	<li>Bundles installed in the framework without a <tt>Bundle-SymbolicName</tt>
-header cannot be updated by the Bundle Repository implementation
-because updates from the bundle repository cannot be correlated to such
-"anonymous" bundles.</li>
-</ul>
-
-
-
-<p><a name="ApacheFelixOSGiBundleRepository-feedback"></a></p>
-
-<h2><a name="ApacheFelixOSGiBundleRepository-Feedback"></a>Feedback</h2>
-
-<p>Subscribe to the Felix users mailing list by sending a message to <a href="mailto:users-subscribe@felix.apache.org" rel="nofollow">users-subscribe@felix.apache.org</a>; after subscribing, email questions or feedback to <a href="mailto:users@felix.apache.org" rel="nofollow">users@felix.apache.org</a>.</p>
-    </div>
-  </body></html>
diff --git a/bundlerepository/doc/apache-felix-osgi-bundle-repository_files/apache-felix-small.png b/bundlerepository/doc/apache-felix-osgi-bundle-repository_files/apache-felix-small.png
deleted file mode 100644
index 95bfa5ef92..0000000000
Binary files a/bundlerepository/doc/apache-felix-osgi-bundle-repository_files/apache-felix-small.png and /dev/null differ
diff --git a/bundlerepository/doc/apache-felix-osgi-bundle-repository_files/apache.png b/bundlerepository/doc/apache-felix-osgi-bundle-repository_files/apache.png
deleted file mode 100644
index 5132f65ec1..0000000000
Binary files a/bundlerepository/doc/apache-felix-osgi-bundle-repository_files/apache.png and /dev/null differ
diff --git a/bundlerepository/doc/apache-felix-osgi-bundle-repository_files/button.html b/bundlerepository/doc/apache-felix-osgi-bundle-repository_files/button.html
deleted file mode 100644
index dc64b6cd10..0000000000
--- a/bundlerepository/doc/apache-felix-osgi-bundle-repository_files/button.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><head>
-<meta http-equiv="content-type" content="text/html; charset=UTF-8"><!-- ads start -->
-</head><body><a href="http://www.us.apachecon.com/c/acus2009/" target="_blank"><img src="button_data/2009-usa-125x125.png" title="ApacheCon US 2009" border="0" height="125" width="125"></a>
-<!-- ads end -->
-</body></html>
\ No newline at end of file
diff --git a/bundlerepository/doc/apache-felix-osgi-bundle-repository_files/button_data/2009-usa-125x125.png b/bundlerepository/doc/apache-felix-osgi-bundle-repository_files/button_data/2009-usa-125x125.png
deleted file mode 100644
index 117c6954dd..0000000000
Binary files a/bundlerepository/doc/apache-felix-osgi-bundle-repository_files/button_data/2009-usa-125x125.png and /dev/null differ
diff --git a/bundlerepository/doc/apache-felix-osgi-bundle-repository_files/linkext7.gif b/bundlerepository/doc/apache-felix-osgi-bundle-repository_files/linkext7.gif
deleted file mode 100644
index f2dd2dcfa9..0000000000
Binary files a/bundlerepository/doc/apache-felix-osgi-bundle-repository_files/linkext7.gif and /dev/null differ
diff --git a/bundlerepository/doc/apache-felix-osgi-bundle-repository_files/logo.png b/bundlerepository/doc/apache-felix-osgi-bundle-repository_files/logo.png
deleted file mode 100644
index dccbddcc35..0000000000
Binary files a/bundlerepository/doc/apache-felix-osgi-bundle-repository_files/logo.png and /dev/null differ
diff --git a/bundlerepository/doc/apache-felix-osgi-bundle-repository_files/mail_small.gif b/bundlerepository/doc/apache-felix-osgi-bundle-repository_files/mail_small.gif
deleted file mode 100644
index a3b7d9f06f..0000000000
Binary files a/bundlerepository/doc/apache-felix-osgi-bundle-repository_files/mail_small.gif and /dev/null differ
diff --git a/bundlerepository/doc/apache-felix-osgi-bundle-repository_files/obr-entities.png b/bundlerepository/doc/apache-felix-osgi-bundle-repository_files/obr-entities.png
deleted file mode 100644
index 81d37608e0..0000000000
Binary files a/bundlerepository/doc/apache-felix-osgi-bundle-repository_files/obr-entities.png and /dev/null differ
diff --git a/bundlerepository/doc/apache-felix-osgi-bundle-repository_files/obr-high-level.png b/bundlerepository/doc/apache-felix-osgi-bundle-repository_files/obr-high-level.png
deleted file mode 100644
index 566f171fd9..0000000000
Binary files a/bundlerepository/doc/apache-felix-osgi-bundle-repository_files/obr-high-level.png and /dev/null differ
diff --git a/bundlerepository/doc/apache-felix-osgi-bundle-repository_files/site.css b/bundlerepository/doc/apache-felix-osgi-bundle-repository_files/site.css
deleted file mode 100644
index 959ab0a592..0000000000
--- a/bundlerepository/doc/apache-felix-osgi-bundle-repository_files/site.css
+++ /dev/null
@@ -1,25 +0,0 @@
-/* @override http://felix.apache.org/site/media.data/site.css */
-
-body { background-color: #ffffff; color: #3b3b3b; font-family: Tahoma, Arial, sans-serif; font-size: 10pt; line-height: 140% }
-h1, h2, h3, h4, h5, h6 { font-weight: normal; color: #000000; line-height: 100%; margin-top: 0px}
-h1 { font-size: 200% }
-h2 { font-size: 175% }
-h3 { font-size: 150% }
-h4 { font-size: 140% }
-h5 { font-size: 130% }
-h6 { font-size: 120% }
-a { color: #1980af }
-a:visited { color: #1980af }
-a:hover { color: #1faae9 }
-.title { position: absolute; left: 1px; right: 1px; top:25px; height: 81px; background: url(http://felix.apache.org/site/media.data/gradient.png) repeat-x; background-position: bottom; }
-.logo { position: absolute; width: 15em; height: 81px; text-align: center; }
-.header { text-align: right; margin-right: 20pt; margin-top: 30pt;}
-.menu { border-top: 10px solid #f9bb00; position: absolute; top: 107px; left: 1px; width: 15em; bottom: 0px; padding: 0px; background-color: #fcfcfc }
-.menu ul { background-color: #fdf5d9; list-style: none; padding-left: 4em; margin-top: 0px; padding-top: 2em; padding-bottom: 2em; margin-left: 0px; color: #4a4a43}
-.menu a { text-decoration: none; color: #4a4a43 }
-.main { position: absolute; border-top: 10px solid #cde0ea; top: 107px; left: 15em; right: 1px; margin-left: 2px; padding-right: 4em; padding-left: 1em; padding-top: 1em;}
-.code { background-color: #eeeeee; border: solid 1px black; padding: 0.5em }
-.code-keyword { color: #880000 }
-.code-quote { color: #008800 }
-.code-object { color: #0000dd }
-.code-java { margin: 0em }
\ No newline at end of file
diff --git a/bundlerepository/doc/changelog.txt b/bundlerepository/doc/changelog.txt
deleted file mode 100644
index d2aa1eb255..0000000000
--- a/bundlerepository/doc/changelog.txt
+++ /dev/null
@@ -1,193 +0,0 @@
-
-Changes from 2.0.4 to 2.0.6
----------------------------
-
-** Improvement
-    * [FELIX-4764] - Add support to GZIP based compact index files
-
-Changes from 2.0.2 to 2.0.4
----------------------------
-
-** Bug
-    * [FELIX-3097] - LocalRepository is not updated when bundles are
-    * [FELIX-4571] - NullPointerException when using Repository impl with Aries subsystem impl
-    * [FELIX-4616] - BundleRepository ResourceComparator violates comparison contract
-    * [FELIX-4640] - missing (&(osgi.ee=JavaSE)(version=1.8)) when embedding in org.apache.felix.framework
-
-** Improvement
-    * [FELIX-4812] - BundleRepository can be quite CPU intensive when starting a lot of bundles
-
-Changes from 1.6.6 to 2.0.2
----------------------------
-
-** New Feature
-    * [FELIX-4368] - Support OSGi Repository 1.0 Specification
-    ** [FELIX-4369] - Support repository.xml as defined by OSGi Repository spec
-    ** [FELIX-4370] - Support Repository service as defined by OSGi spec
-    ** [FELIX-4371] - Pass the Repository 1.0 OSGi CT
-
-** Bug
-    * [FELIX-3257] - OBR resolver unable to pick up the highest bundle version when selecting the best candidate
-    * [FELIX-2465] - system.bundle should be automatically wired to the relevant bundle
-    * [FELIX-3842] - NPE in LocalRepositoryImpl
-
-Changes from 1.6.4 to 1.6.6
----------------------------
-
-** Bug
-    * [FELIX-2612] - [OBR] Doesn't work on Java 1.4 due to use of Boolean.parseBoolean()
-    * [FELIX-2884] - The multiplicity isn't taken into account by the maven bundle plugin and bundlerepository when generating the repository xml
-    * [FELIX-2912] - Host name is lost in exceptions when dealing with Windows shared drives
-    * [FELIX-2958] - Unable to remove previously added repository from OBR
-
-Changes from 1.6.2 to 1.6.4
----------------------------
-
-** Bug
-    * [FELIX-2306] - ClassCastException in Wrapper.unwrap() when calling Resolver.add(x implements Resource)
-    * [FELIX-2385] - Execution environment property is not correctly exposed
-
-Changes from 1.6.0 to 1.6.2
----------------------------
-
-** Bug
-    * [FELIX-2269] - Only the higher version of a given bundle is kept in a repository
-    * [FELIX-2276] - Authentication credentials for proxies are not set when retrieving resources
-    * [FELIX-2304] - Single quotes need to be escaped in xml attribute values 
-
-Changes from 1.4.3 to 1.6.0
----------------------------
-
-** Bug
-    * [FELIX-1007] - OBR search doesn't take 'categories' into account
-    * [FELIX-1531] - Mandatory directive is ignored on the Export-Package when it comes to resolve the bundles
-    * [FELIX-1621] - OBR fails to take bundles into account that are already available in the framework
-    * [FELIX-1809] - OBR issue when using parameters with exported packages
-    * [FELIX-2081] - Attribtues and directives and not used on local resources
-    * [FELIX-2082] - Local resources should really be preferred over remote resources
-    * [FELIX-2083] - bundlerepository should mark dependencies it includes as optional
-    * [FELIX-2102] - Bad exception thrown when an obr url can not be resolved
-    * [FELIX-2114] - The reasons for adding a resource may contain the same requirement several times
-    * [FELIX-2126] - Dependencies of optional resources should be optional
-    * [FELIX-2136] - Improve OBR speed
-    * [FELIX-2138] - The resolver should prefer required resources over optional resources to minimize the set of required resources
-    * [FELIX-2139] - Move extensions to a new api into the bundlerepository module as to not pollute the org.osgi.* package
-    * [FELIX-2221] - DataModelHelper.filter() throws wrong Exception
-
-** Improvement
-    * [FELIX-280] - OBR should be able to confirm satisfaction of a filter, including availability of local resources
-    * [FELIX-483] - Log detailed information on invalid syntax in parsed repository xml requirements
-    * [FELIX-692] - OBR should provide an API for resolving bundles dependencies regardless of locally installed bundles
-    * [FELIX-1492] - Add option to exclude optional dependencies during OBR deploy
-    * [FELIX-2106] - Resolver scoped Repository
-    * [FELIX-2115] - The api offers no way to have a timeout or cancel the resolution if it takes too long
-    * [FELIX-2127] - The explanation given why a resource is include is insufficient
-    * [FELIX-2134] - Change the filter implementation
-    * [FELIX-2140] - The Requirement#isSatisfied() method should actually check the capability/requirement namespace
-    * [FELIX-2151] - Use Strings instead of URLs in the API
-
-** New Feature
-    * [FELIX-178] - OBR should expose some way to convert a locally installed bundle to a Resource
-    * [FELIX-2103] - Improve the OBR url handler to be able to access external bundles
-    * [FELIX-2144] - Add global requirements and capabilities
-
-** Task
-    * [FELIX-2104] - Add an optional faster stax based parser
-    * [FELIX-2211] - Simplify the repository parser based on KXml2
-    * [FELIX-2215] - Refactor bundlerepository and maven bundle plugin obr data model
-
-Changes from 1.4.2 to 1.4.3
----------------------------
-
-** Bug
-    * [FELIX-1792] - Felix OBR seems to just randomly choose one of the satisifed bundles if more than one bundle meets the requirement
-
-
-Changes from 1.4.1 to 1.4.2
----------------------------
-
-** Task
-    * [FELIX-1617] - Modify framework, main, shell, shell.tui, and obr to depend on official OSGi JAR files
-
-Changes from 1.4.0 to 1.4.1
----------------------------
-
-** Bug
-    * [FELIX-1000] - Updating an bundle which was installed via OBR fails
-    * [FELIX-1157] - NPE results in OBR if a resource does not have a presentation name
-    * [FELIX-1433] - java.lang.NumberFormatException in Bundle-Version (org.osgi.framework.Version) due to trailing whitespace
-
-Changes from 1.2.1 to 1.4.0
----------------------------
-** Bug
-    * [FELIX-973] - FilterImpl from Felix Framework does not support none LDAP operators
-    * [FELIX-977] - Bundle resolving runs extreme long
-    * [FELIX-999] - The OBR ResolverImpl shouldn't try to start fragment bundles
-
-** Improvement
-    * [FELIX-884] - OBR should expose registered services as capabilities of local repository
-    * [FELIX-887] - Ensure BundleListeners are not forgotten about
-    * [FELIX-940] - Add support for execution environment
-    * [FELIX-986] - Include the symbolicname in the output of obr list -v
-
-** New Feature
-    * [FELIX-976] - OBR update-url shell command
-
-Changes from 1.2.0 to 1.2.1
----------------------------
-* [2008-10-24] Fixed potential NPE when comparing resources. (FELIX-789)
-* [2008-10-24] Removed the default repository URL from OBR, so now it must 
-  be configured to have a repository. (FELIX-481)
-* [2008-10-24] Print message if there are no matching bundles. (FELIX-785)
-* [2008-10-23] Modified the OBR shell command to hide multiple versions of 
-  available artifacts to cut down on noise. It is still possible to list 
-  all versions by using a new "-v" switch.
-* [2008-09-29] Adapt Bundle-DocURL header to modified URL
-
-
-Changes from 1.0.3 to 1.2.0
----------------------------
-
-* [2008-08-30] Prevent issues when updating running bundles. (FELIX-701)
-* [2008-08-28] Prevent NullPointerException if a locally installed bundle
-  does not have a Bundle-SymbolicName or version. (FELIX-108)
-* [2008-08-12] Added OBR descriptor and updated to the newest bundle plugin. (FELIX-672)
-* [2008-07-31] Use LogService instead of System.err. (FELIX-482)
-* [2008-07-21] Modified OBR to correctly consider the namespace attribute 
-  when matching capabilities to requirements. (FELIX-638)
-* [2008-06-26] Implement referral with hop count support. (FELIX-399)
-* [2008-05-09] Return an empty resource array when querying with a filter
-  with invalid syntax. (FELIX-480)
-* [2008-05-09] Fixed improper synchronization with respect to visibility rules.
-* [2008-05-09] Ignore resources with invalid filters. (FELIX-484)
-* [2008-05-09] Move repository URL list initialization to a later time to 
-  avoid the default repository URL if it is not desired. (FELIX-485)
-
-Changes from 1.0.2 to 1.0.3
----------------------------
-
-* [2008-04-21] Re-release to make bytecode executable on jre 1.3.
-
-Changes from 1.0.0 to 1.0.2
----------------------------
-
-* [2008-01-27] Change the default url from sf.net to sourceforge.net.
-* [2007-10-25] Add support for zipped repository files. (FELIX-410)
-* [2007-10-03] Updated OBR's VersionRange to match the Framework's VersionRange
-  and now accept whitespace in its version range. (FELIX-389)
-* [2007-09-24] Extract OSGi OBR service API to a non-bundle jar to avoid 
-  circular build problems.
-
-Changes from 0.8.0-incubator to 1.0.0
--------------------------------------
-
-* [2007-03-16] Correctly initialized member fields to avoid incorrectly
-  assigning the source and license URLs. (FELIX-242)
-* [2007-03-19] Parent POM extends Apache POM for Apache-wide policies.
-  (FELIX-260)
-* [2007-05-18] Improved OBR dependency resolution by searching resolving
-  bundles before local bundles and to search through all available
-  candidates to find one that can resolve instead of picking one and failing
-  if it cannot be resolved. (FELIX-285)
-* [2007-07-13] Fixed LDAP filter syntax bug when using inclusive version
-  ranges. (FELIX-327)
diff --git a/bundlerepository/obr.xml b/bundlerepository/obr.xml
deleted file mode 100644
index 9056eda6be..0000000000
--- a/bundlerepository/obr.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<!-- 
- 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. 
--->
-<obr>
-  <capability name="service">
-    <p n="service" v="org.apache.felix.shell.Command"/>
-  </capability>
-    <capability name="service">
-      <p n="service" v="org.osgi.service.obr.RepositoryAdmin"/>
-    </capability>
-    <capability name="service">
-      <p n="service" v="org.apache.felix.bundlerepository.RepositoryAdmin"/>
-    </capability>
-</obr>
diff --git a/bundlerepository/pom.xml b/bundlerepository/pom.xml
deleted file mode 100644
index be6c3ebf8a..0000000000
--- a/bundlerepository/pom.xml
+++ /dev/null
@@ -1,190 +0,0 @@
-<!--
- 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</name>
-  <description>Bundle repository service.</description>
-  <artifactId>org.apache.felix.bundlerepository</artifactId>
-  <version>2.0.11-SNAPSHOT</version>
-  <scm>
-    <connection>scm:git:https://github.com/apache/felix-dev.git</connection>
-    <developerConnection>scm:git:https://github.com/apache/felix-dev.git</developerConnection>
-    <url>https://gitbox.apache.org/repos/asf?p=felix-dev.git</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>org.apache.felix.utils</artifactId>
-      <version>1.11.4</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>org.osgi.service.obr</artifactId>
-      <version>1.0.2</version>
-      <optional>true</optional>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.felix</groupId>
-          <artifactId>org.osgi.core</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>org.apache.felix.shell</artifactId>
-      <version>1.4.1</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>org.apache.felix.gogo.runtime</artifactId>
-      <version>1.0.0</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>net.sf.kxml</groupId>
-      <artifactId>kxml2</artifactId>
-      <version>2.3.0</version>
-      <optional>true</optional>
-      <exclusions>
-        <exclusion>
-          <groupId>xmlpull</groupId>
-          <artifactId>xmlpull</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-        <groupId>org.osgi</groupId>
-        <artifactId>org.osgi.compendium</artifactId>
-        <version>5.0.0</version>
-        <optional>true</optional>
-    </dependency>
-    <dependency>
-       <groupId>org.osgi</groupId>
-        <artifactId>org.osgi.core</artifactId>
-        <version>5.0.0</version>
-    </dependency>
-    <dependency>
-        <groupId>org.codehaus.woodstox</groupId>
-        <artifactId>woodstox-core-asl</artifactId>
-        <version>4.4.1</version>
-        <optional>true</optional>
-    </dependency>
-    <dependency>
-        <groupId>org.easymock</groupId>
-        <artifactId>easymock</artifactId>
-        <version>3.4</version>
-        <scope>test</scope>
-    </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.4.0</version>
-        <extensions>true</extensions>
-        <configuration>
-          <unpackBundle>true</unpackBundle>
-          <instructions>
-            <Export-Package>
-                org.osgi.service.repository,
-                org.apache.felix.bundlerepository;version="2.1"
-            </Export-Package>
-            <Private-Package>
-                org.kxml2.io,
-                org.xmlpull.v1,
-                org.apache.felix.bundlerepository.impl.*,
-                org.apache.felix.utils.*
-            </Private-Package>
-            <!-- The org.osgi.service.repository;resolution:=mandatory seems strange below, but otherwise the maven-bundle-plugin
-                 will make that import optional, which we don't want... -->
-            <!-- The version range on org.osgi.service.repository is required as we are a provider of the 1.0.0 API. -->
-            <Import-Package>
-                !javax.xml.parsers,
-                !org.xml.sax,
-                org.osgi.service.repository;resolution:=mandatory;version="[1.0,1.1)",
-                org.osgi.service.log;resolution:=optional,
-                org.osgi.service.obr;resolution:=optional,
-                org.apache.felix.shell;resolution:=optional,
-                org.apache.felix.service.command;resolution:=optional,
-                javax.xml.stream;resolution:=optional,
-                *
-            </Import-Package>
-            <DynamicImport-Package>org.apache.felix.shell,org.apache.felix.service.command</DynamicImport-Package>
-            <Bundle-Activator>${project.artifactId}.impl.Activator</Bundle-Activator>
-            <Bundle-DocURL>http://felix.apache.org/site/apache-felix-osgi-bundle-repository.html</Bundle-DocURL>
-            <Bundle-Url>http://felix.apache.org/site/downloads.cgi</Bundle-Url>
-            <Bundle-Source>http://felix.apache.org/site/downloads.cgi</Bundle-Source>
-            <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
-            <Export-Service>org.apache.felix.bundlerepository.RepositoryAdmin,org.osgi.service.obr.RepositoryAdmin</Export-Service>
-            <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
-            <Include-Resource>META-INF/LICENSE=LICENSE,META-INF/LICENSE.kxml2=LICENSE.kxml2,META-INF/NOTICE=NOTICE,META-INF/DEPENDENCIES=DEPENDENCIES</Include-Resource>
-            <Provide-Capability>osgi.implementation;osgi.implementation="osgi.repository";uses:="org.osgi.service.repository";version:Version="1.1",osgi.service;objectClass:List&lt;String&gt;="org.osgi.service.repository.Repository";uses:="org.osgi.service.repository"</Provide-Capability>
-          </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>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-source-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>attach-sources</id>
-            <goals>
-              <goal>jar</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/bundlerepository/src/main/java/org/apache/felix/bundlerepository/Capability.java b/bundlerepository/src/main/java/org/apache/felix/bundlerepository/Capability.java
deleted file mode 100644
index c2ec5efbe1..0000000000
--- a/bundlerepository/src/main/java/org/apache/felix/bundlerepository/Capability.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * 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.
- */
-/*
- * $Header: /cvshome/build/org.osgi.service.obr/src/org/osgi/service/obr/Capability.java,v 1.3 2006/03/16 14:56:17 hargrave Exp $
- *
- * Copyright (c) OSGi Alliance (2006). All Rights Reserved.
- *
- * Licensed 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.
- */
-
-// This document is an experimental draft to enable interoperability
-// between bundle repositories. There is currently no commitment to
-// turn this draft into an official specification.
-package org.apache.felix.bundlerepository;
-
-import java.util.Map;
-
-/**
- * A named set of properties representing some capability that is provided by
- * its owner.
- *
- * @version $Revision: 1.3 $
- */
-public interface Capability
-{
-    String BUNDLE = "bundle";
-    String FRAGMENT = "fragment";
-    String PACKAGE = "package";
-    String SERVICE = "service";
-    String EXECUTIONENVIRONMENT = "ee";
-
-    /**
-     * Return the name of the capability.
-     *
-     */
-    String getName();
-
-    /**
-     * Return the properties of this capability
-     *
-     * @return
-     */
-    Property[] getProperties();
-
-    /**
-     * Return the map of properties.
-     *
-     * @return a Map<String,Object>
-     */
-    Map<String, Object> getPropertiesAsMap();
-
-    /**
-     * Return the directives of this capability. The returned map
-     * can not be modified.
-     *
-     * @return a Map of directives or an empty map there are no directives.
-     */
-    Map<String, String> getDirectives();
-}
\ No newline at end of file
diff --git a/bundlerepository/src/main/java/org/apache/felix/bundlerepository/DataModelHelper.java b/bundlerepository/src/main/java/org/apache/felix/bundlerepository/DataModelHelper.java
deleted file mode 100644
index 36a37e8f90..0000000000
--- a/bundlerepository/src/main/java/org/apache/felix/bundlerepository/DataModelHelper.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * 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.
- */
-/*
- * $Header: /cvshome/build/org.osgi.service.obr/src/org/osgi/service/obr/Requirement.java,v 1.4 2006/03/16 14:56:17 hargrave Exp $
- *
- * Copyright (c) OSGi Alliance (2006). All Rights Reserved.
- *
- * Licensed 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.
- */
-
-// This document is an experimental draft to enable interoperability
-// between bundle repositories. There is currently no commitment to
-// turn this draft into an official specification.
-package org.apache.felix.bundlerepository;
-
-import java.io.IOException;
-import java.io.Reader;
-import java.io.Writer;
-import java.net.URL;
-import java.util.Map;
-import java.util.jar.Attributes;
-
-import org.osgi.framework.Bundle;
-import org.osgi.framework.Filter;
-import org.osgi.framework.InvalidSyntaxException;
-
-public interface DataModelHelper {
-
-    /**
-     * Create a simple requirement to be used for selection
-     * @param name
-     * @param filter
-     * @return
-     * @throws org.osgi.framework.InvalidSyntaxException
-     */
-    Requirement requirement(String name, String filter);
-
-    /**
-     * Create an extender filter supporting the SUBSET, SUPERSET and other extensions
-     *
-     * @param filter the string filter
-     * @return
-     * @throws org.osgi.framework.InvalidSyntaxException
-     */
-    Filter filter(String filter) throws InvalidSyntaxException;
-
-    /**
-     * Create a repository from the specified URL.
-     *
-     * @param repository
-     * @return
-     * @throws Exception
-     */
-    Repository repository(URL repository) throws Exception;
-
-    /**
-     * Create a repository for the given set of resources.
-     * Such repositories can be used to create a resolver
-     * that would resolve on a subset of available resources
-     * instead of all of them.
-     *
-     * @param resources an array of resources
-     * @return a repository containing the given resources
-     */
-    Repository repository(Resource[] resources);
-
-    /**
-     * Create a capability
-     *
-     * @param name name of this capability
-     * @param properties the properties
-     * @return a new capability with the specified name and properties
-     */
-    Capability capability(String name, Map properties);
-
-    /**
-     * Create a resource corresponding to the given bundle.
-     *
-     * @param bundle the bundle
-     * @return the corresponding resource
-     */
-    Resource createResource(Bundle bundle);
-
-    /**
-     * Create a resource for the bundle located at the
-     * given location.
-     *
-     * @param bundleUrl the location of the bundle
-     * @return the corresponding resource
-     * @throws IOException
-     */
-    Resource createResource(URL bundleUrl) throws IOException;
-
-    /**
-     * Create a resource corresponding to the given manifest
-     * entries.
-     *
-     * @param attributes the manifest headers
-     * @return the corresponding resource
-     */
-    Resource createResource(Attributes attributes);
-
-    //===========================
-    //==   XML serialization   ==
-    //===========================
-
-    Repository readRepository(String xml) throws Exception;
-
-    Repository readRepository(Reader reader) throws Exception;
-
-    Resource readResource(String xml) throws Exception;
-
-    Resource readResource(Reader reader) throws Exception;
-
-    Capability readCapability(String xml) throws Exception;
-
-    Capability readCapability(Reader reader) throws Exception;
-
-    Requirement readRequirement(String xml) throws Exception;
-
-    Requirement readRequirement(Reader reader) throws Exception;
-
-    Property readProperty(String xml) throws Exception;
-
-    Property readProperty(Reader reader) throws Exception;
-
-    String writeRepository(Repository repository);
-
-    void writeRepository(Repository repository, Writer writer) throws IOException;
-
-    String writeResource(Resource resource);
-
-    void writeResource(Resource resource, Writer writer) throws IOException;
-
-    String writeCapability(Capability capability);
-
-    void writeCapability(Capability capability, Writer writer) throws IOException;
-
-    String writeRequirement(Requirement requirement);
-
-    void writeRequirement(Requirement requirement, Writer writer) throws IOException;
-
-    String writeProperty(Property property);
-
-    void writeProperty(Property property, Writer writer) throws IOException;
-
-}
diff --git a/bundlerepository/src/main/java/org/apache/felix/bundlerepository/InterruptedResolutionException.java b/bundlerepository/src/main/java/org/apache/felix/bundlerepository/InterruptedResolutionException.java
deleted file mode 100644
index d7b7339920..0000000000
--- a/bundlerepository/src/main/java/org/apache/felix/bundlerepository/InterruptedResolutionException.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * 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;
-
-/**
- *
- * Exception thrown by the resolver if the resolution has been interrupted.
- */
-public class InterruptedResolutionException extends RuntimeException
-{
-    public InterruptedResolutionException()
-    {
-    }
-
-    public InterruptedResolutionException(String message)
-    {
-        super(message);
-    }
-
-    public InterruptedResolutionException(String message, Throwable cause)
-    {
-        super(message, cause);
-    }
-
-    public InterruptedResolutionException(Throwable cause)
-    {
-        super(cause);
-    }
-}
\ No newline at end of file
diff --git a/bundlerepository/src/main/java/org/apache/felix/bundlerepository/LocalResource.java b/bundlerepository/src/main/java/org/apache/felix/bundlerepository/LocalResource.java
deleted file mode 100644
index c4718d4332..0000000000
--- a/bundlerepository/src/main/java/org/apache/felix/bundlerepository/LocalResource.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * 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;
-
-import org.osgi.framework.BundleReference;
-
-public interface LocalResource extends BundleReference, Resource {
-}
diff --git a/bundlerepository/src/main/java/org/apache/felix/bundlerepository/Property.java b/bundlerepository/src/main/java/org/apache/felix/bundlerepository/Property.java
deleted file mode 100644
index 469beac386..0000000000
--- a/bundlerepository/src/main/java/org/apache/felix/bundlerepository/Property.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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;
-
-public interface Property
-{
-
-    String VERSION = "version";
-    String URL = "url";
-    String URI = "uri";
-    String LONG = "long";
-    String DOUBLE = "double";
-    String SET = "set";
-
-    String getName();
-
-    String getType();
-
-    String getValue();
-
-    Object getConvertedValue();
-
-}
diff --git a/bundlerepository/src/main/java/org/apache/felix/bundlerepository/Reason.java b/bundlerepository/src/main/java/org/apache/felix/bundlerepository/Reason.java
deleted file mode 100644
index b74daabbc2..0000000000
--- a/bundlerepository/src/main/java/org/apache/felix/bundlerepository/Reason.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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;
-
-/**
- * A pair of requirement and resource indicating a reason
- * why a resource has been chosen.
- * The reason indicates which resource and which requirement
- * has been satisfied by the selected resource.
- */
-public interface Reason {
-
-    Resource getResource();
-
-    Requirement getRequirement();
-
-}
diff --git a/bundlerepository/src/main/java/org/apache/felix/bundlerepository/Repository.java b/bundlerepository/src/main/java/org/apache/felix/bundlerepository/Repository.java
deleted file mode 100644
index 6794222e63..0000000000
--- a/bundlerepository/src/main/java/org/apache/felix/bundlerepository/Repository.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * 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.
- */
-/*
- * $Header: /cvshome/build/org.osgi.service.obr/src/org/osgi/service/obr/Repository.java,v 1.3 2006/03/16 14:56:17 hargrave Exp $
- *
- * Copyright (c) OSGi Alliance (2006). All Rights Reserved.
- *
- * Licensed 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.
- */
-
-// This document is an experimental draft to enable interoperability
-// between bundle repositories. There is currently no commitment to 
-// turn this draft into an official specification.  
-package org.apache.felix.bundlerepository;
-
-/**
- * Represents a repository.
- * 
- * @version $Revision: 1.3 $
- */
-public interface Repository
-{
-
-    /**
-     * URI identifying the system repository
-     */
-    String SYSTEM = "system";
-
-    /**
-     * URI identiying the local repository
-     */
-    String LOCAL = "local";
-
-    /**
-     * Return the associated URL for the repository.
-     * 
-     */
-    String getURI();
-
-    /**
-     * Return the resources for this repository.
-     */
-    Resource[] getResources();
-
-    /**
-     * Return the name of this repository.
-     * 
-     * @return a non-null name
-     */
-    String getName();
-
-    /**
-     * Return the last modification date of this repository
-     *
-     * @return the last modification date
-     */
-    long getLastModified();
-
-}
\ No newline at end of file
diff --git a/bundlerepository/src/main/java/org/apache/felix/bundlerepository/RepositoryAdmin.java b/bundlerepository/src/main/java/org/apache/felix/bundlerepository/RepositoryAdmin.java
deleted file mode 100644
index cfa43de171..0000000000
--- a/bundlerepository/src/main/java/org/apache/felix/bundlerepository/RepositoryAdmin.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * 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.
- */
-/*
- * $Header: /cvshome/build/org.osgi.service.obr/src/org/osgi/service/obr/RepositoryAdmin.java,v 1.3 2006/03/16 14:56:17 hargrave Exp $
- *
- * Copyright (c) OSGi Alliance (2006). All Rights Reserved.
- *
- * Licensed 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.
- */
-
-// This document is an experimental draft to enable interoperability
-// between bundle repositories. There is currently no commitment to 
-// turn this draft into an official specification.  
-package org.apache.felix.bundlerepository;
-
-import java.net.URL;
-
-import org.osgi.framework.InvalidSyntaxException;
-
-/**
- * Provides centralized access to the distributed repository.
- * 
- * A repository contains a set of <i>resources</i>. A resource contains a
- * number of fixed attributes (name, version, etc) and sets of:
- * <ol>
- * <li>Capabilities - Capabilities provide a named aspect: a bundle, a display,
- * memory, etc.</li>
- * <li>Requirements - A named filter expression. The filter must be satisfied
- * by one or more Capabilities with the given name. These capabilities can come
- * from other resources or from the platform. If multiple resources provide the
- * requested capability, one is selected. (### what algorithm? ###)</li>
- * <li>Requests - Requests are like requirements, except that a request can be
- * fulfilled by 0..n resources. This feature can be used to link to resources
- * that are compatible with the given resource and provide extra functionality.
- * For example, a bundle could request all its known fragments. The UI
- * associated with the repository could list these as optional downloads.</li>
- * 
- * @version $Revision: 1.3 $
- */
-public interface RepositoryAdmin
-{
-    /**
-     * Discover any resources that match the given filter.
-     * 
-     * This is not a detailed search, but a first scan of applicable resources.
-     * 
-     * ### Checking the capabilities of the filters is not possible because that
-     * requires a new construct in the filter.
-     * 
-     * The filter expression can assert any of the main headers of the resource.
-     * The attributes that can be checked are:
-     * 
-     * <ol>
-     * <li>name</li>
-     * <li>version (uses filter matching rules)</li>
-     * <li>description</li>
-     * <li>category</li>
-     * <li>copyright</li>
-     * <li>license</li>
-     * <li>source</li>
-     * </ol>
-     * 
-     * @param filterExpr
-     *            A standard OSGi filter
-     * @return List of resources matching the filters.
-     */
-    Resource[] discoverResources(String filterExpr) throws InvalidSyntaxException;
-
-    /**
-     * Discover any resources that match the given requirements.
-     *
-     * @param requirements
-     * @return List of resources matching the filter
-     */
-    Resource[] discoverResources(Requirement[] requirements);
-
-    /**
-     * Create a resolver.
-     *
-     * @return
-     */
-    Resolver resolver();
-
-    /**
-     * Create a resolver on the given repositories.
-     *
-     * @param repositories the list of repositories to use for the resolution
-     * @return
-     */
-    Resolver resolver(Repository[] repositories);
-
-    /**
-     * Add a new repository to the federation.
-     *
-     * The url must point to a repository XML file.
-     *
-     * @param repository
-     * @return
-     * @throws Exception
-     */
-    Repository addRepository(String repository) throws Exception;
-
-    /**
-     * Add a new repository to the federation.
-     *
-     * The url must point to a repository XML file.
-     *
-     * @param repository
-     * @return
-     * @throws Exception
-     */
-    Repository addRepository(URL repository) throws Exception;
-
-    /**
-     * Remove a repository from the federation
-     *
-     * The url must point to a repository XML file.
-     *
-     * @param repository
-     * @return
-     */
-    boolean removeRepository(String repository);
-
-    /**
-     * List all the repositories.
-     * 
-     * @return
-     */
-    Repository[] listRepositories();
-
-    /**
-     * Return the repository containing the system bundle
-     *
-     * @return
-     */
-    Repository getSystemRepository();
-
-    /**
-     * Return the repository containing locally installed resources
-     *
-     * @return
-     */
-    Repository getLocalRepository();
-
-    /**
-     * Return a helper to perform various operations on the data model
-     *
-     * @return
-     */
-    DataModelHelper getHelper();
-
-}
\ No newline at end of file
diff --git a/bundlerepository/src/main/java/org/apache/felix/bundlerepository/Requirement.java b/bundlerepository/src/main/java/org/apache/felix/bundlerepository/Requirement.java
deleted file mode 100644
index 06b2bd7be1..0000000000
--- a/bundlerepository/src/main/java/org/apache/felix/bundlerepository/Requirement.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * 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.
- */
-/*
- * $Header: /cvshome/build/org.osgi.service.obr/src/org/osgi/service/obr/Requirement.java,v 1.4 2006/03/16 14:56:17 hargrave Exp $
- *
- * Copyright (c) OSGi Alliance (2006). All Rights Reserved.
- *
- * Licensed 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.
- */
-
-// This document is an experimental draft to enable interoperability
-// between bundle repositories. There is currently no commitment to
-// turn this draft into an official specification.
-package org.apache.felix.bundlerepository;
-
-import java.util.Map;
-
-/**
- * A named requirement specifies the need for certain capabilities with the same
- * name.
- *
- * A requirement is said to be satisfied by a capability if and only if:
- * <ul>
- *   <li>they have the same nsame</li>
- *   <li>the filter matches the capability properties</li>
- * </ul>
- *
- * @version $Revision: 1.4 $
- */
-public interface Requirement
-{
-    /**
-     * Return a map of attributes. Requirements can have attributes, but these are not
-     * used for matching. They are for informational purposes only.
-     *
-     * @return The map of attributes.
-     */
-    Map<String, Object> getAttributes();
-
-    /**
-     * Return the map of directives for this requirement. This requirements map does *not*
-     * contain requirements that are modeled via direct APIs on this interface, such as the
-     * filter, cardinality and resolution.
-     * @return
-     */
-    Map<String, String> getDirectives();
-
-    /**
-     * Return the name of the requirement.
-     */
-    String getName();
-
-    /**
-     * Return the filter.
-     */
-    String getFilter();
-
-    boolean isMultiple();
-
-    boolean isOptional();
-
-    boolean isExtend();
-
-    String getComment();
-
-    /**
-     * Check if the given capability satisfied this requirement.
-     *
-     * @param capability the capability to check
-     * @return <code>true</code> is the capability satisfies this requirement, <code>false</code> otherwise
-     */
-    boolean isSatisfied(Capability capability);
-
-}
\ No newline at end of file
diff --git a/bundlerepository/src/main/java/org/apache/felix/bundlerepository/Resolver.java b/bundlerepository/src/main/java/org/apache/felix/bundlerepository/Resolver.java
deleted file mode 100644
index 42e9dab560..0000000000
--- a/bundlerepository/src/main/java/org/apache/felix/bundlerepository/Resolver.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * 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.
- */
-/*
- * $Header: /cvshome/build/org.osgi.service.obr/src/org/osgi/service/obr/Resolver.java,v 1.3 2006/03/16 14:56:17 hargrave Exp $
- *
- * Copyright (c) OSGi Alliance (2006). All Rights Reserved.
- *
- * Licensed 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.
- */
-
-// This document is an experimental draft to enable interoperability
-// between bundle repositories. There is currently no commitment to 
-// turn this draft into an official specification.  
-package org.apache.felix.bundlerepository;
-
-public interface Resolver
-{
-
-    int NO_OPTIONAL_RESOURCES =    0x0001;
-    int NO_LOCAL_RESOURCES =       0x0002;
-    int NO_SYSTEM_BUNDLE =         0x0004;
-    int DO_NOT_PREFER_LOCAL =      0x0008;
-    int START =                    0x0010;
-
-    /**
-     * Add the following resource to the resolution.
-     *
-     * The resource will be part of the output and all its requirements
-     * will be satisfied.
-     *
-     * It has the same effect has adding a requirement that will match
-     * this resource by symbolicname and version.
-     *
-     * The current resolution will be lost after adding a resource.
-     *
-     * @param resource the resource to add
-     */
-    void add(Resource resource);
-
-    /**
-     * Returns the list of resources that have been added to the resolution
-     * @return
-     */
-    Resource[] getAddedResources();
-
-    /**
-     * Add the following requirement to the resolution
-     *
-     * The current resolution will be lost after adding a requirement.
-     *
-     * @param requirement the requirement to add
-     */
-    void add(Requirement requirement);
-
-    /**
-     * Returns the list of requirements that have been added to the resolution
-     * @return
-     */
-    Requirement[] getAddedRequirements();
-
-    /**
-     * Add a global capability.
-     *
-     * A global capability is one capability provided by the environment
-     * but not reflected in local resources.
-     *
-     * @param capability the new global capability
-     */
-    void addGlobalCapability(Capability capability);
-
-    /**
-     * Returns the list of global capabilities
-     * @return
-     */
-    Capability[] getGlobalCapabilities();
-
-   /**
-     * Start the resolution process and return whether the constraints have
-     * been successfully met or not.
-     * The resolution can be interrupted by a call to Thread.interrupt() at any
-     * time.  The result will be to stop the resolver and throw an InterruptedException.
-     *
-     * @return <code>true</code> if the resolution has succeeded else <code>false</code>
-     * @throws InterruptedResolutionException if the resolution has been interrupted
-     */
-    boolean resolve() throws InterruptedResolutionException;
-
-    /**
-     * Start the resolution process with the following flags.
-     * @param flags resolution flags
-     * @return <code>true</code> if the resolution has succeeded else <code>false</code>
-     * @throws InterruptedResolutionException if the resolution has been interrupted
-     */
-    boolean resolve(int flags) throws InterruptedResolutionException;
-
-    /**
-     * List of mandatory resources that need to be installed
-     * @return
-     */
-    Resource[] getRequiredResources();
-
-    /**
-     * List of optional resources that may be installed
-     * @return
-     */
-    Resource[] getOptionalResources();
-
-    /**
-     * List of reasons why a resource has been included either as a mandatory or
-     * optional resource during the resolution.
-     *
-     * @param resource
-     * @return an array of Reason
-     */
-    Reason[] getReason(Resource resource);
-
-    /**
-     * List of requirements that could not be satisfied during the resolution
-     * @return
-     */
-    Reason[] getUnsatisfiedRequirements();
-
-    void deploy(int flags);
-}
\ No newline at end of file
diff --git a/bundlerepository/src/main/java/org/apache/felix/bundlerepository/Resource.java b/bundlerepository/src/main/java/org/apache/felix/bundlerepository/Resource.java
deleted file mode 100644
index 7246873fa0..0000000000
--- a/bundlerepository/src/main/java/org/apache/felix/bundlerepository/Resource.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * 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.
- */
-/*
- * $Header: /cvshome/build/org.osgi.service.obr/src/org/osgi/service/obr/Resource.java,v 1.5 2006/03/16 14:56:17 hargrave Exp $
- *
- * Copyright (c) OSGi Alliance (2006). All Rights Reserved.
- *
- * Licensed 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.
- */
-
-// This document is an experimental draft to enable interoperability
-// between bundle repositories. There is currently no commitment to 
-// turn this draft into an official specification.  
-package org.apache.felix.bundlerepository;
-
-import java.util.Map;
-
-import org.osgi.framework.Version;
-
-/**
- * A resource is an abstraction of a downloadable thing, like a bundle.
- * 
- * Resources have capabilities and requirements. All a resource's requirements
- * must be satisfied before it can be installed.
- */
-public interface Resource
-{
-    final String LICENSE_URI = "license";
-
-    final String DESCRIPTION = "description";
-
-    final String DOCUMENTATION_URI = "documentation";
-
-    final String COPYRIGHT = "copyright";
-
-    final String SOURCE_URI = "source";
-
-    final String JAVADOC_URI = "javadoc";
-
-    final String SYMBOLIC_NAME = "symbolicname";
-
-    final String PRESENTATION_NAME = "presentationname";
-
-    final String ID = "id";
-
-    final String VERSION = "version";
-
-    final String URI = "uri";
-
-    final String SIZE = "size";
-
-    final String CATEGORY = "category";
-
-    final String MANIFEST_VERSION = "manifestversion";
-
-    /**
-     * Get all resource properties
-     * @return
-     */
-    Map getProperties();
-
-    /**
-     * Shortcut for {{getProperties().get(ID)}}
-     * @return
-     */
-    String getId();
-
-    /**
-     * Shortcut for {{getProperties().get(SYMBOLIC_NAME)}}
-     * @return
-     */
-    String getSymbolicName();
-
-    /**
-     * Shortcut for {{getProperties().get(VERSION)}}
-     * @return
-     */
-    Version getVersion();
-
-    /**
-     * Shortcut for {{getProperties().get(PRESENTATION_NAME)}}
-     * @return
-     */
-    String getPresentationName();
-
-    /**
-     * Shortcut for {{getProperties().get(URI)}}
-     * @return
-     */
-    String getURI();
-
-    /**
-     * Shortcut for {{getProperties().get(SIZE)}}
-     * @return
-     */
-    Long getSize();
-
-    /**
-     * Retrieve this resource categories
-     * @return
-     */
-    String[] getCategories();
-
-    /**
-     * Retrieve the capabilities
-     * @return
-     */
-    Capability[] getCapabilities();
-
-    /**
-     * Retrieve the requirements
-     *
-     * @return
-     */
-    Requirement[] getRequirements();
-
-    /**
-     * Returns whether this resource is a local one or not.
-     *
-     * Local resources are already available in the OSGi framework and thus will be
-     * preferred over other resources.
-     */
-    boolean isLocal();
-
-}
\ No newline at end of file
diff --git a/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/Activator.java b/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/Activator.java
deleted file mode 100644
index a202173a4e..0000000000
--- a/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/Activator.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * 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.impl;
-
-import java.util.Hashtable;
-
-import org.apache.felix.bundlerepository.RepositoryAdmin;
-import org.apache.felix.bundlerepository.impl.wrapper.Wrapper;
-import org.apache.felix.utils.log.Logger;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.service.repository.Repository;
-import org.osgi.service.url.URLConstants;
-import org.osgi.service.url.URLStreamHandlerService;
-
-public class Activator implements BundleActivator
-{
-    private static BundleContext context = null;
-    private static Logger logger = new Logger(null);
-    private transient RepositoryAdminImpl m_repoAdmin = null;
-
-
-    public static BundleContext getContext()
-    {
-        return context;
-    }
-
-    static void setContext(BundleContext context)
-    {
-        Activator.context = context;
-    }
-
-    public static void log(int level, String message)
-    {
-        if (logger != null)
-        {
-            logger.log(level, message);
-        }
-    }
-
-    public static void log(int level, String message, Throwable exception)
-    {
-        if (logger != null)
-        {
-            logger.log(level, message, exception);
-        }
-    }
-
-    public void start(BundleContext context)
-    {
-        Activator.context = context;
-        Activator.logger = new Logger(context);
-
-        // Register bundle repository service.
-        m_repoAdmin = new RepositoryAdminImpl(context, logger);
-        context.registerService(
-            RepositoryAdmin.class.getName(),
-            m_repoAdmin, null);
-
-        // Register the OSGi Repository-spec compliant facade
-        context.registerService(
-            Repository.class.getName(),
-            new OSGiRepositoryImpl(m_repoAdmin), null);
-
-        try
-        {
-            context.registerService(
-                org.osgi.service.obr.RepositoryAdmin.class.getName(),
-                Wrapper.wrap(m_repoAdmin), null);
-        }
-        catch (Throwable th)
-        {
-            // Ignore
-        }
-
-        // We dynamically import the impl service API, so it
-        // might not actually be available, so be ready to catch
-        // the exception when we try to register the command service.
-        try
-        {
-            // Register "obr" impl command service as a
-            // wrapper for the bundle repository service.
-            context.registerService(
-                org.apache.felix.shell.Command.class.getName(),
-                new ObrCommandImpl(Activator.context, m_repoAdmin), null);
-        }
-        catch (Throwable th)
-        {
-            // Ignore.
-        }
-
-        try
-        {
-            Hashtable dict = new Hashtable();
-            dict.put("osgi.command.scope", "obr");
-            dict.put("osgi.command.function", new String[] {
-                    "deploy", "info", "javadoc", "list", "repos", "source" });
-            context.registerService(ObrGogoCommand.class.getName(),
-                    new ObrGogoCommand(Activator.context, m_repoAdmin), dict);
-        }
-        catch (Throwable th)
-        {
-            // Ignore
-        }
-
-        try
-        {
-			Hashtable dict = new Hashtable();
-			dict.put(URLConstants.URL_HANDLER_PROTOCOL, "obr");
-			context.registerService(URLStreamHandlerService.class.getName(),
-					new ObrURLStreamHandlerService(Activator.context, m_repoAdmin), dict);
-		}
-        catch (Exception e)
-		{
-			throw new RuntimeException("could not register obr url handler");
-		}
-
-    }
-
-    public void stop(BundleContext context)
-    {
-        m_repoAdmin.dispose();
-    }
-}
\ No newline at end of file
diff --git a/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/Base64Encoder.java b/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/Base64Encoder.java
deleted file mode 100644
index 93b89085e2..0000000000
--- a/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/Base64Encoder.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/* 
- * 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.impl;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-public class Base64Encoder
-{
-    private static final byte encTab[] = { 0x41, 0x42, 0x43, 0x44, 0x45, 0x46,
-        0x47, 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, 0x50, 0x51, 0x52,
-        0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5a, 0x61, 0x62, 0x63, 0x64,
-        0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70,
-        0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x30, 0x31,
-        0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x2b, 0x2f };
-
-    public static String base64Encode(String s) throws IOException
-    {
-        return encode(s.getBytes(), 0);
-    }
-
-    /**
-     * Encode a raw byte array to a Base64 String.
-     * 
-     * @param in Byte array to encode.
-     * @param len Length of Base64 lines. 0 means no line breaks.
-    **/
-    public static String encode(byte[] in, int len) throws IOException
-    {
-        ByteArrayOutputStream baos = null;
-        ByteArrayInputStream bais = null;
-        try
-        {
-            baos = new ByteArrayOutputStream();
-            bais = new ByteArrayInputStream(in);
-            encode(bais, baos, len);
-            // ASCII byte array to String
-            return (new String(baos.toByteArray()));
-        }
-        finally
-        {
-            if (baos != null)
-            {
-                baos.close();
-            }
-            if (bais != null)
-            {
-                bais.close();
-            }
-        }
-    }
-
-    public static void encode(InputStream in, OutputStream out, int len)
-        throws IOException
-    {
-
-        // Check that length is a multiple of 4 bytes
-        if (len % 4 != 0)
-        {
-            throw new IllegalArgumentException("Length must be a multiple of 4");
-        }
-
-        // Read input stream until end of file
-        int bits = 0;
-        int nbits = 0;
-        int nbytes = 0;
-        int b;
-
-        while ((b = in.read()) != -1)
-        {
-            bits = (bits << 8) | b;
-            nbits += 8;
-            while (nbits >= 6)
-            {
-                nbits -= 6;
-                out.write(encTab[0x3f & (bits >> nbits)]);
-                nbytes++;
-                // New line
-                if (len != 0 && nbytes >= len)
-                {
-                    out.write(0x0d);
-                    out.write(0x0a);
-                    nbytes -= len;
-                }
-            }
-        }
-
-        switch (nbits)
-        {
-            case 2:
-                out.write(encTab[0x3f & (bits << 4)]);
-                out.write(0x3d); // 0x3d = '='
-                out.write(0x3d);
-                break;
-            case 4:
-                out.write(encTab[0x3f & (bits << 2)]);
-                out.write(0x3d);
-                break;
-        }
-
-        if (len != 0)
-        {
-            if (nbytes != 0)
-            {
-                out.write(0x0d);
-                out.write(0x0a);
-            }
-            out.write(0x0d);
-            out.write(0x0a);
-        }
-    }
-}
\ No newline at end of file
diff --git a/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/CapabilityImpl.java b/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/CapabilityImpl.java
deleted file mode 100644
index 50e0f2fa6b..0000000000
--- a/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/CapabilityImpl.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * 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.impl;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.felix.bundlerepository.Capability;
-import org.apache.felix.bundlerepository.Property;
-
-public class CapabilityImpl implements Capability
-{
-    private String m_name = null;
-    private final Map<String, Object> m_attributes = new HashMap<String, Object>();
-    private final Map<String, String> m_directives = new HashMap<String, String>();
-    private final List<Property> m_propList = new ArrayList<Property>();
-
-    public CapabilityImpl()
-    {
-    }
-
-    public CapabilityImpl(String name)
-    {
-        setName(name);
-    }
-
-    public CapabilityImpl(String name, PropertyImpl[] properties)
-    {
-        setName(name);
-        for (int i = 0; properties != null && i < properties.length; i++)
-        {
-            addProperty(properties[i]);
-        }
-    }
-
-    public String getName()
-    {
-        return m_name;
-    }
-
-    public void setName(String name)
-    {
-        m_name = name.intern();
-    }
-
-    public Map<String, Object> getPropertiesAsMap()
-    {
-        return m_attributes;
-    }
-
-    public Property[] getProperties()
-    {
-        return m_propList.toArray(new Property[m_propList.size()]);
-    }
-
-    public void addProperty(Property prop)
-    {
-        // m_map.put(prop.getName().toLowerCase(), prop.getConvertedValue()); // TODO is toLowerCase() on the key the right thing to do?
-        // However if we definitely need to re-enable the to-lowercasing, the Felix Util FilterImpl supports treating filters
-        // case-insensitively
-        m_attributes.put(prop.getName(), prop.getConvertedValue());
-        m_propList.add(prop);
-    }
-
-    public void addProperty(String name, String value)
-    {
-        addProperty(name, null, value);
-    }
-
-    public void addProperty(String name, String type, String value)
-    {
-        addProperty(new PropertyImpl(name, type, value));
-    }
-
-    public String toString()
-    {
-        return m_name  + ":" + m_attributes.toString();
-    }
-
-    public void addDirective(String key, String value) {
-        m_directives.put(key, value);
-    }
-
-    public Map<String, String> getDirectives() {
-        return Collections.unmodifiableMap(m_directives);
-    }
-}
\ No newline at end of file
diff --git a/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/DataModelHelperImpl.java b/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/DataModelHelperImpl.java
deleted file mode 100644
index 5d845b75cf..0000000000
--- a/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/DataModelHelperImpl.java
+++ /dev/null
@@ -1,1080 +0,0 @@
-/*
- * 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.impl;
-
-import java.io.*;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Dictionary;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.jar.Attributes;
-import java.util.jar.JarFile;
-import java.util.jar.Manifest;
-import java.util.zip.GZIPInputStream;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-
-import org.apache.felix.bundlerepository.Capability;
-import org.apache.felix.bundlerepository.DataModelHelper;
-import org.apache.felix.bundlerepository.Property;
-import org.apache.felix.bundlerepository.Repository;
-import org.apache.felix.bundlerepository.Requirement;
-import org.apache.felix.bundlerepository.Resource;
-import org.apache.felix.utils.filter.FilterImpl;
-import org.apache.felix.utils.manifest.Attribute;
-import org.apache.felix.utils.manifest.Clause;
-import org.apache.felix.utils.manifest.Directive;
-import org.apache.felix.utils.manifest.Parser;
-import org.apache.felix.utils.version.VersionCleaner;
-import org.apache.felix.utils.version.VersionRange;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.Constants;
-import org.osgi.framework.Filter;
-import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.framework.Version;
-
-public class DataModelHelperImpl implements DataModelHelper
-{
-
-    public static final String BUNDLE_LICENSE = "Bundle-License";
-    public static final String BUNDLE_SOURCE = "Bundle-Source";
-
-    public Requirement requirement(String name, String filter)
-    {
-        RequirementImpl req = new RequirementImpl();
-        req.setName(name);
-        if (filter != null)
-        {
-            req.setFilter(filter);
-        }
-        return req;
-    }
-
-    public Filter filter(String filter)
-    {
-        try
-        {
-            return FilterImpl.newInstance(filter);
-        }
-        catch (InvalidSyntaxException e)
-        {
-            IllegalArgumentException ex = new IllegalArgumentException();
-            ex.initCause(e);
-            throw ex;
-        }
-    }
-
-    public Repository repository(final URL url) throws Exception
-    {
-        InputStream is = null;
-
-        try
-        {
-            if (url.getPath().endsWith(".zip"))
-            {
-                ZipInputStream zin = new ZipInputStream(FileUtil.openURL(url));
-                ZipEntry entry = zin.getNextEntry();
-                while (entry != null)
-                {
-                    if (entry.getName().equals("repository.xml") || entry.getName().equals("index.xml"))
-                    {
-                        is = zin;
-                        break;
-                    }
-                    entry = zin.getNextEntry();
-                }
-                // as the ZipInputStream is not used further it would not be closed.
-                if (is == null)
-                {
-                    try
-                    {
-                        zin.close();
-                    }
-                    catch (IOException ex)
-                    {
-                        // Not much we can do.
-                    }
-                }
-            }
-            else if (url.getPath().endsWith(".gz"))
-            {
-                is = new GZIPInputStream(FileUtil.openURL(url));
-            }
-            else
-            {
-                is = FileUtil.openURL(url);
-            }
-
-            if (is != null)
-            {
-                String repositoryUri = url.toExternalForm();
-                String baseUri;
-                if (repositoryUri.endsWith(".zip")) {
-                    baseUri = new StringBuilder("jar:").append(repositoryUri).append("!/").toString();
-                } else if (repositoryUri.endsWith(".xml")) {
-                    baseUri = repositoryUri.substring(0, repositoryUri.lastIndexOf('/') + 1);
-                } else {
-                    baseUri = repositoryUri;
-                }
-                RepositoryImpl repository = repository(is, URI.create(baseUri));
-                repository.setURI(repositoryUri);
-
-                return repository;
-            }
-            else
-            {
-                // This should not happen.
-                throw new Exception("Unable to get input stream for repository.");
-            }
-        }
-        finally
-        {
-            try
-            {
-                if (is != null)
-                {
-                    is.close();
-                }
-            }
-            catch (IOException ex)
-            {
-                // Not much we can do.
-            }
-        }
-    }
-
-    public RepositoryImpl repository(InputStream is, URI baseURI) throws Exception
-    {
-        RepositoryParser parser = RepositoryParser.getParser();
-        RepositoryImpl repository = parser.parseRepository(is, baseURI);
-        
-        return repository;
-    }
-
-    public Repository repository(Resource[] resources)
-    {
-        return new RepositoryImpl(resources);
-    }
-
-    public Capability capability(String name, Map properties)
-    {
-        CapabilityImpl cap = new CapabilityImpl(name);
-        for (Iterator it = properties.entrySet().iterator(); it.hasNext();)
-        {
-            Map.Entry e = (Map.Entry) it.next();
-            cap.addProperty((String) e.getKey(), (String) e.getValue());
-        }
-        return cap;
-    }
-
-    public String writeRepository(Repository repository)
-    {
-        try
-        {
-            StringWriter sw = new StringWriter();
-            writeRepository(repository, sw);
-            return sw.toString();
-        }
-        catch (IOException e)
-        {
-            IllegalStateException ex = new IllegalStateException(e);
-            ex.initCause(e);
-            throw ex;
-        }
-    }
-
-    public void writeRepository(Repository repository, Writer writer) throws IOException
-    {
-        XmlWriter w = new XmlWriter(writer);
-        toXml(w, repository);
-    }
-
-    public String writeResource(Resource resource)
-    {
-        try
-        {
-            StringWriter sw = new StringWriter();
-            writeResource(resource, sw);
-            return sw.toString();
-        }
-        catch (IOException e)
-        {
-            IllegalStateException ex = new IllegalStateException(e);
-            ex.initCause(e);
-            throw ex;
-        }
-    }
-
-    public void writeResource(Resource resource, Writer writer) throws IOException
-    {
-        XmlWriter w = new XmlWriter(writer);
-        toXml(w, resource);
-    }
-
-    public String writeCapability(Capability capability)
-    {
-        try
-        {
-            StringWriter sw = new StringWriter();
-            writeCapability(capability, sw);
-            return sw.toString();
-        }
-        catch (IOException e)
-        {
-            IllegalStateException ex = new IllegalStateException(e);
-            ex.initCause(e);
-            throw ex;
-        }
-    }
-
-    public void writeCapability(Capability capability, Writer writer) throws IOException
-    {
-        XmlWriter w = new XmlWriter(writer);
-        toXml(w, capability);
-    }
-
-    public String writeRequirement(Requirement requirement)
-    {
-        try
-        {
-            StringWriter sw = new StringWriter();
-            writeRequirement(requirement, sw);
-            return sw.toString();
-        }
-        catch (IOException e)
-        {
-            IllegalStateException ex = new IllegalStateException(e);
-            ex.initCause(e);
-            throw ex;
-        }
-    }
-
-    public void writeRequirement(Requirement requirement, Writer writer) throws IOException
-    {
-        XmlWriter w = new XmlWriter(writer);
-        toXml(w, requirement);
-    }
-
-    public String writeProperty(Property property)
-    {
-        try
-        {
-            StringWriter sw = new StringWriter();
-            writeProperty(property, sw);
-            return sw.toString();
-        }
-        catch (IOException e)
-        {
-            IllegalStateException ex = new IllegalStateException(e);
-            ex.initCause(e);
-            throw ex;
-        }
-    }
-
-    public void writeProperty(Property property, Writer writer) throws IOException
-    {
-        XmlWriter w = new XmlWriter(writer);
-        toXml(w, property);
-    }
-
-    private static void toXml(XmlWriter w, Repository repository) throws IOException
-    {
-        SimpleDateFormat format = new SimpleDateFormat("yyyyMMddhhmmss.SSS");
-        w.element(RepositoryParser.REPOSITORY)
-            .attribute(RepositoryParser.NAME, repository.getName())
-            .attribute(RepositoryParser.LASTMODIFIED, format.format(new Date(repository.getLastModified())));
-
-        if (repository instanceof RepositoryImpl)
-        {
-            Referral[] referrals = ((RepositoryImpl) repository).getReferrals();
-            for (int i = 0; referrals != null && i < referrals.length; i++)
-            {
-                w.element(RepositoryParser.REFERRAL)
-                    .attribute(RepositoryParser.DEPTH, new Integer(referrals[i].getDepth()))
-                    .attribute(RepositoryParser.URL, referrals[i].getUrl())
-                    .end();
-            }
-        }
-
-        Resource[] resources = repository.getResources();
-        for (int i = 0; resources != null && i < resources.length; i++)
-        {
-            toXml(w, resources[i]);
-        }
-
-        w.end();
-    }
-
-    private static void toXml(XmlWriter w, Resource resource) throws IOException
-    {
-        w.element(RepositoryParser.RESOURCE)
-            .attribute(Resource.ID, resource.getId())
-            .attribute(Resource.SYMBOLIC_NAME, resource.getSymbolicName())
-            .attribute(Resource.PRESENTATION_NAME, resource.getPresentationName())
-            .attribute(Resource.URI, getRelativeUri(resource, Resource.URI))
-            .attribute(Resource.VERSION, resource.getVersion().toString());
-
-        w.textElement(Resource.DESCRIPTION, resource.getProperties().get(Resource.DESCRIPTION))
-            .textElement(Resource.SIZE, resource.getProperties().get(Resource.SIZE))
-            .textElement(Resource.DOCUMENTATION_URI, getRelativeUri(resource, Resource.DOCUMENTATION_URI))
-            .textElement(Resource.SOURCE_URI, getRelativeUri(resource, Resource.SOURCE_URI))
-            .textElement(Resource.JAVADOC_URI, getRelativeUri(resource, Resource.JAVADOC_URI))
-            .textElement(Resource.LICENSE_URI, getRelativeUri(resource, Resource.LICENSE_URI));
-
-        String[] categories = resource.getCategories();
-        for (int i = 0; categories != null && i < categories.length; i++)
-        {
-            w.element(RepositoryParser.CATEGORY)
-                .attribute(RepositoryParser.ID, categories[i])
-                .end();
-        }
-        Capability[] capabilities = resource.getCapabilities();
-        for (int i = 0; capabilities != null && i < capabilities.length; i++)
-        {
-            toXml(w, capabilities[i]);
-        }
-        Requirement[] requirements = resource.getRequirements();
-        for (int i = 0; requirements != null && i < requirements.length; i++)
-        {
-            toXml(w, requirements[i]);
-        }
-        w.end();
-    }
-
-    private static String getRelativeUri(Resource resource, String name) 
-    {
-        String uri = (String) resource.getProperties().get(name);
-        if (resource instanceof ResourceImpl)
-        {
-            try
-            {
-                uri = URI.create(((ResourceImpl) resource).getRepository().getURI()).relativize(URI.create(uri)).toASCIIString();
-            }
-            catch (Throwable t)
-            {
-            }
-        }
-        return uri;
-    }
-
-    private static void toXml(XmlWriter w, Capability capability) throws IOException
-    {
-        w.element(RepositoryParser.CAPABILITY)
-            .attribute(RepositoryParser.NAME, capability.getName());
-        Property[] props = capability.getProperties();
-        for (int j = 0; props != null && j < props.length; j++)
-        {
-            toXml(w, props[j]);
-        }
-        w.end();
-    }
-
-    private static void toXml(XmlWriter w, Property property) throws IOException
-    {
-        w.element(RepositoryParser.P)
-            .attribute(RepositoryParser.N, property.getName())
-            .attribute(RepositoryParser.T, property.getType())
-            .attribute(RepositoryParser.V, property.getValue())
-            .end();
-    }
-
-    private static void toXml(XmlWriter w, Requirement requirement) throws IOException
-    {
-        w.element(RepositoryParser.REQUIRE)
-            .attribute(RepositoryParser.NAME, requirement.getName())
-            .attribute(RepositoryParser.FILTER, requirement.getFilter())
-            .attribute(RepositoryParser.EXTEND, Boolean.toString(requirement.isExtend()))
-            .attribute(RepositoryParser.MULTIPLE, Boolean.toString(requirement.isMultiple()))
-            .attribute(RepositoryParser.OPTIONAL, Boolean.toString(requirement.isOptional()))
-            .text(requirement.getComment().trim())
-            .end();
-    }
-
-    public Resource createResource(final Bundle bundle)
-    {
-        final Dictionary dict = bundle.getHeaders();
-        return createResource(new Headers()
-        {
-            public String getHeader(String name)
-            {
-                return (String) dict.get(name);
-            }
-        });
-    }
-
-    public Resource createResource(final URL bundleUrl) throws IOException
-    {
-        ResourceImpl resource = createResource(new Headers()
-        {
-            private final Manifest manifest;
-            private Properties localization;
-            {
-                // Do not use a JarInputStream so that we can read the manifest even if it's not
-                // the first entry in the JAR.
-                byte[] man = loadEntry(JarFile.MANIFEST_NAME);
-                if (man == null)
-                {
-                    throw new IllegalArgumentException("The specified url is not a valid jar (can't read manifest): " + bundleUrl);
-                }
-                manifest = new Manifest(new ByteArrayInputStream(man));
-            }
-            public String getHeader(String name)
-            {
-                String value = manifest.getMainAttributes().getValue(name);
-                if (value != null && value.startsWith("%"))
-                {
-                    if (localization == null)
-                    {
-                        try
-                        {
-                            localization = new Properties();
-                            String path = manifest.getMainAttributes().getValue(Constants.BUNDLE_LOCALIZATION);
-                            if (path == null)
-                            {
-                                path = Constants.BUNDLE_LOCALIZATION_DEFAULT_BASENAME;
-                            }
-                            path += ".properties";
-                            byte[] loc = loadEntry(path);
-                            if (loc != null)
-                            {
-                                localization.load(new ByteArrayInputStream(loc));
-                            }
-                        }
-                        catch (IOException e)
-                        {
-                            // TODO: ?
-                        }
-                    }
-                    value = value.substring(1);
-                    value = localization.getProperty(value, value);
-                }
-                return value;
-            }
-            private byte[] loadEntry(String name) throws IOException
-            {
-                ZipInputStream zis = new ZipInputStream(FileUtil.openURL(bundleUrl));
-                try
-                {
-                    for (ZipEntry e = zis.getNextEntry(); e != null; e = zis.getNextEntry())
-                    {
-                        if (name.equalsIgnoreCase(e.getName()))
-                        {
-                            ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                            byte[] buf = new byte[1024];
-                            int n;
-                            while ((n = zis.read(buf, 0, buf.length)) > 0)
-                            {
-                                baos.write(buf, 0, n);
-                            }
-                            return baos.toByteArray();
-                        }
-                    }
-                }
-                finally
-                {
-                    zis.close();
-                }
-                return null;
-            }
-        });
-        if (resource != null)
-        {
-            if ("file".equals(bundleUrl.getProtocol()))
-            {
-                try {
-                    File f = new File(bundleUrl.toURI());
-                    resource.put(Resource.SIZE, Long.toString(f.length()), null);
-                } catch (URISyntaxException e) {
-                    throw new RuntimeException(e);
-                }
-            }
-            resource.put(Resource.URI, bundleUrl.toExternalForm(), null);
-        }
-        return resource;
-    }
-
-    public Resource createResource(final Attributes attributes)
-    {
-        return createResource(new Headers()
-        {
-            public String getHeader(String name)
-            {
-                return attributes.getValue(name);
-            }
-        });
-    }
-
-    public ResourceImpl createResource(Headers headers)
-    {
-        String bsn = headers.getHeader(Constants.BUNDLE_SYMBOLICNAME);
-        if (bsn == null)
-        {
-            return null;
-        }
-        ResourceImpl resource = new ResourceImpl();
-        populate(headers, resource);
-        return resource;
-    }
-
-    static void populate(Headers headers, ResourceImpl resource)
-    {
-        String bsn = getSymbolicName(headers);
-        String v = getVersion(headers);
-
-        resource.put(Resource.ID, bsn + "/" + v);
-        resource.put(Resource.SYMBOLIC_NAME, bsn);
-        resource.put(Resource.VERSION, v);
-        if (headers.getHeader(Constants.BUNDLE_NAME) != null)
-        {
-            resource.put(Resource.PRESENTATION_NAME, headers.getHeader(Constants.BUNDLE_NAME));
-        }
-        if (headers.getHeader(Constants.BUNDLE_DESCRIPTION) != null)
-        {
-            resource.put(Resource.DESCRIPTION, headers.getHeader(Constants.BUNDLE_DESCRIPTION));
-        }
-        if (headers.getHeader(BUNDLE_LICENSE) != null)
-        {
-            resource.put(Resource.LICENSE_URI, headers.getHeader(BUNDLE_LICENSE));
-        }
-        if (headers.getHeader(Constants.BUNDLE_COPYRIGHT) != null)
-        {
-            resource.put(Resource.COPYRIGHT, headers.getHeader(Constants.BUNDLE_COPYRIGHT));
-        }
-        if (headers.getHeader(Constants.BUNDLE_DOCURL) != null)
-        {
-            resource.put(Resource.DOCUMENTATION_URI, headers.getHeader(Constants.BUNDLE_DOCURL));
-        }
-        if (headers.getHeader(BUNDLE_SOURCE) != null)
-        {
-            resource.put(Resource.SOURCE_URI, headers.getHeader(BUNDLE_SOURCE));
-        }
-
-        doCategories(resource, headers);
-        doBundle(resource, headers);
-        doImportExportServices(resource, headers);
-        doFragment(resource, headers);
-        doRequires(resource, headers);
-        doExports(resource, headers);
-        doImports(resource, headers);
-        doExecutionEnvironment(resource, headers);
-        doProvides(resource, headers);
-    }
-
-    private static void doCategories(ResourceImpl resource, Headers headers)
-    {
-        Clause[] clauses = Parser.parseHeader(headers.getHeader(Constants.BUNDLE_CATEGORY));
-        for (int i = 0; clauses != null && i < clauses.length; i++)
-        {
-            resource.addCategory(clauses[i].getName());
-        }
-    }
-
-    private static void doImportExportServices(ResourceImpl resource, Headers headers)
-    {
-        Clause[] imports = Parser.parseHeader(headers.getHeader(Constants.IMPORT_SERVICE));
-        for (int i = 0; imports != null && i < imports.length; i++) {
-            RequirementImpl ri = new RequirementImpl(Capability.SERVICE);
-            ri.setFilter(createServiceFilter(imports[i]));
-            ri.addText("Import Service " + imports[i].getName());
-
-            String avail = imports[i].getDirective("availability");
-            String mult = imports[i].getDirective("multiple");
-            ri.setOptional("optional".equalsIgnoreCase(avail));
-            ri.setMultiple(!"false".equalsIgnoreCase(mult));
-            resource.addRequire(ri);
-        }
-
-        Clause[] exports = Parser.parseHeader(headers.getHeader(Constants.EXPORT_SERVICE));
-        for (int i = 0; exports != null && i < exports.length; i++) {
-            CapabilityImpl cap = createServiceCapability(exports[i]);
-            resource.addCapability(cap);
-        }
-    }
-
-    private static String createServiceFilter(Clause clause) {
-        String f = clause.getAttribute("filter");
-		StringBuffer filter = new StringBuffer();
-        if (f != null) {
-            filter.append("(&");
-        }
-        filter.append("(");
-        filter.append(Capability.SERVICE);
-        filter.append("=");
-		filter.append(clause.getName());
-		filter.append(")");
-        if (f != null) {
-            if (!f.startsWith("("))
-            {
-                filter.append("(").append(f).append(")");
-            }
-            else
-            {
-                filter.append(f);
-            }
-            filter.append(")");
-        }
-		return filter.toString();
-    }
-
-    private static CapabilityImpl createServiceCapability(Clause clause) {
-        CapabilityImpl capability = new CapabilityImpl(Capability.SERVICE);
-        capability.addProperty(Capability.SERVICE, clause.getName());
-        Attribute[] attributes = clause.getAttributes();
-        for (int i = 0; attributes != null && i < attributes.length; i++)
-        {
-            capability.addProperty(attributes[i].getName(), attributes[i].getValue());
-        }
-        return capability;
-    }
-
-    private static void doFragment(ResourceImpl resource, Headers headers)
-    {
-        // Check if we are a fragment
-        Clause[] clauses = Parser.parseHeader(headers.getHeader(Constants.FRAGMENT_HOST));
-        if (clauses != null && clauses.length == 1)
-        {
-            // We are a fragment, create a requirement
-            // to our host.
-            RequirementImpl r = new RequirementImpl(Capability.BUNDLE);
-            StringBuffer sb = new StringBuffer();
-            sb.append("(&(symbolicname=");
-            sb.append(clauses[0].getName());
-            sb.append(")");
-            appendVersion(sb, VersionRange.parseVersionRange(clauses[0].getAttribute(Constants.BUNDLE_VERSION_ATTRIBUTE)));
-            sb.append(")");
-            r.setFilter(sb.toString());
-            r.addText("Required Host " + clauses[0].getName());
-            r.setExtend(true);
-            r.setOptional(false);
-            r.setMultiple(false);
-            resource.addRequire(r);
-
-            // And insert a capability that we are available
-            // as a fragment. ### Do we need that with extend?
-            CapabilityImpl capability = new CapabilityImpl(Capability.FRAGMENT);
-            capability.addProperty("host", clauses[0].getName());
-            capability.addProperty("version", Property.VERSION, getVersion(clauses[0]));
-            resource.addCapability(capability);
-        }
-    }
-
-    private static void doRequires(ResourceImpl resource, Headers headers)
-    {
-        Clause[] clauses = Parser.parseHeader(headers.getHeader(Constants.REQUIRE_BUNDLE));
-        for (int i = 0; clauses != null && i < clauses.length; i++) {
-            RequirementImpl r = new RequirementImpl(Capability.BUNDLE);
-
-            VersionRange v = VersionRange.parseVersionRange(clauses[i].getAttribute(Constants.BUNDLE_VERSION_ATTRIBUTE));
-
-            StringBuffer sb = new StringBuffer();
-            sb.append("(&(symbolicname=");
-            sb.append(clauses[i].getName());
-            sb.append(")");
-            appendVersion(sb, v);
-            sb.append(")");
-            r.setFilter(sb.toString());
-
-            r.addText("Require Bundle " + clauses[i].getName() + "; " + v);
-            r.setOptional(Constants.RESOLUTION_OPTIONAL.equalsIgnoreCase(clauses[i].getDirective(Constants.RESOLUTION_DIRECTIVE)));
-            resource.addRequire(r);
-        }
-    }
-
-    private static void doBundle(ResourceImpl resource, Headers headers) {
-        CapabilityImpl capability = new CapabilityImpl(Capability.BUNDLE);
-        capability.addProperty(Resource.SYMBOLIC_NAME, getSymbolicName(headers));
-        if (headers.getHeader(Constants.BUNDLE_NAME) != null)
-        {
-            capability.addProperty(Resource.PRESENTATION_NAME, headers.getHeader(Constants.BUNDLE_NAME));
-        }
-        capability.addProperty(Resource.VERSION, Property.VERSION, getVersion(headers));
-        capability.addProperty(Resource.MANIFEST_VERSION, getManifestVersion(headers));
-        resource.addCapability(capability);
-    }
-
-    private static void doExports(ResourceImpl resource, Headers headers)
-    {
-        Clause[] clauses = Parser.parseHeader(headers.getHeader(Constants.EXPORT_PACKAGE));
-        for (int i = 0; clauses != null && i < clauses.length; i++)
-        {
-            CapabilityImpl capability = createCapability(Capability.PACKAGE, clauses[i]);
-            resource.addCapability(capability);
-        }
-    }
-
-    private static void doProvides(ResourceImpl resource, Headers headers) {
-        Clause[] clauses = Parser.parseHeader(headers.getHeader(Constants.PROVIDE_CAPABILITY));
-
-        if (clauses != null) {
-            for (Clause clause : clauses) {
-                CapabilityImpl capability = createCapability(clause.getName(), clause);
-                resource.addCapability(capability);
-            }
-        }
-    }
-
-    private static CapabilityImpl createCapability(String name, Clause clause)
-    {
-        CapabilityImpl capability = new CapabilityImpl(NamespaceTranslator.getFelixNamespace(name));
-        capability.addProperty(name, clause.getName());
-        capability.addProperty(Resource.VERSION, Property.VERSION, getVersion(clause));
-        Attribute[] attributes = clause.getAttributes();
-        for (int i = 0; attributes != null && i < attributes.length; i++)
-        {
-            String key = attributes[i].getName();
-            if (key.equalsIgnoreCase(Constants.PACKAGE_SPECIFICATION_VERSION) || key.equalsIgnoreCase(Constants.VERSION_ATTRIBUTE) || key.equalsIgnoreCase("version:Version"))
-            {
-                continue;
-            }
-            else
-            {
-                String value = attributes[i].getValue();
-                capability.addProperty(key, value);
-            }
-        }
-        Directive[] directives = clause.getDirectives();
-        for (int i = 0; directives != null && i < directives.length; i++)
-        {
-            String key = directives[i].getName();
-            String value = directives[i].getValue();
-            capability.addProperty(key + ":", value);
-        }
-        return capability;
-    }
-
-    private static void doImports(ResourceImpl resource, Headers headers)
-    {
-        Clause[] clauses = Parser.parseHeader(headers.getHeader(Constants.IMPORT_PACKAGE));
-        for (int i = 0; clauses != null && i < clauses.length; i++)
-        {
-            RequirementImpl requirement = new RequirementImpl(Capability.PACKAGE);
-
-            createImportFilter(requirement, Capability.PACKAGE, clauses[i]);
-            requirement.addText("Import package " + clauses[i]);
-            requirement.setOptional(Constants.RESOLUTION_OPTIONAL.equalsIgnoreCase(clauses[i].getDirective(Constants.RESOLUTION_DIRECTIVE)));
-            resource.addRequire(requirement);
-        }
-    }
-
-    private static void createImportFilter(RequirementImpl requirement, String name, Clause clause)
-    {
-        StringBuffer filter = new StringBuffer();
-        filter.append("(&(");
-        filter.append(name);
-        filter.append("=");
-        filter.append(clause.getName());
-        filter.append(")");
-        appendVersion(filter, getVersionRange(clause));
-        Attribute[] attributes = clause.getAttributes();
-        Set attrs = doImportPackageAttributes(requirement, filter, attributes);
-
-        // The next code is using the subset operator
-        // to check mandatory attributes, it seems to be
-        // impossible to rewrite. It must assert that whateber
-        // is in mandatory: must be in any of the attributes.
-        // This is a fundamental shortcoming of the filter language.
-        if (attrs.size() > 0)
-        {
-            String del = "";
-            filter.append("(mandatory:<*");
-            for (Iterator i = attrs.iterator(); i.hasNext();)
-            {
-                filter.append(del);
-                filter.append(i.next());
-                del = ", ";
-            }
-            filter.append(")");
-        }
-        filter.append(")");
-        requirement.setFilter(filter.toString());
-    }
-
-    private static Set doImportPackageAttributes(RequirementImpl requirement, StringBuffer filter, Attribute[] attributes)
-    {
-        HashSet set = new HashSet();
-        for (int i = 0; attributes != null && i < attributes.length; i++)
-        {
-            String name = attributes[i].getName();
-            String value = attributes[i].getValue();
-            if (name.equalsIgnoreCase(Constants.PACKAGE_SPECIFICATION_VERSION) || name.equalsIgnoreCase(Constants.VERSION_ATTRIBUTE))
-            {
-                continue;
-            }
-            else if (name.equalsIgnoreCase(Constants.RESOLUTION_DIRECTIVE + ":"))
-            {
-                requirement.setOptional(Constants.RESOLUTION_OPTIONAL.equalsIgnoreCase(value));
-            }
-            if (name.endsWith(":"))
-            {
-                // Ignore
-            }
-            else
-            {
-                filter.append("(");
-                filter.append(name);
-                filter.append("=");
-                filter.append(value);
-                filter.append(")");
-                set.add(name);
-            }
-        }
-        return set;
-    }
-
-    private static void doExecutionEnvironment(ResourceImpl resource, Headers headers)
-    {
-        Clause[] clauses = Parser.parseHeader(headers.getHeader(Constants.BUNDLE_REQUIREDEXECUTIONENVIRONMENT));
-        if (clauses != null && clauses.length > 0)
-        {
-            StringBuffer sb = new StringBuffer();
-            sb.append("(|");
-            for (int i = 0; i < clauses.length; i++)
-            {
-                sb.append("(");
-                sb.append(Capability.EXECUTIONENVIRONMENT);
-                sb.append("=");
-                sb.append(clauses[i].getName());
-                sb.append(")");
-            }
-            sb.append(")");
-            RequirementImpl req = new RequirementImpl(Capability.EXECUTIONENVIRONMENT);
-            req.setFilter(sb.toString());
-            req.addText("Execution Environment " + sb.toString());
-            resource.addRequire(req);
-        }
-    }
-
-    private static String getVersion(Clause clause)
-    {
-        String v = clause.getAttribute(Constants.VERSION_ATTRIBUTE);
-        if (v == null)
-        {
-            v = clause.getAttribute(Constants.PACKAGE_SPECIFICATION_VERSION);
-        }
-        if (v == null)
-        {
-            v = clause.getAttribute(Constants.BUNDLE_VERSION_ATTRIBUTE);
-        }
-        if (v == null)
-        {
-            v = clause.getAttribute("version:Version");
-        }
-
-        return VersionCleaner.clean(v);
-    }
-
-    private static VersionRange getVersionRange(Clause clause)
-    {
-        String v = clause.getAttribute(Constants.VERSION_ATTRIBUTE);
-        if (v == null)
-        {
-            v = clause.getAttribute(Constants.PACKAGE_SPECIFICATION_VERSION);
-        }
-        if (v == null)
-        {
-            v = clause.getAttribute(Constants.BUNDLE_VERSION_ATTRIBUTE);
-        }
-        return VersionRange.parseVersionRange(v);
-    }
-
-    private static String getSymbolicName(Headers headers)
-    {
-        String bsn = headers.getHeader(Constants.BUNDLE_SYMBOLICNAME);
-        if (bsn == null)
-        {
-            bsn = headers.getHeader(Constants.BUNDLE_NAME);
-            if (bsn == null)
-            {
-                bsn = "Untitled-" + headers.hashCode();
-            }
-        }
-        Clause[] clauses = Parser.parseHeader(bsn);
-        return clauses[0].getName();
-    }
-
-    private static String getVersion(Headers headers)
-    {
-        String v = headers.getHeader(Constants.BUNDLE_VERSION);
-        return VersionCleaner.clean(v);
-    }
-
-    private static String getManifestVersion(Headers headers)
-    {
-        String v = headers.getHeader(Constants.BUNDLE_MANIFESTVERSION);
-        if (v == null)
-        {
-            v = "1";
-        }
-        return v;
-    }
-
-    private static void appendVersion(StringBuffer filter, VersionRange version)
-    {
-        if (version != null)
-        {
-            if ( !version.isOpenFloor() )
-            {
-                if ( !Version.emptyVersion.equals(version.getFloor()) )
-                {
-                    filter.append("(");
-                    filter.append(Constants.VERSION_ATTRIBUTE);
-                    filter.append(">=");
-                    filter.append(version.getFloor());
-                    filter.append(")");
-                }
-            }
-            else
-            {
-                filter.append("(!(");
-                filter.append(Constants.VERSION_ATTRIBUTE);
-                filter.append("<=");
-                filter.append(version.getFloor());
-                filter.append("))");
-            }
-
-            if (!VersionRange.INFINITE_VERSION.equals(version.getCeiling()))
-            {
-                if ( !version.isOpenCeiling() )
-                {
-                    filter.append("(");
-                    filter.append(Constants.VERSION_ATTRIBUTE);
-                    filter.append("<=");
-                    filter.append(version.getCeiling());
-                    filter.append(")");
-                }
-                else
-                {
-                    filter.append("(!(");
-                    filter.append(Constants.VERSION_ATTRIBUTE);
-                    filter.append(">=");
-                    filter.append(version.getCeiling());
-                    filter.append("))");
-                }
-            }
-        }
-    }
-
-    interface Headers
-    {
-        String getHeader(String name);
-    }
-
-    public Repository readRepository(String xml) throws Exception
-    {
-        try
-        {
-            return readRepository(new StringReader(xml));
-        }
-        catch (IOException e)
-        {
-            IllegalStateException ex = new IllegalStateException(e);
-            ex.initCause(e);
-            throw ex;
-        }
-    }
-
-    public Repository readRepository(Reader reader) throws Exception
-    {
-        return RepositoryParser.getParser().parseRepository(reader);
-    }
-
-    public Resource readResource(String xml) throws Exception
-    {
-        try
-        {
-            return readResource(new StringReader(xml));
-        }
-        catch (IOException e)
-        {
-            IllegalStateException ex = new IllegalStateException(e);
-            ex.initCause(e);
-            throw ex;
-        }
-    }
-
-    public Resource readResource(Reader reader) throws Exception
-    {
-        return RepositoryParser.getParser().parseResource(reader);
-    }
-
-    public Capability readCapability(String xml) throws Exception
-    {
-        try
-        {
-            return readCapability(new StringReader(xml));
-        }
-        catch (IOException e)
-        {
-            IllegalStateException ex = new IllegalStateException(e);
-            ex.initCause(e);
-            throw ex;
-        }
-    }
-
-    public Capability readCapability(Reader reader) throws Exception
-    {
-        return RepositoryParser.getParser().parseCapability(reader);
-    }
-
-    public Requirement readRequirement(String xml) throws Exception
-    {
-        try
-        {
-            return readRequirement(new StringReader(xml));
-        }
-        catch (IOException e)
-        {
-            IllegalStateException ex = new IllegalStateException(e);
-            ex.initCause(e);
-            throw ex;
-        }
-    }
-
-    public Requirement readRequirement(Reader reader) throws Exception
-    {
-        return RepositoryParser.getParser().parseRequirement(reader);
-    }
-
-    public Property readProperty(String xml) throws Exception
-    {
-        try
-        {
-            return readProperty(new StringReader(xml));
-        }
-        catch (IOException e)
-        {
-            IllegalStateException ex = new IllegalStateException(e);
-            ex.initCause(e);
-            throw ex;
-        }
-    }
-
-    public Property readProperty(Reader reader) throws Exception
-    {
-        return RepositoryParser.getParser().parseProperty(reader);
-    }
-}
diff --git a/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/FelixCapabilityAdapter.java b/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/FelixCapabilityAdapter.java
deleted file mode 100644
index 8d93af42e1..0000000000
--- a/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/FelixCapabilityAdapter.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Licensed 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
... 839910 lines suppressed ...