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:09 UTC

[sling-org-apache-sling-xss] 11/19: Add service.vendor property

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to annotated tag org.apache.sling.xss-2.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-xss.git

commit f87443fc700d7211afba6966146c4624a1fba043
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Apr 26 08:01:31 2017 +0000

    Add service.vendor property
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/xss@1792708 13f79535-47bb-0310-9956-ffa450edef68
---
 src/main/java/org/apache/sling/xss/impl/XSSAPIAdapterFactory.java | 1 +
 src/main/java/org/apache/sling/xss/impl/XSSAPIImpl.java           | 7 ++++++-
 src/main/java/org/apache/sling/xss/impl/XSSFilterImpl.java        | 2 ++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/apache/sling/xss/impl/XSSAPIAdapterFactory.java b/src/main/java/org/apache/sling/xss/impl/XSSAPIAdapterFactory.java
index 59d25b7..ab11816 100644
--- a/src/main/java/org/apache/sling/xss/impl/XSSAPIAdapterFactory.java
+++ b/src/main/java/org/apache/sling/xss/impl/XSSAPIAdapterFactory.java
@@ -35,6 +35,7 @@ import org.slf4j.LoggerFactory;
 @Component(
         property = {
                 Constants.SERVICE_DESCRIPTION + "=Adapter for the XSSAPI service.",
+                Constants.SERVICE_VENDOR + "=The Apache Software Foundation",
                 AdapterFactory.ADAPTER_CLASSES + "=org.apache.sling.xss.XSSAPI",
                 AdapterFactory.ADAPTABLE_CLASSES + "=org.apache.sling.api.resource.ResourceResolver",
                 AdapterFactory.ADAPTABLE_CLASSES + "=org.apache.sling.api.SlingHttpServletRequest"
diff --git a/src/main/java/org/apache/sling/xss/impl/XSSAPIImpl.java b/src/main/java/org/apache/sling/xss/impl/XSSAPIImpl.java
index f621d19..c7cdac9 100644
--- a/src/main/java/org/apache/sling/xss/impl/XSSAPIImpl.java
+++ b/src/main/java/org/apache/sling/xss/impl/XSSAPIImpl.java
@@ -34,6 +34,7 @@ import org.apache.sling.api.resource.ResourceResolver;
 import org.apache.sling.xss.ProtectionContext;
 import org.apache.sling.xss.XSSAPI;
 import org.apache.sling.xss.XSSFilter;
+import org.osgi.framework.Constants;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Deactivate;
@@ -46,7 +47,11 @@ import org.slf4j.LoggerFactory;
 import org.xml.sax.InputSource;
 import org.xml.sax.XMLReader;
 
-@Component
+@Component(service = XSSAPI.class,
+           property = {
+                Constants.SERVICE_VENDOR + "=The Apache Software Foundation"
+           })
+
 public class XSSAPIImpl implements XSSAPI {
 
     private final Logger LOGGER = LoggerFactory.getLogger(XSSAPIImpl.class);
diff --git a/src/main/java/org/apache/sling/xss/impl/XSSFilterImpl.java b/src/main/java/org/apache/sling/xss/impl/XSSFilterImpl.java
index c0cc39c..c50b75c 100644
--- a/src/main/java/org/apache/sling/xss/impl/XSSFilterImpl.java
+++ b/src/main/java/org/apache/sling/xss/impl/XSSFilterImpl.java
@@ -36,6 +36,7 @@ import org.apache.sling.api.resource.observation.ResourceChangeListener;
 import org.apache.sling.serviceusermapping.ServiceUserMapped;
 import org.apache.sling.xss.ProtectionContext;
 import org.apache.sling.xss.XSSFilter;
+import org.osgi.framework.Constants;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
@@ -51,6 +52,7 @@ import org.slf4j.LoggerFactory;
 @Component(
         service = {ResourceChangeListener.class, XSSFilter.class},
         property = {
+                Constants.SERVICE_VENDOR + "=The Apache Software Foundation",
                 ResourceChangeListener.CHANGES + "=ADDED",
                 ResourceChangeListener.CHANGES + "=CHANGED",
                 ResourceChangeListener.CHANGES + "=REMOVED",

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.