syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject [01/27] syncope git commit: [SYNCOPE-119] Renaming Role to Group
Date Mon, 06 Apr 2015 16:13:57 GMT
Repository: syncope
Updated Branches:
  refs/heads/SYNCOPE-119 [created] 4095f1e84


http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/installer/src/main/java/org/apache/syncope/installer/files/OrmXml.java
----------------------------------------------------------------------
diff --git a/installer/src/main/java/org/apache/syncope/installer/files/OrmXml.java b/installer/src/main/java/org/apache/syncope/installer/files/OrmXml.java
deleted file mode 100644
index 8b8115b..0000000
--- a/installer/src/main/java/org/apache/syncope/installer/files/OrmXml.java
+++ /dev/null
@@ -1,381 +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.installer.files;
-
-public class OrmXml {
-
-    public static final String PATH_DIR = "core/src/main/resources/META-INF";
-
-    public static final String PATH_COMPLETE = PATH_DIR + "/orm.xml";
-
-    public static final String ORACLE_ORM = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + "<!--\n"
-            + "Licensed to the Apache Software Foundation (ASF) under one\n"
-            + "or more contributor license agreements.  See the NOTICE file\n"
-            + "distributed with this work for additional information\n"
-            + "regarding copyright ownership.  The ASF licenses this file\n"
-            + "to you under the Apache License, Version 2.0 (the\n"
-            + "\"License\"); you may not use this file except in compliance\n"
-            + "with the License.  You may obtain a copy of the License at\n" + "\n"
-            + "  http://www.apache.org/licenses/LICENSE-2.0\n" + "\n"
-            + "Unless required by applicable law or agreed to in writing,\n"
-            + "software distributed under the License is distributed on an\n"
-            + "\"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n"
-            + "KIND, either express or implied.  See the License for the\n"
-            + "specific language governing permissions and limitations\n" + "under the License.\n" + "\n" + "-->\n"
-            + "<entity-mappings  xmlns=\"http://java.sun.com/xml/ns/persistence/orm\"\n"
-            + "                  xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-            + "                  xsi:schemaLocation=\"http://java.sun.com/xml/ns/persistence/orm \n"
-            + "                                      http://java.sun.com/xml/ns/persistence/orm_2_0.xsd\"\n"
-            + "                  version=\"2.0\">\n" + "\n" + "  <persistence-unit-metadata>\n"
-            + "    <persistence-unit-defaults>\n" + "      <entity-listeners>\n"
-            + "        <entity-listener class=\"org.apache.syncope.core.persistence.validation.entity.EntityValidationListener\">\n"
-            + "          <pre-persist method-name=\"validate\"/>\n"
-            + "          <pre-update method-name=\"validate\"/>\n" + "        </entity-listener>\n"
-            + "      </entity-listeners>\n" + "    </persistence-unit-defaults>\n" + "  </persistence-unit-metadata>\n"
-            + "  \n"
-            + "  <table-generator name=\"SEQ_UAttrValue\" pk-column-value=\"SEQ_UAttrValue\" initial-value=\"100\"/>\n"
-            + "  <table-generator name=\"SEQ_RAttrValue\" pk-column-value=\"SEQ_RAttrValue\" initial-value=\"100\"/>\n"
-            + "  <table-generator name=\"SEQ_MAttrValue\" pk-column-value=\"SEQ_MAttrValue\" initial-value=\"100\"/>\n"
-            + "  <table-generator name=\"SEQ_CAttrValue\" pk-column-value=\"SEQ_CAttrValue\" initial-value=\"100\"/>\n"
-            + "\n" + "  <entity class=\"org.apache.syncope.core.persistence.beans.user.SyncopeUser\">\n"
-            + "    <attributes>\n" + "      <id name=\"id\">\n"
-            + "        <generated-value generator=\"SEQ_SyncopeUser\" strategy=\"TABLE\"/>\n"
-            + "        <table-generator name=\"SEQ_SyncopeUser\" pk-column-value=\"SEQ_SyncopeUser\" initial-value=\"100\"/>\n"
-            + "      </id>\n" + "    </attributes>\n" + "  </entity>\n" + "\n"
-            + "  <entity class=\"org.apache.syncope.core.persistence.beans.role.SyncopeRole\">\n" + "    <attributes>\n"
-            + "      <id name=\"id\">\n"
-            + "        <generated-value generator=\"SEQ_SyncopeRole\" strategy=\"TABLE\"/>\n"
-            + "        <table-generator name=\"SEQ_SyncopeRole\" pk-column-value=\"SEQ_SyncopeRole\" initial-value=\"100\"/>\n"
-            + "      </id>\n" + "    </attributes>\n" + "  </entity>\n" + "\n"
-            + "  <entity class=\"org.apache.syncope.core.persistence.beans.membership.Membership\">\n"
-            + "    <attributes>\n" + "      <id name=\"id\">\n"
-            + "        <generated-value generator=\"SEQ_Membership\" strategy=\"TABLE\"/>\n"
-            + "        <table-generator name=\"SEQ_Membership\" pk-column-value=\"SEQ_Membership\" initial-value=\"100\"/>\n"
-            + "      </id>\n" + "    </attributes>\n" + "  </entity>\n" + "\n"
-            + "  <entity class=\"org.apache.syncope.core.persistence.beans.user.UMapping\">\n" + "    <attributes>\n"
-            + "      <id name=\"id\">\n" + "        <generated-value generator=\"SEQ_UMapping\" strategy=\"TABLE\"/>\n"
-            + "        <table-generator name=\"SEQ_UMapping\" pk-column-value=\"SEQ_UMapping\" initial-value=\"100\"/>\n"
-            + "      </id>\n" + "    </attributes>\n" + "  </entity>\n"
-            + "  <entity class=\"org.apache.syncope.core.persistence.beans.role.RMapping\">\n" + "    <attributes>\n"
-            + "      <id name=\"id\">\n" + "        <generated-value generator=\"SEQ_RMapping\" strategy=\"TABLE\"/>\n"
-            + "        <table-generator name=\"SEQ_RMapping\" pk-column-value=\"SEQ_RMapping\" initial-value=\"100\"/>\n"
-            + "      </id>\n" + "    </attributes>\n" + "  </entity>\n"
-            + "  <entity class=\"org.apache.syncope.core.persistence.beans.user.UMappingItem\">\n"
-            + "    <attributes>\n" + "      <id name=\"id\">\n"
-            + "        <generated-value generator=\"SEQ_UMappingItem\" strategy=\"TABLE\"/>\n"
-            + "        <table-generator name=\"SEQ_UMappingItem\" pk-column-value=\"SEQ_UMappingItem\" initial-value=\"1000\"/>\n"
-            + "      </id>\n" + "    </attributes>\n" + "  </entity>\n"
-            + "  <entity class=\"org.apache.syncope.core.persistence.beans.role.RMappingItem\">\n"
-            + "    <attributes>\n" + "      <id name=\"id\">\n"
-            + "        <generated-value generator=\"SEQ_RMappingItem\" strategy=\"TABLE\"/>\n"
-            + "        <table-generator name=\"SEQ_RMappingItem\" pk-column-value=\"SEQ_RMappingItem\" initial-value=\"1000\"/>\n"
-            + "      </id>\n" + "    </attributes>\n" + "  </entity>\n" + "\n"
-            + "  <entity class=\"org.apache.syncope.core.persistence.beans.ConnInstance\">\n" + "    <attributes>\n"
-            + "      <id name=\"id\">\n"
-            + "        <generated-value generator=\"SEQ_ConnInstance\" strategy=\"TABLE\"/>\n"
-            + "        <table-generator name=\"SEQ_ConnInstance\" pk-column-value=\"SEQ_ConnInstance\" initial-value=\"1000\"/>\n"
-            + "      </id>\n" + "    </attributes>\n" + "  </entity>\n" + "\n"
-            + "  <entity class=\"org.apache.syncope.core.persistence.beans.user.UAttr\">\n" + "    <attributes>\n"
-            + "      <id name=\"id\">\n" + "        <generated-value generator=\"SEQ_UAttr\" strategy=\"TABLE\"/>\n"
-            + "        <table-generator name=\"SEQ_UAttr\" pk-column-value=\"SEQ_UAttr\" initial-value=\"1000\"/>\n"
-            + "      </id>\n" + "    </attributes>\n" + "  </entity>\n"
-            + "  <entity class=\"org.apache.syncope.core.persistence.beans.role.RAttr\">\n" + "    <attributes>\n"
-            + "      <id name=\"id\">\n" + "        <generated-value generator=\"SEQ_RAttr\" strategy=\"TABLE\"/>\n"
-            + "        <table-generator name=\"SEQ_RAttr\" pk-column-value=\"SEQ_RAttr\" initial-value=\"1000\"/>\n"
-            + "      </id>\n" + "    </attributes>\n" + "  </entity>\n"
-            + "  <entity class=\"org.apache.syncope.core.persistence.beans.membership.MAttr\">\n" + "    <attributes>\n"
-            + "      <id name=\"id\">\n" + "        <generated-value generator=\"SEQ_MAttr\" strategy=\"TABLE\"/>\n"
-            + "        <table-generator name=\"SEQ_MAttr\" pk-column-value=\"SEQ_MAttr\" initial-value=\"1000\"/>\n"
-            + "      </id>\n" + "    </attributes>\n" + "  </entity>\n"
-            + "  <entity class=\"org.apache.syncope.core.persistence.beans.conf.CAttr\">\n" + "    <attributes>\n"
-            + "      <id name=\"id\">\n" + "        <generated-value generator=\"SEQ_CAttr\" strategy=\"TABLE\"/>\n"
-            + "        <table-generator name=\"SEQ_CAttr\" pk-column-value=\"SEQ_CAttr\" initial-value=\"1000\"/>\n"
-            + "      </id>\n" + "    </attributes>\n" + "  </entity>\n"
-            + "  <entity class=\"org.apache.syncope.core.persistence.beans.user.UAttrValue\">\n" + "    <attributes>\n"
-            + "      <id name=\"id\">\n"
-            + "        <generated-value generator=\"SEQ_UAttrValue\" strategy=\"TABLE\"/>\n" + "      </id>\n"
-            + "    </attributes>\n" + "  </entity>\n"
-            + "  <entity class=\"org.apache.syncope.core.persistence.beans.user.UAttrUniqueValue\">\n" + "    <table>\n"
-            + "      <unique-constraint>\n" + "        <column-name>booleanValue</column-name>\n"
-            + "        <column-name>dateValue</column-name>\n" + "        <column-name>stringValue</column-name>\n"
-            + "        <column-name>doubleValue</column-name>\n" + "        <column-name>longValue</column-name>\n"
-            + "        <column-name>schema_name</column-name>\n" + "      </unique-constraint>\n" + "    </table>\n"
-            + "    <attributes>\n" + "      <id name=\"id\">\n"
-            + "        <generated-value generator=\"SEQ_UAttrValue\" strategy=\"TABLE\"/>\n" + "      </id>\n"
-            + "    </attributes>\n" + "  </entity>\n"
-            + "  <entity class=\"org.apache.syncope.core.persistence.beans.role.RAttrValue\">\n" + "    <attributes>\n"
-            + "      <id name=\"id\">\n"
-            + "        <generated-value generator=\"SEQ_RAttrValue\" strategy=\"TABLE\"/>\n" + "      </id>\n"
-            + "    </attributes>\n" + "  </entity>\n"
-            + "  <entity class=\"org.apache.syncope.core.persistence.beans.role.RAttrUniqueValue\">\n" + "    <table>\n"
-            + "      <unique-constraint>\n" + "        <column-name>booleanValue</column-name>\n"
-            + "        <column-name>dateValue</column-name>\n" + "        <column-name>stringValue</column-name>\n"
-            + "        <column-name>doubleValue</column-name>\n" + "        <column-name>longValue</column-name>\n"
-            + "        <column-name>schema_name</column-name>\n" + "      </unique-constraint>\n" + "    </table>\n"
-            + "    <attributes>\n" + "      <id name=\"id\">\n"
-            + "        <generated-value generator=\"SEQ_RAttrValue\" strategy=\"TABLE\"/>\n" + "      </id>\n"
-            + "    </attributes>\n" + "  </entity>\n"
-            + "  <entity class=\"org.apache.syncope.core.persistence.beans.membership.MAttrValue\">\n"
-            + "    <attributes>\n" + "      <id name=\"id\">\n"
-            + "        <generated-value generator=\"SEQ_MAttrValue\" strategy=\"TABLE\"/>\n" + "      </id>\n"
-            + "    </attributes>\n" + "  </entity>\n"
-            + "  <entity class=\"org.apache.syncope.core.persistence.beans.membership.MAttrUniqueValue\">\n"
-            + "    <table>\n" + "      <unique-constraint>\n" + "        <column-name>booleanValue</column-name>\n"
-            + "        <column-name>dateValue</column-name>\n" + "        <column-name>stringValue</column-name>\n"
-            + "        <column-name>doubleValue</column-name>\n" + "        <column-name>longValue</column-name>\n"
-            + "        <column-name>schema_name</column-name>\n" + "      </unique-constraint>\n" + "    </table>\n"
-            + "    <attributes>\n" + "      <id name=\"id\">\n"
-            + "        <generated-value generator=\"SEQ_MAttrValue\" strategy=\"TABLE\"/>\n" + "      </id>\n"
-            + "    </attributes>\n" + "  </entity>\n"
-            + "  <entity class=\"org.apache.syncope.core.persistence.beans.conf.CAttrValue\">\n" + "    <attributes>\n"
-            + "      <id name=\"id\">\n"
-            + "        <generated-value generator=\"SEQ_CAttrValue\" strategy=\"TABLE\"/>\n" + "      </id>\n"
-            + "    </attributes>\n" + "  </entity>\n"
-            + "  <entity class=\"org.apache.syncope.core.persistence.beans.conf.CAttrUniqueValue\">\n" + "    <table>\n"
-            + "      <unique-constraint>\n" + "        <column-name>booleanValue</column-name>\n"
-            + "        <column-name>dateValue</column-name>\n" + "        <column-name>stringValue</column-name>\n"
-            + "        <column-name>doubleValue</column-name>\n" + "        <column-name>longValue</column-name>\n"
-            + "        <column-name>schema_name</column-name>\n" + "      </unique-constraint>\n" + "    </table>\n"
-            + "    <attributes>\n" + "      <id name=\"id\">\n"
-            + "        <generated-value generator=\"SEQ_CAttrValue\" strategy=\"TABLE\"/>\n" + "      </id>\n"
-            + "    </attributes>\n" + "  </entity>\n" + "\n"
-            + "  <entity class=\"org.apache.syncope.core.persistence.beans.Task\">\n" + "    <attributes>\n"
-            + "      <id name=\"id\">\n" + "        <generated-value generator=\"SEQ_Task\" strategy=\"TABLE\"/>\n"
-            + "        <table-generator name=\"SEQ_Task\" pk-column-value=\"SEQ_Task\" initial-value=\"100\"/>\n"
-            + "      </id>\n" + "    </attributes>\n" + "  </entity>\n"
-            + "  <entity class=\"org.apache.syncope.core.persistence.beans.TaskExec\">\n" + "    <attributes>\n"
-            + "      <id name=\"id\">\n" + "        <generated-value generator=\"SEQ_TaskExec\" strategy=\"TABLE\"/>\n"
-            + "        <table-generator name=\"SEQ_TaskExec\" pk-column-value=\"SEQ_TaskExec\" initial-value=\"10\"/>\n"
-            + "      </id>\n" + "    </attributes>\n" + "  </entity>\n" + "\n"
-            + "  <entity class=\"org.apache.syncope.core.persistence.beans.Policy\">\n" + "    <attributes>\n"
-            + "      <id name=\"id\">\n" + "        <generated-value generator=\"SEQ_Policy\" strategy=\"TABLE\"/>\n"
-            + "        <table-generator name=\"SEQ_Policy\" pk-column-value=\"SEQ_Policy\" initial-value=\"1000\"/>\n"
-            + "      </id>\n" + "    </attributes>\n" + "  </entity>\n" + "    \n"
-            + "  <entity class=\"org.apache.syncope.core.persistence.beans.Report\">\n" + "    <attributes>\n"
-            + "      <id name=\"id\">\n" + "        <generated-value generator=\"SEQ_Report\" strategy=\"TABLE\"/>\n"
-            + "        <table-generator name=\"SEQ_Report\" pk-column-value=\"SEQ_Report\" initial-value=\"100\"/>\n"
-            + "      </id>\n" + "    </attributes>\n" + "  </entity>\n"
-            + "  <entity class=\"org.apache.syncope.core.persistence.beans.ReportExec\">\n" + "    <attributes>\n"
-            + "      <id name=\"id\">\n"
-            + "        <generated-value generator=\"SEQ_ReportExec\" strategy=\"TABLE\"/>\n"
-            + "        <table-generator name=\"SEQ_ReportExec\" pk-column-value=\"SEQ_ReportExec\" initial-value=\"100\"/>\n"
-            + "      </id>\n" + "    </attributes>\n" + "  </entity>\n"
-            + "  <entity class=\"org.apache.syncope.core.persistence.beans.ReportletConfInstance\">\n"
-            + "    <attributes>\n" + "      <id name=\"id\">\n"
-            + "        <generated-value generator=\"SEQ_ReportletConfInstance\" strategy=\"TABLE\"/>\n"
-            + "        <table-generator name=\"SEQ_ReportletConfInstance\" pk-column-value=\"SEQ_ReportletConfInstance\" initial-value=\"100\"/>\n"
-            + "      </id>\n" + "    </attributes>\n" + "  </entity>\n"
-            + "  <entity class=\"org.apache.syncope.core.persistence.beans.Notification\">\n" + "    <attributes>\n"
-            + "      <id name=\"id\">\n"
-            + "        <generated-value generator=\"SEQ_Notification\" strategy=\"TABLE\"/>\n"
-            + "        <table-generator name=\"SEQ_Notification\" pk-column-value=\"SEQ_Notification\" initial-value=\"100\"/>\n"
-            + "      </id>\n" + "    </attributes>\n" + "  </entity>\n"
-            + "  <entity class=\"org.apache.syncope.core.persistence.beans.SecurityQuestion\">\n" + "    <attributes>\n"
-            + "      <id name=\"id\">\n"
-            + "        <generated-value generator=\"SEQ_SecurityQuestion\" strategy=\"TABLE\"/>\n"
-            + "        <table-generator name=\"SEQ_SecurityQuestion\" pk-column-value=\"SEQ_SecurityQuestion\" initial-value=\"100\"/>\n"
-            + "      </id>\n" + "    </attributes>\n" + "  </entity>  \n" + "</entity-mappings>\n" + "";
-
-    public static final String SQLSERVER_ORM = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + "<!--\n"
-            + "Licensed to the Apache Software Foundation (ASF) under one\n"
-            + "or more contributor license agreements.  See the NOTICE file\n"
-            + "distributed with this work for additional information\n"
-            + "regarding copyright ownership.  The ASF licenses this file\n"
-            + "to you under the Apache License, Version 2.0 (the\n"
-            + "\"License\"); you may not use this file except in compliance\n"
-            + "with the License.  You may obtain a copy of the License at\n" + "\n"
-            + "  http://www.apache.org/licenses/LICENSE-2.0\n" + "\n"
-            + "Unless required by applicable law or agreed to in writing,\n"
-            + "software distributed under the License is distributed on an\n"
-            + "\"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n"
-            + "KIND, either express or implied.  See the License for the\n"
-            + "specific language governing permissions and limitations\n" + "under the License.\n" + "\n" + "-->\n"
-            + "<entity-mappings  xmlns=\"http://java.sun.com/xml/ns/persistence/orm\"\n"
-            + "                  xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-            + "                  xsi:schemaLocation=\"http://java.sun.com/xml/ns/persistence/orm \n"
-            + "                                      http://java.sun.com/xml/ns/persistence/orm_2_0.xsd\"\n"
-            + "                  version=\"2.0\">\n" + "  \n" + "  <persistence-unit-metadata>\n"
-            + "    <persistence-unit-defaults>\n" + "      <entity-listeners>\n"
-            + "        <entity-listener class=\"org.apache.syncope.core.persistence.validation.entity.EntityValidationListener\">\n"
-            + "          <pre-persist method-name=\"validate\"/>\n"
-            + "          <pre-update method-name=\"validate\"/>\n" + "        </entity-listener>\n"
-            + "      </entity-listeners>\n" + "    </persistence-unit-defaults>\n" + "  </persistence-unit-metadata>\n"
-            + "  \n"
-            + "  <table-generator name=\"SEQ_UAttrValue\" pk-column-value=\"SEQ_UAttrValue\" initial-value=\"100\"/>\n"
-            + "  <table-generator name=\"SEQ_RAttrValue\" pk-column-value=\"SEQ_RAttrValue\" initial-value=\"100\"/>\n"
-            + "  <table-generator name=\"SEQ_MAttrValue\" pk-column-value=\"SEQ_MAttrValue\" initial-value=\"100\"/>\n"
-            + "  <table-generator name=\"SEQ_CAttrValue\" pk-column-value=\"SEQ_CAttrValue\" initial-value=\"100\"/>\n"
-            + "\n" + "  <entity class=\"org.apache.syncope.core.persistence.beans.user.SyncopeUser\">\n"
-            + "    <attributes>\n" + "      <id name=\"id\">\n"
-            + "        <generated-value generator=\"SEQ_SyncopeUser\" strategy=\"TABLE\"/>\n"
-            + "        <table-generator name=\"SEQ_SyncopeUser\" pk-column-value=\"SEQ_SyncopeUser\" initial-value=\"100\"/>\n"
-            + "      </id>\n" + "    </attributes>\n" + "  </entity>\n" + "\n"
-            + "  <entity class=\"org.apache.syncope.core.persistence.beans.role.SyncopeRole\">\n" + "    <attributes>\n"
-            + "      <id name=\"id\">\n"
-            + "        <generated-value generator=\"SEQ_SyncopeRole\" strategy=\"TABLE\"/>\n"
-            + "        <table-generator name=\"SEQ_SyncopeRole\" pk-column-value=\"SEQ_SyncopeRole\" initial-value=\"100\"/>\n"
-            + "      </id>\n" + "    </attributes>\n" + "  </entity>\n" + "\n"
-            + "  <entity class=\"org.apache.syncope.core.persistence.beans.membership.Membership\">\n"
-            + "    <attributes>\n" + "      <id name=\"id\">\n"
-            + "        <generated-value generator=\"SEQ_Membership\" strategy=\"TABLE\"/>\n"
-            + "        <table-generator name=\"SEQ_Membership\" pk-column-value=\"SEQ_Membership\" initial-value=\"100\"/>\n"
-            + "      </id>\n" + "    </attributes>\n" + "  </entity>\n" + "\n"
-            + "  <entity class=\"org.apache.syncope.core.persistence.beans.user.UMapping\">\n" + "    <attributes>\n"
-            + "      <id name=\"id\">\n" + "        <generated-value generator=\"SEQ_UMapping\" strategy=\"TABLE\"/>\n"
-            + "        <table-generator name=\"SEQ_UMapping\" pk-column-value=\"SEQ_UMapping\" initial-value=\"100\"/>\n"
-            + "      </id>\n" + "    </attributes>\n" + "  </entity>\n"
-            + "  <entity class=\"org.apache.syncope.core.persistence.beans.role.RMapping\">\n" + "    <attributes>\n"
-            + "      <id name=\"id\">\n" + "        <generated-value generator=\"SEQ_RMapping\" strategy=\"TABLE\"/>\n"
-            + "        <table-generator name=\"SEQ_RMapping\" pk-column-value=\"SEQ_RMapping\" initial-value=\"100\"/>\n"
-            + "      </id>\n" + "    </attributes>\n" + "  </entity>\n"
-            + "  <entity class=\"org.apache.syncope.core.persistence.beans.user.UMappingItem\">\n"
-            + "    <attributes>\n" + "      <id name=\"id\">\n"
-            + "        <generated-value generator=\"SEQ_UMappingItem\" strategy=\"TABLE\"/>\n"
-            + "        <table-generator name=\"SEQ_UMappingItem\" pk-column-value=\"SEQ_UMappingItem\" initial-value=\"1000\"/>\n"
-            + "      </id>\n" + "    </attributes>\n" + "  </entity>\n"
-            + "  <entity class=\"org.apache.syncope.core.persistence.beans.role.RMappingItem\">\n"
-            + "    <attributes>\n" + "      <id name=\"id\">\n"
-            + "        <generated-value generator=\"SEQ_RMappingItem\" strategy=\"TABLE\"/>\n"
-            + "        <table-generator name=\"SEQ_RMappingItem\" pk-column-value=\"SEQ_RMappingItem\" initial-value=\"1000\"/>\n"
-            + "      </id>\n" + "    </attributes>\n" + "  </entity>\n" + "\n"
-            + "  <entity class=\"org.apache.syncope.core.persistence.beans.ConnInstance\">\n" + "    <attributes>\n"
-            + "      <id name=\"id\">\n"
-            + "        <generated-value generator=\"SEQ_ConnInstance\" strategy=\"TABLE\"/>\n"
-            + "        <table-generator name=\"SEQ_ConnInstance\" pk-column-value=\"SEQ_ConnInstance\" initial-value=\"1000\"/>\n"
-            + "      </id>\n" + "    </attributes>\n" + "  </entity>\n" + "\n"
-            + "  <entity class=\"org.apache.syncope.core.persistence.beans.user.UAttr\">\n" + "    <attributes>\n"
-            + "      <id name=\"id\">\n" + "        <generated-value generator=\"SEQ_UAttr\" strategy=\"TABLE\"/>\n"
-            + "        <table-generator name=\"SEQ_UAttr\" pk-column-value=\"SEQ_UAttr\" initial-value=\"1000\"/>\n"
-            + "      </id>\n" + "    </attributes>\n" + "  </entity>\n"
-            + "  <entity class=\"org.apache.syncope.core.persistence.beans.role.RAttr\">\n" + "    <attributes>\n"
-            + "      <id name=\"id\">\n" + "        <generated-value generator=\"SEQ_RAttr\" strategy=\"TABLE\"/>\n"
-            + "        <table-generator name=\"SEQ_RAttr\" pk-column-value=\"SEQ_RAttr\" initial-value=\"1000\"/>\n"
-            + "      </id>\n" + "    </attributes>\n" + "  </entity>\n"
-            + "  <entity class=\"org.apache.syncope.core.persistence.beans.membership.MAttr\">\n" + "    <attributes>\n"
-            + "      <id name=\"id\">\n" + "        <generated-value generator=\"SEQ_MAttr\" strategy=\"TABLE\"/>\n"
-            + "        <table-generator name=\"SEQ_MAttr\" pk-column-value=\"SEQ_MAttr\" initial-value=\"1000\"/>\n"
-            + "      </id>\n" + "    </attributes>\n" + "  </entity>\n"
-            + "  <entity class=\"org.apache.syncope.core.persistence.beans.conf.CAttr\">\n" + "    <attributes>\n"
-            + "      <id name=\"id\">\n" + "        <generated-value generator=\"SEQ_CAttr\" strategy=\"TABLE\"/>\n"
-            + "        <table-generator name=\"SEQ_CAttr\" pk-column-value=\"SEQ_CAttr\" initial-value=\"1000\"/>\n"
-            + "      </id>\n" + "    </attributes>\n" + "  </entity>\n" + "      \n"
-            + "  <entity class=\"org.apache.syncope.core.persistence.beans.user.UAttrValue\">\n" + "    <attributes>\n"
-            + "      <id name=\"id\">\n"
-            + "        <generated-value generator=\"SEQ_UAttrValue\" strategy=\"TABLE\"/>\n" + "      </id>\n"
-            + "    </attributes>\n" + "  </entity>\n"
-            + "  <entity class=\"org.apache.syncope.core.persistence.beans.user.UAttrUniqueValue\">\n" + "    <table>\n"
-            + "      <unique-constraint>\n" + "        <column-name>booleanValue</column-name>\n"
-            + "        <column-name>dateValue</column-name>\n" + "        <column-name>stringValue</column-name>\n"
-            + "        <column-name>doubleValue</column-name>\n" + "        <column-name>longValue</column-name>\n"
-            + "        <column-name>schema_name</column-name>\n" + "      </unique-constraint>\n" + "    </table>\n"
-            + "    <attributes>\n" + "      <id name=\"id\">\n"
-            + "        <generated-value generator=\"SEQ_UAttrValue\" strategy=\"TABLE\"/>\n" + "      </id>\n"
-            + "    </attributes>\n" + "  </entity>\n"
-            + "  <entity class=\"org.apache.syncope.core.persistence.beans.role.RAttrValue\">\n" + "    <attributes>\n"
-            + "      <id name=\"id\">\n"
-            + "        <generated-value generator=\"SEQ_RAttrValue\" strategy=\"TABLE\"/>\n" + "      </id>\n"
-            + "    </attributes>\n" + "  </entity>\n"
-            + "  <entity class=\"org.apache.syncope.core.persistence.beans.role.RAttrUniqueValue\">\n" + "    <table>\n"
-            + "      <unique-constraint>\n" + "        <column-name>booleanValue</column-name>\n"
-            + "        <column-name>schema_name</column-name>\n" + "      </unique-constraint>\n"
-            + "      <unique-constraint>\n" + "        <column-name>dateValue</column-name>\n"
-            + "        <column-name>schema_name</column-name>\n" + "      </unique-constraint>\n"
-            + "      <unique-constraint>\n" + "        <column-name>stringValue</column-name>\n"
-            + "        <column-name>schema_name</column-name>\n" + "      </unique-constraint>\n"
-            + "      <unique-constraint>\n" + "        <column-name>doubleValue</column-name>\n"
-            + "        <column-name>schema_name</column-name>\n" + "      </unique-constraint>\n"
-            + "      <unique-constraint>\n" + "        <column-name>longValue</column-name>\n"
-            + "        <column-name>schema_name</column-name>\n" + "      </unique-constraint>\n" + "    </table>\n"
-            + "    <attributes>\n" + "      <id name=\"id\">\n"
-            + "        <generated-value generator=\"SEQ_RAttrValue\" strategy=\"TABLE\"/>\n" + "      </id>\n"
-            + "    </attributes>\n" + "  </entity>\n"
-            + "  <entity class=\"org.apache.syncope.core.persistence.beans.membership.MAttrValue\">\n"
-            + "    <attributes>\n" + "      <id name=\"id\">\n"
-            + "        <generated-value generator=\"SEQ_MAttrValue\" strategy=\"TABLE\"/>\n" + "      </id>\n"
-            + "    </attributes>\n" + "  </entity>\n"
-            + "  <entity class=\"org.apache.syncope.core.persistence.beans.membership.MAttrUniqueValue\">\n"
-            + "    <table>\n" + "      <unique-constraint>\n" + "        <column-name>booleanValue</column-name>\n"
-            + "        <column-name>schema_name</column-name>\n" + "      </unique-constraint>\n"
-            + "      <unique-constraint>\n" + "        <column-name>dateValue</column-name>\n"
-            + "        <column-name>schema_name</column-name>\n" + "      </unique-constraint>\n"
-            + "      <unique-constraint>\n" + "        <column-name>stringValue</column-name>\n"
-            + "        <column-name>schema_name</column-name>\n" + "      </unique-constraint>\n"
-            + "      <unique-constraint>\n" + "        <column-name>doubleValue</column-name>\n"
-            + "        <column-name>schema_name</column-name>\n" + "      </unique-constraint>\n"
-            + "      <unique-constraint>\n" + "        <column-name>longValue</column-name>\n"
-            + "        <column-name>schema_name</column-name>\n" + "      </unique-constraint>\n" + "    </table>\n"
-            + "    <attributes>\n" + "      <id name=\"id\">\n"
-            + "        <generated-value generator=\"SEQ_MAttrValue\" strategy=\"TABLE\"/>\n" + "      </id>\n"
-            + "    </attributes>\n" + "  </entity>\n"
-            + "  <entity class=\"org.apache.syncope.core.persistence.beans.conf.CAttrValue\">\n" + "    <attributes>\n"
-            + "      <id name=\"id\">\n"
-            + "        <generated-value generator=\"SEQ_CAttrValue\" strategy=\"TABLE\"/>\n" + "      </id>\n"
-            + "    </attributes>\n" + "  </entity>\n"
-            + "  <entity class=\"org.apache.syncope.core.persistence.beans.conf.CAttrUniqueValue\">\n" + "    <table>\n"
-            + "      <unique-constraint>\n" + "        <column-name>booleanValue</column-name>\n"
-            + "        <column-name>schema_name</column-name>\n" + "      </unique-constraint>\n"
-            + "      <unique-constraint>\n" + "        <column-name>dateValue</column-name>\n"
-            + "        <column-name>schema_name</column-name>\n" + "      </unique-constraint>\n"
-            + "      <unique-constraint>\n" + "        <column-name>stringValue</column-name>\n"
-            + "        <column-name>schema_name</column-name>\n" + "      </unique-constraint>\n"
-            + "      <unique-constraint>\n" + "        <column-name>doubleValue</column-name>\n"
-            + "        <column-name>schema_name</column-name>\n" + "      </unique-constraint>\n"
-            + "      <unique-constraint>\n" + "        <column-name>longValue</column-name>\n"
-            + "        <column-name>schema_name</column-name>\n" + "      </unique-constraint>\n" + "    </table>\n"
-            + "    <attributes>\n" + "      <id name=\"id\">\n"
-            + "        <generated-value generator=\"SEQ_CAttrValue\" strategy=\"TABLE\"/>\n" + "      </id>\n"
-            + "    </attributes>\n" + "  </entity>\n" + "\n"
-            + "  <entity class=\"org.apache.syncope.core.persistence.beans.Task\">\n" + "    <attributes>\n"
-            + "      <id name=\"id\">\n" + "        <generated-value generator=\"SEQ_Task\" strategy=\"TABLE\"/>\n"
-            + "        <table-generator name=\"SEQ_Task\" pk-column-value=\"SEQ_Task\" initial-value=\"100\"/>\n"
-            + "      </id>\n" + "    </attributes>\n" + "  </entity>\n"
-            + "  <entity class=\"org.apache.syncope.core.persistence.beans.TaskExec\">\n" + "    <attributes>\n"
-            + "      <id name=\"id\">\n" + "        <generated-value generator=\"SEQ_TaskExec\" strategy=\"TABLE\"/>\n"
-            + "        <table-generator name=\"SEQ_TaskExec\" pk-column-value=\"SEQ_TaskExec\" initial-value=\"10\"/>\n"
-            + "      </id>\n" + "    </attributes>\n" + "  </entity>\n" + "    \n"
-            + "  <entity class=\"org.apache.syncope.core.persistence.beans.Policy\">\n" + "    <attributes>\n"
-            + "      <id name=\"id\">\n" + "        <generated-value generator=\"SEQ_Policy\" strategy=\"TABLE\"/>\n"
-            + "        <table-generator name=\"SEQ_Policy\" pk-column-value=\"SEQ_Policy\" initial-value=\"1000\"/>\n"
-            + "      </id>\n" + "    </attributes>\n" + "  </entity>\n" + "\n"
-            + "  <entity class=\"org.apache.syncope.core.persistence.beans.Report\">\n" + "    <attributes>\n"
-            + "      <id name=\"id\">\n" + "        <generated-value generator=\"SEQ_Report\" strategy=\"TABLE\"/>\n"
-            + "        <table-generator name=\"SEQ_Report\" pk-column-value=\"SEQ_Report\" initial-value=\"100\"/>\n"
-            + "      </id>\n" + "    </attributes>\n" + "  </entity>\n"
-            + "  <entity class=\"org.apache.syncope.core.persistence.beans.ReportExec\">\n" + "    <attributes>\n"
-            + "      <id name=\"id\">\n"
-            + "        <generated-value generator=\"SEQ_ReportExec\" strategy=\"TABLE\"/>\n"
-            + "        <table-generator name=\"SEQ_ReportExec\" pk-column-value=\"SEQ_ReportExec\" initial-value=\"100\"/>\n"
-            + "      </id>\n" + "    </attributes>\n" + "  </entity>\n"
-            + "  <entity class=\"org.apache.syncope.core.persistence.beans.ReportletConfInstance\">\n"
-            + "    <attributes>\n" + "      <id name=\"id\">\n"
-            + "        <generated-value generator=\"SEQ_ReportletConfInstance\" strategy=\"TABLE\"/>\n"
-            + "        <table-generator name=\"SEQ_ReportletConfInstance\" pk-column-value=\"SEQ_ReportletConfInstance\" initial-value=\"100\"/>\n"
-            + "      </id>\n" + "    </attributes>\n" + "  </entity>\n"
-            + "  <entity class=\"org.apache.syncope.core.persistence.beans.Notification\">\n" + "    <attributes>\n"
-            + "      <id name=\"id\">\n"
-            + "        <generated-value generator=\"SEQ_Notification\" strategy=\"TABLE\"/>\n"
-            + "        <table-generator name=\"SEQ_Notification\" pk-column-value=\"SEQ_Notification\" initial-value=\"100\"/>\n"
-            + "      </id>\n" + "    </attributes>\n" + "  </entity>\n"
-            + "  <entity class=\"org.apache.syncope.core.persistence.beans.SecurityQuestion\">\n" + "    <attributes>\n"
-            + "      <id name=\"id\">\n"
-            + "        <generated-value generator=\"SEQ_SecurityQuestion\" strategy=\"TABLE\"/>\n"
-            + "        <table-generator name=\"SEQ_SecurityQuestion\" pk-column-value=\"SEQ_SecurityQuestion\" initial-value=\"100\"/>\n"
-            + "      </id>\n" + "    </attributes>\n" + "  </entity>  \n" + "</entity-mappings>\n" + "";
-
-}

