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 2014/10/17 14:04:17 UTC
[01/10] git commit: Fix typo
Repository: syncope
Updated Branches:
refs/heads/1_1_X 6bbfc3297 -> 2820eb254
refs/heads/1_2_X 08e7032f3 -> f44e4daeb
refs/heads/master b40948e0c -> 8e224cd9c
Fix typo
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/fd292279
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/fd292279
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/fd292279
Branch: refs/heads/1_2_X
Commit: fd2922795d39d48e282ec4ff8b8af119f1ffcef8
Parents: 08e7032
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Oct 17 14:00:38 2014 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Oct 17 14:00:38 2014 +0200
----------------------------------------------------------------------
core/src/test/resources/content.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/fd292279/core/src/test/resources/content.xml
----------------------------------------------------------------------
diff --git a/core/src/test/resources/content.xml b/core/src/test/resources/content.xml
index 82ac69c..320da22 100644
--- a/core/src/test/resources/content.xml
+++ b/core/src/test/resources/content.xml
@@ -78,7 +78,7 @@ under the License.
<!-- sample policies -->
<Policy DTYPE="SyncPolicy" id="1" description="global sync policy" type="GLOBAL_SYNC"
- specification='{"userJavaRule":null,"roleJavaRule":null,"conflictResolutionAction":"IGNORE","userAltSearchSchemas":[],"AltSearchSchemas":[]}'/>
+ specification='{"userJavaRule":null,"roleJavaRule":null,"conflictResolutionAction":"IGNORE","userAltSearchSchemas":[],"roleAltSearchSchemas":[]}'/>
<Policy DTYPE="PasswordPolicy" id="2" description="global password policy" type="GLOBAL_PASSWORD"
specification='{"historyLength":1,"maxLength":0,"minLength":8,"nonAlphanumericRequired":false,"alphanumericRequired":false,"digitRequired":false,"lowercaseRequired":false,"uppercaseRequired":false,"mustStartWithDigit":false,"mustntStartWithDigit":false,"mustEndWithDigit":false,"mustntEndWithDigit":false,"mustStartWithNonAlpha":false,"mustStartWithAlpha":false,"mustntStartWithNonAlpha":false,"mustntStartWithAlpha":false,"mustEndWithNonAlpha":false,"mustEndWithAlpha":false,"mustntEndWithNonAlpha":false,"mustntEndWithAlpha":false,"wordsNotPermitted":[],"schemasNotPermitted":[],"prefixesNotPermitted":["notpermitted1","notpermitted2"],"suffixesNotPermitted":[],"allowNullPassword":true}'/>
<Policy DTYPE="SyncPolicy" id="3" description="sync policy 2" type="SYNC"
[04/10] git commit: [SYNCOPE-558] Silence unwanted errors
Posted by il...@apache.org.
[SYNCOPE-558] Silence unwanted errors
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/03a59e78
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/03a59e78
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/03a59e78
Branch: refs/heads/master
Commit: 03a59e783b270695162628c08fd5f048f8cc99fe
Parents: fd29227
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Oct 17 14:01:58 2014 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Oct 17 14:01:58 2014 +0200
----------------------------------------------------------------------
.../console/pages/panels/LayoutsPanel.java | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/03a59e78/console/src/main/java/org/apache/syncope/console/pages/panels/LayoutsPanel.java
----------------------------------------------------------------------
diff --git a/console/src/main/java/org/apache/syncope/console/pages/panels/LayoutsPanel.java b/console/src/main/java/org/apache/syncope/console/pages/panels/LayoutsPanel.java
index 48f7163..c061ea9 100644
--- a/console/src/main/java/org/apache/syncope/console/pages/panels/LayoutsPanel.java
+++ b/console/src/main/java/org/apache/syncope/console/pages/panels/LayoutsPanel.java
@@ -152,17 +152,21 @@ public class LayoutsPanel extends Panel {
add(container);
}
- private AttributeTO getConfiguration(
- final LayoutType layoutType, final AttributableType type) {
- AttributeTO attributeTO = confRestClient.read(layoutType.getParameter());
- if (attributeTO != null) {
- return attributeTO;
- } else {
+ private AttributeTO getConfiguration(final LayoutType layoutType, final AttributableType type) {
+ AttributeTO attributeTO = null;
+ try {
+ attributeTO = confRestClient.read(layoutType.getParameter());
+ } catch (Exception e) {
+ // ignore
+ }
+
+ if (attributeTO == null) {
attributeTO = new AttributeTO();
attributeTO.setSchema(layoutType.getParameter());
attributeTO.getValues().addAll(getAllFields(type));
- return attributeTO;
}
+
+ return attributeTO;
}
private List<String> getAllFields(final AttributableType type) {
[03/10] git commit: [SYNCOPE-558] Silence unwanted errors
Posted by il...@apache.org.
[SYNCOPE-558] Silence unwanted errors
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/03a59e78
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/03a59e78
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/03a59e78
Branch: refs/heads/1_2_X
Commit: 03a59e783b270695162628c08fd5f048f8cc99fe
Parents: fd29227
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Oct 17 14:01:58 2014 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Oct 17 14:01:58 2014 +0200
----------------------------------------------------------------------
.../console/pages/panels/LayoutsPanel.java | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/03a59e78/console/src/main/java/org/apache/syncope/console/pages/panels/LayoutsPanel.java
----------------------------------------------------------------------
diff --git a/console/src/main/java/org/apache/syncope/console/pages/panels/LayoutsPanel.java b/console/src/main/java/org/apache/syncope/console/pages/panels/LayoutsPanel.java
index 48f7163..c061ea9 100644
--- a/console/src/main/java/org/apache/syncope/console/pages/panels/LayoutsPanel.java
+++ b/console/src/main/java/org/apache/syncope/console/pages/panels/LayoutsPanel.java
@@ -152,17 +152,21 @@ public class LayoutsPanel extends Panel {
add(container);
}
- private AttributeTO getConfiguration(
- final LayoutType layoutType, final AttributableType type) {
- AttributeTO attributeTO = confRestClient.read(layoutType.getParameter());
- if (attributeTO != null) {
- return attributeTO;
- } else {
+ private AttributeTO getConfiguration(final LayoutType layoutType, final AttributableType type) {
+ AttributeTO attributeTO = null;
+ try {
+ attributeTO = confRestClient.read(layoutType.getParameter());
+ } catch (Exception e) {
+ // ignore
+ }
+
+ if (attributeTO == null) {
attributeTO = new AttributeTO();
attributeTO.setSchema(layoutType.getParameter());
attributeTO.getValues().addAll(getAllFields(type));
- return attributeTO;
}
+
+ return attributeTO;
}
private List<String> getAllFields(final AttributableType type) {
[02/10] git commit: Fix typo
Posted by il...@apache.org.
Fix typo
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/fd292279
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/fd292279
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/fd292279
Branch: refs/heads/master
Commit: fd2922795d39d48e282ec4ff8b8af119f1ffcef8
Parents: 08e7032
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Oct 17 14:00:38 2014 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Oct 17 14:00:38 2014 +0200
----------------------------------------------------------------------
core/src/test/resources/content.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/fd292279/core/src/test/resources/content.xml
----------------------------------------------------------------------
diff --git a/core/src/test/resources/content.xml b/core/src/test/resources/content.xml
index 82ac69c..320da22 100644
--- a/core/src/test/resources/content.xml
+++ b/core/src/test/resources/content.xml
@@ -78,7 +78,7 @@ under the License.
<!-- sample policies -->
<Policy DTYPE="SyncPolicy" id="1" description="global sync policy" type="GLOBAL_SYNC"
- specification='{"userJavaRule":null,"roleJavaRule":null,"conflictResolutionAction":"IGNORE","userAltSearchSchemas":[],"AltSearchSchemas":[]}'/>
+ specification='{"userJavaRule":null,"roleJavaRule":null,"conflictResolutionAction":"IGNORE","userAltSearchSchemas":[],"roleAltSearchSchemas":[]}'/>
<Policy DTYPE="PasswordPolicy" id="2" description="global password policy" type="GLOBAL_PASSWORD"
specification='{"historyLength":1,"maxLength":0,"minLength":8,"nonAlphanumericRequired":false,"alphanumericRequired":false,"digitRequired":false,"lowercaseRequired":false,"uppercaseRequired":false,"mustStartWithDigit":false,"mustntStartWithDigit":false,"mustEndWithDigit":false,"mustntEndWithDigit":false,"mustStartWithNonAlpha":false,"mustStartWithAlpha":false,"mustntStartWithNonAlpha":false,"mustntStartWithAlpha":false,"mustEndWithNonAlpha":false,"mustEndWithAlpha":false,"mustntEndWithNonAlpha":false,"mustntEndWithAlpha":false,"wordsNotPermitted":[],"schemasNotPermitted":[],"prefixesNotPermitted":["notpermitted1","notpermitted2"],"suffixesNotPermitted":[],"allowNullPassword":true}'/>
<Policy DTYPE="SyncPolicy" id="3" description="sync policy 2" type="SYNC"
[08/10] git commit: Merge branch '1_1_X' into 1_2_X
Posted by il...@apache.org.
Merge branch '1_1_X' into 1_2_X
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/f44e4dae
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/f44e4dae
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/f44e4dae
Branch: refs/heads/master
Commit: f44e4daeb7305847e7e8ad35b9208c6063f3028d
Parents: 03a59e7 2820eb2
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Oct 17 14:03:46 2014 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Oct 17 14:03:46 2014 +0200
----------------------------------------------------------------------
.../org/apache/syncope/console/pages/ConnectorModalPage.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/f44e4dae/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java
----------------------------------------------------------------------
[05/10] git commit: [SYNCOPE-568] Enhancement
Posted by il...@apache.org.
[SYNCOPE-568] Enhancement
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/2820eb25
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/2820eb25
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/2820eb25
Branch: refs/heads/1_2_X
Commit: 2820eb2544e2bb31bcd623847a2aac746f8dfae6
Parents: 6bbfc32
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Oct 17 14:03:38 2014 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Oct 17 14:03:38 2014 +0200
----------------------------------------------------------------------
.../org/apache/syncope/console/pages/ConnectorModalPage.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/2820eb25/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java
----------------------------------------------------------------------
diff --git a/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java b/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java
index aeb0446..ae28729 100644
--- a/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java
+++ b/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java
@@ -363,6 +363,11 @@ public class ConnectorModalPage extends BaseModalPage {
public void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
final ConnInstanceTO conn = (ConnInstanceTO) form.getModelObject();
+ // ensure that connector bundle information is in sync
+ conn.setBundleName(bundleTO.getBundleName());
+ conn.setVersion(bundleTO.getVersion());
+ conn.setConnectorName(bundleTO.getConnectorName());
+
if (restClient.check(conn)) {
info(getString("success_connection"));
} else {
[07/10] git commit: [SYNCOPE-568] Enhancement
Posted by il...@apache.org.
[SYNCOPE-568] Enhancement
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/2820eb25
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/2820eb25
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/2820eb25
Branch: refs/heads/master
Commit: 2820eb2544e2bb31bcd623847a2aac746f8dfae6
Parents: 6bbfc32
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Oct 17 14:03:38 2014 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Oct 17 14:03:38 2014 +0200
----------------------------------------------------------------------
.../org/apache/syncope/console/pages/ConnectorModalPage.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/2820eb25/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java
----------------------------------------------------------------------
diff --git a/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java b/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java
index aeb0446..ae28729 100644
--- a/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java
+++ b/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java
@@ -363,6 +363,11 @@ public class ConnectorModalPage extends BaseModalPage {
public void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
final ConnInstanceTO conn = (ConnInstanceTO) form.getModelObject();
+ // ensure that connector bundle information is in sync
+ conn.setBundleName(bundleTO.getBundleName());
+ conn.setVersion(bundleTO.getVersion());
+ conn.setConnectorName(bundleTO.getConnectorName());
+
if (restClient.check(conn)) {
info(getString("success_connection"));
} else {
[10/10] git commit: Merge branch '1_2_X'
Posted by il...@apache.org.
Merge branch '1_2_X'
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/8e224cd9
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/8e224cd9
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/8e224cd9
Branch: refs/heads/master
Commit: 8e224cd9c60edf9593f4ced10a24d8f11b5d8e1c
Parents: b40948e f44e4da
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Oct 17 14:04:01 2014 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Oct 17 14:04:01 2014 +0200
----------------------------------------------------------------------
.../syncope/console/pages/ConnectorModalPage.java | 5 +++++
.../console/pages/panels/LayoutsPanel.java | 18 +++++++++++-------
core/src/test/resources/content.xml | 2 +-
3 files changed, 17 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
[06/10] git commit: [SYNCOPE-568] Enhancement
Posted by il...@apache.org.
[SYNCOPE-568] Enhancement
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/2820eb25
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/2820eb25
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/2820eb25
Branch: refs/heads/1_1_X
Commit: 2820eb2544e2bb31bcd623847a2aac746f8dfae6
Parents: 6bbfc32
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Oct 17 14:03:38 2014 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Oct 17 14:03:38 2014 +0200
----------------------------------------------------------------------
.../org/apache/syncope/console/pages/ConnectorModalPage.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/2820eb25/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java
----------------------------------------------------------------------
diff --git a/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java b/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java
index aeb0446..ae28729 100644
--- a/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java
+++ b/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java
@@ -363,6 +363,11 @@ public class ConnectorModalPage extends BaseModalPage {
public void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
final ConnInstanceTO conn = (ConnInstanceTO) form.getModelObject();
+ // ensure that connector bundle information is in sync
+ conn.setBundleName(bundleTO.getBundleName());
+ conn.setVersion(bundleTO.getVersion());
+ conn.setConnectorName(bundleTO.getConnectorName());
+
if (restClient.check(conn)) {
info(getString("success_connection"));
} else {
[09/10] git commit: Merge branch '1_1_X' into 1_2_X
Posted by il...@apache.org.
Merge branch '1_1_X' into 1_2_X
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/f44e4dae
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/f44e4dae
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/f44e4dae
Branch: refs/heads/1_2_X
Commit: f44e4daeb7305847e7e8ad35b9208c6063f3028d
Parents: 03a59e7 2820eb2
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Oct 17 14:03:46 2014 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Oct 17 14:03:46 2014 +0200
----------------------------------------------------------------------
.../org/apache/syncope/console/pages/ConnectorModalPage.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/f44e4dae/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java
----------------------------------------------------------------------