syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject svn commit: r1297877 [4/9] - in /incubator/syncope/trunk: ./ archetype/ archetype/src/main/resources/META-INF/maven/ archetype/src/main/resources/archetype-resources/ archetype/src/main/resources/archetype-resources/console/ archetype/src/main/resource...
Date Wed, 07 Mar 2012 08:24:57 GMT
Modified: incubator/syncope/trunk/core/src/main/resources/META-INF/orm.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/resources/META-INF/orm.xml?rev=1297877&r1=1297876&r2=1297877&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/resources/META-INF/orm.xml (original)
+++ incubator/syncope/trunk/core/src/main/resources/META-INF/orm.xml Wed Mar  7 08:24:55 2012
@@ -1,255 +1,260 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Licensed 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.
+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.
+
 -->
-<entity-mappings
-    xmlns="http://java.sun.com/xml/ns/persistence/orm"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm 
-  http://java.sun.com/xml/ns/persistence/orm_2_0.xsd"
-    version="2.0">
-
-    <table-generator name="SEQ_UAttrValue" pk-column-value="SEQ_UAttrValue" initial-value="100"/>
-    <table-generator name="SEQ_RAttrValue" pk-column-value="SEQ_RAttrValue" initial-value="100"/>
-    <table-generator name="SEQ_MAttrValue" pk-column-value="SEQ_MAttrValue" initial-value="100"/>
-
-    <entity class="org.syncope.core.persistence.beans.user.SyncopeUser">
-        <attributes>
-            <id name="id">
-                <generated-value generator="SEQ_SyncopeUser" strategy="TABLE"/>
-                <table-generator name="SEQ_SyncopeUser" pk-column-value="SEQ_SyncopeUser" initial-value="100"/>
-            </id>
-        </attributes>
-    </entity>
-
-    <entity class="org.syncope.core.persistence.beans.role.SyncopeRole">
-        <attributes>
-            <id name="id">
-                <generated-value generator="SEQ_SyncopeRole" strategy="TABLE"/>
-                <table-generator name="SEQ_SyncopeRole" pk-column-value="SEQ_SyncopeRole" initial-value="10"/>
-            </id>
-        </attributes>
-    </entity>
-
-    <entity class="org.syncope.core.persistence.beans.membership.Membership">
-        <attributes>
-            <id name="id">
-                <generated-value generator="SEQ_Membership" strategy="TABLE"/>
-                <table-generator name="SEQ_Membership" pk-column-value="SEQ_Membership" initial-value="10"/>
-            </id>
-        </attributes>
-    </entity>
-
-    <entity class="org.syncope.core.persistence.beans.SchemaMapping">
-        <attributes>
-            <id name="id">
-                <generated-value generator="SEQ_SchemaMapping" strategy="TABLE"/>
-                <table-generator name="SEQ_SchemaMapping" pk-column-value="SEQ_SchemaMapping" initial-value="1000"/>
-            </id>
-        </attributes>
-    </entity>
-
-    <entity class="org.syncope.core.persistence.beans.ConnInstance">
-        <attributes>
-            <id name="id">
-                <generated-value generator="SEQ_ConnInstance" strategy="TABLE"/>
-                <table-generator name="SEQ_ConnInstance" pk-column-value="SEQ_ConnInstance" initial-value="1000"/>
-            </id>
-        </attributes>
-    </entity>
-
-    <entity class="org.syncope.core.persistence.beans.user.UAttr">
-        <attributes>
-            <id name="id">
-                <generated-value generator="SEQ_UAttr" strategy="TABLE"/>
-                <table-generator name="SEQ_UAttr" pk-column-value="SEQ_UAttr" initial-value="1000"/>
-            </id>
-        </attributes>
-    </entity>
-    <entity class="org.syncope.core.persistence.beans.role.RAttr">
-        <attributes>
-            <id name="id">
-                <generated-value generator="SEQ_RAttr" strategy="TABLE"/>
-                <table-generator name="SEQ_RAttr" pk-column-value="SEQ_RAttr" initial-value="1000"/>
-            </id>
-        </attributes>
-    </entity>
-    <entity class="org.syncope.core.persistence.beans.membership.MAttr">
-        <attributes>
-            <id name="id">
-                <generated-value generator="SEQ_MAttr" strategy="TABLE"/>
-                <table-generator name="SEQ_MAttr" pk-column-value="SEQ_MAttr" initial-value="1000"/>
-            </id>
-        </attributes>
-    </entity>
+<entity-mappings  xmlns="http://java.sun.com/xml/ns/persistence/orm"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm 
+                                      http://java.sun.com/xml/ns/persistence/orm_2_0.xsd"
+                  version="2.0">
+
+  <table-generator name="SEQ_UAttrValue" pk-column-value="SEQ_UAttrValue" initial-value="100"/>
+  <table-generator name="SEQ_RAttrValue" pk-column-value="SEQ_RAttrValue" initial-value="100"/>
+  <table-generator name="SEQ_MAttrValue" pk-column-value="SEQ_MAttrValue" initial-value="100"/>
+
+  <entity class="org.syncope.core.persistence.beans.user.SyncopeUser">
+    <attributes>
+      <id name="id">
+        <generated-value generator="SEQ_SyncopeUser" strategy="TABLE"/>
+        <table-generator name="SEQ_SyncopeUser" pk-column-value="SEQ_SyncopeUser" initial-value="100"/>
+      </id>
+    </attributes>
+  </entity>
+
+  <entity class="org.syncope.core.persistence.beans.role.SyncopeRole">
+    <attributes>
+      <id name="id">
+        <generated-value generator="SEQ_SyncopeRole" strategy="TABLE"/>
+        <table-generator name="SEQ_SyncopeRole" pk-column-value="SEQ_SyncopeRole" initial-value="10"/>
+      </id>
+    </attributes>
+  </entity>
+
+  <entity class="org.syncope.core.persistence.beans.membership.Membership">
+    <attributes>
+      <id name="id">
+        <generated-value generator="SEQ_Membership" strategy="TABLE"/>
+        <table-generator name="SEQ_Membership" pk-column-value="SEQ_Membership" initial-value="10"/>
+      </id>
+    </attributes>
+  </entity>
+
+  <entity class="org.syncope.core.persistence.beans.SchemaMapping">
+    <attributes>
+      <id name="id">
+        <generated-value generator="SEQ_SchemaMapping" strategy="TABLE"/>
+        <table-generator name="SEQ_SchemaMapping" pk-column-value="SEQ_SchemaMapping" initial-value="1000"/>
+      </id>
+    </attributes>
+  </entity>
+
+  <entity class="org.syncope.core.persistence.beans.ConnInstance">
+    <attributes>
+      <id name="id">
+        <generated-value generator="SEQ_ConnInstance" strategy="TABLE"/>
+        <table-generator name="SEQ_ConnInstance" pk-column-value="SEQ_ConnInstance" initial-value="1000"/>
+      </id>
+    </attributes>
+  </entity>
+
+  <entity class="org.syncope.core.persistence.beans.user.UAttr">
+    <attributes>
+      <id name="id">
+        <generated-value generator="SEQ_UAttr" strategy="TABLE"/>
+        <table-generator name="SEQ_UAttr" pk-column-value="SEQ_UAttr" initial-value="1000"/>
+      </id>
+    </attributes>
+  </entity>
+  <entity class="org.syncope.core.persistence.beans.role.RAttr">
+    <attributes>
+      <id name="id">
+        <generated-value generator="SEQ_RAttr" strategy="TABLE"/>
+        <table-generator name="SEQ_RAttr" pk-column-value="SEQ_RAttr" initial-value="1000"/>
+      </id>
+    </attributes>
+  </entity>
+  <entity class="org.syncope.core.persistence.beans.membership.MAttr">
+    <attributes>
+      <id name="id">
+        <generated-value generator="SEQ_MAttr" strategy="TABLE"/>
+        <table-generator name="SEQ_MAttr" pk-column-value="SEQ_MAttr" initial-value="1000"/>
+      </id>
+    </attributes>
+  </entity>
     
