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 2015/01/12 17:32:21 UTC

[42/52] [abbrv] [partial] syncope git commit: [SYNCOPE-620] Unit tests all in

http://git-wip-us.apache.org/repos/asf/syncope/blob/235f60fa/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/dao/search/EntitlementCond.java
----------------------------------------------------------------------
diff --git a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/dao/search/EntitlementCond.java b/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/dao/search/EntitlementCond.java
deleted file mode 100644
index 809e275..0000000
--- a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/dao/search/EntitlementCond.java
+++ /dev/null
@@ -1,39 +0,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.persistence.api.dao.search;
-
-public class EntitlementCond extends AbstractSearchCond {
-
-    private static final long serialVersionUID = -4077781080368377428L;
-
-    private String expression;
-
-    public String getExpression() {
-        return expression;
-    }
-
-    public void setExpression(final String expression) {
-        this.expression = expression;
-    }
-
-    @Override
-    public boolean isValid() {
-        return expression != null;
-    }
-}

http://git-wip-us.apache.org/repos/asf/syncope/blob/235f60fa/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/dao/search/MembershipCond.java
----------------------------------------------------------------------
diff --git a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/dao/search/MembershipCond.java b/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/dao/search/MembershipCond.java
deleted file mode 100644
index 0036b1b..0000000
--- a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/dao/search/MembershipCond.java
+++ /dev/null
@@ -1,46 +0,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.persistence.api.dao.search;
-
-/**
- * Search condition to be applied when searching for memberships.
- */
-public class MembershipCond extends AbstractSearchCond {
-
-    private static final long serialVersionUID = -728155256293925989L;
-
-    private Long roleId;
-
-    public MembershipCond() {
-        super();
-    }
-
-    public Long getRoleId() {
-        return roleId;
-    }
-
-    public void setRoleId(final Long roleId) {
-        this.roleId = roleId;
-    }
-
-    @Override
-    public final boolean isValid() {
-        return roleId != null;
-    }
-}

http://git-wip-us.apache.org/repos/asf/syncope/blob/235f60fa/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/dao/search/OrderByClause.java
----------------------------------------------------------------------
diff --git a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/dao/search/OrderByClause.java b/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/dao/search/OrderByClause.java
deleted file mode 100644
index 854f75e..0000000
--- a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/dao/search/OrderByClause.java
+++ /dev/null
@@ -1,69 +0,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.persistence.api.dao.search;
-
-import org.apache.commons.lang3.builder.EqualsBuilder;
-import org.apache.commons.lang3.builder.HashCodeBuilder;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-public class OrderByClause {
-
-    public enum Direction {
-
-        ASC,
-        DESC
-
-    }
-
-    private String field;
-
-    private Direction direction;
-
-    public String getField() {
-        return field;
-    }
-
-    public void setField(final String field) {
-        this.field = field;
-    }
-
-    public Direction getDirection() {
-        return direction == null ? Direction.ASC : direction;
-    }
-
-    public void setDirection(final Direction direction) {
-        this.direction = direction;
-    }
-
-    @Override
-    public boolean equals(final Object obj) {
-        return EqualsBuilder.reflectionEquals(this, obj);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
-
-    @Override
-    public String toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.MULTI_LINE_STYLE);
-    }
-}

http://git-wip-us.apache.org/repos/asf/syncope/blob/235f60fa/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/dao/search/ResourceCond.java
----------------------------------------------------------------------
diff --git a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/dao/search/ResourceCond.java b/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/dao/search/ResourceCond.java
deleted file mode 100644
index fb2a08c..0000000
--- a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/dao/search/ResourceCond.java
+++ /dev/null
@@ -1,42 +0,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.persistence.api.dao.search;
-
-/**
- * Search condition to be applied when searching for associated resources.
- */
-public class ResourceCond extends AbstractSearchCond {
-
-    private static final long serialVersionUID = 466054166309460002L;
-
-    private String resourceName;
-
-    public String getResourceName() {
-        return resourceName;
-    }
-
-    public void setResourceName(final String resourceName) {
-        this.resourceName = resourceName;
-    }
-
-    @Override
-    public final boolean isValid() {
-        return resourceName != null;
-    }
-}

