You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2018/07/31 10:28:10 UTC
[sling-org-apache-sling-testing-osgi-mock] branch master updated
(bf71f40 -> dbfffe9)
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-osgi-mock.git.
from bf71f40 Merge branch 'SLING-7788'
add d0fb15c Add support for dynamic reference properties
add 2b55820 Handle dynamic references when registering potential candidate services
add 616be71 Add unit test for dynamic target filters
new f930425 Merge branch 'master' into dynamic-reference-properties
new 3cc2d81 SLING-7794 use constant for '.target' suffix
new dbfffe9 Merge branch 'dynamic-reference-properties'
The 3 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:
.../sling/testing/mock/osgi/MockBundleContext.java | 7 +++
.../apache/sling/testing/mock/osgi/MockOsgi.java | 15 +++++-
.../sling/testing/mock/osgi/OsgiMetadataUtil.java | 59 +++++++++++++++++-----
.../sling/testing/mock/osgi/OsgiServiceUtil.java | 11 +++-
.../testing/mock/osgi/context/OsgiContextImpl.java | 2 +-
.../sling/testing/mock/osgi/package-info.java | 2 +-
...ckBundleContextDynamicReferencesOsgiR6Test.java | 26 +++++++++-
.../testing/mock/osgi/OsgiServiceUtilTest.java | 6 +++
...sling.testing.mock.osgi.OsgiServiceUtilTest.xml | 1 +
9 files changed, 109 insertions(+), 20 deletions(-)
[sling-org-apache-sling-testing-osgi-mock] 01/03: Merge branch
'master' into dynamic-reference-properties
Posted by ss...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-osgi-mock.git
commit f930425046b5712eb0829537649a9374796e4d80
Merge: 616be71 bf71f40
Author: sseifert <ss...@pro-vision.de>
AuthorDate: Tue Jul 31 12:06:07 2018 +0200
Merge branch 'master' into dynamic-reference-properties
README.md | 4 +++
pom.xml | 10 +++++++
.../testing/mock/osgi/MockServiceRegistration.java | 8 +++---
.../mock/osgi/context/OsgiContextImplTest.java | 33 ++++++++++++++++++++++
...sting.mock.osgi.context.OsgiContextImplTest.xml | 27 ++++++++++++++++++
5 files changed, 78 insertions(+), 4 deletions(-)
[sling-org-apache-sling-testing-osgi-mock] 02/03: SLING-7794 use
constant for '.target' suffix
Posted by ss...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-osgi-mock.git
commit 3cc2d81d747c715cf8356ef9d5a26eee6d1a91db
Author: sseifert <ss...@pro-vision.de>
AuthorDate: Tue Jul 31 12:27:28 2018 +0200
SLING-7794 use constant for '.target' suffix
---
.../java/org/apache/sling/testing/mock/osgi/MockBundleContext.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/sling/testing/mock/osgi/MockBundleContext.java b/src/main/java/org/apache/sling/testing/mock/osgi/MockBundleContext.java
index 02836f4..07b80d2 100644
--- a/src/main/java/org/apache/sling/testing/mock/osgi/MockBundleContext.java
+++ b/src/main/java/org/apache/sling/testing/mock/osgi/MockBundleContext.java
@@ -56,6 +56,7 @@ import org.osgi.framework.ServiceObjects;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.ServiceRegistration;
import org.osgi.service.cm.ConfigurationAdmin;
+import org.osgi.service.component.ComponentConstants;
import com.google.common.collect.ImmutableList;
import com.google.common.io.Files;
@@ -144,7 +145,7 @@ class MockBundleContext implements BundleContext {
for (ReferenceInfo referenceInfo : affectedDynamicReferences) {
Reference reference = referenceInfo.getReference();
// Look for a target override
- Object o = referenceInfo.getServiceRegistration().getProperties().get(reference.getName() + ".target");
+ Object o = referenceInfo.getServiceRegistration().getProperties().get(reference.getName() + ComponentConstants.REFERENCE_TARGET_SUFFIX);
if (o != null && o instanceof String) {
reference = new DynamicReference(reference,(String)o);
}
[sling-org-apache-sling-testing-osgi-mock] 03/03: Merge branch
'dynamic-reference-properties'
Posted by ss...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-osgi-mock.git
commit dbfffe91d6e2a1b640a19d73cfae62826690129d
Merge: bf71f40 3cc2d81
Author: sseifert <ss...@pro-vision.de>
AuthorDate: Tue Jul 31 12:27:42 2018 +0200
Merge branch 'dynamic-reference-properties'
.../sling/testing/mock/osgi/MockBundleContext.java | 7 +++
.../apache/sling/testing/mock/osgi/MockOsgi.java | 15 +++++-
.../sling/testing/mock/osgi/OsgiMetadataUtil.java | 59 +++++++++++++++++-----
.../sling/testing/mock/osgi/OsgiServiceUtil.java | 11 +++-
.../testing/mock/osgi/context/OsgiContextImpl.java | 2 +-
.../sling/testing/mock/osgi/package-info.java | 2 +-
...ckBundleContextDynamicReferencesOsgiR6Test.java | 26 +++++++++-
.../testing/mock/osgi/OsgiServiceUtilTest.java | 6 +++
...sling.testing.mock.osgi.OsgiServiceUtilTest.xml | 1 +
9 files changed, 109 insertions(+), 20 deletions(-)