You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2015/12/07 11:38:22 UTC
[1/2] syncope git commit: [SYNCOPE-740] Incorporating docs and
offline-wadl profiles to global site profile
Repository: syncope
Updated Branches:
refs/heads/master 141f96956 -> 81e141b02
http://git-wip-us.apache.org/repos/asf/syncope/blob/81e141b0/src/site/xdoc/downloads.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/downloads.xml b/src/site/xdoc/downloads.xml
index 454faf1..30b4ecd 100644
--- a/src/site/xdoc/downloads.xml
+++ b/src/site/xdoc/downloads.xml
@@ -60,10 +60,10 @@ under the License.
</section>
<section name="Current Releases">
- <subsection name="1.2.6 Intermezzo">
- <p>Release date: November 5th, 2015</p>
+ <subsection name="2.0.0-M1 Jazz">
+ <p>Release date: December ??, 2015</p>
<p>
- <a href="https://cwiki.apache.org/confluence/display/SYNCOPE/Intermezzo">Release notes</a>
+ <a href="https://cwiki.apache.org/confluence/display/SYNCOPE/Jazz">Release notes</a>
</p>
<table>
<thead>
@@ -75,61 +75,81 @@ under the License.
<tbody>
<tr>
<td>
- <a href="http://www.apache.org/dyn/closer.lua/syncope/1.2.6/syncope-1.2.6-source-release.zip">syncope-1.2.6-source-release.zip</a>
+ <a href="http://www.apache.org/dyn/closer.lua/syncope/2.0.0-M1/syncope-2.0.0-M1-source-release.zip">syncope-2.0.0-M1-source-release.zip</a>
</td>
<td>
- <a href="http://www.apache.org/dist/syncope/1.2.6/syncope-1.2.6-source-release.zip.asc">asc</a>
- <a href="http://www.apache.org/dist/syncope/1.2.6/syncope-1.2.6-source-release.zip.md5">md5</a>
- <a href="http://www.apache.org/dist/syncope/1.2.6/syncope-1.2.6-source-release.zip.sha1">sha1</a>
+ <a href="http://www.apache.org/dist/syncope/2.0.0-M1/syncope-2.0.0-M1-source-release.zip.asc">asc</a>
+ <a href="http://www.apache.org/dist/syncope/2.0.0-M1/syncope-2.0.0-M1-source-release.zip.md5">md5</a>
+ <a href="http://www.apache.org/dist/syncope/2.0.0-M1/syncope-2.0.0-M1-source-release.zip.sha1">sha1</a>
</td>
</tr>
<tr>
<td>
- <a href="http://www.apache.org/dyn/closer.lua/syncope/1.2.6/syncope-standalone-1.2.6-distribution.zip">syncope-standalone-1.2.6-distribution.zip</a>
+ <a href="http://www.apache.org/dyn/closer.lua/syncope/2.0.0-M1/syncope-standalone-2.0.0-M1-distribution.zip">syncope-standalone-2.0.0-M1-distribution.zip</a>
</td>
<td>
- <a href="http://www.apache.org/dist/syncope/1.2.6/syncope-standalone-1.2.6-distribution.zip.asc">asc</a>
- <a href="http://www.apache.org/dist/syncope/1.2.6/syncope-standalone-1.2.6-distribution.zip.md5">md5</a>
- <a href="http://www.apache.org/dist/syncope/1.2.6/syncope-standalone-1.2.6-distribution.zip.sha1">sha1</a>
+ <a href="http://www.apache.org/dist/syncope/2.0.0-M1/syncope-standalone-2.0.0-M1-distribution.zip.asc">asc</a>
+ <a href="http://www.apache.org/dist/syncope/2.0.0-M1/syncope-standalone-2.0.0-M1-distribution.zip.md5">md5</a>
+ <a href="http://www.apache.org/dist/syncope/2.0.0-M1/syncope-standalone-2.0.0-M1-distribution.zip.sha1">sha1</a>
</td>
</tr>
<tr>
<td>
- <a href="http://www.apache.org/dyn/closer.lua/syncope/1.2.6/syncope-installer-1.2.6-uber.jar">syncope-installer-1.2.6.jar</a>
+ <a href="http://www.apache.org/dyn/closer.lua/syncope/2.0.0-M1/syncope-installer-2.0.0-M1-uber.jar">syncope-installer-2.0.0-M1.jar</a>
</td>
<td>
- <a href="http://www.apache.org/dist/syncope/1.2.6/syncope-installer-1.2.6-uber.jar.asc">asc</a>
- <a href="http://www.apache.org/dist/syncope/1.2.6/syncope-installer-1.2.6-uber.jar.md5">md5</a>
- <a href="http://www.apache.org/dist/syncope/1.2.6/syncope-installer-1.2.6-uber.jar.sha1">sha1</a>
+ <a href="http://www.apache.org/dist/syncope/2.0.0-M1/syncope-installer-2.0.0-M1-uber.jar.asc">asc</a>
+ <a href="http://www.apache.org/dist/syncope/2.0.0-M1/syncope-installer-2.0.0-M1-uber.jar.md5">md5</a>
+ <a href="http://www.apache.org/dist/syncope/2.0.0-M1/syncope-installer-2.0.0-M1-uber.jar.sha1">sha1</a>
</td>
</tr>
<tr>
<td>
- <a href="http://www.apache.org/dyn/closer.lua/syncope/1.2.6/apache-syncope-1.2.6.deb">apache-syncope-1.2.6.deb</a>
+ <a href="http://www.apache.org/dyn/closer.lua/syncope/2.0.0-M1/syncope-client-cli-2.0.0-M1.zip">syncope-client-cli-2.0.0-M1.zip</a>
</td>
<td>
- <a href="http://www.apache.org/dist/syncope/1.2.6/apache-syncope-1.2.6.deb.asc">asc</a>
- <a href="http://www.apache.org/dist/syncope/1.2.6/apache-syncope-1.2.6.deb.md5">md5</a>
- <a href="http://www.apache.org/dist/syncope/1.2.6/apache-syncope-1.2.6.deb.sha1">sha1</a>
+ <a href="http://www.apache.org/dist/syncope/2.0.0-M1/syncope-client-cli-2.0.0-M1.zip.asc">asc</a>
+ <a href="http://www.apache.org/dist/syncope/2.0.0-M1/syncope-client-cli-2.0.0-M1.zip.md5">md5</a>
+ <a href="http://www.apache.org/dist/syncope/2.0.0-M1/syncope-client-cli-2.0.0-M1.zip.sha1">sha1</a>
</td>
</tr>
<tr>
<td>
- <a href="http://www.apache.org/dyn/closer.lua/syncope/1.2.6/apache-syncope-console-1.2.6.deb">apache-syncope-console-1.2.6.deb</a>
+ <a href="http://www.apache.org/dyn/closer.lua/syncope/2.0.0-M1/apache-syncope-2.0.0-M1.deb">apache-syncope-2.0.0-M1.deb</a>
</td>
<td>
- <a href="http://www.apache.org/dist/syncope/1.2.6/apache-syncope-console-1.2.6.deb.asc">asc</a>
- <a href="http://www.apache.org/dist/syncope/1.2.6/apache-syncope-console-1.2.6.deb.md5">md5</a>
- <a href="http://www.apache.org/dist/syncope/1.2.6/apache-syncope-console-1.2.6.deb.sha1">sha1</a>
+ <a href="http://www.apache.org/dist/syncope/2.0.0-M1/apache-syncope-2.0.0-M1.deb.asc">asc</a>
+ <a href="http://www.apache.org/dist/syncope/2.0.0-M1/apache-syncope-2.0.0-M1.deb.md5">md5</a>
+ <a href="http://www.apache.org/dist/syncope/2.0.0-M1/apache-syncope-2.0.0-M1.deb.sha1">sha1</a>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="http://www.apache.org/dyn/closer.lua/syncope/2.0.0-M1/apache-syncope-console-2.0.0-M1.deb">apache-syncope-console-2.0.0-M1.deb</a>
+ </td>
+ <td>
+ <a href="http://www.apache.org/dist/syncope/2.0.0-M1/apache-syncope-console-2.0.0-M1.deb.asc">asc</a>
+ <a href="http://www.apache.org/dist/syncope/2.0.0-M1/apache-syncope-console-2.0.0-M1.deb.md5">md5</a>
+ <a href="http://www.apache.org/dist/syncope/2.0.0-M1/apache-syncope-console-2.0.0-M1.deb.sha1">sha1</a>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="http://www.apache.org/dyn/closer.lua/syncope/2.0.0-M1/apache-syncope-enduser-2.0.0-M1.deb">apache-syncope-enduser-2.0.0-M1.deb</a>
+ </td>
+ <td>
+ <a href="http://www.apache.org/dist/syncope/2.0.0-M1/apache-syncope-enduser-2.0.0-M1.deb.asc">asc</a>
+ <a href="http://www.apache.org/dist/syncope/2.0.0-M1/apache-syncope-enduser-2.0.0-M1.deb.md5">md5</a>
+ <a href="http://www.apache.org/dist/syncope/2.0.0-M1/apache-syncope-enduser-2.0.0-M1.deb.sha1">sha1</a>
</td>
</tr>
</tbody>
</table>
</subsection>
- <subsection name="1.1.8 Ad libitum">
- <p>Release date: Jul 3rd, 2014</p>
+ <subsection name="1.2.6 Intermezzo">
+ <p>Release date: November 5th, 2015</p>
<p>
- <a href="https://cwiki.apache.org/confluence/display/SYNCOPE/Ad+libitum">Release notes</a>
+ <a href="https://cwiki.apache.org/confluence/display/SYNCOPE/Intermezzo">Release notes</a>
</p>
<table>
<thead>
@@ -141,53 +161,57 @@ under the License.
<tbody>
<tr>
<td>
- <a href="http://www.apache.org/dyn/closer.lua/syncope/1.1.8/syncope-1.1.8-source-release.zip">syncope-1.1.8-source-release.zip</a>
+ <a href="http://www.apache.org/dyn/closer.lua/syncope/1.2.6/syncope-1.2.6-source-release.zip">syncope-1.2.6-source-release.zip</a>
</td>
<td>
- <a href="http://www.apache.org/dist/syncope/1.1.8/syncope-1.1.8-source-release.zip.asc">asc</a>
- <a href="http://www.apache.org/dist/syncope/1.1.8/syncope-1.1.8-source-release.zip.md5">md5</a>
- <a href="http://www.apache.org/dist/syncope/1.1.8/syncope-1.1.8-source-release.zip.sha1">sha1</a>
+ <a href="http://www.apache.org/dist/syncope/1.2.6/syncope-1.2.6-source-release.zip.asc">asc</a>
+ <a href="http://www.apache.org/dist/syncope/1.2.6/syncope-1.2.6-source-release.zip.md5">md5</a>
+ <a href="http://www.apache.org/dist/syncope/1.2.6/syncope-1.2.6-source-release.zip.sha1">sha1</a>
</td>
</tr>
<tr>
<td>
- <a href="http://www.apache.org/dyn/closer.lua/syncope/1.1.8/syncope-standalone-1.1.8-distribution.zip">syncope-standalone-1.1.8-distribution.zip</a>
+ <a href="http://www.apache.org/dyn/closer.lua/syncope/1.2.6/syncope-standalone-1.2.6-distribution.zip">syncope-standalone-1.2.6-distribution.zip</a>
</td>
<td>
- <a href="http://www.apache.org/dist/syncope/1.1.8/syncope-standalone-1.1.8-distribution.zip.asc">asc</a>
- <a href="http://www.apache.org/dist/syncope/1.1.8/syncope-standalone-1.1.8-distribution.zip.md5">md5</a>
- <a href="http://www.apache.org/dist/syncope/1.1.8/syncope-standalone-1.1.8-distribution.zip.sha1">sha1</a>
+ <a href="http://www.apache.org/dist/syncope/1.2.6/syncope-standalone-1.2.6-distribution.zip.asc">asc</a>
+ <a href="http://www.apache.org/dist/syncope/1.2.6/syncope-standalone-1.2.6-distribution.zip.md5">md5</a>
+ <a href="http://www.apache.org/dist/syncope/1.2.6/syncope-standalone-1.2.6-distribution.zip.sha1">sha1</a>
</td>
</tr>
- </tbody>
- </table>
- </subsection>
- <subsection name="1.0.9 Espressivo">
- <p>Release date: Apr 11th, 2014</p>
- <p>
- <a href="https://cwiki.apache.org/confluence/display/SYNCOPE/Espressivo">Release notes</a>
- </p>
- <table>
- <thead>
<tr>
- <th>Artifact</th>
- <th>Signatures</th>
+ <td>
+ <a href="http://www.apache.org/dyn/closer.lua/syncope/1.2.6/syncope-installer-1.2.6-uber.jar">syncope-installer-1.2.6.jar</a>
+ </td>
+ <td>
+ <a href="http://www.apache.org/dist/syncope/1.2.6/syncope-installer-1.2.6-uber.jar.asc">asc</a>
+ <a href="http://www.apache.org/dist/syncope/1.2.6/syncope-installer-1.2.6-uber.jar.md5">md5</a>
+ <a href="http://www.apache.org/dist/syncope/1.2.6/syncope-installer-1.2.6-uber.jar.sha1">sha1</a>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="http://www.apache.org/dyn/closer.lua/syncope/1.2.6/apache-syncope-1.2.6.deb">apache-syncope-1.2.6.deb</a>
+ </td>
+ <td>
+ <a href="http://www.apache.org/dist/syncope/1.2.6/apache-syncope-1.2.6.deb.asc">asc</a>
+ <a href="http://www.apache.org/dist/syncope/1.2.6/apache-syncope-1.2.6.deb.md5">md5</a>
+ <a href="http://www.apache.org/dist/syncope/1.2.6/apache-syncope-1.2.6.deb.sha1">sha1</a>
+ </td>
</tr>
- </thead>
- <tbody>
<tr>
<td>
- <a href="http://www.apache.org/dyn/closer.lua/syncope/1.0.9/syncope-root-1.0.9-source-release.zip">syncope-root-1.0.9-source-release.zip</a>
+ <a href="http://www.apache.org/dyn/closer.lua/syncope/1.2.6/apache-syncope-console-1.2.6.deb">apache-syncope-console-1.2.6.deb</a>
</td>
<td>
- <a href="http://www.apache.org/dist/syncope/1.0.9/syncope-root-1.0.9-source-release.zip.asc">asc</a>
- <a href="http://www.apache.org/dist/syncope/1.0.9/syncope-root-1.0.9-source-release.zip.md5">md5</a>
- <a href="http://www.apache.org/dist/syncope/1.0.9/syncope-root-1.0.9-source-release.zip.sha1">sha1</a>
+ <a href="http://www.apache.org/dist/syncope/1.2.6/apache-syncope-console-1.2.6.deb.asc">asc</a>
+ <a href="http://www.apache.org/dist/syncope/1.2.6/apache-syncope-console-1.2.6.deb.md5">md5</a>
+ <a href="http://www.apache.org/dist/syncope/1.2.6/apache-syncope-console-1.2.6.deb.sha1">sha1</a>
</td>
</tr>
</tbody>
</table>
- </subsection>
+ </subsection>
</section>
<section name="Older Releases">
@@ -257,70 +281,12 @@ under the License.
</tbody>
</table>
</subsection>
- <subsection name="1.1.7 Ad libitum">
- <p>Release date: Apr 11th, 2014</p>
- <p>
- <a href="https://cwiki.apache.org/confluence/display/SYNCOPE/Ad+libitum">Release notes</a>
- </p>
- <table>
- <thead>
- <tr>
- <th>Artifact</th>
- <th>Signatures</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>
- <a href="http://archive.apache.org/dist/syncope/1.1.7/syncope-1.1.7-source-release.zip">syncope-1.1.7-source-release.zip</a>
- </td>
- <td>
- <a href="http://archive.apache.org/dist/syncope/1.1.7/syncope-1.1.7-source-release.zip.asc">asc</a>
- <a href="http://archive.apache.org/dist/syncope/1.1.7/syncope-1.1.7-source-release.zip.md5">md5</a>
- <a href="http://archive.apache.org/dist/syncope/1.1.7/syncope-1.1.7-source-release.zip.sha1">sha1</a>
- </td>
- </tr>
- <tr>
- <td>
- <a href="http://archive.apache.org/dist/syncope/1.1.7/syncope-standalone-1.1.7-distribution.zip">syncope-standalone-1.1.7-distribution.zip</a>
- </td>
- <td>
- <a href="http://archive.apache.org/dist/syncope/1.1.7/syncope-standalone-1.1.7-distribution.zip.asc">asc</a>
- <a href="http://archive.apache.org/dist/syncope/1.1.7/syncope-standalone-1.1.7-distribution.zip.md5">md5</a>
- <a href="http://archive.apache.org/dist/syncope/1.1.7/syncope-standalone-1.1.7-distribution.zip.sha1">sha1</a>
- </td>
- </tr>
- </tbody>
- </table>
- </subsection>
- <subsection name="1.0.8 Espressivo">
- <p>Release date: Apr 18th, 2013</p>
- <p>
- <a href="https://cwiki.apache.org/confluence/display/SYNCOPE/Espressivo">Release notes</a>
- </p>
- <table>
- <thead>
- <tr>
- <th>Artifact</th>
- <th>Signatures</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>
- <a href="http://archive.apache.org/dist/syncope/1.0.8/syncope-root-1.0.8-source-release.zip">syncope-root-1.0.8-source-release.zip</a>
- </td>
- <td>
- <a href="http://archive.apache.org/dist/syncope/1.0.8/syncope-root-1.0.8-source-release.zip.asc">asc</a>
- <a href="http://archive.apache.org/dist/syncope/1.0.8/syncope-root-1.0.8-source-release.zip.md5">md5</a>
- <a href="http://archive.apache.org/dist/syncope/1.0.8/syncope-root-1.0.8-source-release.zip.sha1">sha1</a>
- </td>
- </tr>
- </tbody>
- </table>
- </subsection>
</section>
+ <section name="Archives">
+ <p>All past releases can be fetched from ASF <a href="http://archive.apache.org/dist/syncope/">archives</a>.</p>
+ </section>
+
<section name="Verifying Releases">
<p>We strongly recommend you verify the integrity of the downloaded files with both PGP and MD5.</p>
http://git-wip-us.apache.org/repos/asf/syncope/blob/81e141b0/src/site/xdoc/index.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
index 8e2954b..6fd210c 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@@ -28,9 +28,7 @@ under the License.
<body>
<div class="hero-unit" style="padding-top: 0px; padding-bottom: 0px;">
- <img src="images/apache-syncope-logo-medium.png"/>
-
- <br clear="left"/>
+ <img src="images/apache-syncope-logo-medium.png" align="right"/>
<p>
<span style="font-weight: bold">Apache Syncope</span>
http://git-wip-us.apache.org/repos/asf/syncope/blob/81e141b0/standalone/pom.xml
----------------------------------------------------------------------
diff --git a/standalone/pom.xml b/standalone/pom.xml
index 8189146..26f5765 100644
--- a/standalone/pom.xml
+++ b/standalone/pom.xml
@@ -305,7 +305,7 @@ under the License.
</profile>
<profile>
- <id>doc</id>
+ <id>site</id>
<build>
<plugins>
@@ -317,6 +317,26 @@ under the License.
<skip>true</skip>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <skip>true</skip>
+ <skipDeploy>true</skipDeploy>
+ <generateReports>false</generateReports>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-docs-to-site</id>
+ <phase>none</phase>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</profile>
[2/2] syncope git commit: [SYNCOPE-740] Incorporating docs and
offline-wadl profiles to global site profile
Posted by il...@apache.org.
[SYNCOPE-740] Incorporating docs and offline-wadl profiles to global site profile
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/81e141b0
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/81e141b0
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/81e141b0
Branch: refs/heads/master
Commit: 81e141b022fce721a8601a4bd79802a9940edbb2
Parents: 141f969
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon Dec 7 11:38:02 2015 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon Dec 7 11:38:02 2015 +0100
----------------------------------------------------------------------
archetype/pom.xml | 22 ++-
client/cli/pom.xml | 17 --
.../pages/AnyDisplayAttributesModalPage.java | 2 +-
.../pages/BulkActionResultModalPage.java | 4 +-
.../pages/DisplayAttributesModalPage.java | 2 +-
.../client/console/pages/ResultStatusModal.java | 2 +-
.../markup/html/form/MultiFieldPanel.java | 16 +-
.../markup/html/form/SelectableRecorder.java | 18 +-
.../client/console/wizards/AjaxWizard.java | 18 +-
.../console/wizards/AjaxWizardBuilder.java | 4 +-
.../console/wizards/any/AnyWizardBuilder.java | 4 +-
.../console/wizards/any/GroupDetails.java | 9 +-
.../console/wizards/any/GroupWizardBuilder.java | 4 +-
.../console/wizards/any/UserWizardBuilder.java | 4 +-
.../syncope/client/lib/SyncopeClient.java | 2 +-
client/pom.xml | 22 ++-
.../common/lib/search/SyncopeProperty.java | 3 +-
common/pom.xml | 22 ++-
common/rest-api/pom.xml | 108 ++++++----
.../syncope/core/logic/AbstractLogic.java | 1 -
.../core/logic/init/EntitlementAccessor.java | 2 +-
.../jpa/dao/JPAExternalResourceDAO.java | 8 -
.../persistence/jpa/dao/JPAReportExecDAO.java | 7 -
.../persistence/jpa/dao/JPATaskExecDAO.java | 7 -
.../jpa/entity/AbstractAnnotatedEntity.java | 7 +-
.../spring/CommonEntityManagerFactoryConf.java | 1 -
core/pom.xml | 22 ++-
.../provisioning/api/data/PolicyDataBinder.java | 6 -
.../api/notification/NotificationManager.java | 21 +-
.../core/provisioning/api/sync/PushActions.java | 3 +-
.../core/provisioning/api/sync/SyncActions.java | 15 +-
.../java/data/GroupDataBinderImpl.java | 2 +-
.../java/sync/LDAPMembershipSyncActions.java | 2 +-
core/rest-cxf/pom.xml | 75 +++----
.../activiti/ActivitiUserWorkflowAdapter.java | 2 +-
.../core/workflow/api/WorkflowAdapter.java | 2 +-
deb/pom.xml | 22 ++-
ext/pom.xml | 22 ++-
.../fit/buildtools/LdifInputStreamLoader.java | 6 +-
fit/pom.xml | 22 ++-
installer/pom.xml | 22 ++-
pom.xml | 46 +++--
src/site/site.xml | 31 ++-
src/site/xdoc/docs/index.xml | 63 ++++++
src/site/xdoc/downloads.xml | 196 ++++++++-----------
src/site/xdoc/index.xml | 4 +-
standalone/pom.xml | 22 ++-
47 files changed, 556 insertions(+), 366 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/81e141b0/archetype/pom.xml
----------------------------------------------------------------------
diff --git a/archetype/pom.xml b/archetype/pom.xml
index d51bea4..0d8f570 100644
--- a/archetype/pom.xml
+++ b/archetype/pom.xml
@@ -255,7 +255,7 @@ under the License.
<profiles>
<profile>
- <id>doc</id>
+ <id>site</id>
<build>
<plugins>
@@ -267,6 +267,26 @@ under the License.
<skip>true</skip>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <skip>true</skip>
+ <skipDeploy>true</skipDeploy>
+ <generateReports>false</generateReports>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-docs-to-site</id>
+ <phase>none</phase>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</profile>
http://git-wip-us.apache.org/repos/asf/syncope/blob/81e141b0/client/cli/pom.xml
----------------------------------------------------------------------
diff --git a/client/cli/pom.xml b/client/cli/pom.xml
index b1b1e08..1548b26 100644
--- a/client/cli/pom.xml
+++ b/client/cli/pom.xml
@@ -172,23 +172,6 @@ under the License.
</plugins>
</build>
</profile>
-
- <profile>
- <id>doc</id>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.asciidoctor</groupId>
- <artifactId>asciidoctor-maven-plugin</artifactId>
- <inherited>false</inherited>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
</project>
http://git-wip-us.apache.org/repos/asf/syncope/blob/81e141b0/client/console/src/main/java/org/apache/syncope/client/console/pages/AnyDisplayAttributesModalPage.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/pages/AnyDisplayAttributesModalPage.java b/client/console/src/main/java/org/apache/syncope/client/console/pages/AnyDisplayAttributesModalPage.java
index 6f304f8..9c2eaef 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/pages/AnyDisplayAttributesModalPage.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/pages/AnyDisplayAttributesModalPage.java
@@ -28,7 +28,7 @@ import org.apache.wicket.PageReference;
/**
* Modal window with Display user attributes form.
*
- * @param <T>
+ * @param <T> anyTO
*/
@SuppressWarnings({ "unchecked", "rawtypes" })
public class AnyDisplayAttributesModalPage<T extends AnyTO> extends DisplayAttributesModalPage {
http://git-wip-us.apache.org/repos/asf/syncope/blob/81e141b0/client/console/src/main/java/org/apache/syncope/client/console/pages/BulkActionResultModalPage.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/pages/BulkActionResultModalPage.java b/client/console/src/main/java/org/apache/syncope/client/console/pages/BulkActionResultModalPage.java
index 00574c4..c659ddc 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/pages/BulkActionResultModalPage.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/pages/BulkActionResultModalPage.java
@@ -39,8 +39,8 @@ import org.apache.wicket.model.IModel;
/**
* Show user or group status after performing a successful operation.
*
- * @param <T>
- * @param <S>
+ * @param <T> type of the object that will be rendered in columns
+ * @param <S> type of the sorting parameter
*/
public class BulkActionResultModalPage<T, S> extends AbstractModalPanel {
http://git-wip-us.apache.org/repos/asf/syncope/blob/81e141b0/client/console/src/main/java/org/apache/syncope/client/console/pages/DisplayAttributesModalPage.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/pages/DisplayAttributesModalPage.java b/client/console/src/main/java/org/apache/syncope/client/console/pages/DisplayAttributesModalPage.java
index 7be2525..fa961b4 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/pages/DisplayAttributesModalPage.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/pages/DisplayAttributesModalPage.java
@@ -46,7 +46,7 @@ import org.apache.wicket.model.ResourceModel;
/**
* Modal window with Display attributes form.
*
- * @param <T>
+ * @param <T> anyTO
*/
@SuppressWarnings({ "unchecked", "rawtypes" })
public abstract class DisplayAttributesModalPage<T extends AnyTO> extends AbstractModalPanel {
http://git-wip-us.apache.org/repos/asf/syncope/blob/81e141b0/client/console/src/main/java/org/apache/syncope/client/console/pages/ResultStatusModal.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/pages/ResultStatusModal.java b/client/console/src/main/java/org/apache/syncope/client/console/pages/ResultStatusModal.java
index c23dd74..bd90381 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/pages/ResultStatusModal.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/pages/ResultStatusModal.java
@@ -62,7 +62,7 @@ import org.apache.wicket.request.resource.ContextRelativeResource;
/**
* Show user or group status after performing a successful operation.
*
- * @param <T>
+ * @param <T> anyTO
*/
public final class ResultStatusModal<T extends AnyTO> extends AbstractModalPanel {
http://git-wip-us.apache.org/repos/asf/syncope/blob/81e141b0/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/MultiFieldPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/MultiFieldPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/MultiFieldPanel.java
index 2237d39..7b7ffcb 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/MultiFieldPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/MultiFieldPanel.java
@@ -219,8 +219,8 @@ public final class MultiFieldPanel<E extends Serializable> extends AbstractField
/**
* Show plus button icon to ad more elements.
*
- * @param plusAlwaysAvailable
- * @return
+ * @param plusAlwaysAvailable whether plus button must always available
+ * @return this instance, for fluent building
*/
public Builder<E> setPlusAlwaysAvailable(final boolean plusAlwaysAvailable) {
this.plusAlwaysAvailable = plusAlwaysAvailable;
@@ -230,8 +230,8 @@ public final class MultiFieldPanel<E extends Serializable> extends AbstractField
/**
* Show minus button icon to remove elements included the latest one in order to empty the list explicitly.
*
- * @param minusAwaysAvailable
- * @return
+ * @param minusAwaysAvailable whether minus button must always available
+ * @return this instance, for fluent building
*/
public Builder<E> setMinusAwaysAvailable(final boolean minusAwaysAvailable) {
this.minusAwaysAvailable = minusAwaysAvailable;
@@ -241,8 +241,8 @@ public final class MultiFieldPanel<E extends Serializable> extends AbstractField
/**
* Set multivalue field.
*
- * @param multivalue
- * @return
+ * @param multivalue whether this field is multivalue
+ * @return this instance, for fluent building
*/
public Builder<E> setMultivalue(final boolean multivalue) {
this.multivalue = multivalue;
@@ -252,9 +252,9 @@ public final class MultiFieldPanel<E extends Serializable> extends AbstractField
/**
* Set on_change event in order to send MultiValueSelectorEvent to page.
*
- * @param eventTemplate
- * @return
* @see MultiValueSelectorEvent
+ * @param eventTemplate whether this is an event template
+ * @return this instance, for fluent building
*/
public Builder<E> setEventTemplate(final boolean eventTemplate) {
this.eventTemplate = eventTemplate;
http://git-wip-us.apache.org/repos/asf/syncope/blob/81e141b0/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/SelectableRecorder.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/SelectableRecorder.java b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/SelectableRecorder.java
index 3cd4557..b82332e 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/SelectableRecorder.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/SelectableRecorder.java
@@ -33,8 +33,8 @@ import org.apache.wicket.util.string.Strings;
/**
* A variant of Recorder, supporting single element selection (for editing purpose, for example). <b>Note</b>: this
- * class extends Recorder<T> but in fact it is a bare copy of most source code; this was done because the original class
- * is keeping everything private.
+ * class extends Recorder<T> but in fact it is a bare copy of most source code; this was done because the original
+ * class is keeping everything private.
*
* @param <T> Type of the palette
*/
@@ -183,15 +183,13 @@ public class SelectableRecorder<T> extends Recorder<T> {
private void updateIds(final String value) {
if (Strings.isEmpty(value)) {
ids = EMPTY_IDS;
+ } else if (value.indexOf('|') == -1) {
+ ids = value.split(",");
+ selectedId = null;
} else {
- if (value.indexOf('|') == -1) {
- ids = value.split(",");
- selectedId = null;
- } else {
- String[] splitted = value.split("\\|");
- selectedId = splitted[0];
- ids = splitted[1].split(",");
- }
+ String[] splitted = value.split("\\|");
+ selectedId = splitted[0];
+ ids = splitted[1].split(",");
}
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/81e141b0/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizard.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizard.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizard.java
index d9b76d6..54f9223 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizard.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizard.java
@@ -19,7 +19,6 @@ import java.io.Serializable;
import org.apache.syncope.client.console.panels.ModalPanel;
import org.apache.syncope.client.console.panels.NotificationPanel;
import org.apache.wicket.Component;
-import org.apache.wicket.PageReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.event.Broadcast;
import org.apache.wicket.extensions.wizard.Wizard;
@@ -32,12 +31,10 @@ import org.slf4j.LoggerFactory;
public abstract class AjaxWizard<T extends Serializable> extends Wizard implements ModalPanel {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = -1272120742876833520L;
protected static final Logger LOG = LoggerFactory.getLogger(AjaxWizard.class);
- private final PageReference pageRef;
-
private T item;
private final boolean edit;
@@ -49,20 +46,17 @@ public abstract class AjaxWizard<T extends Serializable> extends Wizard implemen
*
* @param id The component id.
* @param item model object.
- * @param model
- * @param pageRef Caller page reference.
+ * @param model wizard model
* @param edit <tt>true</tt> if edit mode.
*/
- public AjaxWizard(
- final String id, final T item, final WizardModel model, final PageReference pageRef, final boolean edit) {
+ public AjaxWizard(final String id, final T item, final WizardModel model, final boolean edit) {
super(id);
this.item = item;
- this.pageRef = pageRef;
this.edit = edit;
setOutputMarkupId(true);
- setDefaultModel(new CompoundPropertyModel<AjaxWizard<T>>(this));
+ setDefaultModel(new CompoundPropertyModel<>(this));
init(model);
}
@@ -96,7 +90,7 @@ public abstract class AjaxWizard<T extends Serializable> extends Wizard implemen
final AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class);
try {
onCancelInternal();
- send(AjaxWizard.this, Broadcast.BUBBLE, new NewItemCancelEvent<T>(item, target));
+ send(AjaxWizard.this, Broadcast.BUBBLE, new NewItemCancelEvent<>(item, target));
} catch (Exception e) {
LOG.warn("Wizard error on cancel", e);
error(getString("wizard.cancel.error"));
@@ -112,7 +106,7 @@ public abstract class AjaxWizard<T extends Serializable> extends Wizard implemen
final AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class);
try {
onApplyInternal();
- send(AjaxWizard.this, Broadcast.BUBBLE, new NewItemFinishEvent<T>(item, target));
+ send(AjaxWizard.this, Broadcast.BUBBLE, new NewItemFinishEvent<>(item, target));
} catch (Exception e) {
LOG.warn("Wizard error on finish", e);
error(getString("wizard.apply.error"));
http://git-wip-us.apache.org/repos/asf/syncope/blob/81e141b0/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizardBuilder.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizardBuilder.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizardBuilder.java
index 0205e7f..ec4ccd9 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizardBuilder.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizardBuilder.java
@@ -22,8 +22,6 @@ import org.apache.wicket.extensions.wizard.WizardModel;
public abstract class AjaxWizardBuilder<T extends Serializable> {
- private static final long serialVersionUID = 1L;
-
private final String id;
protected final PageReference pageRef;
@@ -57,7 +55,7 @@ public abstract class AjaxWizardBuilder<T extends Serializable> {
// ge the specified item if available
final T modelObject = newModelObject();
- return new AjaxWizard<T>(id, modelObject, buildModelSteps(modelObject, new WizardModel()), pageRef, edit) {
+ return new AjaxWizard<T>(id, modelObject, buildModelSteps(modelObject, new WizardModel()), edit) {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/81e141b0/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AnyWizardBuilder.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AnyWizardBuilder.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AnyWizardBuilder.java
index cbcdc1d..6ccf566 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AnyWizardBuilder.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AnyWizardBuilder.java
@@ -36,7 +36,7 @@ import org.apache.wicket.model.util.ListModel;
public class AnyWizardBuilder<T extends AnyTO> extends AjaxWizardBuilder<T> implements Serializable {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = -2480279868319546243L;
protected final AnyTypeRestClient anyTypeRestClient = new AnyTypeRestClient();
@@ -47,7 +47,7 @@ public class AnyWizardBuilder<T extends AnyTO> extends AjaxWizardBuilder<T> impl
*
* @param id The component id
* @param anyTO any
- * @param anyTypeClasses
+ * @param anyTypeClasses any type classes
* @param pageRef Caller page reference.
*/
public AnyWizardBuilder(
http://git-wip-us.apache.org/repos/asf/syncope/blob/81e141b0/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/GroupDetails.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/GroupDetails.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/GroupDetails.java
index 8c789ae..582e56b 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/GroupDetails.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/GroupDetails.java
@@ -44,10 +44,7 @@ public class GroupDetails extends Details<GroupTO> {
private static final long serialVersionUID = 855618618337931784L;
- /**
- * Logger.
- */
- protected static final Logger LOG = LoggerFactory.getLogger(GroupDetails.class);
+ private static final Logger LOG = LoggerFactory.getLogger(GroupDetails.class);
private final UserRestClient userRestClient = new UserRestClient();
@@ -178,9 +175,7 @@ public class GroupDetails extends Details<GroupTO> {
* This is waiting for events from opened modal windows: first to get the selected user / group, then to update the
* respective text panel.
*
- * {@inheritDoc }
- *
- * @param event
+ * @param event event
*/
@Override
public void onEvent(final IEvent<?> event) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/81e141b0/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/GroupWizardBuilder.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/GroupWizardBuilder.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/GroupWizardBuilder.java
index ee5e3cb..0d97893 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/GroupWizardBuilder.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/GroupWizardBuilder.java
@@ -29,7 +29,7 @@ import org.apache.wicket.model.util.ListModel;
public class GroupWizardBuilder extends AnyWizardBuilder<GroupTO> {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 5945391813567245081L;
private final GroupRestClient groupRestClient = new GroupRestClient();
@@ -38,7 +38,7 @@ public class GroupWizardBuilder extends AnyWizardBuilder<GroupTO> {
*
* @param id The component id
* @param groupTO any
- * @param anyTypeClasses
+ * @param anyTypeClasses any type classes
* @param pageRef Caller page reference.
*/
public GroupWizardBuilder(
http://git-wip-us.apache.org/repos/asf/syncope/blob/81e141b0/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/UserWizardBuilder.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/UserWizardBuilder.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/UserWizardBuilder.java
index 56fd134..6f9097e 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/UserWizardBuilder.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/UserWizardBuilder.java
@@ -32,7 +32,7 @@ import org.apache.wicket.model.util.ListModel;
public class UserWizardBuilder extends AnyWizardBuilder<UserTO> {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 6716803168859873877L;
private final UserRestClient userRestClient = new UserRestClient();
@@ -43,7 +43,7 @@ public class UserWizardBuilder extends AnyWizardBuilder<UserTO> {
*
* @param id The component id
* @param userTO any
- * @param anyTypeClasses
+ * @param anyTypeClasses any type classes
* @param pageRef Caller page reference.
*/
public UserWizardBuilder(
http://git-wip-us.apache.org/repos/asf/syncope/blob/81e141b0/client/lib/src/main/java/org/apache/syncope/client/lib/SyncopeClient.java
----------------------------------------------------------------------
diff --git a/client/lib/src/main/java/org/apache/syncope/client/lib/SyncopeClient.java b/client/lib/src/main/java/org/apache/syncope/client/lib/SyncopeClient.java
index c2d6250..7c61b10 100644
--- a/client/lib/src/main/java/org/apache/syncope/client/lib/SyncopeClient.java
+++ b/client/lib/src/main/java/org/apache/syncope/client/lib/SyncopeClient.java
@@ -101,7 +101,7 @@ public class SyncopeClient {
}
/**
- * Returns a new instance of {@link OrderByClauseBuilder}, for assisted building of {@link orderby} clauses.
+ * Returns a new instance of {@link OrderByClauseBuilder}, for assisted building of {@code orderby} clauses.
*
* @return default instance of {@link OrderByClauseBuilder}
*/
http://git-wip-us.apache.org/repos/asf/syncope/blob/81e141b0/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index 0cefabb..b2ab47a 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -39,7 +39,7 @@ under the License.
<profiles>
<profile>
- <id>doc</id>
+ <id>site</id>
<build>
<plugins>
@@ -51,6 +51,26 @@ under the License.
<skip>true</skip>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <skip>true</skip>
+ <skipDeploy>true</skipDeploy>
+ <generateReports>false</generateReports>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-docs-to-site</id>
+ <phase>none</phase>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</profile>
http://git-wip-us.apache.org/repos/asf/syncope/blob/81e141b0/common/lib/src/main/java/org/apache/syncope/common/lib/search/SyncopeProperty.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/search/SyncopeProperty.java b/common/lib/src/main/java/org/apache/syncope/common/lib/search/SyncopeProperty.java
index 7673b86..f7c4482 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/search/SyncopeProperty.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/search/SyncopeProperty.java
@@ -22,7 +22,8 @@ import org.apache.cxf.jaxrs.ext.search.client.CompleteCondition;
import org.apache.cxf.jaxrs.ext.search.client.Property;
/**
- * Extension of fluent interface, for {@link SyncopeFiqlSearchConditionBuilder}.
+ * Extension of fluent interface, for {@link org.apache.syncope.common.lib.search.AbstractFiqlSearchConditionBuilder}
+ * and subclasses.
*/
public interface SyncopeProperty extends Property {
http://git-wip-us.apache.org/repos/asf/syncope/blob/81e141b0/common/pom.xml
----------------------------------------------------------------------
diff --git a/common/pom.xml b/common/pom.xml
index 8ba7e7a..2a83aa2 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -39,7 +39,7 @@ under the License.
<profiles>
<profile>
- <id>doc</id>
+ <id>site</id>
<build>
<plugins>
@@ -51,6 +51,26 @@ under the License.
<skip>true</skip>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <skip>true</skip>
+ <skipDeploy>true</skipDeploy>
+ <generateReports>false</generateReports>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-docs-to-site</id>
+ <phase>none</phase>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</profile>
http://git-wip-us.apache.org/repos/asf/syncope/blob/81e141b0/common/rest-api/pom.xml
----------------------------------------------------------------------
diff --git a/common/rest-api/pom.xml b/common/rest-api/pom.xml
index 280de26..386dd8e 100644
--- a/common/rest-api/pom.xml
+++ b/common/rest-api/pom.xml
@@ -73,43 +73,83 @@ under the License.
</plugin>
<plugin>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-java2wadl-plugin</artifactId>
- <inherited>true</inherited>
- <executions>
- <execution>
- <id>parsejavadoc</id>
- <phase>process-classes</phase>
- <goals>
- <goal>parsejavadoc</goal>
- </goals>
- </execution>
- <execution>
- <id>process-classes</id>
- <phase>process-classes</phase>
- <goals>
- <goal>java2wadl</goal>
- </goals>
- <configuration>
- <applicationTitle>Apache Syncope ${project.version}</applicationTitle>
- <namespacePrefix>syncope</namespacePrefix>
- <linkAnyMediaTypeToXmlSchema>true</linkAnyMediaTypeToXmlSchema>
- <useJaxbContextForQnames>true</useJaxbContextForQnames>
- <addResourceAndMethodIds>true</addResourceAndMethodIds>
- <usePathParamsToCompareOperations>false</usePathParamsToCompareOperations>
- <classResourceNames />
- <basePackages>org.apache.syncope.common.rest.api.service</basePackages>
- <docProvider>org.apache.cxf.maven_plugin.javatowadl.ResourceMapJavaDocProvider</docProvider>
- <attachWadl>true</attachWadl>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
</plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>site</id>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <inherited>true</inherited>
+ <executions>
+ <execution>
+ <id>build-for-wadl</id>
+ <phase>pre-site</phase>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <inherited>true</inherited>
+ <executions>
+ <execution>
+ <id>javadocs-for-wadl</id>
+ <phase>pre-site</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-java2wadl-plugin</artifactId>
+ <inherited>true</inherited>
+ <executions>
+ <execution>
+ <id>parse-javadoc-for-wadl</id>
+ <phase>pre-site</phase>
+ <goals>
+ <goal>parsejavadoc</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>generate-wadl</id>
+ <phase>pre-site</phase>
+ <goals>
+ <goal>java2wadl</goal>
+ </goals>
+ <configuration>
+ <applicationTitle>Apache Syncope ${project.version}</applicationTitle>
+ <namespacePrefix>syncope</namespacePrefix>
+ <linkAnyMediaTypeToXmlSchema>true</linkAnyMediaTypeToXmlSchema>
+ <useJaxbContextForQnames>true</useJaxbContextForQnames>
+ <addResourceAndMethodIds>true</addResourceAndMethodIds>
+ <usePathParamsToCompareOperations>false</usePathParamsToCompareOperations>
+ <classResourceNames />
+ <basePackages>org.apache.syncope.common.rest.api.service</basePackages>
+ <docProvider>org.apache.cxf.maven_plugin.javatowadl.ResourceMapJavaDocProvider</docProvider>
+ <attachWadl>true</attachWadl>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/syncope/blob/81e141b0/core/logic/src/main/java/org/apache/syncope/core/logic/AbstractLogic.java
----------------------------------------------------------------------
diff --git a/core/logic/src/main/java/org/apache/syncope/core/logic/AbstractLogic.java b/core/logic/src/main/java/org/apache/syncope/core/logic/AbstractLogic.java
index 6aa375c..6602ca0 100644
--- a/core/logic/src/main/java/org/apache/syncope/core/logic/AbstractLogic.java
+++ b/core/logic/src/main/java/org/apache/syncope/core/logic/AbstractLogic.java
@@ -35,7 +35,6 @@ abstract class AbstractLogic<T extends AbstractBaseBean> {
/**
* Resolves stored bean (if existing) referred by the given CUD method.
- * <br />
* Read-only methods will be unresolved for performance reasons.
*
* @param method method.
http://git-wip-us.apache.org/repos/asf/syncope/blob/81e141b0/core/logic/src/main/java/org/apache/syncope/core/logic/init/EntitlementAccessor.java
----------------------------------------------------------------------
diff --git a/core/logic/src/main/java/org/apache/syncope/core/logic/init/EntitlementAccessor.java b/core/logic/src/main/java/org/apache/syncope/core/logic/init/EntitlementAccessor.java
index 4596898..f2fdb1f 100644
--- a/core/logic/src/main/java/org/apache/syncope/core/logic/init/EntitlementAccessor.java
+++ b/core/logic/src/main/java/org/apache/syncope/core/logic/init/EntitlementAccessor.java
@@ -26,7 +26,7 @@ import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
/**
- * Domain-sensible (via {@code @Transactional} access to any type data for {@link Entitlement} init.
+ * Domain-sensible (via {@code @Transactional} access to any type data for entitlement init.
*
* @see EntitlementLoader
*/
http://git-wip-us.apache.org/repos/asf/syncope/blob/81e141b0/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAExternalResourceDAO.java
----------------------------------------------------------------------
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAExternalResourceDAO.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAExternalResourceDAO.java
index 0650ee9..facea51 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAExternalResourceDAO.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAExternalResourceDAO.java
@@ -138,14 +138,6 @@ public class JPAExternalResourceDAO extends AbstractDAO<ExternalResource, String
return query.getResultList();
}
- /**
- * This method has an explicit Transactional annotation because it is called by SyncJob.
- *
- * @see org.apache.syncope.core.sync.impl.SyncJob
- *
- * @param resource entity to be merged
- * @return the same entity, updated
- */
@Override
@Transactional(rollbackFor = { Throwable.class })
public ExternalResource save(final ExternalResource resource) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/81e141b0/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAReportExecDAO.java
----------------------------------------------------------------------
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAReportExecDAO.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAReportExecDAO.java
index 35b7556..6421cc0 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAReportExecDAO.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAReportExecDAO.java
@@ -65,13 +65,6 @@ public class JPAReportExecDAO extends AbstractDAO<ReportExec, Long> implements R
return query.getResultList();
}
- /**
- * This method is annotated as transactional because called from ReportJob.
- *
- * @see org.apache.syncope.core.report.ReportJob
- * @param execution to be merged
- * @return merged execution
- */
@Override
@Transactional(rollbackFor = Throwable.class)
public ReportExec save(final ReportExec execution) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/81e141b0/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPATaskExecDAO.java
----------------------------------------------------------------------
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPATaskExecDAO.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPATaskExecDAO.java
index 961fea0..9b03814 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPATaskExecDAO.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPATaskExecDAO.java
@@ -83,13 +83,6 @@ public class JPATaskExecDAO extends AbstractDAO<TaskExec, Long> implements TaskE
return entityManager().merge(execution);
}
- /**
- * This method has an explicit Transactional annotation because it is called by
- * {@link org.apache.syncope.core.provisioning.java.job.AbstractTaskJob#execute(org.quartz.JobExecutionContext)}.
- *
- * @param taskId task id
- * @param execution task execution
- */
@Override
@Transactional(rollbackFor = { Throwable.class })
public void saveAndAdd(final Long taskId, final TaskExec execution) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/81e141b0/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/AbstractAnnotatedEntity.java
----------------------------------------------------------------------
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/AbstractAnnotatedEntity.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/AbstractAnnotatedEntity.java
index c9bbe77..ca29980 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/AbstractAnnotatedEntity.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/AbstractAnnotatedEntity.java
@@ -28,6 +28,8 @@ import org.apache.syncope.core.persistence.api.entity.AnnotatedEntity;
/**
* Abstract wrapper for common system information.
+ *
+ * @param <KEY> the type of the key of this entity
*/
@MappedSuperclass
@EntityListeners(value = AnnotatedEntityListener.class)
@@ -37,7 +39,6 @@ public abstract class AbstractAnnotatedEntity<KEY> extends AbstractEntity<KEY> i
/**
* Username of the user that has created this profile.
- * <br/>
* Reference to existing user cannot be used: the creator can either be <tt>admin</tt> or was deleted.
*/
@Column(nullable = false)
@@ -52,11 +53,8 @@ public abstract class AbstractAnnotatedEntity<KEY> extends AbstractEntity<KEY> i
/**
* Username of the user that has performed the last modification to this profile.
- * <br/>
* This field cannot be null: at creation time it needs to be initialized with the creator username.
- * <br/>
* The modifier can be the user itself if the last performed change was a self-modification.
- * <br/>
* Reference to existing user cannot be used: the creator can either be <tt>admin</tt> or was deleted.
*/
@Column(nullable = false)
@@ -64,7 +62,6 @@ public abstract class AbstractAnnotatedEntity<KEY> extends AbstractEntity<KEY> i
/**
* Last change date.
- * <br/>
* This field cannot be null: at creation time it needs to be initialized with <tt>creationDate</tt> field value.
*/
@Column(nullable = false)
http://git-wip-us.apache.org/repos/asf/syncope/blob/81e141b0/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/spring/CommonEntityManagerFactoryConf.java
----------------------------------------------------------------------
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/spring/CommonEntityManagerFactoryConf.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/spring/CommonEntityManagerFactoryConf.java
index 3e44864..bd1aba5 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/spring/CommonEntityManagerFactoryConf.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/spring/CommonEntityManagerFactoryConf.java
@@ -32,7 +32,6 @@ import org.springframework.orm.jpa.persistenceunit.PersistenceUnitPostProcessor;
/**
* Container for common configuration options among all EntityManagerFactory entities (one for each domain).
- * <br/>
* Acts as a commodity place for fetching each domain's {@link DataSource}..
*/
public class CommonEntityManagerFactoryConf implements DomainsHolder, InitializingBean, ApplicationContextAware {
http://git-wip-us.apache.org/repos/asf/syncope/blob/81e141b0/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index e42e36e..35a4958 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -39,7 +39,7 @@ under the License.
<profiles>
<profile>
- <id>doc</id>
+ <id>site</id>
<build>
<plugins>
@@ -51,6 +51,26 @@ under the License.
<skip>true</skip>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <skip>true</skip>
+ <skipDeploy>true</skipDeploy>
+ <generateReports>false</generateReports>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-docs-to-site</id>
+ <phase>none</phase>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</profile>
http://git-wip-us.apache.org/repos/asf/syncope/blob/81e141b0/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/data/PolicyDataBinder.java
----------------------------------------------------------------------
diff --git a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/data/PolicyDataBinder.java b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/data/PolicyDataBinder.java
index aa144f0..10ac492 100644
--- a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/data/PolicyDataBinder.java
+++ b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/data/PolicyDataBinder.java
@@ -25,12 +25,6 @@ public interface PolicyDataBinder {
<T extends Policy> T getPolicy(T policy, AbstractPolicyTO policyTO);
- /**
- * Get policy TO from policy bean.
- *
- * @param policy bean.
- * @return policy TO.
- */
<T extends AbstractPolicyTO> T getPolicyTO(Policy policy);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/81e141b0/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/notification/NotificationManager.java
----------------------------------------------------------------------
diff --git a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/notification/NotificationManager.java b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/notification/NotificationManager.java
index cb41d8c..ee120f5 100644
--- a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/notification/NotificationManager.java
+++ b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/notification/NotificationManager.java
@@ -41,9 +41,26 @@ public interface NotificationManager {
/**
* Create notification tasks for each notification matching the given user id and (some of) tasks performed.
+ *
+ * @param type event category type
+ * @param category event category
+ * @param subcategory event subcategory
+ * @param event event
+ * @param result event result
+ * @param before object(s) availabile before the event
+ * @param output object(s) produced by the event
+ * @param input object(s) provided to the event
+ * @return created notification tasks
*/
- List<NotificationTask> createTasks(AuditElements.EventCategoryType type, String category, String subcategory,
- String event, AuditElements.Result condition, Object before, Object output, Object... input);
+ List<NotificationTask> createTasks(
+ AuditElements.EventCategoryType type,
+ String category,
+ String subcategory,
+ String event,
+ AuditElements.Result result,
+ Object before,
+ Object output,
+ Object... input);
long getMaxRetries();
http://git-wip-us.apache.org/repos/asf/syncope/blob/81e141b0/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/sync/PushActions.java
----------------------------------------------------------------------
diff --git a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/sync/PushActions.java b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/sync/PushActions.java
index 9a3c15b..c6d75ae 100644
--- a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/sync/PushActions.java
+++ b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/sync/PushActions.java
@@ -23,13 +23,12 @@ import org.quartz.JobExecutionException;
/**
* Interface for actions to be performed during push.
- * <br/>
* All methods can throw {@link IgnoreProvisionException} to make the current any ignored by the push process.
*/
public interface PushActions extends ProvisioningActions {
/**
- * Action to be executed before to assign (link & provision) a synchronized any object to the resource.
+ * Action to be executed before to assign (link & provision) a synchronized any object to the resource.
*
* @param <A> concrete any object
* @param profile profile of the push being executed.
http://git-wip-us.apache.org/repos/asf/syncope/blob/81e141b0/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/sync/SyncActions.java
----------------------------------------------------------------------
diff --git a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/sync/SyncActions.java b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/sync/SyncActions.java
index e7c8d8c..2440a1a 100644
--- a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/sync/SyncActions.java
+++ b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/sync/SyncActions.java
@@ -25,7 +25,6 @@ import org.quartz.JobExecutionException;
/**
* Interface for actions to be performed during synchronization.
- * <br/>
* All methods can throw {@link IgnoreProvisionException} to make the current any object ignored by the synchronization
* process.
*/
@@ -34,7 +33,7 @@ public interface SyncActions extends ProvisioningActions {
/**
* Action to be executed before to create a synchronized user / group locally.
* User/group is created locally upon synchronization in case of the un-matching rule
- * {@link org.apache.syncope.common.types.UnmatchingRule#PROVISION} (default un-matching rule) is applied.
+ * {@link org.apache.syncope.common.lib.types.UnmatchingRule#PROVISION} (default un-matching rule) is applied.
*
* @param <A> concrete any object
* @param profile profile of the synchronization being executed.
@@ -51,7 +50,7 @@ public interface SyncActions extends ProvisioningActions {
/**
* Action to be executed before creating (and linking to the resource) a synchronized user / group locally.
* User/group is created locally and linked to the synchronized resource upon synchronization in case of the
- * un-matching rule {@link org.apache.syncope.common.types.UnmatchingRule#ASSIGN} is applied.
+ * un-matching rule {@link org.apache.syncope.common.lib.types.UnmatchingRule#ASSIGN} is applied.
*
* @param <A> concrete any object
* @param profile profile of the synchronization being executed.
@@ -68,7 +67,7 @@ public interface SyncActions extends ProvisioningActions {
/**
* Action to be executed before unlinking resource from the synchronized user / group and de-provisioning.
* User/group is unlinked and de-provisioned from the synchronized resource upon synchronization in case of the
- * matching rule {@link org.apache.syncope.common.types.MatchingRule#UNASSIGN} is applied.
+ * matching rule {@link org.apache.syncope.common.lib.types.MatchingRule#UNASSIGN} is applied.
*
* @param <A> concrete any object
* @param profile profile of the synchronization being executed.
@@ -85,7 +84,7 @@ public interface SyncActions extends ProvisioningActions {
/**
* Action to be executed before de-provisioning action only.
* User/group is de-provisioned (without unlinking) from the synchronized resource upon synchronization in case of
- * the matching rule {@link org.apache.syncope.common.types.MatchingRule#DEPROVISION} is applied.
+ * the matching rule {@link org.apache.syncope.common.lib.types.MatchingRule#DEPROVISION} is applied.
*
* @param <A> concrete any object
* @param profile profile of the synchronization being executed.
@@ -102,7 +101,7 @@ public interface SyncActions extends ProvisioningActions {
/**
* Action to be executed before unlinking resource from the synchronized user / group.
* User/group is unlinked (without de-provisioning) from the synchronized resource upon synchronization in case of
- * the matching rule {@link org.apache.syncope.common.types.MatchingRule#UNLINK} is applied.
+ * the matching rule {@link org.apache.syncope.common.lib.types.MatchingRule#UNLINK} is applied.
*
* @param <A> concrete any object
* @param profile profile of the synchronization being executed.
@@ -119,7 +118,7 @@ public interface SyncActions extends ProvisioningActions {
/**
* Action to be executed before linking resource to the synchronized user / group.
* User/group is linked (without updating) to the synchronized resource upon synchronization in case of
- * the matching rule {@link org.apache.syncope.common.types.MatchingRule#LINK} is applied.
+ * the matching rule {@link org.apache.syncope.common.lib.types.MatchingRule#LINK} is applied.
*
* @param <A> concrete any object
* @param profile profile of the synchronization being executed.
@@ -136,7 +135,7 @@ public interface SyncActions extends ProvisioningActions {
/**
* Action to be executed before to update a synchronized user / group locally.
* User/group is updated upon synchronization in case of the matching rule
- * {@link org.apache.syncope.common.types.MatchingRule#UPDATE} (default matching rule) is applied.
+ * {@link org.apache.syncope.common.lib.types.MatchingRule#UPDATE} (default matching rule) is applied.
*
* @param <M> concrete any object
* @param <P> any object modifications
http://git-wip-us.apache.org/repos/asf/syncope/blob/81e141b0/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/GroupDataBinderImpl.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/GroupDataBinderImpl.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/GroupDataBinderImpl.java
index dad26f8..20c52b3 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/GroupDataBinderImpl.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/GroupDataBinderImpl.java
@@ -72,8 +72,8 @@ public class GroupDataBinderImpl extends AbstractAnyDataBinder implements GroupD
if (anyType.getKind() == AnyTypeKind.ANY_OBJECT && group.getADynMembership(anyType) == null) {
dynMembership = entityFactory.newEntity(ADynGroupMembership.class);
dynMembership.setGroup(group);
- ADynGroupMembership.class.cast(dynMembership).setAnyType(anyType);
group.add((ADynGroupMembership) dynMembership);
+ ((ADynGroupMembership) dynMembership).setAnyType(anyType);
} else if (anyType.getKind() == AnyTypeKind.USER && group.getUDynMembership() == null) {
dynMembership = entityFactory.newEntity(UDynGroupMembership.class);
dynMembership.setGroup(group);
http://git-wip-us.apache.org/repos/asf/syncope/blob/81e141b0/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/LDAPMembershipSyncActions.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/LDAPMembershipSyncActions.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/LDAPMembershipSyncActions.java
index 4cf1b54..9c6294a 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/LDAPMembershipSyncActions.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/LDAPMembershipSyncActions.java
@@ -185,7 +185,7 @@ public class LDAPMembershipSyncActions extends DefaultSyncActions {
* @param delta representing the synchronizing group
* @param connector associated to the current resource
* @return value of attribute returned by
- * {@link #getGroupMembershipAttrName(org.apache.syncope.core.propagation.Connector) }
+ * {@link #getGroupMembershipAttrName}
*/
protected List<Object> getMembAttrValues(final SyncDelta delta, final Connector connector) {
List<Object> result = Collections.<Object>emptyList();
http://git-wip-us.apache.org/repos/asf/syncope/blob/81e141b0/core/rest-cxf/pom.xml
----------------------------------------------------------------------
diff --git a/core/rest-cxf/pom.xml b/core/rest-cxf/pom.xml
index 2a1fcad..8921b3f 100644
--- a/core/rest-cxf/pom.xml
+++ b/core/rest-cxf/pom.xml
@@ -153,40 +153,11 @@ under the License.
<profiles>
<profile>
- <id>offline-wadl</id>
+ <id>site</id>
- <build>
- <defaultGoal>clean verify</defaultGoal>
-
+ <build>
<plugins>
- <!-- 1. Fetch offline WADL -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <inherited>false</inherited>
- <configuration>
- <outputDirectory>${project.build.directory}</outputDirectory>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.syncope.common</groupId>
- <artifactId>syncope-common-rest-api</artifactId>
- <version>${project.version}</version>
- <type>wadl</type>
- </artifactItem>
- </artifactItems>
- </configuration>
- <executions>
- <execution>
- <id>fetch-offline-wadl</id>
- <phase>process-resources</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <!-- 2. Transform WADL into 2 HTML pages -->
+ <!-- 1. Transform WADL into 2 HTML pages -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>xml-maven-plugin</artifactId>
@@ -194,7 +165,7 @@ under the License.
<executions>
<execution>
<id>wadl2html</id>
- <phase>process-resources</phase>
+ <phase>pre-site</phase>
<goals>
<goal>transform</goal>
</goals>
@@ -203,12 +174,12 @@ under the License.
<configuration>
<transformationSets>
<transformationSet>
- <dir>${project.build.directory}</dir>
+ <dir>${basedir}/../../common/rest-api/target/generated/wadl</dir>
<includes>
- <include>syncope-common-rest-api-${project.version}.wadl</include>
+ <include>application.wadl</include>
</includes>
<outputDir>${project.build.directory}/generated/wadl</outputDir>
- <stylesheet>${project.build.directory}/classes/wadl2html/identity.xsl</stylesheet>
+ <stylesheet>${basedir}/src/main/resources/wadl2html/identity.xsl</stylesheet>
<outputProperties>
<outputProperty>
<name>indent</name>
@@ -223,12 +194,12 @@ under the License.
</fileMappers>
</transformationSet>
<transformationSet>
- <dir>${project.build.directory}</dir>
+ <dir>${project.build.directory}/generated/wadl</dir>
<includes>
- <include>syncope-common-rest-api-${project.version}.wadl</include>
+ <include>syncope.wadl</include>
</includes>
<outputDir>${project.build.directory}/generated/wadl</outputDir>
- <stylesheet>${project.build.directory}/classes/wadl2html/index.xsl</stylesheet>
+ <stylesheet>${basedir}/src/main/resources/wadl2html/index.xsl</stylesheet>
<parameters>
<parameter>
<name>contextPath</name>
@@ -249,12 +220,12 @@ under the License.
</fileMappers>
</transformationSet>
<transformationSet>
- <dir>${project.build.directory}</dir>
+ <dir>${project.build.directory}/generated/wadl</dir>
<includes>
- <include>syncope-common-rest-api-${project.version}.wadl</include>
+ <include>syncope.wadl</include>
</includes>
<outputDir>${project.build.directory}/generated/wadl</outputDir>
- <stylesheet>${project.build.directory}/classes/wadl2html/schema.xsl</stylesheet>
+ <stylesheet>${basedir}/src/main/resources/wadl2html/schema.xsl</stylesheet>
<parameters>
<parameter>
<name>contextPath</name>
@@ -286,33 +257,37 @@ under the License.
</configuration>
</plugin>
- <!-- 3. Fix external references -->
+ <!-- 2. Fix external references -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<inherited>true</inherited>
<executions>
<execution>
- <id>fix-html-ext-refs</id>
- <phase>process-resources</phase>
+ <id>copy-rest-reference-to-site</id>
+ <phase>pre-site</phase>
<configuration>
<target>
<replace file="${project.build.directory}/generated/wadl/index.html"
- token="../webjars/jquery/${jquery.version}/jquery.min.js"
+ token="../webjars/jquery/$/jquery.min.js"
value="https://code.jquery.com/jquery-${jquery.version}.min.js"/>
<replace file="${project.build.directory}/generated/wadl/index.html"
- token="../webjars/jquery-ui/${jquery-ui.version}/jquery-ui.min.js"
+ token="../webjars/jquery-ui/$/jquery-ui.min.js"
value="http://code.jquery.com/ui/${jquery-ui.version}/jquery-ui.min.js"/>
<replace file="${project.build.directory}/generated/wadl/index.html"
- token="../webjars/jquery-ui-themes/${jquery-ui.version}/smoothness/jquery-ui.min.css"
+ token="../webjars/jquery-ui-themes/$/smoothness/jquery-ui.min.css"
value="https://code.jquery.com/ui/${jquery-ui.version}/themes/smoothness/jquery-ui.css"/>
<replace file="${project.build.directory}/generated/wadl/schema_1_syncope1.html"
- token="../webjars/highlightjs/${highlightjs.version}/highlight.min.js"
+ token="../webjars/highlightjs/$/highlight.min.js"
value="http://cdnjs.cloudflare.com/ajax/libs/highlight.js/${highlightjs.version}/highlight.min.js"/>
<replace file="${project.build.directory}/generated/wadl/schema_1_syncope1.html"
- token="../webjars/highlightjs/${highlightjs.version}/styles/default.min.css"
+ token="../webjars/highlightjs/$/styles/default.min.css"
value="http://cdnjs.cloudflare.com/ajax/libs/highlight.js/${highlightjs.version}/styles/default.min.css"/>
+
+ <copy todir="${site.deploymentBaseDir}/rest/2.0">
+ <fileset dir="${project.build.directory}/generated/wadl"/>
+ </copy>
</target>
</configuration>
<goals>
http://git-wip-us.apache.org/repos/asf/syncope/blob/81e141b0/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/ActivitiUserWorkflowAdapter.java
----------------------------------------------------------------------
diff --git a/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/ActivitiUserWorkflowAdapter.java b/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/ActivitiUserWorkflowAdapter.java
index b26c9cd..7cf3967 100644
--- a/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/ActivitiUserWorkflowAdapter.java
+++ b/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/ActivitiUserWorkflowAdapter.java
@@ -79,7 +79,7 @@ import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.transaction.annotation.Transactional;
/**
- * Activiti {@link http://www.activiti.org/} based implementation.
+ * <a href="http://www.activiti.org/">Activiti</a> based implementation.
*/
public class ActivitiUserWorkflowAdapter extends AbstractUserWorkflowAdapter {
http://git-wip-us.apache.org/repos/asf/syncope/blob/81e141b0/core/workflow-api/src/main/java/org/apache/syncope/core/workflow/api/WorkflowAdapter.java
----------------------------------------------------------------------
diff --git a/core/workflow-api/src/main/java/org/apache/syncope/core/workflow/api/WorkflowAdapter.java b/core/workflow-api/src/main/java/org/apache/syncope/core/workflow/api/WorkflowAdapter.java
index fa05f09..d16245c 100644
--- a/core/workflow-api/src/main/java/org/apache/syncope/core/workflow/api/WorkflowAdapter.java
+++ b/core/workflow-api/src/main/java/org/apache/syncope/core/workflow/api/WorkflowAdapter.java
@@ -27,7 +27,7 @@ import org.apache.syncope.core.provisioning.api.WorkflowResult;
public interface WorkflowAdapter {
/**
- * @return any string that might be interpreted as "prefix"e; (say table prefix in SQL environments)
+ * @return any string that might be interpreted as 'prefix' (say table prefix in SQL environments)
*/
String getPrefix();
http://git-wip-us.apache.org/repos/asf/syncope/blob/81e141b0/deb/pom.xml
----------------------------------------------------------------------
diff --git a/deb/pom.xml b/deb/pom.xml
index f4ed42e..a78ddbc 100644
--- a/deb/pom.xml
+++ b/deb/pom.xml
@@ -68,7 +68,7 @@ under the License.
</profile>
<profile>
- <id>doc</id>
+ <id>site</id>
<build>
<plugins>
@@ -80,6 +80,26 @@ under the License.
<skip>true</skip>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <skip>true</skip>
+ <skipDeploy>true</skipDeploy>
+ <generateReports>false</generateReports>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-docs-to-site</id>
+ <phase>none</phase>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</profile>
http://git-wip-us.apache.org/repos/asf/syncope/blob/81e141b0/ext/pom.xml
----------------------------------------------------------------------
diff --git a/ext/pom.xml b/ext/pom.xml
index 963caf9..dcd9fc6 100644
--- a/ext/pom.xml
+++ b/ext/pom.xml
@@ -39,7 +39,7 @@ under the License.
<profiles>
<profile>
- <id>doc</id>
+ <id>site</id>
<build>
<plugins>
@@ -51,6 +51,26 @@ under the License.
<skip>true</skip>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <skip>true</skip>
+ <skipDeploy>true</skipDeploy>
+ <generateReports>false</generateReports>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-docs-to-site</id>
+ <phase>none</phase>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</profile>
http://git-wip-us.apache.org/repos/asf/syncope/blob/81e141b0/fit/build-tools/src/main/java/org/apache/syncope/fit/buildtools/LdifInputStreamLoader.java
----------------------------------------------------------------------
diff --git a/fit/build-tools/src/main/java/org/apache/syncope/fit/buildtools/LdifInputStreamLoader.java b/fit/build-tools/src/main/java/org/apache/syncope/fit/buildtools/LdifInputStreamLoader.java
index fd9e9e4..135c341 100644
--- a/fit/build-tools/src/main/java/org/apache/syncope/fit/buildtools/LdifInputStreamLoader.java
+++ b/fit/build-tools/src/main/java/org/apache/syncope/fit/buildtools/LdifInputStreamLoader.java
@@ -69,9 +69,9 @@ public class LdifInputStreamLoader {
/**
* Creates a new instance of LdifFileLoader.
*
- * @param coreSession
- * @param ldif
- * @param filters
+ * @param coreSession core session
+ * @param ldif LDIF content
+ * @param filters filters
*/
public LdifInputStreamLoader(
final CoreSession coreSession, final InputStream ldif, final List<? extends LdifLoadFilter> filters) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/81e141b0/fit/pom.xml
----------------------------------------------------------------------
diff --git a/fit/pom.xml b/fit/pom.xml
index 072e37a..904b134 100644
--- a/fit/pom.xml
+++ b/fit/pom.xml
@@ -39,7 +39,7 @@ under the License.
<profiles>
<profile>
- <id>doc</id>
+ <id>site</id>
<build>
<plugins>
@@ -51,6 +51,26 @@ under the License.
<skip>true</skip>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <skip>true</skip>
+ <skipDeploy>true</skipDeploy>
+ <generateReports>false</generateReports>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-docs-to-site</id>
+ <phase>none</phase>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</profile>
http://git-wip-us.apache.org/repos/asf/syncope/blob/81e141b0/installer/pom.xml
----------------------------------------------------------------------
diff --git a/installer/pom.xml b/installer/pom.xml
index 7727574..7bfc0cf 100644
--- a/installer/pom.xml
+++ b/installer/pom.xml
@@ -217,7 +217,7 @@ under the License.
</profile>
<profile>
- <id>doc</id>
+ <id>site</id>
<build>
<plugins>
@@ -229,6 +229,26 @@ under the License.
<skip>true</skip>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <skip>true</skip>
+ <skipDeploy>true</skipDeploy>
+ <generateReports>false</generateReports>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-docs-to-site</id>
+ <phase>none</phase>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</profile>
http://git-wip-us.apache.org/repos/asf/syncope/blob/81e141b0/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 60194cd..fd563ac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1440,8 +1440,10 @@ under the License.
import java.text.MessageFormat
def year = MessageFormat.format("{0,date,yyyy}", new Date())
project.properties['year'] = year
- project.properties['snapshotOrRelease'] = project.version.endsWith("SNAPSHOT") ? "snapshot": "release"
+ project.properties['snapshotOrRelease'] = project.version.endsWith("SNAPSHOT") ? "snapshot" : "release"
project.properties['licenseUrl'] = project.parent.licenses[0].url
+ project.properties['site.deploymentBaseDir'] =
+ project.properties['site.deploymentBaseUrl'] == null || !project.properties['site.deploymentBaseUrl'].startsWith('file:') ? project.properties['project.build.directory'] + "/generated-docs" : project.properties['site.deploymentBaseUrl'].substring(7)
</source>
</configuration>
</execution>
@@ -1612,11 +1614,11 @@ under the License.
</profile>
<profile>
- <id>doc</id>
+ <id>site</id>
<build>
- <defaultGoal>clean generate-resources</defaultGoal>
-
- <plugins>
+ <defaultGoal>clean generate-resources site-deploy</defaultGoal>
+
+ <plugins>
<plugin>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctor-maven-plugin</artifactId>
@@ -1704,16 +1706,7 @@ under the License.
</execution>
</executions>
</plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
- <id>site</id>
- <build>
- <defaultGoal>clean site-deploy</defaultGoal>
- <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
@@ -1764,6 +1757,31 @@ under the License.
</reportPlugins>
</configuration>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-docs-to-site</id>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <phase>site-deploy</phase>
+ <configuration>
+ <target>
+ <copy todir="${site.deploymentBaseDir}/docs">
+ <fileset dir="${project.build.directory}/generated-docs/" includes="getting-started.*"/>
+ <fileset dir="${project.build.directory}/generated-docs/" includes="reference-guide.*"/>
+ </copy>
+ <copy todir="${site.deploymentBaseDir}/docs/images">
+ <fileset dir="${project.build.directory}/generated-docs/images"/>
+ </copy>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</profile>
http://git-wip-us.apache.org/repos/asf/syncope/blob/81e141b0/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index a292dc1..b7c5527 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -34,8 +34,10 @@ under the License.
</skin>
<custom>
<fluidoSkin>
- <topBarEnabled>true</topBarEnabled>
- <sideBarEnabled>false</sideBarEnabled>
+ <topBarEnabled>false</topBarEnabled>
+ <sideBarEnabled>true</sideBarEnabled>
+ <leftColumnClass>span2</leftColumnClass>
+ <bodyColumnClass>span10</bodyColumnClass>
<sourceLineNumbersEnabled>true</sourceLineNumbersEnabled>
<skipGenerationDate>true</skipGenerationDate>
<twitter>
@@ -43,12 +45,12 @@ under the License.
<showUser>true</showUser>
<showFollowers>false</showFollowers>
</twitter>
+ <facebookLike/>
+ <googlePlusOne/>
<ohloh>
<projectId>syncope</projectId>
<widget>thin-badge</widget>
</ohloh>
- <facebookLike/>
- <googlePlusOne/>
</fluidoSkin>
</custom>
@@ -63,24 +65,21 @@ under the License.
<item name="Architecture" href="architecture.html"/>
<item name="Downloads" href="downloads.html"/>
<item name="Security Advisories" href="security.html"/>
- <item name="References" href="apidocs/1.2/index.html">
+ <item name="Documentation" href="docs/index.html"/>
+ <item name="References">
+ <item name="REST 2.0" href="rest/2.0/index.html"/>
<item name="REST 1.2" href="rest/1.2/index.html"/>
+ <item name="Javadocs 2.0" href="apidocs/2.0/index.html"/>
<item name="Javadocs 1.2" href="apidocs/1.2/index.html"/>
- <item name="Javadocs 1.1" href="apidocs/1.1/index.html"/>
- <item name="Javadocs 1.0" href="apidocs/1.0/index.html"/>
</item>
- <item name="License" href="license.html"/>
- <item name="Professional Services" href="professional-services.html"/>
- </menu>
-
- <menu name="Community">
<item name="Mailing Lists" href="mailing-lists.html"/>
<item name="Project Team" href="team-list.html"/>
- <item name="Roadmap" href="http://cwiki.apache.org/confluence/display/SYNCOPE/Roadmap"/>
- <item name="Documentation" href="http://cwiki.apache.org/confluence/display/SYNCOPE/Index"/>
+ <item name="License" href="license.html"/>
+ <item name="Professional Services" href="professional-services.html"/>
</menu>
-
+
<menu name="Development">
+ <item name="Roadmap" href="http://cwiki.apache.org/confluence/display/SYNCOPE/Roadmap"/>
<item name="How to contribute?" href="contributing.html"/>
<item name="Source Repository" href="source-repository.html"/>
<item name="Continuous Integration" href="integration.html"/>
@@ -97,7 +96,7 @@ under the License.
</menu>
<footer>
- <div class="row">
+ <div class="row-fluid">
Apache, Syncope, Apache Syncope, the Apache feather logo and the Apache Syncope project logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.
</div>
</footer>
http://git-wip-us.apache.org/repos/asf/syncope/blob/81e141b0/src/site/xdoc/docs/index.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/docs/index.xml b/src/site/xdoc/docs/index.xml
new file mode 100644
index 0000000..aae4193
--- /dev/null
+++ b/src/site/xdoc/docs/index.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+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.
+
+-->
+<document xmlns="http://maven.apache.org/XDOC/2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
+
+ <properties>
+ <title>Documentation</title>
+ <author email="dev@syncope.apache.org">Apache Syncope Documentation Team</author>
+ </properties>
+
+ <body>
+ <section>
+ <subsection name="Guides">
+ <table>
+ <thead>
+ <tr>
+ <th>Name</th>
+ <th>Formats</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>Getting Started</td>
+ <td>
+ <a href="getting-started.html">HTML</a>
+ <a href="getting-started.pdf">PDF</a>
+ </td>
+ </tr>
+ <tr>
+ <td>Reference Guide</td>
+ <td>
+ <a href="reference-guide.html">HTML</a>
+ <a href="reference-guide.pdf">PDF</a>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </subsection>
+
+ <subsection name="Wiki">
+ <a href="https://cwiki.apache.org/confluence/display/SYNCOPE">Wiki</a>
+ </subsection>
+ </section>
+ </body>
+</document>