http://git-wip-us.apache.org/repos/asf/syncope/blob/235f60fa/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/dao/search/SearchCond.java
----------------------------------------------------------------------
diff --git a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/dao/search/SearchCond.java b/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/dao/search/SearchCond.java
deleted file mode 100644
index 3e9a591..0000000
--- a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/dao/search/SearchCond.java
+++ /dev/null
@@ -1,254 +0,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.persistence.api.dao.search;
-
-import java.util.List;
-
-public class SearchCond extends AbstractSearchCond {
-
-    private static final long serialVersionUID = 661560782247499526L;
-
-    public enum Type {
-
-        LEAF,
-        NOT_LEAF,
-        AND,
-        OR
-
-    }
-
-    private Type type;
-
-    private SubjectCond subjectCond;
-
-    private AttributeCond attributeCond;
-
-    private MembershipCond membershipCond;
-
-    private ResourceCond resourceCond;
-
-    private EntitlementCond entitlementCond;
-
-    private SearchCond leftNodeCond;
-
-    private SearchCond rightNodeCond;
-
-    public static SearchCond getLeafCond(final AttributeCond attributeCond) {
-        SearchCond nodeCond = new SearchCond();
-
-        nodeCond.type = Type.LEAF;
-        if (attributeCond instanceof SubjectCond) {
-            nodeCond.subjectCond = (SubjectCond) attributeCond;
-        } else {
-            nodeCond.attributeCond = attributeCond;
-        }
-
-        return nodeCond;
-    }
-
-    public static SearchCond getLeafCond(final MembershipCond membershipCond) {
-        SearchCond nodeCond = new SearchCond();
-
-        nodeCond.type = Type.LEAF;
-        nodeCond.membershipCond = membershipCond;
-
-        return nodeCond;
-    }
-
-    public static SearchCond getLeafCond(final ResourceCond resourceCond) {
-        SearchCond nodeCond = new SearchCond();
-
-        nodeCond.type = Type.LEAF;
-        nodeCond.resourceCond = resourceCond;
-
-        return nodeCond;
-    }
-
-    public static SearchCond getLeafCond(final EntitlementCond entitlementCond) {
-        SearchCond nodeCond = new SearchCond();
-
-        nodeCond.type = Type.LEAF;
-        nodeCond.entitlementCond = entitlementCond;
-
-        return nodeCond;
-    }
-
-    public static SearchCond getNotLeafCond(final AttributeCond attributeCond) {
-        SearchCond nodeCond = getLeafCond(attributeCond);
-        nodeCond.type = Type.NOT_LEAF;
-        return nodeCond;
-    }
-
-    public static SearchCond getNotLeafCond(final MembershipCond membershipCond) {
-        SearchCond nodeCond = getLeafCond(membershipCond);
-        nodeCond.type = Type.NOT_LEAF;
-        return nodeCond;
-    }
-
-    public static SearchCond getNotLeafCond(final ResourceCond resourceCond) {
-        SearchCond nodeCond = getLeafCond(resourceCond);
-        nodeCond.type = Type.NOT_LEAF;
-        return nodeCond;
-    }
-
-    public static SearchCond getNotLeafCond(final EntitlementCond entitlementCond) {
-        SearchCond nodeCond = getLeafCond(entitlementCond);
-        nodeCond.type = Type.NOT_LEAF;
-        return nodeCond;
-    }
-
-    public static SearchCond getNotLeafCond(final SearchCond nodeCond) {
-        nodeCond.type = Type.NOT_LEAF;
-        return nodeCond;
-    }
-
-    public static SearchCond getAndCond(final SearchCond leftCond, final SearchCond rightCond) {
-        SearchCond nodeCond = new SearchCond();
-
-        nodeCond.type = Type.AND;
-        nodeCond.leftNodeCond = leftCond;
-        nodeCond.rightNodeCond = rightCond;
-
-        return nodeCond;
-    }
-
-    public static SearchCond getAndCond(final List<SearchCond> conditions) {
-        if (conditions.size() > 2) {
-            SearchCond removed = conditions.remove(0);
-            return getAndCond(removed, getAndCond(conditions));
-        } else {
-            return getAndCond(conditions.get(0), conditions.get(1));
-        }
-    }
-
-    public static SearchCond getOrCond(final SearchCond leftCond, final SearchCond rightCond) {
-        SearchCond nodeCond = new SearchCond();
-
-        nodeCond.type = Type.OR;
-        nodeCond.leftNodeCond = leftCond;
-        nodeCond.rightNodeCond = rightCond;
-
-        return nodeCond;
-    }
-
-    public static SearchCond getOrCond(final List<SearchCond> conditions) {
-        if (conditions.size() > 2) {
-            SearchCond removed = conditions.remove(0);
-            return getOrCond(removed, getOrCond(conditions));
-        } else {
-            return getOrCond(conditions.get(0), conditions.get(1));
-        }
-    }
-
-    public SubjectCond getSubjectCond() {
-        return subjectCond;
-    }
-
-    public void setSubjectCond(final SubjectCond subjectCond) {
-        this.subjectCond = subjectCond;
-    }
-
-    public AttributeCond getAttributeCond() {
-        return attributeCond;
-    }
-
-    public void setAttributeCond(final AttributeCond attributeCond) {
-        this.attributeCond = attributeCond;
-    }
-
-    public MembershipCond getMembershipCond() {
-        return membershipCond;
-    }
-
-    public void setMembershipCond(final MembershipCond membershipCond) {
-        this.membershipCond = membershipCond;
-    }
-
-    public ResourceCond getResourceCond() {
-        return resourceCond;
-    }
-
-    public void setResourceCond(final ResourceCond resourceCond) {
-        this.resourceCond = resourceCond;
-    }
-
-    public EntitlementCond getEntitlementCond() {
-        return entitlementCond;
-    }
-
-    public void setEntitlementCond(final EntitlementCond entitlementCond) {
-        this.entitlementCond = entitlementCond;
-    }
-
-    public SearchCond getLeftNodeCond() {
-        return leftNodeCond;
-    }
-
-    public void setLeftNodeCond(final SearchCond leftNodeCond) {
-        this.leftNodeCond = leftNodeCond;
-    }
-
-    public SearchCond getRightNodeCond() {
-        return rightNodeCond;
-    }
-
-    public void setRightNodeCond(final SearchCond rightNodeCond) {
-        this.rightNodeCond = rightNodeCond;
-    }
-
-    public Type getType() {
-        return type;
-    }
-
-    public void setType(final Type type) {
-        this.type = type;
-    }
-
-    public boolean isValid() {
-        boolean isValid = false;
-
-        if (type == null) {
-            return isValid;
-        }
-
-        switch (type) {
-            case LEAF:
-            case NOT_LEAF:
-                isValid = (subjectCond != null || attributeCond != null || membershipCond != null
-                        || resourceCond != null || entitlementCond != null)
-                        && (subjectCond == null || subjectCond.isValid())
-                        && (attributeCond == null || attributeCond.isValid())
-                        && (membershipCond == null || membershipCond.isValid())
-                        && (resourceCond == null || resourceCond.isValid())
-                        && (entitlementCond == null || entitlementCond.isValid());
-                break;
-
-            case AND:
-            case OR:
-                isValid = (leftNodeCond == null || rightNodeCond == null)
-                        ? false
-                        : leftNodeCond.isValid() && rightNodeCond.isValid();
-                break;
-
-            default:
-        }
-
-        return isValid;
-    }
-}

