[felix-framework] 04/09: Merge tag 'upstream/4.6.0'
Markus Koschany
apo-guest at moszumanska.debian.org
Mon Feb 9 15:41:18 UTC 2015
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a commit to branch experimental
in repository felix-framework.
commit f1ee0994a8bccd7c07eb730ecc90870ee6a9a312
Merge: d615394 b58dea8
Author: Markus Koschany <apo at gambaru.de>
Date: Mon Feb 2 00:26:12 2015 +0100
Merge tag 'upstream/4.6.0'
Upstream version 4.6.0
# gpg: Signature made Mon 02 Feb 2015 00:26:04 CET 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 | 40 ++
pom.xml | 62 +-
src/main/appended-resources/META-INF/DEPENDENCIES | 6 +-
src/main/appended-resources/META-INF/NOTICE | 2 +-
.../apache/felix/framework/BundleContextImpl.java | 145 +++-
.../org/apache/felix/framework/BundleImpl.java | 8 +-
.../felix/framework/BundleProtectionDomain.java | 365 +++++++++-
.../apache/felix/framework/BundleRevisionImpl.java | 15 +-
.../apache/felix/framework/BundleWiringImpl.java | 571 +++++++++-------
.../org/apache/felix/framework/DTOFactory.java | 480 +++++++++++++
.../apache/felix/framework/ExtensionManager.java | 207 +++++-
.../java/org/apache/felix/framework/Felix.java | 357 +++++++---
.../felix/framework/FrameworkStartLevelImpl.java | 12 +-
.../felix/framework/FrameworkWiringImpl.java | 20 +-
.../apache/felix/framework/ResolveContextImpl.java | 6 +-
.../felix/framework/ServiceRegistrationImpl.java | 38 +-
.../apache/felix/framework/ServiceRegistry.java | 167 +++--
.../apache/felix/framework/StatefulResolver.java | 85 +--
.../org/apache/felix/framework/URLHandlers.java | 95 ++-
.../felix/framework/URLHandlersActivator.java | 7 +-
.../org/apache/felix/framework/WovenClassImpl.java | 187 +++--
.../framework/capabilityset/CapabilitySet.java | 32 +-
.../felix/framework/util/EventDispatcher.java | 74 +-
.../felix/framework/util/FelixConstants.java | 5 +-
.../apache/felix/framework/util/ImmutableList.java | 12 +
.../apache/felix/framework/util/SecureAction.java | 88 +++
.../java/org/apache/felix/framework/util/Util.java | 59 +-
.../util/manifestparser/ManifestParser.java | 208 ++++--
.../{R4Library.java => NativeLibrary.java} | 4 +-
.../util/manifestparser/NativeLibraryClause.java | 758 +++++++++++++++++++++
.../util/manifestparser/R4LibraryClause.java | 529 --------------
src/main/java/org/osgi/dto/DTO.java | 273 ++++++++
src/main/java/org/osgi/dto/package-info.java | 42 ++
src/main/java/org/osgi/dto/packageinfo | 1 +
.../java/org/osgi/framework/AdaptPermission.java | 25 +-
.../java/org/osgi/framework/AdminPermission.java | 31 +-
.../org/osgi/framework/AllServiceListener.java | 8 +-
src/main/java/org/osgi/framework/Bundle.java | 211 +++---
.../java/org/osgi/framework/BundleActivator.java | 12 +-
.../java/org/osgi/framework/BundleContext.java | 274 +++++---
src/main/java/org/osgi/framework/BundleEvent.java | 24 +-
.../java/org/osgi/framework/BundleException.java | 6 +-
.../java/org/osgi/framework/BundleListener.java | 7 +-
.../java/org/osgi/framework/BundlePermission.java | 13 +-
.../java/org/osgi/framework/BundleReference.java | 8 +-
.../org/osgi/framework/CapabilityPermission.java | 28 +-
src/main/java/org/osgi/framework/Configurable.java | 4 +-
src/main/java/org/osgi/framework/Constants.java | 129 +++-
src/main/java/org/osgi/framework/Filter.java | 7 +-
.../java/org/osgi/framework/FrameworkEvent.java | 24 +-
.../java/org/osgi/framework/FrameworkListener.java | 7 +-
.../java/org/osgi/framework/FrameworkUtil.java | 74 +-
.../org/osgi/framework/InvalidSyntaxException.java | 6 +-
.../java/org/osgi/framework/PackagePermission.java | 23 +-
.../osgi/framework/PrototypeServiceFactory.java | 124 ++++
src/main/java/org/osgi/framework/ServiceEvent.java | 4 +-
.../java/org/osgi/framework/ServiceException.java | 10 +-
.../java/org/osgi/framework/ServiceFactory.java | 51 +-
.../java/org/osgi/framework/ServiceListener.java | 7 +-
.../java/org/osgi/framework/ServiceObjects.java | 142 ++++
.../java/org/osgi/framework/ServicePermission.java | 33 +-
.../java/org/osgi/framework/ServiceReference.java | 9 +-
.../org/osgi/framework/ServiceRegistration.java | 32 +-
.../java/org/osgi/framework/SignerProperty.java | 6 +-
.../osgi/framework/SynchronousBundleListener.java | 8 +-
.../osgi/framework/UnfilteredServiceListener.java | 7 +-
src/main/java/org/osgi/framework/Version.java | 47 +-
src/main/java/org/osgi/framework/VersionRange.java | 54 +-
.../java/org/osgi/framework/dto/BundleDTO.java | 66 ++
.../java/org/osgi/framework/dto/FrameworkDTO.java | 60 ++
.../osgi/framework/dto/ServiceReferenceDTO.java | 69 ++
.../java/org/osgi/framework/dto/package-info.java | 42 ++
src/main/java/org/osgi/framework/dto/packageinfo | 1 +
.../osgi/framework/hooks/bundle/CollisionHook.java | 14 +-
.../org/osgi/framework/hooks/bundle/EventHook.java | 6 +-
.../org/osgi/framework/hooks/bundle/FindHook.java | 6 +-
.../osgi/framework/hooks/bundle/package-info.java | 36 +
.../org/osgi/framework/hooks/bundle/packageinfo | 1 +
.../framework/hooks/resolver/ResolverHook.java | 52 +-
.../hooks/resolver/ResolverHookFactory.java | 6 +-
.../framework/hooks/resolver/package-info.java | 36 +
.../org/osgi/framework/hooks/resolver/packageinfo | 1 +
.../osgi/framework/hooks/service/EventHook.java | 7 +-
.../framework/hooks/service/EventListenerHook.java | 7 +-
.../org/osgi/framework/hooks/service/FindHook.java | 7 +-
.../osgi/framework/hooks/service/ListenerHook.java | 10 +-
.../osgi/framework/hooks/service/package-info.java | 36 +
.../org/osgi/framework/hooks/service/packageinfo | 1 +
.../framework/hooks/weaving/WeavingException.java | 4 +-
.../osgi/framework/hooks/weaving/WeavingHook.java | 8 +-
.../osgi/framework/hooks/weaving/WovenClass.java | 133 +++-
.../hooks/weaving/WovenClassListener.java | 71 ++
.../osgi/framework/hooks/weaving/package-info.java | 38 ++
.../org/osgi/framework/hooks/weaving/packageinfo | 1 +
.../java/org/osgi/framework/launch/Framework.java | 56 +-
.../osgi/framework/launch/FrameworkFactory.java | 7 +-
.../package-info.java} | 40 +-
.../java/org/osgi/framework/launch/packageinfo | 1 +
.../namespace/AbstractWiringNamespace.java | 6 +-
.../osgi/framework/namespace/BundleNamespace.java | 4 +-
.../namespace/ExecutionEnvironmentNamespace.java | 4 +-
.../osgi/framework/namespace/HostNamespace.java | 6 +-
.../framework/namespace/IdentityNamespace.java | 4 +-
.../osgi/framework/namespace/NativeNamespace.java | 81 +++
.../osgi/framework/namespace/PackageNamespace.java | 4 +-
.../package-info.java} | 32 +-
.../java/org/osgi/framework/namespace/packageinfo | 1 +
.../{BundleReference.java => package-info.java} | 36 +-
src/main/java/org/osgi/framework/packageinfo | 1 +
.../framework/startlevel/BundleStartLevel.java | 7 +-
.../framework/startlevel/FrameworkStartLevel.java | 15 +-
.../startlevel/dto/BundleStartLevelDTO.java | 61 ++
.../startlevel/dto/FrameworkStartLevelDTO.java | 47 ++
.../framework/startlevel/dto/package-info.java | 42 ++
.../org/osgi/framework/startlevel/dto/packageinfo | 1 +
.../osgi/framework/startlevel/package-info.java | 83 +++
.../java/org/osgi/framework/startlevel/packageinfo | 1 +
.../osgi/framework/wiring/BundleCapability.java | 7 +-
.../osgi/framework/wiring/BundleRequirement.java | 7 +-
.../org/osgi/framework/wiring/BundleRevision.java | 9 +-
.../org/osgi/framework/wiring/BundleRevisions.java | 7 +-
.../java/org/osgi/framework/wiring/BundleWire.java | 7 +-
.../org/osgi/framework/wiring/BundleWiring.java | 43 +-
.../org/osgi/framework/wiring/FrameworkWiring.java | 52 +-
.../framework/wiring/dto/BundleRevisionDTO.java | 62 ++
.../osgi/framework/wiring/dto/BundleWireDTO.java | 48 ++
.../osgi/framework/wiring/dto/BundleWiringDTO.java | 97 +++
.../osgi/framework/wiring/dto/package-info.java | 42 ++
.../java/org/osgi/framework/wiring/dto/packageinfo | 1 +
.../package-info.java} | 35 +-
.../java/org/osgi/framework/wiring/packageinfo | 1 +
src/main/java/org/osgi/resource/Capability.java | 6 +-
src/main/java/org/osgi/resource/Namespace.java | 7 +-
src/main/java/org/osgi/resource/Requirement.java | 6 +-
src/main/java/org/osgi/resource/Resource.java | 6 +-
src/main/java/org/osgi/resource/Wire.java | 7 +-
src/main/java/org/osgi/resource/Wiring.java | 18 +-
.../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 ++
src/main/java/org/osgi/resource/dto/WireDTO.java | 58 ++
src/main/java/org/osgi/resource/dto/WiringDTO.java | 73 ++
.../java/org/osgi/resource/dto/package-info.java | 42 ++
src/main/java/org/osgi/resource/dto/packageinfo | 1 +
.../package-info.java} | 35 +-
src/main/java/org/osgi/resource/packageinfo | 1 +
.../osgi/service/packageadmin/ExportedPackage.java | 4 +-
.../osgi/service/packageadmin/PackageAdmin.java | 40 +-
.../osgi/service/packageadmin/RequiredBundle.java | 4 +-
.../osgi/service/packageadmin/package-info.java | 38 ++
.../java/org/osgi/service/packageadmin/packageinfo | 1 +
.../org/osgi/service/startlevel/StartLevel.java | 23 +-
.../org/osgi/service/startlevel/package-info.java | 38 ++
.../java/org/osgi/service/startlevel/packageinfo | 1 +
.../url/AbstractURLStreamHandlerService.java | 23 +-
.../java/org/osgi/service/url/URLConstants.java | 8 +-
.../osgi/service/url/URLStreamHandlerService.java | 19 +-
.../osgi/service/url/URLStreamHandlerSetter.java | 8 +-
.../url/package-info.java} | 36 +-
src/main/java/org/osgi/service/url/packageinfo | 1 +
.../org/osgi/util/tracker/AbstractTracked.java | 4 +-
.../java/org/osgi/util/tracker/BundleTracker.java | 8 +-
.../osgi/util/tracker/BundleTrackerCustomizer.java | 6 +-
.../java/org/osgi/util/tracker/ServiceTracker.java | 19 +-
.../util/tracker/ServiceTrackerCustomizer.java | 6 +-
.../tracker/package-info.java} | 36 +-
src/main/java/org/osgi/util/tracker/packageinfo | 1 +
src/main/resources/default.properties | 65 +-
.../felix/framework/BundleWiringImplTest.java | 464 +++++++++++++
.../apache/felix/framework/CollisionHookTest.java | 6 +-
.../org/apache/felix/framework/DTOFactoryTest.java | 272 ++++++++
.../felix/framework/ExtensionManagerTest.java | 197 ++++++
.../felix/framework/FrameworkVersionTest.java | 49 ++
.../felix/framework/PackageAdminImplTest.java | 163 +++++
.../framework/RequirementsCapabilitiesTest.java | 24 +
.../apache/felix/framework/StartBundleTest.java | 57 ++
.../felix/framework/StartStopBundleTest.java | 1 +
.../util/manifestparser/ManifestParserTest.java | 81 +++
.../manifestparser/NativeLibraryClauseTest.java | 146 ++++
183 files changed, 8471 insertions(+), 2013 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