http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/installer/src/main/java/org/apache/syncope/installer/utilities/FileSystemUtils.java
----------------------------------------------------------------------
diff --git a/installer/src/main/java/org/apache/syncope/installer/utilities/FileSystemUtils.java b/installer/src/main/java/org/apache/syncope/installer/utilities/FileSystemUtils.java
index 7e9f7b8..b44af43 100644
--- a/installer/src/main/java/org/apache/syncope/installer/utilities/FileSystemUtils.java
+++ b/installer/src/main/java/org/apache/syncope/installer/utilities/FileSystemUtils.java
@@ -30,6 +30,7 @@ import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.net.URL;
+import java.nio.charset.Charset;
 import javax.xml.transform.OutputKeys;
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerException;
@@ -146,7 +147,7 @@ public class FileSystemUtils {
             transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
             transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "4");
             transformer.transform(new DOMSource(doc),
-                    new StreamResult(new OutputStreamWriter(out, "UTF-8")));
+                    new StreamResult(new OutputStreamWriter(out, Charset.forName("UTF-8"))));
         } finally {
             IOUtils.closeQuietly(out);
         }

http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e8381bf..054db15 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1196,6 +1196,7 @@ under the License.
             <rulesets>
               <rulesets>${rootpom.basedir}/src/main/resources/org/apache/syncope/pmd.xml</rulesets>
             </rulesets>
