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/11/07 11:28:08 UTC
svn commit: r1637333 [12/12] - in /sling/trunk/contrib/extensions:
distribution/ distribution/core/
distribution/core/src/main/java/org/apache/sling/distribution/
distribution/core/src/main/java/org/apache/sling/distribution/agent/
distribution/core/sr...
Copied: sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/DistributionUtils.java (from r1637123, 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/distribution/it/src/test/java/org/apache/sling/distribution/it/DistributionUtils.java?p2=sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/DistributionUtils.java&p1=sling/trunk/contrib/extensions/replication/it/src/test/java/org/apache/sling/replication/it/ReplicationUtils.java&r1=1637123&r2=1637333&rev=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/it/src/test/java/org/apache/sling/replication/it/ReplicationUtils.java (original)
+++ sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/DistributionUtils.java Fri Nov 7 10:28:02 2014
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.sling.replication.it;
+package org.apache.sling.distribution.it;
import java.io.IOException;
import java.util.ArrayList;
@@ -28,8 +28,8 @@ import org.apache.http.NameValuePair;
import org.apache.http.client.entity.UrlEncodedFormEntity;
import org.apache.http.entity.ByteArrayEntity;
import org.apache.http.message.BasicNameValuePair;
-import org.apache.sling.replication.communication.ReplicationActionType;
-import org.apache.sling.replication.communication.ReplicationParameter;
+import org.apache.sling.distribution.communication.DistributionActionType;
+import org.apache.sling.distribution.communication.DistributionParameter;
import org.apache.sling.testing.tools.http.Request;
import org.apache.sling.testing.tools.sling.SlingClient;
import org.apache.sling.testing.tools.sling.SlingInstance;
@@ -39,12 +39,12 @@ import static org.junit.Assert.assertFal
import static org.junit.Assert.assertTrue;
/**
- * Utils class for Replication ITs
+ * Utils class for distribution ITs
*/
-public class ReplicationUtils {
+public class DistributionUtils {
private static final String JSON_SELECTOR = ".json";
- private static final String REPLICATION_ROOT_PATH = "/libs/sling/replication";
+ private static final String DISTRIBUTION_ROOT_PATH = "/libs/sling/distribution";
private static String assertPostResourceWithParameters(SlingInstance slingInstance,
int status, String path, String... parameters) throws IOException {
@@ -107,21 +107,21 @@ public class ReplicationUtils {
}
- public static void replicate(SlingInstance slingInstance, String agentName, ReplicationActionType action, String... paths) throws IOException {
+ public static void distribute(SlingInstance slingInstance, String agentName, DistributionActionType action, String... paths) throws IOException {
String agentResource = agentUrl(agentName);
- executeReplicationRequest(slingInstance, 202, agentResource, action, paths);
+ executedistributionRequest(slingInstance, 202, agentResource, action, paths);
}
- public static String executeReplicationRequest(SlingInstance slingInstance, int status, String resource, ReplicationActionType action, String... paths) throws IOException {
+ public static String executedistributionRequest(SlingInstance slingInstance, int status, String resource, DistributionActionType action, String... paths) throws IOException {
List<String> args = new ArrayList<String>();
- args.add(ReplicationParameter.ACTION.toString());
+ args.add(DistributionParameter.ACTION.toString());
args.add(action.toString());
if (paths != null) {
for (String path : paths) {
- args.add(ReplicationParameter.PATH.toString());
+ args.add(DistributionParameter.PATH.toString());
args.add(path);
}
}
@@ -129,10 +129,10 @@ public class ReplicationUtils {
return assertPostResourceWithParameters(slingInstance, status, resource, args.toArray(new String[args.size()]));
}
- public static String doExport(SlingInstance slingInstance, String exporterName, ReplicationActionType action, String... paths) throws IOException {
+ public static String doExport(SlingInstance slingInstance, String exporterName, DistributionActionType action, String... paths) throws IOException {
String agentResource = exporterUrl(exporterName);
- return executeReplicationRequest(slingInstance, 200, agentResource, action, paths);
+ return executedistributionRequest(slingInstance, 200, agentResource, action, paths);
}
public static String doImport(SlingInstance slingInstance, String importerName, byte[] bytes) throws IOException {
@@ -171,7 +171,7 @@ public class ReplicationUtils {
}
public static String agentRootUrl() {
- return REPLICATION_ROOT_PATH + "/services/agents";
+ return DISTRIBUTION_ROOT_PATH + "/services/agents";
}
public static String agentUrl(String agentName) {
@@ -183,12 +183,12 @@ public class ReplicationUtils {
}
public static String agentConfigUrl(String agentName) {
- return REPLICATION_ROOT_PATH + "/settings/agents/" + agentName;
+ return DISTRIBUTION_ROOT_PATH + "/settings/agents/" + agentName;
}
public static String importerRootUrl() {
- return REPLICATION_ROOT_PATH + "/services/importers";
+ return DISTRIBUTION_ROOT_PATH + "/services/importers";
}
public static String importerUrl(String importerName) {
@@ -196,7 +196,7 @@ public class ReplicationUtils {
}
public static String exporterRootUrl() {
- return REPLICATION_ROOT_PATH + "/services/exporters";
+ return DISTRIBUTION_ROOT_PATH + "/services/exporters";
}
public static String exporterUrl(String exporterName) {
@@ -204,16 +204,16 @@ public class ReplicationUtils {
}
public static String importerConfigUrl(String importerName) {
- return REPLICATION_ROOT_PATH + "/settings/importers/" + importerName;
+ return DISTRIBUTION_ROOT_PATH + "/settings/importers/" + importerName;
}
public static String exporterConfigUrl(String exporterName) {
- return REPLICATION_ROOT_PATH + "/settings/exporters/" + exporterName;
+ return DISTRIBUTION_ROOT_PATH + "/settings/exporters/" + exporterName;
}
public static String triggerRootUrl() {
- return REPLICATION_ROOT_PATH + "/services/triggers";
+ return DISTRIBUTION_ROOT_PATH + "/services/triggers";
}
public static String triggerUrl(String triggerName) {
Copied: sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/ForwardDistributionTest.java (from r1637123, sling/trunk/contrib/extensions/replication/it/src/test/java/org/apache/sling/replication/it/ForwardReplicationTest.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/ForwardDistributionTest.java?p2=sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/ForwardDistributionTest.java&p1=sling/trunk/contrib/extensions/replication/it/src/test/java/org/apache/sling/replication/it/ForwardReplicationTest.java&r1=1637123&r2=1637333&rev=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/it/src/test/java/org/apache/sling/replication/it/ForwardReplicationTest.java (original)
+++ sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/ForwardDistributionTest.java Fri Nov 7 10:28:02 2014
@@ -16,26 +16,26 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.replication.it;
+package org.apache.sling.distribution.it;
-import org.apache.sling.replication.communication.ReplicationActionType;
+import org.apache.sling.distribution.communication.DistributionActionType;
import org.junit.Test;
-import static org.apache.sling.replication.it.ReplicationUtils.assertExists;
-import static org.apache.sling.replication.it.ReplicationUtils.assertNotExists;
-import static org.apache.sling.replication.it.ReplicationUtils.createRandomNode;
-import static org.apache.sling.replication.it.ReplicationUtils.replicate;
+import static org.apache.sling.distribution.it.DistributionUtils.assertExists;
+import static org.apache.sling.distribution.it.DistributionUtils.assertNotExists;
+import static org.apache.sling.distribution.it.DistributionUtils.createRandomNode;
+import static org.apache.sling.distribution.it.DistributionUtils.distribute;
/**
- * Integration test for forward replication
+ * Integration test for forward distribution
*/
-public class ForwardReplicationTest extends ReplicationIntegrationTestBase {
+public class ForwardDistributionTest extends DistributionIntegrationTestBase {
@Test
public void testAddContent() throws Exception {
String nodePath = createRandomNode(authorClient, "/content/forward_add_" + System.nanoTime());
assertExists(authorClient, nodePath);
- replicate(author, "publish", ReplicationActionType.ADD, nodePath);
+ distribute(author, "publish", DistributionActionType.ADD, nodePath);
assertExists(publishClient, nodePath);
}
@@ -43,7 +43,7 @@ public class ForwardReplicationTest exte
public void testDeleteContent() throws Exception {
String nodePath = createRandomNode(publishClient, "/content/forward_del_" + System.nanoTime());
assertExists(publishClient, nodePath);
- replicate(author, "publish", ReplicationActionType.DELETE, nodePath);
+ distribute(author, "publish", DistributionActionType.DELETE, nodePath);
assertNotExists(publishClient, nodePath);
}
Copied: sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/ReverseDistributionTest.java (from r1637123, sling/trunk/contrib/extensions/replication/it/src/test/java/org/apache/sling/replication/it/ReverseReplicationTest.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/ReverseDistributionTest.java?p2=sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/ReverseDistributionTest.java&p1=sling/trunk/contrib/extensions/replication/it/src/test/java/org/apache/sling/replication/it/ReverseReplicationTest.java&r1=1637123&r2=1637333&rev=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/it/src/test/java/org/apache/sling/replication/it/ReverseReplicationTest.java (original)
+++ sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/ReverseDistributionTest.java Fri Nov 7 10:28:02 2014
@@ -16,27 +16,27 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.replication.it;
+package org.apache.sling.distribution.it;
-import org.apache.sling.replication.communication.ReplicationActionType;
+import org.apache.sling.distribution.communication.DistributionActionType;
import org.junit.Test;
-import static org.apache.sling.replication.it.ReplicationUtils.assertExists;
-import static org.apache.sling.replication.it.ReplicationUtils.assertNotExists;
-import static org.apache.sling.replication.it.ReplicationUtils.createRandomNode;
-import static org.apache.sling.replication.it.ReplicationUtils.replicate;
+import static org.apache.sling.distribution.it.DistributionUtils.assertExists;
+import static org.apache.sling.distribution.it.DistributionUtils.assertNotExists;
+import static org.apache.sling.distribution.it.DistributionUtils.createRandomNode;
+import static org.apache.sling.distribution.it.DistributionUtils.distribute;
/**
- * Integration test for reverse replication
+ * Integration test for reverse distribution
*/
-public class ReverseReplicationTest extends ReplicationIntegrationTestBase {
+public class ReverseDistributionTest extends DistributionIntegrationTestBase {
@Test
public void testAddContent() throws Exception {
String nodePath = createRandomNode(publishClient, "/content/reverse_add_" + System.nanoTime());
assertExists(publishClient, nodePath);
- replicate(publish, "reverse", ReplicationActionType.ADD, nodePath);
+ distribute(publish, "reverse", DistributionActionType.ADD, nodePath);
assertExists(authorClient, nodePath);
}
@@ -44,7 +44,7 @@ public class ReverseReplicationTest exte
public void testDeleteContent() throws Exception {
String nodePath = createRandomNode(authorClient, "/content/reverse_del_" + System.nanoTime());
assertExists(authorClient, nodePath);
- replicate(publish, "reverse", ReplicationActionType.DELETE, nodePath);
+ distribute(publish, "reverse", DistributionActionType.DELETE, nodePath);
assertNotExists(authorClient, nodePath);
}
}
Copied: sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/triggers/DistributionTriggerResourcesTest.java (from r1637123, sling/trunk/contrib/extensions/replication/it/src/test/java/org/apache/sling/replication/it/triggers/ReplicationTriggerResourcesTest.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/triggers/DistributionTriggerResourcesTest.java?p2=sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/triggers/DistributionTriggerResourcesTest.java&p1=sling/trunk/contrib/extensions/replication/it/src/test/java/org/apache/sling/replication/it/triggers/ReplicationTriggerResourcesTest.java&r1=1637123&r2=1637333&rev=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/it/src/test/java/org/apache/sling/replication/it/triggers/ReplicationTriggerResourcesTest.java (original)
+++ sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/triggers/DistributionTriggerResourcesTest.java Fri Nov 7 10:28:02 2014
@@ -17,23 +17,23 @@
* under the License.
*/
-package org.apache.sling.replication.it.triggers;
+package org.apache.sling.distribution.it.triggers;
-import org.apache.sling.replication.it.ReplicationIntegrationTestBase;
+import org.apache.sling.distribution.it.DistributionIntegrationTestBase;
import org.junit.Test;
-import static org.apache.sling.replication.it.ReplicationUtils.assertExists;
-import static org.apache.sling.replication.it.ReplicationUtils.triggerUrl;
+import static org.apache.sling.distribution.it.DistributionUtils.assertExists;
+import static org.apache.sling.distribution.it.DistributionUtils.triggerUrl;
-public class ReplicationTriggerResourcesTest extends ReplicationIntegrationTestBase {
+public class DistributionTriggerResourcesTest extends DistributionIntegrationTestBase {
@Test
public void testTestTriggersOnAuthor() throws Exception {
String[] names = new String[]{
"test-content-event",
"test-remote-event",
- "test-replicate-event",
+ "test-distribute-event",
"test-scheduled-event",
"test-persisting-event"
};
Copied: sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/triggers/ScheduledDistributionTriggerTest.java (from r1637123, sling/trunk/contrib/extensions/replication/it/src/test/java/org/apache/sling/replication/it/triggers/ScheduledReplicationTriggerTest.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/triggers/ScheduledDistributionTriggerTest.java?p2=sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/triggers/ScheduledDistributionTriggerTest.java&p1=sling/trunk/contrib/extensions/replication/it/src/test/java/org/apache/sling/replication/it/triggers/ScheduledReplicationTriggerTest.java&r1=1637123&r2=1637333&rev=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/it/src/test/java/org/apache/sling/replication/it/triggers/ScheduledReplicationTriggerTest.java (original)
+++ sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/triggers/ScheduledDistributionTriggerTest.java Fri Nov 7 10:28:02 2014
@@ -17,15 +17,15 @@
* under the License.
*/
-package org.apache.sling.replication.it.triggers;
+package org.apache.sling.distribution.it.triggers;
-import org.apache.sling.replication.it.ReplicationIntegrationTestBase;
+import org.apache.sling.distribution.it.DistributionIntegrationTestBase;
import org.junit.Test;
-import static org.apache.sling.replication.it.ReplicationUtils.assertResponseContains;
-import static org.apache.sling.replication.it.ReplicationUtils.triggerEventUrl;
+import static org.apache.sling.distribution.it.DistributionUtils.assertResponseContains;
+import static org.apache.sling.distribution.it.DistributionUtils.triggerEventUrl;
-public class ScheduledReplicationTriggerTest extends ReplicationIntegrationTestBase {
+public class ScheduledDistributionTriggerTest extends DistributionIntegrationTestBase {
@Test
public void testTestTriggersOnAuthor() throws Exception {
Modified: sling/trunk/contrib/extensions/distribution/sample/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/sample/pom.xml?rev=1637333&r1=1637123&r2=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/sample/pom.xml (original)
+++ sling/trunk/contrib/extensions/distribution/sample/pom.xml Fri Nov 7 10:28:02 2014
@@ -32,19 +32,19 @@
<!-- ======================================================================= -->
<!-- P R O J E C T -->
<!-- ======================================================================= -->
- <artifactId>org.apache.sling.replication.sample</artifactId>
+ <artifactId>org.apache.sling.distribution.sample</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>bundle</packaging>
- <name>Apache Sling Replication Sample</name>
+ <name>Apache Sling Distribution Sample</name>
<description>
- The Apache Sling Replication sample bundle provides a set of sample configurations and custom component implementations.
+ The Apache Sling Distribution sample bundle provides a set of sample configurations and custom component implementations.
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/replication/sample</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/replication/sample</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/sample</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/sample</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/sample</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/sample</url>
</scm>
<!-- ======================================================================= -->
@@ -66,13 +66,10 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Bundle-SymbolicName>org.apache.sling.replication.sample</Bundle-SymbolicName>
+ <Bundle-SymbolicName>org.apache.sling.distribution.sample</Bundle-SymbolicName>
<Sling-Initial-Content>
- SLING-CONTENT/libs/sling/replication;path:=/libs/sling/replication;overwrite:=true
+ SLING-CONTENT/libs/sling/distribution;path:=/libs/sling/distribution;overwrite:=true
</Sling-Initial-Content>
- <Export-Package>
- </Export-Package>
- <Embed-Dependency>httpasyncclient</Embed-Dependency>
</instructions>
</configuration>
</plugin>
@@ -96,7 +93,7 @@
<!-- SLING -->
<dependency>
<groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.replication.core</artifactId>
+ <artifactId>org.apache.sling.distribution.core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Copied: sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.agent.impl.CoordinatingDistributionAgentFactory-pubsync.json (from r1637123, sling/trunk/contrib/extensions/replication/sample/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.CoordinatingReplicationAgentFactory-pubsync.json)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.agent.impl.CoordinatingDistributionAgentFactory-pubsync.json?p2=sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.agent.impl.CoordinatingDistributionAgentFactory-pubsync.json&p1=sling/trunk/contrib/extensions/replication/sample/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.CoordinatingReplicationAgentFactory-pubsync.json&r1=1637123&r2=1637333&rev=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/sample/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.CoordinatingReplicationAgentFactory-pubsync.json (original)
+++ sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.agent.impl.CoordinatingDistributionAgentFactory-pubsync.json Fri Nov 7 10:28:02 2014
@@ -2,7 +2,7 @@
"jcr:primaryType": "sling:OsgiConfig",
"name": "pubsync",
- "serviceName" : "replicationService",
+ "serviceName" : "distributionService",
"requestAuthorizationStrategy" : [
"type=privilege",
@@ -12,18 +12,18 @@
"packageExporter": [
"packageBuilder/type=vlt",
- "endpoints[0]=http://localhost:4503/libs/sling/replication/services/exporters/reverse-pubsync",
- "endpoints[1]=http://localhost:4504/libs/sling/replication/services/exporters/reverse-pubsync",
- "endpoints[2]=http://localhost:4505/libs/sling/replication/services/exporters/reverse-pubsync",
+ "endpoints[0]=http://localhost:4503/libs/sling/distribution/services/exporters/reverse-pubsync",
+ "endpoints[1]=http://localhost:4504/libs/sling/distribution/services/exporters/reverse-pubsync",
+ "endpoints[2]=http://localhost:4505/libs/sling/distribution/services/exporters/reverse-pubsync",
"endpoints.strategy=All"
],
"packageImporter": [
"packageBuilder/type=vlt",
- "endpoints[0]=http://localhost:4503/libs/sling/replication/services/importers/default",
- "endpoints[1]=http://localhost:4504/libs/sling/replication/services/importers/default",
- "endpoints[2]=http://localhost:4505/libs/sling/replication/services/importers/default",
+ "endpoints[0]=http://localhost:4503/libs/sling/distribution/services/importers/default",
+ "endpoints[1]=http://localhost:4504/libs/sling/distribution/services/importers/default",
+ "endpoints[2]=http://localhost:4505/libs/sling/distribution/services/importers/default",
"endpoints.strategy=All"
],
Copied: sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-publish-reverse.json (from r1637123, sling/trunk/contrib/extensions/replication/sample/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish-reverse.json)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-publish-reverse.json?p2=sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-publish-reverse.json&p1=sling/trunk/contrib/extensions/replication/sample/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish-reverse.json&r1=1637123&r2=1637333&rev=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/sample/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish-reverse.json (original)
+++ sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-publish-reverse.json Fri Nov 7 10:28:02 2014
@@ -4,12 +4,12 @@
"enabled" : true,
- "serviceName" : "replicationService",
+ "serviceName" : "distributionService",
"packageExporter": [
"type=remote",
- "endpoints[0]=http://localhost:4503/libs/sling/replication/services/exporters/reverse",
+ "endpoints[0]=http://localhost:4503/libs/sling/distribution/services/exporters/reverse",
"packageBuilder/type=vlt"
],
@@ -30,7 +30,7 @@
"scheduledTrigger/seconds=30",
"remoteTrigger/type=remoteEvent",
- "remoteTrigger/endpoint=http://localhost:4503/libs/sling/replication/services/triggers/content-changed.event"
+ "remoteTrigger/endpoint=http://localhost:4503/libs/sling/distribution/services/triggers/content-changed.event"
],
Copied: sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-publish.json (from r1637123, sling/trunk/contrib/extensions/replication/sample/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish.json)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-publish.json?p2=sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-publish.json&p1=sling/trunk/contrib/extensions/replication/sample/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish.json&r1=1637123&r2=1637333&rev=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/sample/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish.json (original)
+++ sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-publish.json Fri Nov 7 10:28:02 2014
@@ -2,7 +2,7 @@
"jcr:primaryType": "sling:OsgiConfig",
"name": "publish",
- "serviceName" : "replicationService",
+ "serviceName" : "distributionService",
"requestAuthorizationStrategy" : [
"type=privilege",
@@ -16,7 +16,7 @@
"packageImporter": [
"type=remote",
- "endpoints[0]=http://localhost:4503/libs/sling/replication/services/importers/default",
+ "endpoints[0]=http://localhost:4503/libs/sling/distribution/services/importers/default",
"authenticationProvider/type=service",
Copied: sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.component.impl.GenericDistributionComponentFactory-trigger-remote-event.json (from r1637123, sling/trunk/contrib/extensions/replication/sample/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.component.impl.GenericReplicationComponentFactory-trigger-remote-event.json)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.component.impl.GenericDistributionComponentFactory-trigger-remote-event.json?p2=sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.component.impl.GenericDistributionComponentFactory-trigger-remote-event.json&p1=sling/trunk/contrib/extensions/replication/sample/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.component.impl.GenericReplicationComponentFactory-trigger-remote-event.json&r1=1637123&r2=1637333&rev=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/sample/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.component.impl.GenericReplicationComponentFactory-trigger-remote-event.json (original)
+++ sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.component.impl.GenericDistributionComponentFactory-trigger-remote-event.json Fri Nov 7 10:28:02 2014
@@ -6,7 +6,7 @@
"properties": [
"type=remoteEvent",
- "endpoint=http://localhost:4503/libs/sling/replication/services/triggers/content-changed.event",
+ "endpoint=http://localhost:4503/libs/sling/distribution/services/triggers/content-changed.event",
"authenticationProvider/type=service"
],
Copied: sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-reverse.json (from r1637123, sling/trunk/contrib/extensions/replication/sample/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-reverse.json)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-reverse.json?p2=sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-reverse.json&p1=sling/trunk/contrib/extensions/replication/sample/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-reverse.json&r1=1637123&r2=1637333&rev=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/sample/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-reverse.json (original)
+++ sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-reverse.json Fri Nov 7 10:28:02 2014
@@ -4,7 +4,7 @@
"isPassive": true,
- "serviceName" : "replicationService",
+ "serviceName" : "distributionService",
"packageExporter": [
"type=local",
@@ -28,6 +28,6 @@
"trigger": [
"userGeneratedTrigger/type=jcrEvent",
"userGeneratedTrigger/path=/content/usergenerated",
- "userGeneratedTrigger/servicename=replicationService"
+ "userGeneratedTrigger/servicename=distributionService"
]
}
Copied: sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.component.impl.GenericDistributionComponentFactory-trigger-content-changed.json (from r1637123, sling/trunk/contrib/extensions/replication/sample/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.component.impl.GenericReplicationComponentFactory-trigger-content-changed.json)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.component.impl.GenericDistributionComponentFactory-trigger-content-changed.json?p2=sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.component.impl.GenericDistributionComponentFactory-trigger-content-changed.json&p1=sling/trunk/contrib/extensions/replication/sample/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.component.impl.GenericReplicationComponentFactory-trigger-content-changed.json&r1=1637123&r2=1637333&rev=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/sample/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.component.impl.GenericReplicationComponentFactory-trigger-content-changed.json (original)
+++ sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.component.impl.GenericDistributionComponentFactory-trigger-content-changed.json Fri Nov 7 10:28:02 2014
@@ -7,7 +7,7 @@
"properties": [
"type=jcrEvent",
"path=/content/usergenerated",
- "servicename=replicationService"
+ "servicename=distributionService"
]
}
\ No newline at end of file
Copied: sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.packaging.impl.exporter.AgentDistributionPackageExporterFactory-reverse.json (from r1637123, sling/trunk/contrib/extensions/replication/sample/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/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.packaging.impl.exporter.AgentDistributionPackageExporterFactory-reverse.json?p2=sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.packaging.impl.exporter.AgentDistributionPackageExporterFactory-reverse.json&p1=sling/trunk/contrib/extensions/replication/sample/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.exporter.AgentReplicationPackageExporterFactory-reverse.json&r1=1637123&r2=1637333&rev=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/sample/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/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.packaging.impl.exporter.AgentDistributionPackageExporterFactory-reverse.json Fri Nov 7 10:28:02 2014
@@ -4,5 +4,5 @@
"packageBuilder": [ "type=vlt" ],
- "ReplicationAgent.target": "(name=reverse)"
+ "DistributionAgent.target": "(name=reverse)"
}
\ No newline at end of file
Copied: sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/org.apache.sling.event.jobs.QueueConfiguration-distribution.json (from r1637123, sling/trunk/contrib/extensions/replication/sample/src/main/resources/SLING-CONTENT/libs/sling/replication/install/org.apache.sling.event.jobs.QueueConfiguration-replication.json)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/org.apache.sling.event.jobs.QueueConfiguration-distribution.json?p2=sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/org.apache.sling.event.jobs.QueueConfiguration-distribution.json&p1=sling/trunk/contrib/extensions/replication/sample/src/main/resources/SLING-CONTENT/libs/sling/replication/install/org.apache.sling.event.jobs.QueueConfiguration-replication.json&r1=1637123&r2=1637333&rev=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/sample/src/main/resources/SLING-CONTENT/libs/sling/replication/install/org.apache.sling.event.jobs.QueueConfiguration-replication.json (original)
+++ sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/org.apache.sling.event.jobs.QueueConfiguration-distribution.json Fri Nov 7 10:28:02 2014
@@ -1,8 +1,8 @@
{
"jcr:primaryType" : "sling:OsgiConfig",
- "queue.name" : "org/apache/sling/replication/queue/{0}",
+ "queue.name" : "org/apache/sling/distribution/queue/{0}",
"queue.retries" : "-1",
- "queue.topics": "org/apache/sling/replication/queue/*",
+ "queue.topics": "org/apache/sling/distribution/queue/*",
"queue.type" : "ORDERED"
}
Copied: sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-distribution.json (from r1637123, sling/trunk/contrib/extensions/replication/sample/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/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-distribution.json?p2=sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-distribution.json&p1=sling/trunk/contrib/extensions/replication/sample/src/main/resources/SLING-CONTENT/libs/sling/replication/install/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-replication.json&r1=1637123&r2=1637333&rev=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/sample/src/main/resources/SLING-CONTENT/libs/sling/replication/install/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-replication.json (original)
+++ sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-distribution.json Fri Nov 7 10:28:02 2014
@@ -1,5 +1,5 @@
{
"jcr:primaryType": "sling:OsgiConfig",
"user.default": "",
- "user.mapping": "org.apache.sling.replication.core:replicationService=admin"
+ "user.mapping": "org.apache.sling.distribution.core:distributionService=admin"
}
Copied: sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.OsgiPropertiesResourceProviderFactory-agents.json (from r1637123, sling/trunk/contrib/extensions/replication/sample/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/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.OsgiPropertiesResourceProviderFactory-agents.json?p2=sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.OsgiPropertiesResourceProviderFactory-agents.json&p1=sling/trunk/contrib/extensions/replication/sample/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/services/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-agents.json&r1=1637123&r2=1637333&rev=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/sample/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/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.OsgiPropertiesResourceProviderFactory-agents.json Fri Nov 7 10:28:02 2014
@@ -1,13 +1,13 @@
{
"jcr:primaryType": "sling:OsgiConfig",
- "name": "replicationAgents",
- "provider.roots": [ "/libs/sling/replication/services/agents" ],
- "serviceType": "org.apache.sling.replication.agent.ReplicationAgent",
+ "name": "distributionAgents",
+ "provider.roots": [ "/libs/sling/distribution/services/agents" ],
+ "serviceType": "org.apache.sling.distribution.agent.DistributionAgent",
"resourceProperties": [
- "sling:resourceType=sling/replication/service/agent",
- "sling:resourceSuperType=sling/replication/service",
+ "sling:resourceType=sling/distribution/service/agent",
+ "sling:resourceSuperType=sling/distribution/service",
"name={name}",
- "queue/sling:resourceType=sling/replication/service/agent/queue"
+ "queue/sling:resourceType=sling/distribution/service/agent/queue"
]
}
\ No newline at end of file
Copied: sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.OsgiPropertiesResourceProviderFactory-exporters.json (from r1637123, sling/trunk/contrib/extensions/replication/sample/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/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.OsgiPropertiesResourceProviderFactory-exporters.json?p2=sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.OsgiPropertiesResourceProviderFactory-exporters.json&p1=sling/trunk/contrib/extensions/replication/sample/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/services/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-exporters.json&r1=1637123&r2=1637333&rev=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/sample/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/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.OsgiPropertiesResourceProviderFactory-exporters.json Fri Nov 7 10:28:02 2014
@@ -1,11 +1,11 @@
{
"jcr:primaryType": "sling:OsgiConfig",
- "name": "replicationExporters",
- "provider.roots": [ "/libs/sling/replication/services/exporters" ],
- "serviceType": "org.apache.sling.replication.packaging.ReplicationPackageExporter",
+ "name": "distributionExporters",
+ "provider.roots": [ "/libs/sling/distribution/services/exporters" ],
+ "serviceType": "org.apache.sling.distribution.packaging.DistributionPackageExporter",
"resourceProperties": [
- "sling:resourceType=sling/replication/service/exporter",
- "sling:resourceSuperType=sling/replication/service",
+ "sling:resourceType=sling/distribution/service/exporter",
+ "sling:resourceSuperType=sling/distribution/service",
"name={name}"
]
Copied: sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.OsgiPropertiesResourceProviderFactory-importers.json (from r1637123, sling/trunk/contrib/extensions/replication/sample/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/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.OsgiPropertiesResourceProviderFactory-importers.json?p2=sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.OsgiPropertiesResourceProviderFactory-importers.json&p1=sling/trunk/contrib/extensions/replication/sample/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/services/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-importers.json&r1=1637123&r2=1637333&rev=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/sample/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/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.OsgiPropertiesResourceProviderFactory-importers.json Fri Nov 7 10:28:02 2014
@@ -1,11 +1,11 @@
{
"jcr:primaryType": "sling:OsgiConfig",
- "name": "replicationImporters",
- "provider.roots": [ "/libs/sling/replication/services/importers" ],
- "serviceType": "org.apache.sling.replication.packaging.ReplicationPackageImporter",
+ "name": "distributionImporters",
+ "provider.roots": [ "/libs/sling/distribution/services/importers" ],
+ "serviceType": "org.apache.sling.distribution.packaging.DistributionPackageImporter",
"resourceProperties": [
- "sling:resourceType=sling/replication/service/importer",
- "sling:resourceSuperType=sling/replication/service",
+ "sling:resourceType=sling/distribution/service/importer",
+ "sling:resourceSuperType=sling/distribution/service",
"name={name}"
]
Copied: sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.OsgiPropertiesResourceProviderFactory-triggers.json (from r1637123, sling/trunk/contrib/extensions/replication/sample/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/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.OsgiPropertiesResourceProviderFactory-triggers.json?p2=sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.OsgiPropertiesResourceProviderFactory-triggers.json&p1=sling/trunk/contrib/extensions/replication/sample/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/services/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-triggers.json&r1=1637123&r2=1637333&rev=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/sample/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/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.OsgiPropertiesResourceProviderFactory-triggers.json Fri Nov 7 10:28:02 2014
@@ -1,11 +1,11 @@
{
"jcr:primaryType": "sling:OsgiConfig",
- "name": "replicationTriggers",
- "provider.roots": [ "/libs/sling/replication/services/triggers" ],
- "serviceType": "org.apache.sling.replication.trigger.ReplicationTrigger",
+ "name": "distributionTriggers",
+ "provider.roots": [ "/libs/sling/distribution/services/triggers" ],
+ "serviceType": "org.apache.sling.distribution.trigger.DistributionTrigger",
"resourceProperties": [
- "sling:resourceType=sling/replication/service/trigger",
- "sling:resourceSuperType=sling/replication/service",
+ "sling:resourceType=sling/distribution/service/trigger",
+ "sling:resourceSuperType=sling/distribution/service",
"name={name}"
]
Copied: sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/settings/org.apache.sling.distribution.resources.impl.OsgiPropertiesResourceProviderFactory-simpleAgents.json (from r1637123, sling/trunk/contrib/extensions/replication/sample/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/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/settings/org.apache.sling.distribution.resources.impl.OsgiPropertiesResourceProviderFactory-simpleAgents.json?p2=sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/settings/org.apache.sling.distribution.resources.impl.OsgiPropertiesResourceProviderFactory-simpleAgents.json&p1=sling/trunk/contrib/extensions/replication/sample/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/settings/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-simpleAgents.json&r1=1637123&r2=1637333&rev=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/sample/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/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/settings/org.apache.sling.distribution.resources.impl.OsgiPropertiesResourceProviderFactory-simpleAgents.json Fri Nov 7 10:28:02 2014
@@ -1,14 +1,14 @@
{
"jcr:primaryType": "sling:OsgiConfig",
"name": "simpleAgents",
- "provider.roots": [ "/libs/sling/replication/settings/agents" ],
- "serviceType": "org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory",
+ "provider.roots": [ "/libs/sling/distribution/settings/agents" ],
+ "serviceType": "org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory",
"providerType": "osgiConfig",
"groupPrefix": "agents",
"resourceProperties": [
- "sling:resourceType=sling/replication/setting/agent",
- "sling:resourceSuperType=sling/replication/setting",
+ "sling:resourceType=sling/distribution/setting/agent",
+ "sling:resourceSuperType=sling/distribution/setting",
"name={name}",
"packageExporter={packageExporter}",
"packageImporter={packageImporter}"
Modified: sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/service/list/html.esp
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/service/list/html.esp?rev=1637333&r1=1637123&r2=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/service/list/html.esp (original)
+++ sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/service/list/html.esp Fri Nov 7 10:28:02 2014
@@ -1,5 +1,5 @@
<%
-var settingsUrl = request.contextPath + "/libs/sling/replication/settings/";
+var settingsUrl = request.contextPath + "/libs/sling/distribution/settings/";
var valueMap = resource.adaptTo(Packages.org.apache.sling.api.resource.ValueMap);
var childrenNames = valueMap.get("items"); %>
<html>
Modified: sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/setting/html.esp
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/setting/html.esp?rev=1637333&r1=1637123&r2=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/setting/html.esp (original)
+++ sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/setting/html.esp Fri Nov 7 10:28:02 2014
@@ -1,7 +1,7 @@
<%
var valueMap = resource.adaptTo(Packages.org.apache.sling.api.resource.ValueMap);
var pit = valueMap.keySet().iterator();
-var settingsUrl = request.contextPath + "/libs/sling/replication/settings/";
+var settingsUrl = request.contextPath + "/libs/sling/distribution/settings/";
%>
<html>
<body>
Modified: sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/setting/list/html.esp
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/setting/list/html.esp?rev=1637333&r1=1637123&r2=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/setting/list/html.esp (original)
+++ sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/setting/list/html.esp Fri Nov 7 10:28:02 2014
@@ -1,5 +1,5 @@
<%
-var settingsUrl = request.contextPath + "/libs/sling/replication/settings/"
+var settingsUrl = request.contextPath + "/libs/sling/distribution/settings/"
var valueMap = resource.adaptTo(Packages.org.apache.sling.api.resource.ValueMap);
var childrenNames = valueMap.get("items");
%>