syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject svn commit: r1615909 [8/12] - in /syncope/branches/1_2_X: archetype/src/main/resources/ archetype/src/main/resources/archetype-resources/console/ archetype/src/main/resources/archetype-resources/core/ build-tools/src/main/resources/ client/src/main/jav...
Date Tue, 05 Aug 2014 11:18:14 GMT
Modified: syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/AttributableType.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/AttributableType.java?rev=1615909&r1=1615908&r2=1615909&view=diff
==============================================================================
--- syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/AttributableType.java (original)
+++ syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/AttributableType.java Tue Aug  5 11:18:11 2014
@@ -1,31 +1,31 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.syncope.common.types;
-
-import javax.xml.bind.annotation.XmlEnum;
-
-@XmlEnum
-public enum AttributableType {
-
-    USER,
-    ROLE,
-    MEMBERSHIP,
-    CONFIGURATION;
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.syncope.common.types;
+
+import javax.xml.bind.annotation.XmlEnum;
+
+@XmlEnum
+public enum AttributableType {
+
+    USER,
+    ROLE,
+    MEMBERSHIP,
+    CONFIGURATION;
+
+}

Modified: syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/AttributeSchemaType.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/AttributeSchemaType.java?rev=1615909&r1=1615908&r2=1615909&view=diff
==============================================================================
--- syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/AttributeSchemaType.java (original)
+++ syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/AttributeSchemaType.java Tue Aug  5 11:18:11 2014
@@ -1,51 +1,51 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.syncope.common.types;
-
-import java.util.Date;
-import javax.xml.bind.annotation.XmlEnum;
-
-@XmlEnum
-public enum AttributeSchemaType {
-
-    String(String.class),
-    Long(Long.class),
-    Double(Double.class),
-    Boolean(Boolean.class),
-    Date(Date.class),
-    Enum(Enum.class),
-    Encrypted(byte[].class),
-    Binary(byte[].class);
-
-    final private Class<?> type;
-
-    AttributeSchemaType(final Class<?> type) {
-        this.type = type;
-    }
-
-    public Class<?> getType() {
-        return type;
-    }
-
-    public boolean isConversionPatternNeeded() {
-        return this == AttributeSchemaType.Date
-                || this == AttributeSchemaType.Double
-                || this == AttributeSchemaType.Long;
-    }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.syncope.common.types;
+
+import java.util.Date;
+import javax.xml.bind.annotation.XmlEnum;
+
+@XmlEnum
+public enum AttributeSchemaType {
+
+    String(String.class),
+    Long(Long.class),
+    Double(Double.class),
+    Boolean(Boolean.class),
+    Date(Date.class),
+    Enum(Enum.class),
+    Encrypted(byte[].class),
+    Binary(byte[].class);
+
+    final private Class<?> type;
+
+    AttributeSchemaType(final Class<?> type) {
+        this.type = type;
+    }
+
+    public Class<?> getType() {
+        return type;
+    }
+
+    public boolean isConversionPatternNeeded() {
+        return this == AttributeSchemaType.Date
+                || this == AttributeSchemaType.Double
+                || this == AttributeSchemaType.Long;
+    }
+}

Modified: syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/AuditElements.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/AuditElements.java?rev=1615909&r1=1615908&r2=1615909&view=diff
==============================================================================
--- syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/AuditElements.java (original)
+++ syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/AuditElements.java Tue Aug  5 11:18:11 2014
@@ -1,61 +1,61 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.syncope.common.types;
-
-import java.io.Serializable;
-import javax.xml.bind.annotation.XmlEnum;
-import org.apache.commons.lang3.StringUtils;
-
-public final class AuditElements implements Serializable {
-
-    private static final long serialVersionUID = -4385059255522273254L;
-
-    private AuditElements() {
-    }
-
-    @XmlEnum
-    public enum EventCategoryType {
-
-        REST(StringUtils.EMPTY),
-        TASK(StringUtils.EMPTY),
-        PROPAGATION("PropagationTask"),
-        SYNCHRONIZATION("SyncTask"),
-        PUSH("PushTask"),
-        CUSTOM(StringUtils.EMPTY);
-
-        private final String value;
-
-        EventCategoryType(final String value) {
-            this.value = value;
-        }
-
-        @Override
-        public String toString() {
-            return value;
-        }
-    }
-
-    @XmlEnum
-    public enum Result {
-
-        SUCCESS,
-        FAILURE
-
-    }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.syncope.common.types;
+
+import java.io.Serializable;
+import javax.xml.bind.annotation.XmlEnum;
+import org.apache.commons.lang3.StringUtils;
+
+public final class AuditElements implements Serializable {
+
+    private static final long serialVersionUID = -4385059255522273254L;
+
+    private AuditElements() {
+    }
+
+    @XmlEnum
+    public enum EventCategoryType {
+
+        REST(StringUtils.EMPTY),
+        TASK(StringUtils.EMPTY),
+        PROPAGATION("PropagationTask"),
+        SYNCHRONIZATION("SyncTask"),
+        PUSH("PushTask"),
+        CUSTOM(StringUtils.EMPTY);
+
+        private final String value;
+
+        EventCategoryType(final String value) {
+            this.value = value;
+        }
+
+        @Override
+        public String toString() {
+            return value;
+        }
+    }
+
+    @XmlEnum
+    public enum Result {
+
+        SUCCESS,
+        FAILURE
+
+    }
+}

Modified: syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/AuditLoggerName.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/AuditLoggerName.java?rev=1615909&r1=1615908&r2=1615909&view=diff
==============================================================================
--- syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/AuditLoggerName.java (original)
+++ syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/AuditLoggerName.java Tue Aug  5 11:18:11 2014
@@ -1,110 +1,110 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.syncope.common.types;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import java.text.ParseException;
-import java.util.Map;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.syncope.common.AbstractBaseBean;
-import org.apache.syncope.common.to.EventCategoryTO;
-import org.apache.syncope.common.types.AuditElements.Result;
-import org.apache.syncope.common.util.LoggerEventUtils;
-
-public class AuditLoggerName extends AbstractBaseBean {
-
-    private static final long serialVersionUID = -647989486671786839L;
-
-    private final AuditElements.EventCategoryType type;
-
-    private final String category;
-
-    private final String subcategory;
-
-    private final String event;
-
-    private final Result result;
-
-    @JsonCreator
-    public AuditLoggerName(
-            @JsonProperty("type") final AuditElements.EventCategoryType type,
-            @JsonProperty("category") final String category,
-            @JsonProperty("subcategory") final String subcategory,
-            @JsonProperty("event") final String event,
-            @JsonProperty("result") final Result result)
-            throws IllegalArgumentException {
-
-        this.type = type == null ? AuditElements.EventCategoryType.CUSTOM : type;
-        this.category = category;
-        this.subcategory = subcategory;
-        this.event = event;
-        this.result = result == null ? Result.SUCCESS : result;
-    }
-
-    public AuditElements.EventCategoryType getType() {
-        return type;
-    }
-
-    public String getEvent() {
-        return event;
-    }
-
-    public String getCategory() {
-        return category;
-    }
-
-    public Result getResult() {
-        return result;
-    }
-
-    public String getSubcategory() {
-        return subcategory;
-    }
-
-    public String toLoggerName() {
-        return new StringBuilder().append(
-                LoggerType.AUDIT.getPrefix()).append('.').append(
-                        LoggerEventUtils.buildEvent(type, category, subcategory, event, result)).toString();
-    }
-
-    @SuppressWarnings("unchecked")
-    public static AuditLoggerName fromLoggerName(final String loggerName)
-            throws IllegalArgumentException, ParseException {
-
-        if (StringUtils.isBlank(loggerName)) {
-            throw new IllegalArgumentException("Null value not permitted");
-        }
-
-        if (!loggerName.startsWith(LoggerType.AUDIT.getPrefix())) {
-            throw new ParseException("Audit logger name must start with " + LoggerType.AUDIT.getPrefix(), 0);
-        }
-
-        final Map.Entry<EventCategoryTO, Result> eventCategory = LoggerEventUtils.parseEventCategory(
-                loggerName.replaceAll(LoggerType.AUDIT.getPrefix() + ".", ""));
-
-        return new AuditLoggerName(
-                eventCategory.getKey().getType(),
-                eventCategory.getKey().getCategory(),
-                eventCategory.getKey().getSubcategory(),
-                eventCategory.getKey().getEvents().isEmpty()
-                ? StringUtils.EMPTY : eventCategory.getKey().getEvents().iterator().next(),
-                eventCategory.getValue());
-    }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.syncope.common.types;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.text.ParseException;
+import java.util.Map;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.syncope.common.AbstractBaseBean;
+import org.apache.syncope.common.to.EventCategoryTO;
+import org.apache.syncope.common.types.AuditElements.Result;
+import org.apache.syncope.common.util.LoggerEventUtils;
+
+public class AuditLoggerName extends AbstractBaseBean {
+
+    private static final long serialVersionUID = -647989486671786839L;
+
+    private final AuditElements.EventCategoryType type;
+
+    private final String category;
+
+    private final String subcategory;
+
+    private final String event;
+
+    private final Result result;
+
+    @JsonCreator
+    public AuditLoggerName(
+            @JsonProperty("type") final AuditElements.EventCategoryType type,
+            @JsonProperty("category") final String category,
+            @JsonProperty("subcategory") final String subcategory,
+            @JsonProperty("event") final String event,
+            @JsonProperty("result") final Result result)
+            throws IllegalArgumentException {
+
+        this.type = type == null ? AuditElements.EventCategoryType.CUSTOM : type;
+        this.category = category;
+        this.subcategory = subcategory;
+        this.event = event;
+        this.result = result == null ? Result.SUCCESS : result;
+    }
+
+    public AuditElements.EventCategoryType getType() {
+        return type;
+    }
+
+    public String getEvent() {
+        return event;
+    }
+
+    public String getCategory() {
+        return category;
+    }
+
+    public Result getResult() {
+        return result;
+    }
+
+    public String getSubcategory() {
+        return subcategory;
+    }
+
+    public String toLoggerName() {
+        return new StringBuilder().append(
+                LoggerType.AUDIT.getPrefix()).append('.').append(
+                        LoggerEventUtils.buildEvent(type, category, subcategory, event, result)).toString();
+    }
+
+    @SuppressWarnings("unchecked")
+    public static AuditLoggerName fromLoggerName(final String loggerName)
+            throws IllegalArgumentException, ParseException {
+
+        if (StringUtils.isBlank(loggerName)) {
+            throw new IllegalArgumentException("Null value not permitted");
+        }
+
+        if (!loggerName.startsWith(LoggerType.AUDIT.getPrefix())) {
+            throw new ParseException("Audit logger name must start with " + LoggerType.AUDIT.getPrefix(), 0);
+        }
+
+        final Map.Entry<EventCategoryTO, Result> eventCategory = LoggerEventUtils.parseEventCategory(
+                loggerName.replaceAll(LoggerType.AUDIT.getPrefix() + ".", ""));
+
+        return new AuditLoggerName(
+                eventCategory.getKey().getType(),
+                eventCategory.getKey().getCategory(),
+                eventCategory.getKey().getSubcategory(),
+                eventCategory.getKey().getEvents().isEmpty()
+                ? StringUtils.EMPTY : eventCategory.getKey().getEvents().iterator().next(),
+                eventCategory.getValue());
+    }
+}

Modified: syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/CipherAlgorithm.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/CipherAlgorithm.java?rev=1615909&r1=1615908&r2=1615909&view=diff
==============================================================================
--- syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/CipherAlgorithm.java (original)
+++ syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/CipherAlgorithm.java Tue Aug  5 11:18:11 2014
@@ -1,54 +1,54 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.syncope.common.types;
-
-import javax.xml.bind.annotation.XmlEnum;
-
-@XmlEnum
-public enum CipherAlgorithm {
-
-    SHA("SHA-1", false),
-    SHA1("SHA-1", false),
-    SHA256("SHA-256", false),
-    SHA512("SHA-512", false),
-    AES("AES", true),
-    SMD5("S-MD5", false),
-    SSHA("S-SHA-1", false),
-    SSHA1("S-SHA-1", false),
-    SSHA256("S-SHA-256", false),
-    SSHA512("S-SHA-512", false),
-    BCRYPT("BCRYPT", false);
-
-    final private String algorithm;
-
-    final private boolean invertible;
-
-    CipherAlgorithm(final String algorithm, final boolean invertible) {
-        this.algorithm = algorithm;
-        this.invertible = invertible;
-    }
-
-    public String getAlgorithm() {
-        return algorithm;
-    }
-
-    public boolean isInvertible() {
-        return invertible;
-    }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.syncope.common.types;
+
+import javax.xml.bind.annotation.XmlEnum;
+
+@XmlEnum
+public enum CipherAlgorithm {
+
+    SHA("SHA-1", false),
+    SHA1("SHA-1", false),
+    SHA256("SHA-256", false),
+    SHA512("SHA-512", false),
+    AES("AES", true),
+    SMD5("S-MD5", false),
+    SSHA("S-SHA-1", false),
+    SSHA1("S-SHA-1", false),
+    SSHA256("S-SHA-256", false),
+    SSHA512("S-SHA-512", false),
+    BCRYPT("BCRYPT", false);
+
+    final private String algorithm;
+
+    final private boolean invertible;
+
+    CipherAlgorithm(final String algorithm, final boolean invertible) {
+        this.algorithm = algorithm;
+        this.invertible = invertible;
+    }
+
+    public String getAlgorithm() {
+        return algorithm;
+    }
+
+    public boolean isInvertible() {
+        return invertible;
+    }
+}

Modified: syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/ClientExceptionType.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/ClientExceptionType.java?rev=1615909&r1=1615908&r2=1615909&view=diff
==============================================================================
--- syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/ClientExceptionType.java (original)
+++ syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/ClientExceptionType.java Tue Aug  5 11:18:11 2014
@@ -1,105 +1,105 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.syncope.common.types;
-
-import javax.ws.rs.core.Response;
-
-public enum ClientExceptionType {
-
-    AssociatedResources(Response.Status.BAD_REQUEST),
-    Composite(Response.Status.BAD_REQUEST),
-    ConcurrentModification(Response.Status.PRECONDITION_FAILED),
-    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),
-    InvalidPolicy(Response.Status.BAD_REQUEST),
-    InvalidSyncopeRole(Response.Status.BAD_REQUEST),
-    InvalidReportExec(Response.Status.BAD_REQUEST),
-    InvalidRoles(Response.Status.BAD_REQUEST),
-    InvalidSchemaDefinition(Response.Status.BAD_REQUEST),
-    InvalidSearchExpression(Response.Status.BAD_REQUEST),
-    InvalidPageOrSize(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),
-    InvalidCSchema(Response.Status.BAD_REQUEST),
-    InvalidSchemaMapping(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),
-    InvalidPushTask(Response.Status.BAD_REQUEST),
-    InvalidValues(Response.Status.BAD_REQUEST),
-    NotFound(Response.Status.NOT_FOUND),
-    RejectedUserCreate(Response.Status.BAD_REQUEST),
-    RequiredValuesMissing(Response.Status.BAD_REQUEST),
-    RESTValidation(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 ClientExceptionType fromHeaderValue(final String exceptionTypeHeaderValue) {
-        ClientExceptionType result = null;
-        for (ClientExceptionType type : values()) {
-            if (exceptionTypeHeaderValue.equals(type.getHeaderValue())) {
-                result = type;
-            }
-        }
-
-        if (result == null) {
-            throw new IllegalArgumentException("Unexpected header value: " + exceptionTypeHeaderValue);
-        }
-
-        return result;
-    }
-
-    public String getHeaderValue() {
-        return name();
-    }
-
-    public String getInfoHeaderValue(final String value) {
-        return getHeaderValue() + ":" + value;
-    }
-
-    public Response.Status getResponseStatus() {
-        return responseStatus;
-    }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.syncope.common.types;
+
+import javax.ws.rs.core.Response;
+
+public enum ClientExceptionType {
+
+    AssociatedResources(Response.Status.BAD_REQUEST),
+    Composite(Response.Status.BAD_REQUEST),
+    ConcurrentModification(Response.Status.PRECONDITION_FAILED),
+    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),
+    InvalidPolicy(Response.Status.BAD_REQUEST),
+    InvalidSyncopeRole(Response.Status.BAD_REQUEST),
+    InvalidReportExec(Response.Status.BAD_REQUEST),
+    InvalidRoles(Response.Status.BAD_REQUEST),
+    InvalidSchemaDefinition(Response.Status.BAD_REQUEST),
+    InvalidSearchExpression(Response.Status.BAD_REQUEST),
+    InvalidPageOrSize(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),
+    InvalidCSchema(Response.Status.BAD_REQUEST),
+    InvalidSchemaMapping(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),
+    InvalidPushTask(Response.Status.BAD_REQUEST),
+    InvalidValues(Response.Status.BAD_REQUEST),
+    NotFound(Response.Status.NOT_FOUND),
+    RejectedUserCreate(Response.Status.BAD_REQUEST),
+    RequiredValuesMissing(Response.Status.BAD_REQUEST),
+    RESTValidation(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 ClientExceptionType fromHeaderValue(final String exceptionTypeHeaderValue) {
+        ClientExceptionType result = null;
+        for (ClientExceptionType type : values()) {
+            if (exceptionTypeHeaderValue.equals(type.getHeaderValue())) {
+                result = type;
+            }
+        }
+
+        if (result == null) {
+            throw new IllegalArgumentException("Unexpected header value: " + exceptionTypeHeaderValue);
+        }
+
+        return result;
+    }
+
+    public String getHeaderValue() {
+        return name();
+    }
+
+    public String getInfoHeaderValue(final String value) {
+        return getHeaderValue() + ":" + value;
+    }
+
+    public Response.Status getResponseStatus() {
+        return responseStatus;
+    }
+
+}

Modified: syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/ConflictResolutionAction.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/ConflictResolutionAction.java?rev=1615909&r1=1615908&r2=1615909&view=diff
==============================================================================
--- syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/ConflictResolutionAction.java (original)
+++ syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/ConflictResolutionAction.java Tue Aug  5 11:18:11 2014
@@ -1,38 +1,38 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.syncope.common.types;
-
-import javax.xml.bind.annotation.XmlEnum;
-
-@XmlEnum
-public enum ConflictResolutionAction {
-
-    // ignore sync
-    IGNORE,
-    // sync first matcgh
-    FIRSTMATCH,
-    // sync last match
-    LASTMATCH,
-    // sync all
-    ALL;
-
-    public static ConflictResolutionAction fromString(final String value) {
-        return ConflictResolutionAction.valueOf(value.toUpperCase());
-    }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.syncope.common.types;
+
+import javax.xml.bind.annotation.XmlEnum;
+
+@XmlEnum
+public enum ConflictResolutionAction {
+
+    // ignore sync
+    IGNORE,
+    // sync first matcgh
+    FIRSTMATCH,
+    // sync last match
+    LASTMATCH,
+    // sync all
+    ALL;
+
+    public static ConflictResolutionAction fromString(final String value) {
+        return ConflictResolutionAction.valueOf(value.toUpperCase());
+    }
+}

Modified: syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/ConnConfPropSchema.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/ConnConfPropSchema.java?rev=1615909&r1=1615908&r2=1615909&view=diff
==============================================================================
--- syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/ConnConfPropSchema.java (original)
+++ syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/ConnConfPropSchema.java Tue Aug  5 11:18:11 2014
@@ -1,125 +1,125 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.syncope.common.types;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.apache.syncope.common.AbstractBaseBean;
-
-@XmlRootElement
-@XmlType
-public class ConnConfPropSchema extends AbstractBaseBean implements Comparable<ConnConfPropSchema> {
-
-    private static final long serialVersionUID = -1976365781005801296L;
-
-    private String name;
-
-    private String displayName;
-
-    private String helpMessage;
-
-    private String type;
-
-    private boolean required;
-
-    private int order;
-
-    private boolean confidential;
-
-    private final List<Object> defaultValues = new ArrayList<Object>();
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(final String name) {
-        this.name = name;
-    }
-
-    public boolean isRequired() {
-        return required;
-    }
-
-    public void setRequired(final boolean required) {
-        this.required = required;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(final String type) {
-        this.type = type;
-    }
-
-    public String getDisplayName() {
-        return displayName;
-    }
-
-    public void setDisplayName(final String displayName) {
-        this.displayName = displayName;
-    }
-
-    public String getHelpMessage() {
-        return helpMessage;
-    }
-
-    public void setHelpMessage(final String helpMessage) {
-        this.helpMessage = helpMessage;
-    }
-
-    public int getOrder() {
-        return order;
-    }
-
-    public void setOrder(final int order) {
-        this.order = order;
-    }
-
-    public boolean isConfidential() {
-        return confidential;
-    }
-
-    public void setConfidential(final boolean confidential) {
-        this.confidential = confidential;
-    }
-
-    @XmlElementWrapper(name = "defaultValues")
-    @XmlElement(name = "defaultValue")
-    @JsonProperty("defaultValues")
-    public List<Object> getDefaultValues() {
-        return defaultValues;
-    }
-
-    @Override
-    public int compareTo(final ConnConfPropSchema connConfPropSchema) {
-        if (this.getOrder() > connConfPropSchema.getOrder()) {
-            return 1;
-        } else if (this.getOrder() < connConfPropSchema.getOrder()) {
-            return -1;
-        } else {
-            return 0;
-        }
-    }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.syncope.common.types;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+import org.apache.syncope.common.AbstractBaseBean;
+
+@XmlRootElement
+@XmlType
+public class ConnConfPropSchema extends AbstractBaseBean implements Comparable<ConnConfPropSchema> {
+
+    private static final long serialVersionUID = -1976365781005801296L;
+
+    private String name;
+
+    private String displayName;
+
+    private String helpMessage;
+
+    private String type;
+
+    private boolean required;
+
+    private int order;
+
+    private boolean confidential;
+
+    private final List<Object> defaultValues = new ArrayList<Object>();
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(final String name) {
+        this.name = name;
+    }
+
+    public boolean isRequired() {
+        return required;
+    }
+
+    public void setRequired(final boolean required) {
+        this.required = required;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(final String type) {
+        this.type = type;
+    }
+
+    public String getDisplayName() {
+        return displayName;
+    }
+
+    public void setDisplayName(final String displayName) {
+        this.displayName = displayName;
+    }
+
+    public String getHelpMessage() {
+        return helpMessage;
+    }
+
+    public void setHelpMessage(final String helpMessage) {
+        this.helpMessage = helpMessage;
+    }
+
+    public int getOrder() {
+        return order;
+    }
+
+    public void setOrder(final int order) {
+        this.order = order;
+    }
+
+    public boolean isConfidential() {
+        return confidential;
+    }
+
+    public void setConfidential(final boolean confidential) {
+        this.confidential = confidential;
+    }
+
+    @XmlElementWrapper(name = "defaultValues")
+    @XmlElement(name = "defaultValue")
+    @JsonProperty("defaultValues")
+    public List<Object> getDefaultValues() {
+        return defaultValues;
+    }
+
+    @Override
+    public int compareTo(final ConnConfPropSchema connConfPropSchema) {
+        if (this.getOrder() > connConfPropSchema.getOrder()) {
+            return 1;
+        } else if (this.getOrder() < connConfPropSchema.getOrder()) {
+            return -1;
+        } else {
+            return 0;
+        }
+    }
+}

Modified: syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/ConnConfProperty.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/ConnConfProperty.java?rev=1615909&r1=1615908&r2=1615909&view=diff
==============================================================================
--- syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/ConnConfProperty.java (original)
+++ syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/ConnConfProperty.java Tue Aug  5 11:18:11 2014
@@ -1,69 +1,69 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.syncope.common.types;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.apache.syncope.common.AbstractBaseBean;
-
-@XmlRootElement
-@XmlType
-public class ConnConfProperty extends AbstractBaseBean implements Comparable<ConnConfProperty> {
-
-    private static final long serialVersionUID = -8391413960221862238L;
-
-    private ConnConfPropSchema schema;
-
-    private final List<Object> values = new ArrayList<Object>();
-
-    private boolean overridable;
-
-    public ConnConfPropSchema getSchema() {
-        return schema;
-    }
-
-    public void setSchema(final ConnConfPropSchema schema) {
-        this.schema = schema;
-    }
-
-    @XmlElementWrapper(name = "values")
-    @XmlElement(name = "value")
-    @JsonProperty("values")
-    public List<Object> getValues() {
-        return values;
-    }
-
-    public boolean isOverridable() {
-        return overridable;
-    }
-
-    public void setOverridable(final boolean overridable) {
-        this.overridable = overridable;
-    }
-
-    @Override
-    public int compareTo(final ConnConfProperty connConfProperty) {
-        return this.getSchema().compareTo(connConfProperty.getSchema());
-    }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.syncope.common.types;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+import org.apache.syncope.common.AbstractBaseBean;
+
+@XmlRootElement
+@XmlType
+public class ConnConfProperty extends AbstractBaseBean implements Comparable<ConnConfProperty> {
+
+    private static final long serialVersionUID = -8391413960221862238L;
+
+    private ConnConfPropSchema schema;
+
+    private final List<Object> values = new ArrayList<Object>();
+
+    private boolean overridable;
+
+    public ConnConfPropSchema getSchema() {
+        return schema;
+    }
+
+    public void setSchema(final ConnConfPropSchema schema) {
+        this.schema = schema;
+    }
+
+    @XmlElementWrapper(name = "values")
+    @XmlElement(name = "value")
+    @JsonProperty("values")
+    public List<Object> getValues() {
+        return values;
+    }
+
+    public boolean isOverridable() {
+        return overridable;
+    }
+
+    public void setOverridable(final boolean overridable) {
+        this.overridable = overridable;
+    }
+
+    @Override
+    public int compareTo(final ConnConfProperty connConfProperty) {
+        return this.getSchema().compareTo(connConfProperty.getSchema());
+    }
+}

Modified: syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/ConnParameterType.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/ConnParameterType.java?rev=1615909&r1=1615908&r2=1615909&view=diff
==============================================================================
--- syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/ConnParameterType.java (original)
+++ syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/ConnParameterType.java Tue Aug  5 11:18:11 2014
@@ -1,41 +1,41 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.syncope.common.types;
-
-import javax.xml.bind.annotation.XmlEnum;
-
-@XmlEnum
-public enum ConnParameterType {
-
-    /**
-     * Connector parameter type:
-     */
-    OVERRIDABLE(true),
-    NOT_OVERRIDABLE(false);
-
-    private boolean overridable;
-
-    ConnParameterType(final boolean overridable) {
-        this.overridable = overridable;
-    }
-
-    public boolean getOverridable() {
-        return overridable;
-    }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.syncope.common.types;
+
+import javax.xml.bind.annotation.XmlEnum;
+
+@XmlEnum
+public enum ConnParameterType {
+
+    /**
+     * Connector parameter type:
+     */
+    OVERRIDABLE(true),
+    NOT_OVERRIDABLE(false);
+
+    private boolean overridable;
+
+    ConnParameterType(final boolean overridable) {
+        this.overridable = overridable;
+    }
+
+    public boolean getOverridable() {
+        return overridable;
+    }
+}

Modified: syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/ConnectorCapability.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/ConnectorCapability.java?rev=1615909&r1=1615908&r2=1615909&view=diff
==============================================================================
--- syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/ConnectorCapability.java (original)
+++ syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/ConnectorCapability.java Tue Aug  5 11:18:11 2014
@@ -1,39 +1,39 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.syncope.common.types;
-
-import javax.xml.bind.annotation.XmlEnum;
-
-/**
- * Enum of all possible capabilities that a connector instance can expose.
- */
-@XmlEnum
-public enum ConnectorCapability {
-
-    AUTHENTICATE,
-    ONE_PHASE_CREATE,
-    TWO_PHASES_CREATE,
-    ONE_PHASE_UPDATE,
-    TWO_PHASES_UPDATE,
-    ONE_PHASE_DELETE,
-    TWO_PHASES_DELETE,
-    SEARCH,
-    SYNC;
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.syncope.common.types;
+
+import javax.xml.bind.annotation.XmlEnum;
+
+/**
+ * Enum of all possible capabilities that a connector instance can expose.
+ */
+@XmlEnum
+public enum ConnectorCapability {
+
+    AUTHENTICATE,
+    ONE_PHASE_CREATE,
+    TWO_PHASES_CREATE,
+    ONE_PHASE_UPDATE,
+    TWO_PHASES_UPDATE,
+    ONE_PHASE_DELETE,
+    TWO_PHASES_DELETE,
+    SEARCH,
+    SYNC;
+
+}

Modified: syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/EntityViolationType.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/EntityViolationType.java?rev=1615909&r1=1615908&r2=1615909&view=diff
==============================================================================
--- syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/EntityViolationType.java (original)
+++ syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/EntityViolationType.java Tue Aug  5 11:18:11 2014
@@ -1,72 +1,72 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.syncope.common.types;
-
-import javax.xml.bind.annotation.XmlEnum;
-
-@XmlEnum
-public enum EntityViolationType {
-
-    Standard(""),
-    InvalidAccountPolicy("org.apache.syncope.core.validation.accountpolicy"),
-    InvalidConnInstanceLocation("org.apache.syncope.core.validation.conninstance.location"),
-    InvalidConnPoolConf("org.apache.syncope.core.validation.conninstance.poolConf"),
-    InvalidMapping("org.apache.syncope.core.validation.mapping"),
-    InvalidMSchema("org.apache.syncope.core.validation.attrvalue.mSchema"),
-    InvalidMDerSchema("org.apache.syncope.core.validation.attrvalue.mDerSchema"),
-    InvalidMVirSchema("org.apache.syncope.core.validation.attrvalue.mVirSchema"),
-    InvalidName("org.apache.syncope.core.validation.name"),
-    InvalidNotification("org.apache.syncope.core.validation.notification"),
-    InvalidPassword("org.apache.syncope.core.validation.syncopeuser.password"),
-    InvalidPasswordPolicy("org.apache.syncope.core.validation.passwordpolicy"),
-    InvalidPolicy("org.apache.syncope.core.validation.policy"),
-    InvalidPropagationTask("org.apache.syncope.core.validation.propagationtask"),
-    InvalidRSchema("org.apache.syncope.core.validation.attrvalue.rSchema"),
-    InvalidRDerSchema("org.apache.syncope.core.validation.attrvalue.rDerSchema"),
-    InvalidRVirSchema("org.apache.syncope.core.validation.attrvalue.rVirSchema"),
-    InvalidReport("org.apache.syncope.core.validation.report"),
-    InvalidResource("org.apache.syncope.core.validation.externalresource"),
-    InvalidRoleOwner("org.apache.syncope.core.validation.syncoperole.owner"),
-    InvalidSchemaEncrypted("org.apache.syncope.core.validation.schema.encrypted"),
-    InvalidSchemaEnum("org.apache.syncope.core.validation.schema.enum"),
-    InvalidSchemaMultivalueUnique("org.apache.syncope.core.validation.schema.multivalueUnique"),
-    InvalidSchedTask("org.apache.syncope.core.validation.schedtask"),
-    InvalidSyncTask("org.apache.syncope.core.validation.synctask"),
-    InvalidSyncPolicy("org.apache.syncope.core.validation.syncpolicy"),
-    InvalidUSchema("org.apache.syncope.core.validation.attrvalue.uSchema"),
-    InvalidUDerSchema("org.apache.syncope.core.validation.attrvalue.derSchema"),
-    InvalidUVirSchema("org.apache.syncope.core.validation.attrvalue.uVirSchema"),
-    InvalidUsername("org.apache.syncope.core.validation.syncopeuser.username"),
-    InvalidValueList("org.apache.syncope.core.validation.attr.valueList"),
-    MoreThanOneNonNull("org.apache.syncope.core.validation.attrvalue.moreThanOneNonNull");
-
-    private String message;
-
-    EntityViolationType(final String message) {
-        this.message = message;
-    }
-
-    public void setMessage(final String message) {
-        this.message = message;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.syncope.common.types;
+
+import javax.xml.bind.annotation.XmlEnum;
+
+@XmlEnum
+public enum EntityViolationType {
+
+    Standard(""),
+    InvalidAccountPolicy("org.apache.syncope.core.validation.accountpolicy"),
+    InvalidConnInstanceLocation("org.apache.syncope.core.validation.conninstance.location"),
+    InvalidConnPoolConf("org.apache.syncope.core.validation.conninstance.poolConf"),
+    InvalidMapping("org.apache.syncope.core.validation.mapping"),
+    InvalidMSchema("org.apache.syncope.core.validation.attrvalue.mSchema"),
+    InvalidMDerSchema("org.apache.syncope.core.validation.attrvalue.mDerSchema"),
+    InvalidMVirSchema("org.apache.syncope.core.validation.attrvalue.mVirSchema"),
+    InvalidName("org.apache.syncope.core.validation.name"),
+    InvalidNotification("org.apache.syncope.core.validation.notification"),
+    InvalidPassword("org.apache.syncope.core.validation.syncopeuser.password"),
+    InvalidPasswordPolicy("org.apache.syncope.core.validation.passwordpolicy"),
+    InvalidPolicy("org.apache.syncope.core.validation.policy"),
+    InvalidPropagationTask("org.apache.syncope.core.validation.propagationtask"),
+    InvalidRSchema("org.apache.syncope.core.validation.attrvalue.rSchema"),
+    InvalidRDerSchema("org.apache.syncope.core.validation.attrvalue.rDerSchema"),
+    InvalidRVirSchema("org.apache.syncope.core.validation.attrvalue.rVirSchema"),
+    InvalidReport("org.apache.syncope.core.validation.report"),
+    InvalidResource("org.apache.syncope.core.validation.externalresource"),
+    InvalidRoleOwner("org.apache.syncope.core.validation.syncoperole.owner"),
+    InvalidSchemaEncrypted("org.apache.syncope.core.validation.schema.encrypted"),
+    InvalidSchemaEnum("org.apache.syncope.core.validation.schema.enum"),
+    InvalidSchemaMultivalueUnique("org.apache.syncope.core.validation.schema.multivalueUnique"),
+    InvalidSchedTask("org.apache.syncope.core.validation.schedtask"),
+    InvalidSyncTask("org.apache.syncope.core.validation.synctask"),
+    InvalidSyncPolicy("org.apache.syncope.core.validation.syncpolicy"),
+    InvalidUSchema("org.apache.syncope.core.validation.attrvalue.uSchema"),
+    InvalidUDerSchema("org.apache.syncope.core.validation.attrvalue.derSchema"),
+    InvalidUVirSchema("org.apache.syncope.core.validation.attrvalue.uVirSchema"),
+    InvalidUsername("org.apache.syncope.core.validation.syncopeuser.username"),
+    InvalidValueList("org.apache.syncope.core.validation.attr.valueList"),
+    MoreThanOneNonNull("org.apache.syncope.core.validation.attrvalue.moreThanOneNonNull");
+
+    private String message;
+
+    EntityViolationType(final String message) {
+        this.message = message;
+    }
+
+    public void setMessage(final String message) {
+        this.message = message;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+}

Modified: syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/IntMappingType.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/IntMappingType.java?rev=1615909&r1=1615908&r2=1615909&view=diff
==============================================================================
--- syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/IntMappingType.java (original)
+++ syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/IntMappingType.java Tue Aug  5 11:18:11 2014
@@ -1,201 +1,201 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.syncope.common.types;
-
-import java.util.Collection;
-import java.util.EnumSet;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlEnum;
-
-/**
- * Internal attribute mapping type.
- */
-@XmlEnum
-public enum IntMappingType {
-
-    // Unfortunately enum type cannot be extended ...
-    // -------------------------
-    // User attribute types (the same in UserMappingType)
-    // -------------------------
-    UserSchema(AttributableType.USER),
-    UserDerivedSchema(AttributableType.USER),
-    UserVirtualSchema(AttributableType.USER),
-    UserId(AttributableType.USER),
-    Username(AttributableType.USER),
-    Password(AttributableType.USER),
-    // -------------------------
-    // Role attribute types (the same in RoleMappingType)
-    // -------------------------
-    RoleSchema(AttributableType.ROLE),
-    RoleDerivedSchema(AttributableType.ROLE),
-    RoleVirtualSchema(AttributableType.ROLE),
-    RoleId(AttributableType.ROLE),
-    RoleName(AttributableType.ROLE),
-    RoleOwnerSchema(AttributableType.ROLE),
-    // -------------------------
-    // Membership attribute types (the same in MembershipMappingType)
-    // -------------------------
-    MembershipSchema(AttributableType.MEMBERSHIP),
-    MembershipDerivedSchema(AttributableType.MEMBERSHIP),
-    MembershipVirtualSchema(AttributableType.MEMBERSHIP),
-    MembershipId(AttributableType.MEMBERSHIP);
-
-    private AttributableType attributableType;
-
-    private IntMappingType(final AttributableType attributableType) {
-        this.attributableType = attributableType;
-    }
-
-    public AttributableType getAttributableType() {
-        return attributableType;
-    }
-
-    /**
-     * Get attribute types for a certain attributable type.
-     *
-     * @param attributableType attributable type
-     * @param toBeFiltered types to be filtered from the result.
-     * @return set of attribute types.
-     */
-    public static Set<IntMappingType> getAttributeTypes(
-            final AttributableType attributableType, final Collection<IntMappingType> toBeFiltered) {
-
-        final Set<IntMappingType> res = getAttributeTypes(attributableType);
-        res.removeAll(toBeFiltered);
-
-        return res;
-    }
-
-    /**
-     * Get attribute types for a certain attributable type.
-     *
-     * @param attributableType attributable type
-     * @return set of attribute types.
-     */
-    public static Set<IntMappingType> getAttributeTypes(final AttributableType attributableType) {
-        final EnumSet<?> enumset;
-
-        switch (attributableType) {
-            case ROLE:
-                enumset = EnumSet.allOf(RoleMappingType.class);
-                break;
-
-            case MEMBERSHIP:
-                enumset = EnumSet.allOf(MembershipMappingType.class);
-                break;
-
-            case USER:
-            default:
-                enumset = EnumSet.allOf(UserMappingType.class);
-        }
-
-        final Set<IntMappingType> result = new HashSet<IntMappingType>(enumset.size());
-        for (Object obj : enumset) {
-            result.add(IntMappingType.valueOf(obj.toString()));
-        }
-
-        return result;
-    }
-
-    public static Set<IntMappingType> getEmbedded() {
-        return EnumSet.of(
-                IntMappingType.UserId, IntMappingType.Username, IntMappingType.Password,
-                IntMappingType.RoleId, IntMappingType.RoleName, IntMappingType.RoleOwnerSchema,
-                IntMappingType.MembershipId);
-    }
-
-    /**
-     * Check if attribute type belongs to the specified attributable type set.
-     *
-     * @param attributableType attributable type.
-     * @param type attribute type.
-     * @return true if attribute type belongs to the specified attributable type set.
-     */
-    public static boolean contains(final AttributableType attributableType, final String type) {
-        switch (attributableType) {
-            case ROLE:
-                for (RoleMappingType c : RoleMappingType.values()) {
-                    if (c.name().equals(type)) {
-                        return true;
-                    }
-                }
-                break;
-
-            case MEMBERSHIP:
-                for (MembershipMappingType c : MembershipMappingType.values()) {
-                    if (c.name().equals(type)) {
-                        return true;
-                    }
-                }
-                break;
-
-            case USER:
-            default:
-                for (UserMappingType c : UserMappingType.values()) {
-                    if (c.name().equals(type)) {
-                        return true;
-                    }
-                }
-                break;
-        }
-        return false;
-    }
-
-    /**
-     * User attribute types.
-     */
-    private enum UserMappingType {
-
-        UserSchema,
-        UserDerivedSchema,
-        UserVirtualSchema,
-        UserId,
-        Username,
-        Password;
-
-    }
-
-    /**
-     * Role attribute types.
-     */
-    private enum RoleMappingType {
-
-        RoleSchema,
-        RoleDerivedSchema,
-        RoleVirtualSchema,
-        RoleId,
-        RoleName,
-        RoleOwnerSchema;
-
-    }
-
-    /**
-     * Membership attribute types.
-     */
-    private enum MembershipMappingType {
-
-        MembershipSchema,
-        MembershipDerivedSchema,
-        MembershipVirtualSchema,
-        MembershipId;
-
-    }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.syncope.common.types;
+
+import java.util.Collection;
+import java.util.EnumSet;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.xml.bind.annotation.XmlEnum;
+
+/**
+ * Internal attribute mapping type.
+ */
+@XmlEnum
+public enum IntMappingType {
+
+    // Unfortunately enum type cannot be extended ...
+    // -------------------------
+    // User attribute types (the same in UserMappingType)
+    // -------------------------
+    UserSchema(AttributableType.USER),
+    UserDerivedSchema(AttributableType.USER),
+    UserVirtualSchema(AttributableType.USER),
+    UserId(AttributableType.USER),
+    Username(AttributableType.USER),
+    Password(AttributableType.USER),
+    // -------------------------
+    // Role attribute types (the same in RoleMappingType)
+    // -------------------------
+    RoleSchema(AttributableType.ROLE),
+    RoleDerivedSchema(AttributableType.ROLE),
+    RoleVirtualSchema(AttributableType.ROLE),
+    RoleId(AttributableType.ROLE),
+    RoleName(AttributableType.ROLE),
+    RoleOwnerSchema(AttributableType.ROLE),
+    // -------------------------
+    // Membership attribute types (the same in MembershipMappingType)
+    // -------------------------
+    MembershipSchema(AttributableType.MEMBERSHIP),
+    MembershipDerivedSchema(AttributableType.MEMBERSHIP),
+    MembershipVirtualSchema(AttributableType.MEMBERSHIP),
+    MembershipId(AttributableType.MEMBERSHIP);
+
+    private AttributableType attributableType;
+
+    private IntMappingType(final AttributableType attributableType) {
+        this.attributableType = attributableType;
+    }
+
+    public AttributableType getAttributableType() {
+        return attributableType;
+    }
+
+    /**
+     * Get attribute types for a certain attributable type.
+     *
+     * @param attributableType attributable type
+     * @param toBeFiltered types to be filtered from the result.
+     * @return set of attribute types.
+     */
+    public static Set<IntMappingType> getAttributeTypes(
+            final AttributableType attributableType, final Collection<IntMappingType> toBeFiltered) {
+
+        final Set<IntMappingType> res = getAttributeTypes(attributableType);
+        res.removeAll(toBeFiltered);
+
+        return res;
+    }
+
+    /**
+     * Get attribute types for a certain attributable type.
+     *
+     * @param attributableType attributable type
+     * @return set of attribute types.
+     */
+    public static Set<IntMappingType> getAttributeTypes(final AttributableType attributableType) {
+        final EnumSet<?> enumset;
+
+        switch (attributableType) {
+            case ROLE:
+                enumset = EnumSet.allOf(RoleMappingType.class);
+                break;
+
+            case MEMBERSHIP:
+                enumset = EnumSet.allOf(MembershipMappingType.class);
+                break;
+
+            case USER:
+            default:
+                enumset = EnumSet.allOf(UserMappingType.class);
+        }
+
+        final Set<IntMappingType> result = new HashSet<IntMappingType>(enumset.size());
+        for (Object obj : enumset) {
+            result.add(IntMappingType.valueOf(obj.toString()));
+        }
+
+        return result;
+    }
+
+    public static Set<IntMappingType> getEmbedded() {
+        return EnumSet.of(
+                IntMappingType.UserId, IntMappingType.Username, IntMappingType.Password,
+                IntMappingType.RoleId, IntMappingType.RoleName, IntMappingType.RoleOwnerSchema,
+                IntMappingType.MembershipId);
+    }
+
+    /**
+     * Check if attribute type belongs to the specified attributable type set.
+     *
+     * @param attributableType attributable type.
+     * @param type attribute type.
+     * @return true if attribute type belongs to the specified attributable type set.
+     */
+    public static boolean contains(final AttributableType attributableType, final String type) {
+        switch (attributableType) {
+            case ROLE:
+                for (RoleMappingType c : RoleMappingType.values()) {
+                    if (c.name().equals(type)) {
+                        return true;
+                    }
+                }
+                break;
+
+            case MEMBERSHIP:
+                for (MembershipMappingType c : MembershipMappingType.values()) {
+                    if (c.name().equals(type)) {
+                        return true;
+                    }
+                }
+                break;
+
+            case USER:
+            default:
+                for (UserMappingType c : UserMappingType.values()) {
+                    if (c.name().equals(type)) {
+                        return true;
+                    }
+                }
+                break;
+        }
+        return false;
+    }
+
+    /**
+     * User attribute types.
+     */
+    private enum UserMappingType {
+
+        UserSchema,
+        UserDerivedSchema,
+        UserVirtualSchema,
+        UserId,
+        Username,
+        Password;
+
+    }
+
+    /**
+     * Role attribute types.
+     */
+    private enum RoleMappingType {
+
+        RoleSchema,
+        RoleDerivedSchema,
+        RoleVirtualSchema,
+        RoleId,
+        RoleName,
+        RoleOwnerSchema;
+
+    }
+
+    /**
+     * Membership attribute types.
+     */
+    private enum MembershipMappingType {
+
+        MembershipSchema,
+        MembershipDerivedSchema,
+        MembershipVirtualSchema,
+        MembershipId;
+
+    }
+}

Modified: syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/LoggerLevel.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/LoggerLevel.java?rev=1615909&r1=1615908&r2=1615909&view=diff
==============================================================================
--- syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/LoggerLevel.java (original)
+++ syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/LoggerLevel.java Tue Aug  5 11:18:11 2014
@@ -1,49 +1,49 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.syncope.common.types;
-
-import javax.xml.bind.annotation.XmlEnum;
-import org.apache.logging.log4j.Level;
-
-@XmlEnum
-public enum LoggerLevel {
-
-    OFF(Level.OFF),
-    FATAL(Level.FATAL),
-    ERROR(Level.ERROR),
-    WARN(Level.WARN),
-    INFO(Level.INFO),
-    DEBUG(Level.DEBUG),
-    TRACE(Level.TRACE),
-    ALL(Level.ALL);
-
-    private Level level;
-
-    LoggerLevel(final Level level) {
-        this.level = level;
-    }
-
-    public Level getLevel() {
-        return level;
-    }
-
-    public static LoggerLevel fromLevel(final Level level) {
-        return LoggerLevel.valueOf(level.name());
-    }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.syncope.common.types;
+
+import javax.xml.bind.annotation.XmlEnum;
+import org.apache.logging.log4j.Level;
+
+@XmlEnum
+public enum LoggerLevel {
+
+    OFF(Level.OFF),
+    FATAL(Level.FATAL),
+    ERROR(Level.ERROR),
+    WARN(Level.WARN),
+    INFO(Level.INFO),
+    DEBUG(Level.DEBUG),
+    TRACE(Level.TRACE),
+    ALL(Level.ALL);
+
+    private Level level;
+
+    LoggerLevel(final Level level) {
+        this.level = level;
+    }
+
+    public Level getLevel() {
+        return level;
+    }
+
+    public static LoggerLevel fromLevel(final Level level) {
+        return LoggerLevel.valueOf(level.name());
+    }
+}

Modified: syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/LoggerType.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/LoggerType.java?rev=1615909&r1=1615908&r2=1615909&view=diff
==============================================================================
--- syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/LoggerType.java (original)
+++ syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/LoggerType.java Tue Aug  5 11:18:11 2014
@@ -1,46 +1,46 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.syncope.common.types;
-
-import javax.xml.bind.annotation.XmlEnum;
-
-@XmlEnum
-public enum LoggerType {
-
-    /**
-     * This type describes a common logger used to handle system and application events.
-     */
-    LOG(""),
-    /**
-     * Audit logger only focus on security related events, usually logging how did what and when.
-     * In case of a security incident audit loggers should allow an administrator to recall all
-     * actions a certain user has done.
-     */
-    AUDIT("syncope.audit");
-
-    private String prefix;
-
-    LoggerType(final String prefix) {
-        this.prefix = prefix;
-    }
-
-    public String getPrefix() {
-        return prefix;
-    }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.syncope.common.types;
+
+import javax.xml.bind.annotation.XmlEnum;
+
+@XmlEnum
+public enum LoggerType {
+
+    /**
+     * This type describes a common logger used to handle system and application events.
+     */
+    LOG(""),
+    /**
+     * Audit logger only focus on security related events, usually logging how did what and when.
+     * In case of a security incident audit loggers should allow an administrator to recall all
+     * actions a certain user has done.
+     */
+    AUDIT("syncope.audit");
+
+    private String prefix;
+
+    LoggerType(final String prefix) {
+        this.prefix = prefix;
+    }
+
+    public String getPrefix() {
+        return prefix;
+    }
+}

Modified: syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/MatchingRule.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/MatchingRule.java?rev=1615909&r1=1615908&r2=1615909&view=diff
==============================================================================
--- syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/MatchingRule.java (original)
+++ syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/MatchingRule.java Tue Aug  5 11:18:11 2014
@@ -1,54 +1,54 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.syncope.common.types;
-
-import javax.xml.bind.annotation.XmlEnum;
-
-/**
- * Sync/Push task matching rule.
- */
-@XmlEnum
-public enum MatchingRule {
-
-    /**
-     * Do not perform any action.
-     */
-    IGNORE,
-    /**
-     * Update matching entity.
-     */
-    UPDATE,
-    /**
-     * Delete resource entity.
-     */
-    DEPROVISION,
-    /**
-     * Unlink resource and delete resource entity.
-     */
-    UNASSIGN,
-    /**
-     * Just unlink resource without performing any (de-)provisioning operation.
-     */
-    UNLINK,
-    /**
-     * Just link resource without performing any (de-)provisioning operation.
-     */
-    LINK
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.syncope.common.types;
+
+import javax.xml.bind.annotation.XmlEnum;
+
+/**
+ * Sync/Push task matching rule.
+ */
+@XmlEnum
+public enum MatchingRule {
+
+    /**
+     * Do not perform any action.
+     */
+    IGNORE,
+    /**
+     * Update matching entity.
+     */
+    UPDATE,
+    /**
+     * Delete resource entity.
+     */
+    DEPROVISION,
+    /**
+     * Unlink resource and delete resource entity.
+     */
+    UNASSIGN,
+    /**
+     * Just unlink resource without performing any (de-)provisioning operation.
+     */
+    UNLINK,
+    /**
+     * Just link resource without performing any (de-)provisioning operation.
+     */
+    LINK
+
+}



Mime
View raw message