+            <linkXRef>false</linkXRef>
             <targetJdk>${targetJdk}</targetJdk>
           </configuration>
         </plugin>
@@ -1222,6 +1223,56 @@ under the License.
 
     <plugins>     
       <plugin>
+        <groupId>org.gaul</groupId>
+        <artifactId>modernizer-maven-plugin</artifactId>
+        <version>1.3.0</version>
+        <configuration>
+          <javaVersion>${targetJdk}</javaVersion>
+          <ignorePackages>
+            <ignorePackage>org.apache.syncope.core.persistence.jpa.entity</ignorePackage>
+          </ignorePackages>
+        </configuration>
+        <executions>
+          <execution>
+            <id>modernizer</id>
+            <phase>verify</phase>
+            <goals>
+              <goal>modernizer</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
+      <!-- Enable with SYNCOPE-657
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>checkstyle-check</id>
+            <phase>verify</phase>
+            <goals>
+              <goal>check</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-pmd-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>pmd-check</id>
+            <phase>verify</phase>
+            <goals>
+              <goal>check</goal>
+              <goal>cpd-check</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>-->
+
+      <plugin>
         <groupId>org.codehaus.gmaven</groupId>
         <artifactId>gmaven-plugin</artifactId>
         <version>1.5</version>

http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/src/main/resources/org/apache/syncope/checkstyle.xml
----------------------------------------------------------------------
diff --git a/src/main/resources/org/apache/syncope/checkstyle.xml b/src/main/resources/org/apache/syncope/checkstyle.xml
index e824479..e912c8b 100644
--- a/src/main/resources/org/apache/syncope/checkstyle.xml
+++ b/src/main/resources/org/apache/syncope/checkstyle.xml
@@ -56,7 +56,7 @@ under the License.
 
   <!-- Checks that a package-info.java file exists for each package.     -->
   <!-- See http://checkstyle.sf.net/config_javadoc.html#JavadocPackage -->