http://git-wip-us.apache.org/repos/asf/syncope/blob/235f60fa/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/dao/search/SubjectCond.java
----------------------------------------------------------------------
diff --git a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/dao/search/SubjectCond.java b/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/dao/search/SubjectCond.java
deleted file mode 100644
index c20b83a..0000000
--- a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/dao/search/SubjectCond.java
+++ /dev/null
@@ -1,34 +0,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.persistence.api.dao.search;
-
-/**
- * Search condition to be applied when comparing bean field values.
- */
-public class SubjectCond extends AttributeCond {
-
-    private static final long serialVersionUID = -1880319220462653955L;
-
-    public SubjectCond() {
-    }
-
-    public SubjectCond(final Type conditionType) {
-        super(conditionType);
-    }
-}

http://git-wip-us.apache.org/repos/asf/syncope/blob/235f60fa/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/AccountPolicy.java
----------------------------------------------------------------------
diff --git a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/AccountPolicy.java b/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/AccountPolicy.java
deleted file mode 100644
index 912c622..0000000
--- a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/AccountPolicy.java
+++ /dev/null
@@ -1,32 +0,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.persistence.api.entity;
-
-import java.util.Set;
-
-public interface AccountPolicy extends Policy {
-
-    boolean addResource(ExternalResource resource);
-
-    boolean removeResource(ExternalResource resource);
-
-    Set<String> getResourceNames();
-
-    Set<? extends ExternalResource> getResources();
-}

http://git-wip-us.apache.org/repos/asf/syncope/blob/235f60fa/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/AnnotatedEntity.java
----------------------------------------------------------------------
diff --git a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/AnnotatedEntity.java b/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/AnnotatedEntity.java
deleted file mode 100644
index 80a610d..0000000
--- a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/AnnotatedEntity.java
+++ /dev/null
@@ -1,40 +0,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.persistence.api.entity;
-
-import java.util.Date;
-
-public interface AnnotatedEntity<KEY> extends Entity<KEY> {
-
-    Date getCreationDate();
-
-    String getCreator();
-
-    Date getLastChangeDate();
-
-    String getLastModifier();
-
-    void setCreationDate(Date creationDate);
-
-    void setCreator(String creator);
-
-    void setLastChangeDate(Date lastChangeDate);
-
-    void setLastModifier(String lastModifier);
-}

http://git-wip-us.apache.org/repos/asf/syncope/blob/235f60fa/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/Attr.java
----------------------------------------------------------------------
diff --git a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/Attr.java b/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/Attr.java
deleted file mode 100644
index bb81373..0000000
--- a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/Attr.java
+++ /dev/null
@@ -1,30 +0,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.persistence.api.entity;
-
-public interface Attr<S extends Schema> extends Entity<Long> {
-
-    Attributable<?, ?, ?> getOwner();
-
-    void setOwner(Attributable<?, ?, ?> owner);
-
-    S getSchema();
-
-    void setSchema(S schema);
-}

http://git-wip-us.apache.org/repos/asf/syncope/blob/235f60fa/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/AttrTemplate.java
----------------------------------------------------------------------
diff --git a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/AttrTemplate.java b/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/AttrTemplate.java
deleted file mode 100644
index c016223..0000000
--- a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/AttrTemplate.java
+++ /dev/null
@@ -1,32 +0,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.persistence.api.entity;
-
-import org.apache.syncope.persistence.api.entity.role.Role;
-
-public interface AttrTemplate<S extends Schema> extends Entity<Long> {
-
-    Role getOwner();
-
-    void setOwner(Role role);
-
-    S getSchema();
-
-    void setSchema(S schema);
-}

http://git-wip-us.apache.org/repos/asf/syncope/blob/235f60fa/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/Attributable.java
----------------------------------------------------------------------
diff --git a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/Attributable.java b/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/Attributable.java
deleted file mode 100644
index 350a524..0000000
--- a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/Attributable.java
+++ /dev/null
@@ -1,48 +0,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.persistence.api.entity;
-
-import java.util.List;
-
-public interface Attributable<P extends PlainAttr, D extends DerAttr, V extends VirAttr> extends AnnotatedEntity<Long> {
-
-    boolean addPlainAttr(P attr);
-
-    boolean addDerAttr(D derAttr);
-
-    boolean addVirAttr(V virAttr);
-
-    boolean removePlainAttr(P attr);
-
-    boolean removeDerAttr(D derAttr);
-
-    boolean removeVirAttr(V virAttr);
-
-    P getPlainAttr(String plainSchemaName);
-
-    List<? extends P> getPlainAttrs();
-
-    D getDerAttr(String derSchemaName);
-
-    List<? extends D> getDerAttrs();
-
-    V getVirAttr(String virSchemaName);
-
-    List<? extends V> getVirAttrs();
-}

