syncope git commit: Use the Santuario JCEMapper instead to get the JCE signature algorithm

2017-08-16 Thread coheigea 
Repository: syncope
Updated Branches:
  refs/heads/master 278525b7c -> 1afd1a705


Use the Santuario JCEMapper instead to get the JCE signature algorithm


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

Branch: refs/heads/master
Commit: 1afd1a7053a2fb5d56b9f9ec4a858909e1957c6c
Parents: 278525b
Author: Colm O hEigeartaigh 
Authored: Wed Aug 16 16:00:11 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Wed Aug 16 16:00:11 2017 +0100

--
 .../org/apache/syncope/core/logic/saml2/SAML2ReaderWriter.java  | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/syncope/blob/1afd1a70/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/saml2/SAML2ReaderWriter.java
--
diff --git 
a/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/saml2/SAML2ReaderWriter.java
 
b/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/saml2/SAML2ReaderWriter.java
index 4aebdbb..8bf0c47 100644
--- 
a/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/saml2/SAML2ReaderWriter.java
+++ 
b/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/saml2/SAML2ReaderWriter.java
@@ -52,6 +52,7 @@ import org.apache.syncope.core.logic.init.SAML2SPLoader;
 import org.apache.wss4j.common.crypto.Merlin;
 import org.apache.wss4j.common.ext.WSSecurityException;
 import org.apache.wss4j.common.saml.OpenSAMLUtil;
+import org.apache.xml.security.algorithms.JCEMapper;
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.saml.common.SignableSAMLObject;
 import org.opensaml.saml.saml2.core.RequestAbstractType;
@@ -99,15 +100,13 @@ public class SAML2ReaderWriter {
 keyInfoGenerator = keyInfoGeneratorFactory.newInstance();
 
 sigAlgo = SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA1;
-jceSigAlgo = "SHA1withRSA";
 String pubKeyAlgo = 
loader.getCredential().getPublicKey().getAlgorithm();
 if (pubKeyAlgo.equalsIgnoreCase("DSA")) {
 sigAlgo = SignatureConstants.ALGO_ID_SIGNATURE_DSA_SHA1;
-jceSigAlgo = "SHA1withDSA";
 } else if (pubKeyAlgo.equalsIgnoreCase("EC")) {
 sigAlgo = SignatureConstants.ALGO_ID_SIGNATURE_ECDSA_SHA1;
-jceSigAlgo = "SHA1withECDSA";
 }
+jceSigAlgo = JCEMapper.translateURItoJCEID(sigAlgo);
 
 callbackHandler = new SAMLSPCallbackHandler(loader.getKeyPass());
 }

syncope git commit: Use the Santuario JCEMapper instead to get the JCE signature algorithm

2017-08-16 Thread coheigea 
Repository: syncope
Updated Branches:
  refs/heads/2_0_X 624808ef5 -> de63a75a2


Use the Santuario JCEMapper instead to get the JCE signature algorithm


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

Branch: refs/heads/2_0_X
Commit: de63a75a2e5ce9678e4bf8d346fde86090db09eb
Parents: 624808e
Author: Colm O hEigeartaigh 
Authored: Wed Aug 16 16:00:11 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Wed Aug 16 17:54:05 2017 +0100

--
 .../org/apache/syncope/core/logic/saml2/SAML2ReaderWriter.java  | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/syncope/blob/de63a75a/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/saml2/SAML2ReaderWriter.java
--
diff --git 
a/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/saml2/SAML2ReaderWriter.java
 
b/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/saml2/SAML2ReaderWriter.java
index 25b2f63..8523826 100644
--- 
a/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/saml2/SAML2ReaderWriter.java
+++ 
b/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/saml2/SAML2ReaderWriter.java
@@ -49,6 +49,7 @@ import org.apache.syncope.common.lib.types.SAML2BindingType;
 import org.apache.syncope.core.logic.init.SAML2SPLoader;
 import org.apache.wss4j.common.crypto.Merlin;
 import org.apache.wss4j.common.ext.WSSecurityException;
+import org.apache.xml.security.algorithms.JCEMapper;
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.saml.common.SignableSAMLObject;
 import org.opensaml.saml.saml2.core.RequestAbstractType;
@@ -96,15 +97,13 @@ public class SAML2ReaderWriter {
 keyInfoGenerator = keyInfoGeneratorFactory.newInstance();
 
 sigAlgo = SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA1;
-jceSigAlgo = "SHA1withRSA";
 String pubKeyAlgo = 
loader.getCredential().getPublicKey().getAlgorithm();
 if (pubKeyAlgo.equalsIgnoreCase("DSA")) {
 sigAlgo = SignatureConstants.ALGO_ID_SIGNATURE_DSA_SHA1;
-jceSigAlgo = "SHA1withDSA";
 } else if (pubKeyAlgo.equalsIgnoreCase("EC")) {
 sigAlgo = SignatureConstants.ALGO_ID_SIGNATURE_ECDSA_SHA1;
-jceSigAlgo = "SHA1withECDSA";
 }
+jceSigAlgo = JCEMapper.translateURItoJCEID(sigAlgo);
 
 callbackHandler = new SAMLSPCallbackHandler(loader.getKeyPass());
 }