-    <entity class="org.syncope.core.persistence.beans.user.UAttrValue">
-        <attributes>
-            <id name="id">
-                <generated-value generator="SEQ_UAttrValue" strategy="TABLE"/>
-            </id>
-        </attributes>
-    </entity>
-    <entity class="org.syncope.core.persistence.beans.user.UAttrUniqueValue">
-        <table>
-            <unique-constraint>
-                <column-name>booleanValue</column-name>
-                <column-name>schema_name</column-name>
-            </unique-constraint>
-            <unique-constraint>
-                <column-name>dateValue</column-name>
-                <column-name>schema_name</column-name>
-            </unique-constraint>
-            <unique-constraint>
-                <column-name>stringValue</column-name>
-                <column-name>schema_name</column-name>
-            </unique-constraint>
-            <unique-constraint>
-                <column-name>doubleValue</column-name>
-                <column-name>schema_name</column-name>
-            </unique-constraint>
-            <unique-constraint>
-                <column-name>longValue</column-name>
-                <column-name>schema_name</column-name>
-            </unique-constraint>
-        </table>
-        <attributes>
-            <id name="id">
-                <generated-value generator="SEQ_UAttrValue" strategy="TABLE"/>
-            </id>
-        </attributes>
-    </entity>
-    <entity class="org.syncope.core.persistence.beans.role.RAttrValue">
-        <attributes>
-            <id name="id">
-                <generated-value generator="SEQ_RAttrValue" strategy="TABLE"/>
-            </id>
-        </attributes>
-    </entity>
-    <entity class="org.syncope.core.persistence.beans.role.RAttrUniqueValue">
-        <table>
-            <unique-constraint>
-                <column-name>booleanValue</column-name>
-                <column-name>schema_name</column-name>
-            </unique-constraint>
-            <unique-constraint>
-                <column-name>dateValue</column-name>
-                <column-name>schema_name</column-name>
-            </unique-constraint>
-            <unique-constraint>
-                <column-name>stringValue</column-name>
-                <column-name>schema_name</column-name>
-            </unique-constraint>
-            <unique-constraint>
-                <column-name>doubleValue</column-name>
-                <column-name>schema_name</column-name>
-            </unique-constraint>
-            <unique-constraint>
-                <column-name>longValue</column-name>
-                <column-name>schema_name</column-name>
-            </unique-constraint>
-        </table>
-        <attributes>
-            <id name="id">
-                <generated-value generator="SEQ_RAttrValue" strategy="TABLE"/>
-            </id>
-        </attributes>
-    </entity>
-    <entity class="org.syncope.core.persistence.beans.membership.MAttrValue">
-        <attributes>
-            <id name="id">
-                <generated-value generator="SEQ_MAttrValue" strategy="TABLE"/>
-            </id>
-        </attributes>
-    </entity>
-    <entity class="org.syncope.core.persistence.beans.membership.MAttrUniqueValue">
-        <table>
-            <unique-constraint>
-                <column-name>booleanValue</column-name>
-                <column-name>schema_name</column-name>
-            </unique-constraint>
-            <unique-constraint>
-                <column-name>dateValue</column-name>
-                <column-name>schema_name</column-name>
-            </unique-constraint>
-            <unique-constraint>
-                <column-name>stringValue</column-name>
-                <column-name>schema_name</column-name>
-            </unique-constraint>
-            <unique-constraint>
-                <column-name>doubleValue</column-name>
-                <column-name>schema_name</column-name>
-            </unique-constraint>
-            <unique-constraint>
-                <column-name>longValue</column-name>
-                <column-name>schema_name</column-name>
-            </unique-constraint>
-        </table>
-        <attributes>
-            <id name="id">
-                <generated-value generator="SEQ_MAttrValue" strategy="TABLE"/>
-            </id>
-        </attributes>
-    </entity>
-
-    <entity class="org.syncope.core.persistence.beans.Task">
-        <attributes>
-            <id name="id">
-                <generated-value generator="SEQ_Task" strategy="TABLE"/>
-                <table-generator name="SEQ_Task" pk-column-value="SEQ_Task" initial-value="10"/>
-            </id>
-        </attributes>
-    </entity>
-    <entity class="org.syncope.core.persistence.beans.TaskExec">
-        <attributes>
-            <id name="id">
-                <generated-value generator="SEQ_TaskExec" strategy="TABLE"/>
-                <table-generator name="SEQ_TaskExec" pk-column-value="SEQ_TaskExec" initial-value="10"/>
-            </id>
-        </attributes>
-    </entity>
+  <entity class="org.syncope.core.persistence.beans.user.UAttrValue">
+    <attributes>
+      <id name="id">
+        <generated-value generator="SEQ_UAttrValue" strategy="TABLE"/>
+      </id>
+    </attributes>
+  </entity>
+  <entity class="org.syncope.core.persistence.beans.user.UAttrUniqueValue">
+    <table>
+      <unique-constraint>
+        <column-name>booleanValue</column-name>
+        <column-name>schema_name</column-name>
+      </unique-constraint>
+      <unique-constraint>
+        <column-name>dateValue</column-name>
+        <column-name>schema_name</column-name>
+      </unique-constraint>
+      <unique-constraint>
+        <column-name>stringValue</column-name>
+        <column-name>schema_name</column-name>
+      </unique-constraint>
+      <unique-constraint>
+        <column-name>doubleValue</column-name>
+        <column-name>schema_name</column-name>
+      </unique-constraint>
+      <unique-constraint>
+        <column-name>longValue</column-name>
+        <column-name>schema_name</column-name>
+      </unique-constraint>
+    </table>
+    <attributes>
+      <id name="id">
+        <generated-value generator="SEQ_UAttrValue" strategy="TABLE"/>
+      </id>
+    </attributes>
+  </entity>
+  <entity class="org.syncope.core.persistence.beans.role.RAttrValue">
+    <attributes>
+      <id name="id">
+        <generated-value generator="SEQ_RAttrValue" strategy="TABLE"/>
+      </id>
+    </attributes>
+  </entity>
+  <entity class="org.syncope.core.persistence.beans.role.RAttrUniqueValue">
+    <table>
+      <unique-constraint>
+        <column-name>booleanValue</column-name>
+        <column-name>schema_name</column-name>
+      </unique-constraint>
+      <unique-constraint>
+        <column-name>dateValue</column-name>
+        <column-name>schema_name</column-name>
+      </unique-constraint>
+      <unique-constraint>
+        <column-name>stringValue</column-name>
+        <column-name>schema_name</column-name>
+      </unique-constraint>
+      <unique-constraint>
+        <column-name>doubleValue</column-name>
+        <column-name>schema_name</column-name>
+      </unique-constraint>
+      <unique-constraint>
+        <column-name>longValue</column-name>
+        <column-name>schema_name</column-name>
+      </unique-constraint>
+    </table>
+    <attributes>
+      <id name="id">
+        <generated-value generator="SEQ_RAttrValue" strategy="TABLE"/>
+      </id>
+    </attributes>
+  </entity>
+  <entity class="org.syncope.core.persistence.beans.membership.MAttrValue">
+    <attributes>
+      <id name="id">
+        <generated-value generator="SEQ_MAttrValue" strategy="TABLE"/>
+      </id>
+    </attributes>
+  </entity>
+  <entity class="org.syncope.core.persistence.beans.membership.MAttrUniqueValue">
+    <table>
+      <unique-constraint>
+        <column-name>booleanValue</column-name>
+        <column-name>schema_name</column-name>
+      </unique-constraint>
+      <unique-constraint>
+        <column-name>dateValue</column-name>
+        <column-name>schema_name</column-name>
+      </unique-constraint>
+      <unique-constraint>
+        <column-name>stringValue</column-name>
+        <column-name>schema_name</column-name>
+      </unique-constraint>
+      <unique-constraint>
+        <column-name>doubleValue</column-name>
+        <column-name>schema_name</column-name>
+      </unique-constraint>
+      <unique-constraint>
+        <column-name>longValue</column-name>
+        <column-name>schema_name</column-name>
+      </unique-constraint>
+    </table>
+    <attributes>
+      <id name="id">
+        <generated-value generator="SEQ_MAttrValue" strategy="TABLE"/>
+      </id>
+    </attributes>
+  </entity>
+
+  <entity class="org.syncope.core.persistence.beans.Task">
+    <attributes>
+      <id name="id">
+        <generated-value generator="SEQ_Task" strategy="TABLE"/>
+        <table-generator name="SEQ_Task" pk-column-value="SEQ_Task" initial-value="10"/>
+      </id>
+    </attributes>
+  </entity>
+  <entity class="org.syncope.core.persistence.beans.TaskExec">
+    <attributes>
+      <id name="id">
+        <generated-value generator="SEQ_TaskExec" strategy="TABLE"/>
+        <table-generator name="SEQ_TaskExec" pk-column-value="SEQ_TaskExec" initial-value="10"/>
+      </id>
+    </attributes>
+  </entity>
     
-    <entity class="org.syncope.core.persistence.beans.Policy">
-        <attributes>
-            <id name="id">
-                <generated-value generator="SEQ_Policy" strategy="TABLE"/>
-                <table-generator name="SEQ_Policy" pk-column-value="SEQ_Policy" initial-value="1000"/>
-            </id>
-        </attributes>
-    </entity>
-
-    <entity class="org.syncope.core.persistence.beans.Report">
-        <attributes>
-            <id name="id">
-                <generated-value generator="SEQ_Report" strategy="TABLE"/>
-                <table-generator name="SEQ_Report" pk-column-value="SEQ_Report" initial-value="100"/>
-            </id>
-        </attributes>
-    </entity>
-    <entity class="org.syncope.core.persistence.beans.ReportExec">
-        <attributes>
-            <id name="id">
-                <generated-value generator="SEQ_ReportExec" strategy="TABLE"/>
-                <table-generator name="SEQ_ReportExec" pk-column-value="SEQ_ReportExec" initial-value="100"/>
-            </id>
-        </attributes>
-    </entity>
-    <entity class="org.syncope.core.persistence.beans.ReportletConfInstance">
-        <attributes>
-            <id name="id">
-                <generated-value generator="SEQ_ReportletConfInstance" strategy="TABLE"/>
-                <table-generator name="SEQ_ReportletConfInstance" pk-column-value="SEQ_ReportletConfInstance" initial-value="100"/>
-            </id>
-        </attributes>
-    </entity>
+  <entity class="org.syncope.core.persistence.beans.Policy">
+    <attributes>
+      <id name="id">
+        <generated-value generator="SEQ_Policy" strategy="TABLE"/>
+        <table-generator name="SEQ_Policy" pk-column-value="SEQ_Policy" initial-value="1000"/>
+      </id>
+    </attributes>
+  </entity>
+
+  <entity class="org.syncope.core.persistence.beans.Report">
+    <attributes>
+      <id name="id">
+        <generated-value generator="SEQ_Report" strategy="TABLE"/>
+        <table-generator name="SEQ_Report" pk-column-value="SEQ_Report" initial-value="100"/>
+      </id>
+    </attributes>
+  </entity>
+  <entity class="org.syncope.core.persistence.beans.ReportExec">
+    <attributes>
+      <id name="id">
+        <generated-value generator="SEQ_ReportExec" strategy="TABLE"/>
+        <table-generator name="SEQ_ReportExec" pk-column-value="SEQ_ReportExec" initial-value="100"/>
+      </id>
+    </attributes>
+  </entity>
+  <entity class="org.syncope.core.persistence.beans.ReportletConfInstance">
+    <attributes>
+      <id name="id">
+        <generated-value generator="SEQ_ReportletConfInstance" strategy="TABLE"/>
+        <table-generator name="SEQ_ReportletConfInstance" pk-column-value="SEQ_ReportletConfInstance" initial-value="100"/>
+      </id>
+    </attributes>
+  </entity>
 </entity-mappings>

Modified: incubator/syncope/trunk/core/src/main/resources/META-INF/orm.xml.oracle
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/resources/META-INF/orm.xml.oracle?rev=1297877&r1=1297876&r2=1297877&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/resources/META-INF/orm.xml.oracle (original)
+++ incubator/syncope/trunk/core/src/main/resources/META-INF/orm.xml.oracle Wed Mar  7 08:24:55 2012
@@ -1,219 +1,224 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Licensed 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.
+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.
+
 -->