-  <module name="JavadocPackage"/>
+  <!--<module name="JavadocPackage"/>-->
 
   <!-- Checks whether files end with a new line.                        -->
   <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
@@ -89,10 +89,16 @@ under the License.
 
     <!-- Checks for Javadoc comments.                     -->
     <!-- See http://checkstyle.sf.net/config_javadoc.html -->
-    <module name="JavadocMethod"/>
+    <!--<module name="JavadocMethod">
+      <property name="scope" value="public"/>
+      <property name="allowMissingPropertyJavadoc" value="true"/>
+    </module>
     <module name="JavadocType"/>
-    <module name="JavadocVariable"/>
-    <module name="JavadocStyle"/>
+    <module name="JavadocVariable">
+      <property name="scope" value="public"/>
+      <property name="ignoreNamePattern" value="LOG"/>
+    </module>
+    <module name="JavadocStyle"/>-->
 
 
     <!-- Checks for Naming Conventions.                  -->
@@ -104,7 +110,9 @@ under the License.
     <module name="MethodName"/>
     <module name="PackageName"/>
     <module name="ParameterName"/>
-    <module name="StaticVariableName"/>
+    <module name="StaticVariableName">
+      <property name="format" value="^[A-Z][A-Z0-9_]*$"/>
+    </module>
     <module name="TypeName"/>
 
 