Syncope-2_0_X - Build # 111 - Still Failing

2017-08-16 Thread Apache Jenkins Server 
The Apache Jenkins build system has built Syncope-2_0_X (build #111)

Status: Still Failing

Check console output at https://builds.apache.org/job/Syncope-2_0_X/111/ to 
view the results.

[1/2] syncope git commit: [SYNCOPE-1143] Some fixes and refinements

2017-08-16 Thread ilgrosso 
Repository: syncope
Updated Branches:
  refs/heads/2_0_X de63a75a2 -> 36f2537e7
  refs/heads/master 1afd1a705 -> 05ada83cc


[SYNCOPE-1143] Some fixes and refinements


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

Branch: refs/heads/2_0_X
Commit: 36f2537e7e4cd46bf7c2cd4761eeb24b857409b4
Parents: de63a75
Author: Francesco Chicchiriccò 
Authored: Thu Aug 17 08:53:21 2017 +0200
Committer: Francesco Chicchiriccò 
Committed: Thu Aug 17 08:53:21 2017 +0200

--
 .../cli/commands/CommonsResultManager.java  |  4 +-
 .../connector/ConnectorResultManager.java   |  3 +-
 .../ConnInstanceHistoryConfDirectoryPanel.java  |  5 +-
 .../client/console/panels/DirectoryPanel.java   | 16 +--
 .../console/panels/HistoryConfDetails.java  | 38 +++
 .../ResourceHistoryConfDirectoryPanel.java  |  5 +-
 .../client/console/panels/VirSchemaDetails.java | 34 +++---
 .../console/rest/ConnectorRestClient.java   | 13 +++---
 .../client/console/rest/ResourceRestClient.java | 22 +
 .../client/console/topology/Topology.java   |  6 +--
 .../console/topology/TopologyTogglePanel.java   | 42 +++--
 .../markup/html/bootstrap/dialog/BaseModal.java | 18 +++
 .../resources/ResourceConnConfPanel.java|  5 +-
 .../resources/ResourceProvisionPanel.java   | 13 +++---
 .../syncope/common/lib/to/ConnInstanceTO.java   |  7 +--
 .../syncope/common/lib/to/ResourceTO.java   |  5 +-
 .../common/lib/types/ConnConfPropSchema.java| 44 +-
 .../api/service/ConnectorHistoryService.java|  4 +-
 .../persistence/api/entity/ConnInstance.java|  3 +-
 .../persistence/jpa/entity/JPAConnInstance.java |  5 +-
 .../core/provisioning/api/ConnectorFactory.java |  6 +--
 .../provisioning/java/ConnectorManager.java |  5 +-
 .../java/data/ConnInstanceDataBinderImpl.java   | 49 +---
 .../java/data/ResourceDataBinderImpl.java   | 37 ---
 .../syncope/fit/core/ConnectorITCase.java   |  2 +-
 25 files changed, 257 insertions(+), 134 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/syncope/blob/36f2537e/client/cli/src/main/java/org/apache/syncope/client/cli/commands/CommonsResultManager.java
--
diff --git 
a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/CommonsResultManager.java
 
b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/CommonsResultManager.java
index 6631dea..8098e20 100644
--- 
a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/CommonsResultManager.java
+++ 
b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/CommonsResultManager.java
@@ -19,9 +19,9 @@
 package org.apache.syncope.client.cli.commands;
 
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import org.apache.syncope.client.cli.Command;
 import org.apache.syncope.client.cli.view.Messages;
 import org.apache.syncope.client.cli.view.Table;
@@ -73,7 +73,7 @@ public abstract class CommonsResultManager {
 return 
Messages.commandHelpMessage(name.getAnnotation(Command.class).name());
 }
 
-protected void printConfiguration(final Set 
configurationPropertys) {
+protected void printConfiguration(final Collection 
configurationPropertys) {
 for (final ConnConfProperty configuration : configurationPropertys) {
 System.out.println("   name: " + 
configuration.getSchema().getName());
 System.out.println("   values: " + configuration.getValues());

http://git-wip-us.apache.org/repos/asf/syncope/blob/36f2537e/client/cli/src/main/java/org/apache/syncope/client/cli/commands/connector/ConnectorResultManager.java
--
diff --git 
a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/connector/ConnectorResultManager.java
 
b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/connector/ConnectorResultManager.java
index 157500f..69d2c58 100644
--- 
a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/connector/ConnectorResultManager.java
+++ 
b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/connector/ConnectorResultManager.java
@@ -18,6 +18,7 @@
  */
 package org.apache.syncope.client.cli.commands.connector;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -91,7 +92,7 @@ public class ConnectorResultManager extends 
CommonsResultManager {
 }
 }
 
-public void printConfigu

[2/2] syncope git commit: [SYNCOPE-1143] Some fixes and refinements

2017-08-16 Thread ilgrosso 
[SYNCOPE-1143] Some fixes and refinements


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

Branch: refs/heads/master
Commit: 05ada83cc342178cb4b564a011c13308acc3db53
Parents: 1afd1a7
Author: Francesco Chicchiriccò 
Authored: Thu Aug 17 08:53:21 2017 +0200
Committer: Francesco Chicchiriccò 
Committed: Thu Aug 17 08:54:05 2017 +0200

--
 .../cli/commands/CommonsResultManager.java  |  4 +-
 .../connector/ConnectorResultManager.java   |  3 +-
 .../ConnInstanceHistoryConfDirectoryPanel.java  |  5 +-
 .../client/console/panels/DirectoryPanel.java   | 16 +--
 .../console/panels/HistoryConfDetails.java  | 38 +++
 .../ResourceHistoryConfDirectoryPanel.java  |  5 +-
 .../client/console/panels/VirSchemaDetails.java | 34 +++---
 .../console/rest/ConnectorRestClient.java   | 13 +++---
 .../client/console/rest/ResourceRestClient.java | 22 +
 .../client/console/topology/Topology.java   |  6 +--
 .../console/topology/TopologyTogglePanel.java   | 42 +++--
 .../markup/html/bootstrap/dialog/BaseModal.java | 18 +++
 .../resources/ResourceConnConfPanel.java|  5 +-
 .../resources/ResourceProvisionPanel.java   | 13 +++---
 .../syncope/common/lib/to/ConnInstanceTO.java   |  7 +--
 .../syncope/common/lib/to/ResourceTO.java   |  5 +-
 .../common/lib/types/ConnConfPropSchema.java| 44 +-
 .../api/service/ConnectorHistoryService.java|  4 +-
 .../persistence/api/entity/ConnInstance.java|  3 +-
 .../persistence/jpa/entity/JPAConnInstance.java |  5 +-
 .../core/provisioning/api/ConnectorFactory.java |  6 +--
 .../provisioning/java/ConnectorManager.java |  5 +-
 .../java/data/ConnInstanceDataBinderImpl.java   | 49 +---
 .../java/data/ResourceDataBinderImpl.java   | 37 ---
 .../syncope/fit/core/ConnectorITCase.java   |  2 +-
 25 files changed, 257 insertions(+), 134 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/syncope/blob/05ada83c/client/cli/src/main/java/org/apache/syncope/client/cli/commands/CommonsResultManager.java
--
diff --git 
a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/CommonsResultManager.java
 
b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/CommonsResultManager.java
index 6631dea..8098e20 100644
--- 
a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/CommonsResultManager.java
+++ 
b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/CommonsResultManager.java
@@ -19,9 +19,9 @@
 package org.apache.syncope.client.cli.commands;
 
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import org.apache.syncope.client.cli.Command;
 import org.apache.syncope.client.cli.view.Messages;
 import org.apache.syncope.client.cli.view.Table;
@@ -73,7 +73,7 @@ public abstract class CommonsResultManager {
 return 
Messages.commandHelpMessage(name.getAnnotation(Command.class).name());
 }
 
-protected void printConfiguration(final Set 
configurationPropertys) {
+protected void printConfiguration(final Collection 
configurationPropertys) {
 for (final ConnConfProperty configuration : configurationPropertys) {
 System.out.println("   name: " + 
configuration.getSchema().getName());
 System.out.println("   values: " + configuration.getValues());

http://git-wip-us.apache.org/repos/asf/syncope/blob/05ada83c/client/cli/src/main/java/org/apache/syncope/client/cli/commands/connector/ConnectorResultManager.java
--
diff --git 
a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/connector/ConnectorResultManager.java
 
b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/connector/ConnectorResultManager.java
index 157500f..69d2c58 100644
--- 
a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/connector/ConnectorResultManager.java
+++ 
b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/connector/ConnectorResultManager.java
@@ -18,6 +18,7 @@
  */
 package org.apache.syncope.client.cli.commands.connector;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -91,7 +92,7 @@ public class ConnectorResultManager extends 
CommonsResultManager {
 }
 }
 
-public void printConfigurationProperties(final Set 
connConfPropertys) {
+public void printConfigurationProperties(final 
Collection connConfPro