http://git-wip-us.apache.org/repos/asf/syncope/blob/235f60fa/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/AttributableUtil.java
----------------------------------------------------------------------
diff --git a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/AttributableUtil.java b/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/AttributableUtil.java
deleted file mode 100644
index 3d12ec9..0000000
--- a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/AttributableUtil.java
+++ /dev/null
@@ -1,91 +0,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.persistence.api.entity;
-
-import java.util.List;
-import org.apache.syncope.common.lib.to.AbstractAttributableTO;
-import org.apache.syncope.common.lib.to.AbstractSubjectTO;
-import org.apache.syncope.common.lib.types.AttributableType;
-import org.apache.syncope.common.lib.types.IntMappingType;
-import org.apache.syncope.common.lib.types.MappingPurpose;
-
-public interface AttributableUtil {
-
-    AttributableType getType();
-
-    <T extends Attributable<?, ?, ?>> Class<T> attributableClass();
-
-    <T extends PlainSchema> Class<T> plainSchemaClass();
-
-    <T extends PlainSchema> T newPlainSchema();
-
-    <T extends PlainAttr> Class<T> plainAttrClass();
-
-    <T extends PlainAttr> T newPlainAttr();
-
-    <T extends PlainAttrValue> Class<T> plainAttrValueClass();
-
-    <T extends PlainAttrValue> T newPlainAttrValue();
-
-    <T extends AttrTemplate<PlainSchema>> Class<T> plainAttrTemplateClass();
-
-    <T extends PlainAttrValue> Class<T> plainAttrUniqueValueClass();
-
-    <T extends PlainAttrValue> T newPlainAttrUniqueValue();
-
-    <T extends DerSchema> Class<T> derSchemaClass();
-
-    <T extends DerSchema> T newDerSchema();
-
-    <T extends DerAttr> Class<T> derAttrClass();
-
-    <T extends DerAttr> T newDerAttr();
-
-    <T extends AttrTemplate<DerSchema>> Class<T> derAttrTemplateClass();
-
-    <T extends VirSchema> Class<T> virSchemaClass();
-
-    <T extends VirSchema> T newVirSchema();
-
-    <T extends VirAttr> Class<T> virAttrClass();
-
-    <T extends VirAttr> T newVirAttr();
-
-    <T extends AttrTemplate<VirSchema>> Class<T> virAttrTemplateClass();
-
-    <T extends MappingItem> T getAccountIdItem(ExternalResource resource);
-
-    String getAccountLink(ExternalResource resource);
-
-    <T extends MappingItem> List<T> getMappingItems(ExternalResource resource, MappingPurpose purpose);
-
-    <T extends MappingItem> List<T> getUidToMappingItems(ExternalResource resource, MappingPurpose purpose);
-
-    IntMappingType intMappingType();
-
-    IntMappingType derIntMappingType();
-
-    IntMappingType virIntMappingType();
-
-    <T extends MappingItem> Class<T> mappingItemClass();
-
-    <T extends AbstractAttributableTO> T newAttributableTO();
-
-    <T extends AbstractSubjectTO> T newSubjectTO();
-}

http://git-wip-us.apache.org/repos/asf/syncope/blob/235f60fa/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/AttributableUtilFactory.java
----------------------------------------------------------------------
diff --git a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/AttributableUtilFactory.java b/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/AttributableUtilFactory.java
deleted file mode 100644
index 1f42c17..0000000
--- a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/AttributableUtilFactory.java
+++ /dev/null
@@ -1,33 +0,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.persistence.api.entity;
-
-import org.apache.syncope.common.lib.types.AttributableType;
-import org.identityconnectors.framework.common.objects.ObjectClass;
-
-public interface AttributableUtilFactory {
-
-    AttributableUtil getInstance(AttributableType type);
-
-    AttributableUtil getInstance(String attributableType);
-
-    AttributableUtil getInstance(ObjectClass objectClass);
-
-    AttributableUtil getInstance(Attributable<?, ?, ?> attributable);
-}

http://git-wip-us.apache.org/repos/asf/syncope/blob/235f60fa/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/ConnInstance.java
----------------------------------------------------------------------
diff --git a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/ConnInstance.java b/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/ConnInstance.java
deleted file mode 100644
index 21d8286..0000000
--- a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/ConnInstance.java
+++ /dev/null
@@ -1,71 +0,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.persistence.api.entity;
-
-import java.util.List;
-import java.util.Set;
-import org.apache.syncope.common.lib.types.ConnConfProperty;
-import org.apache.syncope.common.lib.types.ConnectorCapability;
-
-public interface ConnInstance extends Entity<Long> {
-
-    boolean addCapability(ConnectorCapability capabitily);
-
-    boolean addResource(ExternalResource resource);
-
-    String getBundleName();
-
-    Set<ConnectorCapability> getCapabilities();
-
-    Set<ConnConfProperty> getConfiguration();
-
-    Integer getConnRequestTimeout();
-
-    String getConnectorName();
-
-    String getDisplayName();
-
-    String getLocation();
-
-    ConnPoolConf getPoolConf();
-
-    List<? extends ExternalResource> getResources();
-
-    String getVersion();
-
-    boolean removeCapability(ConnectorCapability capabitily);
-
-    boolean removeResource(ExternalResource resource);
-
-    void setBundleName(String bundleName);
-
-    void setConfiguration(Set<ConnConfProperty> configuration);
-
-    void setConnRequestTimeout(Integer timeout);
-
-    void setConnectorName(String connectorName);
-
-    void setDisplayName(String displayName);
-
-    void setLocation(String location);
-
-    void setPoolConf(ConnPoolConf poolConf);
-
-    void setVersion(String version);
-}

http://git-wip-us.apache.org/repos/asf/syncope/blob/235f60fa/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/ConnPoolConf.java
----------------------------------------------------------------------
diff --git a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/ConnPoolConf.java b/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/ConnPoolConf.java
deleted file mode 100644
index bd86024..0000000
--- a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/ConnPoolConf.java
+++ /dev/null
@@ -1,42 +0,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.persistence.api.entity;
-
-public interface ConnPoolConf {
-
-    Integer getMaxObjects();
-
-    void setMaxObjects(Integer maxObjects);
-
-    Integer getMinIdle();
-
-    void setMinIdle(Integer minIdle);
-
-    Integer getMaxIdle();
-
-    void setMaxIdle(Integer maxIdle);
-
-    Long getMaxWait();
-
-    void setMaxWait(Long maxWait);
-
-    Long getMinEvictableIdleTimeMillis();
-
-    void setMinEvictableIdleTimeMillis(Long minEvictableIdleTimeMillis);
-}

