[1/2] syncope git commit: [SYNCOPE-917] Removing chapter for the moment

2016-08-04 Thread ilgrosso 
Repository: syncope
Updated Branches:
  refs/heads/master ef7fc4744 -> 0e3ad3cf6


[SYNCOPE-917] Removing chapter for the moment


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/0c47ba19
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/0c47ba19
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/0c47ba19

Branch: refs/heads/master
Commit: 0c47ba1925f55d7c2d245aae20076cba82f3e16b
Parents: ef7fc47
Author: Francesco Chicchiriccò 
Authored: Thu Aug 4 14:28:23 2016 +0200
Committer: Francesco Chicchiriccò 
Committed: Thu Aug 4 14:28:23 2016 +0200

--
 .../reference-guide/reference-guide.adoc|  2 --
 .../reference-guide/usecases/usecases.adoc  | 25 
 2 files changed, 27 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/syncope/blob/0c47ba19/src/main/asciidoc/reference-guide/reference-guide.adoc
--
diff --git a/src/main/asciidoc/reference-guide/reference-guide.adoc 
b/src/main/asciidoc/reference-guide/reference-guide.adoc
index feaa5fd..c280448 100644
--- a/src/main/asciidoc/reference-guide/reference-guide.adoc
+++ b/src/main/asciidoc/reference-guide/reference-guide.adoc
@@ -83,5 +83,3 @@ include::concepts/concepts.adoc[]
 include::workingwithapachesyncope/workingwithapachesyncope.adoc[]
 
 include::extensions/extensions.adoc[]
-
-include::usecases/usecases.adoc[]

http://git-wip-us.apache.org/repos/asf/syncope/blob/0c47ba19/src/main/asciidoc/reference-guide/usecases/usecases.adoc
--
diff --git a/src/main/asciidoc/reference-guide/usecases/usecases.adoc 
b/src/main/asciidoc/reference-guide/usecases/usecases.adoc
deleted file mode 100644
index 8a87e5d..000
--- a/src/main/asciidoc/reference-guide/usecases/usecases.adoc
+++ /dev/null
@@ -1,25 +0,0 @@
-//
-// 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.
-//
-== Use cases
-
-=== LDAP
-
-=== GoogleApps
-
-=== Active Directory

[2/2] syncope git commit: [SYNCOPE-700] Realms and entitlements

2016-08-04 Thread ilgrosso 
[SYNCOPE-700] Realms and entitlements


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/0e3ad3cf
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/0e3ad3cf
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/0e3ad3cf

Branch: refs/heads/master
Commit: 0e3ad3cf67c9d5578d6a0b65b2aa7d088c656983
Parents: 0c47ba1
Author: Francesco Chicchiriccò 
Authored: Thu Aug 4 17:45:48 2016 +0200
Committer: Francesco Chicchiriccò 
Committed: Thu Aug 4 17:45:48 2016 +0200

--
 .../reference-guide/concepts/concepts.adoc  | 94 
 .../reference-guide/concepts/entitlements.adoc  | 63 +
 .../concepts/externalresources.adoc |  8 +-
 .../concepts/provisioning/pull.adoc | 13 +++
 .../reference-guide/concepts/realms.adoc| 72 +++
 .../concepts/usersgroupsandanyobjects.adoc  | 18 +++-
 6 files changed, 223 insertions(+), 45 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/syncope/blob/0e3ad3cf/src/main/asciidoc/reference-guide/concepts/concepts.adoc
--
diff --git a/src/main/asciidoc/reference-guide/concepts/concepts.adoc 
b/src/main/asciidoc/reference-guide/concepts/concepts.adoc
index 3bea53f..841c88a 100644
--- a/src/main/asciidoc/reference-guide/concepts/concepts.adoc
+++ b/src/main/asciidoc/reference-guide/concepts/concepts.adoc
@@ -24,10 +24,64 @@ include::typemanagement.adoc[]
 
 include::externalresources.adoc[]
 
-=== Realms
+include::realms.adoc[]
+
+include::entitlements.adoc[]
 
 === Roles
 
