This is an automated email from the ASF dual-hosted git repository.
tjwatson pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git.
from 3bac62e FELIX-6482 : Root directory used if location for multipart is
set to empty string
add 49599cc Update minor version for OSGi R8 SCR implementation
add b186ccc Merge branch 'master' into scrR8
add 35c51c7 OSGi R8 - Add support for satisfying condition
add 6afbad6 Merge branch 'master' into scrR8
add 7898ad9 Add DS namespace version 1.5.0 for OSGi R8
add 7723726 Move satisfying condition tests to integration tests
add 5b25fb8 Add support for AnyService
add ce11b7a Fix compile warnings in SCR
add 44c33f3 Merge branch 'master' into scrR8
add ee34b77 Update SCR capability versions to DS spec version 1.5
add f343822 Merge branch 'master' into scrR8
add 9ab0150 Merge branch 'master' into scrR8
add c107424 Force Java 8 compiler
add 5d167e2 Add support for Optional<ServiceType> to be injected
add 2de0937 Merge branch 'master' into scrR8
add e1b5490 Merge branch 'master' into scrR8
add 6701c6c Add Optional service injection tests
add bd2823a Use the correct target when missing any service target
add 4bdb29f Fix for field-collection-type attribute for injection to
Optional
add a86ef80 Add implicit target property as first in the list of
properties
add b503f5d Reference target attributes must not override component
properties
add 4f2f15e Merge branch 'master' into scrR8
add cc4d67d [SCR] Update OSGi API dependency to R8 RC1
add ea98e8b Update change log for SCR 2.2.0-RC1
add bcb93e5 [maven-release-plugin] prepare release
org.apache.felix.scr-2.2.0-RC1
add 70ed0d6 [maven-release-plugin] prepare for next development iteration
add 4e8021e FELIX-6458 : (#101)
new 6591e10 Merge branch 'scrR8'
new e34274d Bump org.osgi.service.component to final version for R8
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
scr/bnd.bnd | 8 +-
scr/changelog.txt | 4 +
scr/pom.xml | 14 +-
.../java/org/apache/felix/scr/impl/Activator.java | 40 +++-
.../felix/scr/impl/BundleComponentActivator.java | 15 +-
.../apache/felix/scr/impl/helper/Coercions.java | 2 +
.../impl/helper/ComponentServiceObjectsHelper.java | 85 +++----
.../felix/scr/impl/inject/ScrComponentContext.java | 2 +
.../apache/felix/scr/impl/inject/ValueUtils.java | 140 +++++++-----
.../felix/scr/impl/inject/field/FieldHandler.java | 55 +++--
.../felix/scr/impl/inject/internal/ClassUtils.java | 6 +-
.../inject/internal/ComponentConstructorImpl.java | 19 +-
.../scr/impl/inject/methods/ActivateMethod.java | 3 +-
.../felix/scr/impl/inject/methods/BaseMethod.java | 8 +-
.../felix/scr/impl/inject/methods/BindMethod.java | 3 +-
.../SuitableMethodNotAccessibleException.java | 1 +
.../scr/impl/manager/AbstractComponentManager.java | 9 +-
.../scr/impl/manager/AbstractPrototypeRefPair.java | 1 -
.../felix/scr/impl/manager/ComponentActivator.java | 2 +
.../scr/impl/manager/ComponentContextImpl.java | 6 +
.../scr/impl/manager/ComponentFactoryImpl.java | 2 +-
.../impl/manager/ConfigurableComponentHolder.java | 12 +-
.../felix/scr/impl/manager/DependencyManager.java | 134 +++++++----
.../scr/impl/manager/ExtendedServiceEvent.java | 3 +-
.../PrototypeServiceFactoryComponentManager.java | 2 +-
.../manager/ServiceFactoryComponentManager.java | 2 +-
.../felix/scr/impl/manager/ServiceTracker.java | 62 +++--
.../scr/impl/manager/SingleComponentManager.java | 6 +-
.../felix/scr/impl/metadata/ComponentMetadata.java | 14 +-
.../apache/felix/scr/impl/metadata/DSVersion.java | 8 +-
.../felix/scr/impl/metadata/PropertyMetadata.java | 16 ++
.../felix/scr/impl/metadata/ReferenceMetadata.java | 69 ++----
.../impl/runtime/ServiceComponentRuntimeImpl.java | 78 +------
.../apache/felix/scr/impl/xml/XmlConstants.java | 4 +
.../org/apache/felix/scr/impl/xml/XmlHandler.java | 41 +++-
.../scr/impl/BundleComponentActivatorTest.java | 8 +-
.../felix/scr/impl/ComponentRegistryKeyTest.java | 2 +-
.../java/org/apache/felix/scr/impl/MockBundle.java | 45 +++-
.../scr/impl/inject/internal/AnnotationTest.java | 1 -
.../impl/inject/methods/ActivateMethodTest.java | 43 ++--
.../scr/impl/inject/methods/BindMethodTest.java | 26 +--
.../manager/ConfiguredComponentHolderTest.java | 67 +++---
.../scr/impl/manager/RegistrationManagerTest.java | 3 +-
.../impl/manager/SingleComponentManagerTest.java | 28 ++-
.../felix/scr/impl/manager/components/T1.java | 37 +--
.../felix/scr/impl/manager/components/T1MapSR.java | 2 +-
.../felix/scr/impl/manager/components2/T2.java | 19 +-
.../felix/scr/impl/metadata/ComponentBase.java | 24 +-
.../impl/metadata/ComponentMetaDataCacheTest.java | 6 +-
.../scr/impl/metadata/ComponentMetadataTest.java | 3 +-
.../felix/scr/impl/metadata/XmlHandlerTest.java | 97 ++++----
.../scr/impl/metadata/instances/AcceptMethod.java | 2 +
.../scr/impl/metadata/instances/BaseObject.java | 7 +-
.../scr/impl/metadata/instances/Level1Object.java | 3 +-
.../scr/impl/metadata/instances/Level3Object.java | 7 +-
.../scr/impl/metadata/instances2/Level2Object.java | 11 +-
.../runtime/ServiceComponentRuntimeImplTest.java | 9 +-
.../apache/felix/scr/impl/xml/XmlHandlerTest.java | 70 +++++-
.../scr/integration/AnyServiceReferenceTest.java | 254 +++++++++++++++++++++
.../scr/integration/CircularReferenceTest.java | 4 +-
.../scr/integration/ComponentConstructorTest.java | 2 +-
.../scr/integration/ComponentDisposeTest.java | 2 +-
.../scr/integration/ComponentFactoryTest.java | 27 ++-
.../scr/integration/ComponentOptionalTest.java | 216 ++++++++++++++++++
.../felix/scr/integration/ComponentTestBase.java | 36 +--
.../scr/integration/ConfigurationChangeTest.java | 8 +-
.../ConfigurationComponentFactoryTest.java | 3 +-
.../felix/scr/integration/Felix3680_2Test.java | 4 +-
.../felix/scr/integration/Felix4188Test.java | 2 +-
.../felix/scr/integration/Felix4350Test.java | 18 +-
.../felix/scr/integration/Felix4984Test.java | 16 +-
.../felix/scr/integration/Felix5248Test.java | 2 +
.../felix/scr/integration/Felix5276Test.java | 1 +
.../felix/scr/integration/Felix5356Test.java | 4 +-
.../felix/scr/integration/Felix6274Test.java | 1 +
.../apache/felix/scr/integration/LocateTest.java | 2 +-
.../apache/felix/scr/integration/LocationTest.java | 1 +
.../scr/integration/MutablePropertiesTest.java | 32 ++-
.../PersistentComponentFactoryTest.java | 31 ++-
.../scr/integration/SatisfyingConditionTest.java | 208 +++++++++++++++++
.../scr/integration/ServiceBindGreedyTest.java | 15 +-
.../felix/scr/integration/ServiceBindTest.java | 13 +-
.../scr/integration/ServiceComponentTest.java | 15 +-
.../integration/components/ActivatorComponent.java | 7 +-
.../components/AnyServiceComponent.java | 108 +++++++++
...ervice.java => AnyServiceComponentInvalid.java} | 13 +-
...ngService.java => AnyServiceComponentList.java} | 13 +-
...ingService.java => AnyServiceComponentMap.java} | 13 +-
.../components/ConstructorSingleReference.java | 12 +
.../integration/components/Felix4350Component.java | 2 +
.../components/InjectOptionalComponent.java | 203 ++++++++++++++++
.../integration/components/MutatingService.java | 2 +-
.../components/MutatingServiceImpl.java | 33 ++-
...java => SatisfyingConditionComponentClass.java} | 23 +-
.../integration/components/SimpleService2Impl.java | 14 +-
.../integration/components/SimpleServiceImpl.java | 1 +
.../activatesignature/Signature_Package_Map.java | 4 +-
.../activatesignature/Signature_Private_Map.java | 4 +-
.../activatesignature/Signature_Protected_Map.java | 3 +-
.../activatesignature/Signature_Public_Map.java | 3 +-
.../scr/integration/components/circular/A.java | 4 +
.../scr/integration/components/circular/B.java | 4 +
.../components/circularFactory/FactoryClient.java | 4 +-
.../components/concurrency/AFactory.java | 8 +-
.../components/concurrency/CFactory.java | 8 +-
.../integration/components/deadlock/Consumer.java | 2 +-
.../components/deadlock/TestComponent.java | 6 +-
.../scr/integration/components/felix3680/Main.java | 12 +-
.../integration/components/felix3680_2/Main.java | 18 +-
.../scr/integration/components/felix4984/A.java | 7 +-
.../scr/integration/components/felix4984/B.java | 2 +
.../scr/integration/components/felix5276/B.java | 2 +
.../scr/integration/components/felix5276/C.java | 2 +
.../components/felix6274_2/Component.java | 1 +
.../components/felix6274_hook/Activator.java | 1 -
.../java/org/osgi/service/condition/Condition.java | 0
.../resources/integration_test_any_service.xml | 211 +++++++++++++++++
...or.xml => integration_test_inject_optional.xml} | 153 +++++++------
.../integration_test_satisfying_condition.xml | 147 ++++++++++++
...s_11.xml => satisfying-condition-specified.xml} | 9 +-
120 files changed, 2600 insertions(+), 772 deletions(-)
create mode 100644
scr/src/test/java/org/apache/felix/scr/integration/AnyServiceReferenceTest.java
create mode 100644
scr/src/test/java/org/apache/felix/scr/integration/ComponentOptionalTest.java
create mode 100644
scr/src/test/java/org/apache/felix/scr/integration/SatisfyingConditionTest.java
create mode 100644
scr/src/test/java/org/apache/felix/scr/integration/components/AnyServiceComponent.java
copy
scr/src/test/java/org/apache/felix/scr/integration/components/{MutatingService.java
=> AnyServiceComponentInvalid.java} (84%)
copy
scr/src/test/java/org/apache/felix/scr/integration/components/{MutatingService.java
=> AnyServiceComponentList.java} (80%)
copy
scr/src/test/java/org/apache/felix/scr/integration/components/{MutatingService.java
=> AnyServiceComponentMap.java} (80%)
create mode 100644
scr/src/test/java/org/apache/felix/scr/integration/components/InjectOptionalComponent.java
copy
scr/src/test/java/org/apache/felix/scr/integration/components/{ConstructorSingleReference.java
=> SatisfyingConditionComponentClass.java} (69%)
copy {framework/src/main =>
scr/src/test}/java/org/osgi/service/condition/Condition.java (100%)
mode change 100755 => 100644
create mode 100644 scr/src/test/resources/integration_test_any_service.xml
copy scr/src/test/resources/{integration_test_constructor.xml =>
integration_test_inject_optional.xml} (52%)
create mode 100644
scr/src/test/resources/integration_test_satisfying_condition.xml
copy scr/src/test/resources/{components_anonymous_11.xml =>
satisfying-condition-specified.xml} (70%)
mode change 100644 => 100755
