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 2013/10/28 11:24:49 UTC
svn commit: r1536304 [1/4] - in /syncope/trunk:
client/src/main/java/org/apache/syncope/client/rest/
common/src/main/java/org/apache/syncope/common/
common/src/main/java/org/apache/syncope/common/types/
common/src/main/java/org/apache/syncope/common/va...
Author: ilgrosso
Date: Mon Oct 28 10:24:47 2013
New Revision: 1536304
URL: http://svn.apache.org/r1536304
Log:
[SYNCOPE-303] Refactoring exception management, also by avoiding composite exceptions whenever possible
Added:
syncope/trunk/common/src/main/java/org/apache/syncope/common/types/ClientExceptionType.java
- copied, changed from r1536272, syncope/trunk/common/src/main/java/org/apache/syncope/common/types/SyncopeClientExceptionType.java
Removed:
syncope/trunk/common/src/main/java/org/apache/syncope/common/types/SyncopeClientExceptionType.java
Modified:
syncope/trunk/client/src/main/java/org/apache/syncope/client/rest/RestClientExceptionMapper.java
syncope/trunk/common/src/main/java/org/apache/syncope/common/SyncopeConstants.java
syncope/trunk/common/src/main/java/org/apache/syncope/common/validation/SyncopeClientCompositeException.java
syncope/trunk/common/src/main/java/org/apache/syncope/common/validation/SyncopeClientException.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/SyncopeRequestCycleListener.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/AbstractSchedTaskModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ApprovalModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Configuration.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConfigurationModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DerivedSchemaModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Login.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/NotificationModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/PolicyModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ProvisioningModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ReportModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Reports.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Resources.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/RoleModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SchemaModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/StatusModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/TaskModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Todo.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/VirtualSchemaModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/NotificationTasks.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PoliciesPanel.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PropagationTasks.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleSearchResultPanel.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleSummaryPanel.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/SchedTasks.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/SyncTasks.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/UserSearchResultPanel.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/ConnectorRestClient.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/ReportRestClient.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/ResourceRestClient.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/SchemaRestClient.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/TaskRestClient.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/UserRestClient.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/WorkflowRestClient.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/tree/TreeActionLinkPanel.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/RoleDAO.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/RoleDAOImpl.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/attrvalue/ParsingValidationException.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/PropagationException.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/ConnectorController.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/LoggerController.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/ReportController.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/ResourceController.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/RoleController.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/SchemaController.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/TaskController.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/UserRequestController.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/AbstractAttributableDataBinder.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/ConnInstanceDataBinder.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/ResourceDataBinder.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/RoleDataBinder.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/SchemaDataBinder.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/TaskDataBinder.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/UserDataBinder.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/utils/RestServiceExceptionMapper.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/services/ConfigurationServiceImpl.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/services/ConnectorServiceImpl.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/services/NotificationServiceImpl.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/services/PolicyServiceImpl.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/services/ReportServiceImpl.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/services/ResourceServiceImpl.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/services/RoleServiceImpl.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/services/SchemaServiceImpl.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/services/TaskServiceImpl.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/services/UserRequestServiceImpl.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/services/UserServiceImpl.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/AuthenticationTestITCase.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ConfigurationTestITCase.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ConnInstanceTestITCase.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/DerivedSchemaTestITCase.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/NotificationTestITCase.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/PolicyTestITCase.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ReportTestITCase.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ResourceTestITCase.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/RoleTestITCase.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/SchemaTestITCase.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserRequestTestITCase.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/VirtualSchemaTestITCase.java
Modified: syncope/trunk/client/src/main/java/org/apache/syncope/client/rest/RestClientExceptionMapper.java
URL: http://svn.apache.org/viewvc/syncope/trunk/client/src/main/java/org/apache/syncope/client/rest/RestClientExceptionMapper.java?rev=1536304&r1=1536303&r2=1536304&view=diff
==============================================================================
--- syncope/trunk/client/src/main/java/org/apache/syncope/client/rest/RestClientExceptionMapper.java (original)
+++ syncope/trunk/client/src/main/java/org/apache/syncope/client/rest/RestClientExceptionMapper.java Mon Oct 28 10:24:47 2013
@@ -19,7 +19,6 @@
package org.apache.syncope.client.rest;
import java.security.AccessControlException;
-import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -29,7 +28,8 @@ import javax.ws.rs.ext.ExceptionMapper;
import javax.ws.rs.ext.Provider;
import javax.xml.ws.WebServiceException;
import org.apache.cxf.jaxrs.client.ResponseExceptionMapper;
-import org.apache.syncope.common.types.SyncopeClientExceptionType;
+import org.apache.syncope.common.SyncopeConstants;
+import org.apache.syncope.common.types.ClientExceptionType;
import org.apache.syncope.common.validation.SyncopeClientCompositeException;
import org.apache.syncope.common.validation.SyncopeClientException;
import org.slf4j.Logger;
@@ -48,28 +48,25 @@ public class RestClientExceptionMapper i
@Override
public Exception fromResponse(final Response response) {
- Exception ex = null;
final int statusCode = response.getStatus();
+ Exception ex;
- // 1. Check for composite exception in HTTP header
- SyncopeClientCompositeException scce = checkCompositeException(response);
+ // 1. Check for client (possibly composite) exception in HTTP header
+ SyncopeClientCompositeException scce = checkSyncopeClientCompositeException(response);
if (scce != null) {
- ex = scce;
-
- // TODO reduce SCCEE to really composite ones and use normal exception for others
- // } else if (statusCode == HttpStatus.SC_FORBIDDEN) {
- // ex = new UnauthorizedRoleException(-1L);
-
- // 2. Map SC_UNAUTHORIZED
- } else if (statusCode == Response.Status.UNAUTHORIZED.getStatusCode()) {
+ if (scce.getExceptions().size() == 1) {
+ ex = scce.getExceptions().iterator().next();
+ } else {
+ ex = scce;
+ }
+ } // 2. Map SC_UNAUTHORIZED
+ else if (statusCode == Response.Status.UNAUTHORIZED.getStatusCode()) {
ex = new AccessControlException("Remote unauthorized exception");
-
- // 3. Map SC_BAD_REQUEST
- } else if (statusCode == Response.Status.BAD_REQUEST.getStatusCode()) {
+ } // 3. Map SC_BAD_REQUEST
+ else if (statusCode == Response.Status.BAD_REQUEST.getStatusCode()) {
ex = new BadRequestException();
-
- } else {
- // 4. All other codes are mapped to runtime exception with HTTP code information
+ } // 4. All other codes are mapped to runtime exception with HTTP code information
+ else {
ex = new WebServiceException(String.format("Remote exception with status code: %s",
Response.Status.fromStatusCode(statusCode).name()));
}
@@ -77,44 +74,35 @@ public class RestClientExceptionMapper i
return ex;
}
- private SyncopeClientCompositeException checkCompositeException(final Response response) {
- final int statusCode = response.getStatus();
- List<Object> exTypesInHeaders = response.getHeaders().
- get(SyncopeClientCompositeException.EXCEPTION_TYPE_HEADER);
+ private SyncopeClientCompositeException checkSyncopeClientCompositeException(final Response response) {
+ List<Object> exTypesInHeaders = response.getHeaders().get(SyncopeConstants.REST_EXCEPTION_TYPE_HEADER);
if (exTypesInHeaders == null) {
- LOG.debug("No " + SyncopeClientCompositeException.EXCEPTION_TYPE_HEADER + " provided");
+ LOG.debug("No " + SyncopeConstants.REST_EXCEPTION_TYPE_HEADER + " provided");
return null;
}
- final SyncopeClientCompositeException compException =
- new SyncopeClientCompositeException(statusCode);
+ final SyncopeClientCompositeException compException = SyncopeClientException.buildComposite();
final Set<String> handledExceptions = new HashSet<String>();
for (Object exceptionTypeValue : exTypesInHeaders) {
final String exTypeAsString = (String) exceptionTypeValue;
- SyncopeClientExceptionType exceptionType = null;
+ ClientExceptionType exceptionType = null;
try {
- exceptionType = SyncopeClientExceptionType.getFromHeaderValue(exTypeAsString);
+ exceptionType = ClientExceptionType.fromHeaderValue(exTypeAsString);
} catch (IllegalArgumentException e) {
- LOG.error("Unexpected value of " + SyncopeClientCompositeException.EXCEPTION_TYPE_HEADER + ": "
+ LOG.error("Unexpected value of " + SyncopeConstants.REST_EXCEPTION_TYPE_HEADER + ": "
+ exTypeAsString, e);
}
if (exceptionType != null) {
handledExceptions.add(exTypeAsString);
- final SyncopeClientException clientException = new SyncopeClientException();
- clientException.setType(exceptionType);
+ final SyncopeClientException clientException = SyncopeClientException.build(exceptionType);
+
if (response.getHeaders().get(exceptionType.getElementHeaderName()) != null
&& !response.getHeaders().get(exceptionType.getElementHeaderName()).isEmpty()) {
- // TODO update clientException to support list of objects
- final List<Object> elObjectList = response.getHeaders().get(exceptionType.getElementHeaderName());
- final List<String> elStringList = new ArrayList<String>();
- for (Object elementObject : elObjectList) {
- if (elementObject instanceof String) {
- elStringList.add((String) elementObject);
- }
- }
- clientException.setElements(elStringList);
+
+ clientException.getElements().addAll(
+ response.getHeaders().get(exceptionType.getElementHeaderName()));
}
compException.addException(clientException);
}
Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/SyncopeConstants.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/SyncopeConstants.java?rev=1536304&r1=1536303&r2=1536304&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/SyncopeConstants.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/SyncopeConstants.java Mon Oct 28 10:24:47 2013
@@ -34,15 +34,20 @@ public class SyncopeConstants {
"yyyy-MM-dd'T'HH:mm:ssz",
"yyyy-MM-dd HH:mm:ss",
"yyyy-MM-dd HH:mm:ss.S", // explicitly added to import date into MySql repository
- "yyyy-MM-dd"};
+ "yyyy-MM-dd" };
public static final String DEFAULT_DATE_PATTERN = "yyyy-MM-dd'T'HH:mm:ssZ";
/**
- * This constant will be used to identify HTTP header key to look for object ID assigned to an object after its
- * creation. HTTP Response after PUT operation should contain this key with resource id as its value.
+ * HTTP header key for object ID assigned to an object after its creation;
+ * HTTP Response after PUT operation should contain this key with resource id as its value.
*/
- public static final String REST_HEADER_ID = "org.apache.syncope.resource.id";
+ public static final String REST_RESOURCE_ID_HEADER = "org.apache.syncope.resource.id";
+
+ /**
+ * HTTP header key for exception type.
+ */
+ public static final String REST_EXCEPTION_TYPE_HEADER = "Syncope.ExceptionType";
/**
* This constant is not defined in javax.ws.rs.core.HttpHeaders.
Copied: syncope/trunk/common/src/main/java/org/apache/syncope/common/types/ClientExceptionType.java (from r1536272, syncope/trunk/common/src/main/java/org/apache/syncope/common/types/SyncopeClientExceptionType.java)
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/types/ClientExceptionType.java?p2=syncope/trunk/common/src/main/java/org/apache/syncope/common/types/ClientExceptionType.java&p1=syncope/trunk/common/src/main/java/org/apache/syncope/common/types/SyncopeClientExceptionType.java&r1=1536272&r2=1536304&rev=1536304&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/types/SyncopeClientExceptionType.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/types/ClientExceptionType.java Mon Oct 28 10:24:47 2013
@@ -18,72 +18,67 @@
*/
package org.apache.syncope.common.types;
+import javax.ws.rs.core.Response;
import javax.xml.bind.annotation.XmlEnum;
-@XmlEnum
-public enum SyncopeClientExceptionType {
+public enum ClientExceptionType {
- AssociatedResources("Syncope.AssociatedResources", "Syncope.AssociatedResources.name"),
- Deadlock("Syncope.Deadlock", ""),
- DataIntegrityViolation("Syncope.DataIntegrityViolation", "Syncope.DataIntegrityViolation.name"),
- EntityExists("Syncope.EntityExists", "Syncope.EntityExists.name"),
- GenericPersistence("Syncope.GenericPersistence", "Syncope.GenericPersistence.cause"),
- InvalidLogger("Syncope.InvalidLogger", "Syncope.InvalidLogger.message"),
- InvalidConnInstance("Syncope.InvalidConnInstance", "Syncope.InvalidConnInstance.message"),
- InvalidConnIdConf("Syncope.InvalidConnIdConf", "Syncope.InvalidConnIdConf.message"),
- InvalidPasswordPolicy("Syncope.InvalidPasswordPolicy", "Syncope.InvalidPasswordPolicy.reason"),
- InvalidAccountPolicy("Syncope.InvalidAccountPolicy", "Syncope.InvalidAccountPolicy.reason"),
- InvalidSyncPolicy("Syncope.InvalidSyncPolicy", "Syncope.InvalidSyncPolicy.reason"),
- InvalidSyncopeRole("Syncope.InvalidSyncopeRole", "Syncope.InvalidSyncopeRole.reason"),
- InvalidReportExec("Syncope.InvalidReportExec", "Syncope.InvalidReportExec.reason"),
- InvalidRoles("Syncope.InvalidRoles", "Syncope.InvalidRoles.name"),
- InvalidSchemaDefinition("Syncope.InvalidSchemaDefinition", ""),
- InvalidSearchCondition("Syncope.InvalidSearchCondition", ""),
- InvalidPropagationTaskExecReport(
- "Syncope.InvalidPropagationTaskExecReport",
- "Syncope.InvalidPropagationTaskExecReport.element"),
- InvalidUSchema("Syncope.InvalidUSchema", "Syncope.InvalidUSchema.name"),
- InvalidUDerSchema("Syncope.InvalidUDerSchema", "Syncope.InvalidUDerSchema.name"),
- InvalidUVirSchema("Syncope.InvalidUVirSchema", "Syncope.InvalidUVirSchema.name"),
- InvalidRSchema("Syncope.InvalidRSchema", "Syncope.InvalidRSchema.name"),
- InvalidRDerSchema("Syncope.InvalidRDerSchema", "Syncope.InvalidRDerSchema.name"),
- InvalidRVirSchema("Syncope.InvalidRVirSchema", "Syncope.InvalidRVirSchema.name"),
- InvalidMSchema("Syncope.InvalidMSchema", "Syncope.InvalidMSchema.name"),
- InvalidMDerSchema("Syncope.InvalidMDerSchema", "Syncope.InvalidMDerSchema.name"),
- InvalidMVirSchema("Syncope.InvalidMVirSchema", "Syncope.InvalidMVirSchema.name"),
- InvalidSchemaMapping("Syncope.InvalidSchemaMapping", "Syncope.InvalidSchemaMapping.name"),
- InvalidSyncopeConf("Syncope.InvalidSyncopeConf", "Syncope.InvalidSyncopeConf.name"),
- InvalidSyncopeUser("Syncope.InvalidSyncopeUser", "Syncope.InvalidSyncopeUser.element"),
- InvalidExternalResource("Syncope.InvalidExternalResource", "Syncope.InvalidExternalResource.element"),
- InvalidNotification("Syncope.InvalidNotification", "Syncope.InvalidNotification.element"),
- InvalidPropagationTask("Syncope.InvalidPropagationTask", "Syncope.InvalidPropagationTask.element"),
- InvalidSchedTask("Syncope.InvalidSchedTask", "Syncope.InvalidSchedTask.element"),
- InvalidSyncTask("Syncope.InvalidSyncTask", "Syncope.InvalidSyncTask.element"),
- InvalidValues("Syncope.InvalidValues", "Syncope.InvalidValues.attributeName"),
- NotFound("Syncope.NotFound", "Syncope.NotFound.entity"),
- RejectedUserCreate("Syncope.RejectUserCreate", "Syncope.RejectUserCreate.userId"),
- RequiredValuesMissing("Syncope.RequiredValuesMissing", "Syncope.RequiredValuesMissing.attributeName"),
- RoleOwnership("Syncope.RoleOwnership", "Syncope.RoleOwnership.role"),
- Scheduling("Syncope.Scheduling", "Syncope.Scheduling.message"),
- UnauthorizedRole("Syncope.UnauthorizedRole", "Syncope.UnauthorizedRole.id"),
- Unauthorized("Syncope.Unauthorized", "Syncope.Unauthorized"),
- Unknown("Syncope.Unknown", ""),
- Workflow("Syncope.Workflow", "Syncope.Workflow.message");
-
- private String headerValue;
-
- private String elementHeaderName;
-
- private SyncopeClientExceptionType(final String headerValue, final String elementHeaderName) {
- this.headerValue = headerValue;
- this.elementHeaderName = elementHeaderName;
+ AssociatedResources(Response.Status.BAD_REQUEST),
+ Composite(Response.Status.BAD_REQUEST),
+ DataIntegrityViolation(Response.Status.BAD_REQUEST),
+ EntityExists(Response.Status.CONFLICT),
+ GenericPersistence(Response.Status.BAD_REQUEST),
+ InvalidLogger(Response.Status.BAD_REQUEST),
+ InvalidConnInstance(Response.Status.BAD_REQUEST),
+ InvalidConnIdConf(Response.Status.BAD_REQUEST),
+ InvalidPasswordPolicy(Response.Status.BAD_REQUEST),
+ InvalidAccountPolicy(Response.Status.BAD_REQUEST),
+ InvalidSyncPolicy(Response.Status.BAD_REQUEST),
+ InvalidSyncopeRole(Response.Status.BAD_REQUEST),
+ InvalidReportExec(Response.Status.BAD_REQUEST),
+ InvalidRoles(Response.Status.BAD_REQUEST),
+ InvalidSchemaDefinition(Response.Status.BAD_REQUEST),
+ InvalidSearchCondition(Response.Status.BAD_REQUEST),
+ InvalidPropagationTaskExecReport(Response.Status.BAD_REQUEST),
+ InvalidUSchema(Response.Status.BAD_REQUEST),
+ InvalidUDerSchema(Response.Status.BAD_REQUEST),
+ InvalidUVirSchema(Response.Status.BAD_REQUEST),
+ InvalidRSchema(Response.Status.BAD_REQUEST),
+ InvalidRDerSchema(Response.Status.BAD_REQUEST),
+ InvalidRVirSchema(Response.Status.BAD_REQUEST),
+ InvalidMSchema(Response.Status.BAD_REQUEST),
+ InvalidMDerSchema(Response.Status.BAD_REQUEST),
+ InvalidMVirSchema(Response.Status.BAD_REQUEST),
+ InvalidSchemaMapping(Response.Status.BAD_REQUEST),
+ InvalidSyncopeConf(Response.Status.BAD_REQUEST),
+ InvalidSyncopeUser(Response.Status.BAD_REQUEST),
+ InvalidExternalResource(Response.Status.BAD_REQUEST),
+ InvalidNotification(Response.Status.BAD_REQUEST),
+ InvalidPropagationTask(Response.Status.BAD_REQUEST),
+ InvalidSchedTask(Response.Status.BAD_REQUEST),
+ InvalidSyncTask(Response.Status.BAD_REQUEST),
+ InvalidValues(Response.Status.BAD_REQUEST),
+ NotFound(Response.Status.NOT_FOUND),
+ RejectedUserCreate(Response.Status.BAD_REQUEST),
+ RequiredValuesMissing(Response.Status.BAD_REQUEST),
+ RoleOwnership(Response.Status.BAD_REQUEST),
+ Scheduling(Response.Status.BAD_REQUEST),
+ UnauthorizedRole(Response.Status.UNAUTHORIZED),
+ Unauthorized(Response.Status.UNAUTHORIZED),
+ Unknown(Response.Status.BAD_REQUEST),
+ Workflow(Response.Status.BAD_REQUEST);
+
+ private final Response.Status responseStatus;
+
+ private ClientExceptionType(final Response.Status responseStatus) {
+ this.responseStatus = responseStatus;
}
- public static SyncopeClientExceptionType getFromHeaderValue(final String exceptionTypeHeaderValue) {
- SyncopeClientExceptionType result = null;
- for (SyncopeClientExceptionType syncopeClientExceptionType : values()) {
- if (exceptionTypeHeaderValue.equals(syncopeClientExceptionType.getHeaderValue())) {
- result = syncopeClientExceptionType;
+ public static ClientExceptionType fromHeaderValue(final String exceptionTypeHeaderValue) {
+ ClientExceptionType result = null;
+ for (ClientExceptionType type : values()) {
+ if (exceptionTypeHeaderValue.equals(type.getHeaderValue())) {
+ result = type;
}
}
@@ -94,11 +89,16 @@ public enum SyncopeClientExceptionType {
return result;
}
+ public String getHeaderValue() {
+ return name();
+ }
+
public String getElementHeaderName() {
- return elementHeaderName;
+ return getHeaderValue() + ".element";
}
- public String getHeaderValue() {
- return headerValue;
+ public Response.Status getResponseStatus() {
+ return responseStatus;
}
+
}
Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/validation/SyncopeClientCompositeException.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/validation/SyncopeClientCompositeException.java?rev=1536304&r1=1536303&r2=1536304&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/validation/SyncopeClientCompositeException.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/validation/SyncopeClientCompositeException.java Mon Oct 28 10:24:47 2013
@@ -21,38 +21,27 @@ package org.apache.syncope.common.valida
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
-import org.apache.syncope.common.types.SyncopeClientExceptionType;
+import org.apache.syncope.common.types.ClientExceptionType;
-public class SyncopeClientCompositeException extends RuntimeException {
+public class SyncopeClientCompositeException extends SyncopeClientException {
private static final long serialVersionUID = 7882118041134372129L;
- public static final String EXCEPTION_TYPE_HEADER = "ExceptionType";
+ private final Set<SyncopeClientException> exceptions = new HashSet<SyncopeClientException>();
- private final int statusCode;
-
- private final Set<SyncopeClientException> exceptions;
-
- public SyncopeClientCompositeException(final int statusCode) {
- super();
-
- this.statusCode = statusCode;
- exceptions = new HashSet<SyncopeClientException>();
- }
-
- public int getStatusCode() {
- return statusCode;
+ protected SyncopeClientCompositeException() {
+ super(ClientExceptionType.Composite);
}
public boolean hasExceptions() {
return !exceptions.isEmpty();
}
- public boolean hasException(final SyncopeClientExceptionType exceptionType) {
+ public boolean hasException(final ClientExceptionType exceptionType) {
return getException(exceptionType) != null;
}
- public SyncopeClientException getException(final SyncopeClientExceptionType exceptionType) {
+ public SyncopeClientException getException(final ClientExceptionType exceptionType) {
boolean found = false;
SyncopeClientException syncopeClientException = null;
for (Iterator<SyncopeClientException> itor = exceptions.iterator(); itor.hasNext() && !found;) {
@@ -74,7 +63,7 @@ public class SyncopeClientCompositeExcep
public boolean addException(final SyncopeClientException exception) {
if (exception.getType() == null) {
throw new IllegalArgumentException(exception + " does not have the right "
- + SyncopeClientExceptionType.class.getName() + " set");
+ + ClientExceptionType.class.getName() + " set");
}
return exceptions.add(exception);
@@ -89,9 +78,7 @@ public class SyncopeClientCompositeExcep
while (iter.hasNext()) {
SyncopeClientException e = iter.next();
message.append("[");
- message.append(e.getType());
- message.append(" ");
- message.append(e.getElements());
+ message.append(e.getMessage());
message.append("]");
if (iter.hasNext()) {
message.append(", ");
Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/validation/SyncopeClientException.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/validation/SyncopeClientException.java?rev=1536304&r1=1536303&r2=1536304&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/validation/SyncopeClientException.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/validation/SyncopeClientException.java Mon Oct 28 10:24:47 2013
@@ -18,58 +18,80 @@
*/
package org.apache.syncope.common.validation;
-import java.util.HashSet;
+import java.util.ArrayList;
import java.util.List;
-import java.util.Set;
-import org.apache.syncope.common.types.SyncopeClientExceptionType;
+import org.apache.syncope.common.types.ClientExceptionType;
-public class SyncopeClientException extends Exception {
+public class SyncopeClientException extends RuntimeException {
private static final long serialVersionUID = 3380920886511913475L;
- private SyncopeClientExceptionType type;
+ private ClientExceptionType type;
- private Set<String> elements;
+ private final List<Object> elements = new ArrayList<Object>();
- public SyncopeClientException() {
- super();
- elements = new HashSet<String>();
+ public static SyncopeClientException build(final ClientExceptionType type) {
+ if (type == ClientExceptionType.Composite) {
+ throw new IllegalArgumentException("Composite exceptions must be obtained via buildComposite()");
+ }
+ return new SyncopeClientException(type);
+ }
+
+ public static SyncopeClientCompositeException buildComposite() {
+ return new SyncopeClientCompositeException();
}
- public SyncopeClientException(final SyncopeClientExceptionType type) {
- this();
+ protected SyncopeClientException(final ClientExceptionType type) {
+ super();
setType(type);
}
- public SyncopeClientExceptionType getType() {
- return type;
+ public boolean isComposite() {
+ return getType() == ClientExceptionType.Composite;
}
- public final void setType(final SyncopeClientExceptionType type) {
- this.type = type;
+ public SyncopeClientCompositeException asComposite() {
+ if (!isComposite()) {
+ throw new IllegalArgumentException("This is not a composite exception");
+ }
+
+ return (SyncopeClientCompositeException) this;
}
- public boolean addElement(final String element) {
- return elements.add(element);
+ public ClientExceptionType getType() {
+ return type;
}
- public boolean removeElement(final String element) {
- return elements.remove(element);
+ public final void setType(final ClientExceptionType type) {
+ this.type = type;
}
- public Set<String> getElements() {
+ public List<Object> getElements() {
return elements;
}
- public void setElements(final Set<String> elements) {
- this.elements = elements;
+ public boolean isEmpty() {
+ return elements.isEmpty();
}
- public void setElements(final List<String> elements) {
- this.elements.addAll(elements);
+ public int size() {
+ return elements.size();
}
- public boolean isEmpty() {
- return elements.isEmpty();
+ @Override
+ public String getMessage() {
+ StringBuilder message = new StringBuilder();
+
+ message.append(getType());
+ message.append(" ");
+ message.append(getElements());
+
+ return message.toString();
+ }
+
+ @Override
+ public String getLocalizedMessage() {
+ return getMessage();
}
+
}
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/SyncopeRequestCycleListener.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/SyncopeRequestCycleListener.java?rev=1536304&r1=1536303&r2=1536304&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/SyncopeRequestCycleListener.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/SyncopeRequestCycleListener.java Mon Oct 28 10:24:47 2013
@@ -21,7 +21,7 @@ package org.apache.syncope.console;
import java.security.AccessControlException;
import javax.ws.rs.BadRequestException;
import javax.xml.ws.WebServiceException;
-import org.apache.syncope.common.validation.SyncopeClientCompositeException;
+import org.apache.syncope.common.validation.SyncopeClientException;
import org.apache.syncope.console.pages.ErrorPage;
import org.apache.wicket.Page;
import org.apache.wicket.authorization.UnauthorizedInstantiationException;
@@ -68,7 +68,7 @@ public class SyncopeRequestCycleListener
errorPage = new ErrorPage(errorParameters);
} else if (e.getCause() instanceof BadRequestException || e.getCause() instanceof WebServiceException
- || e.getCause() instanceof SyncopeClientCompositeException) {
+ || e.getCause() instanceof SyncopeClientException) {
errorParameters.add("errorMessage", new StringResourceModel("restClientException", null).getString());
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/AbstractSchedTaskModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/AbstractSchedTaskModalPage.java?rev=1536304&r1=1536303&r2=1536304&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/AbstractSchedTaskModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/AbstractSchedTaskModalPage.java Mon Oct 28 10:24:47 2013
@@ -20,7 +20,7 @@ package org.apache.syncope.console.pages
import org.apache.syncope.common.to.SchedTaskTO;
import org.apache.syncope.common.to.SyncTaskTO;
-import org.apache.syncope.common.validation.SyncopeClientCompositeException;
+import org.apache.syncope.common.validation.SyncopeClientException;
import org.apache.syncope.console.commons.Constants;
import org.apache.syncope.console.commons.DateFormatROModel;
import org.apache.syncope.console.markup.html.CrontabContainer;
@@ -103,9 +103,9 @@ public abstract class AbstractSchedTaskM
((BasePage) pageRef.getPage()).setModalResult(true);
window.close(target);
- } catch (SyncopeClientCompositeException e) {
+ } catch (SyncopeClientException e) {
LOG.error("While creating or updating task", e);
- error(getString(Constants.ERROR) + ":" + e.getMessage());
+ error(getString(Constants.ERROR) + ": " + e.getMessage());
target.add(feedbackPanel);
}
}
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ApprovalModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ApprovalModalPage.java?rev=1536304&r1=1536303&r2=1536304&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ApprovalModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ApprovalModalPage.java Mon Oct 28 10:24:47 2013
@@ -29,7 +29,7 @@ import java.util.Map;
import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.common.to.WorkflowFormPropertyTO;
import org.apache.syncope.common.to.WorkflowFormTO;
-import org.apache.syncope.common.validation.SyncopeClientCompositeException;
+import org.apache.syncope.common.validation.SyncopeClientException;
import org.apache.syncope.console.commons.Constants;
import org.apache.syncope.console.commons.MapChoiceRenderer;
import org.apache.syncope.console.markup.html.list.AltListView;
@@ -231,8 +231,8 @@ public class ApprovalModalPage extends B
((Todo) pageRef.getPage()).setModalResult(true);
window.close(target);
- } catch (SyncopeClientCompositeException e) {
- error(getString(Constants.ERROR) + ":" + e.getMessage());
+ } catch (SyncopeClientException e) {
+ error(getString(Constants.ERROR) + ": " + e.getMessage());
LOG.error("While submitting form {}", formTO, e);
target.add(feedbackPanel);
}
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Configuration.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Configuration.java?rev=1536304&r1=1536303&r2=1536304&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Configuration.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Configuration.java Mon Oct 28 10:24:47 2013
@@ -34,7 +34,7 @@ import org.apache.syncope.common.to.Noti
import org.apache.syncope.common.to.WorkflowDefinitionTO;
import org.apache.syncope.common.types.PolicyType;
import org.apache.syncope.common.types.LoggerLevel;
-import org.apache.syncope.common.validation.SyncopeClientCompositeException;
+import org.apache.syncope.common.validation.SyncopeClientException;
import org.apache.syncope.console.commons.Constants;
import org.apache.syncope.console.commons.HttpResourceStream;
import org.apache.syncope.console.commons.PreferenceManager;
@@ -166,8 +166,8 @@ public class Configuration extends BaseP
try {
wfRestClient.updateDefinition(workflowDef);
info(getString(Constants.OPERATION_SUCCEEDED));
- } catch (SyncopeClientCompositeException scee) {
- error(getString(Constants.ERROR) + ":" + scee.getMessage());
+ } catch (SyncopeClientException scee) {
+ error(getString(Constants.ERROR) + ": " + scee.getMessage());
}
target.add(feedbackPanel);
}
@@ -266,7 +266,7 @@ public class Configuration extends BaseP
public void onClick(final AjaxRequestTarget target) {
try {
confRestClient.deleteConfiguration(configurationTO.getKey());
- } catch (SyncopeClientCompositeException e) {
+ } catch (SyncopeClientException e) {
LOG.error("While deleting a conf key", e);
error(e.getMessage());
return;
@@ -435,7 +435,7 @@ public class Configuration extends BaseP
public void onClick(final AjaxRequestTarget target) {
try {
notificationRestClient.deleteNotification(notificationTO.getId());
- } catch (SyncopeClientCompositeException e) {
+ } catch (SyncopeClientException e) {
LOG.error("While deleting a notification", e);
error(e.getMessage());
return;
@@ -659,7 +659,7 @@ public class Configuration extends BaseP
}
info(getString(Constants.OPERATION_SUCCEEDED));
- } catch (SyncopeClientCompositeException e) {
+ } catch (SyncopeClientException e) {
info(getString(Constants.OPERATION_ERROR));
}
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConfigurationModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConfigurationModalPage.java?rev=1536304&r1=1536303&r2=1536304&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConfigurationModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConfigurationModalPage.java Mon Oct 28 10:24:47 2013
@@ -19,7 +19,7 @@
package org.apache.syncope.console.pages;
import org.apache.syncope.common.to.ConfigurationTO;
-import org.apache.syncope.common.validation.SyncopeClientCompositeException;
+import org.apache.syncope.common.validation.SyncopeClientException;
import org.apache.syncope.console.rest.ConfigurationRestClient;
import org.apache.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel;
import org.apache.wicket.PageReference;
@@ -86,7 +86,7 @@ public class ConfigurationModalPage exte
callerPage.setModalResult(true);
window.close(target);
- } catch (SyncopeClientCompositeException e) {
+ } catch (SyncopeClientException e) {
if (createFlag) {
error(getString("error_insert"));
} else {
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java?rev=1536304&r1=1536303&r2=1536304&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java Mon Oct 28 10:24:47 2013
@@ -32,7 +32,7 @@ import org.apache.syncope.common.to.Conn
import org.apache.syncope.common.types.ConnConfPropSchema;
import org.apache.syncope.common.types.ConnConfProperty;
import org.apache.syncope.common.types.ConnectorCapability;
-import org.apache.syncope.common.validation.SyncopeClientCompositeException;
+import org.apache.syncope.common.validation.SyncopeClientException;
import org.apache.syncope.console.commons.Constants;
import org.apache.syncope.console.markup.html.list.AltListView;
import org.apache.syncope.console.rest.ConnectorRestClient;
@@ -422,8 +422,8 @@ public class ConnectorModalPage extends
((Resources) pageRef.getPage()).setModalResult(true);
window.close(target);
- } catch (SyncopeClientCompositeException e) {
- error(getString(Constants.ERROR) + ":" + e.getMessage());
+ } catch (SyncopeClientException e) {
+ error(getString(Constants.ERROR) + ": " + e.getMessage());
target.add(feedbackPanel);
((Resources) pageRef.getPage()).setModalResult(false);
LOG.error("While creating or updating connector {}", conn, e);
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DerivedSchemaModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DerivedSchemaModalPage.java?rev=1536304&r1=1536303&r2=1536304&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DerivedSchemaModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DerivedSchemaModalPage.java Mon Oct 28 10:24:47 2013
@@ -21,7 +21,7 @@ package org.apache.syncope.console.pages
import org.apache.syncope.common.AbstractBaseBean;
import org.apache.syncope.common.to.DerSchemaTO;
import org.apache.syncope.common.types.AttributableType;
-import org.apache.syncope.common.validation.SyncopeClientCompositeException;
+import org.apache.syncope.common.validation.SyncopeClientException;
import org.apache.syncope.console.commons.Constants;
import org.apache.syncope.console.commons.JexlHelpUtil;
import org.apache.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel;
@@ -99,8 +99,8 @@ public class DerivedSchemaModalPage exte
}
window.close(target);
- } catch (SyncopeClientCompositeException e) {
- error(getString(Constants.ERROR) + ":" + e.getMessage());
+ } catch (SyncopeClientException e) {
+ error(getString(Constants.ERROR) + ": " + e.getMessage());
target.add(feedbackPanel);
}
}
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Login.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Login.java?rev=1536304&r1=1536303&r2=1536304&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Login.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Login.java Mon Oct 28 10:24:47 2013
@@ -30,7 +30,7 @@ import org.apache.syncope.common.service
import org.apache.syncope.common.to.EntitlementTO;
import org.apache.syncope.common.to.UserTO;
import org.apache.syncope.common.util.CollectionWrapper;
-import org.apache.syncope.common.validation.SyncopeClientCompositeException;
+import org.apache.syncope.common.validation.SyncopeClientException;
import org.apache.syncope.console.SyncopeSession;
import org.apache.syncope.console.commons.Constants;
import org.apache.syncope.console.wicket.ajax.markup.html.ClearIndicatingAjaxLink;
@@ -204,7 +204,7 @@ public class Login extends WebPage {
Boolean result = null;
try {
result = SyncopeSession.get().getService(UserRequestService.class).isCreateAllowed();
- } catch (SyncopeClientCompositeException e) {
+ } catch (SyncopeClientException e) {
LOG.error("While seeking if self registration is allowed", e);
}
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/NotificationModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/NotificationModalPage.java?rev=1536304&r1=1536303&r2=1536304&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/NotificationModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/NotificationModalPage.java Mon Oct 28 10:24:47 2013
@@ -27,7 +27,7 @@ import org.apache.syncope.common.to.Noti
import org.apache.syncope.common.types.AttributableType;
import org.apache.syncope.common.types.IntMappingType;
import org.apache.syncope.common.types.TraceLevel;
-import org.apache.syncope.common.validation.SyncopeClientCompositeException;
+import org.apache.syncope.common.validation.SyncopeClientException;
import org.apache.syncope.console.commons.Constants;
import org.apache.syncope.console.pages.panels.UserSearchPanel;
import org.apache.syncope.console.rest.NotificationRestClient;
@@ -224,8 +224,8 @@ class NotificationModalPage extends Base
callerPage.setModalResult(true);
window.close(target);
- } catch (SyncopeClientCompositeException scee) {
- error(getString(Constants.ERROR) + ":" + scee.getMessage());
+ } catch (SyncopeClientException scee) {
+ error(getString(Constants.ERROR) + ": " + scee.getMessage());
target.add(feedbackPanel);
}
}
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/PolicyModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/PolicyModalPage.java?rev=1536304&r1=1536303&r2=1536304&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/PolicyModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/PolicyModalPage.java Mon Oct 28 10:24:47 2013
@@ -121,7 +121,7 @@ public class PolicyModalPage<T extends A
} catch (Exception e) {
LOG.error("While creating policy", e);
- error(getString(Constants.ERROR) + ":" + e.getMessage());
+ error(getString(Constants.ERROR) + ": " + e.getMessage());
target.add(getPage().get(Constants.FEEDBACK));
}
}
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ProvisioningModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ProvisioningModalPage.java?rev=1536304&r1=1536303&r2=1536304&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ProvisioningModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ProvisioningModalPage.java Mon Oct 28 10:24:47 2013
@@ -127,7 +127,7 @@ public class ProvisioningModalPage<T ext
bulkAssociationAction(target, BulkAssociationAction.Type.UNLINK, table, columns);
} catch (Exception e) {
LOG.error("Error unlinkink resources", e);
- error(getString(Constants.ERROR) + ":" + e.getMessage());
+ error(getString(Constants.ERROR) + ": " + e.getMessage());
target.add(feedbackPanel);
}
}
@@ -143,7 +143,7 @@ public class ProvisioningModalPage<T ext
bulkAssociationAction(target, BulkAssociationAction.Type.DEPROVISION, table, columns);
} catch (Exception e) {
LOG.error("Error de-provisioning user", e);
- error(getString(Constants.ERROR) + ":" + e.getMessage());
+ error(getString(Constants.ERROR) + ": " + e.getMessage());
target.add(feedbackPanel);
}
}
@@ -159,7 +159,7 @@ public class ProvisioningModalPage<T ext
bulkAssociationAction(target, BulkAssociationAction.Type.UNASSIGN, table, columns);
} catch (Exception e) {
LOG.error("Error unassigning resources", e);
- error(getString(Constants.ERROR) + ":" + e.getMessage());
+ error(getString(Constants.ERROR) + ": " + e.getMessage());
target.add(feedbackPanel);
}
}
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ReportModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ReportModalPage.java?rev=1536304&r1=1536303&r2=1536304&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ReportModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ReportModalPage.java Mon Oct 28 10:24:47 2013
@@ -28,7 +28,7 @@ import org.apache.syncope.common.to.Repo
import org.apache.syncope.common.to.ReportTO;
import org.apache.syncope.common.types.ReportExecExportFormat;
import org.apache.syncope.common.types.ReportExecStatus;
-import org.apache.syncope.common.validation.SyncopeClientCompositeException;
+import org.apache.syncope.common.validation.SyncopeClientException;
import org.apache.syncope.console.commons.Constants;
import org.apache.syncope.console.commons.DateFormatROModel;
import org.apache.syncope.console.commons.HttpResourceStream;
@@ -147,9 +147,9 @@ public class ReportModalPage extends Bas
((BasePage) callerPageRef.getPage()).setModalResult(true);
window.close(target);
- } catch (SyncopeClientCompositeException e) {
+ } catch (SyncopeClientException e) {
LOG.error("While creating or updating report", e);
- error(getString(Constants.ERROR) + ":" + e.getMessage());
+ error(getString(Constants.ERROR) + ": " + e.getMessage());
target.add(feedbackPanel);
}
}
@@ -507,7 +507,7 @@ public class ReportModalPage extends Bas
reportTO.getExecutions().remove(taskExecutionTO);
info(getString(Constants.OPERATION_SUCCEEDED));
- } catch (SyncopeClientCompositeException scce) {
+ } catch (SyncopeClientException scce) {
error(scce.getMessage());
}
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Reports.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Reports.java?rev=1536304&r1=1536303&r2=1536304&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Reports.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Reports.java Mon Oct 28 10:24:47 2013
@@ -29,7 +29,7 @@ import org.apache.syncope.common.to.Repo
import org.apache.syncope.common.types.AuditElements.Category;
import org.apache.syncope.common.types.AuditElements.Result;
import org.apache.syncope.common.types.AuditLoggerName;
-import org.apache.syncope.common.validation.SyncopeClientCompositeException;
+import org.apache.syncope.common.validation.SyncopeClientException;
import org.apache.syncope.console.commons.Constants;
import org.apache.syncope.console.commons.PreferenceManager;
import org.apache.syncope.console.commons.SortableDataProviderComparator;
@@ -173,7 +173,7 @@ public class Reports extends BasePage {
try {
reportRestClient.startExecution(reportTO.getId());
getSession().info(getString(Constants.OPERATION_SUCCEEDED));
- } catch (SyncopeClientCompositeException scce) {
+ } catch (SyncopeClientException scce) {
error(scce.getMessage());
}
@@ -191,7 +191,7 @@ public class Reports extends BasePage {
try {
reportRestClient.delete(reportTO.getId());
info(getString(Constants.OPERATION_SUCCEEDED));
- } catch (SyncopeClientCompositeException scce) {
+ } catch (SyncopeClientException scce) {
error(scce.getMessage());
}
target.add(reportContainer);
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Resources.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Resources.java?rev=1536304&r1=1536303&r2=1536304&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Resources.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Resources.java Mon Oct 28 10:24:47 2013
@@ -27,7 +27,7 @@ import org.apache.syncope.common.to.Conn
import org.apache.syncope.common.to.ResourceTO;
import org.apache.syncope.common.to.RoleTO;
import org.apache.syncope.common.to.UserTO;
-import org.apache.syncope.common.validation.SyncopeClientCompositeException;
+import org.apache.syncope.common.validation.SyncopeClientException;
import org.apache.syncope.console.commons.Constants;
import org.apache.syncope.console.commons.PreferenceManager;
import org.apache.syncope.console.commons.SortableDataProviderComparator;
@@ -320,8 +320,8 @@ public class Resources extends BasePage
resourceRestClient.delete(resourceTO.getName());
info(getString(Constants.OPERATION_SUCCEEDED));
- } catch (SyncopeClientCompositeException e) {
- error(getString(Constants.ERROR) + ":" + e.getMessage());
+ } catch (SyncopeClientException e) {
+ error(getString(Constants.ERROR) + ": " + e.getMessage());
LOG.error("While deleting resource " + resourceTO.getName(), e);
}
@@ -475,8 +475,8 @@ public class Resources extends BasePage
try {
connectorRestClient.delete(connectorTO.getId());
info(getString(Constants.OPERATION_SUCCEEDED));
- } catch (SyncopeClientCompositeException e) {
- error(getString(Constants.ERROR) + ":" + e.getMessage());
+ } catch (SyncopeClientException e) {
+ error(getString(Constants.ERROR) + ": " + e.getMessage());
LOG.error("While deleting connector " + connectorTO.getId(), e);
}
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/RoleModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/RoleModalPage.java?rev=1536304&r1=1536303&r2=1536304&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/RoleModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/RoleModalPage.java Mon Oct 28 10:24:47 2013
@@ -109,7 +109,7 @@ public class RoleModalPage extends BaseM
closeAction(target, form);
} catch (Exception e) {
- error(getString(Constants.ERROR) + ":" + e.getMessage());
+ error(getString(Constants.ERROR) + ": " + e.getMessage());
target.add(feedbackPanel);
}
}
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SchemaModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SchemaModalPage.java?rev=1536304&r1=1536303&r2=1536304&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SchemaModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SchemaModalPage.java Mon Oct 28 10:24:47 2013
@@ -30,7 +30,7 @@ import org.apache.syncope.common.Syncope
import org.apache.syncope.common.to.SchemaTO;
import org.apache.syncope.common.types.AttributableType;
import org.apache.syncope.common.types.AttributeSchemaType;
-import org.apache.syncope.common.validation.SyncopeClientCompositeException;
+import org.apache.syncope.common.validation.SyncopeClientException;
import org.apache.syncope.console.commons.Constants;
import org.apache.syncope.console.commons.JexlHelpUtil;
import org.apache.syncope.console.wicket.markup.html.form.AjaxCheckBoxPanel;
@@ -252,8 +252,8 @@ public class SchemaModalPage extends Abs
}
window.close(target);
- } catch (SyncopeClientCompositeException e) {
- error(getString(Constants.ERROR) + ":" + e.getMessage());
+ } catch (SyncopeClientException e) {
+ error(getString(Constants.ERROR) + ": " + e.getMessage());
target.add(feedbackPanel);
}
}
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/StatusModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/StatusModalPage.java?rev=1536304&r1=1536303&r2=1536304&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/StatusModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/StatusModalPage.java Mon Oct 28 10:24:47 2013
@@ -135,7 +135,7 @@ public class StatusModalPage<T extends A
window.close(target);
} catch (Exception e) {
LOG.error("Error enabling resources", e);
- error(getString(Constants.ERROR) + ":" + e.getMessage());
+ error(getString(Constants.ERROR) + ": " + e.getMessage());
target.add(feedbackPanel);
}
}
@@ -158,7 +158,7 @@ public class StatusModalPage<T extends A
window.close(target);
} catch (Exception e) {
LOG.error("Error disabling resources", e);
- error(getString(Constants.ERROR) + ":" + e.getMessage());
+ error(getString(Constants.ERROR) + ": " + e.getMessage());
target.add(feedbackPanel);
}
}
@@ -184,7 +184,7 @@ public class StatusModalPage<T extends A
window.close(target);
} catch (Exception e) {
LOG.error("Error unlinkink resources", e);
- error(getString(Constants.ERROR) + ":" + e.getMessage());
+ error(getString(Constants.ERROR) + ": " + e.getMessage());
target.add(feedbackPanel);
}
}
@@ -210,7 +210,7 @@ public class StatusModalPage<T extends A
window.close(target);
} catch (Exception e) {
LOG.error("Error de-provisioning user", e);
- error(getString(Constants.ERROR) + ":" + e.getMessage());
+ error(getString(Constants.ERROR) + ": " + e.getMessage());
target.add(feedbackPanel);
}
}
@@ -236,7 +236,7 @@ public class StatusModalPage<T extends A
window.close(target);
} catch (Exception e) {
LOG.error("Error unassigning resources", e);
- error(getString(Constants.ERROR) + ":" + e.getMessage());
+ error(getString(Constants.ERROR) + ": " + e.getMessage());
target.add(feedbackPanel);
}
}
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/TaskModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/TaskModalPage.java?rev=1536304&r1=1536303&r2=1536304&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/TaskModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/TaskModalPage.java Mon Oct 28 10:24:47 2013
@@ -28,7 +28,7 @@ import org.apache.syncope.common.to.Sche
import org.apache.syncope.common.to.SyncTaskTO;
import org.apache.syncope.common.to.TaskExecTO;
import org.apache.syncope.common.to.AbstractTaskTO;
-import org.apache.syncope.common.validation.SyncopeClientCompositeException;
+import org.apache.syncope.common.validation.SyncopeClientException;
import org.apache.syncope.console.commons.Constants;
import org.apache.syncope.console.commons.SortableDataProviderComparator;
import org.apache.syncope.console.wicket.extensions.markup.html.repeater.data.table.ActionColumn;
@@ -150,7 +150,7 @@ public abstract class TaskModalPage exte
taskTO.getExecutions().remove(taskExecutionTO);
info(getString(Constants.OPERATION_SUCCEEDED));
- } catch (SyncopeClientCompositeException scce) {
+ } catch (SyncopeClientException scce) {
error(scce.getMessage());
}
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Todo.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Todo.java?rev=1536304&r1=1536303&r2=1536304&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Todo.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Todo.java Mon Oct 28 10:24:47 2013
@@ -26,7 +26,7 @@ import org.apache.commons.lang3.StringUt
import org.apache.syncope.common.to.UserRequestTO;
import org.apache.syncope.common.to.WorkflowFormTO;
import org.apache.syncope.common.types.UserRequestType;
-import org.apache.syncope.common.validation.SyncopeClientCompositeException;
+import org.apache.syncope.common.validation.SyncopeClientException;
import org.apache.syncope.console.SyncopeSession;
import org.apache.syncope.console.commons.Constants;
import org.apache.syncope.console.commons.PreferenceManager;
@@ -144,8 +144,8 @@ public class Todo extends BasePage {
try {
approvalRestClient.claimForm(formTO.getTaskId());
info(getString(Constants.OPERATION_SUCCEEDED));
- } catch (SyncopeClientCompositeException scee) {
- error(getString(Constants.ERROR) + ":" + scee.getMessage());
+ } catch (SyncopeClientException scee) {
+ error(getString(Constants.ERROR) + ": " + scee.getMessage());
}
target.add(feedbackPanel);
target.add(approvalContainer);
@@ -259,8 +259,8 @@ public class Todo extends BasePage {
try {
userRequestRestClient.claim(model.getObject().getId());
info(getString(Constants.OPERATION_SUCCEEDED));
- } catch (SyncopeClientCompositeException scee) {
- error(getString(Constants.ERROR) + ":" + scee.getMessage());
+ } catch (SyncopeClientException scee) {
+ error(getString(Constants.ERROR) + ": " + scee.getMessage());
}
target.add(feedbackPanel);
target.add(userRequestContainer);
@@ -299,7 +299,7 @@ public class Todo extends BasePage {
public void onClick(final AjaxRequestTarget target) {
try {
userRequestRestClient.executeDelete(model.getObject().getId());
- } catch (SyncopeClientCompositeException e) {
+ } catch (SyncopeClientException e) {
LOG.error("While deleting an user", e);
error(e.getMessage());
return;
@@ -323,7 +323,7 @@ public class Todo extends BasePage {
public void onClick(final AjaxRequestTarget target) {
try {
userRequestRestClient.delete(request.getId());
- } catch (SyncopeClientCompositeException e) {
+ } catch (SyncopeClientException e) {
LOG.error("While deleting an user request", e);
error(e.getMessage());
return;
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java?rev=1536304&r1=1536303&r2=1536304&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java Mon Oct 28 10:24:47 2013
@@ -194,7 +194,7 @@ public abstract class UserModalPage exte
closeAction(target, form);
} catch (Exception e) {
LOG.error("While creating or updating user", e);
- error(getString(Constants.ERROR) + ":" + e.getMessage());
+ error(getString(Constants.ERROR) + ": " + e.getMessage());
target.add(feedbackPanel);
}
}
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/VirtualSchemaModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/VirtualSchemaModalPage.java?rev=1536304&r1=1536303&r2=1536304&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/VirtualSchemaModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/VirtualSchemaModalPage.java Mon Oct 28 10:24:47 2013
@@ -21,7 +21,7 @@ package org.apache.syncope.console.pages
import org.apache.syncope.common.AbstractBaseBean;
import org.apache.syncope.common.to.VirSchemaTO;
import org.apache.syncope.common.types.AttributableType;
-import org.apache.syncope.common.validation.SyncopeClientCompositeException;
+import org.apache.syncope.common.validation.SyncopeClientException;
import org.apache.syncope.console.commons.Constants;
import org.apache.syncope.console.wicket.markup.html.form.AjaxCheckBoxPanel;
import org.apache.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel;
@@ -86,8 +86,8 @@ public class VirtualSchemaModalPage exte
}
window.close(target);
- } catch (SyncopeClientCompositeException e) {
- error(getString(Constants.ERROR) + ":" + e.getMessage());
+ } catch (SyncopeClientException e) {
+ error(getString(Constants.ERROR) + ": " + e.getMessage());
target.add(feedbackPanel);
}
}
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/NotificationTasks.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/NotificationTasks.java?rev=1536304&r1=1536303&r2=1536304&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/NotificationTasks.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/NotificationTasks.java Mon Oct 28 10:24:47 2013
@@ -22,7 +22,7 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.syncope.common.to.NotificationTaskTO;
import org.apache.syncope.common.to.AbstractTaskTO;
-import org.apache.syncope.common.validation.SyncopeClientCompositeException;
+import org.apache.syncope.common.validation.SyncopeClientException;
import org.apache.syncope.console.commons.Constants;
import org.apache.syncope.console.pages.NotificationTaskModalPage;
import org.apache.syncope.console.pages.Tasks;
@@ -131,7 +131,7 @@ public class NotificationTasks extends A
try {
restClient.startExecution(taskTO.getId(), false);
getSession().info(getString(Constants.OPERATION_SUCCEEDED));
- } catch (SyncopeClientCompositeException scce) {
+ } catch (SyncopeClientException scce) {
error(scce.getMessage());
}
@@ -149,7 +149,7 @@ public class NotificationTasks extends A
try {
restClient.delete(taskTO.getId(), NotificationTaskTO.class);
info(getString(Constants.OPERATION_SUCCEEDED));
- } catch (SyncopeClientCompositeException scce) {
+ } catch (SyncopeClientException scce) {
error(scce.getMessage());
}
target.add(container);
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PoliciesPanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PoliciesPanel.java?rev=1536304&r1=1536303&r2=1536304&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PoliciesPanel.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PoliciesPanel.java Mon Oct 28 10:24:47 2013
@@ -27,7 +27,7 @@ import org.apache.syncope.common.to.Pass
import org.apache.syncope.common.to.AbstractPolicyTO;
import org.apache.syncope.common.to.SyncPolicyTO;
import org.apache.syncope.common.types.PolicyType;
-import org.apache.syncope.common.validation.SyncopeClientCompositeException;
+import org.apache.syncope.common.validation.SyncopeClientException;
import org.apache.syncope.console.commons.Constants;
import org.apache.syncope.console.commons.PreferenceManager;
import org.apache.syncope.console.commons.SortableDataProviderComparator;
@@ -182,7 +182,7 @@ public class PoliciesPanel extends Panel
policyRestClient.delete(accountPolicyTO.getId(), accountPolicyTO.getClass());
info(getString(Constants.OPERATION_SUCCEEDED));
- } catch (SyncopeClientCompositeException e) {
+ } catch (SyncopeClientException e) {
error(getString(Constants.OPERATION_ERROR));
LOG.error("While deleting resource {}({})", new Object[]{accountPolicyTO.getId(),
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PropagationTasks.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PropagationTasks.java?rev=1536304&r1=1536303&r2=1536304&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PropagationTasks.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PropagationTasks.java Mon Oct 28 10:24:47 2013
@@ -22,7 +22,7 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.syncope.common.to.PropagationTaskTO;
import org.apache.syncope.common.to.AbstractTaskTO;
-import org.apache.syncope.common.validation.SyncopeClientCompositeException;
+import org.apache.syncope.common.validation.SyncopeClientException;
import org.apache.syncope.console.commons.Constants;
import org.apache.syncope.console.pages.PropagationTaskModalPage;
import org.apache.syncope.console.pages.Tasks;
@@ -152,7 +152,7 @@ public class PropagationTasks extends Ab
try {
restClient.startExecution(taskTO.getId(), false);
getSession().info(getString(Constants.OPERATION_SUCCEEDED));
- } catch (SyncopeClientCompositeException scce) {
+ } catch (SyncopeClientException scce) {
error(scce.getMessage());
}
@@ -170,7 +170,7 @@ public class PropagationTasks extends Ab
try {
restClient.delete(taskTO.getId(), PropagationTaskTO.class);
info(getString(Constants.OPERATION_SUCCEEDED));
- } catch (SyncopeClientCompositeException scce) {
+ } catch (SyncopeClientException scce) {
error(scce.getMessage());
}
target.add(container);
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleSearchResultPanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleSearchResultPanel.java?rev=1536304&r1=1536303&r2=1536304&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleSearchResultPanel.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleSearchResultPanel.java Mon Oct 28 10:24:47 2013
@@ -25,7 +25,7 @@ import java.util.List;
import org.apache.syncope.common.search.NodeCond;
import org.apache.syncope.common.to.AbstractAttributableTO;
import org.apache.syncope.common.to.RoleTO;
-import org.apache.syncope.common.validation.SyncopeClientCompositeException;
+import org.apache.syncope.common.validation.SyncopeClientException;
import org.apache.syncope.console.commons.Constants;
import org.apache.syncope.console.pages.ResultStatusModalPage;
import org.apache.syncope.console.pages.RoleModalPage;
@@ -150,7 +150,7 @@ public class RoleSearchResultPanel exten
});
editmodal.show(target);
- } catch (SyncopeClientCompositeException scce) {
+ } catch (SyncopeClientException scce) {
error(getString(Constants.OPERATION_ERROR) + ": " + scce.getMessage());
target.add(feedbackPanel);
}
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleSummaryPanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleSummaryPanel.java?rev=1536304&r1=1536303&r2=1536304&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleSummaryPanel.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleSummaryPanel.java Mon Oct 28 10:24:47 2013
@@ -20,7 +20,7 @@ package org.apache.syncope.console.pages
import java.io.Serializable;
import org.apache.syncope.common.to.RoleTO;
-import org.apache.syncope.common.validation.SyncopeClientCompositeException;
+import org.apache.syncope.common.validation.SyncopeClientException;
import org.apache.syncope.console.rest.RoleRestClient;
import org.apache.syncope.console.wicket.markup.html.tree.TreeActionLinkPanel;
import org.apache.wicket.PageReference;
@@ -95,7 +95,7 @@ public class RoleSummaryPanel extends Pa
} else {
try {
this.selectedNode = restClient.read(builder.selectedNodeId);
- } catch (SyncopeClientCompositeException e) {
+ } catch (SyncopeClientException e) {
LOG.error("Could not read {}", builder.selectedNodeId, e);
this.selectedNode = null;
builder.selectedNodeId = null;
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/SchedTasks.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/SchedTasks.java?rev=1536304&r1=1536303&r2=1536304&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/SchedTasks.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/SchedTasks.java Mon Oct 28 10:24:47 2013
@@ -22,7 +22,7 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.syncope.common.to.SchedTaskTO;
import org.apache.syncope.common.to.AbstractTaskTO;
-import org.apache.syncope.common.validation.SyncopeClientCompositeException;
+import org.apache.syncope.common.validation.SyncopeClientException;
import org.apache.syncope.console.commons.Constants;
import org.apache.syncope.console.pages.SchedTaskModalPage;
import org.apache.syncope.console.pages.Tasks;
@@ -141,7 +141,7 @@ public class SchedTasks extends Abstract
try {
restClient.startExecution(taskTO.getId(), false);
getSession().info(getString(Constants.OPERATION_SUCCEEDED));
- } catch (SyncopeClientCompositeException scce) {
+ } catch (SyncopeClientException scce) {
error(scce.getMessage());
}
@@ -159,7 +159,7 @@ public class SchedTasks extends Abstract
try {
restClient.startExecution(taskTO.getId(), true);
getSession().info(getString(Constants.OPERATION_SUCCEEDED));
- } catch (SyncopeClientCompositeException scce) {
+ } catch (SyncopeClientException scce) {
error(scce.getMessage());
}
@@ -177,7 +177,7 @@ public class SchedTasks extends Abstract
try {
restClient.delete(taskTO.getId(), SchedTaskTO.class);
info(getString(Constants.OPERATION_SUCCEEDED));
- } catch (SyncopeClientCompositeException scce) {
+ } catch (SyncopeClientException scce) {
error(scce.getMessage());
}
target.add(container);
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/SyncTasks.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/SyncTasks.java?rev=1536304&r1=1536303&r2=1536304&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/SyncTasks.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/SyncTasks.java Mon Oct 28 10:24:47 2013
@@ -22,7 +22,7 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.syncope.common.to.SyncTaskTO;
import org.apache.syncope.common.to.AbstractTaskTO;
-import org.apache.syncope.common.validation.SyncopeClientCompositeException;
+import org.apache.syncope.common.validation.SyncopeClientException;
import org.apache.syncope.console.commons.Constants;
import org.apache.syncope.console.pages.RoleTemplateModalPage;
import org.apache.syncope.console.pages.SyncTaskModalPage;
@@ -185,7 +185,7 @@ public class SyncTasks extends AbstractT
try {
restClient.startExecution(taskTO.getId(), false);
getSession().info(getString(Constants.OPERATION_SUCCEEDED));
- } catch (SyncopeClientCompositeException scce) {
+ } catch (SyncopeClientException scce) {
error(scce.getMessage());
}
@@ -203,7 +203,7 @@ public class SyncTasks extends AbstractT
try {
restClient.startExecution(taskTO.getId(), true);
getSession().info(getString(Constants.OPERATION_SUCCEEDED));
- } catch (SyncopeClientCompositeException scce) {
+ } catch (SyncopeClientException scce) {
error(scce.getMessage());
}
@@ -221,7 +221,7 @@ public class SyncTasks extends AbstractT
try {
restClient.delete(taskTO.getId(), SyncTaskTO.class);
info(getString(Constants.OPERATION_SUCCEEDED));
- } catch (SyncopeClientCompositeException scce) {
+ } catch (SyncopeClientException scce) {
error(scce.getMessage());
}
target.add(container);
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/UserSearchResultPanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/UserSearchResultPanel.java?rev=1536304&r1=1536303&r2=1536304&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/UserSearchResultPanel.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/UserSearchResultPanel.java Mon Oct 28 10:24:47 2013
@@ -29,7 +29,7 @@ import org.apache.syncope.common.to.Abst
import org.apache.syncope.common.to.UserTO;
import org.apache.syncope.common.types.AttributableType;
import org.apache.syncope.common.types.SchemaType;
-import org.apache.syncope.common.validation.SyncopeClientCompositeException;
+import org.apache.syncope.common.validation.SyncopeClientException;
import org.apache.syncope.console.commons.Constants;
import org.apache.syncope.console.pages.DisplayAttributesModalPage;
import org.apache.syncope.console.pages.EditUserModalPage;
@@ -227,7 +227,7 @@ public class UserSearchResultPanel exten
});
editmodal.show(target);
- } catch (SyncopeClientCompositeException scce) {
+ } catch (SyncopeClientException scce) {
error(getString(Constants.OPERATION_ERROR) + ": " + scce.getMessage());
target.add(feedbackPanel);
}