+[TIP]
+.Static and Dynamic Memberships
+
+Users are _statically_ assigned to roles when assignments are explicitely set.
+
+With role definition, however, a condition can be expressed so that all 
matching users are _dynamic_ members of the
+role.
+
+
+ Delegated Administration
+
+The idea is that any user U assigned to a role R, which provides entitlements 
E~1~...E~n~ for realms Re~1~...Re~k~ can 
+exercise E~i~ on entities (users or groups, depending on the type of E~i~) 
under any Re~j~ or related sub-realms.
+
+About group membership and any relationships:
+
+* User U can be member of group G either if U and G are in the same realm, or 
G is in one of super-realms of the realm 
+of U
+* Any object A~1~ can be in relationship with any object A~2~ either if A~1~ 
and A~2~ are in the same realm, or A~2~ is
+in one of super-realms of the realm of A~1~
+
+The rationale behind such conditions is to allow the definition of common 
groups and any objects (to enter in 
+relationship with) at the topmost position in the realm tree, so that they can 
be shared by various realm sub-trees.
+
+.Authorization
+
+Let's suppose that we want to implement the following scenario:
+
+
+Administrator A can create users under realm R~5~ but not under realm R~7~, 
administrator B can update users under 
+realm R~6~ and R~8~, administrator C can update groups under realm R~8~.
+
+
+As default, Syncope will have defined the following entitlements, among others:
+
+* `USER_CREATE`
+* `USER_UPDATE`
+* `GROUP_UPDATE`
+
+Here it follows how entitlements should be assigned (via roles) to 
administrators in order to implement the scenario 
+above:
+
+* A: `USER_CREATE` on R~5~
+* B: `USER_UPDATE` on R~6~ and R~8~
+* C: `GROUP_UPDATE` on R~8~
+
+
+[NOTE]
+.Group Ownership
+
+
+
 === Domains
 
 include::provisioning/provisioning.adoc[]
@@ -72,41 +126,3 @@ include::provisioning/provisioning.adoc[]
 === Reports
 
 === Audit
-
-=== Delegated Administration
-
-The idea is that any user U assigned to a role R, which provides entitlements 
E~1~...E~n~ for realms Re~1~...Re~k~ can 
-exercise E~i~ on entities (users or groups, depending on the type of E~i~) 
under any Re~j~ or related sub-realms.
-
-About group membership and any relationships:
-
-* User U can be member of group G either if U and G are in the same realm, or 
G is in one of super-realms of the realm 
-of U
-* Any object A~1~ can be in relationship with any object A~2~ either if A~1~ 
and A~2~ are in the same realm, or A~2~ is
-in one of super-realms of the realm of A~1~
-
-The rationale behind such conditions is to allow the definition of common 
groups and any objects (to enter in 
-relationship with) at the topmost position in the realm tree, so that they can 
be shared by various realm sub-trees.
-
-.Authorization
-
-Let's suppose that we want to implement the following scenario:
-
-
-Administrator A can create users under realm R~5~ but not under realm R~7~, 
administrator B can update users under 
-realm R~6~ and R~8~, administrator C can update groups under realm R~8~.
-
-
-As default, Syncope will have defined the following

[3/3] syncope git commit: [SYNCOPE-916] Restoring table filter

2016-08-04 Thread ilgrosso 
[SYNCOPE-916] Restoring table filter


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/ef7fc474
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/ef7fc474
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/ef7fc474

Branch: refs/heads/master
Commit: ef7fc474457444f822bfb29842e7767a20356a36
Parents: f17d110
Author: Francesco Chicchiriccò 
Authored: Thu Aug 4 14:01:35 2016 +0200
Committer: Francesco Chicchiriccò 
Committed: Thu Aug 4 14:01:35 2016 +0200

--
 .../syncope/core/logic/ConfigurationLogic.java  | 11 -
 .../api/content/ContentExporter.java|  2 +-
 .../jpa/content/XMLContentExporter.java | 44 +++-
 3 files changed, 44 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/syncope/blob/ef7fc474/core/logic/src/main/java/org/apache/syncope/core/logic/ConfigurationLogic.java
--
diff --git 
a/core/logic/src/main/java/org/apache/syncope/core/logic/ConfigurationLogic.java
 
