This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.distribution.sample-0.1.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-sample.git
commit cfb06b5d463174f363d52d821fa37da0f2d48145 Author: Tommaso Teofili <[email protected]> AuthorDate: Fri Nov 7 10:28:02 2014 +0000 SLING-4140 - renamed and moved Sling Replication to Sling Content Distribution git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/sample@1637333 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 21 ++++++------- ...ordinatingDistributionAgentFactory-pubsync.json | 35 ++++++++++++++++++++++ ...eDistributionAgentFactory-publish-reverse.json} | 6 ++-- ...pl.SimpleDistributionAgentFactory-publish.json} | 4 +-- ...tionComponentFactory-trigger-remote-event.json} | 2 +- ...uthenticationProviderFactory-publishAdmin.json} | 0 ...impleDistributionAgentFactory-cache-flush.json} | 0 ...pl.SimpleDistributionAgentFactory-reverse.json} | 4 +-- ...nComponentFactory-trigger-content-changed.json} | 2 +- ...istributionPackageExporterFactory-reverse.json} | 2 +- ...istributionPackageExporterFactory-default.json} | 0 ...teDistributionPackageImporter-cache-flush.json} | 0 ...istributionPackageImporterFactory-default.json} | 0 ...event.jobs.QueueConfiguration-distribution.json | 8 +++++ ...ServiceUserMapperImpl.amended-distribution.json | 5 ++++ ...giPropertiesResourceProviderFactory-agents.json | 13 ++++++++ ...ropertiesResourceProviderFactory-exporters.json | 12 ++++++++ ...ropertiesResourceProviderFactory-importers.json | 12 ++++++++ ...PropertiesResourceProviderFactory-triggers.json | 12 ++++++++ ...ertiesResourceProviderFactory-simpleAgents.json | 18 +++++++++++ .../service/agent/replicate.html.esp | 0 .../{replication => distribution}/service/html.esp | 0 .../service/list/html.esp | 2 +- .../{replication => distribution}/setting/html.esp | 2 +- .../setting/list/html.esp | 2 +- ...oordinatingReplicationAgentFactory-pubsync.json | 35 ---------------------- ....event.jobs.QueueConfiguration-replication.json | 8 ----- ....ServiceUserMapperImpl.amended-replication.json | 5 ---- ...giPropertiesResourceProviderFactory-agents.json | 13 -------- ...ropertiesResourceProviderFactory-exporters.json | 12 -------- ...ropertiesResourceProviderFactory-importers.json | 12 -------- ...PropertiesResourceProviderFactory-triggers.json | 12 -------- ...ertiesResourceProviderFactory-simpleAgents.json | 18 ----------- 33 files changed, 137 insertions(+), 140 deletions(-) diff --git a/pom.xml b/pom.xml index 51033f9..656a556 100644 --- a/pom.xml +++ b/pom.xml @@ -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> diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.agent.impl.CoordinatingDistributionAgentFactory-pubsync.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.agent.impl.CoordinatingDistributionAgentFactory-pubsync.json new file mode 100644 index 0000000..7724b93 --- /dev/null +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.agent.impl.CoordinatingDistributionAgentFactory-pubsync.json @@ -0,0 +1,35 @@ +{ + "jcr:primaryType": "sling:OsgiConfig", + "name": "pubsync", + + "serviceName" : "distributionService", + + "requestAuthorizationStrategy" : [ + "type=privilege", + "jcrPrivilege=jcr:read" + ], + + "packageExporter": [ + "packageBuilder/type=vlt", + + "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/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" + ], + + "queueProvider.target" : "(name=sjh)", + + "queueDistributionStrategy.target": "(name=error)", + + "transportAuthenticationProvider.target" : "(name=publishAdmin)" +} \ No newline at end of file diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish-reverse.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-publish-reverse.json similarity index 78% rename from src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish-reverse.json rename to src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-publish-reverse.json index 23ef9a9..84b41b9 100644 --- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish-reverse.json +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-publish-reverse.json @@ -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"; ], diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-publish.json similarity index 76% rename from src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish.json rename to src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-publish.json index e03d474..d624a3f 100644 --- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish.json +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-publish.json @@ -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", diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.component.impl.GenericReplicationComponentFactory-trigger-remote-event.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.component.impl.GenericDistributionComponentFactory-trigger-remote-event.json similarity index 72% rename from src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.component.impl.GenericReplicationComponentFactory-trigger-remote-event.json rename to src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.component.impl.GenericDistributionComponentFactory-trigger-remote-event.json index 38030a4..6d8c4f8 100644 --- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.component.impl.GenericReplicationComponentFactory-trigger-remote-event.json +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.component.impl.GenericDistributionComponentFactory-trigger-remote-event.json @@ -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" ], diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.transport.authentication.impl.UserCredentialsTransportAuthenticationProviderFactory-publishAdmin.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.transport.authentication.impl.UserCredentialsTransportAuthenticationProviderFactory-publishAdmin.json similarity index 100% rename from src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.transport.authentication.impl.UserCredentialsTransportAuthenticationProviderFactory-publishAdmin.json rename to src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.transport.authentication.impl.UserCredentialsTransportAuthenticationProviderFactory-publishAdmin.json diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-cache-flush.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-cache-flush.json similarity index 100% rename from src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-cache-flush.json rename to src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-cache-flush.json diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-reverse.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-reverse.json similarity index 85% rename from src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-reverse.json rename to src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-reverse.json index 70fa22a..a1ed69e 100644 --- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-reverse.json +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-reverse.json @@ -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" ] } diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.component.impl.GenericReplicationComponentFactory-trigger-content-changed.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.component.impl.GenericDistributionComponentFactory-trigger-content-changed.json similarity index 82% rename from src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.component.impl.GenericReplicationComponentFactory-trigger-content-changed.json rename to src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.component.impl.GenericDistributionComponentFactory-trigger-content-changed.json index 155e371..bea7209 100644 --- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.component.impl.GenericReplicationComponentFactory-trigger-content-changed.json +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.component.impl.GenericDistributionComponentFactory-trigger-content-changed.json @@ -7,7 +7,7 @@ "properties": [ "type=jcrEvent", "path=/content/usergenerated", - "servicename=replicationService" + "servicename=distributionService" ] } \ No newline at end of file diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.exporter.AgentReplicationPackageExporterFactory-reverse.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.packaging.impl.exporter.AgentDistributionPackageExporterFactory-reverse.json similarity index 68% rename from src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.exporter.AgentReplicationPackageExporterFactory-reverse.json rename to src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.packaging.impl.exporter.AgentDistributionPackageExporterFactory-reverse.json index f9e8bb0..03ab1d4 100644 --- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.exporter.AgentReplicationPackageExporterFactory-reverse.json +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.packaging.impl.exporter.AgentDistributionPackageExporterFactory-reverse.json @@ -4,5 +4,5 @@ "packageBuilder": [ "type=vlt" ], - "ReplicationAgent.target": "(name=reverse)" + "DistributionAgent.target": "(name=reverse)" } \ No newline at end of file diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.exporter.LocalReplicationPackageExporterFactory-default.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.packaging.impl.exporter.LocalDistributionPackageExporterFactory-default.json similarity index 100% rename from src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.exporter.LocalReplicationPackageExporterFactory-default.json rename to src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.packaging.impl.exporter.LocalDistributionPackageExporterFactory-default.json diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.importer.AdvancedRemoteReplicationPackageImporter-cache-flush.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.packaging.impl.importer.AdvancedRemoteDistributionPackageImporter-cache-flush.json similarity index 100% rename from src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.importer.AdvancedRemoteReplicationPackageImporter-cache-flush.json rename to src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.packaging.impl.importer.AdvancedRemoteDistributionPackageImporter-cache-flush.json diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.importer.LocalReplicationPackageImporterFactory-default.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.packaging.impl.importer.LocalDistributionPackageImporterFactory-default.json similarity index 100% rename from src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.importer.LocalReplicationPackageImporterFactory-default.json rename to src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.packaging.impl.importer.LocalDistributionPackageImporterFactory-default.json diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/org.apache.sling.event.jobs.QueueConfiguration-distribution.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/org.apache.sling.event.jobs.QueueConfiguration-distribution.json new file mode 100644 index 0000000..2b68424 --- /dev/null +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/org.apache.sling.event.jobs.QueueConfiguration-distribution.json @@ -0,0 +1,8 @@ +{ + "jcr:primaryType" : "sling:OsgiConfig", + "queue.name" : "org/apache/sling/distribution/queue/{0}", + "queue.retries" : "-1", + "queue.topics": "org/apache/sling/distribution/queue/*", + "queue.type" : "ORDERED" +} + diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-distribution.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-distribution.json new file mode 100644 index 0000000..10337b7 --- /dev/null +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-distribution.json @@ -0,0 +1,5 @@ +{ + "jcr:primaryType": "sling:OsgiConfig", + "user.default": "", + "user.mapping": "org.apache.sling.distribution.core:distributionService=admin" +} diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.OsgiPropertiesResourceProviderFactory-agents.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.OsgiPropertiesResourceProviderFactory-agents.json new file mode 100644 index 0000000..f2587ac --- /dev/null +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.OsgiPropertiesResourceProviderFactory-agents.json @@ -0,0 +1,13 @@ +{ + "jcr:primaryType": "sling:OsgiConfig", + "name": "distributionAgents", + "provider.roots": [ "/libs/sling/distribution/services/agents" ], + "serviceType": "org.apache.sling.distribution.agent.DistributionAgent", + "resourceProperties": [ + "sling:resourceType=sling/distribution/service/agent", + "sling:resourceSuperType=sling/distribution/service", + "name={name}", + + "queue/sling:resourceType=sling/distribution/service/agent/queue" + ] +} \ No newline at end of file diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.OsgiPropertiesResourceProviderFactory-exporters.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.OsgiPropertiesResourceProviderFactory-exporters.json new file mode 100644 index 0000000..e1b8e94 --- /dev/null +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.OsgiPropertiesResourceProviderFactory-exporters.json @@ -0,0 +1,12 @@ +{ + "jcr:primaryType": "sling:OsgiConfig", + "name": "distributionExporters", + "provider.roots": [ "/libs/sling/distribution/services/exporters" ], + "serviceType": "org.apache.sling.distribution.packaging.DistributionPackageExporter", + "resourceProperties": [ + "sling:resourceType=sling/distribution/service/exporter", + "sling:resourceSuperType=sling/distribution/service", + + "name={name}" + ] +} \ No newline at end of file diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.OsgiPropertiesResourceProviderFactory-importers.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.OsgiPropertiesResourceProviderFactory-importers.json new file mode 100644 index 0000000..1964678 --- /dev/null +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.OsgiPropertiesResourceProviderFactory-importers.json @@ -0,0 +1,12 @@ +{ + "jcr:primaryType": "sling:OsgiConfig", + "name": "distributionImporters", + "provider.roots": [ "/libs/sling/distribution/services/importers" ], + "serviceType": "org.apache.sling.distribution.packaging.DistributionPackageImporter", + "resourceProperties": [ + "sling:resourceType=sling/distribution/service/importer", + "sling:resourceSuperType=sling/distribution/service", + + "name={name}" + ] +} \ No newline at end of file diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.OsgiPropertiesResourceProviderFactory-triggers.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.OsgiPropertiesResourceProviderFactory-triggers.json new file mode 100644 index 0000000..cf30532 --- /dev/null +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.OsgiPropertiesResourceProviderFactory-triggers.json @@ -0,0 +1,12 @@ +{ + "jcr:primaryType": "sling:OsgiConfig", + "name": "distributionTriggers", + "provider.roots": [ "/libs/sling/distribution/services/triggers" ], + "serviceType": "org.apache.sling.distribution.trigger.DistributionTrigger", + "resourceProperties": [ + "sling:resourceType=sling/distribution/service/trigger", + "sling:resourceSuperType=sling/distribution/service", + + "name={name}" + ] +} \ No newline at end of file diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/settings/org.apache.sling.distribution.resources.impl.OsgiPropertiesResourceProviderFactory-simpleAgents.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/settings/org.apache.sling.distribution.resources.impl.OsgiPropertiesResourceProviderFactory-simpleAgents.json new file mode 100644 index 0000000..91825dd --- /dev/null +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/settings/org.apache.sling.distribution.resources.impl.OsgiPropertiesResourceProviderFactory-simpleAgents.json @@ -0,0 +1,18 @@ +{ + "jcr:primaryType": "sling:OsgiConfig", + "name": "simpleAgents", + "provider.roots": [ "/libs/sling/distribution/settings/agents" ], + "serviceType": "org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory", + "providerType": "osgiConfig", + "groupPrefix": "agents", + + "resourceProperties": [ + "sling:resourceType=sling/distribution/setting/agent", + "sling:resourceSuperType=sling/distribution/setting", + "name={name}", + "packageExporter={packageExporter}", + "packageImporter={packageImporter}" + ] + + +} \ No newline at end of file diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/service/agent/replicate.html.esp b/src/main/resources/SLING-CONTENT/libs/sling/distribution/service/agent/replicate.html.esp similarity index 100% rename from src/main/resources/SLING-CONTENT/libs/sling/replication/service/agent/replicate.html.esp rename to src/main/resources/SLING-CONTENT/libs/sling/distribution/service/agent/replicate.html.esp diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/service/html.esp b/src/main/resources/SLING-CONTENT/libs/sling/distribution/service/html.esp similarity index 100% rename from src/main/resources/SLING-CONTENT/libs/sling/replication/service/html.esp rename to src/main/resources/SLING-CONTENT/libs/sling/distribution/service/html.esp diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/service/list/html.esp b/src/main/resources/SLING-CONTENT/libs/sling/distribution/service/list/html.esp similarity index 92% rename from src/main/resources/SLING-CONTENT/libs/sling/replication/service/list/html.esp rename to src/main/resources/SLING-CONTENT/libs/sling/distribution/service/list/html.esp index b86c0be..fec9698 100644 --- a/src/main/resources/SLING-CONTENT/libs/sling/replication/service/list/html.esp +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/service/list/html.esp @@ -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> diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/setting/html.esp b/src/main/resources/SLING-CONTENT/libs/sling/distribution/setting/html.esp similarity index 90% rename from src/main/resources/SLING-CONTENT/libs/sling/replication/setting/html.esp rename to src/main/resources/SLING-CONTENT/libs/sling/distribution/setting/html.esp index 1bb968c..640beaf 100644 --- a/src/main/resources/SLING-CONTENT/libs/sling/replication/setting/html.esp +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/setting/html.esp @@ -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> diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/setting/list/html.esp b/src/main/resources/SLING-CONTENT/libs/sling/distribution/setting/list/html.esp similarity index 87% rename from src/main/resources/SLING-CONTENT/libs/sling/replication/setting/list/html.esp rename to src/main/resources/SLING-CONTENT/libs/sling/distribution/setting/list/html.esp index b327903..fd018aa 100644 --- a/src/main/resources/SLING-CONTENT/libs/sling/replication/setting/list/html.esp +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/setting/list/html.esp @@ -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"); %> diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.CoordinatingReplicationAgentFactory-pubsync.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.CoordinatingReplicationAgentFactory-pubsync.json deleted file mode 100644 index 6144bac..0000000 --- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.CoordinatingReplicationAgentFactory-pubsync.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "jcr:primaryType": "sling:OsgiConfig", - "name": "pubsync", - - "serviceName" : "replicationService", - - "requestAuthorizationStrategy" : [ - "type=privilege", - "jcrPrivilege=jcr:read" - ], - - "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.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.strategy=All" - ], - - "queueProvider.target" : "(name=sjh)", - - "queueDistributionStrategy.target": "(name=error)", - - "transportAuthenticationProvider.target" : "(name=publishAdmin)" -} \ No newline at end of file diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install/org.apache.sling.event.jobs.QueueConfiguration-replication.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install/org.apache.sling.event.jobs.QueueConfiguration-replication.json deleted file mode 100644 index a75062b..0000000 --- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install/org.apache.sling.event.jobs.QueueConfiguration-replication.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "jcr:primaryType" : "sling:OsgiConfig", - "queue.name" : "org/apache/sling/replication/queue/{0}", - "queue.retries" : "-1", - "queue.topics": "org/apache/sling/replication/queue/*", - "queue.type" : "ORDERED" -} - diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-replication.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-replication.json deleted file mode 100644 index 33c0a62..0000000 --- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-replication.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "jcr:primaryType": "sling:OsgiConfig", - "user.default": "", - "user.mapping": "org.apache.sling.replication.core:replicationService=admin" -} diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/services/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-agents.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/services/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-agents.json deleted file mode 100644 index 5d166ff..0000000 --- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/services/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-agents.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "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}", - - "queue/sling:resourceType=sling/replication/service/agent/queue" - ] -} \ No newline at end of file diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/services/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-exporters.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/services/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-exporters.json deleted file mode 100644 index 58180b6..0000000 --- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/services/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-exporters.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "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", - - "name={name}" - ] -} \ No newline at end of file diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/services/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-importers.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/services/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-importers.json deleted file mode 100644 index 85b4e30..0000000 --- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/services/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-importers.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "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", - - "name={name}" - ] -} \ No newline at end of file diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/services/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-triggers.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/services/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-triggers.json deleted file mode 100644 index 14c715e..0000000 --- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/services/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-triggers.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "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", - - "name={name}" - ] -} \ No newline at end of file diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/settings/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-simpleAgents.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/settings/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-simpleAgents.json deleted file mode 100644 index 7a81cd2..0000000 --- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/settings/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-simpleAgents.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "jcr:primaryType": "sling:OsgiConfig", - "name": "simpleAgents", - "provider.roots": [ "/libs/sling/replication/settings/agents" ], - "serviceType": "org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory", - "providerType": "osgiConfig", - "groupPrefix": "agents", - - "resourceProperties": [ - "sling:resourceType=sling/replication/setting/agent", - "sling:resourceSuperType=sling/replication/setting", - "name={name}", - "packageExporter={packageExporter}", - "packageImporter={packageImporter}" - ] - - -} \ No newline at end of file -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
