You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2016/02/17 18:13:29 UTC
svn commit: r1730877 - in /sling/trunk/bundles/extensions/discovery/base:
pom.xml
src/main/java/org/apache/sling/discovery/base/commons/BaseViewChecker.java
src/main/java/org/apache/sling/discovery/base/commons/package-info.java
Author: olli
Date: Wed Feb 17 17:13:28 2016
New Revision: 1730877
URL: http://svn.apache.org/viewvc?rev=1730877&view=rev
Log:
SLING-5485 Remove Launchpad API dependency from Discovery Base
Modified:
sling/trunk/bundles/extensions/discovery/base/pom.xml
sling/trunk/bundles/extensions/discovery/base/src/main/java/org/apache/sling/discovery/base/commons/BaseViewChecker.java
sling/trunk/bundles/extensions/discovery/base/src/main/java/org/apache/sling/discovery/base/commons/package-info.java
Modified: sling/trunk/bundles/extensions/discovery/base/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/base/pom.xml?rev=1730877&r1=1730876&r2=1730877&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/discovery/base/pom.xml (original)
+++ sling/trunk/bundles/extensions/discovery/base/pom.xml Wed Feb 17 17:13:28 2016
@@ -204,12 +204,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.launchpad.api</artifactId>
- <version>1.1.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.4</version>
Modified: sling/trunk/bundles/extensions/discovery/base/src/main/java/org/apache/sling/discovery/base/commons/BaseViewChecker.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/base/src/main/java/org/apache/sling/discovery/base/commons/BaseViewChecker.java?rev=1730877&r1=1730876&r2=1730877&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/discovery/base/src/main/java/org/apache/sling/discovery/base/commons/BaseViewChecker.java (original)
+++ sling/trunk/bundles/extensions/discovery/base/src/main/java/org/apache/sling/discovery/base/commons/BaseViewChecker.java Wed Feb 17 17:13:28 2016
@@ -33,8 +33,6 @@ import org.apache.sling.commons.schedule
import org.apache.sling.discovery.base.connectors.BaseConfig;
import org.apache.sling.discovery.base.connectors.announcement.AnnouncementRegistry;
import org.apache.sling.discovery.base.connectors.ping.ConnectorRegistry;
-import org.apache.sling.launchpad.api.StartupListener;
-import org.apache.sling.launchpad.api.StartupMode;
import org.apache.sling.settings.SlingSettingsService;
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceReference;
@@ -49,7 +47,7 @@ import org.slf4j.LoggerFactory;
* Local heartbeats are stored in the repository. Remote heartbeats are POSTs to
* remote TopologyConnectorServlets.
*/
-public abstract class BaseViewChecker implements ViewChecker, Runnable, StartupListener {
+public abstract class BaseViewChecker implements ViewChecker, Runnable {
protected final Logger logger = LoggerFactory.getLogger(this.getClass());
@@ -80,9 +78,6 @@ public abstract class BaseViewChecker im
/** keep a reference to the component context **/
protected ComponentContext context;
- /** SLING-2968 : start issuing remote heartbeats only after startup finished **/
- protected boolean startupFinished = false;
-
/** SLING-3382 : force ping instructs the servlet to start the backoff from scratch again **/
private boolean forcePing;
@@ -91,12 +86,6 @@ public abstract class BaseViewChecker im
protected PeriodicBackgroundJob periodicPingJob;
- public void inform(StartupMode mode, boolean finished) {
- if (finished) {
- startupFinished(mode);
- }
- }
-
protected abstract SlingSettingsService getSlingSettingsService();
protected abstract ResourceResolverFactory getResourceResolverFactory();
@@ -109,17 +98,6 @@ public abstract class BaseViewChecker im
protected abstract BaseConfig getConnectorConfig();
- public void startupFinished(StartupMode mode) {
- synchronized(lock) {
- startupFinished = true;
- issueHeartbeat();
- }
- }
-
- public void startupProgress(float ratio) {
- // we dont care
- }
-
@Activate
protected void activate(ComponentContext context) {
synchronized(lock) {
@@ -130,6 +108,7 @@ public abstract class BaseViewChecker im
doActivate();
activated = true;
+ issueHeartbeat();
}
}
@@ -223,10 +202,6 @@ public abstract class BaseViewChecker im
logger.error("issueConnectorPings: connectorRegistry is null");
return;
}
- if (!startupFinished) {
- logger.debug("issueConnectorPings: not issuing remote heartbeat yet, startup not yet finished");
- return;
- }
if (logger.isDebugEnabled()) {
logger.debug("issueConnectorPings: pinging outgoing topology connectors (if there is any) for "+slingId);
}
Modified: sling/trunk/bundles/extensions/discovery/base/src/main/java/org/apache/sling/discovery/base/commons/package-info.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/base/src/main/java/org/apache/sling/discovery/base/commons/package-info.java?rev=1730877&r1=1730876&r2=1730877&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/discovery/base/src/main/java/org/apache/sling/discovery/base/commons/package-info.java (original)
+++ sling/trunk/bundles/extensions/discovery/base/src/main/java/org/apache/sling/discovery/base/commons/package-info.java Wed Feb 17 17:13:28 2016
@@ -23,7 +23,7 @@
*
* @version 1.1.0
*/
-@Version("1.1.0")
+@Version("2.0.0")
package org.apache.sling.discovery.base.commons;
import aQute.bnd.annotation.Version;