-<entity-mappings
-    xmlns="http://java.sun.com/xml/ns/persistence/orm"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm 
-  http://java.sun.com/xml/ns/persistence/orm_2_0.xsd"
-    version="2.0">
-
-    <table-generator name="SEQ_UAttrValue" pk-column-value="SEQ_UAttrValue" initial-value="100"/>
-    <table-generator name="SEQ_RAttrValue" pk-column-value="SEQ_RAttrValue" initial-value="100"/>
-    <table-generator name="SEQ_MAttrValue" pk-column-value="SEQ_MAttrValue" initial-value="100"/>
-
-    <entity class="org.syncope.core.persistence.beans.user.SyncopeUser">
-        <attributes>
-            <id name="id">
-                <generated-value generator="SEQ_SyncopeUser" strategy="TABLE"/>
-                <table-generator name="SEQ_SyncopeUser" pk-column-value="SEQ_SyncopeUser" initial-value="100"/>
-            </id>
-        </attributes>
-    </entity>
-
-    <entity class="org.syncope.core.persistence.beans.role.SyncopeRole">
-        <attributes>
-            <id name="id">
-                <generated-value generator="SEQ_SyncopeRole" strategy="TABLE"/>
-                <table-generator name="SEQ_SyncopeRole" pk-column-value="SEQ_SyncopeRole" initial-value="10"/>
-            </id>
-        </attributes>
-    </entity>
-
-    <entity class="org.syncope.core.persistence.beans.membership.Membership">
-        <attributes>
-            <id name="id">
-                <generated-value generator="SEQ_Membership" strategy="TABLE"/>
-                <table-generator name="SEQ_Membership" pk-column-value="SEQ_Membership" initial-value="10"/>
-            </id>
-        </attributes>
-    </entity>
-
-    <entity class="org.syncope.core.persistence.beans.SchemaMapping">
-        <attributes>
-            <id name="id">
-                <generated-value generator="SEQ_SchemaMapping" strategy="TABLE"/>
-                <table-generator name="SEQ_SchemaMapping" pk-column-value="SEQ_SchemaMapping" initial-value="1000"/>
-            </id>
-        </attributes>
-    </entity>
-
-    <entity class="org.syncope.core.persistence.beans.ConnInstance">
-        <attributes>
-            <id name="id">
-                <generated-value generator="SEQ_ConnInstance" strategy="TABLE"/>
-                <table-generator name="SEQ_ConnInstance" pk-column-value="SEQ_ConnInstance" initial-value="1000"/>
-            </id>
-        </attributes>
-    </entity>
-
-    <entity class="org.syncope.core.persistence.beans.user.UAttr">
-        <attributes>
-            <id name="id">
-                <generated-value generator="SEQ_UAttr" strategy="TABLE"/>
-                <table-generator name="SEQ_UAttr" pk-column-value="SEQ_UAttr" initial-value="1000"/>
-            </id>
-        </attributes>
-    </entity>
-    <entity class="org.syncope.core.persistence.beans.role.RAttr">
-        <attributes>
-            <id name="id">
-                <generated-value generator="SEQ_RAttr" strategy="TABLE"/>
-                <table-generator name="SEQ_RAttr" pk-column-value="SEQ_RAttr" initial-value="1000"/>
-            </id>
-        </attributes>
-    </entity>
-    <entity class="org.syncope.core.persistence.beans.membership.MAttr">
-        <attributes>
-            <id name="id">
-                <generated-value generator="SEQ_MAttr" strategy="TABLE"/>
-                <table-generator name="SEQ_MAttr" pk-column-value="SEQ_MAttr" initial-value="1000"/>
-            </id>
-        </attributes>
-    </entity>
-
-    <entity class="org.syncope.core.persistence.beans.user.UAttrValue">
-        <attributes>
-            <id name="id">
-                <generated-value generator="SEQ_UAttrValue" strategy="TABLE"/>
-            </id>
-        </attributes>
-    </entity>
-    <entity class="org.syncope.core.persistence.beans.user.UAttrUniqueValue">
-        <table>
-            <unique-constraint>
-                <column-name>booleanValue</column-name>
-                <column-name>dateValue</column-name>
-                <column-name>stringValue</column-name>
-                <column-name>doubleValue</column-name>
-                <column-name>longValue</column-name>
-                <column-name>schema_name</column-name>
-            </unique-constraint>
-        </table>
-        <attributes>
-            <id name="id">
-                <generated-value generator="SEQ_UAttrValue" strategy="TABLE"/>
-            </id>
-        </attributes>
-    </entity>
-    <entity class="org.syncope.core.persistence.beans.role.RAttrValue">
-        <attributes>
-            <id name="id">
-                <generated-value generator="SEQ_RAttrValue" strategy="TABLE"/>
-            </id>
-        </attributes>
-    </entity>
-    <entity class="org.syncope.core.persistence.beans.role.RAttrUniqueValue">
-        <table>
-            <unique-constraint>
-                <column-name>booleanValue</column-name>
-                <column-name>dateValue</column-name>
-                <column-name>stringValue</column-name>
-                <column-name>doubleValue</column-name>
-                <column-name>longValue</column-name>
-                <column-name>schema_name</column-name>
-            </unique-constraint>
-        </table>
-        <attributes>
-            <id name="id">
-                <generated-value generator="SEQ_RAttrValue" strategy="TABLE"/>
-            </id>
-        </attributes>
-    </entity>
-    <entity class="org.syncope.core.persistence.beans.membership.MAttrValue">
-        <attributes>
-            <id name="id">
-                <generated-value generator="SEQ_MAttrValue" strategy="TABLE"/>
-            </id>
-        </attributes>
-    </entity>
-    <entity class="org.syncope.core.persistence.beans.membership.MAttrUniqueValue">
-        <table>
-            <unique-constraint>
-                <column-name>booleanValue</column-name>
-                <column-name>dateValue</column-name>
-                <column-name>stringValue</column-name>
-                <column-name>doubleValue</column-name>
-                <column-name>longValue</column-name>
-                <column-name>schema_name</column-name>
-            </unique-constraint>
-        </table>
-        <attributes>
-            <id name="id">
-                <generated-value generator="SEQ_MAttrValue" strategy="TABLE"/>
-            </id>
-        </attributes>
-    </entity>
-
-    <entity class="org.syncope.core.persistence.beans.Task">
-        <attributes>
-            <id name="id">
-                <generated-value generator="SEQ_Task" strategy="TABLE"/>
-                <table-generator name="SEQ_Task" pk-column-value="SEQ_Task" initial-value="10"/>
-            </id>
-        </attributes>
-    </entity>
-    <entity class="org.syncope.core.persistence.beans.TaskExec">
-        <attributes>
-            <id name="id">
-                <generated-value generator="SEQ_TaskExec" strategy="TABLE"/>
-                <table-generator name="SEQ_TaskExec" pk-column-value="SEQ_TaskExec" initial-value="10"/>
-            </id>
-        </attributes>
-    </entity>
-
-    <entity class="org.syncope.core.persistence.beans.Policy">
-        <attributes>
-            <id name="id">
-                <generated-value generator="SEQ_Policy" strategy="TABLE"/>
-                <table-generator name="SEQ_Policy" pk-column-value="SEQ_Policy" initial-value="1000"/>
-            </id>
-        </attributes>
-    </entity>
+<entity-mappings  xmlns="http://java.sun.com/xml/ns/persistence/orm"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm 
+                                      http://java.sun.com/xml/ns/persistence/orm_2_0.xsd"
+                  version="2.0">
+
+  <table-generator name="SEQ_UAttrValue" pk-column-value="SEQ_UAttrValue" initial-value="100"/>
+  <table-generator name="SEQ_RAttrValue" pk-column-value="SEQ_RAttrValue" initial-value="100"/>
+  <table-generator name="SEQ_MAttrValue" pk-column-value="SEQ_MAttrValue" initial-value="100"/>
+
+  <entity class="org.syncope.core.persistence.beans.user.SyncopeUser">
+    <attributes>
+      <id name="id">
+        <generated-value generator="SEQ_SyncopeUser" strategy="TABLE"/>
+        <table-generator name="SEQ_SyncopeUser" pk-column-value="SEQ_SyncopeUser" initial-value="100"/>
+      </id>
+    </attributes>
+  </entity>
+
+  <entity class="org.syncope.core.persistence.beans.role.SyncopeRole">
+    <attributes>
+      <id name="id">
+        <generated-value generator="SEQ_SyncopeRole" strategy="TABLE"/>
+        <table-generator name="SEQ_SyncopeRole" pk-column-value="SEQ_SyncopeRole" initial-value="10"/>
+      </id>
+    </attributes>
+  </entity>
+
+  <entity class="org.syncope.core.persistence.beans.membership.Membership">
+    <attributes>
+      <id name="id">
+        <generated-value generator="SEQ_Membership" strategy="TABLE"/>
+        <table-generator name="SEQ_Membership" pk-column-value="SEQ_Membership" initial-value="10"/>
+      </id>
+    </attributes>
+  </entity>
+
+  <entity class="org.syncope.core.persistence.beans.SchemaMapping">
+    <attributes>
+      <id name="id">
+        <generated-value generator="SEQ_SchemaMapping" strategy="TABLE"/>
+        <table-generator name="SEQ_SchemaMapping" pk-column-value="SEQ_SchemaMapping" initial-value="1000"/>
+      </id>
+    </attributes>
+  </entity>
+
+  <entity class="org.syncope.core.persistence.beans.ConnInstance">
+    <attributes>
+      <id name="id">
+        <generated-value generator="SEQ_ConnInstance" strategy="TABLE"/>
+        <table-generator name="SEQ_ConnInstance" pk-column-value="SEQ_ConnInstance" initial-value="1000"/>
+      </id>
+    </attributes>
+  </entity>
+
+  <entity class="org.syncope.core.persistence.beans.user.UAttr">
+    <attributes>
+      <id name="id">
+        <generated-value generator="SEQ_UAttr" strategy="TABLE"/>
+        <table-generator name="SEQ_UAttr" pk-column-value="SEQ_UAttr" initial-value="1000"/>
+      </id>
+    </attributes>
+  </entity>
+  <entity class="org.syncope.core.persistence.beans.role.RAttr">
+    <attributes>
+      <id name="id">
+        <generated-value generator="SEQ_RAttr" strategy="TABLE"/>
+        <table-generator name="SEQ_RAttr" pk-column-value="SEQ_RAttr" initial-value="1000"/>
+      </id>
+    </attributes>
+  </entity>
+  <entity class="org.syncope.core.persistence.beans.membership.MAttr">
+    <attributes>
+      <id name="id">
+        <generated-value generator="SEQ_MAttr" strategy="TABLE"/>
+        <table-generator name="SEQ_MAttr" pk-column-value="SEQ_MAttr" initial-value="1000"/>
+      </id>
+    </attributes>
+  </entity>
+
+  <entity class="org.syncope.core.persistence.beans.user.UAttrValue">
+    <attributes>
+      <id name="id">
+        <generated-value generator="SEQ_UAttrValue" strategy="TABLE"/>
+      </id>
+    </attributes>
+  </entity>
+  <entity class="org.syncope.core.persistence.beans.user.UAttrUniqueValue">
+    <table>
+      <unique-constraint>
+        <column-name>booleanValue</column-name>
+        <column-name>dateValue</column-name>
+        <column-name>stringValue</column-name>
+        <column-name>doubleValue</column-name>
+        <column-name>longValue</column-name>
+        <column-name>schema_name</column-name>
+      </unique-constraint>
+    </table>
+    <attributes>
+      <id name="id">
+        <generated-value generator="SEQ_UAttrValue" strategy="TABLE"/>
+      </id>
+    </attributes>
+  </entity>
+  <entity class="org.syncope.core.persistence.beans.role.RAttrValue">
+    <attributes>
+      <id name="id">
+        <generated-value generator="SEQ_RAttrValue" strategy="TABLE"/>
+      </id>
+    </attributes>
+  </entity>
+  <entity class="org.syncope.core.persistence.beans.role.RAttrUniqueValue">
+    <table>
+      <unique-constraint>
+        <column-name>booleanValue</column-name>
+        <column-name>dateValue</column-name>
+        <column-name>stringValue</column-name>
+        <column-name>doubleValue</column-name>
+        <column-name>longValue</column-name>
+        <column-name>schema_name</column-name>
+      </unique-constraint>
+    </table>
+    <attributes>
+      <id name="id">
+        <generated-value generator="SEQ_RAttrValue" strategy="TABLE"/>
+      </id>
+    </attributes>
+  </entity>
+  <entity class="org.syncope.core.persistence.beans.membership.MAttrValue">
+    <attributes>
+      <id name="id">
+        <generated-value generator="SEQ_MAttrValue" strategy="TABLE"/>
+      </id>
+    </attributes>
+  </entity>
+  <entity class="org.syncope.core.persistence.beans.membership.MAttrUniqueValue">
+    <table>
+      <unique-constraint>
+        <column-name>booleanValue</column-name>
+        <column-name>dateValue</column-name>
+        <column-name>stringValue</column-name>
+        <column-name>doubleValue</column-name>
+        <column-name>longValue</column-name>
+        <column-name>schema_name</column-name>
+      </unique-constraint>
+    </table>
+    <attributes>
+      <id name="id">
+        <generated-value generator="SEQ_MAttrValue" strategy="TABLE"/>
+      </id>
+    </attributes>
+  </entity>
+
+  <entity class="org.syncope.core.persistence.beans.Task">
+    <attributes>
+      <id name="id">
+        <generated-value generator="SEQ_Task" strategy="TABLE"/>
+        <table-generator name="SEQ_Task" pk-column-value="SEQ_Task" initial-value="10"/>
+      </id>
+    </attributes>
+  </entity>
+  <entity class="org.syncope.core.persistence.beans.TaskExec">
+    <attributes>
+      <id name="id">
+        <generated-value generator="SEQ_TaskExec" strategy="TABLE"/>
+        <table-generator name="SEQ_TaskExec" pk-column-value="SEQ_TaskExec" initial-value="10"/>
+      </id>
+    </attributes>
+  </entity>
+
+  <entity class="org.syncope.core.persistence.beans.Policy">
+    <attributes>
+      <id name="id">
+        <generated-value generator="SEQ_Policy" strategy="TABLE"/>
+        <table-generator name="SEQ_Policy" pk-column-value="SEQ_Policy" initial-value="1000"/>
+      </id>
+    </attributes>
+  </entity>
     
