[felix-framework] 01/06: Merge tag 'upstream/4.4.0'
Markus Koschany
apo-guest at moszumanska.debian.org
Mon Jul 14 10:50:59 UTC 2014
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a commit to branch master
in repository felix-framework.
commit c7a87b2a3c40bae7e1a646b674d985ab13b94094
Merge: 3137204 13a5a3f
Author: Markus Koschany <apo at gambaru.de>
Date: Mon Jul 14 11:47:46 2014 +0200
Merge tag 'upstream/4.4.0'
Upstream version 4.4.0
# gpg: Signature made Mon 14 Jul 2014 11:47:42 CEST using RSA key ID 513B51E4
# gpg: Good signature from "Markus Koschany <apo at gambaru.de>" [ultimate]
# gpg: aka "Markus Koschany <markus at koschany.net>" [ultimate]
DEPENDENCIES | 6 +-
NOTICE | 4 +-
doc/changelog.txt | 124 ++
pom.xml | 12 +-
src/main/appended-resources/META-INF/DEPENDENCIES | 6 +-
src/main/appended-resources/META-INF/NOTICE | 2 +-
.../apache/felix/framework/BundleContextImpl.java | 2 +-
.../org/apache/felix/framework/BundleImpl.java | 196 +-
.../felix/framework/BundleProtectionDomain.java | 19 +-
.../framework/BundleRevisionDependencies.java | 27 +-
.../apache/felix/framework/BundleRevisionImpl.java | 39 +-
.../apache/felix/framework/BundleWiringImpl.java | 639 ++++---
.../apache/felix/framework/ExtensionManager.java | 68 +-
.../java/org/apache/felix/framework/Felix.java | 456 +++--
.../org/apache/felix/framework/FilterImpl.java | 4 +-
.../felix/framework/FrameworkStartLevelImpl.java | 45 +-
.../felix/framework/FrameworkWiringImpl.java | 16 +-
.../apache/felix/framework/PackageAdminImpl.java | 5 +-
.../apache/felix/framework/ResolveContextImpl.java | 110 ++
.../felix/framework/ServiceRegistrationImpl.java | 43 +-
.../apache/felix/framework/ServiceRegistry.java | 68 +-
.../apache/felix/framework/StatefulResolver.java | 1334 +++++++------
.../org/apache/felix/framework/URLHandlers.java | 231 ++-
.../framework/URLHandlersBundleStreamHandler.java | 7 +-
.../framework/URLHandlersContentHandlerProxy.java | 22 +-
.../framework/URLHandlersStreamHandlerProxy.java | 162 +-
.../org/apache/felix/framework/WovenClassImpl.java | 10 +-
.../apache/felix/framework/cache/BundleCache.java | 7 +-
.../felix/framework/cache/DirectoryRevision.java | 2 +-
.../apache/felix/framework/cache/JarRevision.java | 2 +-
.../framework/capabilityset/CapabilitySet.java | 75 +-
.../framework/capabilityset/SimpleFilter.java | 35 +-
.../felix/framework/resolver/Candidates.java | 220 ++-
.../felix/framework/resolver/HostedCapability.java | 126 +-
.../felix/framework/resolver/ResolveContext.java | 52 +
.../apache/felix/framework/resolver/Resolver.java | 18 +-
.../felix/framework/resolver/ResolverImpl.java | 278 +--
.../felix/framework/resolver/ShadowList.java | 157 ++
.../{Resolver.java => SimpleHostedCapability.java} | 57 +-
...ostedCapability.java => WrappedCapability.java} | 40 +-
...tedRequirement.java => WrappedRequirement.java} | 6 +-
...ostBundleRevision.java => WrappedRevision.java} | 41 +-
.../felix/framework/util/EventDispatcher.java | 27 +-
.../felix/framework/util/FelixConstants.java | 3 +-
.../apache/felix/framework/util/ImmutableList.java | 146 ++
.../apache/felix/framework/util/ImmutableMap.java | 129 ++
.../apache/felix/framework/util/SecureAction.java | 52 +-
.../org/apache/felix/framework/util/StringMap.java | 173 +-
.../java/org/apache/felix/framework/util/Util.java | 44 +-
.../util/manifestparser/ManifestParser.java | 358 +++-
.../framework/util/manifestparser/R4Library.java | 4 +
.../util/manifestparser/R4LibraryClause.java | 34 +-
.../framework/wiring/BundleCapabilityImpl.java | 18 +-
.../framework/wiring/BundleRequirementImpl.java | 16 +-
.../java/org/osgi/framework/AdaptPermission.java | 68 +-
.../java/org/osgi/framework/AdminPermission.java | 364 ++--
.../org/osgi/framework/AllServiceListener.java | 55 +-
src/main/java/org/osgi/framework/Bundle.java | 149 +-
.../java/org/osgi/framework/BundleActivator.java | 55 +-
.../java/org/osgi/framework/BundleContext.java | 96 +-
src/main/java/org/osgi/framework/BundleEvent.java | 49 +-
.../java/org/osgi/framework/BundleException.java | 39 +-
.../java/org/osgi/framework/BundleListener.java | 24 +-
.../java/org/osgi/framework/BundlePermission.java | 139 +-
.../org/osgi/framework/CapabilityPermission.java | 100 +-
src/main/java/org/osgi/framework/Configurable.java | 9 +-
src/main/java/org/osgi/framework/Constants.java | 61 +-
src/main/java/org/osgi/framework/Filter.java | 23 +-
.../java/org/osgi/framework/FrameworkEvent.java | 16 +-
.../java/org/osgi/framework/FrameworkListener.java | 23 +-
.../java/org/osgi/framework/FrameworkUtil.java | 1976 +++++++++++++++++---
.../org/osgi/framework/InvalidSyntaxException.java | 43 +-
.../java/org/osgi/framework/PackagePermission.java | 183 +-
src/main/java/org/osgi/framework/ServiceEvent.java | 65 +-
.../java/org/osgi/framework/ServiceException.java | 30 +-
.../java/org/osgi/framework/ServiceFactory.java | 13 +-
.../java/org/osgi/framework/ServiceListener.java | 42 +-
.../java/org/osgi/framework/ServicePermission.java | 234 +--
.../java/org/osgi/framework/ServiceReference.java | 104 +-
.../org/osgi/framework/ServiceRegistration.java | 65 +-
.../java/org/osgi/framework/SignerProperty.java | 16 +-
.../osgi/framework/SynchronousBundleListener.java | 39 +-
.../osgi/framework/UnfilteredServiceListener.java | 73 +
src/main/java/org/osgi/framework/Version.java | 120 +-
src/main/java/org/osgi/framework/VersionRange.java | 509 +++++
.../osgi/framework/hooks/bundle/CollisionHook.java | 85 +
.../org/osgi/framework/hooks/bundle/EventHook.java | 33 +-
.../org/osgi/framework/hooks/bundle/FindHook.java | 29 +-
.../framework/hooks/resolver/ResolverHook.java | 149 +-
.../hooks/resolver/ResolverHookFactory.java | 112 +-
.../osgi/framework/hooks/service/EventHook.java | 11 +-
.../framework/hooks/service/EventListenerHook.java | 8 +-
.../org/osgi/framework/hooks/service/FindHook.java | 26 +-
.../osgi/framework/hooks/service/ListenerHook.java | 44 +-
.../osgi/framework/hooks/weaving/WovenClass.java | 18 +-
.../java/org/osgi/framework/launch/Framework.java | 61 +-
.../osgi/framework/launch/FrameworkFactory.java | 25 +-
.../namespace/AbstractWiringNamespace.java | 56 +
.../osgi/framework/namespace/BundleNamespace.java | 153 ++
.../namespace/ExecutionEnvironmentNamespace.java | 55 +
.../osgi/framework/namespace/HostNamespace.java | 174 ++
.../framework/namespace/IdentityNamespace.java | 162 ++
.../osgi/framework/namespace/PackageNamespace.java | 112 ++
.../framework/startlevel/FrameworkStartLevel.java | 6 +-
.../osgi/framework/wiring/BundleCapability.java | 37 +-
.../osgi/framework/wiring/BundleRequirement.java | 63 +-
.../org/osgi/framework/wiring/BundleRevision.java | 129 +-
.../org/osgi/framework/wiring/BundleRevisions.java | 5 +-
.../java/org/osgi/framework/wiring/BundleWire.java | 48 +-
.../org/osgi/framework/wiring/BundleWiring.java | 226 ++-
.../org/osgi/framework/wiring/FrameworkWiring.java | 8 +-
src/main/java/org/osgi/resource/Capability.java | 86 +
src/main/java/org/osgi/resource/Namespace.java | 154 ++
src/main/java/org/osgi/resource/Requirement.java | 90 +
src/main/java/org/osgi/resource/Resource.java | 82 +
src/main/java/org/osgi/resource/Wire.java | 87 +
src/main/java/org/osgi/resource/Wiring.java | 144 ++
.../osgi/service/packageadmin/ExportedPackage.java | 10 +-
.../org/osgi/service/startlevel/StartLevel.java | 6 +-
.../url/AbstractURLStreamHandlerService.java | 46 +-
.../java/org/osgi/service/url/URLConstants.java | 12 +-
.../osgi/service/url/URLStreamHandlerService.java | 31 +-
.../osgi/service/url/URLStreamHandlerSetter.java | 22 +-
.../org/osgi/util/tracker/AbstractTracked.java | 57 +-
.../java/org/osgi/util/tracker/BundleTracker.java | 145 +-
.../osgi/util/tracker/BundleTrackerCustomizer.java | 65 +-
.../java/org/osgi/util/tracker/ServiceTracker.java | 338 ++--
.../util/tracker/ServiceTrackerCustomizer.java | 39 +-
src/main/resources/default.properties | 174 +-
.../org/osgi/framework/hooks/bundle/packageinfo | 2 +-
.../org/osgi/framework/launch/packageinfo | 2 +-
.../{hooks/bundle => namespace}/packageinfo | 0
src/main/resources/org/osgi/framework/packageinfo | 2 +-
.../org/osgi/framework/wiring/packageinfo | 2 +-
.../hooks/bundle => resource}/packageinfo | 0
.../resources/org/osgi/util/tracker/packageinfo | 2 +-
.../apache/felix/framework/CollisionHookTest.java | 297 +++
.../framework/RequirementsCapabilitiesTest.java | 267 +++
.../felix/framework/ServiceRegistryTest.java | 56 +-
.../felix/framework/StartStopBundleTest.java | 105 +-
.../apache/felix/framework/URLHandlersTest.java | 385 ++++
.../framework/capabilityset/SimpleFilterTest.java | 9 +
.../felix/framework/util/EventDispatcherTest.java | 16 +-
.../util/manifestparser/ManifestParserTest.java | 88 +
144 files changed, 10930 insertions(+), 4285 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/felix-framework.git
More information about the pkg-java-commits
mailing list