You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bd...@apache.org on 2017/09/26 12:40:40 UTC
[05/30] sling-site git commit: Resync with svn content at revision
1809724
http://git-wip-us.apache.org/repos/asf/sling-site/blob/f47e8676/components/maven-sling-plugin/install-file-mojo.html
----------------------------------------------------------------------
diff --git a/components/maven-sling-plugin/install-file-mojo.html b/components/maven-sling-plugin/install-file-mojo.html
index e43d285..68f35db 100644
--- a/components/maven-sling-plugin/install-file-mojo.html
+++ b/components/maven-sling-plugin/install-file-mojo.html
@@ -1,13 +1,13 @@
<!DOCTYPE html>
<!--
- | Generated by Apache Maven Doxia Site Renderer 1.7.1 at 2017-06-02
+ | Generated by Apache Maven Doxia Site Renderer 1.7.1 at 2017-09-23
| Rendered using Apache Maven Fluido Skin 1.6
-->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20170602" />
+ <meta name="Date-Revision-yyyymmdd" content="20170923" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache Sling Maven Sling Plugin – sling:install-file</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" />
@@ -27,9 +27,9 @@
<div id="breadcrumbs">
<ul class="breadcrumb">
- <li id="publishDate">Last Published: 2017-06-02<span class="divider">|</span>
+ <li id="publishDate">Last Published: 2017-09-23<span class="divider">|</span>
</li>
- <li id="projectVersion">Version: 2.3.0</li>
+ <li id="projectVersion">Version: 2.3.2</li>
</ul>
</div>
<div class="row-fluid">
@@ -61,7 +61,7 @@
<p><b>Full name</b>:</p>
-<p>org.apache.sling:maven-sling-plugin:2.3.0:install-file</p>
+<p>org.apache.sling:maven-sling-plugin:2.3.2:install-file</p>
<p><b>Description</b>:</p>
http://git-wip-us.apache.org/repos/asf/sling-site/blob/f47e8676/components/maven-sling-plugin/install-mojo.html
----------------------------------------------------------------------
diff --git a/components/maven-sling-plugin/install-mojo.html b/components/maven-sling-plugin/install-mojo.html
index 1d79d2f..260f5e9 100644
--- a/components/maven-sling-plugin/install-mojo.html
+++ b/components/maven-sling-plugin/install-mojo.html
@@ -1,13 +1,13 @@
<!DOCTYPE html>
<!--
- | Generated by Apache Maven Doxia Site Renderer 1.7.1 at 2017-06-02
+ | Generated by Apache Maven Doxia Site Renderer 1.7.1 at 2017-09-23
| Rendered using Apache Maven Fluido Skin 1.6
-->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20170602" />
+ <meta name="Date-Revision-yyyymmdd" content="20170923" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache Sling Maven Sling Plugin – sling:install</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" />
@@ -27,9 +27,9 @@
<div id="breadcrumbs">
<ul class="breadcrumb">
- <li id="publishDate">Last Published: 2017-06-02<span class="divider">|</span>
+ <li id="publishDate">Last Published: 2017-09-23<span class="divider">|</span>
</li>
- <li id="projectVersion">Version: 2.3.0</li>
+ <li id="projectVersion">Version: 2.3.2</li>
</ul>
</div>
<div class="row-fluid">
@@ -61,7 +61,7 @@
<p><b>Full name</b>:</p>
-<p>org.apache.sling:maven-sling-plugin:2.3.0:install</p>
+<p>org.apache.sling:maven-sling-plugin:2.3.2:install</p>
<p><b>Description</b>:</p>
http://git-wip-us.apache.org/repos/asf/sling-site/blob/f47e8676/components/maven-sling-plugin/issue-tracking.html
----------------------------------------------------------------------
diff --git a/components/maven-sling-plugin/issue-tracking.html b/components/maven-sling-plugin/issue-tracking.html
index 222bc64..f370ac4 100644
--- a/components/maven-sling-plugin/issue-tracking.html
+++ b/components/maven-sling-plugin/issue-tracking.html
@@ -1,13 +1,13 @@
<!DOCTYPE html>
<!--
- | Generated by Apache Maven Doxia Site Renderer 1.7.1 at 2017-06-02
+ | Generated by Apache Maven Doxia Site Renderer 1.7.1 at 2017-09-23
| Rendered using Apache Maven Fluido Skin 1.6
-->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20170602" />
+ <meta name="Date-Revision-yyyymmdd" content="20170923" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache Sling Maven Sling Plugin – Issue Management</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" />
@@ -27,9 +27,9 @@
<div id="breadcrumbs">
<ul class="breadcrumb">
- <li id="publishDate">Last Published: 2017-06-02<span class="divider">|</span>
+ <li id="publishDate">Last Published: 2017-09-23<span class="divider">|</span>
</li>
- <li id="projectVersion">Version: 2.3.0</li>
+ <li id="projectVersion">Version: 2.3.2</li>
</ul>
</div>
<div class="row-fluid">
http://git-wip-us.apache.org/repos/asf/sling-site/blob/f47e8676/components/maven-sling-plugin/jira-report.html
----------------------------------------------------------------------
diff --git a/components/maven-sling-plugin/jira-report.html b/components/maven-sling-plugin/jira-report.html
index 100d6b2..848e388 100644
--- a/components/maven-sling-plugin/jira-report.html
+++ b/components/maven-sling-plugin/jira-report.html
@@ -1,13 +1,13 @@
<!DOCTYPE html>
<!--
- | Generated by Apache Maven Doxia Site Renderer 1.7.1 at 2017-06-02
+ | Generated by Apache Maven Doxia Site Renderer 1.7.1 at 2017-09-23
| Rendered using Apache Maven Fluido Skin 1.6
-->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20170602" />
+ <meta name="Date-Revision-yyyymmdd" content="20170923" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache Sling Maven Sling Plugin – </title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" />
@@ -27,9 +27,9 @@
<div id="breadcrumbs">
<ul class="breadcrumb">
- <li id="publishDate">Last Published: 2017-06-02<span class="divider">|</span>
+ <li id="publishDate">Last Published: 2017-09-23<span class="divider">|</span>
</li>
- <li id="projectVersion">Version: 2.3.0</li>
+ <li id="projectVersion">Version: 2.3.2</li>
</ul>
</div>
<div class="row-fluid">
http://git-wip-us.apache.org/repos/asf/sling-site/blob/f47e8676/components/maven-sling-plugin/license.html
----------------------------------------------------------------------
diff --git a/components/maven-sling-plugin/license.html b/components/maven-sling-plugin/license.html
index bebf2ae..2667f56 100644
--- a/components/maven-sling-plugin/license.html
+++ b/components/maven-sling-plugin/license.html
@@ -1,13 +1,13 @@
<!DOCTYPE html>
<!--
- | Generated by Apache Maven Doxia Site Renderer 1.7.1 at 2017-06-02
+ | Generated by Apache Maven Doxia Site Renderer 1.7.1 at 2017-09-23
| Rendered using Apache Maven Fluido Skin 1.6
-->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20170602" />
+ <meta name="Date-Revision-yyyymmdd" content="20170923" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache Sling Maven Sling Plugin – Project Licenses</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" />
@@ -27,9 +27,9 @@
<div id="breadcrumbs">
<ul class="breadcrumb">
- <li id="publishDate">Last Published: 2017-06-02<span class="divider">|</span>
+ <li id="publishDate">Last Published: 2017-09-23<span class="divider">|</span>
</li>
- <li id="projectVersion">Version: 2.3.0</li>
+ <li id="projectVersion">Version: 2.3.2</li>
</ul>
</div>
<div class="row-fluid">
http://git-wip-us.apache.org/repos/asf/sling-site/blob/f47e8676/components/maven-sling-plugin/mail-lists.html
----------------------------------------------------------------------
diff --git a/components/maven-sling-plugin/mail-lists.html b/components/maven-sling-plugin/mail-lists.html
index bde039c..340198a 100644
--- a/components/maven-sling-plugin/mail-lists.html
+++ b/components/maven-sling-plugin/mail-lists.html
@@ -1,13 +1,13 @@
<!DOCTYPE html>
<!--
- | Generated by Apache Maven Doxia Site Renderer 1.7.1 at 2017-06-02
+ | Generated by Apache Maven Doxia Site Renderer 1.7.1 at 2017-09-23
| Rendered using Apache Maven Fluido Skin 1.6
-->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20170602" />
+ <meta name="Date-Revision-yyyymmdd" content="20170923" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache Sling Maven Sling Plugin – Project Mailing Lists</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" />
@@ -27,9 +27,9 @@
<div id="breadcrumbs">
<ul class="breadcrumb">
- <li id="publishDate">Last Published: 2017-06-02<span class="divider">|</span>
+ <li id="publishDate">Last Published: 2017-09-23<span class="divider">|</span>
</li>
- <li id="projectVersion">Version: 2.3.0</li>
+ <li id="projectVersion">Version: 2.3.2</li>
</ul>
</div>
<div class="row-fluid">
http://git-wip-us.apache.org/repos/asf/sling-site/blob/f47e8676/components/maven-sling-plugin/plugin-info.html
----------------------------------------------------------------------
diff --git a/components/maven-sling-plugin/plugin-info.html b/components/maven-sling-plugin/plugin-info.html
index dbd9bbe..baef876 100644
--- a/components/maven-sling-plugin/plugin-info.html
+++ b/components/maven-sling-plugin/plugin-info.html
@@ -1,13 +1,13 @@
<!DOCTYPE html>
<!--
- | Generated by Apache Maven Doxia Site Renderer 1.7.1 at 2017-06-02
+ | Generated by Apache Maven Doxia Site Renderer 1.7.1 at 2017-09-23
| Rendered using Apache Maven Fluido Skin 1.6
-->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20170602" />
+ <meta name="Date-Revision-yyyymmdd" content="20170923" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache Sling Maven Sling Plugin – Plugin Documentation</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" />
@@ -27,9 +27,9 @@
<div id="breadcrumbs">
<ul class="breadcrumb">
- <li id="publishDate">Last Published: 2017-06-02<span class="divider">|</span>
+ <li id="publishDate">Last Published: 2017-09-23<span class="divider">|</span>
</li>
- <li id="projectVersion">Version: 2.3.0</li>
+ <li id="projectVersion">Version: 2.3.2</li>
</ul>
</div>
<div class="row-fluid">
@@ -197,7 +197,7 @@ on the parameter <code>deploymentMethod</code>.</td></tr>
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>maven-sling-plugin</artifactId>
- <version>2.3.0</version>
+ <version>2.3.2</version>
</plugin>
...
</plugins>
@@ -207,7 +207,7 @@ on the parameter <code>deploymentMethod</code>.</td></tr>
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>maven-sling-plugin</artifactId>
- <version>2.3.0</version>
+ <version>2.3.2</version>
</plugin>
...
</plugins>
http://git-wip-us.apache.org/repos/asf/sling-site/blob/f47e8676/components/maven-sling-plugin/plugin-management.html
----------------------------------------------------------------------
diff --git a/components/maven-sling-plugin/plugin-management.html b/components/maven-sling-plugin/plugin-management.html
index f13054f..b42d3f1 100644
--- a/components/maven-sling-plugin/plugin-management.html
+++ b/components/maven-sling-plugin/plugin-management.html
@@ -1,13 +1,13 @@
<!DOCTYPE html>
<!--
- | Generated by Apache Maven Doxia Site Renderer 1.7.1 at 2017-06-02
+ | Generated by Apache Maven Doxia Site Renderer 1.7.1 at 2017-09-23
| Rendered using Apache Maven Fluido Skin 1.6
-->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20170602" />
+ <meta name="Date-Revision-yyyymmdd" content="20170923" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache Sling Maven Sling Plugin – Project Plugin Management</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" />
@@ -27,9 +27,9 @@
<div id="breadcrumbs">
<ul class="breadcrumb">
- <li id="publishDate">Last Published: 2017-06-02<span class="divider">|</span>
+ <li id="publishDate">Last Published: 2017-09-23<span class="divider">|</span>
</li>
- <li id="projectVersion">Version: 2.3.0</li>
+ <li id="projectVersion">Version: 2.3.2</li>
</ul>
</div>
<div class="row-fluid">
http://git-wip-us.apache.org/repos/asf/sling-site/blob/f47e8676/components/maven-sling-plugin/plugins.html
----------------------------------------------------------------------
diff --git a/components/maven-sling-plugin/plugins.html b/components/maven-sling-plugin/plugins.html
index c79e824..91a0b28 100644
--- a/components/maven-sling-plugin/plugins.html
+++ b/components/maven-sling-plugin/plugins.html
@@ -1,13 +1,13 @@
<!DOCTYPE html>
<!--
- | Generated by Apache Maven Doxia Site Renderer 1.7.1 at 2017-06-02
+ | Generated by Apache Maven Doxia Site Renderer 1.7.1 at 2017-09-23
| Rendered using Apache Maven Fluido Skin 1.6
-->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20170602" />
+ <meta name="Date-Revision-yyyymmdd" content="20170923" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache Sling Maven Sling Plugin – Project Plugins</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" />
@@ -27,9 +27,9 @@
<div id="breadcrumbs">
<ul class="breadcrumb">
- <li id="publishDate">Last Published: 2017-06-02<span class="divider">|</span>
+ <li id="publishDate">Last Published: 2017-09-23<span class="divider">|</span>
</li>
- <li id="projectVersion">Version: 2.3.0</li>
+ <li id="projectVersion">Version: 2.3.2</li>
</ul>
</div>
<div class="row-fluid">
http://git-wip-us.apache.org/repos/asf/sling-site/blob/f47e8676/components/maven-sling-plugin/project-info.html
----------------------------------------------------------------------
diff --git a/components/maven-sling-plugin/project-info.html b/components/maven-sling-plugin/project-info.html
index a460d8c..f9c0d57 100644
--- a/components/maven-sling-plugin/project-info.html
+++ b/components/maven-sling-plugin/project-info.html
@@ -1,13 +1,13 @@
<!DOCTYPE html>
<!--
- | Generated by Apache Maven Doxia Site Renderer 1.7.1 at 2017-06-02
+ | Generated by Apache Maven Doxia Site Renderer 1.7.1 at 2017-09-23
| Rendered using Apache Maven Fluido Skin 1.6
-->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20170602" />
+ <meta name="Date-Revision-yyyymmdd" content="20170923" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache Sling Maven Sling Plugin – Project Information</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" />
@@ -27,9 +27,9 @@
<div id="breadcrumbs">
<ul class="breadcrumb">
- <li id="publishDate">Last Published: 2017-06-02<span class="divider">|</span>
+ <li id="publishDate">Last Published: 2017-09-23<span class="divider">|</span>
</li>
- <li id="projectVersion">Version: 2.3.0</li>
+ <li id="projectVersion">Version: 2.3.2</li>
</ul>
</div>
<div class="row-fluid">
http://git-wip-us.apache.org/repos/asf/sling-site/blob/f47e8676/components/maven-sling-plugin/project-reports.html
----------------------------------------------------------------------
diff --git a/components/maven-sling-plugin/project-reports.html b/components/maven-sling-plugin/project-reports.html
index bcd890a..975d40f 100644
--- a/components/maven-sling-plugin/project-reports.html
+++ b/components/maven-sling-plugin/project-reports.html
@@ -1,13 +1,13 @@
<!DOCTYPE html>
<!--
- | Generated by Apache Maven Doxia Site Renderer 1.7.1 at 2017-06-02
+ | Generated by Apache Maven Doxia Site Renderer 1.7.1 at 2017-09-23
| Rendered using Apache Maven Fluido Skin 1.6
-->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20170602" />
+ <meta name="Date-Revision-yyyymmdd" content="20170923" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache Sling Maven Sling Plugin – Generated Reports</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" />
@@ -27,9 +27,9 @@
<div id="breadcrumbs">
<ul class="breadcrumb">
- <li id="publishDate">Last Published: 2017-06-02<span class="divider">|</span>
+ <li id="publishDate">Last Published: 2017-09-23<span class="divider">|</span>
</li>
- <li id="projectVersion">Version: 2.3.0</li>
+ <li id="projectVersion">Version: 2.3.2</li>
</ul>
</div>
<div class="row-fluid">
http://git-wip-us.apache.org/repos/asf/sling-site/blob/f47e8676/components/maven-sling-plugin/project-summary.html
----------------------------------------------------------------------
diff --git a/components/maven-sling-plugin/project-summary.html b/components/maven-sling-plugin/project-summary.html
index e166219..7f50954 100644
--- a/components/maven-sling-plugin/project-summary.html
+++ b/components/maven-sling-plugin/project-summary.html
@@ -1,13 +1,13 @@
<!DOCTYPE html>
<!--
- | Generated by Apache Maven Doxia Site Renderer 1.7.1 at 2017-06-02
+ | Generated by Apache Maven Doxia Site Renderer 1.7.1 at 2017-09-23
| Rendered using Apache Maven Fluido Skin 1.6
-->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20170602" />
+ <meta name="Date-Revision-yyyymmdd" content="20170923" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache Sling Maven Sling Plugin – Project Summary</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" />
@@ -27,9 +27,9 @@
<div id="breadcrumbs">
<ul class="breadcrumb">
- <li id="publishDate">Last Published: 2017-06-02<span class="divider">|</span>
+ <li id="publishDate">Last Published: 2017-09-23<span class="divider">|</span>
</li>
- <li id="projectVersion">Version: 2.3.0</li>
+ <li id="projectVersion">Version: 2.3.2</li>
</ul>
</div>
<div class="row-fluid">
@@ -114,7 +114,7 @@
<td>maven-sling-plugin</td></tr>
<tr class="b">
<td>Version</td>
-<td>2.3.0</td></tr>
+<td>2.3.2</td></tr>
<tr class="a">
<td>Type</td>
<td>maven-plugin</td></tr>
http://git-wip-us.apache.org/repos/asf/sling-site/blob/f47e8676/components/maven-sling-plugin/source-repository.html
----------------------------------------------------------------------
diff --git a/components/maven-sling-plugin/source-repository.html b/components/maven-sling-plugin/source-repository.html
index 5417357..98dfe26 100644
--- a/components/maven-sling-plugin/source-repository.html
+++ b/components/maven-sling-plugin/source-repository.html
@@ -1,13 +1,13 @@
<!DOCTYPE html>
<!--
- | Generated by Apache Maven Doxia Site Renderer 1.7.1 at 2017-06-02
+ | Generated by Apache Maven Doxia Site Renderer 1.7.1 at 2017-09-23
| Rendered using Apache Maven Fluido Skin 1.6
-->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20170602" />
+ <meta name="Date-Revision-yyyymmdd" content="20170923" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache Sling Maven Sling Plugin – Source Code Management</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" />
@@ -27,9 +27,9 @@
<div id="breadcrumbs">
<ul class="breadcrumb">
- <li id="publishDate">Last Published: 2017-06-02<span class="divider">|</span>
+ <li id="publishDate">Last Published: 2017-09-23<span class="divider">|</span>
</li>
- <li id="projectVersion">Version: 2.3.0</li>
+ <li id="projectVersion">Version: 2.3.2</li>
</ul>
</div>
<div class="row-fluid">
@@ -77,21 +77,21 @@
<div class="section">
<h2><a name="Web_Browser_Access"></a>Web Browser Access</h2><a name="Web_Browser_Access"></a>
<p>The following is a link to a browsable version of the source repository:</p>
-<div class="source"><pre class="prettyprint"><a class="externalLink" href="http://svn.apache.org/viewvc/sling/tags/maven-sling-plugin-2.3.0">http://svn.apache.org/viewvc/sling/tags/maven-sling-plugin-2.3.0</a></pre></div></div>
+<div class="source"><pre class="prettyprint"><a class="externalLink" href="http://svn.apache.org/viewvc/sling/tags/maven-sling-plugin-2.3.2">http://svn.apache.org/viewvc/sling/tags/maven-sling-plugin-2.3.2</a></pre></div></div>
<div class="section">
<h2><a name="Anonymous_Access"></a>Anonymous Access</h2><a name="Anonymous_Access"></a>
<p>The source can be checked out anonymously from Subversion with this command:</p>
-<div class="source"><pre class="prettyprint">$ svn checkout http://svn.apache.org/repos/asf/sling/tags/maven-sling-plugin-2.3.0 maven-sling-plugin</pre></div></div>
+<div class="source"><pre class="prettyprint">$ svn checkout http://svn.apache.org/repos/asf/sling/tags/maven-sling-plugin-2.3.2 maven-sling-plugin</pre></div></div>
<div class="section">
<h2><a name="Developer_Access"></a>Developer Access</h2><a name="Developer_Access"></a>
<p>Everyone can access the Subversion repository via HTTP, but committers must checkout the Subversion repository via HTTPS.</p>
-<div class="source"><pre class="prettyprint">$ svn checkout https://svn.apache.org/repos/asf/sling/tags/maven-sling-plugin-2.3.0 maven-sling-plugin</pre></div>
+<div class="source"><pre class="prettyprint">$ svn checkout https://svn.apache.org/repos/asf/sling/tags/maven-sling-plugin-2.3.2 maven-sling-plugin</pre></div>
<p>To commit changes to the repository, execute the following command to commit your changes (svn will prompt you for your password):</p>
<div class="source"><pre class="prettyprint">$ svn commit --username your-username -m "A message"</pre></div></div>
<div class="section">
<h2><a name="Access_from_Behind_a_Firewall"></a>Access from Behind a Firewall</h2><a name="Access_from_Behind_a_Firewall"></a>
<p>For those users who are stuck behind a corporate firewall which is blocking HTTP access to the Subversion repository, you can try to access it via the developer connection:</p>
-<div class="source"><pre class="prettyprint">$ svn checkout https://svn.apache.org/repos/asf/sling/tags/maven-sling-plugin-2.3.0 maven-sling-plugin</pre></div></div>
+<div class="source"><pre class="prettyprint">$ svn checkout https://svn.apache.org/repos/asf/sling/tags/maven-sling-plugin-2.3.2 maven-sling-plugin</pre></div></div>
<div class="section">
<h2><a name="Access_Through_a_Proxy"></a>Access Through a Proxy</h2><a name="Access_Through_a_Proxy"></a>
<p>The Subversion client can go through a proxy, if you configure it to do so. First, edit your "servers" configuration file to indicate which proxy to use. The file's location depends on your operating system. On Linux or Unix it is located in the directory "~/.subversion". On Windows it is in "%APPDATA%\Subversion". (Try "echo %APPDATA%", note this is a hidden directory.)</p>
http://git-wip-us.apache.org/repos/asf/sling-site/blob/f47e8676/components/maven-sling-plugin/surefire-report.html
----------------------------------------------------------------------
diff --git a/components/maven-sling-plugin/surefire-report.html b/components/maven-sling-plugin/surefire-report.html
index 3eddfc7..39613d6 100644
--- a/components/maven-sling-plugin/surefire-report.html
+++ b/components/maven-sling-plugin/surefire-report.html
@@ -1,13 +1,13 @@
<!DOCTYPE html>
<!--
- | Generated by Apache Maven Doxia Site Renderer 1.7.1 at 2017-06-02
+ | Generated by Apache Maven Doxia Site Renderer 1.7.1 at 2017-09-23
| Rendered using Apache Maven Fluido Skin 1.6
-->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20170602" />
+ <meta name="Date-Revision-yyyymmdd" content="20170923" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache Sling Maven Sling Plugin – Surefire Report</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" />
@@ -27,9 +27,9 @@
<div id="breadcrumbs">
<ul class="breadcrumb">
- <li id="publishDate">Last Published: 2017-06-02<span class="divider">|</span>
+ <li id="publishDate">Last Published: 2017-09-23<span class="divider">|</span>
</li>
- <li id="projectVersion">Version: 2.3.0</li>
+ <li id="projectVersion">Version: 2.3.2</li>
</ul>
</div>
<div class="row-fluid">
@@ -97,7 +97,7 @@ function toggleDisplay(elementId) {
<td>0</td>
<td>0</td>
<td>100%</td>
-<td>0.044</td></tr></table><br />
+<td>0.043</td></tr></table><br />
<p>Note: failures are anticipated and checked for with assertions while errors are unanticipated.</p><br /></div>
<div class="section">
<h2><a name="Package_List"></a>Package List</h2><a name="Package_List"></a>
@@ -118,7 +118,7 @@ function toggleDisplay(elementId) {
<td>0</td>
<td>0</td>
<td>100%</td>
-<td>0.001</td></tr>
+<td>0</td></tr>
<tr class="a">
<td><a href="#org.apache.sling.maven.bundlesupport">org.apache.sling.maven.bundlesupport</a></td>
<td>9</td>
@@ -148,7 +148,7 @@ function toggleDisplay(elementId) {
<td>0</td>
<td>0</td>
<td>100%</td>
-<td>0.001</td></tr></table></div>
+<td>0</td></tr></table></div>
<div class="section">
<h3><a name="org.apache.sling.maven.bundlesupport"></a>org.apache.sling.maven.bundlesupport</h3><a name="org.apache.sling.maven.bundlesupport"></a>
<table border="1" class="table table-striped">
@@ -179,7 +179,7 @@ function toggleDisplay(elementId) {
<tr class="a">
<td><img src="images/icon_success_sml.gif" alt="" /></td>
<td>extractPaths_trailingSlash</td>
-<td>0.001</td></tr>
+<td>0</td></tr>
<tr class="b">
<td><img src="images/icon_success_sml.gif" alt="" /></td>
<td>extractPaths_empty</td>
@@ -194,7 +194,7 @@ function toggleDisplay(elementId) {
<tr class="a">
<td><img src="images/icon_success_sml.gif" alt="" /></td>
<td>testParseArray</td>
-<td>0.019</td></tr>
+<td>0.017</td></tr>
<tr class="b">
<td><img src="images/icon_success_sml.gif" alt="" /></td>
<td>testParseObject</td>
@@ -202,11 +202,11 @@ function toggleDisplay(elementId) {
<tr class="a">
<td><img src="images/icon_success_sml.gif" alt="" /></td>
<td>testValidateJsonStructure_Invalid</td>
-<td>0.001</td></tr>
+<td>0</td></tr>
<tr class="b">
<td><img src="images/icon_success_sml.gif" alt="" /></td>
<td>testAccumulate_NewValue</td>
-<td>0.003</td></tr>
+<td>0.004</td></tr>
<tr class="a">
<td><img src="images/icon_success_sml.gif" alt="" /></td>
<td>testValidateJsonStructure</td>
@@ -218,11 +218,11 @@ function toggleDisplay(elementId) {
<tr class="a">
<td><img src="images/icon_success_sml.gif" alt="" /></td>
<td>testToJson</td>
-<td>0.019</td></tr>
+<td>0.02</td></tr>
<tr class="b">
<td><img src="images/icon_success_sml.gif" alt="" /></td>
<td>testAccumulate_ExistingArray</td>
-<td>0</td></tr>
+<td>0.001</td></tr>
<tr class="a">
<td><img src="images/icon_success_sml.gif" alt="" /></td>
<td>testAccumulate_ExistingValue</td>
http://git-wip-us.apache.org/repos/asf/sling-site/blob/f47e8676/components/maven-sling-plugin/team-list.html
----------------------------------------------------------------------
diff --git a/components/maven-sling-plugin/team-list.html b/components/maven-sling-plugin/team-list.html
index 4c1291d..12b7107 100644
--- a/components/maven-sling-plugin/team-list.html
+++ b/components/maven-sling-plugin/team-list.html
@@ -1,13 +1,13 @@
<!DOCTYPE html>
<!--
- | Generated by Apache Maven Doxia Site Renderer 1.7.1 at 2017-06-02
+ | Generated by Apache Maven Doxia Site Renderer 1.7.1 at 2017-09-23
| Rendered using Apache Maven Fluido Skin 1.6
-->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20170602" />
+ <meta name="Date-Revision-yyyymmdd" content="20170923" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache Sling Maven Sling Plugin – Project Team</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" />
@@ -27,9 +27,9 @@
<div id="breadcrumbs">
<ul class="breadcrumb">
- <li id="publishDate">Last Published: 2017-06-02<span class="divider">|</span>
+ <li id="publishDate">Last Published: 2017-09-23<span class="divider">|</span>
</li>
- <li id="projectVersion">Version: 2.3.0</li>
+ <li id="projectVersion">Version: 2.3.2</li>
</ul>
</div>
<div class="row-fluid">
http://git-wip-us.apache.org/repos/asf/sling-site/blob/f47e8676/components/maven-sling-plugin/uninstall-mojo.html
----------------------------------------------------------------------
diff --git a/components/maven-sling-plugin/uninstall-mojo.html b/components/maven-sling-plugin/uninstall-mojo.html
index d2d2cbb..75f0fb3 100644
--- a/components/maven-sling-plugin/uninstall-mojo.html
+++ b/components/maven-sling-plugin/uninstall-mojo.html
@@ -1,13 +1,13 @@
<!DOCTYPE html>
<!--
- | Generated by Apache Maven Doxia Site Renderer 1.7.1 at 2017-06-02
+ | Generated by Apache Maven Doxia Site Renderer 1.7.1 at 2017-09-23
| Rendered using Apache Maven Fluido Skin 1.6
-->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20170602" />
+ <meta name="Date-Revision-yyyymmdd" content="20170923" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache Sling Maven Sling Plugin – sling:uninstall</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" />
@@ -27,9 +27,9 @@
<div id="breadcrumbs">
<ul class="breadcrumb">
- <li id="publishDate">Last Published: 2017-06-02<span class="divider">|</span>
+ <li id="publishDate">Last Published: 2017-09-23<span class="divider">|</span>
</li>
- <li id="projectVersion">Version: 2.3.0</li>
+ <li id="projectVersion">Version: 2.3.2</li>
</ul>
</div>
<div class="row-fluid">
@@ -61,7 +61,7 @@
<p><b>Full name</b>:</p>
-<p>org.apache.sling:maven-sling-plugin:2.3.0:uninstall</p>
+<p>org.apache.sling:maven-sling-plugin:2.3.2:uninstall</p>
<p><b>Description</b>:</p>
http://git-wip-us.apache.org/repos/asf/sling-site/blob/f47e8676/components/maven-sling-plugin/validate-mojo.html
----------------------------------------------------------------------
diff --git a/components/maven-sling-plugin/validate-mojo.html b/components/maven-sling-plugin/validate-mojo.html
index 5bf9370..cffa83a 100644
--- a/components/maven-sling-plugin/validate-mojo.html
+++ b/components/maven-sling-plugin/validate-mojo.html
@@ -1,13 +1,13 @@
<!DOCTYPE html>
<!--
- | Generated by Apache Maven Doxia Site Renderer 1.7.1 at 2017-06-02
+ | Generated by Apache Maven Doxia Site Renderer 1.7.1 at 2017-09-23
| Rendered using Apache Maven Fluido Skin 1.6
-->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20170602" />
+ <meta name="Date-Revision-yyyymmdd" content="20170923" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache Sling Maven Sling Plugin – sling:validate</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" />
@@ -27,9 +27,9 @@
<div id="breadcrumbs">
<ul class="breadcrumb">
- <li id="publishDate">Last Published: 2017-06-02<span class="divider">|</span>
+ <li id="publishDate">Last Published: 2017-09-23<span class="divider">|</span>
</li>
- <li id="projectVersion">Version: 2.3.0</li>
+ <li id="projectVersion">Version: 2.3.2</li>
</ul>
</div>
<div class="row-fluid">
@@ -61,7 +61,7 @@
<p><b>Full name</b>:</p>
-<p>org.apache.sling:maven-sling-plugin:2.3.0:validate</p>
+<p>org.apache.sling:maven-sling-plugin:2.3.2:validate</p>
<p><b>Description</b>:</p>
http://git-wip-us.apache.org/repos/asf/sling-site/blob/f47e8676/documentation/bundles/content-distribution.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/content-distribution.html b/documentation/bundles/content-distribution.html
index 4871a03..20d4041 100644
--- a/documentation/bundles/content-distribution.html
+++ b/documentation/bundles/content-distribution.html
@@ -109,6 +109,11 @@
</code></pre>
</li>
</ul>
+<h4><a href="#trigger-forward-distribution" name="trigger-forward-distribution">Trigger forward distribution</a></h4>
+<p>Forward distribution can be triggered by sending a <code>POST</code> HTTP request to the agent resource on the source instance with the parameter <code>action=ADD</code> and parameters <code>path=<resourcePath></code>.</p>
+<p>The example below distributes the path <code>/content/sample1</code></p>
+<pre><code>$ curl -v -u admin:admin http://localhost:8080/libs/sling/distribution/services/agents/publish -d 'action=ADD' -d 'path=/content/sample1'
+</code></pre>
<h3><a href="#reverse-distribution" name="reverse-distribution">Reverse distribution</a></h3>
<p>A reverse distribution setup allows one to transfer content from a farm of source instances to a target instance. That is done by pulling the content from source instances into the target instance.</p>
<h4><a href="#setup-overview" name="setup-overview">Setup overview</a></h4>
@@ -145,6 +150,11 @@ org.apache.sling.distribution.packaging.impl.exporter.AgentDistributionPackageEx
</code></pre>
</li>
</ul>
+<h4><a href="#trigger-reverse-distribution" name="trigger-reverse-distribution">Trigger reverse distribution</a></h4>
+<p>Reverse distribution can be triggered by sending a <code>POST</code> HTTP request to the agent resource on the target instance with the parameter <code>action=PULL</code>.</p>
+<p>The example below adds the the path <code>/content/sample1</code> and then reverse distribute it.</p>
+<pre><code>$ curl -v -u admin:admin http://localhost:8081/libs/sling/distribution/services/agents/publish -d 'action=PULL' -d 'path=/content/sample1'
+</code></pre>
<h3><a href="#sync-distribution" name="sync-distribution">Sync distribution</a></h3>
<p>A sync distribution setup allows one to synchronize content in a farm of instances. That is done by using a coordinator instance (typically an author instance) that pulls content from all instances in a farm and pushes it back to all.</p>
<h4><a href="#setup-overview-" name="setup-overview-">Setup overview:</a></h4>
@@ -247,10 +257,20 @@ org.apache.sling.distribution.packaging.impl.importer.LocalDistributionPackageIm
</li>
</ul>
<h2><a href="#additional-options" name="additional-options">Additional options</a></h2>
-<h3><a href="#how-to-trigger-distribution-over-http-" name="how-to-trigger-distribution-over-http-">How to trigger distribution over HTTP?</a></h3>
<h3><a href="#how-to-configure-binary-less-distribution-" name="how-to-configure-binary-less-distribution-">How to configure binary-less distribution?</a></h3>
-<h3><a href="#how-to-configure-priority-paths-" name="how-to-configure-priority-paths-">How to configure priority paths?</a></h3>
-<h3><a href="#how-to-configure-error-queues-" name="how-to-configure-error-queues-">How to configure error queues?</a></h3></section></div></div>
+<p>Binary-less distribution is supported for deployments over a shared data store and involving agents that leverage the Vault based Distribution package exporter (Factory PID: org.apache.sling.distribution.serialization.impl.vlt.VaultDistributionPackageBuilderFactory) package builder.</p>
+<p>With binary-less mode enabled, the content packages distributed contain references to binaries rather than the actual binaries.</p>
+<p>SCD does not explicitly deal with binary references. Instead, it configures Apache Jackrabbit FileVault export options in order to assemble/import binary references.</p>
+<p>Upon import, if a referenced binary is not visible on the destination instance, SCD will retry distributing the content package after a delay has elapsed.</p>
+<p>Binary-less is configured by setting the 'useReferences' to true on the VaultDistributionPackageBuilderFactory.</p>
+<h3><a href="#how-to-configure-priority-queue-" name="how-to-configure-priority-queue-">How to configure priority queue?</a></h3>
+<p>SCD agents allow to prioritize the distribution of content depending on its path. This feature improves the delays in use cases where a subset of the content to be distributed must meet tighter delay than the remaining one (e.g. news flash).</p>
+<p>Each agent can be configured with one or more priority queues.</p>
+<p>In order to setup the priority queues, configure the 'priorityQueues' agent property by providing the queuePrefix and path regular expression.</p>
+<h3><a href="#how-to-configure-retry-strategy-" name="how-to-configure-retry-strategy-">How to configure retry strategy?</a></h3>
+<p>The agent behaviour upon failed distribution request can be configured via the Retry Strategy 'retry.strategy' and 'retry.attempts' properties.</p>
+<p>With the 'none' strategy, an agent will retry distributing an item forever, blocking the queue until the distribution succeeds. The 'none' strategy guarantees the distribution order but may block the queue until someone resolves the situation.</p>
+<p>With the 'errorQueue' strategy, an agent will automatically create an additional error queue. The agent will retry up to 'retry.attempts' attempts then move the failed item to the error queue. The error queue is passive and allow to keep track of the failed distribution item for post analysis. The 'errorQueue' strategy does not guarantee the distribution order, but it guarantee that the queue is stuck for a bounded number of retries.</p></section></div></div>
<div class="footer">
<div class="trademarkFooter">
Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.
http://git-wip-us.apache.org/repos/asf/sling-site/blob/f47e8676/documentation/bundles/content-loading-jcr-contentloader.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/content-loading-jcr-contentloader.html b/documentation/bundles/content-loading-jcr-contentloader.html
index 4f8fc6e..a2169d0 100644
--- a/documentation/bundles/content-loading-jcr-contentloader.html
+++ b/documentation/bundles/content-loading-jcr-contentloader.html
@@ -342,6 +342,9 @@
</code></pre>
<h3><a href="#extractors" name="extractors">Extractors</a></h3>
<p>By default, the <code>sling-jcr-contentloader</code> bundle tries to extract certain file types during content loading. These include <code>json</code>, <code>xml</code>, <code>zip</code>, and <code>jar</code> files. Therefore all available extractors are used for content processing. However if some files should be put into the repository unextracted, the <code>ignoreImportProviders</code> directive can be used with a comma separated list of extensions that should not be extracted, like <code>ignoreImportProviders:="jar,zip"</code>. Please note that the value needs to be put into quotation marks if more than one value is used like in the example.</p>
+<h3><a href="#file-name-escaping" name="file-name-escaping">File name escaping</a></h3>
+<p>When the node name you want to import with the JCR ContentLoader contains characters that are not allowed in typical file systems (e.g. a ":" is not allowed on windows file systems), you can URL-encode the file name. It uses the <a href="https://docs.oracle.com/javase/8/docs/api/java/net/URLDecoder.html">Java URLDecoder</a> internally.</p>
+<p>Example: <code>jcr%3Acontent.txt</code> will be loaded into a node named <code>jcr:content.txt</code>.</p>
<h3><a href="#workspace-targetting" name="workspace-targetting">Workspace Targetting</a></h3>
<p>By default, initial content will be loaded into the default workspace. To override this, add a <code>Sling-Initial-Content-Workspace</code> bundle manifest header to specify the workspace. Note that <em>all</em> content from a bundle will be loaded into the same workspace. </p>
<h3><a href="#example-load-i18n-json-files" name="example-load-i18n-json-files">Example: Load i18n JSON files</a></h3>
@@ -380,7 +383,32 @@ Support for re-registration of node types is relatively limited. In Jackrabbit,
</div>
<h3><a href="#automated-tests" name="automated-tests">Automated tests</a></h3>
<p>The initial content found in the <a href="http://svn.apache.org/repos/asf/sling/trunk/launchpad/content/src/main/resources/content/sling-test">sling-test folder of the launchpad initial content</a> is verified by the <a href="http://svn.apache.org/repos/asf/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/InitialContentTest.java">InitialContentTest</a> when running the <em>launchpad/testing</em> integration tests.</p>
-<p>Those tests can be used as verified examples of initial content loading. Contributions are welcome to improve the coverage of those tests.</p></section></div></div>
+<p>Those tests can be used as verified examples of initial content loading. Contributions are welcome to improve the coverage of those tests.</p>
+<h2><a href="#acls-and-principals" name="acls-and-principals">ACLs and Principals</a></h2>
+<p>By adding a <code>security:acl</code> object to a content node definition in JSON you can define an ACL for this node. For each array entry in this example an ACE is added. Example:</p>
+<pre><code>{
+ "security:acl": [
+ { "principal": "TestGroup1", "granted": ["jcr:read","jcr:write"] },
+ { "principal": "TestUser1", "granted": ["jcr:read"], "denied": ["jcr:write"] }
+ ]
+}
+</code></pre>
+<p>If ACLs already exist on the node you can add an <code>order</code> property to each array entry controlling the position where the new ACE is inserted into the list of existing ACEs. Possible values for this property:</p>
+<ul>
+ <li><strong>first</strong>: Place the target ACE as the first amongst its siblings</li>
+ <li><strong>last</strong>: Place the target ACE as the last amongst its siblings</li>
+ <li><strong>before xyz</strong>: Place the target ACE immediately before the sibling whose name is xyz</li>
+ <li><strong>after xyz</strong>: Place the target ACE immediately after the sibling whose name is xyz</li>
+ <li><strong>numeric</strong>: Place the target ACE at the specified index</li>
+</ul>
+<p>You can also add new principals (users or groups) to the repository by adding a <code>security:principals</code> object. This is not related to any specific path/node, so you can add this JSON fragment anywhere. Example for creating one use and one group:</p>
+<pre><code>{
+ "security:principals": [
+ { "name": "TestUser1", "password": "mypassword", "extraProp1": "extraProp1Value" },
+ { "name": "TestGroup1", "isgroup": "true", "members": ["TestUser1"], "extraProp1": "extraProp1Value" }
+ ]
+}
+</code></pre></section></div></div>
<div class="footer">
<div class="trademarkFooter">
Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.
http://git-wip-us.apache.org/repos/asf/sling-site/blob/f47e8676/documentation/bundles/discovery-api-and-impl.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/discovery-api-and-impl.html b/documentation/bundles/discovery-api-and-impl.html
index 84324f6..2d4c272 100644
--- a/documentation/bundles/discovery-api-and-impl.html
+++ b/documentation/bundles/discovery-api-and-impl.html
@@ -217,11 +217,11 @@ public class SamplePropertyProvider implements PropertyProvider {
<p>From a discovery API's point of view a cluster consists of all instances that are connected to the same repository. The above described built-in mechanism of storing a lastHeartbeat property into the (shared) repository, of voting on changes and creating an explicit establishedView results in automatic discovery within a cluster. There is therefore no further configuration needed for discovering instances in the same cluster.</p>
<p>However, for discovering multiple clusters such an automatic discovery is not possible and the clusters need to be explicitly configured using (cross-cluster) topology connectors:</p>
<p>A topology connector is a periodically issued HTTP PUT that announces the part of the topology known to the sending instance to the receiving instance and vica-verca the receiving instance announces its part of the topology to the sender in the response of the very same HTTP PUT. This way whatever other clusters are connected to sender or receiver will be made known to each other. Such a 'topology announcement' will be valid either until the same sender sends the announcement again (which it does periodically) - or until it times out (configurable). A topology connector is by definition always between clusters, never within the same cluster. Topology connectors can be structured in an arbitrary way (chain, star, tree, etc) with the only important point to note here that since changes in the topology propagate through these topology connectors they have a certain delay (namely the configured heartbeatInterval per hop).</p>
-<p>Topology connectors are configured at <a href="http://localhost:8888/system/console/configMgr/org.apache.sling.discovery.impl.Config">/system/console/configMgr/org.apache.sling.discovery.impl.Config</a>. They use the same interval and timeout as the repository heartbeats (heartbeatInterval and heartbeatTimeout).</p>
+<p>Topology connectors are configured at <a href="http://localhost:8080/system/console/configMgr/org.apache.sling.discovery.impl.Config">/system/console/configMgr/org.apache.sling.discovery.impl.Config</a>. They use the same interval and timeout as the repository heartbeats (heartbeatInterval and heartbeatTimeout).</p>
<h3><a href="#webconsole" name="webconsole">WebConsole</a></h3>
-<p>A Felix WebConsole plugin at <a href="http://localhost:8888/system/console/topology">/system/console/topology</a> provides a (read-only) overview of the topology.</p>
+<p>A Felix WebConsole plugin at <a href="http://localhost:8080/system/console/topology">/system/console/topology</a> provides a (read-only) overview of the topology.</p>
<h3><a href="#configuration" name="configuration">Configuration</a></h3>
-<p>The following properties can be configured (at <a href="http://localhost:8888/system/console/configMgr/org.apache.sling.discovery.impl.Config">/system/console/configMgr/org.apache.sling.discovery.impl.Config</a>):</p>
+<p>The following properties can be configured (at <a href="http://localhost:8080/system/console/configMgr/org.apache.sling.discovery.impl.Config">/system/console/configMgr/org.apache.sling.discovery.impl.Config</a>):</p>
<ul>
<li>
<p>heartbeatInterval: the time in seconds between two heartbeats (both cluster-internal and for HTTP-connectors). Default value is 15 seconds.</p></li>
http://git-wip-us.apache.org/repos/asf/sling-site/blob/f47e8676/documentation/bundles/jcr-installer-provider.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/jcr-installer-provider.html b/documentation/bundles/jcr-installer-provider.html
index db21762..c49626b 100644
--- a/documentation/bundles/jcr-installer-provider.html
+++ b/documentation/bundles/jcr-installer-provider.html
@@ -100,17 +100,17 @@
<p>We'll use the <a href="http://www.knopflerfish.org/releases/2.0.5/jars/desktop_awt/desktop_awt_all-2.0.0.jar">Knopflerfish Desktop</a> bundle for this example, it is convenient as it displays a graphical user interface when started.</p>
<p>We use <code>curl</code> to create content, to make it easy to reproduce the example by copying and pasting the <code>curl</code> commands. Any other way to create content in the repository will work, of course.</p>
<p>By default, JCRInstall picks up bundles found in folders named <em>install</em> under <code>/libs</code> and <code>/apps</code>, so we start by creating such a folder:</p>
-<pre><code>curl -X MKCOL http://admin:admin@localhost:8888/apps/jcrtest
-curl -X MKCOL http://admin:admin@localhost:8888/apps/jcrtest/install
+<pre><code>curl -X MKCOL http://admin:admin@localhost:8080/apps/jcrtest
+curl -X MKCOL http://admin:admin@localhost:8080/apps/jcrtest/install
</code></pre>
<p>And we copy the bundle to install in that folder (a backslash in command lines means <em>continued on next line</em>):</p>
<pre><code>curl -T desktop_awt_all-2.0.0.jar \
- http://admin:admin@localhost:8888/apps/jcrtest/install/desktop_awt_all-2.0.0.jar
+ http://admin:admin@localhost:8080/apps/jcrtest/install/desktop_awt_all-2.0.0.jar
</code></pre>
<p>That's it. After 2-3 seconds, the bundle should be picked up by JCRInstall, installed and started. If this works you'll see a small <em>Knopflerfish Desktop</em> window on your desktop, and Sling's OSGi console can of course be used to check the details.</p>
<p>Removing the bundle from the repository will cause it to be uninstalled, so:</p>
<pre><code>curl -X DELETE \
- http://admin:admin@localhost:8888/apps/jcrtest/install/desktop_awt_all-2.0.0.jar
+ http://admin:admin@localhost:8080/apps/jcrtest/install/desktop_awt_all-2.0.0.jar
</code></pre>
<p>Should cause the <em>Knopflerfish Desktop</em> window to disappear as the bundle is uninstalled.</p>
<h2><a href="#install-modify-and-remove-a-configuration" name="install-modify-and-remove-a-configuration">Install, modify and remove a configuration</a></h2>
@@ -119,18 +119,18 @@ curl -X MKCOL http://admin:admin@localhost:8888/apps/jcrtest/install
<pre><code>curl \
-F "jcr:primaryType=sling:OsgiConfig" \
-F foo=bar -F works=yes \
- http://admin:admin@localhost:8888/apps/jcrtest/install/some.config.pid
+ http://admin:admin@localhost:8080/apps/jcrtest/install/some.config.pid
</code></pre>
<p>And verify the contents of our config node:</p>
<pre><code>curl \
- http://admin:admin@localhost:8888/apps/jcrtest/install/some.config.pid.json
+ http://admin:admin@localhost:8080/apps/jcrtest/install/some.config.pid.json
</code></pre>
<p>Which should display something like</p>
<pre><code>{"foo":"bar",
"jcr:created":"Wed Aug 26 2009 17:06:40GMT+0200",
"jcr:primaryType":"sling:OsgiConfig","works":"yes"}
</code></pre>
-<p>At this point, JCRInstall should have picked up our new config and installed it. The logs would confirm that, but we can also use the OSGi console's config status page (http://localhost:8888/system/console/config) to check it. That page should now contain:</p>
+<p>At this point, JCRInstall should have picked up our new config and installed it. The logs would confirm that, but we can also use the OSGi console's config status page (http://localhost:8080/system/console/config) to check it. That page should now contain:</p>
<pre><code>PID=some.config.pid
BundleLocation=Unbound
_jcr_config_path=jcrinstall:/apps/jcrtest/install/some.config.pid
@@ -142,7 +142,7 @@ curl -X MKCOL http://admin:admin@localhost:8888/apps/jcrtest/install
<p>Let's try modifying the configuration parameters:</p>
<pre><code>curl \
-F works=updated -F even=more \
- http://admin:admin@localhost:8888/apps/jcrtest/install/some.config.pid
+ http://admin:admin@localhost:8080/apps/jcrtest/install/some.config.pid
</code></pre>
<p>And check the changes in the console page:</p>
<pre><code>PID=some.config.pid
@@ -155,7 +155,7 @@ curl -X MKCOL http://admin:admin@localhost:8888/apps/jcrtest/install
</code></pre>
<p>We can now delete the configuration node:</p>
<pre><code>curl -X DELETE \
- http://admin:admin@localhost:8888/apps/jcrtest/install/some.config.pid
+ http://admin:admin@localhost:8080/apps/jcrtest/install/some.config.pid
</code></pre>
<p>And verify that the corresponding configuration is gone in the console page (after 1-2 seconds, like for all other JCRInstall operations).</p>
<p>A node named like <code>o.a.s.foo.bar-a</code> uses <em>o.a.s.foo.bar</em> as its factory PID creating a configuration with an automatically generated PID. The value of <em>a</em> is stored as an alias in the OSGi installer to correlate the configuration object with the repository node.</p>
http://git-wip-us.apache.org/repos/asf/sling-site/blob/f47e8676/documentation/bundles/models.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/models.html b/documentation/bundles/models.html
index 25e62eb..de829bf 100644
--- a/documentation/bundles/models.html
+++ b/documentation/bundles/models.html
@@ -269,16 +269,28 @@ public class MyModel {
}
</code></pre>
<p><code>@PostConstruct</code> methods in a super class will be invoked first.</p>
+<p>Since Sling Models Implementation 1.4.6, <code>@PostConstruct</code> methods may return a <code>false</code> boolean value in which case the model creation will fail without logging any exception (a message will be logged at the <code>DEBUG</code> level).</p>
<h2><a href="#via" name="via">Via</a></h2>
-<p>If the injection should be based on a JavaBean property of the adaptable, you can indicate this using the <code>@Via</code> annotation:</p>
+<p>In some cases, a different object should be used as the adaptable instead of the original adaptable. This can be done using the <code>@Via</code> annotation. By default, this can be done using a JavaBean property of the adaptable:</p>
<pre><code><!-- TODO syntax marker (::java) disabled -->@Model(adaptables=SlingHttpServletRequest.class)
public interface MyModel {
- // will return request.getResource().adaptTo(ValueMap.class).get("propertyName", String.class)
+ // will return request.getResource().getValueMap().get("propertyName", String.class)
@Inject @Via("resource")
String getPropertyName();
}
</code></pre>
+<p>A different strategy can be used to define the adaptable by specifying a <code>type</code> attribute:</p>
+<pre><code><!-- TODO syntax marker (::java) disabled -->@Model(adaptables=Resource.class)
+public interface MyModel {
+
+ // will return resource.getChild("jcr:content").getValueMap().get("propertyName", String.class)
+ @Inject @Via(value = "jcr:content", type = ChildResource.class)
+ String getPropertyName();
+
+}
+</code></pre>
+<p>See the <a href="#via-types-since-api-134implementation-140">Via Types</a> section below for details on the included types for <code>@Via</code>.</p>
<h2><a href="#source" name="source">Source</a></h2>
<p>If there is ambiguity where a given injection could be handled by more than one injector, the <code>@Source</code> annotation can be used to define which injector is responsible:</p>
<pre><code><!-- TODO syntax marker (::java) disabled -->@Model(adaptables=SlingHttpServletRequest.class)
@@ -371,7 +383,7 @@ public class MyModel {
<p><code>@Source</code> : explictly tie an injected field or method to a particular injector (by name). Can also be on other annotations.</p>
<p><code>@Filter</code> : an OSGi service filter</p>
<p><code>@PostConstruct</code> : methods to call upon model option creation (only for model classes)</p>
-<p><code>@Via</code> : use a JavaBean property of the adaptable as the source of the injection</p>
+<p><code>@Via</code> : change the adaptable as the source of the injection</p>
<p><code>@Default</code> : set default values for a field or method</p>
<p><code>@Path</code> : only used together with the resource-path injector to specify the path of a resource</p>
<p><code>@Exporters</code>/<code>@Exporter</code>/<code>@ExporterOptions</code>/<code>@ExporterOption</code> : See Exporter Framework section below</p>
@@ -613,7 +625,44 @@ public class MyModel implements MyService {
<_plugin>org.apache.sling.bnd.models.ModelsScannerPlugin;generatePackagesHeader=true</_plugin>
</instructions>
</configuration>
-</code></pre></section></div></div>
+</code></pre>
+<h1><a href="#via-types-since-api-1-3-4-implementation-1-4-0-" name="via-types-since-api-1-3-4-implementation-1-4-0-">Via Types (Since API 1.3.4/Implementation 1.4.0)</a></h1>
+<p>As discussed in the <a href="#via">Via</a> section above, it is possible to select a different adaptable than the original value using the <code>@Via</code> annotation. The following standard types are provided (all types are in the package <code>org.apache.sling.models.annotations.via</code>)</p>
+<table>
+ <thead>
+ <tr>
+ <th><code>@Via</code> type value </th>
+ <th>Description</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td><code>BeanProperty</code> (default) </td>
+ <td>Uses a JavaBean property from the adaptable.</td>
+ </tr>
+ <tr>
+ <td><code>ChildResource</code> </td>
+ <td>Uses a child resource from the adaptable, assuming the adaptable is a <code>Resource</code>.</td>
+ </tr>
+ <tr>
+ <td><code>ForcedResourceType</code> </td>
+ <td>Creates a wrapped resource with the provided resource type. If the adaptable is a <code>SlingHttpServletRequest</code>, a wrapped request is created as well to contain the wrapped resource.</td>
+ </tr>
+ <tr>
+ <td><code>ResourceSuperType</code> </td>
+ <td>Creates a wrapped resource with the resource type set to the adaptable's resource super type. If the adaptable is a <code>SlingHttpServletRequest</code>, a wrapped request is created as well to contain the wrapped resource.</td>
+ </tr>
+ </tbody>
+</table>
+<h2><a href="#custom-via-type" name="custom-via-type">Custom Via Type</a></h2>
+<p>Defining your own type for the <code>@Via</code> annotation is a two step process. The first step is to create a marker class implementing the <code>@ViaProviderType</code> annotation. This class can be entirely empty, e.g.</p>
+<pre><code><!-- TODO syntax marker (::java) disabled -->public class MyCustomProviderType implements ViaProviderType {}
+</code></pre>
+<p>The second step is to create an OSGi service implementing the <code>ViaProvider</code> interface. This interface defines two methods:</p>
+<ul>
+ <li><code>getType()</code> should return the marker class.</li>
+ <li><code>getAdaptable()</code> should return the new adaptable or <code>ViaProvider.ORIGINAL</code> to indicate that the original adaptable should be used.</li>
+</ul></section></div></div>
<div class="footer">
<div class="trademarkFooter">
Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.
http://git-wip-us.apache.org/repos/asf/sling-site/blob/f47e8676/documentation/bundles/org-apache-sling-junit-bundles.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/org-apache-sling-junit-bundles.html b/documentation/bundles/org-apache-sling-junit-bundles.html
index c4a2570..6366b6a 100644
--- a/documentation/bundles/org-apache-sling-junit-bundles.html
+++ b/documentation/bundles/org-apache-sling-junit-bundles.html
@@ -261,7 +261,7 @@ public final TeleporterRule teleporter =
</table>
<p>The provisioning of an appropriate instance can be done with the <a href="/documentation/development/slingstart.html">slingstart-maven-plugin</a>. An example for that is given at <a href="https://svn.apache.org/viewvc/sling/trunk/testing/samples/module-with-it"><code>testing/samples/module-with-it</code></a>. Since <code>slingstart-maven-plugin</code> 1.5.0 it is possible to bootstrap a Sling Server from a <code>model.txt</code> below <code>src/test/provisioning</code> independent of the packaging (see <a href="https://issues.apache.org/jira/browse/SLING-6068">SLING-6068</a>).</p>
<h4><a href="#launchpadcustomizer" name="launchpadcustomizer">LaunchpadCustomizer</a></h4>
-<p>The <em><a href="https://svn.apache.org/repos/asf/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/junit/teleporter/customizers/LaunchpadCustomizer.java"><code>LaunchpadCustomizer.java</code></a></em> only verifies that a Sling instance is ready at a given port and configures the <code>ClientSideTeleporter</code> to deploy to <code>http://localhost:8888</code> with the credentials <code>admin</code>:<code>admin</code>. <code>LaunchpadCustomizer</code> uses the <code>HttpTestBase</code> therefore some parameters are customizable through system properties. There is no bootstrapping of an instance done here, so this must be done separately!</p>
+<p>The <em><a href="https://svn.apache.org/repos/asf/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/junit/teleporter/customizers/LaunchpadCustomizer.java"><code>LaunchpadCustomizer.java</code></a></em> only verifies that a Sling instance is ready at a given port and configures the <code>ClientSideTeleporter</code> to deploy to <code>http://localhost:8080</code> with the credentials <code>admin</code>:<code>admin</code>. <code>LaunchpadCustomizer</code> uses the <code>HttpTestBase</code> therefore some parameters are customizable through system properties. There is no bootstrapping of an instance done here, so this must be done separately!</p>
<h4>BWIT_TeleporterCustomizer</h4>
<p>The <em><a href="http://svn.apache.org/viewvc/sling/trunk/testing/samples/bundle-with-it/src/test/java/org/apache/sling/junit/teleporter/customizers/BWIT_TeleporterCustomizer.java"><code>BWIT_TeleporterCustomizer.java</code></a></em> relies on <code>SlingTestBase</code> to set the server's base url and credentials. Additionally the test bundle is adjusted so that the API is not included in it (but rather referenced from another bundle). The bootstrapping of the Sling instance is tweaked through system properties which are desribed <a href="http://labs.6dglobal.com/blog/2013-06-05/creating-integration-tests-apache-sling/">here</a> and implicitly done by the customizer itself.</p>
<p>Those should give you an overview on what can be done with a customizer and decide whether you need to write your own one or using the default customizer is just enough.</p>
http://git-wip-us.apache.org/repos/asf/sling-site/blob/f47e8676/documentation/bundles/repository-initialization.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/repository-initialization.html b/documentation/bundles/repository-initialization.html
index 30641f2..fb64595 100644
--- a/documentation/bundles/repository-initialization.html
+++ b/documentation/bundles/repository-initialization.html
@@ -108,6 +108,15 @@ end
# Nodetypes inside the path apply to just that path element
create path /content/example.com(sling:Folder)
+# Nodetypes and mixins applied to just a path element
+# Specifying mixins require
+# o.a.s.repoinit.parser 1.2.0 and
+# o.a.s.jcr.repoinit 1.2.0
+create path /content/example.com(sling:Folder mixin mix:referenceable,mix:shareable)
+
+# Mixins applied to just a path element
+create path /content/example.com(mixin mix:referenceable)
+
# A nodetype in front is used as the default for all path elements
create path (nt:unstructured) /var
@@ -126,6 +135,14 @@ set ACL for restrictions_examples
allow jcr:addChildNodes on /apps,/content restriction(rep:glob,/cat/*,*/cat,*cat/*)
end
+# Set repository level ACL
+# Setting repository level ACL require
+# o.a.s.repoinit.parser 1.2.0 and
+# o.a.s.jcr.repoinit 1.2.0
+set repository ACL for alice,bob
+ allow jcr:namespaceManagement,jcr:nodeTypeDefinitionManagement
+end
+
# register namespace requires
# o.a.s.repoinit.parser 1.0.4
# and o.a.s.jcr.repoinit 1.0.2
@@ -151,6 +168,10 @@ register nodetypes
create user demoUser with password {SHA-256} dc460da4ad72c482231e28e688e01f2778a88ce31a08826899d54ef7183998b5
+# disable service user
+create service user deprecated_service_user
+disable service user deprecated_service_user : "Disabled user to make an example"
+
create service user the-last-one
</code></pre>
<h2><a href="#providing-repoinit-statements-from-the-sling-provisioning-model-or-other-urls" name="providing-repoinit-statements-from-the-sling-provisioning-model-or-other-urls">Providing repoinit statements from the Sling provisioning model or other URLs</a></h2>
http://git-wip-us.apache.org/repos/asf/sling-site/blob/f47e8676/documentation/bundles/resource-merger.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/resource-merger.html b/documentation/bundles/resource-merger.html
index aca5799..3e5f50d 100644
--- a/documentation/bundles/resource-merger.html
+++ b/documentation/bundles/resource-merger.html
@@ -119,24 +119,24 @@
<tr>
<td>sling:orderBefore </td>
<td>String </td>
- <td>Contains the name of the preceeding sibling resource. This is influencing the order of resources when calling e.g. <code>Resource.listChildren()</code> or <code>Resource.getChildren()</code> on the merged resource. This is only necessary if the default resource order is not sufficient (see below).</td>
+ <td>Contains the name of the preceding sibling resource. This is influencing the order of resources when calling e.g. <code>Resource.listChildren()</code> or <code>Resource.getChildren()</code> on the merged resource. This is only necessary if the default child resource order is not sufficient (see below).</td>
</tr>
</tbody>
</table>
<h1><a href="#child-resource-order" name="child-resource-order">Child Resource Order</a></h1>
-<p>For a merged resource the order of its child resources is the following: First the ones from the base resource, then the ones from the overlaying resources. The children only defined by the topmost resource come last.</p>
-<p>In case the same child is defined in more than one resource, its position is taken from the highest overlaying resource (since version 1.3.2, see also <a href="https://issues.apache.org/jira/browse/SLING-4915">SLING-4915</a>). For example:</p>
+<p>For a merged resource the order of its child resources is the following: First the ones from the underlying resource, then the ones from the overlying resources.</p>
+<p>In case the same child is defined in more than one resource, its position is taken from the highest overlaying resource (since version 1.3.2, see also <a href="https://issues.apache.org/jira/browse/SLING-4915">SLING-4915</a>, for some more examples for more complicated merges look at <a href="https://issues.apache.org/jira/browse/SLING-6956">SLING-6956</a>). For example:</p>
<pre><code>base/
+--child1
- +--child2
+--child3
+ +--child5
overlay/
- +--child4
+--child2
+--child3
+ +--child4
-resulting order: child1, child4, child2, child3
+resulting order: child1, child5, child2, child3, child4
</code></pre>
<p>You can overwrite that behaviour by leveraging the <code>sling:orderBefore</code> property.</p>
<h1><a href="#resource-pickers" name="resource-pickers">Resource Pickers</a></h1>
http://git-wip-us.apache.org/repos/asf/sling-site/blob/f47e8676/documentation/bundles/scheduler-service-commons-scheduler.html
----------------------------------------------------------------------
diff --git a/documentation/bundles/scheduler-service-commons-scheduler.html b/documentation/bundles/scheduler-service-commons-scheduler.html
index 41b4a2e..f154178 100644
--- a/documentation/bundles/scheduler-service-commons-scheduler.html
+++ b/documentation/bundles/scheduler-service-commons-scheduler.html
@@ -79,7 +79,8 @@ The notion of Job used in this context is a different one than the one used for
<h2><a href="#examples-of-jobs-that-are-scheduled-by-leveraging-the-whiteboard-pattern" name="examples-of-jobs-that-are-scheduled-by-leveraging-the-whiteboard-pattern">Examples of jobs that are scheduled by leveraging the whiteboard pattern</a></h2>
<p>The following examples show you how to define and schedule a job by leveraging the whiteboard pattern.</p>
<h3><a href="#scheduling-with-a-cron-expression" name="scheduling-with-a-cron-expression">Scheduling with a cron expression</a></h3>
-<p>The following job is executed every minute by setting <em>scheduler.expression</em> to the cron expression <em>"0 * * * * ?"</em>:</p>
+<p>The cron expression format is described in the <a href="http://www.quartz-scheduler.org/documentation/quartz-2.x/tutorials/crontrigger.html#format">Quartz Cron Documentation</a> and requires either 6 or 7 fields separated by white space. The first field always indicates the second (not the minute). </p>
+<p>The following job is executed every minute by setting <em>scheduler.expression</em> to the cron expression <code>0 * * * * ?</code>:</p>
<pre><code>package sling.docu.examples;
import org.slf4j.Logger;