-    <entity class="org.syncope.core.persistence.beans.Report">
-        <attributes>
-            <id name="id">
-                <generated-value generator="SEQ_Report" strategy="TABLE"/>
-                <table-generator name="SEQ_Report" pk-column-value="SEQ_Report" initial-value="100"/>
-            </id>
-        </attributes>
-    </entity>
-    <entity class="org.syncope.core.persistence.beans.ReportExec">
-        <attributes>
-            <id name="id">
-                <generated-value generator="SEQ_ReportExec" strategy="TABLE"/>
-                <table-generator name="SEQ_ReportExec" pk-column-value="SEQ_ReportExec" initial-value="100"/>
-            </id>
-        </attributes>
-    </entity>
-    <entity class="org.syncope.core.persistence.beans.ReportletConfInstance">
-        <attributes>
-            <id name="id">
-                <generated-value generator="SEQ_ReportletConfInstance" strategy="TABLE"/>
-                <table-generator name="SEQ_ReportletConfInstance" pk-column-value="SEQ_ReportletConfInstance" initial-value="100"/>
-            </id>
-        </attributes>
-    </entity>
+  <entity class="org.syncope.core.persistence.beans.Report">
+    <attributes>
+      <id name="id">
+        <generated-value generator="SEQ_Report" strategy="TABLE"/>
+        <table-generator name="SEQ_Report" pk-column-value="SEQ_Report" initial-value="100"/>
+      </id>
+    </attributes>
+  </entity>
+  <entity class="org.syncope.core.persistence.beans.ReportExec">
+    <attributes>
+      <id name="id">
+        <generated-value generator="SEQ_ReportExec" strategy="TABLE"/>
+        <table-generator name="SEQ_ReportExec" pk-column-value="SEQ_ReportExec" initial-value="100"/>
+      </id>
+    </attributes>
+  </entity>
+  <entity class="org.syncope.core.persistence.beans.ReportletConfInstance">
+    <attributes>
+      <id name="id">
+        <generated-value generator="SEQ_ReportletConfInstance" strategy="TABLE"/>
+        <table-generator name="SEQ_ReportletConfInstance" pk-column-value="SEQ_ReportletConfInstance" initial-value="100"/>
+      </id>
+    </attributes>
+  </entity>
 </entity-mappings>

Modified: incubator/syncope/trunk/core/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/resources/META-INF/persistence.xml?rev=1297877&r1=1297876&r2=1297877&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/resources/META-INF/persistence.xml (original)
+++ incubator/syncope/trunk/core/src/main/resources/META-INF/persistence.xml Wed Mar  7 08:24:55 2012
@@ -1,28 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Licensed 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
+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
+  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.
 
-  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.
 -->
 <persistence xmlns="http://java.sun.com/xml/ns/persistence"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:schemaLocation="http://java.sun.com/xml/ns/persistence
              http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"
              version="2.0">
-    <persistence-unit name="syncopePersistenceUnit">
-        <mapping-file>META-INF/orm.xml</mapping-file>
-        <validation-mode>NONE</validation-mode>
+  <persistence-unit name="syncopePersistenceUnit">
+    <mapping-file>META-INF/orm.xml</mapping-file>
+    <validation-mode>NONE</validation-mode>
         
-        <properties>
-            <property name="eclipselink.weaving" value="false"/>
-        </properties>
-    </persistence-unit>
+    <properties>
+      <property name="eclipselink.weaving" value="false"/>
+    </properties>
+  </persistence-unit>
 </persistence>

Modified: incubator/syncope/trunk/core/src/main/resources/content.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/resources/content.xml?rev=1297877&r1=1297876&r2=1297877&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/resources/content.xml (original)
+++ incubator/syncope/trunk/core/src/main/resources/content.xml Wed Mar  7 08:24:55 2012
@@ -18,101 +18,100 @@ specific language governing permissions 
 under the License.
 
 -->
-
 <dataset>
-    <SyncopeConf confKey="token.length" confValue="256"/>
-    <SyncopeConf confKey="token.expireTime" confValue="60"/>
-    <SyncopeConf confKey="smtp.host" confValue="smtp.ngi.it"/>
-    <SyncopeConf confKey="smtp.port" confValue="25"/>
-    <SyncopeConf confKey="email.schema" confValue="email"/>
-    <SyncopeConf confKey="connid.bundles.directory" confValue="${bundles.directory}"/>
-    <SyncopeConf confKey="password.cipher.algorithm" confValue="MD5"/>
-    <SyncopeConf confKey="createRequest.allowed" confValue="false"/>
+  <SyncopeConf confKey="token.length" confValue="256"/>
+  <SyncopeConf confKey="token.expireTime" confValue="60"/>
+  <SyncopeConf confKey="smtp.host" confValue="smtp.ngi.it"/>
+  <SyncopeConf confKey="smtp.port" confValue="25"/>
+  <SyncopeConf confKey="email.schema" confValue="email"/>
+  <SyncopeConf confKey="connid.bundles.directory" confValue="${bundles.directory}"/>
+  <SyncopeConf confKey="password.cipher.algorithm" confValue="MD5"/>
+  <SyncopeConf confKey="createRequest.allowed" confValue="false"/>
     
-    <Policy DTYPE="SyncPolicy" id="1" description="Global Sync Policy" type="GLOBAL_SYNC"
+  <Policy DTYPE="SyncPolicy" id="1" description="Global Sync Policy" type="GLOBAL_SYNC"
             specification="%3Corg.syncope.types.SyncPolicySpec%2F%3E"/>
-    <Policy DTYPE="PasswordPolicy" id="2" description="Global Password Policy" type="GLOBAL_PASSWORD"
+  <Policy DTYPE="PasswordPolicy" id="2" description="Global Password Policy" type="GLOBAL_PASSWORD"
             specification="%3Corg.syncope.types.PasswordPolicySpec%3E%0A++%3ChistoryLength%3E0%3C%2FhistoryLength%3E%0A++%3CmaxLength%3E0%3C%2FmaxLength%3E%0A++%3CminLength%3E0%3C%2FminLength%3E%0A++%3CnonAlphanumericRequired%3Efalse%3C%2FnonAlphanumericRequired%3E%0A++%3CalphanumericRequired%3Efalse%3C%2FalphanumericRequired%3E%0A++%3CdigitRequired%3Efalse%3C%2FdigitRequired%3E%0A++%3ClowercaseRequired%3Efalse%3C%2FlowercaseRequired%3E%0A++%3CuppercaseRequired%3Efalse%3C%2FuppercaseRequired%3E%0A++%3CmustStartWithDigit%3Efalse%3C%2FmustStartWithDigit%3E%0A++%3CmustntStartWithDigit%3Efalse%3C%2FmustntStartWithDigit%3E%0A++%3CmustEndWithDigit%3Efalse%3C%2FmustEndWithDigit%3E%0A++%3CmustntEndWithDigit%3Efalse%3C%2FmustntEndWithDigit%3E%0A++%3CmustStartWithNonAlpha%3Efalse%3C%2FmustStartWithNonAlpha%3E%0A++%3CmustStartWithAlpha%3Efalse%3C%2FmustStartWithAlpha%3E%0A++%3CmustntStartWithNonAlpha%3Efalse%3C%2FmustntStartWithNonAlpha%3E%0A++%3CmustntStartWithAlpha%3Efalse%3C%2Fmustn
 tStartWithAlpha%3E%0A++%3CmustEndWithNonAlpha%3Efalse%3C%2FmustEndWithNonAlpha%3E%0A++%3CmustEndWithAlpha%3Efalse%3C%2FmustEndWithAlpha%3E%0A++%3CmustntEndWithNonAlpha%3Efalse%3C%2FmustntEndWithNonAlpha%3E%0A++%3CmustntEndWithAlpha%3Efalse%3C%2FmustntEndWithAlpha%3E%0A%3C%2Forg.syncope.types.PasswordPolicySpec%3E"/>
-    <Policy DTYPE="AccountPolicy" id="3" description="Global Account Policy" type="GLOBAL_ACCOUNT"
+  <Policy DTYPE="AccountPolicy" id="3" description="Global Account Policy" type="GLOBAL_ACCOUNT"
             specification="%3Corg.syncope.types.AccountPolicySpec%3E%0A++%3CmaxLength%3E0%3C%2FmaxLength%3E%0A++%3CminLength%3E0%3C%2FminLength%3E%0A++%3CallUpperCase%3Efalse%3C%2FallUpperCase%3E%0A++%3CallLowerCase%3Efalse%3C%2FallLowerCase%3E%0A++%3CpropagateSuspension%3Efalse%3C%2FpropagateSuspension%3E%0A++%3CpermittedLoginRetries%3E0%3C%2FpermittedLoginRetries%3E%0A%3C%2Forg.syncope.types.AccountPolicySpec%3E"/>
     
