You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 09:30:25 UTC
[sling-org-apache-sling-distribution-sample] annotated tag
org.apache.sling.distribution.sample-0.1.2 created (now a1a7b2c)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change to annotated tag org.apache.sling.distribution.sample-0.1.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-sample.git.
at a1a7b2c (tag)
tagging d8faeaaf267bd2df35b44605e2a296b61d36a88d (commit)
by Marius Petria
on Wed Jul 29 13:37:04 2015 +0000
- Log -----------------------------------------------------------------
org.apache.sling.distribution.sample-0.1.2
-----------------------------------------------------------------------
This annotated tag includes the following new commits:
new bb3b2c9 SLING-3978 - added 'sample' replication bundle
new dae9ac1 SLING-3978 - adjusted service user mapping to match the core sybmolic name
new 7a2e3b7 no Jira - ignored IntelliJ's config files
new 5bd1d0c Update to Sling Parent POM 22 with baselining enabled
new f9e18f3 SLING-3992 - added coordinating agent(factory), fixed some defaults (scheduling,remote polling)
new 3517e55 SLING-3994 - simplified replication components' dependency management, minor javadoc adjustments
new 490010a SLING-4008 - added JcrEventReplicationTrigger
new 2e50078 SLING-3993 - added an abstract jcr event trigger to avoid loops with two implementations(current and another persisting and replicating the event itself)
new 953e611 SLING-3899 - applied Marius patch to add the resource resolved to all APIs
new a820b02 SLING-4052 - cleaned up jcr pacakges
new 12e552a SLING-4052 - cleaned up jcr pacakges
new 47dfebf SLING-3899 - using authorization strategy for checking resource resolver
new f906ea1 SLING-4073 - replication component factory declaring accepted properties for component creation
new abb4084 SLING-4106 - cleand up agent API, moved replication component stuff to component package
new 6d442b4 SLING-4120: cleaned ReplicationQueueProvider of quueue creation/deletion semantics
new 2426062 SLING-4132 - fixed event listeners registration
new 9197ae5 SLING-4060: initial refactoring for property parsing
new cfb06b5 SLING-4140 - renamed and moved Sling Replication to Sling Content Distribution
new 877bcc6 SLING-4140 - renamed and moved Sling Replication to Sling Content Distribution
new b8059df SLING-4144 - split distribution api and core bundles
new 4124bc3 SLING-4149: adding component factories based on resources
new 5a26d72 SLING-4149: renaming factory to resource based & adding defaults
new d74cef5 Ignore Eclipse .settings folder
new 4bb3044 SLING-4153 - improve javadoc, added distribution request state, minor fixes
new 5990eef SLING-4514: Generating OSGI configs from content and starting services using osgi services
new 1f94f01 SLING-4154: making also importers and exporters to be picked up by content based factory
new c448282 SLING-4153 - fixed transport API to just expose the secret
new 8fa1d60 SLING-4153 - fixed transport API to just expose the secret
new 84aef53 SLING-4153: changing events to be controlled by agent + some name changes for settings
new 13ab803 SLING-4054: adding package builder based on jcr packages
new cfd7edf SLING-4060: creating dedicated factories for sync and queue agents
new 5cbd816 SLING-4153: adjusting osgi configs to dedicated factories
new 3a5baef SLING-4009: implementing multiple queue dispatch strategy to have one queue per receiving endpoint
new 1d73477 SLING-4289: refactoring the resourceproviders for osgi configs and osgi services
new 10bbfbe SLING-4009: making multiple queue delivery option explicit via osgi config
new b8aa8c2 SLING-4292: exposing queue and queue items as resources
new a7f7f3c SLING-4324: spliting LocalDistributionTriggerFactory in specific factories
new 662df30 SLING-4341: removing package also when a package is deleted from queue
new da3ebed SLING-4392: removing mechanism for generating osgi configs from jcr descriptions
new 45afb9f Added eclipse project files to svn:ignore
new ec12364 [maven-release-plugin] prepare release org.apache.sling.distribution.sample-0.1.0
new 081974d [maven-release-plugin] prepare for next development iteration
new 91a8d2e Adding pull items configuration to distribution sync agents + depending on snapshots until release
new e59b8d7 SLING-4629: allow configuration of passive queues, for which processing is not enabled
new 1472672 Add missing licence headers
new b9b610d SLING-4727: add customization options for temp folders in vlt package builders
new 74566b2 Update contrib modules to Parent 23
new c35a501 set parent version to 24 and add empty relativePath where missing
new 27f8664 SLING-4913: support include and exclude patterns for distribution packages
new 35dd60b [maven-release-plugin] prepare release org.apache.sling.distribution.sample-0.1.2
new d8faeaa [maven-release-plugin] copy for tag org.apache.sling.distribution.sample-0.1.2
The 51 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
--
To stop receiving notification emails like this one, please contact
['"commits@sling.apache.org" <co...@sling.apache.org>'].
[sling-org-apache-sling-distribution-sample] 10/12: SLING-4913:
support include and exclude patterns for distribution packages
Posted by ro...@apache.org.
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.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-sample.git
commit 27f86642c26126d41f237152c2c32e5f3cab2f80
Author: Marius Petria <mp...@apache.org>
AuthorDate: Wed Jul 29 09:14:26 2015 +0000
SLING-4913: support include and exclude patterns for distribution packages
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/sample@1693222 13f79535-47bb-0310-9956-ffa450edef68
---
...rialization.impl.vlt.VaultDistributionPackageBuilderFactory-vlt.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/org.apache.sling.distribution.serialization.impl.vlt.VaultDistributionPackageBuilderFactory-vlt.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/org.apache.sling.distribution.serialization.impl.vlt.VaultDistributionPackageBuilderFactory-vlt.json
index 349afcf..396ee58 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/org.apache.sling.distribution.serialization.impl.vlt.VaultDistributionPackageBuilderFactory-vlt.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/org.apache.sling.distribution.serialization.impl.vlt.VaultDistributionPackageBuilderFactory-vlt.json
@@ -2,5 +2,5 @@
"jcr:primaryType": "sling:OsgiConfig",
"name": "vlt",
"type": "jcrvlt",
- "tempFsFolder": "/Users/mpetria/work/temp"
+ "package.filters": ["/content|-.*/excluded"]
}
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-distribution-sample] 07/12: SLING-4727: add
customization options for temp folders in vlt package builders
Posted by ro...@apache.org.
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.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-sample.git
commit b9b610d2a812753edfe1e6d70c74216571457bd0
Author: Marius Petria <mp...@apache.org>
AuthorDate: Tue May 19 14:57:35 2015 +0000
SLING-4727: add customization options for temp folders in vlt package builders
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/sample@1680309 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 3 ++-
...ribution.agent.impl.QueueDistributionAgentFactory-temp.json | 10 ++++++++++
....exporter.AgentDistributionPackageExporterFactory-temp.json | 6 ++++++
....importer.LocalDistributionPackageImporterFactory-temp.json | 6 ++++++
...mpl.vlt.VaultDistributionPackageBuilderFactory-tempvlt.json | 7 +++++++
...on.impl.vlt.VaultDistributionPackageBuilderFactory-vlt.json | 3 ++-
.../SLING-CONTENT/var/sling/distribution/jcrpackages.json | 3 +++
.../SLING-CONTENT/var/sling/distribution/packages.json | 3 +++
8 files changed, 39 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 84d443a..f65b9f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,7 +67,8 @@
<instructions>
<Bundle-SymbolicName>org.apache.sling.distribution.sample</Bundle-SymbolicName>
<Sling-Initial-Content>
- SLING-CONTENT/libs/sling/distribution;path:=/libs/sling/distribution;overwrite:=true
+ SLING-CONTENT/libs/sling/distribution;path:=/libs/sling/distribution;overwrite:=true,
+ SLING-CONTENT/var/sling/distribution;path:=/var/sling/distribution;overwrite:=true
</Sling-Initial-Content>
</instructions>
</configuration>
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/impexp/org.apache.sling.distribution.agent.impl.QueueDistributionAgentFactory-temp.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/impexp/org.apache.sling.distribution.agent.impl.QueueDistributionAgentFactory-temp.json
new file mode 100644
index 0000000..dad003d
--- /dev/null
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/impexp/org.apache.sling.distribution.agent.impl.QueueDistributionAgentFactory-temp.json
@@ -0,0 +1,10 @@
+{
+ "jcr:primaryType": "sling:OsgiConfig",
+ "name": "temp",
+
+ "serviceName" : "distributionService",
+
+ "requestAuthorizationStrategy.target" : "(name=privilegeRead)",
+
+ "packageBuilder.target" : "(name=tempvlt)"
+}
\ No newline at end of file
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/impexp/org.apache.sling.distribution.packaging.impl.exporter.AgentDistributionPackageExporterFactory-temp.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/impexp/org.apache.sling.distribution.packaging.impl.exporter.AgentDistributionPackageExporterFactory-temp.json
new file mode 100644
index 0000000..cd1ab11
--- /dev/null
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/impexp/org.apache.sling.distribution.packaging.impl.exporter.AgentDistributionPackageExporterFactory-temp.json
@@ -0,0 +1,6 @@
+{
+ "jcr:primaryType": "sling:OsgiConfig",
+ "name": "temp",
+
+ "agent.target": "(name=temp)"
+}
\ No newline at end of file
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/impexp/org.apache.sling.distribution.packaging.impl.importer.LocalDistributionPackageImporterFactory-temp.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/impexp/org.apache.sling.distribution.packaging.impl.importer.LocalDistributionPackageImporterFactory-temp.json
new file mode 100644
index 0000000..657c503
--- /dev/null
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/impexp/org.apache.sling.distribution.packaging.impl.importer.LocalDistributionPackageImporterFactory-temp.json
@@ -0,0 +1,6 @@
+{
+ "jcr:primaryType": "sling:OsgiConfig",
+ "name": "temp",
+
+ "packageBuilder.target" : "(name=tempvlt)"
+}
\ No newline at end of file
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/impexp/org.apache.sling.distribution.serialization.impl.vlt.VaultDistributionPackageBuilderFactory-tempvlt.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/impexp/org.apache.sling.distribution.serialization.impl.vlt.VaultDistributionPackageBuilderFactory-tempvlt.json
new file mode 100644
index 0000000..37c970b
--- /dev/null
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/impexp/org.apache.sling.distribution.serialization.impl.vlt.VaultDistributionPackageBuilderFactory-tempvlt.json
@@ -0,0 +1,7 @@
+{
+ "jcr:primaryType": "sling:OsgiConfig",
+ "name": "tempvlt",
+ "type": "jcrvlt",
+ "tempJcrFolder" : "/var/sling/distribution/jcrpackages",
+ "tempFsFolder" : "/var/sling/distribution/packages"
+}
\ No newline at end of file
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/org.apache.sling.distribution.serialization.impl.vlt.VaultDistributionPackageBuilderFactory-vlt.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/org.apache.sling.distribution.serialization.impl.vlt.VaultDistributionPackageBuilderFactory-vlt.json
index 931dc79..349afcf 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/org.apache.sling.distribution.serialization.impl.vlt.VaultDistributionPackageBuilderFactory-vlt.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/org.apache.sling.distribution.serialization.impl.vlt.VaultDistributionPackageBuilderFactory-vlt.json
@@ -1,5 +1,6 @@
{
"jcr:primaryType": "sling:OsgiConfig",
"name": "vlt",
- "type": "jcrvlt"
+ "type": "jcrvlt",
+ "tempFsFolder": "/Users/mpetria/work/temp"
}
\ No newline at end of file
diff --git a/src/main/resources/SLING-CONTENT/var/sling/distribution/jcrpackages.json b/src/main/resources/SLING-CONTENT/var/sling/distribution/jcrpackages.json
new file mode 100644
index 0000000..68baa9c
--- /dev/null
+++ b/src/main/resources/SLING-CONTENT/var/sling/distribution/jcrpackages.json
@@ -0,0 +1,3 @@
+{
+ "jcr:primaryType": "sling:Folder"
+}
\ No newline at end of file
diff --git a/src/main/resources/SLING-CONTENT/var/sling/distribution/packages.json b/src/main/resources/SLING-CONTENT/var/sling/distribution/packages.json
new file mode 100644
index 0000000..68baa9c
--- /dev/null
+++ b/src/main/resources/SLING-CONTENT/var/sling/distribution/packages.json
@@ -0,0 +1,3 @@
+{
+ "jcr:primaryType": "sling:Folder"
+}
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-distribution-sample] 06/12: Add missing
licence headers
Posted by ro...@apache.org.
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.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-sample.git
commit 1472672b91b5ccbce72ce90af8dfc73f3c91efd7
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Apr 28 06:41:42 2015 +0000
Add missing licence headers
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/sample@1676415 13f79535-47bb-0310-9956-ffa450edef68
---
.../distribution/service/agent/replicate.html.esp | 18 ++++++++++++++++++
.../libs/sling/distribution/service/html.esp | 18 ++++++++++++++++++
.../libs/sling/distribution/service/list/html.esp | 18 ++++++++++++++++++
.../libs/sling/distribution/setting/html.esp | 18 ++++++++++++++++++
.../libs/sling/distribution/setting/list/html.esp | 18 ++++++++++++++++++
5 files changed, 90 insertions(+)
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/service/agent/replicate.html.esp b/src/main/resources/SLING-CONTENT/libs/sling/distribution/service/agent/replicate.html.esp
index 9612ed7..f2247fc 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/service/agent/replicate.html.esp
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/service/agent/replicate.html.esp
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
<%
var valueMap = resource.adaptTo(Packages.org.apache.sling.api.resource.ValueMap);
var pit = valueMap.keySet().iterator();
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/service/html.esp b/src/main/resources/SLING-CONTENT/libs/sling/distribution/service/html.esp
index e2fc96d..63b339a 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/service/html.esp
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/service/html.esp
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
<%
var valueMap = resource.adaptTo(Packages.org.apache.sling.api.resource.ValueMap);
var pit = valueMap.keySet().iterator();
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/service/list/html.esp b/src/main/resources/SLING-CONTENT/libs/sling/distribution/service/list/html.esp
index fec9698..d1a56fa 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/service/list/html.esp
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/service/list/html.esp
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
<%
var settingsUrl = request.contextPath + "/libs/sling/distribution/settings/";
var valueMap = resource.adaptTo(Packages.org.apache.sling.api.resource.ValueMap);
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/setting/html.esp b/src/main/resources/SLING-CONTENT/libs/sling/distribution/setting/html.esp
index 640beaf..80b924d 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/setting/html.esp
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/setting/html.esp
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
<%
var valueMap = resource.adaptTo(Packages.org.apache.sling.api.resource.ValueMap);
var pit = valueMap.keySet().iterator();
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/setting/list/html.esp b/src/main/resources/SLING-CONTENT/libs/sling/distribution/setting/list/html.esp
index fd018aa..7cc944b 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/setting/list/html.esp
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/setting/list/html.esp
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
<%
var settingsUrl = request.contextPath + "/libs/sling/distribution/settings/"
var valueMap = resource.adaptTo(Packages.org.apache.sling.api.resource.ValueMap);
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-distribution-sample] 04/12: Adding pull
items configuration to distribution sync agents + depending on snapshots
until release
Posted by ro...@apache.org.
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.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-sample.git
commit 91a8d2e04953d042272373ed4a99b7eecdbd399c
Author: Marius Petria <mp...@apache.org>
AuthorDate: Wed Mar 25 11:55:00 2015 +0000
Adding pull items configuration to distribution sync agents + depending on snapshots until release
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/sample@1669098 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 --------
1 file changed, 8 deletions(-)
diff --git a/pom.xml b/pom.xml
index 13cb322..4658953 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,14 +83,6 @@
<!-- D E P E N D E N C I E S -->
<!-- ======================================================================= -->
<dependencies>
-
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.distribution.core</artifactId>
- <version>0.1.0</version>
- <scope>provided</scope>
- </dependency>
-
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-distribution-sample] 01/12: Added eclipse
project files to svn:ignore
Posted by ro...@apache.org.
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.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-sample.git
commit 45afb9f0c5f662f0bf3ba2dc4a4c241ed5f53ad0
Author: Tomasz Rekawek <to...@apache.org>
AuthorDate: Thu Feb 12 18:59:21 2015 +0000
Added eclipse project files to svn:ignore
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/sample@1659362 13f79535-47bb-0310-9956-ffa450edef68
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-distribution-sample] 08/12: Update contrib
modules to Parent 23
Posted by ro...@apache.org.
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.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-sample.git
commit 74566b2dbfb2cb6e4f0e47c022ccfb13035e08bd
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Thu Jun 25 13:10:59 2015 +0000
Update contrib modules to Parent 23
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/sample@1687503 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index f65b9f0..1ac9939 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>22</version>
+ <version>23</version>
</parent>
<!-- ======================================================================= -->
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-distribution-sample] 11/12:
[maven-release-plugin] prepare release
org.apache.sling.distribution.sample-0.1.2
Posted by ro...@apache.org.
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.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-sample.git
commit 35dd60b9a0896aa1c3bdfa463992a38d8d44f729
Author: Marius Petria <mp...@apache.org>
AuthorDate: Wed Jul 29 13:36:50 2015 +0000
[maven-release-plugin] prepare release org.apache.sling.distribution.sample-0.1.2
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/sample@1693259 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index 142c323..304cb2b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,14 +26,14 @@
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
<version>24</version>
- <relativePath/>
+ <relativePath />
</parent>
<!-- ======================================================================= -->
<!-- P R O J E C T -->
<!-- ======================================================================= -->
<artifactId>org.apache.sling.distribution.sample</artifactId>
- <version>0.1.1-SNAPSHOT</version>
+ <version>0.1.2</version>
<packaging>bundle</packaging>
<name>Apache Sling Distribution Sample</name>
@@ -42,9 +42,9 @@
</description>
<scm>
- <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>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.distribution.sample-0.1.2</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.distribution.sample-0.1.2</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.distribution.sample-0.1.2</url>
</scm>
<!-- ======================================================================= -->
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-distribution-sample] 09/12: set parent
version to 24 and add empty relativePath where missing
Posted by ro...@apache.org.
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.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-sample.git
commit c35a5016b893c1f1698011e28b523cf6b26c0c43
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Jul 7 07:36:29 2015 +0000
set parent version to 24 and add empty relativePath where missing
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/sample@1689588 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 1ac9939..142c323 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,8 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>23</version>
+ <version>24</version>
+ <relativePath/>
</parent>
<!-- ======================================================================= -->
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-distribution-sample] 03/12:
[maven-release-plugin] prepare for next development iteration
Posted by ro...@apache.org.
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.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-sample.git
commit 081974d6c6cead660039c9bfc373e3756f00cf05
Author: Tommaso Teofili <to...@apache.org>
AuthorDate: Tue Mar 24 14:12:28 2015 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/sample@1668902 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index ad46fbc..13cb322 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
<!-- P R O J E C T -->
<!-- ======================================================================= -->
<artifactId>org.apache.sling.distribution.sample</artifactId>
- <version>0.1.0</version>
+ <version>0.1.1-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Sling Distribution Sample</name>
@@ -41,9 +41,9 @@
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.distribution.sample-0.1.0</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.distribution.sample-0.1.0</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.distribution.sample-0.1.0</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>
<!-- ======================================================================= -->
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-distribution-sample] 05/12: SLING-4629:
allow configuration of passive queues, for which processing is not enabled
Posted by ro...@apache.org.
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.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-sample.git
commit e59b8d707d132db1447501355cf2593ed1d12ba8
Author: Marius Petria <mp...@apache.org>
AuthorDate: Mon Apr 20 13:27:20 2015 +0000
SLING-4629: allow configuration of passive queues, for which processing is not enabled
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/sample@1674843 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 28 ++++++-
.../org/apache/sling/distribution/test/Init.java | 90 ++++++++++++++++++++++
...dDistributionAgentFactory-publish-multiple.json | 4 +
...ionPackageExporterFactory-publish-multiple.json | 8 ++
...ServiceUserMapperImpl.amended-distribution.json | 2 +-
5 files changed, 130 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 4658953..84d443a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -93,7 +93,33 @@
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
</dependency>
-
+ <dependency>
+ <groupId>javax.jcr</groupId>
+ <artifactId>jcr</artifactId>
+ <version>2.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-api</artifactId>
+ <version>2.9.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.jcr.api</artifactId>
+ <version>2.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.6.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-jcr-commons</artifactId>
+ <version>2.9.0</version>
+ </dependency>
</dependencies>
<reporting>
<plugins>
diff --git a/src/main/java/org/apache/sling/distribution/test/Init.java b/src/main/java/org/apache/sling/distribution/test/Init.java
new file mode 100644
index 0000000..409b3b2
--- /dev/null
+++ b/src/main/java/org/apache/sling/distribution/test/Init.java
@@ -0,0 +1,90 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.apache.sling.distribution.test;
+
+import org.apache.felix.scr.annotations.Activate;
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Reference;
+import org.apache.jackrabbit.api.JackrabbitSession;
+import org.apache.jackrabbit.api.security.user.Authorizable;
+import org.apache.jackrabbit.api.security.user.UserManager;
+import javax.jcr.security.Privilege;
+import org.apache.jackrabbit.commons.jackrabbit.authorization.AccessControlUtils;
+import org.apache.sling.jcr.api.SlingRepository;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+import javax.jcr.Session;
+
+
+@Component(immediate = true)
+public class Init {
+
+ Logger log = LoggerFactory.getLogger(getClass());
+
+ @Reference
+ SlingRepository slingRepository;
+
+ @Activate
+ public void activate() throws Exception {
+
+ try {
+ final String userName = "testDistributionUser";
+ Session session = slingRepository.loginAdministrative(null);
+
+ JackrabbitSession jackrabittSession = (JackrabbitSession) session;
+ UserManager userManager = jackrabittSession.getUserManager();
+ Authorizable user = userManager.getAuthorizable(userName);
+
+ if (user == null) {
+ try {
+ user = userManager.createSystemUser(userName, null);
+ log.error("created system user", user);
+
+ } catch (Throwable t) {
+ user = userManager.createUser(userName, "123");
+ log.error("created regular user", user);
+
+ }
+ }
+
+ if (user != null) {
+ AccessControlUtils.addAccessControlEntry(session, "/", user.getPrincipal(), new String[]{ Privilege.JCR_ALL }, true);
+
+ AccessControlUtils.addAccessControlEntry(session, null, user.getPrincipal(), new String[]{ Privilege.JCR_ALL }, true);
+
+ session.save();
+
+ session.logout();
+ }
+
+ } catch (Throwable t) {
+ log.error("cannot create user", t);
+ }
+
+
+
+ }
+
+
+
+}
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/publish-multiple/org.apache.sling.distribution.agent.impl.ForwardDistributionAgentFactory-publish-multiple.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/publish-multiple/org.apache.sling.distribution.agent.impl.ForwardDistributionAgentFactory-publish-multiple.json
index 5dcfcb6..11f9533 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/publish-multiple/org.apache.sling.distribution.agent.impl.ForwardDistributionAgentFactory-publish-multiple.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/publish-multiple/org.apache.sling.distribution.agent.impl.ForwardDistributionAgentFactory-publish-multiple.json
@@ -16,5 +16,9 @@
"packageImporter.endpoints" : [
"endpoint1=http://localhost:4503/libs/sling/distribution/services/importers/default",
"endpoint2=http://localhost:4503/libs/sling/distribution/services/importers/defaultbadaddress"
+ ],
+
+ "passiveQueues" : [
+ "passivequeue1"
]
}
\ No newline at end of file
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/publish-multiple/org.apache.sling.distribution.packaging.impl.exporter.AgentDistributionPackageExporterFactory-publish-multiple.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/publish-multiple/org.apache.sling.distribution.packaging.impl.exporter.AgentDistributionPackageExporterFactory-publish-multiple.json
new file mode 100644
index 0000000..0d1045b
--- /dev/null
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/publish-multiple/org.apache.sling.distribution.packaging.impl.exporter.AgentDistributionPackageExporterFactory-publish-multiple.json
@@ -0,0 +1,8 @@
+{
+ "jcr:primaryType": "sling:OsgiConfig",
+ "name": "publish-multiple-passivequeue1",
+
+ "agent.target": "(name=publish-multiple)",
+
+ "queue": "passivequeue1"
+}
\ No newline at end of file
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
index 10337b7..85cde3d 100644
--- 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
@@ -1,5 +1,5 @@
{
"jcr:primaryType": "sling:OsgiConfig",
"user.default": "",
- "user.mapping": "org.apache.sling.distribution.core:distributionService=admin"
+ "user.mapping": "org.apache.sling.distribution.core:distributionService=testDistributionUser"
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-distribution-sample] 02/12:
[maven-release-plugin] prepare release
org.apache.sling.distribution.sample-0.1.0
Posted by ro...@apache.org.
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.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-sample.git
commit ec1236416398bb75dfa7d7550412b96bf3de8c33
Author: Tommaso Teofili <to...@apache.org>
AuthorDate: Tue Mar 24 14:12:19 2015 +0000
[maven-release-plugin] prepare release org.apache.sling.distribution.sample-0.1.0
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/sample@1668900 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index a250a62..ad46fbc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,8 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<!-- ======================================================================= -->
<!-- P A R E N T P R O J E C T -->
@@ -33,7 +32,7 @@
<!-- P R O J E C T -->
<!-- ======================================================================= -->
<artifactId>org.apache.sling.distribution.sample</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.1.0</version>
<packaging>bundle</packaging>
<name>Apache Sling Distribution Sample</name>
@@ -42,9 +41,9 @@
</description>
<scm>
- <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>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.distribution.sample-0.1.0</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.distribution.sample-0.1.0</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.distribution.sample-0.1.0</url>
</scm>
<!-- ======================================================================= -->
@@ -88,7 +87,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.distribution.core</artifactId>
- <version>${project.version}</version>
+ <version>0.1.0</version>
<scope>provided</scope>
</dependency>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-distribution-sample] 12/12:
[maven-release-plugin] copy for tag
org.apache.sling.distribution.sample-0.1.2
Posted by ro...@apache.org.
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.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-sample.git
commit d8faeaaf267bd2df35b44605e2a296b61d36a88d
Author: Marius Petria <mp...@apache.org>
AuthorDate: Wed Jul 29 13:37:04 2015 +0000
[maven-release-plugin] copy for tag org.apache.sling.distribution.sample-0.1.2
git-svn-id: https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.distribution.sample-0.1.2@1693260 13f79535-47bb-0310-9956-ffa450edef68
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.