b/core/logic/src/main/java/org/apache/syncope/core/logic/ConfigurationLogic.java
index 98e1032..b6c31b4 100644
--- 
a/core/logic/src/main/java/org/apache/syncope/core/logic/ConfigurationLogic.java
+++ 
b/core/logic/src/main/java/org/apache/syncope/core/logic/ConfigurationLogic.java
@@ -31,6 +31,7 @@ import 
org.apache.syncope.core.persistence.api.dao.PlainSchemaDAO;
 import org.apache.syncope.core.persistence.api.entity.PlainSchema;
 import org.apache.syncope.core.persistence.api.entity.conf.CPlainAttr;
 import org.apache.syncope.core.provisioning.api.data.ConfigurationDataBinder;
+import org.apache.syncope.core.workflow.api.AnyObjectWorkflowAdapter;
 import org.apache.syncope.core.workflow.api.GroupWorkflowAdapter;
 import org.apache.syncope.core.workflow.api.UserWorkflowAdapter;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -59,6 +60,9 @@ public class ConfigurationLogic extends 
AbstractTransactionalLogic {
 @Autowired
 private GroupWorkflowAdapter gwfAdapter;
 
+@Autowired
+private AnyObjectWorkflowAdapter awfAdapter;
+
 @PreAuthorize("hasRole('" + StandardEntitlement.CONFIGURATION_DELETE + 
"')")
 public void delete(final String schema) {
 CPlainAttr conf = confDAO.find(schema);
@@ -106,7 +110,12 @@ public class ConfigurationLogic extends 
AbstractTransactionalLogic {
 @Transactional(readOnly = true)
 public void export(final OutputStream os) {
 try {
-exporter.export(AuthContextUtils.getDomain(), os, 
uwfAdapter.getPrefix(), gwfAdapter.getPrefix());
+exporter.export(
+AuthContextUtils.getDomain(),
+os,
+uwfAdapter.getPrefix(),
+gwfAdapter.getPrefix(),
+awfAdapter.getPrefix());
 LOG.debug("Database content successfully exported");
 } catch (Exception e) {
 LOG.error("While exporting database content", e);

http://git-wip-us.apache.org/repos/asf/syncope/blob/ef7fc474/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/content/ContentExporter.java
--
diff --git 
a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/content/ContentExporter.java
 
b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/content/ContentExporter.java
index 5ed50df..4b2cf10 100644
--- 
a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/content/ContentExporter.java
+++ 
b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/content/ContentExporter.java
@@ -24,6 +24,6 @@ import org.xml.sax.SAXException;
 
 public interface ContentExporter {
 
-void export(String domain, OutputStream output, String uwfPrefix, String 
rwfPrefix) 
+void export(String domain, OutputStream output, String uwfPrefix, String 
gwfPrefix, String awfPrefix) 
 throws SAXException, TransformerConfigurationException;
 }

http://git-wip-us.apache.org/repos/asf/syncope/blob/ef7fc474/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/content/XMLContentExporter.java
--
diff --git 
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/content/XMLContentExporter.java
 
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/content/XMLContentExporter.java
index 4f7c3a4..7618e1b 100644
--- 
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/content/XMLContentExporter.java
+++

[2/3] syncope git commit: Minor fixes on the admin console

2016-08-04 Thread ilgrosso 
Minor fixes on the admin console


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/f17d1103
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/f17d1103
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/f17d1103

Branch: refs/heads/master
Commit: f17d110305c1606daccf1fc3ea6f39776fec6852
Parents: f2bf3ec
Author: Francesco Chicchiriccò 
Authored: Thu Aug 4 13:05:42 2016 +0200
Committer: Francesco Chicchiriccò 
Committed: Thu Aug 4 13:05:42 2016 +0200

--
 .../syncope/client/console/panels/VirSchemaDetails.java   | 10 --
 .../client/console/topology/TopologyTogglePanel.java  |  2 +-
 .../console/wizards/resources/ResourceDetailsPanel.java   |  8 
 .../wizards/resources/ResourceDetailsPanel.properties |  8 
 .../wizards/resources/ResourceDetailsPanel_it.properties  |  8 
 .../resources/ResourceDetailsPanel_pt_BR.properties   |  8 
 .../wizards/resources/ResourceDetailsPanel_ru.properties  |  8 
 7 files changed, 29 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/syncope/blob/f17d1103/client/console/src/main/java/org/apache/syncope/client/console/panels/VirSchemaDetails.java
--
diff --git 
a/client/console/src/main/java/org/apache/syncope/client/console/panels/VirSchemaDetails.java
 
b/client/console/src/main/java/org/apache/syncope/client/console/panels/VirSchemaDetails.java
index b0a3412..5c712e2 100644
--- 
a/client/console/src/main/java/org/apache/syncope/client/console/panels/VirSchemaDetails.java
+++ 
b/client/console/src/main/java/org/apache/syncope/client/console/panels/VirSchemaDetails.java
@@ -70,7 +70,8 @@ public class VirSchemaDetails extends 
AbstractSchemaDetailsPanel {
 schemaForm.add(readonly);
 
 final AjaxDropDownChoicePanel resource = new 
AjaxDropDownChoicePanel<>(
-"resource", getString("resource"), new 
PropertyModel(schemaTO, "resource"));
+"resource", getString("resource"), new 
PropertyModel(schemaTO, "resource")).
+setNullValid(false);
 resource.setChoices(CollectionUtils.collect(resourceRestClient.list(),
 EntityTOUtils.keyTransformer(), new 
ArrayList()));
 resource.setOutputMarkupId(true);
@@ -81,11 +82,15 @@ public class VirSchemaDetails extends 
AbstractSchemaDetailsPanel {
 schemaForm.add(resource);
 
 anyType = new AjaxDropDownChoicePanel<>(
-"anyType", getString("anyType"), new 
PropertyModel(schemaTO, "anyType"));
+"anyType", getString("anyType"), new 
PropertyModel(schemaTO, "anyType")).
+setNullValid(false);
 anyType.setChoices(new ArrayList<>(anyTypes.keySet()));
 anyType.setOutputMarkupId(true);
 anyType.setOutputMarkupPlaceholderTag(true);
 anyType.addRequiredLabel();
+if (resource.getModelObject() == null) {
+anyType.setEnabled(false);
+}
 schemaForm.add(anyType);
 
 final AjaxTextFieldPanel extAttrName = new AjaxTextFieldPanel(
@@ -108,6 +113,7 @@ public class VirSchemaDetails extends 
AbstractSchemaDetailsPanel {
 anyTypes.clear();
 if (resource.getModelObject() != null) {
 populateAnyTypes(resource.getModelObject());
+anyType.setEnabled(true);
 }
 anyType.setChoices(new ArrayList<>(anyTypes.keySet()));
 anyType.setModelObject(null);

http://git-wip-us.apache.org/repos/asf/syncope/blob/f17d1103/client/console/src/main/java/org/apache/syncope/client/console/topology/TopologyTogglePanel.java
--
diff --git 
a/client/console/src/main/java/org/apache/syncope/client/console/topology/TopologyTogglePanel.java
 
b/client/console/src/main/java/org/apache/syncope/client/console/topology/TopologyTogglePanel.java
index 8f58b45..841dec7 100644
--- 
a/client/console/src/main/java/org/apache/syncope/client/console/topology/TopologyTogglePanel.java
+++ 
b/client/console/src/main/java/org/apache/syncope/client/console/topology/TopologyTogglePanel.java
@@ -279,7 +279,7 @@ public class TopologyTogglePanel extends 
TogglePanel {
 target.add(modal.setContent(new 
ConnectorWizardBuilder(modelObject, pageRef).
 build(BaseModal.CONTENT_ID, AjaxWizard.Mode.EDIT)));
 
-modal.header(new 
Model<>(MessageFormat.format(getString("connector.edit"), node.getKey(;
+modal.header(new 
Model<>(MessageFormat.format(getString("connector.edit"), 
node.getDisplayName(;

[1/3] syncope git commit: [SYNCOPE-700] Adding version to HTML title tag

2016-08-04 Thread ilgrosso 
Repository: syncope
Updated Branches:
  refs/heads/master 69df3afa3 -> ef7fc4744


[SYNCOPE-700] Adding version to HTML title tag


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/f2bf3ec6
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/f2bf3ec6
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/f2bf3ec6

Branch: refs/heads/master
Commit: f2bf3ec60dc7feab018392f4058cd490734ffb61
Parents: 69df3af
Author: Francesco Chicchiriccò 
Authored: Thu Aug 4 12:17:55 2016 +0200
Committer: Francesco Chicchiriccò 
Committed: Thu Aug 4 12:17:55 2016 +0200

--
 pom.xml | 14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/syncope/blob/f2bf3ec6/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 874ea82..2e1a96b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1862,7 +1862,10 @@ under the License.
 
   
getting-started/getting-started.adoc
   html
- ./images
+  ./images
+  
+Apache Syncope ${project.version} - Getting 
Started
+  
 
   
   
@@ -1874,7 +1877,7 @@ under the License.
 
   
getting-started/getting-started.adoc
   pdf
- ${basedir}/src/main/asciidoc/images
+  ${basedir}/src/main/asciidoc/images
   
 ${basedir}/src/main/asciidoc
 syncope
@@ -1890,7 +1893,10 @@ under the License.
 
   
reference-guide/reference-guide.adoc
   html
- ./images
+  ./images
+  
+Apache Syncope ${project.version} - Reference 
Guide
+  
 
   
   
@@ -1902,7 +1908,7 @@ under the License.
 
   
reference-guide/reference-guide.adoc
   pdf
- ${basedir}/src/main/asciidoc/images
+  ${basedir}/src/main/asciidoc/images
   
 ${basedir}/src/main/asciidoc
 syncope

[3/3] syncope git commit: Updating site content with doc build instruction + buildbot

2016-08-04 Thread ilgrosso 
Updating site content with doc build instruction + buildbot


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/69df3afa
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/69df3afa
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/69df3afa

Branch: refs/heads/master
Commit: 69df3afa3b57567af93e76d7b2c50e7a66c630a0
Parents: 7bd4656
Author: Francesco Chicchiriccò 
Authored: Thu Aug 4 12:06:16 2016 +0200
Committer: Francesco Chicchiriccò 
Committed: Thu Aug 4 12:06:16 2016 +0200

--
 src/site/xdoc/building.xml| 16 
 src/site/xdoc/integration.xml |  6 ++
 2 files changed, 18 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/syncope/blob/69df3afa/src/site/xdoc/building.xml
--
diff --git a/src/site/xdoc/building.xml b/src/site/xdoc/building.xml
index 75126da..88ad666 100644
--- a/src/site/xdoc/building.xml
+++ b/src/site/xdoc/building.xml
@@ -94,10 +94,10 @@ under the License.
 JRebel
 As with Debug, but with http://zeroturnaround.com/software/jrebel/;>JRebel features enabled.
 $ export REBEL_HOME=/opt/jrebel
-  $ mvn -Pjrebel,all
+$ mvn -Pjrebel,all
 or, without Activiti and Camel support
 $ export REBEL_HOME=/opt/jrebel
-  $ mvn -Pjrebel
+$ mvn -Pjrebel
 
 DBMSes
 
@@ -158,7 +158,7 @@ under the License.
 JRebel
 As with Debug, but with http://zeroturnaround.com/software/jrebel/;>JRebel features enabled.
 $ export REBEL_HOME=/opt/jrebel
-  $ mvn -Pjrebel
+$ mvn -Pjrebel
   
   
   
@@ -171,8 +171,16 @@ under the License.
 JRebel
 As with Debug, but with http://zeroturnaround.com/software/jrebel/;>JRebel features enabled.
 $ export REBEL_HOME=/opt/jrebel
-  $ mvn -Pjrebel
+$ mvn -Pjrebel
   
 
+
+
+  
+To build Syncope documentation execute (from within the check-out 
directory):
+$ mvn -N -P site clean generate-resources
+The documentation artifacts are now be available under 
target/generated-docs/.
+  
+
   
 

http://git-wip-us.apache.org/repos/asf/syncope/blob/69df3afa/src/site/xdoc/integration.xml
--
diff --git a/src/site/xdoc/integration.xml b/src/site/xdoc/integration.xml
index 94b5ded..186a8c5 100644
--- a/src/site/xdoc/integration.xml
+++ b/src/site/xdoc/integration.xml
@@ -39,5 +39,11 @@ under the License.
 
   
 
+
+
+  
+https://ci.apache.org/builders/syncope-master-docs;>https://ci.apache.org/builders/syncope-master-docs
+  
+

[1/3] syncope git commit: Upgrading Swagger UI

2016-08-04 Thread ilgrosso 
Repository: syncope
Updated Branches:
  refs/heads/master 4a6bd031d -> 69df3afa3


Upgrading Swagger UI


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/a40d1aa3
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/a40d1aa3
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/a40d1aa3

Branch: refs/heads/master
Commit: a40d1aa313e12c91641caf8d09b60e269319292d
Parents: 4a6bd03
Author: Francesco Chicchiriccò 
Authored: Thu Aug 4 11:42:24 2016 +0200
Committer: Francesco Chicchiriccò 
Committed: Thu Aug 4 11:42:24 2016 +0200

--
 .../syncope/core/rest/cxf/Swagger2Feature.java  | 271 +++
 .../META-INF/resources/swagger/index.html   |  81 +++---
 pom.xml |   2 +-
 3 files changed, 306 insertions(+), 48 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/syncope/blob/a40d1aa3/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/Swagger2Feature.java
--
diff --git 
a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/Swagger2Feature.java
 
b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/Swagger2Feature.java
index fa7ce9a..1578032 100644
--- 
a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/Swagger2Feature.java
+++ 
b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/Swagger2Feature.java
@@ -18,9 +18,54 @@
  */
 package org.apache.syncope.core.rest.cxf;
 
+import io.swagger.jaxrs.config.BeanConfig;
+import io.swagger.jaxrs.config.DefaultReaderConfig;
+import io.swagger.jaxrs.config.ReaderConfig;
+import io.swagger.jaxrs.listing.ApiListingResource;
+import io.swagger.jaxrs.listing.SwaggerSerializers;
+import io.swagger.models.Operation;
+import io.swagger.models.Path;
+import io.swagger.models.Swagger;
+import io.swagger.models.Tag;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.net.URI;
 import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.LinkedHashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.regex.Pattern;
+import javax.servlet.ServletContext;
+import javax.ws.rs.HttpMethod;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerRequestFilter;
+import javax.ws.rs.container.PreMatching;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.UriInfo;
+import org.apache.commons.collections4.ComparatorUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.apache.commons.lang3.tuple.Pair;
 import org.apache.cxf.Bus;
 import org.apache.cxf.endpoint.Server;
+import org.apache.cxf.jaxrs.JAXRSServiceFactoryBean;
+import org.apache.cxf.jaxrs.ext.MessageContext;
+import org.apache.cxf.jaxrs.model.ClassResourceInfo;
+import org.apache.cxf.jaxrs.model.OperationResourceInfo;
+import org.apache.cxf.jaxrs.model.doc.DocumentationProvider;
+import org.apache.cxf.jaxrs.provider.ServerProviderFactory;
+import org.apache.cxf.jaxrs.utils.InjectionUtils;
+import org.apache.cxf.jaxrs.utils.JAXRSUtils;
 
 /**
  * Automatically loads available javadocs from class loader (when {@link 
java.net.URLClassLoader}).
@@ -37,4 +82,230 @@ public class Swagger2Feature extends 
org.apache.cxf.jaxrs.swagger.Swagger2Featur
 super.initialize(server, bus);
 }
 
+// --- Remove the code below this point when CXF-6990 is part of next 
CXF release (3.1.8?) -
+@Override
+protected void addSwaggerResource(final Server server, final Bus bus) {
+List swaggerResources = new LinkedList<>();
+ApiListingResource apiListingResource = new ApiListingResource();
+swaggerResources.add(apiListingResource);
+if (SWAGGER_UI_RESOURCE_ROOT != null) {
+swaggerResources.add(new SwaggerUIService());
+bus.setProperty("swagger.service.ui.available", "true");
+}
+JAXRSServiceFactoryBean sfb =
+(JAXRSServiceFactoryBean) 
server.getEndpoint().get(JAXRSServiceFactoryBean.class.getName());
+sfb.setResourceClassesFromBeans(swaggerResources);
+
+List cris = sfb.getClassResourceInfo();
+
+List providers = new ArrayList<>();
+for (ClassResourceInfo cri : cris) {
+if (ApiListingResource.class == cri.getResourceClass()) {
+InjectionUtils.injectContextProxies(cri, apiListingResource);
+}
+}
+

[2/3] syncope git commit: [SYNCOPE-809] Fixing javadoc errors

2016-08-04 Thread ilgrosso 
[SYNCOPE-809] Fixing javadoc errors


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/7bd46563
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/7bd46563
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/7bd46563

Branch: refs/heads/master
Commit: 7bd465636f0985d1e376479d0664d0dc3ddec4f3
Parents: a40d1aa
Author: Francesco Chicchiriccò 
Authored: Thu Aug 4 12:05:53 2016 +0200
Committer: Francesco Chicchiriccò 
Committed: Thu Aug 4 12:05:53 2016 +0200

--
 .../eclipse/plugin/editors/htmlhelpers/HTMLAutoEditStrategy.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/syncope/blob/7bd46563/ide/eclipse/bundles/org.apache.syncope.ide.eclipse.plugin/src/main/java/org/apache/syncope/ide/eclipse/plugin/editors/htmlhelpers/HTMLAutoEditStrategy.java
--
diff --git 
a/ide/eclipse/bundles/org.apache.syncope.ide.eclipse.plugin/src/main/java/org/apache/syncope/ide/eclipse/plugin/editors/htmlhelpers/HTMLAutoEditStrategy.java
 
b/ide/eclipse/bundles/org.apache.syncope.ide.eclipse.plugin/src/main/java/org/apache/syncope/ide/eclipse/plugin/editors/htmlhelpers/HTMLAutoEditStrategy.java
index 8761e88..0609a24 100644
--- 
a/ide/eclipse/bundles/org.apache.syncope.ide.eclipse.plugin/src/main/java/org/apache/syncope/ide/eclipse/plugin/editors/htmlhelpers/HTMLAutoEditStrategy.java
+++ 
b/ide/eclipse/bundles/org.apache.syncope.ide.eclipse.plugin/src/main/java/org/apache/syncope/ide/eclipse/plugin/editors/htmlhelpers/HTMLAutoEditStrategy.java
@@ -90,8 +90,8 @@ public class HTMLAutoEditStrategy extends 
DefaultIndentLineAutoEditStrategy {
  * Returns the line number of the next bracket after end.
  *
  * @param document - the document being parsed
- * @param line - the line to start searching back from
- * @param end - the end position to search back from
+ * @param linearg - the line to start searching back from
+ * @param endarg - the end position to search back from
  * @param closingBracketIncrease - the number of brackets to skip
  * @return the line number of the next matching bracket after end
  * @throws BadLocationException in case the line numbers are invalid in 
the document

syncope git commit: Fixing typo

2016-08-04 Thread ilgrosso 
Repository: syncope
Updated Branches:
  refs/heads/master acb803e04 -> 4a6bd031d


Fixing typo


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/4a6bd031
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/4a6bd031
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/4a6bd031

Branch: refs/heads/master
Commit: 4a6bd031d3d5f91967d13b6b6b4aa93a8e9254ee
Parents: acb803e
Author: Francesco Chicchiriccò 
Authored: Thu Aug 4 10:19:54 2016 +0200
Committer: Francesco Chicchiriccò 
Committed: Thu Aug 4 10:19:54 2016 +0200

--
 core/persistence-jpa/src/test/resources/domains/MasterContent.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/syncope/blob/4a6bd031/core/persistence-jpa/src/test/resources/domains/MasterContent.xml
--
diff --git a/core/persistence-jpa/src/test/resources/domains/MasterContent.xml 
b/core/persistence-jpa/src/test/resources/domains/MasterContent.xml
index 50c5388..7976010 100644
--- a/core/persistence-jpa/src/test/resources/domains/MasterContent.xml
+++ b/core/persistence-jpa/src/test/resources/domains/MasterContent.xml
@@ -970,7 +970,7 @@ under the License.
extAttrName="owner" intAttrName="userOwner"
mandatoryCondition="false" purpose="BOTH"/>