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/10/18 23:19:41 UTC
[sling-org-apache-sling-discovery-support] branch master created
(now 3695c4f)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-support.git.
at 3695c4f SLING-7167 Adjust READMEs
This branch includes the following new commits:
new 2cf6b37 Create new support module
new e902d21 Create new support module
new fa70e8a Add missing poms
new 59d9e1c Update to latest parent pom
new 5d49a74 Use released discovery api
new 5a8a738 SLING-2976 : Add support for instance name and description
new bfd7fa7 Prepare for release
new 601a418 [maven-release-plugin] prepare release org.apache.sling.discovery.support-1.0.0
new d28259a [maven-release-plugin] prepare for next development iteration
new b408eb4 Switch to current snapshot after release
new fb684e8 Use released version as dependency
new 37c0878 Update to parent pom 18
new 0830bed Update to parent pom v19
new 38c3ca6 Updated to parent version 20
new 14f8c6e Update to Sling Parent POM 22 with baselining enabled
new ac35e73 SLING-4505 Relative paths has been set to correct value.
new 29c74cb Remove inherited dependencies
new ef81eea SLING-4698 - Set parent.relativePath to empty for all modules
new 5c46b28 Update to Sling Parent 23
new a3808b3 set parent version to 24 and add empty relativePath where missing
new 3df7513 Update the main reactor to parent 25
new 0684ac6 Switch to parent pom 26
new 3695c4f SLING-7167 Adjust READMEs
The 23 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.
--
To stop receiving notification emails like this one, please contact
['"commits@sling.apache.org" <co...@sling.apache.org>'].
[sling-org-apache-sling-discovery-support] 16/23: SLING-4505
Relative paths has been set to correct value.
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-support.git
commit ac35e73864882daf2e50e1b29a3806cb4b62c96f
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Mon Mar 16 13:22:00 2015 +0000
SLING-4505 Relative paths has been set to correct value.
Submitted-By: Petr_Shypila <pe...@sap.com>
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1666984 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 3eca9e8..12b6cac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
<version>22</version>
- <relativePath>../../../parent/pom.xml</relativePath>
+ <relativePath>../../../../parent/pom.xml</relativePath>
</parent>
<artifactId>org.apache.sling.discovery.support</artifactId>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-discovery-support] 14/23: Updated to parent
version 20
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-support.git
commit 38c3ca67cd18f6fdebbe299e596b6fa2e0004730
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Fri Aug 1 19:16:26 2014 +0000
Updated to parent version 20
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1615208 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index c001022..09dd7ae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>19</version>
+ <version>20</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-discovery-support] 15/23: Update to Sling
Parent POM 22 with baselining enabled
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-support.git
commit 14f8c6e297f0c2dc2b7f56e13f7714a9e23186e1
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Oct 1 06:57:44 2014 +0000
Update to Sling Parent POM 22 with baselining enabled
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1628622 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 09dd7ae..3eca9e8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>20</version>
+ <version>22</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-discovery-support] 12/23: Update to parent
pom 18
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-support.git
commit 37c087843e6ed26d9f32b876ac8c9234c6d4ca22
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Fri Sep 6 12:15:57 2013 +0000
Update to parent pom 18
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1520554 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 6997ee0..5d1e51a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>17</version>
+ <version>18</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-discovery-support] 19/23: Update to Sling
Parent 23
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-support.git
commit 5c46b28cf697cbaf0f1ef83dcf84516bd114da08
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Thu Jun 25 13:08:16 2015 +0000
Update to Sling Parent 23
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1687500 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 2f9616d..713e3bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>22</version>
+ <version>23</version>
<relativePath/>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-discovery-support] 04/23: Update to latest
parent pom
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-support.git
commit 59d9e1c77e7a16f6aac871ccb53c260557796a38
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Fri Jul 19 07:04:15 2013 +0000
Update to latest parent pom
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1504788 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 0749ac6..deb3ae6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>16</version>
+ <version>17</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-discovery-support] 17/23: Remove inherited
dependencies
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-support.git
commit 29c74cb5b44587db067999c88a2b7ce941137670
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Apr 27 14:08:12 2015 +0000
Remove inherited dependencies
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1676269 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 --------
1 file changed, 8 deletions(-)
diff --git a/pom.xml b/pom.xml
index 12b6cac..b54e9a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,14 +57,6 @@
</build>
<dependencies>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr.annotations</artifactId>
- </dependency>
- <dependency>
- <groupId>biz.aQute</groupId>
- <artifactId>bndlib</artifactId>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-discovery-support] 06/23: SLING-2976 : Add
support for instance name and description
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-support.git
commit 5a8a7386047821315b22f20c3a92a0ed1e7d89ca
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Jul 24 06:56:26 2013 +0000
SLING-2976 : Add support for instance name and description
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1506416 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 6 ++++
.../impl/support/StandardPropertyProvider.java | 33 +++++-----------------
2 files changed, 13 insertions(+), 26 deletions(-)
diff --git a/pom.xml b/pom.xml
index 69d81e6..1223a9d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,5 +82,11 @@
<version>1.0.0</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.settings</artifactId>
+ <version>1.2.3-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/src/main/java/org/apache/sling/discovery/impl/support/StandardPropertyProvider.java b/src/main/java/org/apache/sling/discovery/impl/support/StandardPropertyProvider.java
index b698659..9358688 100644
--- a/src/main/java/org/apache/sling/discovery/impl/support/StandardPropertyProvider.java
+++ b/src/main/java/org/apache/sling/discovery/impl/support/StandardPropertyProvider.java
@@ -35,6 +35,7 @@ import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.ReferencePolicy;
import org.apache.sling.discovery.InstanceDescription;
import org.apache.sling.discovery.PropertyProvider;
+import org.apache.sling.settings.SlingSettingsService;
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.ServiceRegistration;
@@ -55,24 +56,18 @@ public class StandardPropertyProvider {
private volatile long changeCount;
- private String instanceName;
-
- private String instanceDescription;
-
private ServiceRegistration propagationService;
private final Map<Long, String[]> endpoints = new HashMap<Long, String[]>();
private String endpointString;
+ @Reference SlingSettingsService settings;
+
private Dictionary<String, Object> getRegistrationProperties() {
final List<String> names = new ArrayList<String>();
- if ( this.instanceName != null ) {
- names.add(InstanceDescription.PROPERTY_NAME);
- }
- if ( this.instanceDescription != null ) {
- names.add(InstanceDescription.PROPERTY_DESCRIPTION);
- }
+ names.add(InstanceDescription.PROPERTY_NAME);
+ names.add(InstanceDescription.PROPERTY_DESCRIPTION);
names.add(InstanceDescription.PROPERTY_ENDPOINTS);
final StringBuilder sb = new StringBuilder();
@@ -101,17 +96,6 @@ public class StandardPropertyProvider {
return serviceProps;
}
- private String getPropertyValue(final ComponentContext bc, final String key) {
- Object value = bc.getProperties().get(key);
- if ( value == null ) {
- value = bc.getBundleContext().getProperty(key);
- }
- if ( value != null ) {
- return value.toString();
- }
- return null;
- }
-
@Activate
protected void activate(final ComponentContext cc) {
this.modified(cc);
@@ -119,18 +103,15 @@ public class StandardPropertyProvider {
@Modified
protected void modified(final ComponentContext cc) {
- this.instanceName = this.getPropertyValue(cc, "sling.name");
- this.instanceDescription = this.getPropertyValue(cc, "sling.description");
-
this.propagationService = cc.getBundleContext().registerService(PropertyProvider.class.getName(),
new PropertyProvider() {
public String getProperty(final String name) {
if ( InstanceDescription.PROPERTY_DESCRIPTION.equals(name) ) {
- return instanceDescription;
+ return settings.getSlingDescription();
}
if ( InstanceDescription.PROPERTY_NAME.equals(name) ) {
- return instanceName;
+ return settings.getSlingName();
}
if ( InstanceDescription.PROPERTY_ENDPOINTS.equals(name) ) {
return endpointString;
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-discovery-support] 01/23: Create new
support module
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-support.git
commit 2cf6b3722c7004331aa65febc243329fbc7b50cc
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue May 14 08:09:45 2013 +0000
Create new support module
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1482245 13f79535-47bb-0310-9956-ffa450edef68
---
.../impl/support/StandardPropertyProvider.java | 219 +++++++++++++++++++++
1 file changed, 219 insertions(+)
diff --git a/src/main/java/org/apache/sling/discovery/impl/support/StandardPropertyProvider.java b/src/main/java/org/apache/sling/discovery/impl/support/StandardPropertyProvider.java
new file mode 100644
index 0000000..dacdb7a
--- /dev/null
+++ b/src/main/java/org/apache/sling/discovery/impl/support/StandardPropertyProvider.java
@@ -0,0 +1,219 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.discovery.impl.standalone;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Dictionary;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.felix.scr.annotations.Activate;
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Deactivate;
+import org.apache.felix.scr.annotations.Modified;
+import org.apache.felix.scr.annotations.Reference;
+import org.apache.felix.scr.annotations.ReferenceCardinality;
+import org.apache.felix.scr.annotations.ReferencePolicy;
+import org.apache.sling.discovery.InstanceDescription;
+import org.apache.sling.discovery.PropertyProvider;
+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.http.HttpService;
+
+/**
+ * This service provides the standard instance properties (if available)
+ */
+@Component(immediate=true)
+@Reference(referenceInterface=HttpService.class,
+ cardinality=ReferenceCardinality.OPTIONAL_MULTIPLE,
+ policy=ReferencePolicy.DYNAMIC)
+public class StandardPropertyProvider {
+
+ /** Endpoint service registration property from RFC 189 */
+ private static final String REG_PROPERTY_ENDPOINTS = "osgi.http.service.endpoints";
+
+ private volatile long changeCount;
+
+ private String instanceName;
+
+ private String instanceDescription;
+
+ private ServiceRegistration propagationService;
+
+ private final Map<Long, String[]> endpoints = new HashMap<Long, String[]>();
+
+ private String endpointString;
+
+ private Dictionary<String, Object> getRegistrationProperties() {
+ final List<String> names = new ArrayList<String>();
+ if ( this.instanceName != null ) {
+ names.add(InstanceDescription.PROPERTY_NAME);
+ }
+ if ( this.instanceDescription != null ) {
+ names.add(InstanceDescription.PROPERTY_DESCRIPTION);
+ }
+ names.add(InstanceDescription.PROPERTY_ENDPOINTS);
+
+ final StringBuilder sb = new StringBuilder();
+ boolean first = true;
+ synchronized ( this.endpoints ) {
+ for(final String[] points : endpoints.values()) {
+ for(final String point : points) {
+ if ( first ) {
+ first = false;
+ } else {
+ sb.append(",");
+ }
+ sb.append(point);
+ }
+ }
+ }
+ this.endpointString = sb.toString();
+
+ final Dictionary<String, Object> serviceProps = new Hashtable<String, Object>();
+ serviceProps.put(PropertyProvider.PROPERTY_PROPERTIES, names.toArray(new String[names.size()]));
+ // we add a changing property to the service registration
+ // to make sure a modification event is really sent
+ synchronized ( this ) {
+ serviceProps.put("changeCount", this.changeCount++);
+ }
+ return serviceProps;
+ }
+
+ private String getPropertyValue(final ComponentContext bc, final String key) {
+ Object value = bc.getProperties().get(key);
+ if ( value == null ) {
+ value = bc.getBundleContext().getProperty(key);
+ }
+ if ( value != null ) {
+ return value.toString();
+ }
+ return null;
+ }
+
+ @Activate
+ protected void activate(final ComponentContext cc) {
+ this.modified(cc);
+ }
+
+ @Modified
+ protected void modified(final ComponentContext cc) {
+ this.instanceName = this.getPropertyValue(cc, "sling.name");
+ this.instanceDescription = this.getPropertyValue(cc, "sling.description");
+
+ this.propagationService = cc.getBundleContext().registerService(PropertyProvider.class.getName(),
+ new PropertyProvider() {
+
+ public String getProperty(final String name) {
+ if ( InstanceDescription.PROPERTY_DESCRIPTION.equals(name) ) {
+ return instanceDescription;
+ }
+ if ( InstanceDescription.PROPERTY_NAME.equals(name) ) {
+ return instanceName;
+ }
+ if ( InstanceDescription.PROPERTY_ENDPOINTS.equals(name) ) {
+ return endpointString;
+ }
+ return null;
+ }
+ }, this.getRegistrationProperties());
+ }
+
+ @Deactivate
+ protected void deactivate() {
+ if ( this.propagationService != null ) {
+ this.propagationService.unregister();
+ this.propagationService = null;
+ }
+ }
+
+ /**
+ * Bind a http service
+ */
+ protected void bindHttpService(final ServiceReference reference) {
+ final String[] endpointUrls = toStringArray(reference.getProperty(REG_PROPERTY_ENDPOINTS));
+ if ( endpointUrls != null ) {
+ synchronized ( this.endpoints ) {
+ this.endpoints.put((Long)reference.getProperty(Constants.SERVICE_ID), endpointUrls);
+ }
+ if ( this.propagationService != null ) {
+ this.propagationService.setProperties(this.getRegistrationProperties());
+ }
+ }
+ }
+
+ /**
+ * Unbind a http service
+ */
+ protected void unbindHttpService(final ServiceReference reference) {
+ boolean changed = false;
+ synchronized ( this.endpoints ) {
+ if ( this.endpoints.remove(reference.getProperty(Constants.SERVICE_ID)) != null ) {
+ changed = true;
+ }
+ }
+ if ( changed && this.propagationService != null ) {
+ this.propagationService.setProperties(this.getRegistrationProperties());
+ }
+ }
+
+ private String[] toStringArray(final Object propValue) {
+ if (propValue == null) {
+ // no value at all
+ return null;
+
+ } else if (propValue instanceof String) {
+ // single string
+ return new String[] { (String) propValue };
+
+ } else if (propValue instanceof String[]) {
+ // String[]
+ return (String[]) propValue;
+
+ } else if (propValue.getClass().isArray()) {
+ // other array
+ Object[] valueArray = (Object[]) propValue;
+ List<String> values = new ArrayList<String>(valueArray.length);
+ for (Object value : valueArray) {
+ if (value != null) {
+ values.add(value.toString());
+ }
+ }
+ return values.toArray(new String[values.size()]);
+
+ } else if (propValue instanceof Collection<?>) {
+ // collection
+ Collection<?> valueCollection = (Collection<?>) propValue;
+ List<String> valueList = new ArrayList<String>(valueCollection.size());
+ for (Object value : valueCollection) {
+ if (value != null) {
+ valueList.add(value.toString());
+ }
+ }
+ return valueList.toArray(new String[valueList.size()]);
+ }
+
+ return null;
+ }
+}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-discovery-support] 05/23: Use released
discovery api
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-support.git
commit 5d49a74073558a76982be2b29faee8680995fcfa
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Fri Jul 19 07:11:07 2013 +0000
Use released discovery api
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1504792 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index deb3ae6..69d81e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,7 +79,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.discovery.api</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.0</version>
<scope>provided</scope>
</dependency>
</dependencies>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-discovery-support] 03/23: Add missing poms
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-support.git
commit fa70e8a7dc9c2d3d090d540e1b12d4b71e365189
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue May 14 10:56:11 2013 +0000
Add missing poms
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1482296 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 86 insertions(+)
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..0749ac6
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>sling</artifactId>
+ <version>16</version>
+ <relativePath>../../../parent/pom.xml</relativePath>
+ </parent>
+
+ <artifactId>org.apache.sling.discovery.support</artifactId>
+ <packaging>bundle</packaging>
+ <version>0.0.1-SNAPSHOT</version>
+
+ <name>Apache Sling Discovery Support Bundle</name>
+ <description>
+ Supporting services for the discovery
+ </description>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/support</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/support</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/support</url>
+ </scm>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-scr-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.annotations</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>biz.aQute</groupId>
+ <artifactId>bndlib</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.discovery.api</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+</project>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-discovery-support] 18/23: SLING-4698 - Set
parent.relativePath to empty for all modules
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-support.git
commit ef81eea13638502082be5e48bdddd18037da6329
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Thu May 7 10:14:40 2015 +0000
SLING-4698 - Set parent.relativePath to empty for all modules
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1678154 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index b54e9a3..2f9616d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
<version>22</version>
- <relativePath>../../../../parent/pom.xml</relativePath>
+ <relativePath/>
</parent>
<artifactId>org.apache.sling.discovery.support</artifactId>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-discovery-support] 20/23: set parent
version to 24 and add empty relativePath where missing
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-support.git
commit a3808b3be37c1bdb65e9821fa1c2e382928c8283
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Jul 7 08:09:17 2015 +0000
set parent version to 24 and add empty relativePath where missing
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1689593 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 713e3bd..de99420 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>23</version>
+ <version>24</version>
<relativePath/>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-discovery-support] 13/23: Update to parent
pom v19
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-support.git
commit 0830bed8e6b3d18fee2bd5e7d2f18c0c62f04d42
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Mar 31 14:39:20 2014 +0000
Update to parent pom v19
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1583337 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 5d1e51a..c001022 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>18</version>
+ <version>19</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-discovery-support] 11/23: Use released
version as dependency
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-support.git
commit fb684e85ab478dff38b7dc0147be9fe466373394
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Aug 13 07:08:16 2013 +0000
Use released version as dependency
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1513373 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 54dde90..6997ee0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,7 +85,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.settings</artifactId>
- <version>1.3.1-SNAPSHOT</version>
+ <version>1.3.0</version>
<scope>provided</scope>
</dependency>
</dependencies>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-discovery-support] 08/23:
[maven-release-plugin] prepare release
org.apache.sling.discovery.support-1.0.0
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-support.git
commit 601a418ec30b0ca6a6c71c15fdf15738bd3592b1
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Fri Aug 9 07:01:49 2013 +0000
[maven-release-plugin] prepare release org.apache.sling.discovery.support-1.0.0
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1512173 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3299d84..3dc3718 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<artifactId>org.apache.sling.discovery.support</artifactId>
<packaging>bundle</packaging>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.0.0</version>
<name>Apache Sling Discovery Support Bundle</name>
<description>
@@ -37,9 +37,9 @@
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/support</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/support</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/support</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.discovery.support-1.0.0</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.discovery.support-1.0.0</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.discovery.support-1.0.0</url>
</scm>
<build>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-discovery-support] 10/23: Switch to current
snapshot after release
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-support.git
commit b408eb43cbfa25beaa41b19c7b8256a62f4e585a
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Fri Aug 9 07:07:14 2013 +0000
Switch to current snapshot after release
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1512179 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 6997ee0..54dde90 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,7 +85,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.settings</artifactId>
- <version>1.3.0</version>
+ <version>1.3.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-discovery-support] 22/23: Switch to parent
pom 26
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-support.git
commit 0684ac6339af3e526de156d57597773b2405e613
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Sun Jan 3 14:07:46 2016 +0000
Switch to parent pom 26
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1722720 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 12e7c9b..55db0c3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>25</version>
+ <version>26</version>
<relativePath/>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-discovery-support] 09/23:
[maven-release-plugin] prepare for next development iteration
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-support.git
commit d28259a8af68bf7b39e089dc7b9ef23e67dd2bfc
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Fri Aug 9 07:02:34 2013 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1512175 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3dc3718..6997ee0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<artifactId>org.apache.sling.discovery.support</artifactId>
<packaging>bundle</packaging>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<name>Apache Sling Discovery Support Bundle</name>
<description>
@@ -37,9 +37,9 @@
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.discovery.support-1.0.0</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.discovery.support-1.0.0</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.discovery.support-1.0.0</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/support</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/support</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/support</url>
</scm>
<build>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-discovery-support] 21/23: Update the main
reactor to parent 25
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-support.git
commit 3df75132cd565783450dea2c90aea4f0650f20dd
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Mon Oct 5 10:03:45 2015 +0000
Update the main reactor to parent 25
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1706780 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index de99420..12e7c9b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>24</version>
+ <version>25</version>
<relativePath/>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-discovery-support] 23/23: SLING-7167 Adjust
READMEs
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-support.git
commit 3695c4fc20810ed9532fd89f1075a236965f6cea
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Oct 3 09:21:30 2017 +0000
SLING-7167 Adjust READMEs
add missing README
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1810689 13f79535-47bb-0310-9956-ffa450edef68
---
README.md | 3 +++
1 file changed, 3 insertions(+)
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..02fdc15
--- /dev/null
+++ b/README.md
@@ -0,0 +1,3 @@
+# Apache Sling Discovery Support Bundle
+
+This module is part of the [Apache Sling](https://sling.apache.org) project.
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-discovery-support] 07/23: Prepare for
release
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-support.git
commit bfd7fa766dc1cd0803367502a5b6b58eabd47c7e
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Fri Aug 9 06:50:15 2013 +0000
Prepare for release
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1512159 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 1223a9d..3299d84 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,7 +85,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.settings</artifactId>
- <version>1.2.3-SNAPSHOT</version>
+ <version>1.3.0</version>
<scope>provided</scope>
</dependency>
</dependencies>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-discovery-support] 02/23: Create new
support module
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-support.git
commit e902d2190a572dc42853529f94e04931199ee60e
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue May 14 08:11:21 2013 +0000
Create new support module
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1482246 13f79535-47bb-0310-9956-ffa450edef68
---
.../apache/sling/discovery/impl/support/StandardPropertyProvider.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/sling/discovery/impl/support/StandardPropertyProvider.java b/src/main/java/org/apache/sling/discovery/impl/support/StandardPropertyProvider.java
index dacdb7a..b698659 100644
--- a/src/main/java/org/apache/sling/discovery/impl/support/StandardPropertyProvider.java
+++ b/src/main/java/org/apache/sling/discovery/impl/support/StandardPropertyProvider.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.discovery.impl.standalone;
+package org.apache.sling.discovery.impl.support;
import java.util.ArrayList;
import java.util.Collection;
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.