http://git-wip-us.apache.org/repos/asf/syncope/blob/235f60fa/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/DerAttr.java
----------------------------------------------------------------------
diff --git a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/DerAttr.java b/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/DerAttr.java
deleted file mode 100644
index 0494d01..0000000
--- a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/DerAttr.java
+++ /dev/null
@@ -1,26 +0,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.persistence.api.entity;
-
-import java.util.Collection;
-
-public interface DerAttr extends Attr<DerSchema> {
-
-    String getValue(Collection<? extends PlainAttr> attrs);
-}

http://git-wip-us.apache.org/repos/asf/syncope/blob/235f60fa/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/DerSchema.java
----------------------------------------------------------------------
diff --git a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/DerSchema.java b/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/DerSchema.java
deleted file mode 100644
index e8e9e50..0000000
--- a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/DerSchema.java
+++ /dev/null
@@ -1,26 +0,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.persistence.api.entity;
-
-public interface DerSchema extends Schema {
-
-    String getExpression();
-
-    void setExpression(String expression);
-}

http://git-wip-us.apache.org/repos/asf/syncope/blob/235f60fa/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/Entitlement.java
----------------------------------------------------------------------
diff --git a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/Entitlement.java b/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/Entitlement.java
deleted file mode 100644
index 4e6ace9..0000000
--- a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/Entitlement.java
+++ /dev/null
@@ -1,29 +0,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.persistence.api.entity;
-
-public interface Entitlement extends Entity<String> {
-
-    String getDescription();
-
-    void setKey(String key);
-
-    void setDescription(String description);
-
-}

http://git-wip-us.apache.org/repos/asf/syncope/blob/235f60fa/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/Entity.java
----------------------------------------------------------------------
diff --git a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/Entity.java b/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/Entity.java
deleted file mode 100644
index 6c8afbd..0000000
--- a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/Entity.java
+++ /dev/null
@@ -1,26 +0,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.persistence.api.entity;
-
-import java.io.Serializable;
-
-public interface Entity<KEY> extends Serializable {
-
-    KEY getKey();
-}

http://git-wip-us.apache.org/repos/asf/syncope/blob/235f60fa/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/EntityFactory.java
----------------------------------------------------------------------
diff --git a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/EntityFactory.java b/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/EntityFactory.java
deleted file mode 100644
index c36030b..0000000
--- a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/EntityFactory.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.apache.syncope.persistence.api.entity;
-
-/*
- * 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.
- */
-public interface EntityFactory {
-
-    <KEY, T extends Entity<KEY>> T newEntity(Class<T> reference);
-
-    <T extends Policy> T newPolicy(Class<T> reference, boolean global);
-
-    ConnPoolConf newConnPoolConf();
-}

http://git-wip-us.apache.org/repos/asf/syncope/blob/235f60fa/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/Exec.java
----------------------------------------------------------------------
diff --git a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/Exec.java b/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/Exec.java
deleted file mode 100644
index c54729a..0000000
--- a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/Exec.java
+++ /dev/null
@@ -1,45 +0,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.persistence.api.entity;
-
-import java.util.Date;
-
-public interface Exec extends Entity<Long> {
-
-    Date getEndDate();
-
-    String getMessage();
-
-    Date getStartDate();
-
-    String getStatus();
-
-    void setEndDate(Date endDate);
-
-    /**
-     * Set a message for this execution, taking care of replacing every null character with newline.
-     *
-     * @param message the message to set for this execution
-     */
-    void setMessage(String message);
-
-    void setStartDate(Date startDate);
-
-    void setStatus(String status);
-}

http://git-wip-us.apache.org/repos/asf/syncope/blob/235f60fa/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/ExternalResource.java
----------------------------------------------------------------------
diff --git a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/ExternalResource.java b/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/ExternalResource.java
deleted file mode 100644
index 8e55c26..0000000
--- a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/ExternalResource.java
+++ /dev/null
@@ -1,111 +0,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.persistence.api.entity;
-
-import org.apache.syncope.persistence.api.entity.user.UMapping;
-import org.apache.syncope.persistence.api.entity.role.RMapping;
-import java.util.List;
-import java.util.Set;
-import org.apache.syncope.common.lib.types.ConnConfProperty;
-import org.apache.syncope.common.lib.types.PropagationMode;
-import org.apache.syncope.common.lib.types.TraceLevel;
-import org.identityconnectors.framework.common.objects.SyncToken;
-
-public interface ExternalResource extends AnnotatedEntity<String> {
-
-    AccountPolicy getAccountPolicy();
-
-    PasswordPolicy getPasswordPolicy();
-
-    SyncPolicy getSyncPolicy();
-
-    Set<ConnConfProperty> getConnInstanceConfiguration();
-
-    ConnInstance getConnector();
-
-    TraceLevel getCreateTraceLevel();
-
-    TraceLevel getUpdateTraceLevel();
-
-    TraceLevel getDeleteTraceLevel();
-
-    TraceLevel getSyncTraceLevel();
-
-    List<String> getPropagationActionsClassNames();
-
-    PropagationMode getPropagationMode();
-
-    Integer getPropagationPriority();
-
-    UMapping getUmapping();
-
-    RMapping getRmapping();
-
-    SyncToken getUsyncToken();
-
-    String getSerializedUSyncToken();
-
-    SyncToken getRsyncToken();
-
-    String getSerializedRSyncToken();
-
-    boolean isEnforceMandatoryCondition();
-
-    boolean isPropagationPrimary();
-
-    boolean isRandomPwdIfNotProvided();
-
-    void setKey(String name);
-
-    void setAccountPolicy(AccountPolicy accountPolicy);
-
-    void setPasswordPolicy(PasswordPolicy passwordPolicy);
-
-    void setSyncPolicy(SyncPolicy syncPolicy);
-
-    void setConnInstanceConfiguration(Set<ConnConfProperty> properties);
-
-    void setConnector(ConnInstance connector);
-
-    void setCreateTraceLevel(TraceLevel createTraceLevel);
-
-    void setUpdateTraceLevel(TraceLevel updateTraceLevel);
-
-    void setDeleteTraceLevel(TraceLevel deleteTraceLevel);
-
-    void setSyncTraceLevel(TraceLevel syncTraceLevel);
-
-    void setPropagationMode(PropagationMode propagationMode);
-
-    void setPropagationPriority(Integer priority);
-
-    void setUmapping(UMapping umapping);
-
-    void setRmapping(RMapping rmapping);
-
-    void setEnforceMandatoryCondition(boolean enforce);
-
-    void setPropagationPrimary(boolean condition);
-
-    void setRandomPwdIfNotProvided(boolean condition);
-
-    void setUsyncToken(SyncToken syncToken);
-
-    void setRsyncToken(SyncToken syncToken);
-}