-    <USchema name="surname" type="String"
+  <USchema name="surname" type="String"
              mandatoryCondition="true" multivalue="0" uniqueConstraint="0" readonly="0"/>
-    <USchema name="firstname" type="String"
+  <USchema name="firstname" type="String"
              mandatoryCondition="false" multivalue="0" uniqueConstraint="0" readonly="0"/>
-    <USchema name="email" type="String"
+  <USchema name="email" type="String"
              mandatoryCondition="false" multivalue="1" uniqueConstraint="0" readonly="0"
              validatorClass="org.syncope.core.persistence.validation.attrvalue.EmailAddressValidator"/>
                
-    <UDerSchema name="fullname" expression="firstname + '.' + surname"/>
+  <UDerSchema name="fullname" expression="firstname + '.' + surname"/>
 
-    <MSchema name="subscriptionDate" type="Date"
+  <MSchema name="subscriptionDate" type="Date"
              mandatoryCondition="false" multivalue="0" uniqueConstraint="0" readonly="0"
              conversionPattern="yyyy-MM-dd'T'HH:mm:ss.SSSZ"/>
 
     <!-- Authentication and authorization -->
-    <Entitlement name="SCHEMA_CREATE"/>
-    <Entitlement name="SCHEMA_READ"/>
-    <Entitlement name="SCHEMA_UPDATE"/>
-    <Entitlement name="SCHEMA_DELETE"/>
-    <Entitlement name="USER_LIST"/>
-    <Entitlement name="USER_CREATE"/>
-    <Entitlement name="USER_READ"/>
-    <Entitlement name="USER_UPDATE"/>
-    <Entitlement name="USER_DELETE"/>
-    <Entitlement name="USER_VIEW"/>
-    <Entitlement name="ROLE_CREATE"/>
-    <Entitlement name="ROLE_READ"/>
-    <Entitlement name="ROLE_UPDATE"/>
-    <Entitlement name="ROLE_DELETE"/>
-    <Entitlement name="RESOURCE_CREATE"/>
-    <Entitlement name="RESOURCE_READ"/>
-    <Entitlement name="RESOURCE_UPDATE"/>
-    <Entitlement name="RESOURCE_DELETE"/>
-    <Entitlement name="RESOURCE_GETOBJECT"/>
-    <Entitlement name="CONNECTOR_LIST"/>
-    <Entitlement name="CONNECTOR_CREATE"/>
-    <Entitlement name="CONNECTOR_READ"/>
-    <Entitlement name="CONNECTOR_UPDATE"/>
-    <Entitlement name="CONNECTOR_DELETE"/>
-    <Entitlement name="CONFIGURATION_LIST"/>
-    <Entitlement name="CONFIGURATION_CREATE"/>
-    <Entitlement name="CONFIGURATION_READ"/>
-    <Entitlement name="CONFIGURATION_UPDATE"/>
-    <Entitlement name="CONFIGURATION_DELETE"/>
-    <Entitlement name="TASK_CREATE"/>
-    <Entitlement name="TASK_LIST"/>
-    <Entitlement name="TASK_EXECUTE"/>
-    <Entitlement name="TASK_READ"/>
-    <Entitlement name="TASK_UPDATE"/>
-    <Entitlement name="TASK_DELETE"/>
-    <Entitlement name="LOGGER_LIST"/>
-    <Entitlement name="LOGGER_SET_LEVEL"/>
-    <Entitlement name="POLICY_CREATE"/>
-    <Entitlement name="POLICY_LIST"/>
-    <Entitlement name="POLICY_READ"/>
-    <Entitlement name="POLICY_UPDATE"/>
-    <Entitlement name="POLICY_DELETE"/>
-    <Entitlement name="WORKFLOW_DEF_READ"/>
-    <Entitlement name="WORKFLOW_DEF_UPDATE"/>
-    <Entitlement name="WORKFLOW_TASK_LIST"/> 
-    <Entitlement name="WORKFLOW_FORM_LIST"/>
-    <Entitlement name="WORKFLOW_FORM_READ"/>
-    <Entitlement name="WORKFLOW_FORM_CLAIM"/>
-    <Entitlement name="WORKFLOW_FORM_SUBMIT"/>
-    <Entitlement name="NOTIFICATION_LIST"/>
-    <Entitlement name="NOTIFICATION_CREATE"/>
-    <Entitlement name="NOTIFICATION_READ"/>
-    <Entitlement name="NOTIFICATION_UPDATE"/>
-    <Entitlement name="NOTIFICATION_DELETE"/>
-    <Entitlement name="USER_REQUEST_LIST"/>
-    <Entitlement name="USER_REQUEST_READ"/>
-    <Entitlement name="USER_REQUEST_DELETE"/>
-    <Entitlement name="REPORT_LIST"/>
-    <Entitlement name="REPORT_READ"/>
-    <Entitlement name="REPORT_CREATE"/>
-    <Entitlement name="REPORT_UPDATE"/>
-    <Entitlement name="REPORT_DELETE"/>
-    <Entitlement name="REPORT_EXECUTE"/>
+  <Entitlement name="SCHEMA_CREATE"/>
+  <Entitlement name="SCHEMA_READ"/>
+  <Entitlement name="SCHEMA_UPDATE"/>
+  <Entitlement name="SCHEMA_DELETE"/>
+  <Entitlement name="USER_LIST"/>
+  <Entitlement name="USER_CREATE"/>
+  <Entitlement name="USER_READ"/>
+  <Entitlement name="USER_UPDATE"/>
+  <Entitlement name="USER_DELETE"/>
+  <Entitlement name="USER_VIEW"/>
+  <Entitlement name="ROLE_CREATE"/>
+  <Entitlement name="ROLE_READ"/>
+  <Entitlement name="ROLE_UPDATE"/>
+  <Entitlement name="ROLE_DELETE"/>
+  <Entitlement name="RESOURCE_CREATE"/>
+  <Entitlement name="RESOURCE_READ"/>
+  <Entitlement name="RESOURCE_UPDATE"/>
+  <Entitlement name="RESOURCE_DELETE"/>
+  <Entitlement name="RESOURCE_GETOBJECT"/>
+  <Entitlement name="CONNECTOR_LIST"/>
+  <Entitlement name="CONNECTOR_CREATE"/>
+  <Entitlement name="CONNECTOR_READ"/>
+  <Entitlement name="CONNECTOR_UPDATE"/>
+  <Entitlement name="CONNECTOR_DELETE"/>
+  <Entitlement name="CONFIGURATION_LIST"/>
+  <Entitlement name="CONFIGURATION_CREATE"/>
+  <Entitlement name="CONFIGURATION_READ"/>
+  <Entitlement name="CONFIGURATION_UPDATE"/>
+  <Entitlement name="CONFIGURATION_DELETE"/>
+  <Entitlement name="TASK_CREATE"/>
+  <Entitlement name="TASK_LIST"/>
+  <Entitlement name="TASK_EXECUTE"/>
+  <Entitlement name="TASK_READ"/>
+  <Entitlement name="TASK_UPDATE"/>
+  <Entitlement name="TASK_DELETE"/>
+  <Entitlement name="LOGGER_LIST"/>
+  <Entitlement name="LOGGER_SET_LEVEL"/>
+  <Entitlement name="POLICY_CREATE"/>
+  <Entitlement name="POLICY_LIST"/>
+  <Entitlement name="POLICY_READ"/>
+  <Entitlement name="POLICY_UPDATE"/>
+  <Entitlement name="POLICY_DELETE"/>
+  <Entitlement name="WORKFLOW_DEF_READ"/>
+  <Entitlement name="WORKFLOW_DEF_UPDATE"/>
+  <Entitlement name="WORKFLOW_TASK_LIST"/> 
+  <Entitlement name="WORKFLOW_FORM_LIST"/>
+  <Entitlement name="WORKFLOW_FORM_READ"/>
+  <Entitlement name="WORKFLOW_FORM_CLAIM"/>
+  <Entitlement name="WORKFLOW_FORM_SUBMIT"/>
+  <Entitlement name="NOTIFICATION_LIST"/>
+  <Entitlement name="NOTIFICATION_CREATE"/>
+  <Entitlement name="NOTIFICATION_READ"/>
+  <Entitlement name="NOTIFICATION_UPDATE"/>
+  <Entitlement name="NOTIFICATION_DELETE"/>
+  <Entitlement name="USER_REQUEST_LIST"/>
+  <Entitlement name="USER_REQUEST_READ"/>
+  <Entitlement name="USER_REQUEST_DELETE"/>
+  <Entitlement name="REPORT_LIST"/>
+  <Entitlement name="REPORT_READ"/>
+  <Entitlement name="REPORT_CREATE"/>
+  <Entitlement name="REPORT_UPDATE"/>
+  <Entitlement name="REPORT_DELETE"/>
+  <Entitlement name="REPORT_EXECUTE"/>
     
 </dataset>

Modified: incubator/syncope/trunk/core/src/main/resources/indexes.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/resources/indexes.xml?rev=1297877&r1=1297876&r2=1297877&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/resources/indexes.xml (original)
+++ incubator/syncope/trunk/core/src/main/resources/indexes.xml Wed Mar  7 08:24:55 2012
@@ -18,10 +18,9 @@ specific language governing permissions 
 under the License.
 
 -->
-
 <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
 <properties>