@@ -140,8 +148,8 @@ under the License.
       <property name="max" value="120"/>
       <property name="ignorePattern" value="^import"/>
     </module>
-    <module name="MethodLength"/>
-    <module name="ParameterNumber"/>
+    <!--<module name="MethodLength"/>-->
+    <!--<module name="ParameterNumber"/>-->
 
 
     <!-- Checks for whitespace                               -->
@@ -167,7 +175,9 @@ under the License.
     <!-- Checks for blocks. You know, those {}'s         -->
     <!-- See http://checkstyle.sf.net/config_blocks.html -->
     <module name="AvoidNestedBlocks"/>
-    <module name="EmptyBlock"/>
+    <module name="EmptyBlock">
+      <property name="option" value="text"/>
+    </module>
     <module name="LeftCurly"/>
     <module name="NeedBraces"/>
     <module name="RightCurly"/>
@@ -176,7 +186,6 @@ under the License.
     <!-- Checks for common coding problems               -->
     <!-- See http://checkstyle.sf.net/config_coding.html -->
     <!--        <module name="AvoidInlineConditionals"/>-->
-    <!--module name="DoubleCheckedLocking"/-->    <!-- MY FAVOURITE -->
     <module name="EmptyStatement"/>
     <module name="EqualsHashCode"/>
     <module name="HiddenField">