http://git-wip-us.apache.org/repos/asf/syncope/blob/235f60fa/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/Logger.java
----------------------------------------------------------------------
diff --git a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/Logger.java b/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/Logger.java
deleted file mode 100644
index 1284833..0000000
--- a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/Logger.java
+++ /dev/null
@@ -1,35 +0,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.persistence.api.entity;
-
-import org.apache.syncope.common.lib.types.LoggerLevel;
-import org.apache.syncope.common.lib.types.LoggerType;
-
-public interface Logger extends Entity<String> {
-
-    void setKey(String name);
-
-    LoggerLevel getLevel();
-
-    void setLevel(LoggerLevel level);
-
-    LoggerType getType();
-
-    void setType(LoggerType type);
-}

http://git-wip-us.apache.org/repos/asf/syncope/blob/235f60fa/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/Mapping.java
----------------------------------------------------------------------
diff --git a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/Mapping.java b/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/Mapping.java
deleted file mode 100644
index 3639e8e..0000000
--- a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/Mapping.java
+++ /dev/null
@@ -1,42 +0,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.persistence.api.entity;
-
-import java.util.List;
-
-public interface Mapping<T extends MappingItem> extends Entity<Long> {
-
-    T getAccountIdItem();
-
-    String getAccountLink();
-
-    List<? extends T> getItems();
-
-    ExternalResource getResource();
-
-    boolean addItem(T item);
-
-    boolean removeItem(T item);
-
-    void setAccountIdItem(T item);
-
-    void setAccountLink(String accountLink);
-
-    void setResource(ExternalResource resource);
-}

http://git-wip-us.apache.org/repos/asf/syncope/blob/235f60fa/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/MappingItem.java
----------------------------------------------------------------------
diff --git a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/MappingItem.java b/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/MappingItem.java
deleted file mode 100644
index 07a12b8..0000000
--- a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/MappingItem.java
+++ /dev/null
@@ -1,57 +0,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.persistence.api.entity;
-
-import org.apache.syncope.common.lib.types.IntMappingType;
-import org.apache.syncope.common.lib.types.MappingPurpose;
-
-public interface MappingItem extends Entity<Long> {
-
-    String getExtAttrName();
-
-    String getIntAttrName();
-
-    IntMappingType getIntMappingType();
-
-    String getMandatoryCondition();
-
-    Mapping<?> getMapping();
-
-    MappingPurpose getPurpose();
-
-    boolean isAccountid();
-
-    boolean isPassword();
-
-    void setAccountid(boolean accountid);
-
-    void setExtAttrName(String extAttrName);
-
-    void setIntAttrName(String intAttrName);
-
-    void setIntMappingType(IntMappingType intMappingType);
-
-    void setMandatoryCondition(String condition);
-
-    void setMapping(Mapping<?> mapping);
-
-    void setPassword(boolean password);
-
-    void setPurpose(MappingPurpose purpose);
-}

http://git-wip-us.apache.org/repos/asf/syncope/blob/235f60fa/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/Notification.java
----------------------------------------------------------------------
diff --git a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/Notification.java b/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/Notification.java
deleted file mode 100644
index d7f7dc0..0000000
--- a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/Notification.java
+++ /dev/null
@@ -1,82 +0,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.persistence.api.entity;
-
-import java.util.List;
-import org.apache.syncope.common.lib.types.IntMappingType;
-import org.apache.syncope.common.lib.types.TraceLevel;
-
-public interface Notification extends Entity<Long> {
-
-    boolean addEvent(String event);
-
-    boolean addStaticRecipient(String staticRecipient);
-
-    List<String> getEvents();
-
-    String getRecipientAttrName();
-
-    IntMappingType getRecipientAttrType();
-
-    String getRecipients();
-
-    String getRoleAbout();
-
-    String getSender();
-
-    List<String> getStaticRecipients();
-
-    String getSubject();
-
-    String getTemplate();
-
-    TraceLevel getTraceLevel();
-
-    String getUserAbout();
-
-    boolean isActive();
-
-    boolean isSelfAsRecipient();
-
-    boolean removeEvent(String event);
-
-    boolean removeStaticRecipient(String staticRecipient);
-
-    void setActive(boolean active);
-
-    void setRecipientAttrName(String recipientAttrName);
-
-    void setRecipientAttrType(IntMappingType recipientAttrType);
-
-    void setRecipients(String recipients);
-
-    void setRoleAbout(String roleAbout);
-
-    void setSelfAsRecipient(boolean selfAsRecipient);
-
-    void setSender(String sender);
-
-    void setSubject(String subject);
-
-    void setTemplate(String template);
-
-    void setTraceLevel(TraceLevel traceLevel);
-
-    void setUserAbout(String userAbout);
-}