-    <comment>Additional indexes (in respect to JPA's)</comment>
+  <comment>Additional indexes (in respect to JPA's)</comment>
 
     <!-- These indexes are not needed by OpenJPA, only by Hibernate
     <entry key="roleNameIndex">CREATE INDEX roleNameIndex ON SyncopeRole(name)</entry>
@@ -74,19 +73,19 @@ under the License.
     <entry key="UVirAttr_Index_52">CREATE INDEX UVirAttr_Index_52 ON UVirAttr(owner_id)</entry>
     -->
 
-    <entry key="UAttrValue_stringvalueIndex">CREATE INDEX UAttrValue_stringvalueIndex ON UAttrValue(stringvalue)</entry>
-    <entry key="UAttrValue_datevalueIndex">CREATE INDEX UAttrValue_datevalueIndex ON UAttrValue(datevalue)</entry>
-    <entry key="UAttrValue_longvalueIndex">CREATE INDEX UAttrValue_longvalueIndex ON UAttrValue(longvalue)</entry>
-    <entry key="UAttrValue_doublevalueIndex">CREATE INDEX UAttrValue_doublevalueIndex ON UAttrValue(doublevalue)</entry>
-    <entry key="UAttrValue_booleanvalueIndex">CREATE INDEX UAttrValue_booleanvalueIndex ON UAttrValue(booleanvalue)</entry>
-    <entry key="MAttrValue_stringvalueIndex">CREATE INDEX MAttrValue_stringvalueIndex ON MAttrValue(stringvalue)</entry>
-    <entry key="MAttrValue_datevalueIndex">CREATE INDEX MAttrValue_datevalueIndex ON MAttrValue(datevalue)</entry>
-    <entry key="MAttrValue_longvalueIndex">CREATE INDEX MAttrValue_longvalueIndex ON MAttrValue(longvalue)</entry>
-    <entry key="MAttrValue_doublevalueIndex">CREATE INDEX MAttrValue_doublevalueIndex ON MAttrValue(doublevalue)</entry>
-    <entry key="MAttrValue_booleanvalueIndex">CREATE INDEX MAttrValue_booleanvalueIndex ON MAttrValue(booleanvalue)</entry>
-    <entry key="RAttrValue_stringvalueIndex">CREATE INDEX RAttrValue_stringvalueIndex ON RAttrValue(stringvalue)</entry>
-    <entry key="RAttrValue_datevalueIndex">CREATE INDEX RAttrValue_datevalueIndex ON RAttrValue(datevalue)</entry>
-    <entry key="RAttrValue_longvalueIndex">CREATE INDEX RAttrValue_longvalueIndex ON RAttrValue(longvalue)</entry>
-    <entry key="RAttrValue_doublevalueIndex">CREATE INDEX RAttrValue_doublevalueIndex ON RAttrValue(doublevalue)</entry>
-    <entry key="RAttrValue_booleanvalueIndex">CREATE INDEX RAttrValue_booleanvalueIndex ON RAttrValue(booleanvalue)</entry>
+  <entry key="UAttrValue_stringvalueIndex">CREATE INDEX UAttrValue_stringvalueIndex ON UAttrValue(stringvalue)</entry>
+  <entry key="UAttrValue_datevalueIndex">CREATE INDEX UAttrValue_datevalueIndex ON UAttrValue(datevalue)</entry>
+  <entry key="UAttrValue_longvalueIndex">CREATE INDEX UAttrValue_longvalueIndex ON UAttrValue(longvalue)</entry>
+  <entry key="UAttrValue_doublevalueIndex">CREATE INDEX UAttrValue_doublevalueIndex ON UAttrValue(doublevalue)</entry>
+  <entry key="UAttrValue_booleanvalueIndex">CREATE INDEX UAttrValue_booleanvalueIndex ON UAttrValue(booleanvalue)</entry>
+  <entry key="MAttrValue_stringvalueIndex">CREATE INDEX MAttrValue_stringvalueIndex ON MAttrValue(stringvalue)</entry>
+  <entry key="MAttrValue_datevalueIndex">CREATE INDEX MAttrValue_datevalueIndex ON MAttrValue(datevalue)</entry>
+  <entry key="MAttrValue_longvalueIndex">CREATE INDEX MAttrValue_longvalueIndex ON MAttrValue(longvalue)</entry>
+  <entry key="MAttrValue_doublevalueIndex">CREATE INDEX MAttrValue_doublevalueIndex ON MAttrValue(doublevalue)</entry>
+  <entry key="MAttrValue_booleanvalueIndex">CREATE INDEX MAttrValue_booleanvalueIndex ON MAttrValue(booleanvalue)</entry>
+  <entry key="RAttrValue_stringvalueIndex">CREATE INDEX RAttrValue_stringvalueIndex ON RAttrValue(stringvalue)</entry>
+  <entry key="RAttrValue_datevalueIndex">CREATE INDEX RAttrValue_datevalueIndex ON RAttrValue(datevalue)</entry>
+  <entry key="RAttrValue_longvalueIndex">CREATE INDEX RAttrValue_longvalueIndex ON RAttrValue(longvalue)</entry>
+  <entry key="RAttrValue_doublevalueIndex">CREATE INDEX RAttrValue_doublevalueIndex ON RAttrValue(doublevalue)</entry>
+  <entry key="RAttrValue_booleanvalueIndex">CREATE INDEX RAttrValue_booleanvalueIndex ON RAttrValue(booleanvalue)</entry>
 </properties>

Modified: incubator/syncope/trunk/core/src/main/resources/logback.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/resources/logback.xml?rev=1297877&r1=1297876&r2=1297877&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/resources/logback.xml (original)
+++ incubator/syncope/trunk/core/src/main/resources/logback.xml Wed Mar  7 08:24:55 2012
@@ -18,138 +18,137 @@ specific language governing permissions 
 under the License.
 
 -->
-
 <configuration>
 
-    <appender name="main" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.directory}/core.log</file>
-        <append>true</append>
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${log.directory}/core.log.%d{yyyy-MM-dd}</fileNamePattern>
-            <maxHistory>30</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
-        </encoder>
-    </appender>
-
-    <appender name="persistence" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.directory}/core-persistence.log</file>
-        <append>true</append>
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${log.directory}/core-persistence.log.%d{yyyy-MM-dd}</fileNamePattern>
-            <maxHistory>30</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
-        </encoder>
-    </appender>
-
-    <appender name="rest" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.directory}/core-rest.log</file>
-        <append>true</append>
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${log.directory}/core-rest.log.%d{yyyy-MM-dd}</fileNamePattern>
-            <maxHistory>30</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
-        </encoder>
-    </appender>
-
-    <appender name="connid" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.directory}/core-connid.log</file>
-        <append>true</append>
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${log.directory}/core-connid.log.%d{yyyy-MM-dd}</fileNamePattern>
-            <maxHistory>30</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>%d{HH:mm:ss.SSS} %-5level %msg%n</pattern>
-        </encoder>
-    </appender>
-
-    <appender name="test" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.directory}/core-test.log</file>
-        <append>true</append>
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${log.directory}/core-test.log.%d{yyyy-MM-dd}</fileNamePattern>
-            <maxHistory>30</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
-        </encoder>
-    </appender>
-
-    <logger name="org.syncope.client" additivity="false">
-        <level value="OFF"/>
-        <appender-ref ref="main"/>
-    </logger>
-
-    <logger name="org.syncope.core.persistence" additivity="false">
-        <level value="INFO"/>
-        <appender-ref ref="persistence"/>
-    </logger>
-    <logger name="org.syncope.core.persistence.propagation.ConnectorFacadeProxy" additivity="false">
-        <level value="INFO"/>
-        <appender-ref ref="persistence"/>
-    </logger>
+  <appender name="main" class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${log.directory}/core.log</file>
+    <append>true</append>
+    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <fileNamePattern>${log.directory}/core.log.%d{yyyy-MM-dd}</fileNamePattern>
+      <maxHistory>30</maxHistory>
+    </rollingPolicy>
+    <encoder>
+      <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <appender name="persistence" class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${log.directory}/core-persistence.log</file>
+    <append>true</append>
+    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <fileNamePattern>${log.directory}/core-persistence.log.%d{yyyy-MM-dd}</fileNamePattern>
+      <maxHistory>30</maxHistory>
+    </rollingPolicy>
+    <encoder>
+      <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <appender name="rest" class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${log.directory}/core-rest.log</file>
+    <append>true</append>
+    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <fileNamePattern>${log.directory}/core-rest.log.%d{yyyy-MM-dd}</fileNamePattern>
+      <maxHistory>30</maxHistory>
+    </rollingPolicy>
+    <encoder>
+      <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <appender name="connid" class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${log.directory}/core-connid.log</file>
+    <append>true</append>
+    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <fileNamePattern>${log.directory}/core-connid.log.%d{yyyy-MM-dd}</fileNamePattern>
+      <maxHistory>30</maxHistory>
+    </rollingPolicy>
+    <encoder>
+      <pattern>%d{HH:mm:ss.SSS} %-5level %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <appender name="test" class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${log.directory}/core-test.log</file>
+    <append>true</append>
+    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <fileNamePattern>${log.directory}/core-test.log.%d{yyyy-MM-dd}</fileNamePattern>
+      <maxHistory>30</maxHistory>
+    </rollingPolicy>
+    <encoder>
+      <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <logger name="org.syncope.client" additivity="false">
+    <level value="OFF"/>
+    <appender-ref ref="main"/>
+  </logger>
+
+  <logger name="org.syncope.core.persistence" additivity="false">
+    <level value="INFO"/>
+    <appender-ref ref="persistence"/>
+  </logger>
+  <logger name="org.syncope.core.persistence.propagation.ConnectorFacadeProxy" additivity="false">
+    <level value="INFO"/>
+    <appender-ref ref="persistence"/>
+  </logger>
     
-    <logger name="org.syncope.core.security" additivity="false">
-        <level value="INFO"/>
-        <appender-ref ref="main"/>
-    </logger>
-
-    <logger name="org.syncope.core.rest" additivity="false">
-        <level value="INFO"/>
-        <appender-ref ref="rest"/>
-    </logger>
+  <logger name="org.syncope.core.security" additivity="false">
+    <level value="INFO"/>
+    <appender-ref ref="main"/>
+  </logger>
+
+  <logger name="org.syncope.core.rest" additivity="false">
+    <level value="INFO"/>
+    <appender-ref ref="rest"/>
+  </logger>
     
-    <logger name="org.identityconnectors" additivity="false">
-        <level value="DEBUG"/>
-        <appender-ref ref="connid"/>
-    </logger>
-    <logger name="org.syncope.core.connid" additivity="false">
-        <level value="DEBUG"/>
-        <appender-ref ref="connid"/>
-    </logger>
-    <logger name="org.connid" additivity="false">
-        <level value="DEBUG"/>
-        <appender-ref ref="connid"/>
-    </logger>
+  <logger name="org.identityconnectors" additivity="false">
+    <level value="DEBUG"/>
+    <appender-ref ref="connid"/>
+  </logger>
+  <logger name="org.syncope.core.connid" additivity="false">
+    <level value="DEBUG"/>
+    <appender-ref ref="connid"/>
+  </logger>
+  <logger name="org.connid" additivity="false">
+    <level value="DEBUG"/>
+    <appender-ref ref="connid"/>
+  </logger>
     
