You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2014/10/23 17:44:11 UTC
svn commit: r1633844 - in
/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs:
JobManagerImpl.java console/InventoryPlugin.java
console/WebConsolePlugin.java
Author: cziegeler
Date: Thu Oct 23 15:44:10 2014
New Revision: 1633844
URL: http://svn.apache.org/r1633844
Log:
SLING-4095 : Clean up code and logging statements
Modified:
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/JobManagerImpl.java
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/console/InventoryPlugin.java
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/console/WebConsolePlugin.java
Modified: sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/JobManagerImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/JobManagerImpl.java?rev=1633844&r1=1633843&r2=1633844&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/JobManagerImpl.java (original)
+++ sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/JobManagerImpl.java Thu Oct 23 15:44:10 2014
@@ -876,13 +876,6 @@ public class JobManagerImpl
}
/**
- * Get the current capabilities
- */
- public TopologyCapabilities getTopologyCapabilities() {
- return this.topologyCapabilities;
- }
-
- /**
* @see org.apache.sling.event.jobs.JobManager#stopJobById(java.lang.String)
*/
@Override
Modified: sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/console/InventoryPlugin.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/console/InventoryPlugin.java?rev=1633844&r1=1633843&r2=1633844&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/console/InventoryPlugin.java (original)
+++ sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/console/InventoryPlugin.java Thu Oct 23 15:44:10 2014
@@ -38,7 +38,6 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.Service;
import org.apache.sling.discovery.InstanceDescription;
import org.apache.sling.event.impl.jobs.JobConsumerManager;
-import org.apache.sling.event.impl.jobs.JobManagerImpl;
import org.apache.sling.event.impl.jobs.config.InternalQueueConfiguration;
import org.apache.sling.event.impl.jobs.config.JobManagerConfiguration;
import org.apache.sling.event.impl.jobs.config.TopologyCapabilities;
@@ -165,7 +164,7 @@ public class InventoryPlugin implements
pw.println();
pw.println("Topology Capabilities");
- final TopologyCapabilities cap = ((JobManagerImpl)this.jobManager).getTopologyCapabilities();
+ final TopologyCapabilities cap = this.configuration.getTopologyCapabilities();
if ( cap == null ) {
pw.print("No topology information available !");
} else {
@@ -320,7 +319,7 @@ public class InventoryPlugin implements
pw.printf(" \"averageWaitingTimeText\" : \"%s\"%n", formatTime(s.getAverageWaitingTime()));
pw.print(" }");
- final TopologyCapabilities cap = ((JobManagerImpl)this.jobManager).getTopologyCapabilities();
+ final TopologyCapabilities cap = this.configuration.getTopologyCapabilities();
if ( cap != null ) {
pw.println(",");
pw.println(" \"capabilities\" : [");
Modified: sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/console/WebConsolePlugin.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/console/WebConsolePlugin.java?rev=1633844&r1=1633843&r2=1633844&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/console/WebConsolePlugin.java (original)
+++ sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/console/WebConsolePlugin.java Thu Oct 23 15:44:10 2014
@@ -39,7 +39,6 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.Service;
import org.apache.sling.discovery.InstanceDescription;
import org.apache.sling.event.impl.jobs.JobConsumerManager;
-import org.apache.sling.event.impl.jobs.JobManagerImpl;
import org.apache.sling.event.impl.jobs.config.InternalQueueConfiguration;
import org.apache.sling.event.impl.jobs.config.JobManagerConfiguration;
import org.apache.sling.event.impl.jobs.config.TopologyCapabilities;
@@ -240,7 +239,7 @@ public class WebConsolePlugin extends Ht
pw.println("<table class='nicetable'><tbody>");
pw.println("<tr><th colspan='2'>Topology Capabilities</th></tr>");
- final TopologyCapabilities cap = ((JobManagerImpl)this.jobManager).getTopologyCapabilities();
+ final TopologyCapabilities cap = this.configuration.getTopologyCapabilities();
if ( cap == null ) {
pw.print("<tr><td colspan='2'>No topology information available !</td></tr>");
} else {