You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 10:26:48 UTC
[sling-org-apache-sling-testing-sling-mock] 27/48: SLING-6673
sling-mock: Switch to OSGi annotations
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.testing.sling-mock-2.2.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
commit f0f5b083af87a0546e343261660146b0a9612c94
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Sun Mar 19 16:33:33 2017 +0000
SLING-6673 sling-mock: Switch to OSGi annotations
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/sling-mock@1787643 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 11 --------
.../testing/mock/sling/MockAdapterManagerImpl.java | 29 +++++++++-------------
.../testing/mock/sling/MockJcrSlingRepository.java | 8 +++---
.../sling/testing/mock/sling/package-info.java | 2 +-
.../mock/sling/services/MockMimeTypeService.java | 6 ++---
.../testing/mock/sling/services/package-info.java | 2 +-
6 files changed, 19 insertions(+), 39 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6c89a0c..e970ced 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,12 +43,6 @@
<dependencies>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr.annotations</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.osgi-mock</artifactId>
<version>2.2.3-SNAPSHOT</version>
@@ -264,11 +258,6 @@
<extensions>true</extensions>
</plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- </plugin>
-
</plugins>
</build>
diff --git a/src/main/java/org/apache/sling/testing/mock/sling/MockAdapterManagerImpl.java b/src/main/java/org/apache/sling/testing/mock/sling/MockAdapterManagerImpl.java
index 4120292..b3f3825 100644
--- a/src/main/java/org/apache/sling/testing/mock/sling/MockAdapterManagerImpl.java
+++ b/src/main/java/org/apache/sling/testing/mock/sling/MockAdapterManagerImpl.java
@@ -32,13 +32,6 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Properties;
-import org.apache.felix.scr.annotations.Property;
-import org.apache.felix.scr.annotations.Reference;
-import org.apache.felix.scr.annotations.ReferenceCardinality;
-import org.apache.felix.scr.annotations.ReferencePolicy;
-import org.apache.felix.scr.annotations.Service;
import org.apache.sling.adapter.Adaption;
import org.apache.sling.adapter.internal.AdapterFactoryDescriptor;
import org.apache.sling.adapter.internal.AdapterFactoryDescriptorMap;
@@ -51,6 +44,10 @@ import org.osgi.framework.Constants;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.ServiceRegistration;
import org.osgi.service.component.ComponentContext;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
+import org.osgi.service.component.annotations.ReferenceCardinality;
+import org.osgi.service.component.annotations.ReferencePolicy;
import org.osgi.service.event.Event;
import org.osgi.service.event.EventAdmin;
import org.slf4j.Logger;
@@ -62,15 +59,13 @@ import org.slf4j.LoggerFactory;
* break the {@link ThreadsafeMockAdapterManagerWrapper} concept.
* Additionally the reference to PackageAdmin is disabled.
*/
-@Component(immediate=true)
-@Service
-@Properties({
- @Property(name=Constants.SERVICE_DESCRIPTION, value="Sling Adapter Manager"),
- @Property(name=Constants.SERVICE_VENDOR, value="The Apache Software Foundation")
-
-})
-@Reference(name="AdapterFactory", referenceInterface=AdapterFactory.class,
-cardinality=ReferenceCardinality.OPTIONAL_MULTIPLE, policy=ReferencePolicy.DYNAMIC)
+@Component(immediate=true, service=AdapterManager.class,
+ property={Constants.SERVICE_DESCRIPTION + "=Sling Adapter Manager",
+ Constants.SERVICE_VENDOR + "=The Apache Software Foundation"},
+ reference = @Reference(name="AdapterFactory", service=AdapterFactory.class,
+ cardinality=ReferenceCardinality.MULTIPLE, policy=ReferencePolicy.DYNAMIC,
+ bind="bindAdapterFactory", unbind="unbindAdapterFactory")
+)
public class MockAdapterManagerImpl implements AdapterManager {
private final Logger log = LoggerFactory.getLogger(getClass());
@@ -113,7 +108,7 @@ public class MockAdapterManagerImpl implements AdapterManager {
/**
* The service tracker for the event admin
*/
- @Reference(cardinality=ReferenceCardinality.OPTIONAL_UNARY, policy=ReferencePolicy.DYNAMIC)
+ @Reference(cardinality=ReferenceCardinality.OPTIONAL, policy=ReferencePolicy.DYNAMIC)
private volatile EventAdmin eventAdmin;
// DISABLED IN THIS COPY OF CLASS
diff --git a/src/main/java/org/apache/sling/testing/mock/sling/MockJcrSlingRepository.java b/src/main/java/org/apache/sling/testing/mock/sling/MockJcrSlingRepository.java
index ffd5f9c..e3073cd 100644
--- a/src/main/java/org/apache/sling/testing/mock/sling/MockJcrSlingRepository.java
+++ b/src/main/java/org/apache/sling/testing/mock/sling/MockJcrSlingRepository.java
@@ -26,18 +26,16 @@ import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.jcr.Value;
-import org.apache.felix.scr.annotations.Activate;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Service;
import org.apache.sling.jcr.api.SlingRepository;
import org.apache.sling.testing.mock.jcr.MockJcr;
import org.osgi.service.component.ComponentContext;
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
/**
* Mock {@link SlingRepository} implementation.
*/
-@Component
-@Service(SlingRepository.class)
+@Component(service = SlingRepository.class)
public final class MockJcrSlingRepository implements SlingRepository {
private Repository repository;
diff --git a/src/main/java/org/apache/sling/testing/mock/sling/package-info.java b/src/main/java/org/apache/sling/testing/mock/sling/package-info.java
index 6456e2a..c0dc58f 100644
--- a/src/main/java/org/apache/sling/testing/mock/sling/package-info.java
+++ b/src/main/java/org/apache/sling/testing/mock/sling/package-info.java
@@ -19,5 +19,5 @@
/**
* Mock implementation of selected Sling APIs.
*/
-@org.osgi.annotation.versioning.Version("2.0")
+@org.osgi.annotation.versioning.Version("3.0")
package org.apache.sling.testing.mock.sling;
diff --git a/src/main/java/org/apache/sling/testing/mock/sling/services/MockMimeTypeService.java b/src/main/java/org/apache/sling/testing/mock/sling/services/MockMimeTypeService.java
index fbc6fb7..a13ffa3 100644
--- a/src/main/java/org/apache/sling/testing/mock/sling/services/MockMimeTypeService.java
+++ b/src/main/java/org/apache/sling/testing/mock/sling/services/MockMimeTypeService.java
@@ -21,18 +21,16 @@ package org.apache.sling.testing.mock.sling.services;
import java.io.IOException;
import java.io.InputStream;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Service;
import org.apache.sling.commons.mime.MimeTypeService;
import org.apache.sling.commons.mime.internal.MimeTypeServiceImpl;
import org.apache.sling.testing.mock.osgi.MockOsgi;
import org.osgi.service.component.ComponentContext;
+import org.osgi.service.component.annotations.Component;
/**
* Mock {@link MimeTypeService} implementation.
*/
-@Component(inherit = false)
-@Service(MimeTypeService.class)
+@Component(service = MimeTypeService.class)
public final class MockMimeTypeService extends MimeTypeServiceImpl {
private boolean initialized;
diff --git a/src/main/java/org/apache/sling/testing/mock/sling/services/package-info.java b/src/main/java/org/apache/sling/testing/mock/sling/services/package-info.java
index 30212d1..37315a7 100644
--- a/src/main/java/org/apache/sling/testing/mock/sling/services/package-info.java
+++ b/src/main/java/org/apache/sling/testing/mock/sling/services/package-info.java
@@ -19,5 +19,5 @@
/**
* Mocks for selected Sling services.
*/
-@org.osgi.annotation.versioning.Version("2.0")
+@org.osgi.annotation.versioning.Version("2.0.1")
package org.apache.sling.testing.mock.sling.services;
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.