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 09:33:47 UTC
[sling-org-apache-sling-event-dea] annotated tag
org.apache.sling.event.dea-1.1.0 created (now 18802c3)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change to annotated tag org.apache.sling.event.dea-1.1.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-event-dea.git.
at 18802c3 (tag)
tagging 270f546f467cf8b1530615ed732b2b80463c748c (commit)
by Carsten Ziegeler
on Wed Oct 12 13:07:37 2016 +0000
- Log -----------------------------------------------------------------
org.apache.sling.event.dea-1.1.0
-----------------------------------------------------------------------
This annotated tag includes the following new commits:
new d715c2e SLING-3882 : Move the distributed event admin into a separate project
new 82bf84c Update svn properties
new c447797 Update to latest API version
new e74ac43 Use released SLING API
new ca962c6 [maven-release-plugin] prepare release org.apache.sling.event.dea-1.0.0
new 3a9b2a7 [maven-release-plugin] prepare for next development iteration
new bb155eb Use latest parent pom
new 61186e0 SLING-4698 - Set parent.relativePath to empty for all modules
new 49f716a SLING-4758 : Make the DEA bundle usable on older Sling installations
new d137c00 Update to Sling Parent 23
new b7468c1 Remove superflous sling.java.version=6 as it's the default now
new 438dd1c set parent version to 24 and add empty relativePath where missing
new a0e7910 [maven-release-plugin] prepare release org.apache.sling.event.dea-1.0.2
new c5622ea [maven-release-plugin] prepare for next development iteration
new 8577a82 SLING-5052 : avoid NPE when resource no longer exists
new 7a94f81 [maven-release-plugin] prepare release org.apache.sling.event.dea-1.0.4
new 705344f [maven-release-plugin] prepare for next development iteration
new dfdd21e Update the main reactor to parent 25
new 10ff4b5 Switch to parent pom 26
new 9fe4fe6 SLING-5996 : DistributedEventSender should move to new ResourceChangeListener API
new 86c508c Fix javadoc generation
new 69c37f8 SLING-5230 : Remove getAdministrativeResourceResolver() usage from org.apache.sling.event.dea
new b8b3bb5 [maven-release-plugin] prepare release org.apache.sling.event.dea-1.1.0
new 270f546 [maven-release-plugin] copy for tag org.apache.sling.event.dea-1.1.0
The 24 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-event-dea] 08/08: [maven-release-plugin]
copy for tag org.apache.sling.event.dea-1.1.0
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.event.dea-1.1.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-event-dea.git
commit 270f546f467cf8b1530615ed732b2b80463c748c
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Oct 12 13:07:37 2016 +0000
[maven-release-plugin] copy for tag org.apache.sling.event.dea-1.1.0
git-svn-id: https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.event.dea-1.1.0@1764456 13f79535-47bb-0310-9956-ffa450edef68
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-event-dea] 05/08: Fix javadoc generation
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.event.dea-1.1.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-event-dea.git
commit 86c508c5f044285f9be04cf4113fd66f6994b187
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Thu Sep 22 13:41:38 2016 +0000
Fix javadoc generation
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/dea@1761967 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index c2d9718..9b654e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,10 +49,6 @@
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
</plugin>
- </plugins>
- </build>
- <reporting>
- <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
@@ -63,7 +59,7 @@
</configuration>
</plugin>
</plugins>
- </reporting>
+ </build>
<dependencies>
<dependency>
<groupId>org.apache.sling</groupId>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-event-dea] 07/08: [maven-release-plugin]
prepare release org.apache.sling.event.dea-1.1.0
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.event.dea-1.1.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-event-dea.git
commit b8b3bb535be3394384a5847002862cbd522747b2
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Oct 12 13:07:24 2016 +0000
[maven-release-plugin] prepare release org.apache.sling.event.dea-1.1.0
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/dea@1764455 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9b654e4..f1a65b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<artifactId>org.apache.sling.event.dea</artifactId>
<packaging>bundle</packaging>
- <version>1.0.5-SNAPSHOT</version>
+ <version>1.1.0</version>
<name>Apache Sling Distributed Event Admin</name>
<description>
@@ -37,9 +37,9 @@
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/dea</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/dea</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/dea</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.event.dea-1.1.0</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.event.dea-1.1.0</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.event.dea-1.1.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-event-dea] 04/08: SLING-5996 :
DistributedEventSender should move to new ResourceChangeListener API
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.event.dea-1.1.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-event-dea.git
commit 9fe4fe69e5f89db56ba312710f4ac921c9c96c9d
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Thu Sep 22 13:33:05 2016 +0000
SLING-5996 : DistributedEventSender should move to new ResourceChangeListener API
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/dea@1761965 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 28 ++++++---------
.../event/dea/impl/DistributedEventAdminImpl.java | 40 +++++++++-------------
.../event/dea/impl/DistributedEventReceiver.java | 4 +--
.../event/dea/impl/DistributedEventSender.java | 38 ++++++++++----------
.../org/apache/sling/event/dea/package-info.java | 3 +-
.../dea/impl/DistributingEventHandlerTest.java | 6 +++-
6 files changed, 55 insertions(+), 64 deletions(-)
diff --git a/pom.xml b/pom.xml
index 83d3675..c2d9718 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>26</version>
+ <version>28</version>
<relativePath />
</parent>
@@ -46,10 +46,6 @@
<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>
@@ -70,28 +66,24 @@
</reporting>
<dependencies>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr.annotations</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.discovery.api</artifactId>
<version>1.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <version>1.3.1</version>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>4.2.0</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>4.2.0</version>
+ <artifactId>osgi.core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
@@ -108,7 +100,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
- <version>2.4.0</version>
+ <version>2.11.0</version>
<scope>provided</scope>
</dependency>
<!-- Testing -->
@@ -125,7 +117,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
- <version>1.9.5</version>
+ <version>1.10.19</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/src/main/java/org/apache/sling/event/dea/impl/DistributedEventAdminImpl.java b/src/main/java/org/apache/sling/event/dea/impl/DistributedEventAdminImpl.java
index df128b4..27a811c 100644
--- a/src/main/java/org/apache/sling/event/dea/impl/DistributedEventAdminImpl.java
+++ b/src/main/java/org/apache/sling/event/dea/impl/DistributedEventAdminImpl.java
@@ -18,17 +18,13 @@
*/
package org.apache.sling.event.dea.impl;
-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.Property;
-import org.apache.felix.scr.annotations.Reference;
import org.apache.sling.api.resource.ResourceResolverFactory;
-import org.apache.sling.commons.osgi.PropertiesUtil;
import org.apache.sling.settings.SlingSettingsService;
import org.osgi.framework.BundleContext;
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Deactivate;
+import org.osgi.service.component.annotations.Reference;
import org.osgi.service.event.EventAdmin;
/**
@@ -38,6 +34,14 @@ import org.osgi.service.event.EventAdmin;
@Component(name="org.apache.sling.event.impl.DistributingEventHandler")
public class DistributedEventAdminImpl {
+ public @interface Config {
+
+ /** The path where all jobs are stored. */
+ String repository_path() default DEFAULT_REPOSITORY_PATH;
+
+ int cleanup_period() default DEFAULT_CLEANUP_PERIOD;
+ }
+
public static final String RESOURCE_TYPE_FOLDER = "sling:Folder";
public static final String RESOURCE_TYPE_EVENT = "sling/distributed/event";
@@ -54,16 +58,9 @@ public class DistributedEventAdminImpl {
/** Default repository path. */
public static final String DEFAULT_REPOSITORY_PATH = "/var/eventing/distribution";
- /** The path where all jobs are stored. */
- @Property(value=DEFAULT_REPOSITORY_PATH)
- private static final String CONFIG_PROPERTY_REPOSITORY_PATH = "repository.path";
-
/** Default clean up time is 15 minutes. */
private static final int DEFAULT_CLEANUP_PERIOD = 15;
- @Property(intValue=DEFAULT_CLEANUP_PERIOD)
- private static final String CONFIG_PROPERTY_CLEANUP_PERIOD = "cleanup.period";
-
/** The local receiver of distributed events .*/
private DistributedEventReceiver receiver;
@@ -71,19 +68,16 @@ public class DistributedEventAdminImpl {
private DistributedEventSender sender;
@Activate
- protected void activate(final BundleContext bundleContext, final Map<String, Object> props) {
- final int cleanupPeriod = PropertiesUtil.toInteger(props.get(CONFIG_PROPERTY_CLEANUP_PERIOD), DEFAULT_CLEANUP_PERIOD);
- final String rootPath = PropertiesUtil.toString(props.get(
- CONFIG_PROPERTY_REPOSITORY_PATH), DEFAULT_REPOSITORY_PATH);
- final String ownRootPath = rootPath.concat("/").concat(settings.getSlingId());
+ protected void activate(final BundleContext bundleContext, final Config props) {
+ final String ownRootPath = props.repository_path().concat("/").concat(settings.getSlingId());
this.receiver = new DistributedEventReceiver(bundleContext,
- rootPath,
+ props.repository_path(),
ownRootPath,
- cleanupPeriod,
+ props.cleanup_period(),
this.resourceResolverFactory, this.settings);
this.sender = new DistributedEventSender(bundleContext,
- rootPath,
+ props.repository_path(),
ownRootPath,
this.resourceResolverFactory, this.eventAdmin);
}
diff --git a/src/main/java/org/apache/sling/event/dea/impl/DistributedEventReceiver.java b/src/main/java/org/apache/sling/event/dea/impl/DistributedEventReceiver.java
index 995a0a9..7635f81 100644
--- a/src/main/java/org/apache/sling/event/dea/impl/DistributedEventReceiver.java
+++ b/src/main/java/org/apache/sling/event/dea/impl/DistributedEventReceiver.java
@@ -97,7 +97,7 @@ public class DistributedEventReceiver
private volatile Set<String> instances;
/** The service registration. */
- private volatile ServiceRegistration serviceRegistration;
+ private volatile ServiceRegistration<?> serviceRegistration;
public DistributedEventReceiver(final BundleContext bundleContext,
final String rootPath,
@@ -127,7 +127,7 @@ public class DistributedEventReceiver
props.put("scheduler.period", 1800L);
props.put("scheduler.concurrent", Boolean.FALSE);
- final ServiceRegistration reg =
+ final ServiceRegistration<?> reg =
bundleContext.registerService(new String[] {EventHandler.class.getName(),
Runnable.class.getName(),
TopologyEventListener.class.getName()},
diff --git a/src/main/java/org/apache/sling/event/dea/impl/DistributedEventSender.java b/src/main/java/org/apache/sling/event/dea/impl/DistributedEventSender.java
index 1cf81ec..e277bf9 100644
--- a/src/main/java/org/apache/sling/event/dea/impl/DistributedEventSender.java
+++ b/src/main/java/org/apache/sling/event/dea/impl/DistributedEventSender.java
@@ -25,12 +25,14 @@ import java.util.Map;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
-import org.apache.sling.api.SlingConstants;
import org.apache.sling.api.resource.LoginException;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.resource.ResourceResolverFactory;
import org.apache.sling.api.resource.ValueMap;
+import org.apache.sling.api.resource.observation.ExternalResourceChangeListener;
+import org.apache.sling.api.resource.observation.ResourceChange;
+import org.apache.sling.api.resource.observation.ResourceChangeListener;
import org.apache.sling.event.dea.DEAConstants;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
@@ -38,7 +40,6 @@ import org.osgi.framework.ServiceRegistration;
import org.osgi.service.event.Event;
import org.osgi.service.event.EventAdmin;
import org.osgi.service.event.EventConstants;
-import org.osgi.service.event.EventHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -52,7 +53,7 @@ import org.slf4j.LoggerFactory;
* <p>
*/
public class DistributedEventSender
- implements EventHandler {
+ implements ResourceChangeListener, ExternalResourceChangeListener {
/** Default logger. */
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@@ -69,7 +70,7 @@ public class DistributedEventSender
private final String ownRootPathWithSlash;
- private volatile ServiceRegistration serviceRegistration;
+ private volatile ServiceRegistration<ResourceChangeListener> serviceRegistration;
public DistributedEventSender(final BundleContext bundleContext,
final String rootPath,
@@ -89,12 +90,12 @@ public class DistributedEventSender
props.put(Constants.SERVICE_VENDOR, "The Apache Software Foundation");
// listen for all resource added OSGi events in the DEA area
- props.put(EventConstants.EVENT_TOPIC, SlingConstants.TOPIC_RESOURCE_ADDED);
- props.put(EventConstants.EVENT_FILTER, "(path=" + rootPath + "/*)");
+ props.put(ResourceChangeListener.CHANGES, ResourceChange.ChangeType.ADDED.name());
+ props.put(ResourceChangeListener.PATHS, rootPath);
- final ServiceRegistration reg =
- bundleContext.registerService(new String[] {EventHandler.class.getName()},
- DistributedEventSender.this, props);
+ final ServiceRegistration<ResourceChangeListener> reg =
+ bundleContext.registerService(ResourceChangeListener.class,
+ DistributedEventSender.this, props);
DistributedEventSender.this.serviceRegistration = reg;
@@ -218,17 +219,18 @@ public class DistributedEventSender
}
/**
- * @see org.osgi.service.event.EventHandler#handleEvent(org.osgi.service.event.Event)
+ * @see org.apache.sling.api.resource.observation.ResourceChangeListener#onChange(java.util.List)
*/
@Override
- public void handleEvent(final Event event) {
- final String path = (String) event.getProperty(SlingConstants.PROPERTY_PATH);
- if ( !path.startsWith(this.ownRootPathWithSlash) ) {
- try {
- this.queue.put(path);
- } catch (final InterruptedException ex) {
- this.ignoreException(ex);
- Thread.currentThread().interrupt();
+ public void onChange(final List<ResourceChange> changes) {
+ for(final ResourceChange c : changes) {
+ if ( !c.getPath().startsWith(this.ownRootPathWithSlash) ) {
+ try {
+ this.queue.put(c.getPath());
+ } catch (final InterruptedException ex) {
+ this.ignoreException(ex);
+ Thread.currentThread().interrupt();
+ }
}
}
}
diff --git a/src/main/java/org/apache/sling/event/dea/package-info.java b/src/main/java/org/apache/sling/event/dea/package-info.java
index 9495421..8e790d4 100644
--- a/src/main/java/org/apache/sling/event/dea/package-info.java
+++ b/src/main/java/org/apache/sling/event/dea/package-info.java
@@ -17,8 +17,7 @@
* under the License.
*/
-@Version("1.0.0")
+@org.osgi.annotation.versioning.Version("1.0.0")
package org.apache.sling.event.dea;
-import aQute.bnd.annotation.Version;
diff --git a/src/test/java/org/apache/sling/event/dea/impl/DistributingEventHandlerTest.java b/src/test/java/org/apache/sling/event/dea/impl/DistributingEventHandlerTest.java
index 3547300..2b7293e 100644
--- a/src/test/java/org/apache/sling/event/dea/impl/DistributingEventHandlerTest.java
+++ b/src/test/java/org/apache/sling/event/dea/impl/DistributingEventHandlerTest.java
@@ -30,6 +30,8 @@ import java.util.List;
import org.apache.sling.api.SlingConstants;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.resource.ResourceResolverFactory;
+import org.apache.sling.api.resource.observation.ResourceChange;
+import org.apache.sling.api.resource.observation.ResourceChange.ChangeType;
import org.apache.sling.event.dea.DEAConstants;
import org.apache.sling.settings.SlingSettingsService;
import org.apache.sling.testing.resourceresolver.MockResourceResolverFactory;
@@ -77,7 +79,9 @@ public class DistributingEventHandlerTest {
public void postEvent(final Event event) {
final String topic = event.getTopic();
if ( topic.equals(SlingConstants.TOPIC_RESOURCE_ADDED) ) {
- sender.handleEvent(event);
+ final ResourceChange change = new ResourceChange(ChangeType.ADDED,
+ (String)event.getProperty(SlingConstants.PROPERTY_PATH), false, null, null, null);
+ sender.onChange(Collections.singletonList(change));
} else if ( topic.startsWith(TOPIC_PREFIX) ) {
events.add(event);
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-event-dea] 01/08: [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 annotated tag org.apache.sling.event.dea-1.1.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-event-dea.git
commit 705344f7dc404f5dec97a37f27badf0dc66f98a0
Author: Stefan Egli <st...@apache.org>
AuthorDate: Wed Sep 23 10:06:20 2015 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/dea@1704804 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 048688f..2dceaba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<artifactId>org.apache.sling.event.dea</artifactId>
<packaging>bundle</packaging>
- <version>1.0.4</version>
+ <version>1.0.5-SNAPSHOT</version>
<name>Apache Sling Distributed Event Admin</name>
<description>
@@ -37,9 +37,9 @@
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.event.dea-1.0.4</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.event.dea-1.0.4</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.event.dea-1.0.4</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/dea</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/dea</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/dea</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-event-dea] 03/08: 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 annotated tag org.apache.sling.event.dea-1.1.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-event-dea.git
commit 10ff4b52f1e84e0abdd68197621432a6820db604
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/bundles/extensions/dea@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 494ffa6..83d3675 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-event-dea] 02/08: 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 annotated tag org.apache.sling.event.dea-1.1.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-event-dea.git
commit dfdd21eda0797af147f82f6578f376376815467c
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/bundles/extensions/dea@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 2dceaba..494ffa6 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-event-dea] 06/08: SLING-5230 : Remove
getAdministrativeResourceResolver() usage from org.apache.sling.event.dea
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.event.dea-1.1.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-event-dea.git
commit 69c37f8a149799262eeec6336ee9dab917ba8134
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Oct 12 12:30:45 2016 +0000
SLING-5230 : Remove getAdministrativeResourceResolver() usage from org.apache.sling.event.dea
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/dea@1764446 13f79535-47bb-0310-9956-ffa450edef68
---
.../org/apache/sling/event/dea/impl/DistributedEventReceiver.java | 6 +++---
.../org/apache/sling/event/dea/impl/DistributedEventSender.java | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/apache/sling/event/dea/impl/DistributedEventReceiver.java b/src/main/java/org/apache/sling/event/dea/impl/DistributedEventReceiver.java
index 7635f81..8698b39 100644
--- a/src/main/java/org/apache/sling/event/dea/impl/DistributedEventReceiver.java
+++ b/src/main/java/org/apache/sling/event/dea/impl/DistributedEventReceiver.java
@@ -136,7 +136,7 @@ public class DistributedEventReceiver
DistributedEventReceiver.this.serviceRegistration = reg;
try {
- writerResolver = resourceResolverFactory.getAdministrativeResourceResolver(null);
+ writerResolver = resourceResolverFactory.getServiceResourceResolver(null);
ResourceUtil.getOrCreateResource(writerResolver,
ownRootPath,
DistributedEventAdminImpl.RESOURCE_TYPE_FOLDER,
@@ -296,7 +296,7 @@ public class DistributedEventReceiver
this.logger.debug("Checking for old instance trees for distributed events.");
ResourceResolver resolver = null;
try {
- resolver = this.resourceResolverFactory.getAdministrativeResourceResolver(null);
+ resolver = this.resourceResolverFactory.getServiceResourceResolver(null);
final Resource baseResource = resolver.getResource(this.rootPath);
// sanity check - should never be null
@@ -332,7 +332,7 @@ public class DistributedEventReceiver
ResourceResolver resolver = null;
try {
- resolver = this.resourceResolverFactory.getAdministrativeResourceResolver(null);
+ resolver = this.resourceResolverFactory.getServiceResourceResolver(null);
final ResourceHelper.BatchResourceRemover brr = ResourceHelper.getBatchResourceRemover(50);
final Resource baseResource = resolver.getResource(this.ownRootPath);
diff --git a/src/main/java/org/apache/sling/event/dea/impl/DistributedEventSender.java b/src/main/java/org/apache/sling/event/dea/impl/DistributedEventSender.java
index e277bf9..3159931 100644
--- a/src/main/java/org/apache/sling/event/dea/impl/DistributedEventSender.java
+++ b/src/main/java/org/apache/sling/event/dea/impl/DistributedEventSender.java
@@ -191,7 +191,7 @@ public class DistributedEventSender
if ( path != null && path.length() > 0 && this.running ) {
ResourceResolver resolver = null;
try {
- resolver = this.resourceResolverFactory.getAdministrativeResourceResolver(null);
+ resolver = this.resourceResolverFactory.getServiceResourceResolver(null);
final Resource eventResource = resolver.getResource(path);
if (eventResource == null) {
this.logger.warn("runInBackground : resource not found at "+path);
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.