Author: fmartelli
Date: Fri Apr 26 16:02:05 2013
New Revision: 1476263
URL: http://svn.apache.org/r1476263
Log:
merged from 1.1.X
Modified:
syncope/trunk/ (props changed)
syncope/trunk/common/src/main/java/org/apache/syncope/common/types/EntityViolationType.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/AbstractValidator.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/AttrValidator.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/AttrValueValidator.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/ConnInstanceValidator.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/EntitlementValidator.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/ExternalResourceValidator.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/InvalidEntityException.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/NotificationValidator.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/PolicyValidator.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/PropagationTaskValidator.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/ReportValidator.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/SchedTaskValidator.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/SchemaValidator.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/SyncTaskValidator.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/SyncopeRoleValidator.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/SyncopeUserValidator.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/USchemaValidator.java
syncope/trunk/core/src/main/webapp/syncopeClientError.jsp
Propchange: syncope/trunk/
--
Merged /syncope/branches/1_1_X:r1471506-1476262
Modified:
syncope/trunk/common/src/main/java/org/apache/syncope/common/types/EntityViolationType.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/types/EntityViolationType.java?rev=1476263r1=1476262r2=1476263view=diff
==
---
syncope/trunk/common/src/main/java/org/apache/syncope/common/types/EntityViolationType.java
(original)
+++
syncope/trunk/common/src/main/java/org/apache/syncope/common/types/EntityViolationType.java
Fri Apr 26 16:02:05 2013
@@ -60,14 +60,11 @@ public enum EntityViolationType {
this.message = message;
}
-public void setMessageTemplate(final String message) {
+public void setMessage(final String message) {
this.message = message;
}
-@Override
-public String toString() {
-return this == Standard
-? message
-: super.toString();
+public String getMessage() {
+return message;
}
}
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/AbstractValidator.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/AbstractValidator.java?rev=1476263r1=1476262r2=1476263view=diff
==
---
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/AbstractValidator.java
(original)
+++
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/AbstractValidator.java
Fri Apr 26 16:02:05 2013
@@ -18,6 +18,7 @@
*/
package org.apache.syncope.core.persistence.validation.entity;
+import org.apache.syncope.common.types.EntityViolationType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -28,4 +29,7 @@ public abstract class AbstractValidator
*/
protected static final Logger LOG =
LoggerFactory.getLogger(AbstractValidator.class);
+protected final String getTemplate(final EntityViolationType type, final
String message) {
+return type.name() + ; + message;
+}
}
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/AttrValidator.java
URL: