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/09/29 10:41:28 UTC
svn commit: r1628136 [2/2] - in /sling/trunk/contrib/extensions/replication:
core/ core/src/main/java/org/apache/sling/replication/agent/
core/src/main/java/org/apache/sling/replication/agent/impl/
core/src/main/java/org/apache/sling/replication/commun...
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/servlet/ReplicationAgentRootServlet.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/servlet/ReplicationAgentRootServlet.java?rev=1628136&r1=1628135&r2=1628136&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/servlet/ReplicationAgentRootServlet.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/servlet/ReplicationAgentRootServlet.java Mon Sep 29 08:41:26 2014
@@ -44,8 +44,8 @@ import org.slf4j.LoggerFactory;
@Component(metatype = false)
@Service(value = Servlet.class)
@Properties({
- @Property(name = "sling.servlet.resourceTypes", value = ReplicationConstants.AGENT_ROOT_RESOURCE_TYPE),
- @Property(name = "sling.servlet.methods", value = {"POST" })
+ @Property(name = "sling.servlet.resourceTypes", value = ReplicationConstants.AGENT_ROOT_RESOURCE_TYPE),
+ @Property(name = "sling.servlet.methods", value = {"POST"})
})
public class ReplicationAgentRootServlet extends SlingAllMethodsServlet {
@@ -58,7 +58,7 @@ public class ReplicationAgentRootServlet
@Override
protected void doPost(SlingHttpServletRequest request, SlingHttpServletResponse response)
- throws ServletException, IOException {
+ throws ServletException, IOException {
ReplicationAgent[] agents = request.getResource().adaptTo(ReplicationAgent[].class);
@@ -69,7 +69,7 @@ public class ReplicationAgentRootServlet
ReplicationRequest replicationRequest = new ReplicationRequest(System.currentTimeMillis(),
- action, paths);
+ action, paths);
boolean failed = false;
for (ReplicationAgent agent : agents) {
@@ -87,8 +87,7 @@ public class ReplicationAgentRootServlet
if (failed) {
response.setStatus(503);
response.getWriter().append("status : ").append("503");
- }
- else {
+ } else {
response.setStatus(200);
}
}
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/servlet/ReplicationAgentServlet.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/servlet/ReplicationAgentServlet.java?rev=1628136&r1=1628135&r2=1628136&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/servlet/ReplicationAgentServlet.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/servlet/ReplicationAgentServlet.java Mon Sep 29 08:41:26 2014
@@ -50,7 +50,7 @@ import org.slf4j.LoggerFactory;
@Service(value = Servlet.class)
@Properties({
@Property(name = "sling.servlet.resourceTypes", value = ReplicationConstants.AGENT_RESOURCE_TYPE),
- @Property(name = "sling.servlet.methods", value = "POST") })
+ @Property(name = "sling.servlet.methods", value = "POST")})
public class ReplicationAgentServlet extends SlingAllMethodsServlet {
private final Logger log = LoggerFactory.getLogger(getClass());
@@ -91,9 +91,9 @@ public class ReplicationAgentServlet ext
}
}
- String[] toStringArray(Enumeration<String> e){
+ String[] toStringArray(Enumeration<String> e) {
List<String> l = new ArrayList<String>();
- while (e.hasMoreElements()){
+ while (e.hasMoreElements()) {
l.add(e.nextElement());
}
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/servlet/ReplicationTriggerServlet.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/servlet/ReplicationTriggerServlet.java?rev=1628136&r1=1628135&r2=1628136&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/servlet/ReplicationTriggerServlet.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/servlet/ReplicationTriggerServlet.java Mon Sep 29 08:41:26 2014
@@ -33,8 +33,8 @@ import org.apache.sling.api.SlingHttpSer
import org.apache.sling.api.SlingHttpServletResponse;
import org.apache.sling.api.servlets.SlingAllMethodsServlet;
import org.apache.sling.replication.communication.ReplicationRequest;
-import org.apache.sling.replication.trigger.ReplicationTriggerRequestHandler;
import org.apache.sling.replication.trigger.ReplicationTrigger;
+import org.apache.sling.replication.trigger.ReplicationTriggerRequestHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -46,7 +46,7 @@ import org.slf4j.LoggerFactory;
@Service(value = Servlet.class)
@Properties({
@Property(name = "sling.servlet.resourceTypes", value = "sling/replication/service/trigger"),
- @Property(name = "sling.servlet.extensions", value="event"),
+ @Property(name = "sling.servlet.extensions", value = "event"),
@Property(name = "sling.servlet.methods", value = "GET")
})
public class ReplicationTriggerServlet extends SlingAllMethodsServlet {
@@ -79,7 +79,8 @@ public class ReplicationTriggerServlet e
response.setHeader("Cache-Control", "no-cache");
response.setHeader("Connection", "keep-alive");
- // needed to allow the JavaScript EventSource API to make a call from author to this server and listen for the events
+ // needed to allow e.g. the JavaScript EventSource API to make a call from author to this server and listen for the events
+ // TODO : check if this is needed or not (other than for browser communication)
response.setHeader("Access-Control-Allow-Origin", request.getHeader("Origin"));
response.setHeader("Access-Control-Allow-Credentials", "true");
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/authentication/TransportAuthenticationProvider.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/authentication/TransportAuthenticationProvider.java?rev=1628136&r1=1628135&r2=1628136&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/authentication/TransportAuthenticationProvider.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/authentication/TransportAuthenticationProvider.java Mon Sep 29 08:41:26 2014
@@ -34,7 +34,6 @@ public interface TransportAuthentication
boolean canAuthenticate(Class authenticable);
/**
- *
* @param authenticable
* @param context
* @return
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/authentication/impl/UserCredentialsTransportAuthenticationProvider.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/authentication/impl/UserCredentialsTransportAuthenticationProvider.java?rev=1628136&r1=1628135&r2=1628136&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/authentication/impl/UserCredentialsTransportAuthenticationProvider.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/authentication/impl/UserCredentialsTransportAuthenticationProvider.java Mon Sep 29 08:41:26 2014
@@ -76,8 +76,7 @@ public class UserCredentialsTransportAut
log.debug("authenticated executor HTTP client with user and password");
return authenticated;
- }
- else if (authenticable instanceof CredentialsProvider) {
+ } else if (authenticable instanceof CredentialsProvider) {
CredentialsProvider credentialsProvider = (CredentialsProvider) authenticable;
credentialsProvider.setCredentials(new AuthScope(new HttpHost(endpoint.getUri().getHost())),
new UsernamePasswordCredentials(username, password));
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/authentication/impl/UserCredentialsTransportAuthenticationProviderFactory.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/authentication/impl/UserCredentialsTransportAuthenticationProviderFactory.java?rev=1628136&r1=1628135&r2=1628136&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/authentication/impl/UserCredentialsTransportAuthenticationProviderFactory.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/authentication/impl/UserCredentialsTransportAuthenticationProviderFactory.java Mon Sep 29 08:41:26 2014
@@ -47,7 +47,6 @@ public class UserCredentialsTransportAut
private final Logger log = LoggerFactory.getLogger(getClass());
-
private UserCredentialsTransportAuthenticationProvider transportAuthenticationProvider;
@@ -57,7 +56,6 @@ public class UserCredentialsTransportAut
}
-
public Object authenticate(Object authenticable, TransportAuthenticationContext context)
throws TransportAuthenticationException {
return transportAuthenticationProvider.authenticate(authenticable, context);
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/impl/SimpleHttpReplicationTransportHandler.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/impl/SimpleHttpReplicationTransportHandler.java?rev=1628136&r1=1628135&r2=1628136&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/impl/SimpleHttpReplicationTransportHandler.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/impl/SimpleHttpReplicationTransportHandler.java Mon Sep 29 08:41:26 2014
@@ -84,22 +84,21 @@ public class SimpleHttpReplicationTransp
TransportAuthenticationContext context = new TransportAuthenticationContext();
context.addAttribute("endpoint", replicationEndpoint);
- executor = transportAuthenticationProvider.authenticate(executor, context);
+ executor = transportAuthenticationProvider.authenticate(executor, context);
Request req = Request.Post(replicationEndpoint.getUri()).useExpectContinue();
InputStream inputStream = null;
Response response = null;
- try{
+ try {
inputStream = replicationPackage.createInputStream();
- if(inputStream != null) {
+ if (inputStream != null) {
req = req.bodyStream(inputStream, ContentType.APPLICATION_OCTET_STREAM);
}
response = executor.execute(req);
- }
- finally {
+ } finally {
IOUtils.closeQuietly(inputStream);
}
@@ -110,12 +109,10 @@ public class SimpleHttpReplicationTransp
Arrays.toString(replicationPackage.getPaths()),
content
});
- }
- else {
+ } else {
throw new IOException("response is empty");
}
- }
- catch (Exception ex) {
+ } catch (Exception ex) {
throw new ReplicationTransportException(ex);
}
@@ -153,8 +150,7 @@ public class SimpleHttpReplicationTransp
if (polls > 0) {
log.info("polled {} packages from {}", polls, replicationEndpoint.getUri());
- }
- else {
+ } else {
log.debug("polled {} packages from {}", polls, replicationEndpoint.getUri());
}
@@ -164,8 +160,7 @@ public class SimpleHttpReplicationTransp
return result;
- }
- catch (Exception ex) {
+ } catch (Exception ex) {
throw new ReplicationTransportException(ex);
}
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/ReplicationTrigger.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/ReplicationTrigger.java?rev=1628136&r1=1628135&r2=1628136&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/ReplicationTrigger.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/ReplicationTrigger.java Mon Sep 29 08:41:26 2014
@@ -25,13 +25,15 @@ public interface ReplicationTrigger {
/**
* register a replication trigger
- * @param handlerId id of the given handler
+ *
+ * @param handlerId id of the given handler
* @param requestHandler handler
*/
void register(String handlerId, ReplicationTriggerRequestHandler requestHandler);
/**
* unregister the handler with the given id, if existing
+ *
* @param handlerId id of the handler to unregister
*/
void unregister(String handlerId);
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/impl/ChainReplicateReplicationTrigger.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/impl/ChainReplicateReplicationTrigger.java?rev=1628136&r1=1628135&r2=1628136&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/impl/ChainReplicateReplicationTrigger.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/impl/ChainReplicateReplicationTrigger.java Mon Sep 29 08:41:26 2014
@@ -28,8 +28,8 @@ import org.apache.sling.replication.comm
import org.apache.sling.replication.communication.ReplicationRequest;
import org.apache.sling.replication.event.ReplicationEvent;
import org.apache.sling.replication.event.ReplicationEventType;
-import org.apache.sling.replication.trigger.ReplicationTriggerRequestHandler;
import org.apache.sling.replication.trigger.ReplicationTrigger;
+import org.apache.sling.replication.trigger.ReplicationTriggerRequestHandler;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceRegistration;
import org.osgi.service.event.Event;
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/impl/RemoteEventReplicationTrigger.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/impl/RemoteEventReplicationTrigger.java?rev=1628136&r1=1628135&r2=1628136&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/impl/RemoteEventReplicationTrigger.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/impl/RemoteEventReplicationTrigger.java Mon Sep 29 08:41:26 2014
@@ -43,10 +43,10 @@ import org.apache.sling.commons.schedule
import org.apache.sling.replication.communication.ReplicationActionType;
import org.apache.sling.replication.communication.ReplicationEndpoint;
import org.apache.sling.replication.communication.ReplicationRequest;
-import org.apache.sling.replication.trigger.ReplicationTriggerRequestHandler;
-import org.apache.sling.replication.trigger.ReplicationTrigger;
import org.apache.sling.replication.transport.authentication.TransportAuthenticationContext;
import org.apache.sling.replication.transport.authentication.TransportAuthenticationProvider;
+import org.apache.sling.replication.trigger.ReplicationTrigger;
+import org.apache.sling.replication.trigger.ReplicationTriggerRequestHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -167,7 +167,7 @@ public class RemoteEventReplicationTrigg
TransportAuthenticationContext context = new TransportAuthenticationContext();
context.addAttribute("endpoint", endpoint);
- credentialsProvider = authenticationProvider.authenticate(credentialsProvider, context);
+ credentialsProvider = authenticationProvider.authenticate(credentialsProvider, context);
final CloseableHttpAsyncClient httpClient = HttpAsyncClients.custom()
.setDefaultCredentialsProvider(credentialsProvider)
@@ -198,7 +198,7 @@ public class RemoteEventReplicationTrigg
futureResponse.get();
} catch (Exception e) {
- log.warn("cannot communicate with {} -Â {}", endpoint, e);
+ log.warn("cannot communicate with {} -Â {}", endpoint, e);
}
httpClient.close();
log.debug("request finished");
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/impl/ResourceEventReplicationTrigger.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/impl/ResourceEventReplicationTrigger.java?rev=1628136&r1=1628135&r2=1628136&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/impl/ResourceEventReplicationTrigger.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/impl/ResourceEventReplicationTrigger.java Mon Sep 29 08:41:26 2014
@@ -27,8 +27,8 @@ import org.apache.sling.api.SlingConstan
import org.apache.sling.commons.osgi.PropertiesUtil;
import org.apache.sling.replication.communication.ReplicationActionType;
import org.apache.sling.replication.communication.ReplicationRequest;
-import org.apache.sling.replication.trigger.ReplicationTriggerRequestHandler;
import org.apache.sling.replication.trigger.ReplicationTrigger;
+import org.apache.sling.replication.trigger.ReplicationTriggerRequestHandler;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceRegistration;
import org.osgi.service.event.Event;
@@ -53,7 +53,7 @@ public class ResourceEventReplicationTri
public ResourceEventReplicationTrigger(Map<String, Object> config, BundleContext bundleContext) {
- this(PropertiesUtil.toString(config.get(PATH), null), bundleContext);
+ this(PropertiesUtil.toString(config.get(PATH), null), bundleContext);
}
public ResourceEventReplicationTrigger(String path, BundleContext bundleContext) {
@@ -92,7 +92,6 @@ public class ResourceEventReplicationTri
registrations.put(handlerId, triggerPathEventRegistration);
} else {
log.error("cannot register trigger since bundle context is null");
-
}
}
@@ -103,7 +102,6 @@ public class ResourceEventReplicationTri
}
}
-
private class TriggerAgentEventListener implements EventHandler {
private final ReplicationTriggerRequestHandler requestHandler;
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/impl/ScheduledReplicationTrigger.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/impl/ScheduledReplicationTrigger.java?rev=1628136&r1=1628135&r2=1628136&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/impl/ScheduledReplicationTrigger.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/impl/ScheduledReplicationTrigger.java Mon Sep 29 08:41:26 2014
@@ -25,8 +25,8 @@ import org.apache.sling.commons.schedule
import org.apache.sling.commons.scheduler.Scheduler;
import org.apache.sling.replication.communication.ReplicationActionType;
import org.apache.sling.replication.communication.ReplicationRequest;
-import org.apache.sling.replication.trigger.ReplicationTriggerRequestHandler;
import org.apache.sling.replication.trigger.ReplicationTrigger;
+import org.apache.sling.replication.trigger.ReplicationTriggerRequestHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -57,7 +57,7 @@ public class ScheduledReplicationTrigger
scheduler);
}
- public ScheduledReplicationTrigger(ReplicationActionType replicationAction, String path, int secondsInterval, Scheduler scheduler) {
+ public ScheduledReplicationTrigger(ReplicationActionType replicationAction, String path, int secondsInterval, Scheduler scheduler) {
this.replicationAction = replicationAction;
this.path = path;
@@ -84,7 +84,7 @@ public class ScheduledReplicationTrigger
}
public void run() {
- log.debug("agent {}: scheduling {} replication of {}", new Object[]{ requestHandler, replicationAction, path});
+ log.debug("agent {}: scheduling {} replication of {}", new Object[]{requestHandler, replicationAction, path});
requestHandler.handle(new ReplicationRequest(System.currentTimeMillis(), replicationAction, path));
}
Modified: sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.CompactSimpleReplicationAgentFactory-publish-reverse.json
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.CompactSimpleReplicationAgentFactory-publish-reverse.json?rev=1628136&r1=1628135&r2=1628136&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.CompactSimpleReplicationAgentFactory-publish-reverse.json (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.CompactSimpleReplicationAgentFactory-publish-reverse.json Mon Sep 29 08:41:26 2014
@@ -1,9 +1,9 @@
{
- "jcr:primaryType" : "sling:OsgiConfig",
- "name" : "publish-reverse",
- "type" : "simple",
+ "jcr:primaryType": "sling:OsgiConfig",
+ "name": "publish-reverse",
+ "type": "simple",
- "packageExporter" : [
+ "packageExporter": [
"type=remote",
"endpoints[0]=http://localhost:4503/libs/sling/replication/services/exporters/reverse",
@@ -20,23 +20,23 @@
"packageBuilder/servicename=replicationService"
],
- "queueProvider" : [
+ "queueProvider": [
"type=service",
"name=sjh"
],
- "queueDistributionStrategy" : [
+ "queueDistributionStrategy": [
"type=service",
"name=error"
],
- "trigger0" : [
+ "trigger0": [
"type=scheduledEvent",
"action=poll",
"seconds=30"
],
- "trigger1" : [
+ "trigger1": [
"type=remoteEvent",
"endpoint=http://localhost:4503/libs/sling/replication/services/triggers/content-changed.event",
Modified: sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.CompactSimpleReplicationAgentFactory-publish.json
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.CompactSimpleReplicationAgentFactory-publish.json?rev=1628136&r1=1628135&r2=1628136&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.CompactSimpleReplicationAgentFactory-publish.json (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.CompactSimpleReplicationAgentFactory-publish.json Mon Sep 29 08:41:26 2014
@@ -1,9 +1,9 @@
{
- "jcr:primaryType" : "sling:OsgiConfig",
- "name" : "publish",
- "type" : "simple",
+ "jcr:primaryType": "sling:OsgiConfig",
+ "name": "publish",
+ "type": "simple",
- "packageExporter" : [
+ "packageExporter": [
"type=local",
"packageBuilder/type=vlt",
"packageBuilder/servicename=replicationService"
@@ -20,12 +20,12 @@
"packageBuilder/servicename=replicationService"
],
- "queueProvider" : [
+ "queueProvider": [
"type=service",
"name=sjh"
],
- "queueDistributionStrategy" : [
+ "queueDistributionStrategy": [
"type=service",
"name=error"
]
Modified: sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.DefaultReplicationComponentFactory-trigger-remote-event.json
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.DefaultReplicationComponentFactory-trigger-remote-event.json?rev=1628136&r1=1628135&r2=1628136&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.DefaultReplicationComponentFactory-trigger-remote-event.json (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.DefaultReplicationComponentFactory-trigger-remote-event.json Mon Sep 29 08:41:26 2014
@@ -1,10 +1,10 @@
{
- "jcr:primaryType" : "sling:OsgiConfig",
- "name" : "remote-event",
+ "jcr:primaryType": "sling:OsgiConfig",
+ "name": "remote-event",
- "kind" : "trigger",
+ "kind": "trigger",
- "properties" : [
+ "properties": [
"type=remoteEvent",
"endpoint=http://localhost:4503/libs/sling/replication/services/triggers/content-changed.event",
Modified: sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.transport.authentication.impl.UserCredentialsTransportAuthenticationProviderFactory-publishAdmin.json
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.transport.authentication.impl.UserCredentialsTransportAuthenticationProviderFactory-publishAdmin.json?rev=1628136&r1=1628135&r2=1628136&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.transport.authentication.impl.UserCredentialsTransportAuthenticationProviderFactory-publishAdmin.json (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.transport.authentication.impl.UserCredentialsTransportAuthenticationProviderFactory-publishAdmin.json Mon Sep 29 08:41:26 2014
@@ -1,6 +1,6 @@
{
- "jcr:primaryType" : "sling:OsgiConfig",
+ "jcr:primaryType": "sling:OsgiConfig",
"name": "publishAdmin",
- "username" : "admin",
- "password" : "admin"
+ "username": "admin",
+ "password": "admin"
}
\ No newline at end of file
Modified: sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.CompactSimpleReplicationAgentFactory-cache-flush.json
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.CompactSimpleReplicationAgentFactory-cache-flush.json?rev=1628136&r1=1628135&r2=1628136&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.CompactSimpleReplicationAgentFactory-cache-flush.json (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.CompactSimpleReplicationAgentFactory-cache-flush.json Mon Sep 29 08:41:26 2014
@@ -1,9 +1,9 @@
{
- "jcr:primaryType" : "sling:OsgiConfig",
- "name" : "cache-flush",
- "type" : "simple",
+ "jcr:primaryType": "sling:OsgiConfig",
+ "name": "cache-flush",
+ "type": "simple",
- "packageExporter" : [
+ "packageExporter": [
"type=service",
"name=void"
],
@@ -13,12 +13,12 @@
"name=cache-flush"
],
- "queueProvider" : [
+ "queueProvider": [
"type=service",
"name=sjh"
],
- "queueDistributionStrategy" : [
+ "queueDistributionStrategy": [
"type=service",
"name=error"
]
Modified: sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.CompactSimpleReplicationAgentFactory-reverse.json
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.CompactSimpleReplicationAgentFactory-reverse.json?rev=1628136&r1=1628135&r2=1628136&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.CompactSimpleReplicationAgentFactory-reverse.json (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.CompactSimpleReplicationAgentFactory-reverse.json Mon Sep 29 08:41:26 2014
@@ -1,11 +1,11 @@
{
- "jcr:primaryType" : "sling:OsgiConfig",
- "name" : "reverse",
- "type" : "simple",
+ "jcr:primaryType": "sling:OsgiConfig",
+ "name": "reverse",
+ "type": "simple",
- "isPassive" : true,
+ "isPassive": true,
- "packageExporter" : [
+ "packageExporter": [
"type=local",
"packageBuilder/type=vlt",
"packageBuilder/servicename=replicationService"
@@ -17,17 +17,17 @@
"packageBuilder/servicename=replicationService"
],
- "queueProvider" : [
+ "queueProvider": [
"type=service",
"name=sjh"
],
- "queueDistributionStrategy" : [
+ "queueDistributionStrategy": [
"type=service",
"name=error"
],
- "trigger0" : [
+ "trigger0": [
"type=resourceEvent",
"path=/content/usergenerated"
]
Modified: sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.DefaultReplicationComponentFactory-trigger-content-changed.json
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.DefaultReplicationComponentFactory-trigger-content-changed.json?rev=1628136&r1=1628135&r2=1628136&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.DefaultReplicationComponentFactory-trigger-content-changed.json (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.DefaultReplicationComponentFactory-trigger-content-changed.json Mon Sep 29 08:41:26 2014
@@ -1,10 +1,10 @@
{
- "jcr:primaryType" : "sling:OsgiConfig",
- "name" : "content-changed",
+ "jcr:primaryType": "sling:OsgiConfig",
+ "name": "content-changed",
- "kind" : "trigger",
+ "kind": "trigger",
- "properties" : [
+ "properties": [
"type=resourceEvent",
"path=/content/usergenerated"
]
Modified: sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.exporter.AgentReplicationPackageExporterFactory-reverse.json
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.exporter.AgentReplicationPackageExporterFactory-reverse.json?rev=1628136&r1=1628135&r2=1628136&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.exporter.AgentReplicationPackageExporterFactory-reverse.json (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.exporter.AgentReplicationPackageExporterFactory-reverse.json Mon Sep 29 08:41:26 2014
@@ -1,7 +1,7 @@
{
- "jcr:primaryType" : "sling:OsgiConfig",
+ "jcr:primaryType": "sling:OsgiConfig",
"name": "reverse",
- "ReplicationPackageBuilder.target" : "(name=vlt)",
- "ReplicationAgent.target" : "(name=reverse)"
+ "ReplicationPackageBuilder.target": "(name=vlt)",
+ "ReplicationAgent.target": "(name=reverse)"
}
\ No newline at end of file
Modified: sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.exporter.LocalReplicationPackageExporterFactory-default.json
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.exporter.LocalReplicationPackageExporterFactory-default.json?rev=1628136&r1=1628135&r2=1628136&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.exporter.LocalReplicationPackageExporterFactory-default.json (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.exporter.LocalReplicationPackageExporterFactory-default.json Mon Sep 29 08:41:26 2014
@@ -1,6 +1,6 @@
{
- "jcr:primaryType" : "sling:OsgiConfig",
+ "jcr:primaryType": "sling:OsgiConfig",
"name": "default",
- "ReplicationPackageBuilder.target" : "(name=vlt)"
+ "ReplicationPackageBuilder.target": "(name=vlt)"
}
\ No newline at end of file
Modified: sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.importer.AdvancedRemoteReplicationPackageImporter-cache-flush.json
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.importer.AdvancedRemoteReplicationPackageImporter-cache-flush.json?rev=1628136&r1=1628135&r2=1628136&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.importer.AdvancedRemoteReplicationPackageImporter-cache-flush.json (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.importer.AdvancedRemoteReplicationPackageImporter-cache-flush.json Mon Sep 29 08:41:26 2014
@@ -1,13 +1,13 @@
{
- "jcr:primaryType" : "sling:OsgiConfig",
- "name" : "cache-flush",
- "useCustomHeaders" : true,
- "customHeaders" : [
- "Path: {path}",
- "add -> Action : REFRESH",
- "delete -> Change : REMOVE" ],
+ "jcr:primaryType": "sling:OsgiConfig",
+ "name": "cache-flush",
+ "useCustomHeaders": true,
+ "customHeaders": [
+ "Path: {path}",
+ "add -> Action : REFRESH",
+ "delete -> Change : REMOVE" ],
"useCustomBody": true,
- "customBody" : "",
- "TransportAuthenticationProviderFactory.target" : "(name=nop)",
- "endpoints" : [ "http://localhost:8000/invalidatecache" ]
+ "customBody": "",
+ "TransportAuthenticationProviderFactory.target": "(name=nop)",
+ "endpoints": [ "http://localhost:8000/invalidatecache" ]
}
\ No newline at end of file
Modified: sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.importer.LocalReplicationPackageImporterFactory-default.json
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.importer.LocalReplicationPackageImporterFactory-default.json?rev=1628136&r1=1628135&r2=1628136&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.importer.LocalReplicationPackageImporterFactory-default.json (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.importer.LocalReplicationPackageImporterFactory-default.json Mon Sep 29 08:41:26 2014
@@ -1,5 +1,5 @@
{
- "jcr:primaryType" : "sling:OsgiConfig",
+ "jcr:primaryType": "sling:OsgiConfig",
"name": "default",
- "ReplicationPackageBuilder.target" : "(name=vlt)"
+ "ReplicationPackageBuilder.target": "(name=vlt)"
}
\ No newline at end of file
Modified: sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install/org.apache.sling.replication.serialization.impl.vlt.FileVaultReplicationPackageBuilderFactory-vlt.json
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install/org.apache.sling.replication.serialization.impl.vlt.FileVaultReplicationPackageBuilderFactory-vlt.json?rev=1628136&r1=1628135&r2=1628136&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install/org.apache.sling.replication.serialization.impl.vlt.FileVaultReplicationPackageBuilderFactory-vlt.json (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install/org.apache.sling.replication.serialization.impl.vlt.FileVaultReplicationPackageBuilderFactory-vlt.json Mon Sep 29 08:41:26 2014
@@ -1,5 +1,5 @@
{
- "jcr:primaryType" : "sling:OsgiConfig",
- "name" : "vlt",
- "servicename" : "replicationService"
+ "jcr:primaryType": "sling:OsgiConfig",
+ "name": "vlt",
+ "servicename": "replicationService"
}
\ No newline at end of file
Modified: sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-replication.json
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-replication.json?rev=1628136&r1=1628135&r2=1628136&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-replication.json (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-replication.json Mon Sep 29 08:41:26 2014
@@ -1,5 +1,5 @@
{
- "jcr:primaryType" : "sling:OsgiConfig",
+ "jcr:primaryType": "sling:OsgiConfig",
"user.default": "",
"user.mapping": "org.apache.sling.replication:replicationService=admin"
}
Modified: sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/services/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-agents.json
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/services/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-agents.json?rev=1628136&r1=1628135&r2=1628136&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/services/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-agents.json (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/services/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-agents.json Mon Sep 29 08:41:26 2014
@@ -1,9 +1,9 @@
{
- "jcr:primaryType" : "sling:OsgiConfig",
- "name" : "replicationAgents",
- "provider.roots" : [ "/libs/sling/replication/services/agents" ],
- "serviceType" : "org.apache.sling.replication.agent.ReplicationAgent",
- "resourceProperties" : [
+ "jcr:primaryType": "sling:OsgiConfig",
+ "name": "replicationAgents",
+ "provider.roots": [ "/libs/sling/replication/services/agents" ],
+ "serviceType": "org.apache.sling.replication.agent.ReplicationAgent",
+ "resourceProperties": [
"sling:resourceType=sling/replication/service/agent",
"sling:resourceSuperType=sling/replication/service",
"name={name}",
Modified: sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/services/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-exporters.json
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/services/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-exporters.json?rev=1628136&r1=1628135&r2=1628136&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/services/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-exporters.json (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/services/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-exporters.json Mon Sep 29 08:41:26 2014
@@ -1,9 +1,9 @@
{
- "jcr:primaryType" : "sling:OsgiConfig",
- "name" : "replicationExporters",
- "provider.roots" : [ "/libs/sling/replication/services/exporters" ],
- "serviceType" : "org.apache.sling.replication.packaging.ReplicationPackageExporter",
- "resourceProperties" : [
+ "jcr:primaryType": "sling:OsgiConfig",
+ "name": "replicationExporters",
+ "provider.roots": [ "/libs/sling/replication/services/exporters" ],
+ "serviceType": "org.apache.sling.replication.packaging.ReplicationPackageExporter",
+ "resourceProperties": [
"sling:resourceType=sling/replication/service/exporter",
"sling:resourceSuperType=sling/replication/service",
Modified: sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/services/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-importers.json
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/services/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-importers.json?rev=1628136&r1=1628135&r2=1628136&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/services/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-importers.json (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/services/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-importers.json Mon Sep 29 08:41:26 2014
@@ -1,9 +1,9 @@
{
- "jcr:primaryType" : "sling:OsgiConfig",
- "name" : "replicationImporters",
- "provider.roots" : [ "/libs/sling/replication/services/importers" ],
- "serviceType" : "org.apache.sling.replication.packaging.ReplicationPackageImporter",
- "resourceProperties" : [
+ "jcr:primaryType": "sling:OsgiConfig",
+ "name": "replicationImporters",
+ "provider.roots": [ "/libs/sling/replication/services/importers" ],
+ "serviceType": "org.apache.sling.replication.packaging.ReplicationPackageImporter",
+ "resourceProperties": [
"sling:resourceType=sling/replication/service/importer",
"sling:resourceSuperType=sling/replication/service",
Modified: sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/services/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-triggers.json
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/services/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-triggers.json?rev=1628136&r1=1628135&r2=1628136&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/services/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-triggers.json (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/services/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-triggers.json Mon Sep 29 08:41:26 2014
@@ -1,9 +1,9 @@
{
- "jcr:primaryType" : "sling:OsgiConfig",
- "name" : "replicationTriggers",
- "provider.roots" : [ "/libs/sling/replication/services/triggers" ],
- "serviceType" : "org.apache.sling.replication.trigger.ReplicationTrigger",
- "resourceProperties" : [
+ "jcr:primaryType": "sling:OsgiConfig",
+ "name": "replicationTriggers",
+ "provider.roots": [ "/libs/sling/replication/services/triggers" ],
+ "serviceType": "org.apache.sling.replication.trigger.ReplicationTrigger",
+ "resourceProperties": [
"sling:resourceType=sling/replication/service/trigger",
"sling:resourceSuperType=sling/replication/service",
Modified: sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/settings/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-simpleAgents.json
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/settings/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-simpleAgents.json?rev=1628136&r1=1628135&r2=1628136&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/settings/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-simpleAgents.json (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/settings/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-simpleAgents.json Mon Sep 29 08:41:26 2014
@@ -1,13 +1,13 @@
{
- "jcr:primaryType" : "sling:OsgiConfig",
- "name" : "simpleAgents",
- "provider.roots" : [ "/libs/sling/replication/settings/agents" ],
- "serviceType" : "org.apache.sling.replication.agent.impl.CompactSimpleReplicationAgentFactory",
- "providerType" : "osgiConfig",
- "groupPrefix" : "agents",
+ "jcr:primaryType": "sling:OsgiConfig",
+ "name": "simpleAgents",
+ "provider.roots": [ "/libs/sling/replication/settings/agents" ],
+ "serviceType": "org.apache.sling.replication.agent.impl.CompactSimpleReplicationAgentFactory",
+ "providerType": "osgiConfig",
+ "groupPrefix": "agents",
- "resourceProperties" : [
+ "resourceProperties": [
"sling:resourceType=sling/replication/setting/agent",
"sling:resourceSuperType=sling/replication/setting",
"name={name}",
Modified: sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/agent/impl/SimpleReplicationAgentTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/agent/impl/SimpleReplicationAgentTest.java?rev=1628136&r1=1628135&r2=1628136&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/agent/impl/SimpleReplicationAgentTest.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/agent/impl/SimpleReplicationAgentTest.java Mon Sep 29 08:41:26 2014
@@ -65,7 +65,7 @@ public class SimpleReplicationAgentTest
ReplicationPackage replicationPackage = mock(ReplicationPackage.class);
when(replicationPackage.getPaths()).thenReturn(new String[]{"/"});
- when(packageExporter.exportPackage(request)).thenReturn(Arrays.asList(new ReplicationPackage[] { replicationPackage } ));
+ when(packageExporter.exportPackage(request)).thenReturn(Arrays.asList(new ReplicationPackage[]{replicationPackage}));
when(queueProvider.getDefaultQueue(agent.getName())).thenReturn(
new SimpleReplicationQueue(agent.getName(), "name"));
ReplicationResponse response = agent.execute(request);
@@ -77,7 +77,8 @@ public class SimpleReplicationAgentTest
public void testSyncReplicationWithWorkingDistributionStrategy() throws Exception {
String name = "sample-agent";
ReplicationPackageImporter packageImporter = mock(ReplicationPackageImporter.class);
- ReplicationPackageExporter packageExporter = mock(ReplicationPackageExporter.class); ReplicationQueueProvider queueProvider = mock(ReplicationQueueProvider.class);
+ ReplicationPackageExporter packageExporter = mock(ReplicationPackageExporter.class);
+ ReplicationQueueProvider queueProvider = mock(ReplicationQueueProvider.class);
ReplicationQueueDistributionStrategy distributionHandler = mock(ReplicationQueueDistributionStrategy.class);
ReplicationEventFactory replicationEventFactory = mock(ReplicationEventFactory.class);
SimpleReplicationAgent agent = new SimpleReplicationAgent(name, true,
@@ -89,7 +90,7 @@ public class SimpleReplicationAgentTest
ReplicationQueueItemState state = new ReplicationQueueItemState();
state.setItemState(ReplicationQueueItemState.ItemState.SUCCEEDED);
when(distributionHandler.add(any(String.class), any(ReplicationQueueItem.class), eq(queueProvider))).thenReturn(state);
- when(packageExporter.exportPackage(any(ReplicationRequest.class))).thenReturn(Arrays.asList(new ReplicationPackage[] { replicationPackage } ));
+ when(packageExporter.exportPackage(any(ReplicationRequest.class))).thenReturn(Arrays.asList(new ReplicationPackage[]{replicationPackage}));
when(queueProvider.getDefaultQueue(agent.getName())).thenReturn(
new SimpleReplicationQueue(agent.getName(), "name"));
ReplicationResponse response = agent.execute(request);
@@ -101,7 +102,8 @@ public class SimpleReplicationAgentTest
public void testAsyncReplication() throws Exception {
String name = "sample-agent";
ReplicationPackageImporter packageImporter = mock(ReplicationPackageImporter.class);
- ReplicationPackageExporter packageExporter = mock(ReplicationPackageExporter.class); ReplicationQueueProvider queueProvider = mock(ReplicationQueueProvider.class);
+ ReplicationPackageExporter packageExporter = mock(ReplicationPackageExporter.class);
+ ReplicationQueueProvider queueProvider = mock(ReplicationQueueProvider.class);
ReplicationQueueDistributionStrategy distributionHandler = mock(ReplicationQueueDistributionStrategy.class);
ReplicationEventFactory replicationEventFactory = mock(ReplicationEventFactory.class);
SimpleReplicationAgent agent = new SimpleReplicationAgent(name, true,
@@ -110,7 +112,7 @@ public class SimpleReplicationAgentTest
ReplicationActionType.ADD, "/");
ReplicationPackage replicationPackage = mock(ReplicationPackage.class);
when(replicationPackage.getPaths()).thenReturn(new String[]{"/"});
- when(packageExporter.exportPackage(request)).thenReturn(Arrays.asList(new ReplicationPackage[] { replicationPackage } ));
+ when(packageExporter.exportPackage(request)).thenReturn(Arrays.asList(new ReplicationPackage[]{replicationPackage}));
when(queueProvider.getDefaultQueue(agent.getName())).thenReturn(
new SimpleReplicationQueue(agent.getName(), "name"));
agent.execute(request);
Modified: sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/queue/impl/jobhandling/JobHandlingUtilsTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/queue/impl/jobhandling/JobHandlingUtilsTest.java?rev=1628136&r1=1628135&r2=1628136&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/queue/impl/jobhandling/JobHandlingUtilsTest.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/queue/impl/jobhandling/JobHandlingUtilsTest.java Mon Sep 29 08:41:26 2014
@@ -39,7 +39,7 @@ public class JobHandlingUtilsTest {
when(replicationQueueItem.getId()).thenReturn("an-id");
when(replicationQueueItem.getPaths()).thenReturn(new String[]{"/content", "/apps"});
when(replicationQueueItem.getType()).thenReturn("vlt");
- Map<String,Object> fullPropertiesFromPackage = JobHandlingUtils.createFullProperties(replicationQueueItem);
+ Map<String, Object> fullPropertiesFromPackage = JobHandlingUtils.createFullProperties(replicationQueueItem);
assertNotNull(fullPropertiesFromPackage);
assertEquals(4, fullPropertiesFromPackage.size());
assertNotNull(fullPropertiesFromPackage.get("replication.package.paths"));
@@ -52,7 +52,7 @@ public class JobHandlingUtilsTest {
public void testIdPropertiesFromPackageCreation() throws Exception {
ReplicationQueueItem replicationPackage = mock(ReplicationQueueItem.class);
when(replicationPackage.getId()).thenReturn("an-id");
- Map<String,Object> idPropertiesFromPackage = JobHandlingUtils.createIdProperties(replicationPackage.getId());
+ Map<String, Object> idPropertiesFromPackage = JobHandlingUtils.createIdProperties(replicationPackage.getId());
assertNotNull(idPropertiesFromPackage);
assertEquals(1, idPropertiesFromPackage.size());
assertNotNull(idPropertiesFromPackage.get("replication.package.id"));
Modified: sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/transport/authentication/impl/UserCredentialsTransportAuthenticationProviderTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/transport/authentication/impl/UserCredentialsTransportAuthenticationProviderTest.java?rev=1628136&r1=1628135&r2=1628136&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/transport/authentication/impl/UserCredentialsTransportAuthenticationProviderTest.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/transport/authentication/impl/UserCredentialsTransportAuthenticationProviderTest.java Mon Sep 29 08:41:26 2014
@@ -33,7 +33,7 @@ public class UserCredentialsTransportAut
@Test
public void testAuthenticationWithNullAuthenticableAndContext() throws Exception {
UserCredentialsTransportAuthenticationProvider authenticationHandler = new UserCredentialsTransportAuthenticationProvider(
- "foo", "bar");
+ "foo", "bar");
Executor authenticable = null;
TransportAuthenticationContext context = null;
try {
@@ -47,7 +47,7 @@ public class UserCredentialsTransportAut
@Test
public void testAuthenticationWithAuthenticableAndNullContext() throws Exception {
UserCredentialsTransportAuthenticationProvider authenticationHandler = new UserCredentialsTransportAuthenticationProvider(
- "foo", "bar");
+ "foo", "bar");
Executor authenticable = Executor.newInstance();
TransportAuthenticationContext context = null;
try {
@@ -61,7 +61,7 @@ public class UserCredentialsTransportAut
@Test
public void testAuthenticationWithAuthenticableAndEmptyContext() throws Exception {
UserCredentialsTransportAuthenticationProvider authenticationHandler = new UserCredentialsTransportAuthenticationProvider(
- "foo", "bar");
+ "foo", "bar");
Executor authenticable = Executor.newInstance();
TransportAuthenticationContext context = new TransportAuthenticationContext();
try {
@@ -75,7 +75,7 @@ public class UserCredentialsTransportAut
@Test
public void testAuthenticationWithAuthenticableAndCorrectContext() throws Exception {
UserCredentialsTransportAuthenticationProvider authenticationHandler = new UserCredentialsTransportAuthenticationProvider(
- "foo", "bar");
+ "foo", "bar");
Executor authenticable = Executor.newInstance();
TransportAuthenticationContext context = new TransportAuthenticationContext();
context.addAttribute("endpoint", new ReplicationEndpoint("http://www.apache.org"));
Modified: sling/trunk/contrib/extensions/replication/it/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/it/pom.xml?rev=1628136&r1=1628135&r2=1628136&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/it/pom.xml (original)
+++ sling/trunk/contrib/extensions/replication/it/pom.xml Mon Sep 29 08:41:26 2014
@@ -77,8 +77,11 @@
<!-- Options for the jar to execute. $JAREXEC_SERVER_PORT$ is replaced by the
selected port number -->
- <author.jar.executor.jar.options>-p $JAREXEC_SERVER_PORT$ -Dsling.run.modes=author -Dsling.home=sling/author</author.jar.executor.jar.options>
- <publish.jar.executor.jar.options>-p $JAREXEC_SERVER_PORT$ -Dsling.run.modes=publish -Dsling.home=sling/publish</publish.jar.executor.jar.options>
+ <author.jar.executor.jar.options>-p $JAREXEC_SERVER_PORT$ -Dsling.run.modes=author -Dsling.home=sling/author
+ </author.jar.executor.jar.options>
+ <publish.jar.executor.jar.options>-p $JAREXEC_SERVER_PORT$ -Dsling.run.modes=publish
+ -Dsling.home=sling/publish
+ </publish.jar.executor.jar.options>
<!-- Change this to run selected tests only -->
@@ -87,7 +90,8 @@
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/replication/it</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/replication/it</developerConnection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/replication/it
+ </developerConnection>
<url>http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/it</url>
</scm>
@@ -237,8 +241,10 @@
<jar.executor.jar.name.regexp>org.apache.sling.launchpad.*jar$</jar.executor.jar.name.regexp>
<jar.executor.work.folder>${jar.executor.work.folder}</jar.executor.work.folder>
- <author.jar.executor.jar.options>${author.jar.executor.jar.options}</author.jar.executor.jar.options>
- <publish.jar.executor.jar.options>${publish.jar.executor.jar.options}</publish.jar.executor.jar.options>
+ <author.jar.executor.jar.options>${author.jar.executor.jar.options}
+ </author.jar.executor.jar.options>
+ <publish.jar.executor.jar.options>${publish.jar.executor.jar.options}
+ </publish.jar.executor.jar.options>
<additional.bundles.path>
Modified: sling/trunk/contrib/extensions/replication/it/src/main/resources/SLING-CONTENT/libs/test/install.author/org.apache.sling.replication.agent.impl.DefaultReplicationComponentFactory-trigger-test-content-event.json
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/it/src/main/resources/SLING-CONTENT/libs/test/install.author/org.apache.sling.replication.agent.impl.DefaultReplicationComponentFactory-trigger-test-content-event.json?rev=1628136&r1=1628135&r2=1628136&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/it/src/main/resources/SLING-CONTENT/libs/test/install.author/org.apache.sling.replication.agent.impl.DefaultReplicationComponentFactory-trigger-test-content-event.json (original)
+++ sling/trunk/contrib/extensions/replication/it/src/main/resources/SLING-CONTENT/libs/test/install.author/org.apache.sling.replication.agent.impl.DefaultReplicationComponentFactory-trigger-test-content-event.json Mon Sep 29 08:41:26 2014
@@ -1,10 +1,10 @@
{
- "jcr:primaryType" : "sling:OsgiConfig",
- "name" : "test-content-event",
+ "jcr:primaryType": "sling:OsgiConfig",
+ "name": "test-content-event",
- "kind" : "trigger",
+ "kind": "trigger",
- "properties" : [
+ "properties": [
"type=resourceEvent",
"path=/content"
Modified: sling/trunk/contrib/extensions/replication/it/src/main/resources/SLING-CONTENT/libs/test/install.author/org.apache.sling.replication.agent.impl.DefaultReplicationComponentFactory-trigger-test-remote-event.json
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/it/src/main/resources/SLING-CONTENT/libs/test/install.author/org.apache.sling.replication.agent.impl.DefaultReplicationComponentFactory-trigger-test-remote-event.json?rev=1628136&r1=1628135&r2=1628136&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/it/src/main/resources/SLING-CONTENT/libs/test/install.author/org.apache.sling.replication.agent.impl.DefaultReplicationComponentFactory-trigger-test-remote-event.json (original)
+++ sling/trunk/contrib/extensions/replication/it/src/main/resources/SLING-CONTENT/libs/test/install.author/org.apache.sling.replication.agent.impl.DefaultReplicationComponentFactory-trigger-test-remote-event.json Mon Sep 29 08:41:26 2014
@@ -1,10 +1,10 @@
{
- "jcr:primaryType" : "sling:OsgiConfig",
- "name" : "test-remote-event",
+ "jcr:primaryType": "sling:OsgiConfig",
+ "name": "test-remote-event",
- "kind" : "trigger",
+ "kind": "trigger",
- "properties" : [
+ "properties": [
"type=remoteEvent",
"endpoint=http://localhost:4503/libs/sling/replication/services/triggers/content-changed.event",
Modified: sling/trunk/contrib/extensions/replication/it/src/main/resources/SLING-CONTENT/libs/test/install.author/org.apache.sling.replication.agent.impl.DefaultReplicationComponentFactory-trigger-test-replicate-event.json
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/it/src/main/resources/SLING-CONTENT/libs/test/install.author/org.apache.sling.replication.agent.impl.DefaultReplicationComponentFactory-trigger-test-replicate-event.json?rev=1628136&r1=1628135&r2=1628136&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/it/src/main/resources/SLING-CONTENT/libs/test/install.author/org.apache.sling.replication.agent.impl.DefaultReplicationComponentFactory-trigger-test-replicate-event.json (original)
+++ sling/trunk/contrib/extensions/replication/it/src/main/resources/SLING-CONTENT/libs/test/install.author/org.apache.sling.replication.agent.impl.DefaultReplicationComponentFactory-trigger-test-replicate-event.json Mon Sep 29 08:41:26 2014
@@ -1,10 +1,10 @@
{
- "jcr:primaryType" : "sling:OsgiConfig",
- "name" : "test-replicate-event",
+ "jcr:primaryType": "sling:OsgiConfig",
+ "name": "test-replicate-event",
- "kind" : "trigger",
+ "kind": "trigger",
- "properties" : [
+ "properties": [
"type=replicateEvent"
]
Modified: sling/trunk/contrib/extensions/replication/it/src/main/resources/SLING-CONTENT/libs/test/install.author/org.apache.sling.replication.agent.impl.DefaultReplicationComponentFactory-trigger-test-scheduled-event.json
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/it/src/main/resources/SLING-CONTENT/libs/test/install.author/org.apache.sling.replication.agent.impl.DefaultReplicationComponentFactory-trigger-test-scheduled-event.json?rev=1628136&r1=1628135&r2=1628136&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/it/src/main/resources/SLING-CONTENT/libs/test/install.author/org.apache.sling.replication.agent.impl.DefaultReplicationComponentFactory-trigger-test-scheduled-event.json (original)
+++ sling/trunk/contrib/extensions/replication/it/src/main/resources/SLING-CONTENT/libs/test/install.author/org.apache.sling.replication.agent.impl.DefaultReplicationComponentFactory-trigger-test-scheduled-event.json Mon Sep 29 08:41:26 2014
@@ -1,10 +1,10 @@
-{
- "jcr:primaryType" : "sling:OsgiConfig",
- "name" : "test-scheduled-event",
+ {
+ "jcr:primaryType": "sling:OsgiConfig",
+ "name": "test-scheduled-event",
- "kind" : "trigger",
+ "kind": "trigger",
- "properties" : [
+ "properties": [
"type=scheduledEvent",
"action=poll",
"seconds=30"
Modified: sling/trunk/contrib/extensions/replication/it/src/test/java/org/apache/sling/replication/it/ReplicationAgentResourcesIntegrationTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/it/src/test/java/org/apache/sling/replication/it/ReplicationAgentResourcesIntegrationTest.java?rev=1628136&r1=1628135&r2=1628136&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/it/src/test/java/org/apache/sling/replication/it/ReplicationAgentResourcesIntegrationTest.java (original)
+++ sling/trunk/contrib/extensions/replication/it/src/test/java/org/apache/sling/replication/it/ReplicationAgentResourcesIntegrationTest.java Mon Sep 29 08:41:26 2014
@@ -114,7 +114,7 @@ public class ReplicationAgentResourcesIn
assertExists(authorClient, agentRootUrl());
assertResponseContains(author, agentRootUrl(),
"sling:resourceType", "sling/replication/service/agent/list",
- "items", "publish-reverse","publish");
+ "items", "publish-reverse", "publish");
}
@Test
Modified: sling/trunk/contrib/extensions/replication/it/src/test/java/org/apache/sling/replication/it/ReplicationPackageExporterImporterTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/it/src/test/java/org/apache/sling/replication/it/ReplicationPackageExporterImporterTest.java?rev=1628136&r1=1628135&r2=1628136&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/it/src/test/java/org/apache/sling/replication/it/ReplicationPackageExporterImporterTest.java (original)
+++ sling/trunk/contrib/extensions/replication/it/src/test/java/org/apache/sling/replication/it/ReplicationPackageExporterImporterTest.java Mon Sep 29 08:41:26 2014
@@ -28,7 +28,7 @@ import static org.apache.sling.replicati
import static org.apache.sling.replication.it.ReplicationUtils.doExport;
import static org.apache.sling.replication.it.ReplicationUtils.doImport;
-public class ReplicationPackageExporterImporterTest extends ReplicationIntegrationTestBase {
+public class ReplicationPackageExporterImporterTest extends ReplicationIntegrationTestBase {
@Test
public void testAddExportImport() throws Exception {
Modified: sling/trunk/contrib/extensions/replication/it/src/test/java/org/apache/sling/replication/it/ReplicationUtils.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/it/src/test/java/org/apache/sling/replication/it/ReplicationUtils.java?rev=1628136&r1=1628135&r2=1628136&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/it/src/test/java/org/apache/sling/replication/it/ReplicationUtils.java (original)
+++ sling/trunk/contrib/extensions/replication/it/src/test/java/org/apache/sling/replication/it/ReplicationUtils.java Mon Sep 29 08:41:26 2014
@@ -217,11 +217,11 @@ public class ReplicationUtils {
}
public static String triggerUrl(String triggerName) {
- return triggerRootUrl() + "/" + triggerName;
+ return triggerRootUrl() + "/" + triggerName;
}
public static String triggerEventUrl(String triggerName) {
- return triggerRootUrl() + "/" + triggerName + ".event";
+ return triggerRootUrl() + "/" + triggerName + ".event";
}
}