-    <logger name="org.syncope.core.test" additivity="false">
-        <level value="INFO"/>
-        <appender-ref ref="test"/>
-    </logger>
-
-    <logger name="org.springframework" additivity="false">
-        <level value="INFO"/>
-        <appender-ref ref="main"/>
-    </logger>
-
-    <logger name="org.springframework.orm" additivity="false">
-        <level value="INFO"/>
-        <appender-ref ref="persistence"/>
-    </logger>
-
-    <logger name="org.springframework.test" additivity="false">
-        <level value="INFO"/>
-        <appender-ref ref="test"/>
-    </logger>
-
-    <logger name="org.springframework.web" additivity="false">
-        <level value="INFO"/>
-        <appender-ref ref="rest"/>
-    </logger>
-
-    <logger name="org.apache.http" additivity="false">
-        <level value="INFO"/>
-        <appender-ref ref="test"/>
-    </logger>
+  <logger name="org.syncope.core.test" additivity="false">
+    <level value="INFO"/>
+    <appender-ref ref="test"/>
+  </logger>
+
+  <logger name="org.springframework" additivity="false">
+    <level value="INFO"/>
+    <appender-ref ref="main"/>
+  </logger>
+
+  <logger name="org.springframework.orm" additivity="false">
+    <level value="INFO"/>
+    <appender-ref ref="persistence"/>
+  </logger>
+
+  <logger name="org.springframework.test" additivity="false">
+    <level value="INFO"/>
+    <appender-ref ref="test"/>
+  </logger>
+
+  <logger name="org.springframework.web" additivity="false">
+    <level value="INFO"/>
+    <appender-ref ref="rest"/>
+  </logger>
+
+  <logger name="org.apache.http" additivity="false">
+    <level value="INFO"/>
+    <appender-ref ref="test"/>
+  </logger>
     
-    <root>
-        <level value="INFO"/>
-        <appender-ref ref="main"/>
-    </root>
+  <root>
+    <level value="INFO"/>
+    <appender-ref ref="main"/>
+  </root>
 </configuration>

Modified: incubator/syncope/trunk/core/src/main/resources/persistenceContext.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/resources/persistenceContext.xml?rev=1297877&r1=1297876&r2=1297877&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/resources/persistenceContext.xml (original)
+++ incubator/syncope/trunk/core/src/main/resources/persistenceContext.xml Wed Mar  7 08:24:55 2012
@@ -18,7 +18,6 @@ specific language governing permissions 
 under the License.
 
 -->
-
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:context="http://www.springframework.org/schema/context"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -33,41 +32,41 @@ under the License.
        http://www.springframework.org/schema/aop
        http://www.springframework.org/schema/aop/spring-aop.xsd">
 
-    <import resource="persistenceContextEMFactory.xml"/>
+  <import resource="persistenceContextEMFactory.xml"/>
 
-    <context:annotation-config/>
-    <context:component-scan base-package="org.syncope.core.persistence"/>
-    <context:component-scan base-package="org.syncope.core.rest.data"/>
-    <context:component-scan base-package="org.syncope.core.policy"/>
+  <context:annotation-config/>
+  <context:component-scan base-package="org.syncope.core.persistence"/>
+  <context:component-scan base-package="org.syncope.core.rest.data"/>
+  <context:component-scan base-package="org.syncope.core.policy"/>
 
-    <aop:aspectj-autoproxy/>
+  <aop:aspectj-autoproxy/>
 
-    <bean id="xStream" class="com.thoughtworks.xstream.XStream"/>
+  <bean id="xStream" class="com.thoughtworks.xstream.XStream"/>
 
     <!-- Use JNDI datasource as default but, when not available, revert to
          local datasource, using different properties for execution and testing -->
-    <bean id="dataSource"
+  <bean id="dataSource"
           class="org.springframework.jndi.JndiObjectFactoryBean">
-        <property name="jndiName" value="java:comp/env/jdbc/syncopeDataSource"/>
-        <property name="defaultObject" ref="localDataSource"/>
-    </bean>
-    <bean id="localDataSource" class="org.apache.commons.dbcp.BasicDataSource">
-        <property name="driverClassName" value="${jpa.driverClassName}"/>
-        <property name="url" value="${jpa.url}"/>
-        <property name="username" value="${jpa.username}"/>
-        <property name="password" value="${jpa.password}"/>
-        <property name="initialSize" value="10"/>
-    </bean>
-
-    <bean id="entityManager" class="org.springframework.orm.jpa.support.SharedEntityManagerBean">
-        <property name="entityManagerFactory" ref="entityManagerFactory"/>
-    </bean>
-
-    <bean id="transactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
-        <property name="entityManagerFactory" ref="entityManagerFactory"/>
-    </bean>
-    <tx:annotation-driven/>
+    <property name="jndiName" value="java:comp/env/jdbc/syncopeDataSource"/>
+    <property name="defaultObject" ref="localDataSource"/>
+  </bean>
+  <bean id="localDataSource" class="org.apache.commons.dbcp.BasicDataSource">
+    <property name="driverClassName" value="${jpa.driverClassName}"/>
+    <property name="url" value="${jpa.url}"/>
+    <property name="username" value="${jpa.username}"/>
+    <property name="password" value="${jpa.password}"/>
+    <property name="initialSize" value="10"/>
+  </bean>
+
+  <bean id="entityManager" class="org.springframework.orm.jpa.support.SharedEntityManagerBean">
+    <property name="entityManagerFactory" ref="entityManagerFactory"/>
+  </bean>
+
+  <bean id="transactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
+    <property name="entityManagerFactory" ref="entityManagerFactory"/>
+  </bean>
+  <tx:annotation-driven/>
 
-    <bean id="validator"
+  <bean id="validator"
           class="org.springframework.validation.beanvalidation.LocalValidatorFactoryBean"/>
 </beans>

Modified: incubator/syncope/trunk/core/src/main/resources/persistenceContextEMFactory.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/resources/persistenceContextEMFactory.xml?rev=1297877&r1=1297876&r2=1297877&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/resources/persistenceContextEMFactory.xml (original)
+++ incubator/syncope/trunk/core/src/main/resources/persistenceContextEMFactory.xml Wed Mar  7 08:24:55 2012
@@ -18,39 +18,38 @@ specific language governing permissions 
 under the License.
 
 -->
-
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
        http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-    <bean id="entityManagerFactory"
+  <bean id="entityManagerFactory"
           class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
-        <property name="persistenceUnitName" value="syncopePersistenceUnit"/>
-        <property name="dataSource" ref="dataSource"/>
-        <property name="jpaVendorAdapter">
-            <bean class="org.springframework.orm.jpa.vendor.OpenJpaVendorAdapter">
-                <property name="showSql" value="false"/>
-                <property name="generateDdl" value="true"/>
-                <property name="databasePlatform" value="${jpa.dialect}"/>
-            </bean>
-        </property>
-        <property name="jpaPropertyMap">
-            <map>
+    <property name="persistenceUnitName" value="syncopePersistenceUnit"/>
+    <property name="dataSource" ref="dataSource"/>
+    <property name="jpaVendorAdapter">
+      <bean class="org.springframework.orm.jpa.vendor.OpenJpaVendorAdapter">
+        <property name="showSql" value="false"/>
+        <property name="generateDdl" value="true"/>
+        <property name="databasePlatform" value="${jpa.dialect}"/>
+      </bean>
+    </property>
+    <property name="jpaPropertyMap">
+      <map>
                 <!--<entry key="openjpa.Log" value="SQL=TRACE"/>-->
                 
-                <entry key="openjpa.NontransactionalWrite" value="false"/>
-                <entry key="openjpa.AutoDetach" value="close, commit, nontx-read, rollback"/>
+        <entry key="openjpa.NontransactionalWrite" value="false"/>
+        <entry key="openjpa.AutoDetach" value="close, commit, nontx-read, rollback"/>
                 
-                <entry key="openjpa.ReadLockLevel" value="none"/>
-                <entry key="openjpa.WriteLockLevel" value="write"/>
-                <entry key="openjpa.LockTimeout" value="30000"/>
+        <entry key="openjpa.ReadLockLevel" value="none"/>
+        <entry key="openjpa.WriteLockLevel" value="write"/>
+        <entry key="openjpa.LockTimeout" value="30000"/>
                                 
-                <entry key="openjpa.DataCache" value="true" />
-                <entry key="openjpa.QueryCache" value="true"/>
-                <entry key="openjpa.RemoteCommitProvider" value="sjvm" />
-            </map>
-        </property>
-    </bean>
+        <entry key="openjpa.DataCache" value="true" />
+        <entry key="openjpa.QueryCache" value="true"/>
+        <entry key="openjpa.RemoteCommitProvider" value="sjvm" />
+      </map>
+    </property>
+  </bean>
 
 </beans>

Modified: incubator/syncope/trunk/core/src/main/resources/restContext.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/resources/restContext.xml?rev=1297877&r1=1297876&r2=1297877&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/resources/restContext.xml (original)
+++ incubator/syncope/trunk/core/src/main/resources/restContext.xml Wed Mar  7 08:24:55 2012
@@ -18,7 +18,6 @@ specific language governing permissions 
 under the License.
 
 -->
-
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:context="http://www.springframework.org/schema/context"
@@ -30,72 +29,72 @@ under the License.
        http://www.springframework.org/schema/oxm
        http://www.springframework.org/schema/oxm/spring-oxm.xsd">
 
-    <context:component-scan base-package="org.syncope.core.rest.controller"/>
+  <context:component-scan base-package="org.syncope.core.rest.controller"/>
 
-    <bean id="adminUser" class="java.lang.String">
-        <constructor-arg value="${adminUser}"/>
-    </bean>
+  <bean id="adminUser" class="java.lang.String">
+    <constructor-arg value="${adminUser}"/>
+  </bean>
     
     <!-- JSON (via Jackson) -->
-    <bean id="jacksonObjectMapper" class="org.syncope.core.rest.data.UnwrappedObjectMapper"/>
-    <bean id="mappingJacksonHttpMessageConverter"
+  <bean id="jacksonObjectMapper" class="org.syncope.core.rest.data.UnwrappedObjectMapper"/>
+  <bean id="mappingJacksonHttpMessageConverter"
           class="org.springframework.http.converter.json.MappingJacksonHttpMessageConverter">
-        <property name="objectMapper" ref="jacksonObjectMapper"/>
-    </bean>
+    <property name="objectMapper" ref="jacksonObjectMapper"/>
+  </bean>
     
     <!-- XML (via XStream) -->
-    <bean id="xStreamXmlMarshaller" class="org.springframework.oxm.xstream.XStreamMarshaller">
-        <property name="autodetectAnnotations" value="true" />
-    </bean> 
-    <bean id="mappingXstreamHttpMessageConverter" class="org.springframework.http.converter.xml.MarshallingHttpMessageConverter">
-        <constructor-arg ref="xStreamXmlMarshaller" />
-    </bean>
+  <bean id="xStreamXmlMarshaller" class="org.springframework.oxm.xstream.XStreamMarshaller">
+    <property name="autodetectAnnotations" value="true" />
+  </bean> 
+  <bean id="mappingXstreamHttpMessageConverter" class="org.springframework.http.converter.xml.MarshallingHttpMessageConverter">
+    <constructor-arg ref="xStreamXmlMarshaller" />
+  </bean>
    