http://git-wip-us.apache.org/repos/asf/syncope/blob/235f60fa/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/PasswordPolicy.java
----------------------------------------------------------------------
diff --git a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/PasswordPolicy.java b/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/PasswordPolicy.java
deleted file mode 100644
index cc82917..0000000
--- a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/PasswordPolicy.java
+++ /dev/null
@@ -1,23 +0,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.persistence.api.entity;
-
-public interface PasswordPolicy extends Policy {
-    
-}

http://git-wip-us.apache.org/repos/asf/syncope/blob/235f60fa/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/PlainAttr.java
----------------------------------------------------------------------
diff --git a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/PlainAttr.java b/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/PlainAttr.java
deleted file mode 100644
index d5b2d6e..0000000
--- a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/PlainAttr.java
+++ /dev/null
@@ -1,37 +0,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.persistence.api.entity;
-
-import java.util.List;
-import org.apache.syncope.persistence.api.attrvalue.validation.InvalidPlainAttrValueException;
-
-public interface PlainAttr extends Attr<PlainSchema> {
-
-    void addValue(String value, AttributableUtil attributableUtil) throws InvalidPlainAttrValueException;
-
-    boolean removeValue(PlainAttrValue attrValue);
-
-    PlainAttrUniqueValue getUniqueValue();
-
-    List<? extends PlainAttrValue> getValues();
-
-    List<String> getValuesAsStrings();
-
-    void setUniqueValue(PlainAttrUniqueValue uniqueValue);
-}

http://git-wip-us.apache.org/repos/asf/syncope/blob/235f60fa/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/PlainAttrUniqueValue.java
----------------------------------------------------------------------
diff --git a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/PlainAttrUniqueValue.java b/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/PlainAttrUniqueValue.java
deleted file mode 100644
index 6f7113a..0000000
--- a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/PlainAttrUniqueValue.java
+++ /dev/null
@@ -1,26 +0,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.persistence.api.entity;
-
-public interface PlainAttrUniqueValue extends PlainAttrValue {
-
-    PlainSchema getSchema();
-
-    void setSchema(PlainSchema schema);
-}

http://git-wip-us.apache.org/repos/asf/syncope/blob/235f60fa/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/PlainAttrValue.java
----------------------------------------------------------------------
diff --git a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/PlainAttrValue.java b/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/PlainAttrValue.java
deleted file mode 100644
index da7f1c3..0000000
--- a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/PlainAttrValue.java
+++ /dev/null
@@ -1,62 +0,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.persistence.api.entity;
-
-import java.util.Date;
-import org.apache.syncope.common.lib.types.AttrSchemaType;
-import org.apache.syncope.persistence.api.attrvalue.validation.ParsingValidationException;
-
-public interface PlainAttrValue extends Entity<Long> {
-
-    PlainAttr getAttr();
-
-    byte[] getBinaryValue();
-
-    Boolean getBooleanValue();
-
-    Date getDateValue();
-
-    Double getDoubleValue();
-
-    Long getLongValue();
-
-    String getStringValue();
-
-    <V> V getValue();
-
-    String getValueAsString();
-
-    String getValueAsString(AttrSchemaType type);
-
-    void parseValue(PlainSchema schema, String value) throws ParsingValidationException;
-
-    void setAttr(PlainAttr attr);
-
-    void setBinaryValue(byte[] binaryValue);
-
-    void setBooleanValue(Boolean booleanValue);
-
-    void setDateValue(Date dateValue);
-
-    void setDoubleValue(Double doubleValue);
-
-    void setLongValue(Long longValue);
-
-    void setStringValue(String stringValue);
-}

http://git-wip-us.apache.org/repos/asf/syncope/blob/235f60fa/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/PlainSchema.java
----------------------------------------------------------------------
diff --git a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/PlainSchema.java b/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/PlainSchema.java
deleted file mode 100644
index 2ba286c..0000000
--- a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/PlainSchema.java
+++ /dev/null
@@ -1,67 +0,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.persistence.api.entity;
-
-import org.apache.syncope.common.lib.types.AttrSchemaType;
-import org.apache.syncope.common.lib.types.CipherAlgorithm;
-import org.apache.syncope.persistence.api.attrvalue.validation.Validator;
-
-public interface PlainSchema extends Schema {
-
-    CipherAlgorithm getCipherAlgorithm();
-
-    String getConversionPattern();
-
-    String getEnumerationKeys();
-
-    String getEnumerationValues();
-
-    String getMimeType();
-
-    String getSecretKey();
-
-    Validator getValidator();
-
-    String getValidatorClass();
-
-    void setCipherAlgorithm(CipherAlgorithm cipherAlgorithm);
-
-    void setConversionPattern(String conversionPattern);
-
-    void setEnumerationKeys(String enumerationKeys);
-
-    void setEnumerationValues(String enumerationValues);
-
-    void setMimeType(String mimeType);
-
-    void setSecretKey(String secretKey);
-
-    void setValidatorClass(String validatorClass);
-
-    void setType(AttrSchemaType type);
-
-    void setMandatoryCondition(String condition);
-
-    void setMultivalue(boolean multivalue);
-
-    void setReadonly(boolean readonly);
-
-    void setUniqueConstraint(boolean uniquevalue);
-
-}

