Syncope-2_0_X-deploy - Build # 513 - Fixed
The Apache Jenkins build system has built Syncope-2_0_X-deploy (build #513) Status: Fixed Check console output at https://builds.apache.org/job/Syncope-2_0_X-deploy/513/ to view the results.
syncope git commit: Applying lambdas to all StreamingOutput instances
Repository: syncope
Updated Branches:
refs/heads/master 2f182750b -> 43c66bfe3
Applying lambdas to all StreamingOutput instances
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/43c66bfe
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/43c66bfe
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/43c66bfe
Branch: refs/heads/master
Commit: 43c66bfe30c15f6c8ba42901098ac5f207624002
Parents: 2f18275
Author: Francesco Chicchiriccò
Authored: Wed Aug 2 08:21:27 2017 +0200
Committer: Francesco Chicchiriccò
Committed: Wed Aug 2 08:21:27 2017 +0200
--
.../cxf/service/ConfigurationServiceImpl.java | 12 ++--
.../cxf/service/MailTemplateServiceImpl.java| 10 ++
.../rest/cxf/service/ReportServiceImpl.java | 13 +++--
.../cxf/service/ReportTemplateServiceImpl.java | 10 ++
.../core/rest/cxf/service/RoleServiceImpl.java | 10 ++
.../rest/cxf/service/WorkflowServiceImpl.java | 20 +++-
6 files changed, 14 insertions(+), 61 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/43c66bfe/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/ConfigurationServiceImpl.java
--
diff --git
a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/ConfigurationServiceImpl.java
b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/ConfigurationServiceImpl.java
index 8c8473d..4a40a75 100644
---
a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/ConfigurationServiceImpl.java
+++
b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/ConfigurationServiceImpl.java
@@ -18,8 +18,6 @@
*/
package org.apache.syncope.core.rest.cxf.service;
-import java.io.IOException;
-import java.io.OutputStream;
import java.util.List;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
@@ -42,17 +40,11 @@ public class ConfigurationServiceImpl extends
AbstractServiceImpl implements Con
@Override
public Response export() {
-StreamingOutput sout = new StreamingOutput() {
+StreamingOutput sout = (os) -> logic.export(os);
-@Override
-public void write(final OutputStream os) throws IOException {
-logic.export(os);
-}
-};
return Response.ok(sout).
type(MediaType.TEXT_XML).
-header(
-HttpHeaders.CONTENT_DISPOSITION,
+header(HttpHeaders.CONTENT_DISPOSITION,
"attachment; filename=" + AuthContextUtils.getDomain()
+ CONTENT_XML).
build();
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/43c66bfe/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/MailTemplateServiceImpl.java
--
diff --git
a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/MailTemplateServiceImpl.java
b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/MailTemplateServiceImpl.java
index 6ea590a..7596171 100644
---
a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/MailTemplateServiceImpl.java
+++
b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/MailTemplateServiceImpl.java
@@ -20,7 +20,6 @@ package org.apache.syncope.core.rest.cxf.service;
import java.io.IOException;
import java.io.InputStream;
-import java.io.OutputStream;
import java.net.URI;
import java.nio.charset.StandardCharsets;
import java.util.List;
@@ -68,14 +67,9 @@ public class MailTemplateServiceImpl extends
AbstractServiceImpl implements Mail
@Override
public Response getFormat(final String key, final MailTemplateFormat
format) {
-final String template = logic.getFormat(key, format);
-StreamingOutput sout = new StreamingOutput() {
+String template = logic.getFormat(key, format);
+StreamingOutput sout = (os) -> os.write(template.getBytes());
-@Override
-public void write(final OutputStream os) throws IOException {
-os.write(template.getBytes());
-}
-};
return Response.ok(sout).
type(format.getMediaType()).
build();
http://git-wip-us.apache.org/repos/asf/syncope/blob/43c66bfe/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/ReportServiceImpl.java
--
diff --git
a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/ReportServiceImpl.java
b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/
Syncope-2_0_X - Build # 71 - Still Failing
The Apache Jenkins build system has built Syncope-2_0_X (build #71) Status: Still Failing Check console output at https://builds.apache.org/job/Syncope-2_0_X/71/ to view the results.
Syncope-2_0_X-deploy - Build # 512 - Failure
The Apache Jenkins build system has built Syncope-2_0_X-deploy (build #512) Status: Failure Check console output at https://builds.apache.org/job/Syncope-2_0_X-deploy/512/ to view the results.
syncope git commit: Some trivial grammatical changes
Repository: syncope
Updated Branches:
refs/heads/2_0_X bf35449ca -> 6008f3eb1
Some trivial grammatical changes
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/6008f3eb
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/6008f3eb
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/6008f3eb
Branch: refs/heads/2_0_X
Commit: 6008f3eb1b61b214c5592f05022c75fe9a432642
Parents: bf35449
Author: Colm O hEigeartaigh
Authored: Tue Aug 1 17:27:04 2017 +0100
Committer: Colm O hEigeartaigh
Committed: Tue Aug 1 21:28:03 2017 +0100
--
.../main/java/org/apache/syncope/core/logic/AccessTokenLogic.java | 2 +-
.../src/main/java/org/apache/syncope/core/logic/SAML2IdPLogic.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/6008f3eb/core/logic/src/main/java/org/apache/syncope/core/logic/AccessTokenLogic.java
--
diff --git
a/core/logic/src/main/java/org/apache/syncope/core/logic/AccessTokenLogic.java
b/core/logic/src/main/java/org/apache/syncope/core/logic/AccessTokenLogic.java
index c495392..e6b0099 100644
---
a/core/logic/src/main/java/org/apache/syncope/core/logic/AccessTokenLogic.java
+++
b/core/logic/src/main/java/org/apache/syncope/core/logic/AccessTokenLogic.java
@@ -54,7 +54,7 @@ public class AccessTokenLogic extends
AbstractTransactionalLogic
@PreAuthorize("isAuthenticated()")
public Pair login() {
if (anonymousUser.equals(AuthContextUtils.getUsername())) {
-throw new IllegalArgumentException(anonymousUser + " cannot be
granted for an access token");
+throw new IllegalArgumentException(anonymousUser + " cannot be
granted an access token");
}
return binder.create(AuthContextUtils.getUsername(),
Collections.emptyMap(), false);
http://git-wip-us.apache.org/repos/asf/syncope/blob/6008f3eb/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/SAML2IdPLogic.java
--
diff --git
a/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/SAML2IdPLogic.java
b/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/SAML2IdPLogic.java
index bb26b34..d7337b3 100644
---
a/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/SAML2IdPLogic.java
+++
b/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/SAML2IdPLogic.java
@@ -165,7 +165,7 @@ public class SAML2IdPLogic extends
AbstractSAML2Logic {
} else if (idp.getSSOLocation(SAML2BindingType.REDIRECT) != null) {
idpTO.setBindingType(SAML2BindingType.REDIRECT);
} else {
-throw new IllegalArgumentException("Not POST nor REDIRECT
artifacts supported by " + idp.getId());
+throw new IllegalArgumentException("Neither POST nor REDIRECT
artifacts supported by " + idp.getId());
}
result.add(idpTO);
[1/2] syncope git commit: Fixed WSS4J version on master + added a few lambdas in the SAML SSO code
Repository: syncope
Updated Branches:
refs/heads/master f533b2f73 -> 2f182750b
Fixed WSS4J version on master + added a few lambdas in the SAML SSO code
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/2f182750
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/2f182750
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/2f182750
Branch: refs/heads/master
Commit: 2f182750bdef9e260c4e267f95e816c76a7fbccc
Parents: 508c8cc
Author: Colm O hEigeartaigh
Authored: Tue Aug 1 17:27:20 2017 +0100
Committer: Colm O hEigeartaigh
Committed: Tue Aug 1 21:27:45 2017 +0100
--
.../core/rest/cxf/service/SAML2SPServiceImpl.java | 10 +-
.../java/org/apache/syncope/fit/core/SAML2ITCase.java | 14 ++
pom.xml | 2 +-
3 files changed, 8 insertions(+), 18 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/2f182750/ext/saml2sp/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/SAML2SPServiceImpl.java
--
diff --git
a/ext/saml2sp/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/SAML2SPServiceImpl.java
b/ext/saml2sp/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/SAML2SPServiceImpl.java
index 94d14f1..4ec2074 100644
---
a/ext/saml2sp/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/SAML2SPServiceImpl.java
+++
b/ext/saml2sp/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/SAML2SPServiceImpl.java
@@ -18,9 +18,6 @@
*/
package org.apache.syncope.core.rest.cxf.service;
-import java.io.IOException;
-import java.io.OutputStream;
-
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
@@ -42,13 +39,8 @@ public class SAML2SPServiceImpl extends AbstractServiceImpl
implements SAML2SPSe
@Override
public Response getMetadata(final String spEntityID, final String
urlContext) {
-StreamingOutput sout = new StreamingOutput() {
+StreamingOutput sout = (os) ->
logic.getMetadata(StringUtils.appendIfMissing(spEntityID, "/"), urlContext, os);
-@Override
-public void write(final OutputStream os) throws IOException {
-logic.getMetadata(StringUtils.appendIfMissing(spEntityID,
"/"), urlContext, os);
-}
-};
return Response.ok(sout).
type(MediaType.APPLICATION_XML).
build();
http://git-wip-us.apache.org/repos/asf/syncope/blob/2f182750/fit/core-reference/src/test/java/org/apache/syncope/fit/core/SAML2ITCase.java
--
diff --git
a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/SAML2ITCase.java
b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/SAML2ITCase.java
index 948c426..2df4530 100644
---
a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/SAML2ITCase.java
+++
b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/SAML2ITCase.java
@@ -28,11 +28,11 @@ import static org.junit.Assert.fail;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets;
+import java.util.Optional;
+
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.collections4.IterableUtils;
-import org.apache.commons.collections4.Predicate;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.staxutils.StaxUtils;
import org.apache.syncope.client.lib.AnonymousAuthenticationHandler;
@@ -135,13 +135,11 @@ public class SAML2ITCase extends AbstractITCase {
public void setIdPMapping() {
Assume.assumeTrue(SAML2SPDetector.isSAML2SPAvailable());
-SAML2IdPTO ssoCircle = IterableUtils.find(saml2IdPService.list(), new
Predicate() {
+Optional ssoCircleOpt =
+saml2IdPService.list().stream().filter(o ->
"https://idp.ssocircle.com".equals(o.getEntityID())).findFirst();
+assertTrue(ssoCircleOpt.isPresent());
-@Override
-public boolean evaluate(final SAML2IdPTO object) {
-return
"https://idp.ssocircle.com".equals(object.getEntityID());
-}
-});
+SAML2IdPTO ssoCircle = ssoCircleOpt.get();
assertNotNull(ssoCircle);
assertFalse(ssoCircle.getMappingItems().isEmpty());
assertNotNull(ssoCircle.getConnObjectKeyItem());
http://git-wip-us.apache.org/repos/asf/syncope/blob/2f182750/pom.xml
--
diff --git a/pom.xml b/pom.xml
index cbd9120..39bae7d 100644
--- a/pom.xml
+++ b/pom.xml
@@
[2/2] syncope git commit: Some trivial grammatical changes
Some trivial grammatical changes
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/508c8cc8
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/508c8cc8
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/508c8cc8
Branch: refs/heads/master
Commit: 508c8cc823118d2015aa12f323de7bf5afd77019
Parents: f533b2f
Author: Colm O hEigeartaigh
Authored: Tue Aug 1 17:27:04 2017 +0100
Committer: Colm O hEigeartaigh
Committed: Tue Aug 1 21:27:45 2017 +0100
--
.../main/java/org/apache/syncope/core/logic/AccessTokenLogic.java | 2 +-
.../src/main/java/org/apache/syncope/core/logic/SAML2IdPLogic.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/508c8cc8/core/logic/src/main/java/org/apache/syncope/core/logic/AccessTokenLogic.java
--
diff --git
a/core/logic/src/main/java/org/apache/syncope/core/logic/AccessTokenLogic.java
b/core/logic/src/main/java/org/apache/syncope/core/logic/AccessTokenLogic.java
index c495392..e6b0099 100644
---
a/core/logic/src/main/java/org/apache/syncope/core/logic/AccessTokenLogic.java
+++
b/core/logic/src/main/java/org/apache/syncope/core/logic/AccessTokenLogic.java
@@ -54,7 +54,7 @@ public class AccessTokenLogic extends
AbstractTransactionalLogic
@PreAuthorize("isAuthenticated()")
public Pair login() {
if (anonymousUser.equals(AuthContextUtils.getUsername())) {
-throw new IllegalArgumentException(anonymousUser + " cannot be
granted for an access token");
+throw new IllegalArgumentException(anonymousUser + " cannot be
granted an access token");
}
return binder.create(AuthContextUtils.getUsername(),
Collections.emptyMap(), false);
http://git-wip-us.apache.org/repos/asf/syncope/blob/508c8cc8/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/SAML2IdPLogic.java
--
diff --git
a/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/SAML2IdPLogic.java
b/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/SAML2IdPLogic.java
index f86b633..b432c04 100644
---
a/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/SAML2IdPLogic.java
+++
b/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/SAML2IdPLogic.java
@@ -165,7 +165,7 @@ public class SAML2IdPLogic extends
AbstractSAML2Logic {
} else if (idp.getSSOLocation(SAML2BindingType.REDIRECT) != null) {
idpTO.setBindingType(SAML2BindingType.REDIRECT);
} else {
-throw new IllegalArgumentException("Not POST nor REDIRECT
artifacts supported by " + idp.getId());
+throw new IllegalArgumentException("Neither POST nor REDIRECT
artifacts supported by " + idp.getId());
}
result.add(idpTO);
Syncope-2_0_X - Build # 70 - Still Failing
The Apache Jenkins build system has built Syncope-2_0_X (build #70) Status: Still Failing Check console output at https://builds.apache.org/job/Syncope-2_0_X/70/ to view the results.
[2/2] syncope git commit: [SYNCOPE-1182] Get rid of GetApiOp
[SYNCOPE-1182] Get rid of GetApiOp
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/f533b2f7
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/f533b2f7
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/f533b2f7
Branch: refs/heads/master
Commit: f533b2f73b1e9e2f039e3c393e24c75e0b4dd394
Parents: aee4cea
Author: Francesco Chicchiriccò
Authored: Tue Aug 1 15:42:04 2017 +0200
Committer: Francesco Chicchiriccò
Committed: Tue Aug 1 15:42:15 2017 +0200
--
.../syncope/core/logic/ResourceLogic.java | 6 ++-
.../core/provisioning/api/Connector.java| 4 +-
.../provisioning/java/AsyncConnectorFacade.java | 16 +-
.../provisioning/java/ConnectorFacadeProxy.java | 56 +++-
.../provisioning/java/VirAttrHandlerImpl.java | 17 +++---
.../job/report/ReconciliationReportlet.java | 5 +-
.../AbstractPropagationTaskExecutor.java| 9 ++--
.../pushpull/AbstractPushResultHandler.java | 38 -
.../pushpull/RealmPushResultHandlerImpl.java| 40 +-
.../src/test/resources/rest/SearchScript.groovy | 5 +-
.../src/test/resources/rest/SyncScript.groovy | 1 +
11 files changed, 126 insertions(+), 71 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/f533b2f7/core/logic/src/main/java/org/apache/syncope/core/logic/ResourceLogic.java
--
diff --git
a/core/logic/src/main/java/org/apache/syncope/core/logic/ResourceLogic.java
b/core/logic/src/main/java/org/apache/syncope/core/logic/ResourceLogic.java
index 4593b77..3f2ff75 100644
--- a/core/logic/src/main/java/org/apache/syncope/core/logic/ResourceLogic.java
+++ b/core/logic/src/main/java/org/apache/syncope/core/logic/ResourceLogic.java
@@ -69,6 +69,7 @@ import
org.apache.syncope.core.provisioning.java.utils.MappingUtils;
import org.apache.syncope.core.spring.security.AuthContextUtils;
import
org.apache.syncope.core.spring.security.DelegatedAdministrationException;
import org.identityconnectors.framework.common.objects.Attribute;
+import org.identityconnectors.framework.common.objects.AttributeBuilder;
import org.identityconnectors.framework.common.objects.AttributeUtil;
import org.identityconnectors.framework.common.objects.ConnectorObject;
import org.identityconnectors.framework.common.objects.Name;
@@ -344,8 +345,9 @@ public class ResourceLogic extends
AbstractTransactionalLogic {
// 4. read from the underlying connector
Connector connector = connFactory.getConnector(init.getLeft());
-ConnectorObject connectorObject =
connector.getObject(init.getRight().getObjectClass(),
-new Uid(connObjectKeyValue),
+ConnectorObject connectorObject = connector.getObject(
+init.getRight().getObjectClass(),
+AttributeBuilder.build(connObjectKeyItem.getExtAttrName(),
connObjectKeyValue),
MappingUtils.buildOperationOptions(mapItems));
if (connectorObject == null) {
throw new NotFoundException(
http://git-wip-us.apache.org/repos/asf/syncope/blob/f533b2f7/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/Connector.java
--
diff --git
a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/Connector.java
b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/Connector.java
index 694ab30..324c1d9 100644
---
a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/Connector.java
+++
b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/Connector.java
@@ -140,11 +140,11 @@ public interface Connector {
* Get remote object.
*
* @param objectClass ConnId's object class
- * @param uid ConnId's Uid
+ * @param connObjectKey ConnId's key attribute
* @param options ConnId's OperationOptions
* @return ConnId's connector object for given uid
*/
-ConnectorObject getObject(ObjectClass objectClass, Uid uid,
OperationOptions options);
+ConnectorObject getObject(ObjectClass objectClass, Attribute
connObjectKey, OperationOptions options);
/**
* Search for remote objects.
http://git-wip-us.apache.org/repos/asf/syncope/blob/f533b2f7/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/AsyncConnectorFacade.java
--
diff --git
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/AsyncConnectorFacade.java
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/AsyncConnectorFacade.java
index 83a38eb..a
[1/2] syncope git commit: [SYNCOPE-1182] Get rid of GetApiOp
Repository: syncope
Updated Branches:
refs/heads/2_0_X 39314d046 -> bf35449ca
refs/heads/master aee4cea0f -> f533b2f73
[SYNCOPE-1182] Get rid of GetApiOp
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/bf35449c
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/bf35449c
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/bf35449c
Branch: refs/heads/2_0_X
Commit: bf35449ca00082ad5fecad7230c0db39257d922f
Parents: 39314d0
Author: Francesco Chicchiriccò
Authored: Tue Aug 1 15:42:04 2017 +0200
Committer: Francesco Chicchiriccò
Committed: Tue Aug 1 15:42:04 2017 +0200
--
.../syncope/core/logic/ResourceLogic.java | 6 ++-
.../core/provisioning/api/Connector.java| 4 +-
.../provisioning/java/AsyncConnectorFacade.java | 16 +-
.../provisioning/java/ConnectorFacadeProxy.java | 56 +++-
.../provisioning/java/VirAttrHandlerImpl.java | 17 +++---
.../job/report/ReconciliationReportlet.java | 5 +-
.../AbstractPropagationTaskExecutor.java| 9 ++--
.../pushpull/AbstractPushResultHandler.java | 38 -
.../pushpull/RealmPushResultHandlerImpl.java| 40 +-
.../src/test/resources/rest/SearchScript.groovy | 5 +-
.../src/test/resources/rest/SyncScript.groovy | 1 +
11 files changed, 126 insertions(+), 71 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/bf35449c/core/logic/src/main/java/org/apache/syncope/core/logic/ResourceLogic.java
--
diff --git
a/core/logic/src/main/java/org/apache/syncope/core/logic/ResourceLogic.java
b/core/logic/src/main/java/org/apache/syncope/core/logic/ResourceLogic.java
index 4593b77..3f2ff75 100644
--- a/core/logic/src/main/java/org/apache/syncope/core/logic/ResourceLogic.java
+++ b/core/logic/src/main/java/org/apache/syncope/core/logic/ResourceLogic.java
@@ -69,6 +69,7 @@ import
org.apache.syncope.core.provisioning.java.utils.MappingUtils;
import org.apache.syncope.core.spring.security.AuthContextUtils;
import
org.apache.syncope.core.spring.security.DelegatedAdministrationException;
import org.identityconnectors.framework.common.objects.Attribute;
+import org.identityconnectors.framework.common.objects.AttributeBuilder;
import org.identityconnectors.framework.common.objects.AttributeUtil;
import org.identityconnectors.framework.common.objects.ConnectorObject;
import org.identityconnectors.framework.common.objects.Name;
@@ -344,8 +345,9 @@ public class ResourceLogic extends
AbstractTransactionalLogic {
// 4. read from the underlying connector
Connector connector = connFactory.getConnector(init.getLeft());
-ConnectorObject connectorObject =
connector.getObject(init.getRight().getObjectClass(),
-new Uid(connObjectKeyValue),
+ConnectorObject connectorObject = connector.getObject(
+init.getRight().getObjectClass(),
+AttributeBuilder.build(connObjectKeyItem.getExtAttrName(),
connObjectKeyValue),
MappingUtils.buildOperationOptions(mapItems));
if (connectorObject == null) {
throw new NotFoundException(
http://git-wip-us.apache.org/repos/asf/syncope/blob/bf35449c/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/Connector.java
--
diff --git
a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/Connector.java
b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/Connector.java
index 694ab30..324c1d9 100644
---
a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/Connector.java
+++
b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/Connector.java
@@ -140,11 +140,11 @@ public interface Connector {
* Get remote object.
*
* @param objectClass ConnId's object class
- * @param uid ConnId's Uid
+ * @param connObjectKey ConnId's key attribute
* @param options ConnId's OperationOptions
* @return ConnId's connector object for given uid
*/
-ConnectorObject getObject(ObjectClass objectClass, Uid uid,
OperationOptions options);
+ConnectorObject getObject(ObjectClass objectClass, Attribute
connObjectKey, OperationOptions options);
/**
* Search for remote objects.
http://git-wip-us.apache.org/repos/asf/syncope/blob/bf35449c/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/AsyncConnectorFacade.java
--
diff --git
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/AsyncConnectorFacade.java
Syncope-2_0_X - Build # 69 - Still Failing
The Apache Jenkins build system has built Syncope-2_0_X (build #69) Status: Still Failing Check console output at https://builds.apache.org/job/Syncope-2_0_X/69/ to view the results.
Syncope-2_0_X-deploy - Build # 510 - Fixed
The Apache Jenkins build system has built Syncope-2_0_X-deploy (build #510) Status: Fixed Check console output at https://builds.apache.org/job/Syncope-2_0_X-deploy/510/ to view the results.
[2/2] syncope git commit: Upgrading asciidoctorj-pdf
Upgrading asciidoctorj-pdf Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/aee4cea0 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/aee4cea0 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/aee4cea0 Branch: refs/heads/master Commit: aee4cea0f68529b666a82185e26c8533f04820d4 Parents: 13c046a Author: Francesco Chicchiriccò Authored: Tue Aug 1 10:55:06 2017 +0200 Committer: Francesco Chicchiriccò Committed: Tue Aug 1 10:55:15 2017 +0200 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/aee4cea0/pom.xml -- diff --git a/pom.xml b/pom.xml index 6a89612..cbd9120 100644 --- a/pom.xml +++ b/pom.xml @@ -2281,7 +2281,7 @@ under the License. org.asciidoctor asciidoctorj-pdf -1.5.0-alpha.15 +1.5.0-alpha.16 org.asciidoctor
[1/2] syncope git commit: Upgrading asciidoctorj-pdf
Repository: syncope Updated Branches: refs/heads/2_0_X 12d468e45 -> 39314d046 refs/heads/master 13c046a29 -> aee4cea0f Upgrading asciidoctorj-pdf Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/39314d04 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/39314d04 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/39314d04 Branch: refs/heads/2_0_X Commit: 39314d0464c9504bedcf3554005d0d61b4def160 Parents: 12d468e Author: Francesco Chicchiriccò Authored: Tue Aug 1 10:55:06 2017 +0200 Committer: Francesco Chicchiriccò Committed: Tue Aug 1 10:55:06 2017 +0200 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/39314d04/pom.xml -- diff --git a/pom.xml b/pom.xml index a9d8170..314c06c 100644 --- a/pom.xml +++ b/pom.xml @@ -2336,7 +2336,7 @@ under the License. org.asciidoctor asciidoctorj-pdf -1.5.0-alpha.15 +1.5.0-alpha.16 org.asciidoctor
Syncope-2_0_X - Build # 68 - Still Failing
The Apache Jenkins build system has built Syncope-2_0_X (build #68) Status: Still Failing Check console output at https://builds.apache.org/job/Syncope-2_0_X/68/ to view the results.
Syncope-2_0_X-deploy - Build # 509 - Failure
The Apache Jenkins build system has built Syncope-2_0_X-deploy (build #509) Status: Failure Check console output at https://builds.apache.org/job/Syncope-2_0_X-deploy/509/ to view the results.
[1/2] syncope git commit: [SYNCOPE-1180] Enumerating values for smtpProtocol
Repository: syncope Updated Branches: refs/heads/2_0_X f350ccc16 -> 12d468e45 refs/heads/master b88a7565f -> 13c046a29 [SYNCOPE-1180] Enumerating values for smtpProtocol Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/12d468e4 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/12d468e4 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/12d468e4 Branch: refs/heads/2_0_X Commit: 12d468e45acc511588a9b67d7cb844c70ec773ba Parents: f350ccc Author: Francesco Chicchiriccò Authored: Tue Aug 1 09:28:28 2017 +0200 Committer: Francesco Chicchiriccò Committed: Tue Aug 1 09:28:28 2017 +0200 -- .../systemadministration/emailconfiguration.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/12d468e4/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/emailconfiguration.adoc -- diff --git a/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/emailconfiguration.adoc b/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/emailconfiguration.adoc index 9787dc3..04cc6f0 100644 --- a/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/emailconfiguration.adoc +++ b/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/emailconfiguration.adoc @@ -25,7 +25,7 @@ The `mail.properties` file holds the configuration options to enable the effecti * `smtpPort` - the mail server port; * `smtpUser` - (optional) the username for the account at the mail host; * `smtpPassword` - (optional) the password for the account at the mail host; -* `smtpProtocol` - the mail protocol; +* `smtpProtocol` - the message transport protocol: `smtp` (default) and `smtps` are supported; * `smtpEncoding` - the default encoding to use for MIME messages; * `mail.smtp.starttls.enable` - when `true`, enable the use of the `STARTTLS` command to switch the connection to a TLS-protected connection before issuing any login commands;
[2/2] syncope git commit: [SYNCOPE-1180] Enumerating values for smtpProtocol
[SYNCOPE-1180] Enumerating values for smtpProtocol Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/13c046a2 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/13c046a2 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/13c046a2 Branch: refs/heads/master Commit: 13c046a29287b814c68b6620963bc850c9ce6f6c Parents: b88a756 Author: Francesco Chicchiriccò Authored: Tue Aug 1 09:28:28 2017 +0200 Committer: Francesco Chicchiriccò Committed: Tue Aug 1 09:28:48 2017 +0200 -- .../systemadministration/emailconfiguration.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/13c046a2/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/emailconfiguration.adoc -- diff --git a/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/emailconfiguration.adoc b/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/emailconfiguration.adoc index 9787dc3..04cc6f0 100644 --- a/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/emailconfiguration.adoc +++ b/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/emailconfiguration.adoc @@ -25,7 +25,7 @@ The `mail.properties` file holds the configuration options to enable the effecti * `smtpPort` - the mail server port; * `smtpUser` - (optional) the username for the account at the mail host; * `smtpPassword` - (optional) the password for the account at the mail host; -* `smtpProtocol` - the mail protocol; +* `smtpProtocol` - the message transport protocol: `smtp` (default) and `smtps` are supported; * `smtpEncoding` - the default encoding to use for MIME messages; * `mail.smtp.starttls.enable` - when `true`, enable the use of the `STARTTLS` command to switch the connection to a TLS-protected connection before issuing any login commands;