-    <bean class="org.springframework.web.servlet.mvc.annotation.DefaultAnnotationHandlerMapping"/>
-    <bean class="org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter">
-        <property name="messageConverters">
-            <list>
-                <ref bean="mappingJacksonHttpMessageConverter"/>
-                <ref bean="mappingXstreamHttpMessageConverter" />
-            </list>
-        </property>
-    </bean>
+  <bean class="org.springframework.web.servlet.mvc.annotation.DefaultAnnotationHandlerMapping"/>
+  <bean class="org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter">
+    <property name="messageConverters">
+      <list>
+        <ref bean="mappingJacksonHttpMessageConverter"/>
+        <ref bean="mappingXstreamHttpMessageConverter" />
+      </list>
+    </property>
+  </bean>
     
-    <bean class="org.springframework.web.servlet.view.ContentNegotiatingViewResolver">
-        <property name="mediaTypes">
-            <map>
-                <entry key="json" value="application/json;charset=UTF-8"/>
-                <entry key="xml" value="application/xml;charset=UTF-8"/>
-                <entry key="html" value="text/html;charset=UTF-8"/>
-            </map>
-        </property>
-        <property name="viewResolvers">
-            <list>
-                <bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-                    <property name="prefix" value="/"/>
-                    <property name="suffix" value=".jsp"/>
-                </bean>
-            </list>
-        </property>
-        <property name="defaultViews">
-            <list>
-                <bean class="org.springframework.web.servlet.view.json.MappingJacksonJsonView">
-                    <property name="objectMapper" ref="jacksonObjectMapper"/>
-                </bean>
-                <bean class="org.springframework.web.servlet.view.xml.MarshallingView">
-                    <constructor-arg ref="xStreamXmlMarshaller"/>
-                </bean>
-            </list>
-        </property>
-        <property name="defaultContentType">        
-            <bean id="jsonMediaType" class="org.springframework.http.MediaType">
-                <constructor-arg value="application"/>
-                <constructor-arg value="json"/>
-                <constructor-arg value="UTF-8"/>
-            </bean>
-        </property>
+  <bean class="org.springframework.web.servlet.view.ContentNegotiatingViewResolver">
+    <property name="mediaTypes">
+      <map>
+        <entry key="json" value="application/json;charset=UTF-8"/>
+        <entry key="xml" value="application/xml;charset=UTF-8"/>
+        <entry key="html" value="text/html;charset=UTF-8"/>
+      </map>
+    </property>
+    <property name="viewResolvers">
+      <list>
+        <bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
+          <property name="prefix" value="/"/>
+          <property name="suffix" value=".jsp"/>
+        </bean>
+      </list>
+    </property>
+    <property name="defaultViews">
+      <list>
+        <bean class="org.springframework.web.servlet.view.json.MappingJacksonJsonView">
+          <property name="objectMapper" ref="jacksonObjectMapper"/>
+        </bean>
+        <bean class="org.springframework.web.servlet.view.xml.MarshallingView">
+          <constructor-arg ref="xStreamXmlMarshaller"/>
+        </bean>
+      </list>
+    </property>
+    <property name="defaultContentType">        
+      <bean id="jsonMediaType" class="org.springframework.http.MediaType">
+        <constructor-arg value="application"/>
+        <constructor-arg value="json"/>
+        <constructor-arg value="UTF-8"/>
+      </bean>
+    </property>
         
-        <property name="ignoreAcceptHeader" value="false"/>
-    </bean>
+    <property name="ignoreAcceptHeader" value="false"/>
+  </bean>
 
 </beans>
\ No newline at end of file

Modified: incubator/syncope/trunk/core/src/main/resources/schedulingContext.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/resources/schedulingContext.xml?rev=1297877&r1=1297876&r2=1297877&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/resources/schedulingContext.xml (original)
+++ incubator/syncope/trunk/core/src/main/resources/schedulingContext.xml Wed Mar  7 08:24:55 2012
@@ -18,58 +18,57 @@ specific language governing permissions 
 under the License.
 
 -->
-
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
        http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-    <bean id="quartzDbInitializer" class="org.springframework.jdbc.datasource.init.DataSourceInitializer">
-        <property name="dataSource" ref="dataSource"/>
-        <property name="enabled" value="true"/>
-        <property name="databasePopulator">
-            <bean class="org.springframework.jdbc.datasource.init.ResourceDatabasePopulator">
-                <property name="continueOnError" value="true"/>
-                <property name="ignoreFailedDrops" value="true"/>
-                <property name="sqlScriptEncoding" value="UTF-8"/>
-                <property name="scripts">
-                    <array>
-                        <value type="org.springframework.core.io.Resource">
-                            classpath:/quartz/${quartz.sql}
-                        </value>
-                    </array>
-                </property>
-            </bean>
+  <bean id="quartzDbInitializer" class="org.springframework.jdbc.datasource.init.DataSourceInitializer">
+    <property name="dataSource" ref="dataSource"/>
+    <property name="enabled" value="true"/>
+    <property name="databasePopulator">
+      <bean class="org.springframework.jdbc.datasource.init.ResourceDatabasePopulator">
+        <property name="continueOnError" value="true"/>
+        <property name="ignoreFailedDrops" value="true"/>
+        <property name="sqlScriptEncoding" value="UTF-8"/>
+        <property name="scripts">
+          <array>
+            <value type="org.springframework.core.io.Resource">
+              classpath:/quartz/${quartz.sql}
+            </value>
+          </array>
         </property>
-    </bean>
+      </bean>
+    </property>
+  </bean>
     
-    <bean id="scheduler"
+  <bean id="scheduler"
           class="org.springframework.scheduling.quartz.SchedulerFactoryBean"
           lazy-init="false" depends-on="quartzDbInitializer">
-        <property name="autoStartup" value="true"/>
-        <property name="applicationContextSchedulerContextKey" value="applicationContext"/>
-        <property name="waitForJobsToCompleteOnShutdown" value="true"/>
-        <property name="overwriteExistingJobs" value="true"/>
-        <property name="dataSource" ref="dataSource"/>
-        <property name="transactionManager" ref="transactionManager"/>
-        <property name="jobFactory">
-            <bean class="org.syncope.core.scheduling.SpringBeanJobFactory"/>
-        </property>
-        <property name="quartzProperties">
-            <props>
+    <property name="autoStartup" value="true"/>
+    <property name="applicationContextSchedulerContextKey" value="applicationContext"/>
+    <property name="waitForJobsToCompleteOnShutdown" value="true"/>
+    <property name="overwriteExistingJobs" value="true"/>
+    <property name="dataSource" ref="dataSource"/>
+    <property name="transactionManager" ref="transactionManager"/>
+    <property name="jobFactory">
+      <bean class="org.syncope.core.scheduling.SpringBeanJobFactory"/>
+    </property>
+    <property name="quartzProperties">
+      <props>
 		<!-- Job store -->
-                <prop key="org.quartz.jobStore.misfireThreshold">6000000</prop>
-                <prop key="org.quartz.jobStore.driverDelegateClass">${quartz.jobstore}</prop>
+        <prop key="org.quartz.jobStore.misfireThreshold">6000000</prop>
+        <prop key="org.quartz.jobStore.driverDelegateClass">${quartz.jobstore}</prop>
 
-                <prop key="org.quartz.jobStore.isClustered">true</prop>
-                <prop key="org.quartz.jobStore.clusterCheckinInterval">20000</prop>
+        <prop key="org.quartz.jobStore.isClustered">true</prop>
+        <prop key="org.quartz.jobStore.clusterCheckinInterval">20000</prop>
 
-                <prop key="org.quartz.scheduler.instanceName">ClusteredScheduler</prop>
-                <prop key="org.quartz.scheduler.instanceId">AUTO</prop>
-                <prop key="org.quartz.scheduler.jmx.export">true</prop>
-            </props>
-        </property>
-    </bean>
+        <prop key="org.quartz.scheduler.instanceName">ClusteredScheduler</prop>
+        <prop key="org.quartz.scheduler.instanceId">AUTO</prop>
+        <prop key="org.quartz.scheduler.jmx.export">true</prop>
+      </props>
+    </property>
+  </bean>
     
-    <bean id="notificationJob" class="org.syncope.core.scheduling.NotificationJob"/>
+  <bean id="notificationJob" class="org.syncope.core.scheduling.NotificationJob"/>
 </beans>

Modified: incubator/syncope/trunk/core/src/main/resources/securityContext.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/resources/securityContext.xml?rev=1297877&r1=1297876&r2=1297877&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/resources/securityContext.xml (original)
+++ incubator/syncope/trunk/core/src/main/resources/securityContext.xml Wed Mar  7 08:24:55 2012
@@ -18,7 +18,6 @@ specific language governing permissions 
 under the License.
 
 -->
-
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:security="http://www.springframework.org/schema/security"
@@ -27,29 +26,29 @@ under the License.
        http://www.springframework.org/schema/security
        http://www.springframework.org/schema/security/spring-security.xsd">
 
-    <security:global-method-security pre-post-annotations="enabled"/>
+  <security:global-method-security pre-post-annotations="enabled"/>
 
-    <bean id="securityContextRepository" class='org.syncope.core.security.NullSecurityContextRepository'/>
+  <bean id="securityContextRepository" class='org.syncope.core.security.NullSecurityContextRepository'/>
 
-    <security:http security-context-repository-ref="securityContextRepository">
-        <security:http-basic/>
-        <security:intercept-url pattern="/**"/>
-    </security:http>
+  <security:http security-context-repository-ref="securityContextRepository">
+    <security:http-basic/>
+    <security:intercept-url pattern="/**"/>
+  </security:http>
 
-    <bean id="syncopeUserDetailsService"
+  <bean id="syncopeUserDetailsService"
           class="org.syncope.core.security.SyncopeUserDetailsService">
-        <property name="adminUser" value="${adminUser}"/>
-    </bean>
+    <property name="adminUser" value="${adminUser}"/>
+  </bean>
 
-    <bean id="syncopeAuthenticationProvider"
+  <bean id="syncopeAuthenticationProvider"
           class="org.syncope.core.security.SyncopeAuthenticationProvider">
-        <property name="adminUser" value="${adminUser}"/>
-        <property name="adminMD5Password" value="${adminMD5Password}"/>
-        <property name="syncopeUserDetailsService" ref="syncopeUserDetailsService"/>
-    </bean>
-
-    <security:authentication-manager>
-        <security:authentication-provider ref="syncopeAuthenticationProvider"/>
-    </security:authentication-manager>
+    <property name="adminUser" value="${adminUser}"/>
+    <property name="adminMD5Password" value="${adminMD5Password}"/>
+    <property name="syncopeUserDetailsService" ref="syncopeUserDetailsService"/>
+  </bean>
+
+  <security:authentication-manager>
+    <security:authentication-provider ref="syncopeAuthenticationProvider"/>
+  </security:authentication-manager>
 
 </beans>



Mime
View raw message