http://git-wip-us.apache.org/repos/asf/syncope/blob/235f60fa/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/Policy.java
----------------------------------------------------------------------
diff --git a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/Policy.java b/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/Policy.java
deleted file mode 100644
index dc501e1..0000000
--- a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/Policy.java
+++ /dev/null
@@ -1,35 +0,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.persistence.api.entity;
-
-import org.apache.syncope.common.lib.types.PolicySpec;
-import org.apache.syncope.common.lib.types.PolicyType;
-
-public interface Policy extends Entity<Long> {
-
-    String getDescription();
-
-    <T extends PolicySpec> T getSpecification(Class<T> reference);
-
-    PolicyType getType();
-
-    void setDescription(String description);
-
-    void setSpecification(PolicySpec policy);
-}

http://git-wip-us.apache.org/repos/asf/syncope/blob/235f60fa/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/PushPolicy.java
----------------------------------------------------------------------
diff --git a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/PushPolicy.java b/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/PushPolicy.java
deleted file mode 100644
index d97ad64..0000000
--- a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/PushPolicy.java
+++ /dev/null
@@ -1,23 +0,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.persistence.api.entity;
-
-public interface PushPolicy extends Policy {
-    
-}

http://git-wip-us.apache.org/repos/asf/syncope/blob/235f60fa/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/Report.java
----------------------------------------------------------------------
diff --git a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/Report.java b/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/Report.java
deleted file mode 100644
index 09fe063..0000000
--- a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/Report.java
+++ /dev/null
@@ -1,45 +0,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.persistence.api.entity;
-
-import java.util.List;
-import org.apache.syncope.common.lib.report.ReportletConf;
-
-public interface Report extends Entity<Long> {
-
-    String getName();
-
-    boolean addExec(ReportExec exec);
-
-    boolean addReportletConf(ReportletConf reportletConf);
-
-    String getCronExpression();
-
-    List<? extends ReportExec> getExecs();
-
-    List<? extends ReportletConf> getReportletConfs();
-
-    boolean removeExec(ReportExec exec);
-
-    boolean removeReportletConf(ReportletConf reportletConf);
-
-    void setCronExpression(String cronExpression);
-
-    void setName(String name);
-}

http://git-wip-us.apache.org/repos/asf/syncope/blob/235f60fa/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/ReportExec.java
----------------------------------------------------------------------
diff --git a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/ReportExec.java b/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/ReportExec.java
deleted file mode 100644
index 1cbd6b3..0000000
--- a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/ReportExec.java
+++ /dev/null
@@ -1,34 +0,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.persistence.api.entity;
-
-import org.apache.syncope.common.lib.types.ReportExecStatus;
-
-public interface ReportExec extends Exec {
-
-    byte[] getExecResult();
-
-    Report getReport();
-
-    void setExecResult(byte[] execResult);
-
-    void setReport(Report report);
-
-    void setStatus(ReportExecStatus status);
-}

http://git-wip-us.apache.org/repos/asf/syncope/blob/235f60fa/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/ReportletConfInstance.java
----------------------------------------------------------------------
diff --git a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/ReportletConfInstance.java b/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/ReportletConfInstance.java
deleted file mode 100644
index dcf56ed..0000000
--- a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/ReportletConfInstance.java
+++ /dev/null
@@ -1,33 +0,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.persistence.api.entity;
-
-import org.apache.syncope.common.lib.report.ReportletConf;
-
-public interface ReportletConfInstance extends Entity<Long> {
-
-    ReportletConf getInstance();
-
-    Report getReport();
-
-    void setInstance(ReportletConf instance);
-
-    void setReport(Report report);
-
-}

http://git-wip-us.apache.org/repos/asf/syncope/blob/235f60fa/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/Schema.java
----------------------------------------------------------------------
diff --git a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/Schema.java b/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/Schema.java
deleted file mode 100644
index 2e4a5eb..0000000
--- a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/Schema.java
+++ /dev/null
@@ -1,37 +0,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.persistence.api.entity;
-
-import org.apache.syncope.common.lib.types.AttrSchemaType;
-
-public interface Schema extends Entity<String> {
-
-    AttrSchemaType getType();
-
-    String getMandatoryCondition();
-
-    boolean isMultivalue();
-
-    boolean isReadonly();
-
-    boolean isUniqueConstraint();
-
-    void setKey(String name);
-
-}

http://git-wip-us.apache.org/repos/asf/syncope/blob/235f60fa/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/Subject.java
----------------------------------------------------------------------
diff --git a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/Subject.java b/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/Subject.java
deleted file mode 100644
index 7f13b03..0000000
--- a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/Subject.java
+++ /dev/null
@@ -1,32 +0,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.persistence.api.entity;
-
-import java.util.Set;
-
-public interface Subject<N extends PlainAttr, D extends DerAttr, V extends VirAttr> extends Attributable<N, D, V> {
-
-    boolean addResource(ExternalResource resource);
-
-    boolean removeResource(ExternalResource resource);
-
-    Set<String> getResourceNames();
-
-    Set<? extends ExternalResource> getResources();
-}

http://git-wip-us.apache.org/repos/asf/syncope/blob/235f60fa/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/SyncPolicy.java
----------------------------------------------------------------------
diff --git a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/SyncPolicy.java b/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/SyncPolicy.java
deleted file mode 100644
index 8f15dbc..0000000
--- a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/SyncPolicy.java
+++ /dev/null
@@ -1,23 +0,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.persistence.api.entity;
-
-public interface SyncPolicy extends Policy {
-    
-}

http://git-wip-us.apache.org/repos/asf/syncope/blob/235f60fa/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/VirAttr.java
----------------------------------------------------------------------
diff --git a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/VirAttr.java b/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/VirAttr.java
deleted file mode 100644
index a7287c7..0000000
--- a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/persistence/api/entity/VirAttr.java
+++ /dev/null
@@ -1,30 +0,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.persistence.api.entity;
-
-import java.util.List;
-
-public interface VirAttr extends Attr<VirSchema> {
-
-    List<String> getValues();
-
-    boolean addValue(String value);
-
-    boolean removeValue(String value);
-}