@@ -196,7 +205,7 @@ under the License.
     <!--<module name="DesignForExtension"/>-->
     <module name="FinalClass"/>
     <module name="HideUtilityClassConstructor"/>
-    <module name="InterfaceIsType"/>
+    <!--<module name="InterfaceIsType"/>-->
     <module name="VisibilityModifier">
       <property name="protectedAllowed" value="true"/>
     </module>

http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/src/main/resources/org/apache/syncope/pmd.xml
----------------------------------------------------------------------
diff --git a/src/main/resources/org/apache/syncope/pmd.xml b/src/main/resources/org/apache/syncope/pmd.xml
index 28cfb4c..5190d40 100644
--- a/src/main/resources/org/apache/syncope/pmd.xml
+++ b/src/main/resources/org/apache/syncope/pmd.xml
@@ -23,27 +23,58 @@ under the License.
          xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd"
          xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd">
         
-  <rule ref="rulesets/basic.xml"/>
-  <rule ref="rulesets/naming.xml">
+  <rule ref="rulesets/java/basic.xml"/>
+  <rule ref="rulesets/java/naming.xml">
     <exclude name="ShortVariable"/>
     <exclude name="LongVariable"/>
+    <exclude name="ShortMethodName"/>
+    <exclude name="ShortClassName"/>
+    <exclude name="GenericsNaming"/>
   </rule>
