You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by to...@apache.org on 2014/06/16 16:47:49 UTC
svn commit: r1602882 - in
/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication:
queue/impl/jobhandling/ serialization/impl/vlt/ servlet/
Author: tommaso
Date: Mon Jun 16 14:47:49 2014
New Revision: 1602882
URL: http://svn.apache.org/r1602882
Log:
SLING-3672 - not using empty template map to retrieve jobs
Modified:
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/impl/jobhandling/JobHandlingReplicationQueue.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/vlt/FileVaultReplicationPackageBuilder.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/servlet/ReplicationAgentQueueServlet.java
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/impl/jobhandling/JobHandlingReplicationQueue.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/impl/jobhandling/JobHandlingReplicationQueue.java?rev=1602882&r1=1602881&r2=1602882&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/impl/jobhandling/JobHandlingReplicationQueue.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/impl/jobhandling/JobHandlingReplicationQueue.java Mon Jun 16 14:47:49 2014
@@ -125,9 +125,8 @@ public class JobHandlingReplicationQueue
log.info("getting first item in the queue");
}
- HashMap<String, Object> props = new HashMap<String, Object>();
- Collection<Job> jobs = jobManager.findJobs(QueryType.QUEUED, topic, -1, props);
- jobs.addAll(jobManager.findJobs(QueryType.ACTIVE, topic, -1, props));
+ Collection<Job> jobs = jobManager.findJobs(QueryType.QUEUED, topic, -1);
+ jobs.addAll(jobManager.findJobs(QueryType.ACTIVE, topic, -1));
if (jobs.size() > 0) {
ArrayList<Job> list = new ArrayList<Job>(jobs);
Collections.sort(list, new Comparator<Job>() {
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/vlt/FileVaultReplicationPackageBuilder.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/vlt/FileVaultReplicationPackageBuilder.java?rev=1602882&r1=1602881&r2=1602882&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/vlt/FileVaultReplicationPackageBuilder.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/vlt/FileVaultReplicationPackageBuilder.java Mon Jun 16 14:47:49 2014
@@ -108,8 +108,8 @@ public class FileVaultReplicationPackage
props.setProperty(VaultPackage.NAME_GROUP, packageGroup);
String packageName = String.valueOf(request.getTime());
props.setProperty(VaultPackage.NAME_NAME, packageName);
- if (log.isInfoEnabled()) {
- log.info("assembling package {}", packageGroup + '/' + packageName);
+ if (log.isDebugEnabled()) {
+ log.debug("assembling package {}", packageGroup + '/' + packageName);
}
inf.setProperties(props);
@@ -140,14 +140,12 @@ public class FileVaultReplicationPackage
@Override
protected ReplicationPackage readPackageForAdd(final InputStream stream, boolean install)
throws ReplicationPackageReadingException {
- if (log.isInfoEnabled()) {
- log.info("reading a stream {}", stream);
+ if (log.isDebugEnabled()) {
+ log.debug("reading a stream");
}
Session session = null;
ReplicationPackage pkg = null;
try {
- log.info("reading package for addition");
-
session = getSession();
if (session != null) {
final JcrPackage jcrPackage = packaging.getPackageManager(session).upload(stream, true,
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/servlet/ReplicationAgentQueueServlet.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/servlet/ReplicationAgentQueueServlet.java?rev=1602882&r1=1602881&r2=1602882&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/servlet/ReplicationAgentQueueServlet.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/servlet/ReplicationAgentQueueServlet.java Mon Jun 16 14:47:49 2014
@@ -18,9 +18,9 @@
*/
package org.apache.sling.replication.servlet;
-import java.io.IOException;
import javax.servlet.Servlet;
import javax.servlet.ServletException;
+import java.io.IOException;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Properties;
@@ -29,7 +29,6 @@ import org.apache.felix.scr.annotations.
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.SlingHttpServletResponse;
import org.apache.sling.api.servlets.SlingAllMethodsServlet;
-
import org.apache.sling.replication.agent.ReplicationAgent;
import org.apache.sling.replication.communication.ReplicationParameter;
import org.apache.sling.replication.queue.ReplicationQueue;
@@ -45,7 +44,7 @@ import org.apache.sling.replication.reso
@Service(value = Servlet.class)
@Properties({
@Property(name = "sling.servlet.resourceTypes", value = ReplicationConstants.AGENT_QUEUE_RESOURCE_TYPE),
- @Property(name = "sling.servlet.methods", value = { "GET", "POST", "DELETE" } ) })
+ @Property(name = "sling.servlet.methods", value = {"GET", "POST", "DELETE"})})
public class ReplicationAgentQueueServlet extends SlingAllMethodsServlet {
@Override
@@ -60,10 +59,10 @@ public class ReplicationAgentQueueServle
if (agent != null) {
try {
ReplicationQueue queue = agent.getQueue(queueName);
-
response.getWriter().write(toJSoN(queue));
} catch (Exception e) {
- response.getWriter().write("{\"status\" : \"error\",\"message\":\"error reading from the queue\"}");
+ response.getWriter().write("{\"status\" : \"error\",\"message\":\"error reading from the queue\",\"reason\":\""
+ + e.getLocalizedMessage() + "\"}");
}
} else {
response.getWriter().write("{\"status\" : \"error\",\"message\":\"queue not found\"}");
@@ -72,12 +71,12 @@ public class ReplicationAgentQueueServle
@Override
- protected void doPost(SlingHttpServletRequest request, SlingHttpServletResponse response)
+ protected void doPost(SlingHttpServletRequest request, SlingHttpServletResponse response)
throws ServletException, IOException {
@SuppressWarnings("unchecked")
String operation = request.getParameter(":operation");
- if("delete".equals(operation)) {
+ if ("delete".equals(operation)) {
doDelete(request, response);
}
}
@@ -88,7 +87,7 @@ public class ReplicationAgentQueueServle
throws ServletException, IOException {
ReplicationQueue queue = request.getResource().adaptTo(ReplicationQueue.class);
- while(!queue.isEmpty()){
+ while (!queue.isEmpty()) {
queue.removeHead();
}
}
@@ -114,7 +113,12 @@ public class ReplicationAgentQueueServle
}
private String toJSoN(ReplicationQueueItemState status) {
- return "\"attempts\":" + status.getAttempts() + ",\"state\":\"" + status.getItemState().name() + "\",\"entered\":\"" + status.getEntered().getTime() + "\"";
+ StringBuilder builder = new StringBuilder("\"attempts\":" + status.getAttempts() + ",\"state\":\"" +
+ status.getItemState().name() + "\"");
+ if (status.getEntered() != null) {
+ builder.append(",\"entered\":\"").append(status.getEntered().getTime()).append("\"");
+ }
+ return builder.toString();
}
private String toJSoN(ReplicationQueueItem item) {