-  <rule ref="rulesets/unusedcode.xml"/>
-  <rule ref="rulesets/design.xml"/>
-  <rule ref="rulesets/imports.xml"/>
-  <rule ref="rulesets/strings.xml">
+  <rule ref="rulesets/java/unusedcode.xml"/>
+  <rule ref="rulesets/java/design.xml">
+    <exclude name="GodClass"/>
+    <exclude name="UseLocaleWithCaseConversions"/>
+    <exclude name="ConfusingTernary"/>
+    <exclude name="NonStaticInitializer"/>
+    <exclude name="AvoidConstantsInterface"/>
+    <exclude name="AvoidDeeplyNestedIfStmts"/>
+  </rule>
+  <rule ref="rulesets/java/imports.xml"/>
+  <rule ref="rulesets/java/strings.xml">
     <exclude name="AvoidDuplicateLiterals"/>
+    <exclude name="AvoidStringBufferField"/>
+  </rule>
+  <rule ref="rulesets/java/codesize.xml">
+    <exclude name="TooManyFields"/>
+    <exclude name="TooManyMethods"/>
+    <exclude name="ExcessivePublicCount"/>
+    <exclude name="CyclomaticComplexity"/>
+    <exclude name="StdCyclomaticComplexity"/>
+    <exclude name="ModifiedCyclomaticComplexity"/>
+    <exclude name="NPathComplexity"/>
+    <exclude name="ExcessiveMethodLength"/>
   </rule>
-  <rule ref="rulesets/codesize.xml"/>
-  <rule ref="rulesets/javabeans.xml">
+  <rule ref="rulesets/java/javabeans.xml">
     <exclude name="BeanMembersShouldSerialize"/>
   </rule>
-  <rule ref="rulesets/coupling.xml"/>
-  <rule ref="rulesets/controversial.xml">
+  <rule ref="rulesets/java/coupling.xml">
+    <exclude name="LoosePackageCoupling"/>
+    <exclude name="LawOfDemeter"/>
+    <exclude name="ExcessiveImports"/>
+  </rule>
+  <rule ref="rulesets/java/controversial.xml">
     <exclude name="NullAssignment"/>
     <exclude name="DataflowAnomalyAnalysis"/>
+    <exclude name="AtLeastOneConstructor"/>
+    <exclude name="OnlyOneReturn"/>
+    <exclude name="UseConcurrentHashMap"/>
+    <exclude name="AvoidLiteralsInIfCondition"/>
+    <exclude name="UseObjectForClearerAPI"/>
+  </rule>
+  <rule ref="rulesets/java/strictexception.xml">
+    <exclude name="AvoidCatchingGenericException"/>
   </rule>
-  <rule ref="rulesets/strictexception.xml"/>
-  <rule ref="rulesets/typeresolution.xml"/>
+  <rule ref="rulesets/java/typeresolution.xml"/>
     
 </ruleset>

http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/src/site/xdoc/architecture.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/architecture.xml b/src/site/xdoc/architecture.xml
index 024609e..9d5ddc2 100644
--- a/src/site/xdoc/architecture.xml
+++ b/src/site/xdoc/architecture.xml
@@ -88,7 +88,7 @@ under the License.
 
       <subsection name="JPA persistence layer">
         <p>
-          All data in Apache Syncope (users, roles, attributes, resources, ...) is managed at a high level using a 
+          All data in Apache Syncope (users, groups, attributes, resources, ...) is managed at a high level using a 
           standard JPA 2.0 approach and persisted to an underlying database.
         </p>
         <p>

http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/src/site/xdoc/features.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/features.xml b/src/site/xdoc/features.xml
index af2fc35..c503ab5 100644
--- a/src/site/xdoc/features.xml
+++ b/src/site/xdoc/features.xml
@@ -27,15 +27,15 @@ under the License.
   </properties>
 
   <body>    
-    <section name="Account and Role Administration">
+    <section name="Account and Group Administration">
       <ul>
         <li>Password management and Self-Service Operations</li>
         <li>Configurable Password encryption</li>
         <li>Attribute validators (Reg-Exp based and custom)</li>
         <li>Account Policy management</li>
         <li>Password Policy management</li>
-        <li>User role-based provisioning</li>
-        <li>Role provisioning</li>
+        <li>User group-based provisioning</li>
+        <li>Group provisioning</li>
         <li>Account status information on external resources</li>
       </ul>
     </section>
@@ -71,9 +71,9 @@ under the License.
       <ul>
         <li>RESTFul interface</li>
         <li>Web-based multilingual AJAX administration console</li>
-        <li>Role-based administration</li>
+        <li>Group-based administration</li>
         <li>Attribute schema, Derived attribute schema and Virtual Attribute schema management</li>
-        <li>Role tree management</li>
+        <li>Group tree management</li>
         <li>Schedulable Task execution</li>
       </ul>
     </section>

http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/src/site/xdoc/index.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
index bc8b898..ee3af80 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@@ -40,7 +40,7 @@ under the License.
 
       <p>
         <span style="font-weight: bold">Identity management</span> (or IdM) represents the joint result of business process and IT to manage user data on systems
-        and applications. IdM involves considering user attributes, roles, resources and entitlements in trying to give a 
+        and applications. IdM involves considering user attributes, groups, resources and entitlements in trying to give a 
         decent answer to the question bumping up every time in an IT administrator's mind:
       </p>
 

http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/src/site/xdoc/security.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/security.xml b/src/site/xdoc/security.xml
index 716470d..fc5619e 100644
--- a/src/site/xdoc/security.xml
+++ b/src/site/xdoc/security.xml
@@ -63,7 +63,7 @@ under the License.
 
       <subsection name="CVE-2014-0111: Remote code execution by an authenticated administrator">	
         <p>In the various places in which Apache Commons JEXL expressions are allowed (derived schema definition, 
-          user / role templates, account links of resource mappings) a malicious administrator can inject Java code 
+          user / group templates, account links of resource mappings) a malicious administrator can inject Java code 
           that can be executed remotely by the JEE container running the Apache Syncope core.</p>
 
         <p>


Mime
View raw message