You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2015/02/02 14:55:38 UTC

[01/22] syncope git commit: Updating CHANGES for release

Repository: syncope
Updated Branches:
  refs/heads/1_2_X bccd3a00d -> 424148ada
  refs/heads/2_0_X 2b7dd5d2c -> c7e819311
  refs/heads/master 3f4c7583b -> 697544198


Updating CHANGES for release


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/db4c9202
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/db4c9202
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/db4c9202

Branch: refs/heads/2_0_X
Commit: db4c920256035f49507115b8dc9fb28c54a1b217
Parents: 3237d26
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Jan 30 08:59:00 2015 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Jan 30 08:59:00 2015 +0100

----------------------------------------------------------------------
 CHANGES | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/db4c9202/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index a9b5592..142ca16 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,29 @@ Apache Syncope - CHANGES
 Licensed under Apache License 2.0 - http://www.apache.org/licenses/LICENSE-2.0
 --------------------------------------------------------------------------------
 
+Release Notes - Syncope - Version 1.2.2
+================================================================================
+
+** Bug
+    * [SYNCOPE-607] - Error when adding a value to a multivalue configuration parameter of type long
+    * [SYNCOPE-608] - Cannot configure audit for AuthenticationController
+    * [SYNCOPE-610] - Installer doesn't update the console.properties with the container port
+    * [SYNCOPE-611] - An approver displays all approval tasks including those not assigned to him
+    * [SYNCOPE-613] - delete overridable connector configuration property of type array String in resource edit panel
+    * [SYNCOPE-614] - NotificationJob fails with NullPointerException
+    * [SYNCOPE-615] - Updating properties and xml files of the installer module with the current version
+    * [SYNCOPE-617] - User/role schema attribute with minus symbol in name
+    * [SYNCOPE-625] - Build fails with Java 6
+    * [SYNCOPE-629] - ATTRTEMPLATE entities not exported
+    * [SYNCOPE-632] - Errors during update propagation when derived attribute is configured as account id
+
+** Improvement
+    * [SYNCOPE-612] - explicit configuration of Velocity logging
+    * [SYNCOPE-616] - Improving the management of the xml and properties files inside the installer
+    * [SYNCOPE-621] - Reduce log level of bean validation errors (in data binder)
+    * [SYNCOPE-622] - Improve VirAttrCache management
+    * [SYNCOPE-630] - Eliminate duplicate Syncope WADL methods
+
 Release Notes - Syncope - Version 1.2.1
 ================================================================================
 


[20/22] syncope git commit: Merge from 1_2_X

Posted by il...@apache.org.
Merge from 1_2_X


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/69754419
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/69754419
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/69754419

Branch: refs/heads/2_0_X
Commit: 69754419891a5f36619c9a02bc0133286cab897e
Parents: 3f4c758 424148a
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon Feb 2 14:54:29 2015 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon Feb 2 14:54:29 2015 +0100

----------------------------------------------------------------------
 CHANGES                                         |  23 +++
 NOTICE                                          |   2 +-
 build-tools/NOTICE                              |   8 +-
 console/NOTICE                                  |  12 +-
 core/NOTICE                                     |  12 +-
 core/pom.xml                                    |  38 ++++
 .../rest/utils/QueryResourceInfoComparator.java | 114 ++++++++++
 .../main/resources/quartz/tables_mariadb.sql    | 206 +++++++++++++++++++
 core/src/main/resources/restContext.xml         |   3 +
 .../core/rest/ConfigurationTestITCase.java      |   8 +-
 .../resources/mariadb/persistence.properties    |  28 +++
 pom.xml                                         |   5 +-
 src/site/xdoc/building.xml                      |   5 +
 src/site/xdoc/downloads.xml                     |  88 ++++----
 standalone/NOTICE                               |  14 +-
 15 files changed, 492 insertions(+), 74 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/69754419/core/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/syncope/blob/69754419/pom.xml
----------------------------------------------------------------------


[22/22] syncope git commit: Merge from master

Posted by il...@apache.org.
Merge from master


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/c7e81931
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/c7e81931
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/c7e81931

Branch: refs/heads/2_0_X
Commit: c7e819311b287f47ed90852871dce6f01cee57f8
Parents: 2b7dd5d 6975441
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon Feb 2 14:55:24 2015 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon Feb 2 14:55:24 2015 +0100

----------------------------------------------------------------------
 CHANGES                                         |  23 +++
 NOTICE                                          |   2 +-
 build-tools/NOTICE                              |   8 +-
 console/NOTICE                                  |  12 +-
 core/NOTICE                                     |  12 +-
 core/pom.xml                                    |  38 ++++
 .../main/resources/quartz/tables_mariadb.sql    | 206 +++++++++++++++++++
 .../core/rest/ConfigurationTestITCase.java      |   8 +-
 .../resources/mariadb/persistence.properties    |  28 +++
 pom.xml                                         |   5 +-
 src/site/xdoc/building.xml                      |   5 +
 src/site/xdoc/downloads.xml                     |  88 ++++----
 standalone/NOTICE                               |  14 +-
 13 files changed, 375 insertions(+), 74 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/c7e81931/core/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/syncope/blob/c7e81931/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 0ed97d7,1ebeb19..d8d0712
--- a/pom.xml
+++ b/pom.xml
@@@ -1434,7 -1434,7 +1434,8 @@@ under the License
              <exclude>**/.*</exclude>
              <exclude>**/deb/control/conffiles</exclude>
              <exclude>**/deb/control/control</exclude>
+             <exclude>**/*.lst</exclude>
 +            <exclude>**/syncope620/**</exclude>
            </excludes>
          </configuration>
          <executions>


[15/22] syncope git commit: [SYNCOPE-633] building documentation updated

Posted by il...@apache.org.
[SYNCOPE-633] building documentation updated


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/bccd3a00
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/bccd3a00
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/bccd3a00

Branch: refs/heads/2_0_X
Commit: bccd3a00d560cededa008993849e78a73d2593e2
Parents: 3967cfa
Author: fmartelli <fm...@apache.org>
Authored: Fri Jan 30 18:35:23 2015 +0100
Committer: fmartelli <fm...@apache.org>
Committed: Fri Jan 30 18:35:23 2015 +0100

----------------------------------------------------------------------
 src/site/xdoc/building.xml | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/bccd3a00/src/site/xdoc/building.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/building.xml b/src/site/xdoc/building.xml
index b9b1db9..9aa2409 100644
--- a/src/site/xdoc/building.xml
+++ b/src/site/xdoc/building.xml
@@ -115,6 +115,11 @@ $ mvn -Pdev -Dit.test=UserTestITCase#create</source>
         <a href="https://mariadb.org/">MariaDB</a> database via
         <source>$ mvn -Pmysql-it</source>
 
+        <h5>MariaDB</h5>
+        After providing connection information in <code>src/test/resources/mariadb/persistence.properties</code>,
+        perform the full test suite against a <a href="https://mariadb.org/">MariaDB</a> database via
+        <source>$ mvn -Pmariadb-it</source>
+
         <h5>Oracle database</h5>
         After providing connection information in <code>src/test/resources/oracle/persistence.properties</code>
         and having <a href="http://www.mkyong.com/maven/how-to-add-oracle-jdbc-driver-in-your-maven-local-repository/">


[10/22] syncope git commit: [maven-release-plugin] prepare for next development iteration

Posted by il...@apache.org.
[maven-release-plugin] prepare for next development iteration


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/b1511319
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/b1511319
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/b1511319

Branch: refs/heads/master
Commit: b1511319334aafc68142fa3a014ce9bf74144e48
Parents: bd0d901
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Jan 30 09:09:11 2015 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Jan 30 09:09:11 2015 +0100

----------------------------------------------------------------------
 archetype/pom.xml     | 2 +-
 build-tools/pom.xml   | 2 +-
 client/pom.xml        | 2 +-
 common/pom.xml        | 2 +-
 console/pom.xml       | 2 +-
 core-upgrader/pom.xml | 2 +-
 core/pom.xml          | 2 +-
 deb/console/pom.xml   | 2 +-
 deb/core/pom.xml      | 2 +-
 deb/pom.xml           | 2 +-
 installer/pom.xml     | 2 +-
 pom.xml               | 4 ++--
 standalone/pom.xml    | 2 +-
 13 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/b1511319/archetype/pom.xml
----------------------------------------------------------------------
diff --git a/archetype/pom.xml b/archetype/pom.xml
index 44424bb..fa42a6b 100644
--- a/archetype/pom.xml
+++ b/archetype/pom.xml
@@ -24,7 +24,7 @@ under the License.
   <parent>
     <groupId>org.apache.syncope</groupId>
     <artifactId>syncope</artifactId>
-    <version>1.2.2</version>
+    <version>1.2.3-SNAPSHOT</version>
   </parent>
 
   <name>Apache Syncope Archetype</name>

http://git-wip-us.apache.org/repos/asf/syncope/blob/b1511319/build-tools/pom.xml
----------------------------------------------------------------------
diff --git a/build-tools/pom.xml b/build-tools/pom.xml
index 47bc221..d2257be 100644
--- a/build-tools/pom.xml
+++ b/build-tools/pom.xml
@@ -24,7 +24,7 @@ under the License.
   <parent>
     <groupId>org.apache.syncope</groupId>
     <artifactId>syncope</artifactId>
-    <version>1.2.2</version>
+    <version>1.2.3-SNAPSHOT</version>
   </parent>
 
   <name>Apache Syncope Build Tools</name>

http://git-wip-us.apache.org/repos/asf/syncope/blob/b1511319/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index 8a9ea62..23764ce 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -24,7 +24,7 @@ under the License.
   <parent>
     <groupId>org.apache.syncope</groupId>
     <artifactId>syncope</artifactId>
-    <version>1.2.2</version>
+    <version>1.2.3-SNAPSHOT</version>
   </parent>
 
   <name>Apache Syncope Client</name>

http://git-wip-us.apache.org/repos/asf/syncope/blob/b1511319/common/pom.xml
----------------------------------------------------------------------
diff --git a/common/pom.xml b/common/pom.xml
index 005add7..331e929 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -24,7 +24,7 @@ under the License.
   <parent>
     <groupId>org.apache.syncope</groupId>
     <artifactId>syncope</artifactId>
-    <version>1.2.2</version>
+    <version>1.2.3-SNAPSHOT</version>
   </parent>
 
   <name>Apache Syncope Common</name>

http://git-wip-us.apache.org/repos/asf/syncope/blob/b1511319/console/pom.xml
----------------------------------------------------------------------
diff --git a/console/pom.xml b/console/pom.xml
index ac57f92..8f2dd3c 100644
--- a/console/pom.xml
+++ b/console/pom.xml
@@ -24,7 +24,7 @@ under the License.
   <parent>
     <groupId>org.apache.syncope</groupId>
     <artifactId>syncope</artifactId>
-    <version>1.2.2</version>
+    <version>1.2.3-SNAPSHOT</version>
   </parent>
 
   <name>Apache Syncope Console</name>

http://git-wip-us.apache.org/repos/asf/syncope/blob/b1511319/core-upgrader/pom.xml
----------------------------------------------------------------------
diff --git a/core-upgrader/pom.xml b/core-upgrader/pom.xml
index aa9d1d2..8db5eb5 100644
--- a/core-upgrader/pom.xml
+++ b/core-upgrader/pom.xml
@@ -23,7 +23,7 @@ under the License.
   <parent>
     <groupId>org.apache.syncope</groupId>
     <artifactId>syncope</artifactId>
-    <version>1.2.2</version>
+    <version>1.2.3-SNAPSHOT</version>
   </parent>
  
   <groupId>org.apache.syncope</groupId>

http://git-wip-us.apache.org/repos/asf/syncope/blob/b1511319/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index d9541b5..4b13eab 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -24,7 +24,7 @@ under the License.
   <parent>
     <groupId>org.apache.syncope</groupId>
     <artifactId>syncope</artifactId>
-    <version>1.2.2</version>
+    <version>1.2.3-SNAPSHOT</version>
   </parent>
 
   <name>Apache Syncope Core</name>

http://git-wip-us.apache.org/repos/asf/syncope/blob/b1511319/deb/console/pom.xml
----------------------------------------------------------------------
diff --git a/deb/console/pom.xml b/deb/console/pom.xml
index 2565b9d..c1bed80 100644
--- a/deb/console/pom.xml
+++ b/deb/console/pom.xml
@@ -24,7 +24,7 @@ under the License.
   <parent>
     <groupId>org.apache.syncope</groupId>
     <artifactId>syncope-deb</artifactId>
-    <version>1.2.2</version>
+    <version>1.2.3-SNAPSHOT</version>
   </parent>
 
   <name>Apache Syncope Deb Console</name>

http://git-wip-us.apache.org/repos/asf/syncope/blob/b1511319/deb/core/pom.xml
----------------------------------------------------------------------
diff --git a/deb/core/pom.xml b/deb/core/pom.xml
index 3602af0..3c1aed7 100644
--- a/deb/core/pom.xml
+++ b/deb/core/pom.xml
@@ -24,7 +24,7 @@ under the License.
   <parent>
     <groupId>org.apache.syncope</groupId>
     <artifactId>syncope-deb</artifactId>
-    <version>1.2.2</version>
+    <version>1.2.3-SNAPSHOT</version>
   </parent>
 
   <name>Apache Syncope Deb Core</name>

http://git-wip-us.apache.org/repos/asf/syncope/blob/b1511319/deb/pom.xml
----------------------------------------------------------------------
diff --git a/deb/pom.xml b/deb/pom.xml
index 852f492..904ebdd 100644
--- a/deb/pom.xml
+++ b/deb/pom.xml
@@ -24,7 +24,7 @@ under the License.
   <parent>
     <groupId>org.apache.syncope</groupId>
     <artifactId>syncope</artifactId>
-    <version>1.2.2</version>
+    <version>1.2.3-SNAPSHOT</version>
   </parent>
 
   <name>Apache Syncope Deb</name>

http://git-wip-us.apache.org/repos/asf/syncope/blob/b1511319/installer/pom.xml
----------------------------------------------------------------------
diff --git a/installer/pom.xml b/installer/pom.xml
index 16e7159..073cd52 100644
--- a/installer/pom.xml
+++ b/installer/pom.xml
@@ -24,7 +24,7 @@ under the License.
   <parent>
     <groupId>org.apache.syncope</groupId>
     <artifactId>syncope</artifactId>
-    <version>1.2.2</version>
+    <version>1.2.3-SNAPSHOT</version>
   </parent>
 
   <name>Apache Syncope Installer</name>

http://git-wip-us.apache.org/repos/asf/syncope/blob/b1511319/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a528560..3b805c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@ under the License.
 
   <groupId>org.apache.syncope</groupId>
   <artifactId>syncope</artifactId>
-  <version>1.2.2</version>
+  <version>1.2.3-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <parent>
@@ -52,7 +52,7 @@ under the License.
     <connection>scm:git:https://git-wip-us.apache.org/repos/asf/syncope.git</connection>
     <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/syncope.git</developerConnection>
     <url>https://git-wip-us.apache.org/repos/asf?p=syncope.git</url>
-    <tag>syncope-1.2.2</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <issueManagement>

http://git-wip-us.apache.org/repos/asf/syncope/blob/b1511319/standalone/pom.xml
----------------------------------------------------------------------
diff --git a/standalone/pom.xml b/standalone/pom.xml
index 8ea8346..270b58c 100644
--- a/standalone/pom.xml
+++ b/standalone/pom.xml
@@ -24,7 +24,7 @@ under the License.
   <parent>
     <groupId>org.apache.syncope</groupId>
     <artifactId>syncope</artifactId>
-    <version>1.2.2</version>
+    <version>1.2.3-SNAPSHOT</version>
   </parent>
 
   <name>Apache Syncope Standalone Distribution</name>


[12/22] syncope git commit: Restoring QueryResourceInfoComparator removed by SYNCOPE-630 in order to avoid test failures with JDK 6

Posted by il...@apache.org.
Restoring QueryResourceInfoComparator removed by SYNCOPE-630 in order to avoid test failures with JDK 6


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/9aa765b2
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/9aa765b2
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/9aa765b2

Branch: refs/heads/master
Commit: 9aa765b2519b4c565c5d2dca21afe8d7093fdf91
Parents: b151131
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Jan 30 13:58:40 2015 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Jan 30 13:58:40 2015 +0100

----------------------------------------------------------------------
 .../rest/utils/QueryResourceInfoComparator.java | 114 +++++++++++++++++++
 core/src/main/resources/restContext.xml         |   3 +
 2 files changed, 117 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/9aa765b2/core/src/main/java/org/apache/syncope/core/rest/utils/QueryResourceInfoComparator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/rest/utils/QueryResourceInfoComparator.java b/core/src/main/java/org/apache/syncope/core/rest/utils/QueryResourceInfoComparator.java
new file mode 100644
index 0000000..bcc015d
--- /dev/null
+++ b/core/src/main/java/org/apache/syncope/core/rest/utils/QueryResourceInfoComparator.java
@@ -0,0 +1,114 @@
+/*
+ * 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.core.rest.utils;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.cxf.jaxrs.ext.ResourceComparator;
+import org.apache.cxf.jaxrs.model.ClassResourceInfo;
+import org.apache.cxf.jaxrs.model.OperationResourceInfo;
+import org.apache.cxf.jaxrs.model.OperationResourceInfoComparator;
+import org.apache.cxf.jaxrs.model.Parameter;
+import org.apache.cxf.jaxrs.utils.JAXRSUtils;
+import org.apache.cxf.message.Message;
+
+public class QueryResourceInfoComparator extends OperationResourceInfoComparator implements ResourceComparator {
+
+    public QueryResourceInfoComparator() {
+        super(null, null);
+    }
+
+    @Override
+    public int compare(final ClassResourceInfo cri1, final ClassResourceInfo cri2, final Message message) {
+        // Leave Class selection to CXF
+        return 0;
+    }
+
+    @Override
+    public int compare(final OperationResourceInfo oper1, final OperationResourceInfo oper2, final Message message) {
+        // Check if CXF can make a decision
+        int cxfResult = super.compare(oper1, oper2);
+        if (cxfResult != 0) {
+            return cxfResult;
+        }
+
+        int op1Counter = getMatchingRate(oper1, message);
+        int op2Counter = getMatchingRate(oper2, message);
+
+        return op1Counter == op2Counter
+                ? 0
+                : op1Counter < op2Counter
+                ? 1
+                : -1;
+    }
+
+    /**
+     * This method calculates a number indicating a good or bad match between values provided within the request and
+     * expected method parameters. A higher number means a better match.
+     *
+     * @param operation The operation to be rated, based on contained parameterInfo values.
+     * @param message A message containing query and header values from user request
+     * @return A positive or negative number, indicating a good match between query and method
+     */
+    protected int getMatchingRate(final OperationResourceInfo operation, final Message message) {
+        List<Parameter> params = operation.getParameters();
+        if (params == null || params.isEmpty()) {
+            return 0;
+        }
+
+        // Get Request QueryParams
+        String query = (String) message.get(Message.QUERY_STRING);
+        String path = (String) message.get(Message.REQUEST_URI);
+        Map<String, List<String>> qParams = JAXRSUtils.getStructuredParams(query, "&", true, false);
+        Map<String, List<String>> mParams = JAXRSUtils.getMatrixParams(path, true);
+        // Get Request Headers
+        Map<?, ?> qHeader = (java.util.Map<?, ?>) message.get(Message.PROTOCOL_HEADERS);
+
+        int rate = 0;
+        for (Parameter p : params) {
+            switch (p.getType()) {
+                case QUERY:
+                    if (qParams.containsKey(p.getName())) {
+                        rate += 2;
+                    } else if (p.getDefaultValue() == null) {
+                        rate -= 1;
+                    }
+                    break;
+                case MATRIX:
+                    if (mParams.containsKey(p.getName())) {
+                        rate += 2;
+                    } else if (p.getDefaultValue() == null) {
+                        rate -= 1;
+                    }
+                    break;
+                case HEADER:
+                    if (qHeader.containsKey(p.getName())) {
+                        rate += 2;
+                    } else if (p.getDefaultValue() == null) {
+                        rate -= 1;
+                    }
+                    break;
+                default:
+                    break;
+            }
+        }
+        return rate;
+    }
+}

http://git-wip-us.apache.org/repos/asf/syncope/blob/9aa765b2/core/src/main/resources/restContext.xml
----------------------------------------------------------------------
diff --git a/core/src/main/resources/restContext.xml b/core/src/main/resources/restContext.xml
index 7b6fe30..1b71e31 100644
--- a/core/src/main/resources/restContext.xml
+++ b/core/src/main/resources/restContext.xml
@@ -100,6 +100,9 @@ under the License.
   <jaxrs:server id="restContainer" address="/" 
                 basePackages="org.apache.syncope.common.services, org.apache.syncope.core.services" 
                 staticSubresourceResolution="true">
+    <jaxrs:resourceComparator>
+      <bean id="queryResourceInfoComparator" class="org.apache.syncope.core.rest.utils.QueryResourceInfoComparator"/>
+    </jaxrs:resourceComparator>
     <jaxrs:properties> 
       <entry key="search.lax.property.match" value="true"/> 
     </jaxrs:properties> 


[14/22] syncope git commit: [SYNCOPE-633] added MariaDB support

Posted by il...@apache.org.
[SYNCOPE-633] added MariaDB support


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/3967cfad
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/3967cfad
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/3967cfad

Branch: refs/heads/master
Commit: 3967cfad94505961cbd872298de42070caff676f
Parents: 9aa765b
Author: fmartelli <fm...@apache.org>
Authored: Fri Jan 30 16:28:12 2015 +0100
Committer: fmartelli <fm...@apache.org>
Committed: Fri Jan 30 16:28:12 2015 +0100

----------------------------------------------------------------------
 core/pom.xml                                    |  38 ++++
 .../main/resources/quartz/tables_mariadb.sql    | 206 +++++++++++++++++++
 .../core/rest/ConfigurationTestITCase.java      |   8 +-
 .../resources/mariadb/persistence.properties    |  28 +++
 pom.xml                                         |   1 +
 5 files changed, 277 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/3967cfad/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 4b13eab..3fa0e26 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -691,6 +691,7 @@ under the License.
           <exclude>oracle/**</exclude>
           <exclude>postgres/**</exclude>
           <exclude>mysql/**</exclude>
+          <exclude>mariadb/**</exclude>
           <exclude>sqlserver/**</exclude>
           <exclude>jboss/**</exclude>
           <exclude>weblogic/**</exclude>
@@ -1155,6 +1156,43 @@ under the License.
     </profile>
 
     <profile>
+      <id>mariadb-it</id>
+
+      <properties>
+        <jdbcdriver.groupId>org.mariadb.jdbc</jdbcdriver.groupId>
+        <jdbcdriver.artifactId>mariadb-java-client</jdbcdriver.artifactId>
+        <jdbcdriver.version>1.1.7</jdbcdriver.version>
+      </properties>
+
+      <dependencies>
+        <dependency>
+          <groupId>${jdbcdriver.groupId}</groupId>
+          <artifactId>${jdbcdriver.artifactId}</artifactId>
+          <version>${jdbcdriver.version}</version>
+          <scope>test</scope>
+        </dependency>
+      </dependencies>
+      
+      <build>
+        <defaultGoal>clean verify</defaultGoal>
+
+        <testResources>
+          <testResource>
+            <directory>src/test/resources</directory>
+            <filtering>true</filtering>
+            <excludes>
+              <exclude>persistence.properties</exclude>
+            </excludes>
+          </testResource>
+          <testResource>
+            <directory>src/test/resources/mariadb</directory>
+            <filtering>true</filtering>
+          </testResource>
+        </testResources>
+      </build>
+    </profile>
+
+    <profile>
       <id>glassfish-it</id>
 
       <dependencies>

http://git-wip-us.apache.org/repos/asf/syncope/blob/3967cfad/core/src/main/resources/quartz/tables_mariadb.sql
----------------------------------------------------------------------
diff --git a/core/src/main/resources/quartz/tables_mariadb.sql b/core/src/main/resources/quartz/tables_mariadb.sql
new file mode 100644
index 0000000..ebb8e59
--- /dev/null
+++ b/core/src/main/resources/quartz/tables_mariadb.sql
@@ -0,0 +1,206 @@
+-- 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.
+
+--
+-- Quartz seems to work best with the driver mm.mysql-2.0.7-bin.jar
+--
+-- PLEASE consider using mysql with innodb tables to avoid locking issues
+--
+-- In your Quartz properties file, you'll need to set 
+-- org.quartz.jobStore.driverDelegateClass = org.quartz.impl.jdbcjobstore.StdJDBCDelegate
+--
+
+BEGIN;
+DROP TABLE IF EXISTS QRTZ_FIRED_TRIGGERS;
+DROP TABLE IF EXISTS QRTZ_PAUSED_TRIGGER_GRPS;
+DROP TABLE IF EXISTS QRTZ_SCHEDULER_STATE;
+DROP TABLE IF EXISTS QRTZ_LOCKS;
+DROP TABLE IF EXISTS QRTZ_SIMPLE_TRIGGERS;
+DROP TABLE IF EXISTS QRTZ_SIMPROP_TRIGGERS;
+DROP TABLE IF EXISTS QRTZ_CRON_TRIGGERS;
+DROP TABLE IF EXISTS QRTZ_BLOB_TRIGGERS;
+DROP TABLE IF EXISTS QRTZ_TRIGGERS;
+DROP TABLE IF EXISTS QRTZ_JOB_DETAILS;
+DROP TABLE IF EXISTS QRTZ_CALENDARS;
+COMMIT;
+
+
+BEGIN;
+CREATE TABLE QRTZ_JOB_DETAILS
+  (
+    SCHED_NAME VARCHAR(120) NOT NULL,
+    JOB_NAME  VARCHAR(200) NOT NULL,
+    JOB_GROUP VARCHAR(200) NOT NULL,
+    DESCRIPTION VARCHAR(250) NULL,
+    JOB_CLASS_NAME   VARCHAR(250) NOT NULL,
+    IS_DURABLE VARCHAR(1) NOT NULL,
+    IS_NONCONCURRENT VARCHAR(1) NOT NULL,
+    IS_UPDATE_DATA VARCHAR(1) NOT NULL,
+    REQUESTS_RECOVERY VARCHAR(1) NOT NULL,
+    JOB_DATA BLOB NULL,
+    PRIMARY KEY (SCHED_NAME,JOB_NAME,JOB_GROUP)
+);
+COMMIT;
+
+BEGIN;
+CREATE TABLE QRTZ_TRIGGERS
+  (
+    SCHED_NAME VARCHAR(120) NOT NULL,
+    TRIGGER_NAME VARCHAR(200) NOT NULL,
+    TRIGGER_GROUP VARCHAR(200) NOT NULL,
+    JOB_NAME  VARCHAR(200) NOT NULL,
+    JOB_GROUP VARCHAR(200) NOT NULL,
+    DESCRIPTION VARCHAR(250) NULL,
+    NEXT_FIRE_TIME BIGINT(13) NULL,
+    PREV_FIRE_TIME BIGINT(13) NULL,
+    PRIORITY INTEGER NULL,
+    TRIGGER_STATE VARCHAR(16) NOT NULL,
+    TRIGGER_TYPE VARCHAR(8) NOT NULL,
+    START_TIME BIGINT(13) NOT NULL,
+    END_TIME BIGINT(13) NULL,
+    CALENDAR_NAME VARCHAR(200) NULL,
+    MISFIRE_INSTR SMALLINT(2) NULL,
+    JOB_DATA BLOB NULL,
+    PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP),
+    FOREIGN KEY (SCHED_NAME,JOB_NAME,JOB_GROUP)
+        REFERENCES QRTZ_JOB_DETAILS(SCHED_NAME,JOB_NAME,JOB_GROUP)
+);
+COMMIT;
+
+BEGIN;
+CREATE TABLE QRTZ_SIMPLE_TRIGGERS
+  (
+    SCHED_NAME VARCHAR(120) NOT NULL,
+    TRIGGER_NAME VARCHAR(200) NOT NULL,
+    TRIGGER_GROUP VARCHAR(200) NOT NULL,
+    REPEAT_COUNT BIGINT(7) NOT NULL,
+    REPEAT_INTERVAL BIGINT(12) NOT NULL,
+    TIMES_TRIGGERED BIGINT(10) NOT NULL,
+    PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP),
+    FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
+        REFERENCES QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
+);
+COMMIT;
+
+BEGIN;
+CREATE TABLE QRTZ_CRON_TRIGGERS
+  (
+    SCHED_NAME VARCHAR(120) NOT NULL,
+    TRIGGER_NAME VARCHAR(200) NOT NULL,
+    TRIGGER_GROUP VARCHAR(200) NOT NULL,
+    CRON_EXPRESSION VARCHAR(200) NOT NULL,
+    TIME_ZONE_ID VARCHAR(80),
+    PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP),
+    FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
+        REFERENCES QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
+);
+COMMIT;
+
+BEGIN;
+CREATE TABLE QRTZ_SIMPROP_TRIGGERS
+  (          
+    SCHED_NAME VARCHAR(120) NOT NULL,
+    TRIGGER_NAME VARCHAR(200) NOT NULL,
+    TRIGGER_GROUP VARCHAR(200) NOT NULL,
+    STR_PROP_1 VARCHAR(512) NULL,
+    STR_PROP_2 VARCHAR(512) NULL,
+    STR_PROP_3 VARCHAR(512) NULL,
+    INT_PROP_1 INT NULL,
+    INT_PROP_2 INT NULL,
+    LONG_PROP_1 BIGINT NULL,
+    LONG_PROP_2 BIGINT NULL,
+    DEC_PROP_1 NUMERIC(13,4) NULL,
+    DEC_PROP_2 NUMERIC(13,4) NULL,
+    BOOL_PROP_1 VARCHAR(1) NULL,
+    BOOL_PROP_2 VARCHAR(1) NULL,
+    PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP),
+    FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP) 
+    REFERENCES QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
+);
+COMMIT;
+
+BEGIN;
+CREATE TABLE QRTZ_BLOB_TRIGGERS
+  (
+    SCHED_NAME VARCHAR(120) NOT NULL,
+    TRIGGER_NAME VARCHAR(200) NOT NULL,
+    TRIGGER_GROUP VARCHAR(200) NOT NULL,
+    BLOB_DATA BLOB NULL,
+    PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP),
+    FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
+        REFERENCES QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
+);
+COMMIT;
+
+BEGIN;
+CREATE TABLE QRTZ_CALENDARS
+  (
+    SCHED_NAME VARCHAR(120) NOT NULL,
+    CALENDAR_NAME  VARCHAR(200) NOT NULL,
+    CALENDAR BLOB NOT NULL,
+    PRIMARY KEY (SCHED_NAME,CALENDAR_NAME)
+);
+COMMIT;
+
+BEGIN;
+CREATE TABLE QRTZ_PAUSED_TRIGGER_GRPS
+  (
+    SCHED_NAME VARCHAR(120) NOT NULL,
+    TRIGGER_GROUP  VARCHAR(200) NOT NULL, 
+    PRIMARY KEY (SCHED_NAME,TRIGGER_GROUP)
+);
+COMMIT;
+
+BEGIN;
+CREATE TABLE QRTZ_FIRED_TRIGGERS
+  (
+    SCHED_NAME VARCHAR(120) NOT NULL,
+    ENTRY_ID VARCHAR(95) NOT NULL,
+    TRIGGER_NAME VARCHAR(200) NOT NULL,
+    TRIGGER_GROUP VARCHAR(200) NOT NULL,
+    INSTANCE_NAME VARCHAR(200) NOT NULL,
+    FIRED_TIME BIGINT(13) NOT NULL,
+    SCHED_TIME BIGINT(13) NOT NULL,
+    PRIORITY INTEGER NOT NULL,
+    STATE VARCHAR(16) NOT NULL,
+    JOB_NAME VARCHAR(200) NULL,
+    JOB_GROUP VARCHAR(200) NULL,
+    IS_NONCONCURRENT VARCHAR(1) NULL,
+    REQUESTS_RECOVERY VARCHAR(1) NULL,
+    PRIMARY KEY (SCHED_NAME,ENTRY_ID)
+);
+COMMIT;
+
+BEGIN;
+CREATE TABLE QRTZ_SCHEDULER_STATE
+  (
+    SCHED_NAME VARCHAR(120) NOT NULL,
+    INSTANCE_NAME VARCHAR(200) NOT NULL,
+    LAST_CHECKIN_TIME BIGINT(13) NOT NULL,
+    CHECKIN_INTERVAL BIGINT(13) NOT NULL,
+    PRIMARY KEY (SCHED_NAME,INSTANCE_NAME)
+);
+COMMIT;
+
+BEGIN;
+CREATE TABLE QRTZ_LOCKS
+  (
+    SCHED_NAME VARCHAR(120) NOT NULL,
+    LOCK_NAME  VARCHAR(40) NOT NULL, 
+    PRIMARY KEY (SCHED_NAME,LOCK_NAME)
+);
+COMMIT;

http://git-wip-us.apache.org/repos/asf/syncope/blob/3967cfad/core/src/test/java/org/apache/syncope/core/rest/ConfigurationTestITCase.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/syncope/core/rest/ConfigurationTestITCase.java b/core/src/test/java/org/apache/syncope/core/rest/ConfigurationTestITCase.java
index 1f981ac..d81afb7 100644
--- a/core/src/test/java/org/apache/syncope/core/rest/ConfigurationTestITCase.java
+++ b/core/src/test/java/org/apache/syncope/core/rest/ConfigurationTestITCase.java
@@ -195,19 +195,19 @@ public class ConfigurationTestITCase extends AbstractTest {
             assertFalse(configExport.isEmpty());
             assertTrue(configExport.length() > 1000);
 
-            String[] result = StringUtils.substringsBetween(configExport, "<RATTRTEMPLATE", "/>");
+            String[] result = StringUtils.substringsBetween(configExport.toUpperCase(), "<RATTRTEMPLATE", "/>");
             boolean rattrExists = false;
             for (String entry : result) {
-                if (entry.contains(roleKey.getName())) {
+                if (entry.contains(roleKey.getName().toUpperCase())) {
                     rattrExists = true;
                 }
             }
             assertTrue(rattrExists);
 
-            result = StringUtils.substringsBetween(configExport, "<MATTRTEMPLATE", "/>");
+            result = StringUtils.substringsBetween(configExport.toUpperCase(), "<MATTRTEMPLATE", "/>");
             boolean mattrExists = false;
             for (String entry : result) {
-                if (entry.contains(membershipKey.getName())) {
+                if (entry.contains(membershipKey.getName().toUpperCase())) {
                     mattrExists = true;
                 }
             }

http://git-wip-us.apache.org/repos/asf/syncope/blob/3967cfad/core/src/test/resources/mariadb/persistence.properties
----------------------------------------------------------------------
diff --git a/core/src/test/resources/mariadb/persistence.properties b/core/src/test/resources/mariadb/persistence.properties
new file mode 100644
index 0000000..8713629
--- /dev/null
+++ b/core/src/test/resources/mariadb/persistence.properties
@@ -0,0 +1,28 @@
+# 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.
+jpa.driverClassName=org.mariadb.jdbc.Driver
+jpa.url=jdbc:mariadb://localhost:3306/syncope?characterEncoding=UTF-8
+jpa.username=syncope
+jpa.password=syncope
+jpa.dialect=org.apache.openjpa.jdbc.sql.MariaDBDictionary
+jpa.pool.validationQuery=SELECT 1
+#note: other connection pool settings can also be configured here, see persistenceContext.xml
+quartz.jobstore=org.quartz.impl.jdbcjobstore.StdJDBCDelegate
+quartz.scheduler.idleWaitTime=5000
+quartz.sql=tables_mariadb.sql
+audit.sql=audit.sql
+database.schema=

http://git-wip-us.apache.org/repos/asf/syncope/blob/3967cfad/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3b805c1..2d3f6c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1410,6 +1410,7 @@ under the License.
             <exclude>**/.*</exclude>
             <exclude>**/deb/control/conffiles</exclude>
             <exclude>**/deb/control/control</exclude>
+            <exclude>**/*.lst</exclude>
           </excludes>
         </configuration>
         <executions>


[04/22] syncope git commit: It's 2015

Posted by il...@apache.org.
It's 2015


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/4f437939
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/4f437939
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/4f437939

Branch: refs/heads/master
Commit: 4f43793915b14b6c8a235cfb37fe924a64e4f76e
Parents: db4c920
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Jan 30 08:59:18 2015 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Jan 30 08:59:18 2015 +0100

----------------------------------------------------------------------
 NOTICE             |  2 +-
 build-tools/NOTICE |  8 ++++----
 console/NOTICE     | 12 ++++++------
 core/NOTICE        | 12 ++++++------
 standalone/NOTICE  | 14 +++++++-------
 5 files changed, 24 insertions(+), 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/4f437939/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 8fe5dc6..6bb20e8 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
 Apache Syncope
-Copyright 2012-2014 The Apache Software Foundation
+Copyright 2012-2015 The Apache Software Foundation
 
 This product includes software developed by:
 The Apache Software Foundation (http://www.apache.org/).

http://git-wip-us.apache.org/repos/asf/syncope/blob/4f437939/build-tools/NOTICE
----------------------------------------------------------------------
diff --git a/build-tools/NOTICE b/build-tools/NOTICE
index 11830fe..6d3619e 100644
--- a/build-tools/NOTICE
+++ b/build-tools/NOTICE
@@ -1,5 +1,5 @@
 Apache Syncope
-Copyright 2012-2014 The Apache Software Foundation
+Copyright 2012-2015 The Apache Software Foundation
 
 This product includes software developed by:
 The Apache Software Foundation (http://www.apache.org/).
@@ -21,7 +21,7 @@ This product includes software developed by the AOP Alliance (Java/J2EE AOP stan
 
 This product includes software developed by Tirasa (http://www.tirasa.net)
 Copyright 2008-2009 Sun Microsystems, Inc. All rights reserved.
-Copyright 2011-2014 Tirasa S.r.l. All rights reserved.
+Copyright 2011-2015 Tirasa S.r.l. All rights reserved.
 This software is included in binary form only.
 
 ==
@@ -42,11 +42,11 @@ Copyright (c) 2004-2013 QOS.ch.
 ==
 
 This product includes software developed by SpringSource
-Copyright (c) 2004-2014 SpringSource
+Copyright (c) 2004-2015 SpringSource
 All rights reserved.
 
 ==
 
 This product includes software developed by the Indiana University Extreme! Lab.
 Copyright (c) 2002 Extreme! Lab, Indiana University.
-All rights reserved.
\ No newline at end of file
+All rights reserved.

http://git-wip-us.apache.org/repos/asf/syncope/blob/4f437939/console/NOTICE
----------------------------------------------------------------------
diff --git a/console/NOTICE b/console/NOTICE
index 1812b9d..356cdb9 100644
--- a/console/NOTICE
+++ b/console/NOTICE
@@ -1,5 +1,5 @@
 Apache Syncope
-Copyright 2012-2014 The Apache Software Foundation
+Copyright 2012-2015 The Apache Software Foundation
 
 This product includes software developed by:
 The Apache Software Foundation (http://www.apache.org/).
@@ -26,7 +26,7 @@ All rights reserved.
 ==
 
 This product includes the CodeMirror JavaScript component.
-Copyright (C) 2014 by Marijn Haverbeke <ma...@gmail.com> and others
+Copyright (C) 2015 by Marijn Haverbeke <ma...@gmail.com> and others
 
 ==
 
@@ -45,13 +45,13 @@ This product includes software developed by the Joda Time project (http://www.jo
 ==
 
 This product includes the jQuery Core JavaScript Library.
-Copyright 2007, 2014 jQuery Foundation and other contributors,
+Copyright 2007, 2015 jQuery Foundation and other contributors,
 https://jquery.org/
 
 ==
 
 This product includes the jQuery UI JavaScript Library.
-Copyright 2007, 2014 jQuery Foundation and other contributors,
+Copyright 2007, 2015 jQuery Foundation and other contributors,
 https://jquery.org/
 
 ==
@@ -62,7 +62,7 @@ Copyright (c) 2004-2013 QOS.ch.
 ==
 
 This product includes software developed by SpringSource
-Copyright (c) 2004-2014 SpringSource
+Copyright (c) 2004-2015 SpringSource
 All rights reserved.
 
 ==
@@ -72,4 +72,4 @@ Copyright (c) Red Hat, Inc., Emmanuel Bernard
 
 ==
 
-This product includes software developed by the Woodstox Project (http://woodstox.codehaus.org/).
\ No newline at end of file
+This product includes software developed by the Woodstox Project (http://woodstox.codehaus.org/).

http://git-wip-us.apache.org/repos/asf/syncope/blob/4f437939/core/NOTICE
----------------------------------------------------------------------
diff --git a/core/NOTICE b/core/NOTICE
index 3749e1b..12c36cf 100644
--- a/core/NOTICE
+++ b/core/NOTICE
@@ -1,5 +1,5 @@
 Apache Syncope
-Copyright 2012-2014 The Apache Software Foundation
+Copyright 2012-2015 The Apache Software Foundation
 
 This product includes software developed by:
 The Apache Software Foundation (http://www.apache.org/).
@@ -41,7 +41,7 @@ This product includes software developed by ClassMate (https://github.com/cowtow
 
 This product includes software developed by Tirasa (http://www.tirasa.net)
 Copyright 2008-2009 Sun Microsystems, Inc. All rights reserved.
-Copyright 2011-2014 Tirasa S.r.l. All rights reserved.
+Copyright 2011-2015 Tirasa S.r.l. All rights reserved.
 This software is included in binary form only.
 
 ==
@@ -80,13 +80,13 @@ This product includes software developed by the Joda Time project (http://www.jo
 ==
 
 This product includes the jQuery Core JavaScript Library.
-Copyright 2007, 2014 jQuery Foundation and other contributors,
+Copyright 2007, 2015 jQuery Foundation and other contributors,
 https://jquery.org/
 
 ==
 
 This product includes the jQuery UI JavaScript Library.
-Copyright 2007, 2014 jQuery Foundation and other contributors,
+Copyright 2007, 2015 jQuery Foundation and other contributors,
 https://jquery.org/
 
 ==
@@ -112,7 +112,7 @@ Copyright (c) 2004-2013 QOS.ch.
 ==
 
 This product includes software developed by SpringSource
-Copyright (c) 2004-2014 SpringSource
+Copyright (c) 2004-2015 SpringSource
 All rights reserved.
 
 ==
@@ -128,4 +128,4 @@ This product includes software developed by the Woodstox Project (http://woodsto
 
 This product includes software developed by Web Services Description Language for Java (http://wsdl4j.sourceforge.net/).
 Copyright (c) Dice.
-All Rights Reserved.
\ No newline at end of file
+All Rights Reserved.

http://git-wip-us.apache.org/repos/asf/syncope/blob/4f437939/standalone/NOTICE
----------------------------------------------------------------------
diff --git a/standalone/NOTICE b/standalone/NOTICE
index 508b900..c66645f 100644
--- a/standalone/NOTICE
+++ b/standalone/NOTICE
@@ -1,5 +1,5 @@
 Apache Syncope
-Copyright 2012-2014 The Apache Software Foundation
+Copyright 2012-2015 The Apache Software Foundation
 
 This product includes software developed by:
 The Apache Software Foundation (http://www.apache.org/).
@@ -41,13 +41,13 @@ This product includes software developed by ClassMate (https://github.com/cowtow
 
 This product includes software developed by Tirasa (http://www.tirasa.net)
 Copyright 2008-2009 Sun Microsystems, Inc. All rights reserved.
-Copyright 2011-2014 Tirasa S.r.l. All rights reserved.
+Copyright 2011-2015 Tirasa S.r.l. All rights reserved.
 This software is included in binary form only.
 
 ==
 
 This product includes the CodeMirror JavaScript component.
-Copyright (C) 2014 by Marijn Haverbeke <ma...@gmail.com> and others
+Copyright (C) 2015 by Marijn Haverbeke <ma...@gmail.com> and others
 
 ==
 
@@ -91,13 +91,13 @@ This product includes software developed by the Joda Time project (http://www.jo
 ==
 
 This product includes the jQuery Core JavaScript Library.
-Copyright 2007, 2014 jQuery Foundation and other contributors,
+Copyright 2007, 2015 jQuery Foundation and other contributors,
 https://jquery.org/
 
 ==
 
 This product includes the jQuery UI JavaScript Library.
-Copyright 2007, 2014 jQuery Foundation and other contributors,
+Copyright 2007, 2015 jQuery Foundation and other contributors,
 https://jquery.org/
 
 ==
@@ -123,7 +123,7 @@ Copyright (c) 2004-2013 QOS.ch.
 ==
 
 This product includes software developed by SpringSource
-Copyright (c) 2004-2014 SpringSource
+Copyright (c) 2004-2015 SpringSource
 All rights reserved.
 
 ==
@@ -139,4 +139,4 @@ This product includes software developed by the Woodstox Project (http://woodsto
 
 This product includes software developed by Web Services Description Language for Java (http://wsdl4j.sourceforge.net/).
 Copyright (c) Dice.
-All Rights Reserved.
\ No newline at end of file
+All Rights Reserved.


[03/22] syncope git commit: It's 2015

Posted by il...@apache.org.
It's 2015


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/4f437939
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/4f437939
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/4f437939

Branch: refs/heads/2_0_X
Commit: 4f43793915b14b6c8a235cfb37fe924a64e4f76e
Parents: db4c920
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Jan 30 08:59:18 2015 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Jan 30 08:59:18 2015 +0100

----------------------------------------------------------------------
 NOTICE             |  2 +-
 build-tools/NOTICE |  8 ++++----
 console/NOTICE     | 12 ++++++------
 core/NOTICE        | 12 ++++++------
 standalone/NOTICE  | 14 +++++++-------
 5 files changed, 24 insertions(+), 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/4f437939/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 8fe5dc6..6bb20e8 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
 Apache Syncope
-Copyright 2012-2014 The Apache Software Foundation
+Copyright 2012-2015 The Apache Software Foundation
 
 This product includes software developed by:
 The Apache Software Foundation (http://www.apache.org/).

http://git-wip-us.apache.org/repos/asf/syncope/blob/4f437939/build-tools/NOTICE
----------------------------------------------------------------------
diff --git a/build-tools/NOTICE b/build-tools/NOTICE
index 11830fe..6d3619e 100644
--- a/build-tools/NOTICE
+++ b/build-tools/NOTICE
@@ -1,5 +1,5 @@
 Apache Syncope
-Copyright 2012-2014 The Apache Software Foundation
+Copyright 2012-2015 The Apache Software Foundation
 
 This product includes software developed by:
 The Apache Software Foundation (http://www.apache.org/).
@@ -21,7 +21,7 @@ This product includes software developed by the AOP Alliance (Java/J2EE AOP stan
 
 This product includes software developed by Tirasa (http://www.tirasa.net)
 Copyright 2008-2009 Sun Microsystems, Inc. All rights reserved.
-Copyright 2011-2014 Tirasa S.r.l. All rights reserved.
+Copyright 2011-2015 Tirasa S.r.l. All rights reserved.
 This software is included in binary form only.
 
 ==
@@ -42,11 +42,11 @@ Copyright (c) 2004-2013 QOS.ch.
 ==
 
 This product includes software developed by SpringSource
-Copyright (c) 2004-2014 SpringSource
+Copyright (c) 2004-2015 SpringSource
 All rights reserved.
 
 ==
 
 This product includes software developed by the Indiana University Extreme! Lab.
 Copyright (c) 2002 Extreme! Lab, Indiana University.
-All rights reserved.
\ No newline at end of file
+All rights reserved.

http://git-wip-us.apache.org/repos/asf/syncope/blob/4f437939/console/NOTICE
----------------------------------------------------------------------
diff --git a/console/NOTICE b/console/NOTICE
index 1812b9d..356cdb9 100644
--- a/console/NOTICE
+++ b/console/NOTICE
@@ -1,5 +1,5 @@
 Apache Syncope
-Copyright 2012-2014 The Apache Software Foundation
+Copyright 2012-2015 The Apache Software Foundation
 
 This product includes software developed by:
 The Apache Software Foundation (http://www.apache.org/).
@@ -26,7 +26,7 @@ All rights reserved.
 ==
 
 This product includes the CodeMirror JavaScript component.
-Copyright (C) 2014 by Marijn Haverbeke <ma...@gmail.com> and others
+Copyright (C) 2015 by Marijn Haverbeke <ma...@gmail.com> and others
 
 ==
 
@@ -45,13 +45,13 @@ This product includes software developed by the Joda Time project (http://www.jo
 ==
 
 This product includes the jQuery Core JavaScript Library.
-Copyright 2007, 2014 jQuery Foundation and other contributors,
+Copyright 2007, 2015 jQuery Foundation and other contributors,
 https://jquery.org/
 
 ==
 
 This product includes the jQuery UI JavaScript Library.
-Copyright 2007, 2014 jQuery Foundation and other contributors,
+Copyright 2007, 2015 jQuery Foundation and other contributors,
 https://jquery.org/
 
 ==
@@ -62,7 +62,7 @@ Copyright (c) 2004-2013 QOS.ch.
 ==
 
 This product includes software developed by SpringSource
-Copyright (c) 2004-2014 SpringSource
+Copyright (c) 2004-2015 SpringSource
 All rights reserved.
 
 ==
@@ -72,4 +72,4 @@ Copyright (c) Red Hat, Inc., Emmanuel Bernard
 
 ==
 
-This product includes software developed by the Woodstox Project (http://woodstox.codehaus.org/).
\ No newline at end of file
+This product includes software developed by the Woodstox Project (http://woodstox.codehaus.org/).

http://git-wip-us.apache.org/repos/asf/syncope/blob/4f437939/core/NOTICE
----------------------------------------------------------------------
diff --git a/core/NOTICE b/core/NOTICE
index 3749e1b..12c36cf 100644
--- a/core/NOTICE
+++ b/core/NOTICE
@@ -1,5 +1,5 @@
 Apache Syncope
-Copyright 2012-2014 The Apache Software Foundation
+Copyright 2012-2015 The Apache Software Foundation
 
 This product includes software developed by:
 The Apache Software Foundation (http://www.apache.org/).
@@ -41,7 +41,7 @@ This product includes software developed by ClassMate (https://github.com/cowtow
 
 This product includes software developed by Tirasa (http://www.tirasa.net)
 Copyright 2008-2009 Sun Microsystems, Inc. All rights reserved.
-Copyright 2011-2014 Tirasa S.r.l. All rights reserved.
+Copyright 2011-2015 Tirasa S.r.l. All rights reserved.
 This software is included in binary form only.
 
 ==
@@ -80,13 +80,13 @@ This product includes software developed by the Joda Time project (http://www.jo
 ==
 
 This product includes the jQuery Core JavaScript Library.
-Copyright 2007, 2014 jQuery Foundation and other contributors,
+Copyright 2007, 2015 jQuery Foundation and other contributors,
 https://jquery.org/
 
 ==
 
 This product includes the jQuery UI JavaScript Library.
-Copyright 2007, 2014 jQuery Foundation and other contributors,
+Copyright 2007, 2015 jQuery Foundation and other contributors,
 https://jquery.org/
 
 ==
@@ -112,7 +112,7 @@ Copyright (c) 2004-2013 QOS.ch.
 ==
 
 This product includes software developed by SpringSource
-Copyright (c) 2004-2014 SpringSource
+Copyright (c) 2004-2015 SpringSource
 All rights reserved.
 
 ==
@@ -128,4 +128,4 @@ This product includes software developed by the Woodstox Project (http://woodsto
 
 This product includes software developed by Web Services Description Language for Java (http://wsdl4j.sourceforge.net/).
 Copyright (c) Dice.
-All Rights Reserved.
\ No newline at end of file
+All Rights Reserved.

http://git-wip-us.apache.org/repos/asf/syncope/blob/4f437939/standalone/NOTICE
----------------------------------------------------------------------
diff --git a/standalone/NOTICE b/standalone/NOTICE
index 508b900..c66645f 100644
--- a/standalone/NOTICE
+++ b/standalone/NOTICE
@@ -1,5 +1,5 @@
 Apache Syncope
-Copyright 2012-2014 The Apache Software Foundation
+Copyright 2012-2015 The Apache Software Foundation
 
 This product includes software developed by:
 The Apache Software Foundation (http://www.apache.org/).
@@ -41,13 +41,13 @@ This product includes software developed by ClassMate (https://github.com/cowtow
 
 This product includes software developed by Tirasa (http://www.tirasa.net)
 Copyright 2008-2009 Sun Microsystems, Inc. All rights reserved.
-Copyright 2011-2014 Tirasa S.r.l. All rights reserved.
+Copyright 2011-2015 Tirasa S.r.l. All rights reserved.
 This software is included in binary form only.
 
 ==
 
 This product includes the CodeMirror JavaScript component.
-Copyright (C) 2014 by Marijn Haverbeke <ma...@gmail.com> and others
+Copyright (C) 2015 by Marijn Haverbeke <ma...@gmail.com> and others
 
 ==
 
@@ -91,13 +91,13 @@ This product includes software developed by the Joda Time project (http://www.jo
 ==
 
 This product includes the jQuery Core JavaScript Library.
-Copyright 2007, 2014 jQuery Foundation and other contributors,
+Copyright 2007, 2015 jQuery Foundation and other contributors,
 https://jquery.org/
 
 ==
 
 This product includes the jQuery UI JavaScript Library.
-Copyright 2007, 2014 jQuery Foundation and other contributors,
+Copyright 2007, 2015 jQuery Foundation and other contributors,
 https://jquery.org/
 
 ==
@@ -123,7 +123,7 @@ Copyright (c) 2004-2013 QOS.ch.
 ==
 
 This product includes software developed by SpringSource
-Copyright (c) 2004-2014 SpringSource
+Copyright (c) 2004-2015 SpringSource
 All rights reserved.
 
 ==
@@ -139,4 +139,4 @@ This product includes software developed by the Woodstox Project (http://woodsto
 
 This product includes software developed by Web Services Description Language for Java (http://wsdl4j.sourceforge.net/).
 Copyright (c) Dice.
-All Rights Reserved.
\ No newline at end of file
+All Rights Reserved.


[13/22] syncope git commit: [SYNCOPE-633] added MariaDB support

Posted by il...@apache.org.
[SYNCOPE-633] added MariaDB support


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/3967cfad
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/3967cfad
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/3967cfad

Branch: refs/heads/2_0_X
Commit: 3967cfad94505961cbd872298de42070caff676f
Parents: 9aa765b
Author: fmartelli <fm...@apache.org>
Authored: Fri Jan 30 16:28:12 2015 +0100
Committer: fmartelli <fm...@apache.org>
Committed: Fri Jan 30 16:28:12 2015 +0100

----------------------------------------------------------------------
 core/pom.xml                                    |  38 ++++
 .../main/resources/quartz/tables_mariadb.sql    | 206 +++++++++++++++++++
 .../core/rest/ConfigurationTestITCase.java      |   8 +-
 .../resources/mariadb/persistence.properties    |  28 +++
 pom.xml                                         |   1 +
 5 files changed, 277 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/3967cfad/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 4b13eab..3fa0e26 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -691,6 +691,7 @@ under the License.
           <exclude>oracle/**</exclude>
           <exclude>postgres/**</exclude>
           <exclude>mysql/**</exclude>
+          <exclude>mariadb/**</exclude>
           <exclude>sqlserver/**</exclude>
           <exclude>jboss/**</exclude>
           <exclude>weblogic/**</exclude>
@@ -1155,6 +1156,43 @@ under the License.
     </profile>
 
     <profile>
+      <id>mariadb-it</id>
+
+      <properties>
+        <jdbcdriver.groupId>org.mariadb.jdbc</jdbcdriver.groupId>
+        <jdbcdriver.artifactId>mariadb-java-client</jdbcdriver.artifactId>
+        <jdbcdriver.version>1.1.7</jdbcdriver.version>
+      </properties>
+
+      <dependencies>
+        <dependency>
+          <groupId>${jdbcdriver.groupId}</groupId>
+          <artifactId>${jdbcdriver.artifactId}</artifactId>
+          <version>${jdbcdriver.version}</version>
+          <scope>test</scope>
+        </dependency>
+      </dependencies>
+      
+      <build>
+        <defaultGoal>clean verify</defaultGoal>
+
+        <testResources>
+          <testResource>
+            <directory>src/test/resources</directory>
+            <filtering>true</filtering>
+            <excludes>
+              <exclude>persistence.properties</exclude>
+            </excludes>
+          </testResource>
+          <testResource>
+            <directory>src/test/resources/mariadb</directory>
+            <filtering>true</filtering>
+          </testResource>
+        </testResources>
+      </build>
+    </profile>
+
+    <profile>
       <id>glassfish-it</id>
 
       <dependencies>

http://git-wip-us.apache.org/repos/asf/syncope/blob/3967cfad/core/src/main/resources/quartz/tables_mariadb.sql
----------------------------------------------------------------------
diff --git a/core/src/main/resources/quartz/tables_mariadb.sql b/core/src/main/resources/quartz/tables_mariadb.sql
new file mode 100644
index 0000000..ebb8e59
--- /dev/null
+++ b/core/src/main/resources/quartz/tables_mariadb.sql
@@ -0,0 +1,206 @@
+-- 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.
+
+--
+-- Quartz seems to work best with the driver mm.mysql-2.0.7-bin.jar
+--
+-- PLEASE consider using mysql with innodb tables to avoid locking issues
+--
+-- In your Quartz properties file, you'll need to set 
+-- org.quartz.jobStore.driverDelegateClass = org.quartz.impl.jdbcjobstore.StdJDBCDelegate
+--
+
+BEGIN;
+DROP TABLE IF EXISTS QRTZ_FIRED_TRIGGERS;
+DROP TABLE IF EXISTS QRTZ_PAUSED_TRIGGER_GRPS;
+DROP TABLE IF EXISTS QRTZ_SCHEDULER_STATE;
+DROP TABLE IF EXISTS QRTZ_LOCKS;
+DROP TABLE IF EXISTS QRTZ_SIMPLE_TRIGGERS;
+DROP TABLE IF EXISTS QRTZ_SIMPROP_TRIGGERS;
+DROP TABLE IF EXISTS QRTZ_CRON_TRIGGERS;
+DROP TABLE IF EXISTS QRTZ_BLOB_TRIGGERS;
+DROP TABLE IF EXISTS QRTZ_TRIGGERS;
+DROP TABLE IF EXISTS QRTZ_JOB_DETAILS;
+DROP TABLE IF EXISTS QRTZ_CALENDARS;
+COMMIT;
+
+
+BEGIN;
+CREATE TABLE QRTZ_JOB_DETAILS
+  (
+    SCHED_NAME VARCHAR(120) NOT NULL,
+    JOB_NAME  VARCHAR(200) NOT NULL,
+    JOB_GROUP VARCHAR(200) NOT NULL,
+    DESCRIPTION VARCHAR(250) NULL,
+    JOB_CLASS_NAME   VARCHAR(250) NOT NULL,
+    IS_DURABLE VARCHAR(1) NOT NULL,
+    IS_NONCONCURRENT VARCHAR(1) NOT NULL,
+    IS_UPDATE_DATA VARCHAR(1) NOT NULL,
+    REQUESTS_RECOVERY VARCHAR(1) NOT NULL,
+    JOB_DATA BLOB NULL,
+    PRIMARY KEY (SCHED_NAME,JOB_NAME,JOB_GROUP)
+);
+COMMIT;
+
+BEGIN;
+CREATE TABLE QRTZ_TRIGGERS
+  (
+    SCHED_NAME VARCHAR(120) NOT NULL,
+    TRIGGER_NAME VARCHAR(200) NOT NULL,
+    TRIGGER_GROUP VARCHAR(200) NOT NULL,
+    JOB_NAME  VARCHAR(200) NOT NULL,
+    JOB_GROUP VARCHAR(200) NOT NULL,
+    DESCRIPTION VARCHAR(250) NULL,
+    NEXT_FIRE_TIME BIGINT(13) NULL,
+    PREV_FIRE_TIME BIGINT(13) NULL,
+    PRIORITY INTEGER NULL,
+    TRIGGER_STATE VARCHAR(16) NOT NULL,
+    TRIGGER_TYPE VARCHAR(8) NOT NULL,
+    START_TIME BIGINT(13) NOT NULL,
+    END_TIME BIGINT(13) NULL,
+    CALENDAR_NAME VARCHAR(200) NULL,
+    MISFIRE_INSTR SMALLINT(2) NULL,
+    JOB_DATA BLOB NULL,
+    PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP),
+    FOREIGN KEY (SCHED_NAME,JOB_NAME,JOB_GROUP)
+        REFERENCES QRTZ_JOB_DETAILS(SCHED_NAME,JOB_NAME,JOB_GROUP)
+);
+COMMIT;
+
+BEGIN;
+CREATE TABLE QRTZ_SIMPLE_TRIGGERS
+  (
+    SCHED_NAME VARCHAR(120) NOT NULL,
+    TRIGGER_NAME VARCHAR(200) NOT NULL,
+    TRIGGER_GROUP VARCHAR(200) NOT NULL,
+    REPEAT_COUNT BIGINT(7) NOT NULL,
+    REPEAT_INTERVAL BIGINT(12) NOT NULL,
+    TIMES_TRIGGERED BIGINT(10) NOT NULL,
+    PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP),
+    FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
+        REFERENCES QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
+);
+COMMIT;
+
+BEGIN;
+CREATE TABLE QRTZ_CRON_TRIGGERS
+  (
+    SCHED_NAME VARCHAR(120) NOT NULL,
+    TRIGGER_NAME VARCHAR(200) NOT NULL,
+    TRIGGER_GROUP VARCHAR(200) NOT NULL,
+    CRON_EXPRESSION VARCHAR(200) NOT NULL,
+    TIME_ZONE_ID VARCHAR(80),
+    PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP),
+    FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
+        REFERENCES QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
+);
+COMMIT;
+
+BEGIN;
+CREATE TABLE QRTZ_SIMPROP_TRIGGERS
+  (          
+    SCHED_NAME VARCHAR(120) NOT NULL,
+    TRIGGER_NAME VARCHAR(200) NOT NULL,
+    TRIGGER_GROUP VARCHAR(200) NOT NULL,
+    STR_PROP_1 VARCHAR(512) NULL,
+    STR_PROP_2 VARCHAR(512) NULL,
+    STR_PROP_3 VARCHAR(512) NULL,
+    INT_PROP_1 INT NULL,
+    INT_PROP_2 INT NULL,
+    LONG_PROP_1 BIGINT NULL,
+    LONG_PROP_2 BIGINT NULL,
+    DEC_PROP_1 NUMERIC(13,4) NULL,
+    DEC_PROP_2 NUMERIC(13,4) NULL,
+    BOOL_PROP_1 VARCHAR(1) NULL,
+    BOOL_PROP_2 VARCHAR(1) NULL,
+    PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP),
+    FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP) 
+    REFERENCES QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
+);
+COMMIT;
+
+BEGIN;
+CREATE TABLE QRTZ_BLOB_TRIGGERS
+  (
+    SCHED_NAME VARCHAR(120) NOT NULL,
+    TRIGGER_NAME VARCHAR(200) NOT NULL,
+    TRIGGER_GROUP VARCHAR(200) NOT NULL,
+    BLOB_DATA BLOB NULL,
+    PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP),
+    FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
+        REFERENCES QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
+);
+COMMIT;
+
+BEGIN;
+CREATE TABLE QRTZ_CALENDARS
+  (
+    SCHED_NAME VARCHAR(120) NOT NULL,
+    CALENDAR_NAME  VARCHAR(200) NOT NULL,
+    CALENDAR BLOB NOT NULL,
+    PRIMARY KEY (SCHED_NAME,CALENDAR_NAME)
+);
+COMMIT;
+
+BEGIN;
+CREATE TABLE QRTZ_PAUSED_TRIGGER_GRPS
+  (
+    SCHED_NAME VARCHAR(120) NOT NULL,
+    TRIGGER_GROUP  VARCHAR(200) NOT NULL, 
+    PRIMARY KEY (SCHED_NAME,TRIGGER_GROUP)
+);
+COMMIT;
+
+BEGIN;
+CREATE TABLE QRTZ_FIRED_TRIGGERS
+  (
+    SCHED_NAME VARCHAR(120) NOT NULL,
+    ENTRY_ID VARCHAR(95) NOT NULL,
+    TRIGGER_NAME VARCHAR(200) NOT NULL,
+    TRIGGER_GROUP VARCHAR(200) NOT NULL,
+    INSTANCE_NAME VARCHAR(200) NOT NULL,
+    FIRED_TIME BIGINT(13) NOT NULL,
+    SCHED_TIME BIGINT(13) NOT NULL,
+    PRIORITY INTEGER NOT NULL,
+    STATE VARCHAR(16) NOT NULL,
+    JOB_NAME VARCHAR(200) NULL,
+    JOB_GROUP VARCHAR(200) NULL,
+    IS_NONCONCURRENT VARCHAR(1) NULL,
+    REQUESTS_RECOVERY VARCHAR(1) NULL,
+    PRIMARY KEY (SCHED_NAME,ENTRY_ID)
+);
+COMMIT;
+
+BEGIN;
+CREATE TABLE QRTZ_SCHEDULER_STATE
+  (
+    SCHED_NAME VARCHAR(120) NOT NULL,
+    INSTANCE_NAME VARCHAR(200) NOT NULL,
+    LAST_CHECKIN_TIME BIGINT(13) NOT NULL,
+    CHECKIN_INTERVAL BIGINT(13) NOT NULL,
+    PRIMARY KEY (SCHED_NAME,INSTANCE_NAME)
+);
+COMMIT;
+
+BEGIN;
+CREATE TABLE QRTZ_LOCKS
+  (
+    SCHED_NAME VARCHAR(120) NOT NULL,
+    LOCK_NAME  VARCHAR(40) NOT NULL, 
+    PRIMARY KEY (SCHED_NAME,LOCK_NAME)
+);
+COMMIT;

http://git-wip-us.apache.org/repos/asf/syncope/blob/3967cfad/core/src/test/java/org/apache/syncope/core/rest/ConfigurationTestITCase.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/syncope/core/rest/ConfigurationTestITCase.java b/core/src/test/java/org/apache/syncope/core/rest/ConfigurationTestITCase.java
index 1f981ac..d81afb7 100644
--- a/core/src/test/java/org/apache/syncope/core/rest/ConfigurationTestITCase.java
+++ b/core/src/test/java/org/apache/syncope/core/rest/ConfigurationTestITCase.java
@@ -195,19 +195,19 @@ public class ConfigurationTestITCase extends AbstractTest {
             assertFalse(configExport.isEmpty());
             assertTrue(configExport.length() > 1000);
 
-            String[] result = StringUtils.substringsBetween(configExport, "<RATTRTEMPLATE", "/>");
+            String[] result = StringUtils.substringsBetween(configExport.toUpperCase(), "<RATTRTEMPLATE", "/>");
             boolean rattrExists = false;
             for (String entry : result) {
-                if (entry.contains(roleKey.getName())) {
+                if (entry.contains(roleKey.getName().toUpperCase())) {
                     rattrExists = true;
                 }
             }
             assertTrue(rattrExists);
 
-            result = StringUtils.substringsBetween(configExport, "<MATTRTEMPLATE", "/>");
+            result = StringUtils.substringsBetween(configExport.toUpperCase(), "<MATTRTEMPLATE", "/>");
             boolean mattrExists = false;
             for (String entry : result) {
-                if (entry.contains(membershipKey.getName())) {
+                if (entry.contains(membershipKey.getName().toUpperCase())) {
                     mattrExists = true;
                 }
             }

http://git-wip-us.apache.org/repos/asf/syncope/blob/3967cfad/core/src/test/resources/mariadb/persistence.properties
----------------------------------------------------------------------
diff --git a/core/src/test/resources/mariadb/persistence.properties b/core/src/test/resources/mariadb/persistence.properties
new file mode 100644
index 0000000..8713629
--- /dev/null
+++ b/core/src/test/resources/mariadb/persistence.properties
@@ -0,0 +1,28 @@
+# 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.
+jpa.driverClassName=org.mariadb.jdbc.Driver
+jpa.url=jdbc:mariadb://localhost:3306/syncope?characterEncoding=UTF-8
+jpa.username=syncope
+jpa.password=syncope
+jpa.dialect=org.apache.openjpa.jdbc.sql.MariaDBDictionary
+jpa.pool.validationQuery=SELECT 1
+#note: other connection pool settings can also be configured here, see persistenceContext.xml
+quartz.jobstore=org.quartz.impl.jdbcjobstore.StdJDBCDelegate
+quartz.scheduler.idleWaitTime=5000
+quartz.sql=tables_mariadb.sql
+audit.sql=audit.sql
+database.schema=

http://git-wip-us.apache.org/repos/asf/syncope/blob/3967cfad/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3b805c1..2d3f6c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1410,6 +1410,7 @@ under the License.
             <exclude>**/.*</exclude>
             <exclude>**/deb/control/conffiles</exclude>
             <exclude>**/deb/control/control</exclude>
+            <exclude>**/*.lst</exclude>
           </excludes>
         </configuration>
         <executions>


[18/22] syncope git commit: Upgrading Wicket and Maven enforcer plugin

Posted by il...@apache.org.
Upgrading Wicket and Maven enforcer plugin


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/424148ad
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/424148ad
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/424148ad

Branch: refs/heads/2_0_X
Commit: 424148ada65f09b8718af2d923d88a1c8aadb107
Parents: bccd3a0
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon Feb 2 14:48:22 2015 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon Feb 2 14:48:22 2015 +0100

----------------------------------------------------------------------
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/424148ad/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2d3f6c9..cb26d2b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -352,7 +352,7 @@ under the License.
 
     <cocoon.version>3.0.0-alpha-3</cocoon.version>
 
-    <wicket.version>6.18.0</wicket.version>
+    <wicket.version>6.19.0</wicket.version>
 
     <groovy.version>2.3.9</groovy.version>
 
@@ -1344,7 +1344,7 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>1.3.1</version>
+        <version>1.4</version>
         <executions>
           <execution>
             <id>enforce-java</id>


[08/22] syncope git commit: [maven-release-plugin] prepare release syncope-1.2.2

Posted by il...@apache.org.
[maven-release-plugin] prepare release syncope-1.2.2


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/bd0d9017
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/bd0d9017
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/bd0d9017

Branch: refs/heads/master
Commit: bd0d9017b97548e01b755d37200765e69a26f6e2
Parents: 1df9ef8
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Jan 30 09:08:53 2015 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Jan 30 09:08:53 2015 +0100

----------------------------------------------------------------------
 archetype/pom.xml     | 2 +-
 build-tools/pom.xml   | 2 +-
 client/pom.xml        | 2 +-
 common/pom.xml        | 2 +-
 console/pom.xml       | 2 +-
 core-upgrader/pom.xml | 2 +-
 core/pom.xml          | 2 +-
 deb/console/pom.xml   | 2 +-
 deb/core/pom.xml      | 2 +-
 deb/pom.xml           | 2 +-
 installer/pom.xml     | 2 +-
 pom.xml               | 4 ++--
 standalone/pom.xml    | 2 +-
 13 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/bd0d9017/archetype/pom.xml
----------------------------------------------------------------------
diff --git a/archetype/pom.xml b/archetype/pom.xml
index c744cc6..44424bb 100644
--- a/archetype/pom.xml
+++ b/archetype/pom.xml
@@ -24,7 +24,7 @@ under the License.
   <parent>
     <groupId>org.apache.syncope</groupId>
     <artifactId>syncope</artifactId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.2</version>
   </parent>
 
   <name>Apache Syncope Archetype</name>

http://git-wip-us.apache.org/repos/asf/syncope/blob/bd0d9017/build-tools/pom.xml
----------------------------------------------------------------------
diff --git a/build-tools/pom.xml b/build-tools/pom.xml
index 16fbd41..47bc221 100644
--- a/build-tools/pom.xml
+++ b/build-tools/pom.xml
@@ -24,7 +24,7 @@ under the License.
   <parent>
     <groupId>org.apache.syncope</groupId>
     <artifactId>syncope</artifactId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.2</version>
   </parent>
 
   <name>Apache Syncope Build Tools</name>

http://git-wip-us.apache.org/repos/asf/syncope/blob/bd0d9017/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index ff161c0..8a9ea62 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -24,7 +24,7 @@ under the License.
   <parent>
     <groupId>org.apache.syncope</groupId>
     <artifactId>syncope</artifactId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.2</version>
   </parent>
 
   <name>Apache Syncope Client</name>

http://git-wip-us.apache.org/repos/asf/syncope/blob/bd0d9017/common/pom.xml
----------------------------------------------------------------------
diff --git a/common/pom.xml b/common/pom.xml
index 9e61202..005add7 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -24,7 +24,7 @@ under the License.
   <parent>
     <groupId>org.apache.syncope</groupId>
     <artifactId>syncope</artifactId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.2</version>
   </parent>
 
   <name>Apache Syncope Common</name>

http://git-wip-us.apache.org/repos/asf/syncope/blob/bd0d9017/console/pom.xml
----------------------------------------------------------------------
diff --git a/console/pom.xml b/console/pom.xml
index 1ab4755..ac57f92 100644
--- a/console/pom.xml
+++ b/console/pom.xml
@@ -24,7 +24,7 @@ under the License.
   <parent>
     <groupId>org.apache.syncope</groupId>
     <artifactId>syncope</artifactId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.2</version>
   </parent>
 
   <name>Apache Syncope Console</name>

http://git-wip-us.apache.org/repos/asf/syncope/blob/bd0d9017/core-upgrader/pom.xml
----------------------------------------------------------------------
diff --git a/core-upgrader/pom.xml b/core-upgrader/pom.xml
index 8be9428..aa9d1d2 100644
--- a/core-upgrader/pom.xml
+++ b/core-upgrader/pom.xml
@@ -23,7 +23,7 @@ under the License.
   <parent>
     <groupId>org.apache.syncope</groupId>
     <artifactId>syncope</artifactId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.2</version>
   </parent>
  
   <groupId>org.apache.syncope</groupId>

http://git-wip-us.apache.org/repos/asf/syncope/blob/bd0d9017/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 6497c1f..d9541b5 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -24,7 +24,7 @@ under the License.
   <parent>
     <groupId>org.apache.syncope</groupId>
     <artifactId>syncope</artifactId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.2</version>
   </parent>
 
   <name>Apache Syncope Core</name>

http://git-wip-us.apache.org/repos/asf/syncope/blob/bd0d9017/deb/console/pom.xml
----------------------------------------------------------------------
diff --git a/deb/console/pom.xml b/deb/console/pom.xml
index ceaf288..2565b9d 100644
--- a/deb/console/pom.xml
+++ b/deb/console/pom.xml
@@ -24,7 +24,7 @@ under the License.
   <parent>
     <groupId>org.apache.syncope</groupId>
     <artifactId>syncope-deb</artifactId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.2</version>
   </parent>
 
   <name>Apache Syncope Deb Console</name>

http://git-wip-us.apache.org/repos/asf/syncope/blob/bd0d9017/deb/core/pom.xml
----------------------------------------------------------------------
diff --git a/deb/core/pom.xml b/deb/core/pom.xml
index 0ef8efb..3602af0 100644
--- a/deb/core/pom.xml
+++ b/deb/core/pom.xml
@@ -24,7 +24,7 @@ under the License.
   <parent>
     <groupId>org.apache.syncope</groupId>
     <artifactId>syncope-deb</artifactId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.2</version>
   </parent>
 
   <name>Apache Syncope Deb Core</name>

http://git-wip-us.apache.org/repos/asf/syncope/blob/bd0d9017/deb/pom.xml
----------------------------------------------------------------------
diff --git a/deb/pom.xml b/deb/pom.xml
index a3a5447..852f492 100644
--- a/deb/pom.xml
+++ b/deb/pom.xml
@@ -24,7 +24,7 @@ under the License.
   <parent>
     <groupId>org.apache.syncope</groupId>
     <artifactId>syncope</artifactId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.2</version>
   </parent>
 
   <name>Apache Syncope Deb</name>

http://git-wip-us.apache.org/repos/asf/syncope/blob/bd0d9017/installer/pom.xml
----------------------------------------------------------------------
diff --git a/installer/pom.xml b/installer/pom.xml
index e6675de..16e7159 100644
--- a/installer/pom.xml
+++ b/installer/pom.xml
@@ -24,7 +24,7 @@ under the License.
   <parent>
     <groupId>org.apache.syncope</groupId>
     <artifactId>syncope</artifactId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.2</version>
   </parent>
 
   <name>Apache Syncope Installer</name>

http://git-wip-us.apache.org/repos/asf/syncope/blob/bd0d9017/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a40e6c0..a528560 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@ under the License.
 
   <groupId>org.apache.syncope</groupId>
   <artifactId>syncope</artifactId>
-  <version>1.2.2-SNAPSHOT</version>
+  <version>1.2.2</version>
   <packaging>pom</packaging>
 
   <parent>
@@ -52,7 +52,7 @@ under the License.
     <connection>scm:git:https://git-wip-us.apache.org/repos/asf/syncope.git</connection>
     <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/syncope.git</developerConnection>
     <url>https://git-wip-us.apache.org/repos/asf?p=syncope.git</url>
-    <tag>HEAD</tag>
+    <tag>syncope-1.2.2</tag>
   </scm>
 
   <issueManagement>

http://git-wip-us.apache.org/repos/asf/syncope/blob/bd0d9017/standalone/pom.xml
----------------------------------------------------------------------
diff --git a/standalone/pom.xml b/standalone/pom.xml
index e01a37e..8ea8346 100644
--- a/standalone/pom.xml
+++ b/standalone/pom.xml
@@ -24,7 +24,7 @@ under the License.
   <parent>
     <groupId>org.apache.syncope</groupId>
     <artifactId>syncope</artifactId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.2</version>
   </parent>
 
   <name>Apache Syncope Standalone Distribution</name>


[16/22] syncope git commit: [SYNCOPE-633] building documentation updated

Posted by il...@apache.org.
[SYNCOPE-633] building documentation updated


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/bccd3a00
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/bccd3a00
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/bccd3a00

Branch: refs/heads/master
Commit: bccd3a00d560cededa008993849e78a73d2593e2
Parents: 3967cfa
Author: fmartelli <fm...@apache.org>
Authored: Fri Jan 30 18:35:23 2015 +0100
Committer: fmartelli <fm...@apache.org>
Committed: Fri Jan 30 18:35:23 2015 +0100

----------------------------------------------------------------------
 src/site/xdoc/building.xml | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/bccd3a00/src/site/xdoc/building.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/building.xml b/src/site/xdoc/building.xml
index b9b1db9..9aa2409 100644
--- a/src/site/xdoc/building.xml
+++ b/src/site/xdoc/building.xml
@@ -115,6 +115,11 @@ $ mvn -Pdev -Dit.test=UserTestITCase#create</source>
         <a href="https://mariadb.org/">MariaDB</a> database via
         <source>$ mvn -Pmysql-it</source>
 
+        <h5>MariaDB</h5>
+        After providing connection information in <code>src/test/resources/mariadb/persistence.properties</code>,
+        perform the full test suite against a <a href="https://mariadb.org/">MariaDB</a> database via
+        <source>$ mvn -Pmariadb-it</source>
+
         <h5>Oracle database</h5>
         After providing connection information in <code>src/test/resources/oracle/persistence.properties</code>
         and having <a href="http://www.mkyong.com/maven/how-to-add-oracle-jdbc-driver-in-your-maven-local-repository/">


[07/22] syncope git commit: [maven-release-plugin] prepare release syncope-1.2.2

Posted by il...@apache.org.
[maven-release-plugin] prepare release syncope-1.2.2


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/bd0d9017
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/bd0d9017
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/bd0d9017

Branch: refs/heads/2_0_X
Commit: bd0d9017b97548e01b755d37200765e69a26f6e2
Parents: 1df9ef8
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Jan 30 09:08:53 2015 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Jan 30 09:08:53 2015 +0100

----------------------------------------------------------------------
 archetype/pom.xml     | 2 +-
 build-tools/pom.xml   | 2 +-
 client/pom.xml        | 2 +-
 common/pom.xml        | 2 +-
 console/pom.xml       | 2 +-
 core-upgrader/pom.xml | 2 +-
 core/pom.xml          | 2 +-
 deb/console/pom.xml   | 2 +-
 deb/core/pom.xml      | 2 +-
 deb/pom.xml           | 2 +-
 installer/pom.xml     | 2 +-
 pom.xml               | 4 ++--
 standalone/pom.xml    | 2 +-
 13 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/bd0d9017/archetype/pom.xml
----------------------------------------------------------------------
diff --git a/archetype/pom.xml b/archetype/pom.xml
index c744cc6..44424bb 100644
--- a/archetype/pom.xml
+++ b/archetype/pom.xml
@@ -24,7 +24,7 @@ under the License.
   <parent>
     <groupId>org.apache.syncope</groupId>
     <artifactId>syncope</artifactId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.2</version>
   </parent>
 
   <name>Apache Syncope Archetype</name>

http://git-wip-us.apache.org/repos/asf/syncope/blob/bd0d9017/build-tools/pom.xml
----------------------------------------------------------------------
diff --git a/build-tools/pom.xml b/build-tools/pom.xml
index 16fbd41..47bc221 100644
--- a/build-tools/pom.xml
+++ b/build-tools/pom.xml
@@ -24,7 +24,7 @@ under the License.
   <parent>
     <groupId>org.apache.syncope</groupId>
     <artifactId>syncope</artifactId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.2</version>
   </parent>
 
   <name>Apache Syncope Build Tools</name>

http://git-wip-us.apache.org/repos/asf/syncope/blob/bd0d9017/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index ff161c0..8a9ea62 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -24,7 +24,7 @@ under the License.
   <parent>
     <groupId>org.apache.syncope</groupId>
     <artifactId>syncope</artifactId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.2</version>
   </parent>
 
   <name>Apache Syncope Client</name>

http://git-wip-us.apache.org/repos/asf/syncope/blob/bd0d9017/common/pom.xml
----------------------------------------------------------------------
diff --git a/common/pom.xml b/common/pom.xml
index 9e61202..005add7 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -24,7 +24,7 @@ under the License.
   <parent>
     <groupId>org.apache.syncope</groupId>
     <artifactId>syncope</artifactId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.2</version>
   </parent>
 
   <name>Apache Syncope Common</name>

http://git-wip-us.apache.org/repos/asf/syncope/blob/bd0d9017/console/pom.xml
----------------------------------------------------------------------
diff --git a/console/pom.xml b/console/pom.xml
index 1ab4755..ac57f92 100644
--- a/console/pom.xml
+++ b/console/pom.xml
@@ -24,7 +24,7 @@ under the License.
   <parent>
     <groupId>org.apache.syncope</groupId>
     <artifactId>syncope</artifactId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.2</version>
   </parent>
 
   <name>Apache Syncope Console</name>

http://git-wip-us.apache.org/repos/asf/syncope/blob/bd0d9017/core-upgrader/pom.xml
----------------------------------------------------------------------
diff --git a/core-upgrader/pom.xml b/core-upgrader/pom.xml
index 8be9428..aa9d1d2 100644
--- a/core-upgrader/pom.xml
+++ b/core-upgrader/pom.xml
@@ -23,7 +23,7 @@ under the License.
   <parent>
     <groupId>org.apache.syncope</groupId>
     <artifactId>syncope</artifactId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.2</version>
   </parent>
  
   <groupId>org.apache.syncope</groupId>

http://git-wip-us.apache.org/repos/asf/syncope/blob/bd0d9017/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 6497c1f..d9541b5 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -24,7 +24,7 @@ under the License.
   <parent>
     <groupId>org.apache.syncope</groupId>
     <artifactId>syncope</artifactId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.2</version>
   </parent>
 
   <name>Apache Syncope Core</name>

http://git-wip-us.apache.org/repos/asf/syncope/blob/bd0d9017/deb/console/pom.xml
----------------------------------------------------------------------
diff --git a/deb/console/pom.xml b/deb/console/pom.xml
index ceaf288..2565b9d 100644
--- a/deb/console/pom.xml
+++ b/deb/console/pom.xml
@@ -24,7 +24,7 @@ under the License.
   <parent>
     <groupId>org.apache.syncope</groupId>
     <artifactId>syncope-deb</artifactId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.2</version>
   </parent>
 
   <name>Apache Syncope Deb Console</name>

http://git-wip-us.apache.org/repos/asf/syncope/blob/bd0d9017/deb/core/pom.xml
----------------------------------------------------------------------
diff --git a/deb/core/pom.xml b/deb/core/pom.xml
index 0ef8efb..3602af0 100644
--- a/deb/core/pom.xml
+++ b/deb/core/pom.xml
@@ -24,7 +24,7 @@ under the License.
   <parent>
     <groupId>org.apache.syncope</groupId>
     <artifactId>syncope-deb</artifactId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.2</version>
   </parent>
 
   <name>Apache Syncope Deb Core</name>

http://git-wip-us.apache.org/repos/asf/syncope/blob/bd0d9017/deb/pom.xml
----------------------------------------------------------------------
diff --git a/deb/pom.xml b/deb/pom.xml
index a3a5447..852f492 100644
--- a/deb/pom.xml
+++ b/deb/pom.xml
@@ -24,7 +24,7 @@ under the License.
   <parent>
     <groupId>org.apache.syncope</groupId>
     <artifactId>syncope</artifactId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.2</version>
   </parent>
 
   <name>Apache Syncope Deb</name>

http://git-wip-us.apache.org/repos/asf/syncope/blob/bd0d9017/installer/pom.xml
----------------------------------------------------------------------
diff --git a/installer/pom.xml b/installer/pom.xml
index e6675de..16e7159 100644
--- a/installer/pom.xml
+++ b/installer/pom.xml
@@ -24,7 +24,7 @@ under the License.
   <parent>
     <groupId>org.apache.syncope</groupId>
     <artifactId>syncope</artifactId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.2</version>
   </parent>
 
   <name>Apache Syncope Installer</name>

http://git-wip-us.apache.org/repos/asf/syncope/blob/bd0d9017/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a40e6c0..a528560 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@ under the License.
 
   <groupId>org.apache.syncope</groupId>
   <artifactId>syncope</artifactId>
-  <version>1.2.2-SNAPSHOT</version>
+  <version>1.2.2</version>
   <packaging>pom</packaging>
 
   <parent>
@@ -52,7 +52,7 @@ under the License.
     <connection>scm:git:https://git-wip-us.apache.org/repos/asf/syncope.git</connection>
     <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/syncope.git</developerConnection>
     <url>https://git-wip-us.apache.org/repos/asf?p=syncope.git</url>
-    <tag>HEAD</tag>
+    <tag>syncope-1.2.2</tag>
   </scm>
 
   <issueManagement>

http://git-wip-us.apache.org/repos/asf/syncope/blob/bd0d9017/standalone/pom.xml
----------------------------------------------------------------------
diff --git a/standalone/pom.xml b/standalone/pom.xml
index e01a37e..8ea8346 100644
--- a/standalone/pom.xml
+++ b/standalone/pom.xml
@@ -24,7 +24,7 @@ under the License.
   <parent>
     <groupId>org.apache.syncope</groupId>
     <artifactId>syncope</artifactId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.2</version>
   </parent>
 
   <name>Apache Syncope Standalone Distribution</name>


[06/22] syncope git commit: Updating downloads site page for release

Posted by il...@apache.org.
Updating downloads site page for release


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/1df9ef89
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/1df9ef89
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/1df9ef89

Branch: refs/heads/master
Commit: 1df9ef8960dc35e43e23161d82a7364c5b30c2f1
Parents: 4f43793
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Jan 30 09:01:53 2015 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Jan 30 09:01:53 2015 +0100

----------------------------------------------------------------------
 src/site/xdoc/downloads.xml | 88 ++++++++++++++++++++--------------------
 1 file changed, 44 insertions(+), 44 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/1df9ef89/src/site/xdoc/downloads.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/downloads.xml b/src/site/xdoc/downloads.xml
index 618c51d..fe99a11 100644
--- a/src/site/xdoc/downloads.xml
+++ b/src/site/xdoc/downloads.xml
@@ -60,8 +60,8 @@ under the License.
     </section>
 
     <section name="Current Releases">
-      <subsection name="1.2.1 Intermezzo">
-        <p>Release date: Nov 17th, 2014</p>
+      <subsection name="1.2.2 Intermezzo">
+        <p>Release date: Jan 30th, 2015</p>
         <p>
           <a href="https://cwiki.apache.org/confluence/display/SYNCOPE/Intermezzo">Release notes</a>
         </p>
@@ -75,52 +75,52 @@ under the License.
           <tbody>
             <tr>
               <td>
-                <a href="http://www.apache.org/dyn/closer.cgi/syncope/1.2.1/syncope-1.2.1-source-release.zip">syncope-1.2.1-source-release.zip</a>
+                <a href="http://www.apache.org/dyn/closer.cgi/syncope/1.2.2/syncope-1.2.2-source-release.zip">syncope-1.2.2-source-release.zip</a>
               </td>
               <td>
-                <a href="http://www.apache.org/dist/syncope/1.2.1/syncope-1.2.1-source-release.zip.asc">asc</a> 
-                <a href="http://www.apache.org/dist/syncope/1.2.1/syncope-1.2.1-source-release.zip.md5">md5</a> 
-                <a href="http://www.apache.org/dist/syncope/1.2.1/syncope-1.2.1-source-release.zip.sha1">sha1</a>
+                <a href="http://www.apache.org/dist/syncope/1.2.2/syncope-1.2.2-source-release.zip.asc">asc</a> 
+                <a href="http://www.apache.org/dist/syncope/1.2.2/syncope-1.2.2-source-release.zip.md5">md5</a> 
+                <a href="http://www.apache.org/dist/syncope/1.2.2/syncope-1.2.2-source-release.zip.sha1">sha1</a>
               </td>
             </tr>
             <tr>
               <td>
-                <a href="http://www.apache.org/dyn/closer.cgi/syncope/1.2.1/syncope-standalone-1.2.1-distribution.zip">syncope-standalone-1.2.1-distribution.zip</a>
+                <a href="http://www.apache.org/dyn/closer.cgi/syncope/1.2.2/syncope-standalone-1.2.2-distribution.zip">syncope-standalone-1.2.2-distribution.zip</a>
               </td>
               <td>
-                <a href="http://www.apache.org/dist/syncope/1.2.1/syncope-standalone-1.2.1-distribution.zip.asc">asc</a> 
-                <a href="http://www.apache.org/dist/syncope/1.2.1/syncope-standalone-1.2.1-distribution.zip.md5">md5</a> 
-                <a href="http://www.apache.org/dist/syncope/1.2.1/syncope-standalone-1.2.1-distribution.zip.sha1">sha1</a>
+                <a href="http://www.apache.org/dist/syncope/1.2.2/syncope-standalone-1.2.2-distribution.zip.asc">asc</a> 
+                <a href="http://www.apache.org/dist/syncope/1.2.2/syncope-standalone-1.2.2-distribution.zip.md5">md5</a> 
+                <a href="http://www.apache.org/dist/syncope/1.2.2/syncope-standalone-1.2.2-distribution.zip.sha1">sha1</a>
               </td>
             </tr>
             <tr>
               <td>
-                <a href="http://www.apache.org/dyn/closer.cgi/syncope/1.2.1/syncope-installer-1.2.1-uber.jar">syncope-installer-1.2.1.jar</a>
+                <a href="http://www.apache.org/dyn/closer.cgi/syncope/1.2.2/syncope-installer-1.2.2-uber.jar">syncope-installer-1.2.2.jar</a>
               </td>
               <td>
-                <a href="http://www.apache.org/dist/syncope/1.2.1/syncope-installer-1.2.1-uber.jar.asc">asc</a> 
-                <a href="http://www.apache.org/dist/syncope/1.2.1/syncope-installer-1.2.1-uber.jar.md5">md5</a> 
-                <a href="http://www.apache.org/dist/syncope/1.2.1/syncope-installer-1.2.1-uber.jar.sha1">sha1</a>
+                <a href="http://www.apache.org/dist/syncope/1.2.2/syncope-installer-1.2.2-uber.jar.asc">asc</a> 
+                <a href="http://www.apache.org/dist/syncope/1.2.2/syncope-installer-1.2.2-uber.jar.md5">md5</a> 
+                <a href="http://www.apache.org/dist/syncope/1.2.2/syncope-installer-1.2.2-uber.jar.sha1">sha1</a>
               </td>
             </tr>
             <tr>
               <td>
-                <a href="http://www.apache.org/dyn/closer.cgi/syncope/1.2.1/apache-syncope-1.2.1.deb">apache-syncope-1.2.1.deb</a>
+                <a href="http://www.apache.org/dyn/closer.cgi/syncope/1.2.2/apache-syncope-1.2.2.deb">apache-syncope-1.2.2.deb</a>
               </td>
               <td>
-                <a href="http://www.apache.org/dist/syncope/1.2.1/apache-syncope-1.2.1.deb.asc">asc</a> 
-                <a href="http://www.apache.org/dist/syncope/1.2.1/apache-syncope-1.2.1.deb.md5">md5</a> 
-                <a href="http://www.apache.org/dist/syncope/1.2.1/apache-syncope-1.2.1.deb.sha1">sha1</a>
+                <a href="http://www.apache.org/dist/syncope/1.2.2/apache-syncope-1.2.2.deb.asc">asc</a> 
+                <a href="http://www.apache.org/dist/syncope/1.2.2/apache-syncope-1.2.2.deb.md5">md5</a> 
+                <a href="http://www.apache.org/dist/syncope/1.2.2/apache-syncope-1.2.2.deb.sha1">sha1</a>
               </td>
             </tr>
             <tr>
               <td>
-                <a href="http://www.apache.org/dyn/closer.cgi/syncope/1.2.1/apache-syncope-console-1.2.1.deb">apache-syncope-console-1.2.1.deb</a>
+                <a href="http://www.apache.org/dyn/closer.cgi/syncope/1.2.2/apache-syncope-console-1.2.2.deb">apache-syncope-console-1.2.2.deb</a>
               </td>
               <td>
-                <a href="http://www.apache.org/dist/syncope/1.2.1/apache-syncope-console-1.2.1.deb.asc">asc</a> 
-                <a href="http://www.apache.org/dist/syncope/1.2.1/apache-syncope-console-1.2.1.deb.md5">md5</a> 
-                <a href="http://www.apache.org/dist/syncope/1.2.1/apache-syncope-console-1.2.1.deb.sha1">sha1</a>
+                <a href="http://www.apache.org/dist/syncope/1.2.2/apache-syncope-console-1.2.2.deb.asc">asc</a> 
+                <a href="http://www.apache.org/dist/syncope/1.2.2/apache-syncope-console-1.2.2.deb.md5">md5</a> 
+                <a href="http://www.apache.org/dist/syncope/1.2.2/apache-syncope-console-1.2.2.deb.sha1">sha1</a>
               </td>
             </tr>
           </tbody>
@@ -191,8 +191,8 @@ under the License.
     </section>
 
     <section name="Older Releases">
-      <subsection name="1.2.0 Intermezzo">
-        <p>Release date: Oct 3rd, 2014</p>
+      <subsection name="1.2.1 Intermezzo">
+        <p>Release date: Nov 17th, 2014</p>
         <p>
           <a href="https://cwiki.apache.org/confluence/display/SYNCOPE/Intermezzo">Release notes</a>
         </p>
@@ -206,52 +206,52 @@ under the License.
           <tbody>
             <tr>
               <td>
-                <a href="http://archive.apache.org/dist/syncope/1.2.0/syncope-1.2.0-source-release.zip">syncope-1.2.0-source-release.zip</a>
+                <a href="http://archive.apache.org/dist/syncope/1.2.1/syncope-1.2.1-source-release.zip">syncope-1.2.1-source-release.zip</a>
               </td>
               <td>
-                <a href="http://archive.apache.org/dist/syncope/1.2.0/syncope-1.2.0-source-release.zip.asc">asc</a> 
-                <a href="http://archive.apache.org/dist/syncope/1.2.0/syncope-1.2.0-source-release.zip.md5">md5</a> 
-                <a href="http://archive.apache.org/dist/syncope/1.2.0/syncope-1.2.0-source-release.zip.sha1">sha1</a>
+                <a href="http://archive.apache.org/dist/syncope/1.2.1/syncope-1.2.1-source-release.zip.asc">asc</a> 
+                <a href="http://archive.apache.org/dist/syncope/1.2.1/syncope-1.2.1-source-release.zip.md5">md5</a> 
+                <a href="http://archive.apache.org/dist/syncope/1.2.1/syncope-1.2.1-source-release.zip.sha1">sha1</a>
               </td>
             </tr>
             <tr>
               <td>
-                <a href="http://archive.apache.org/dist/syncope/1.2.0/syncope-standalone-1.2.0-distribution.zip">syncope-standalone-1.2.0-distribution.zip</a>
+                <a href="http://archive.apache.org/dist/syncope/1.2.1/syncope-standalone-1.2.1-distribution.zip">syncope-standalone-1.2.1-distribution.zip</a>
               </td>
               <td>
-                <a href="http://archive.apache.org/dist/syncope/1.2.0/syncope-standalone-1.2.0-distribution.zip.asc">asc</a> 
-                <a href="http://archive.apache.org/dist/syncope/1.2.0/syncope-standalone-1.2.0-distribution.zip.md5">md5</a> 
-                <a href="http://archive.apache.org/dist/syncope/1.2.0/syncope-standalone-1.2.0-distribution.zip.sha1">sha1</a>
+                <a href="http://archive.apache.org/dist/syncope/1.2.1/syncope-standalone-1.2.1-distribution.zip.asc">asc</a> 
+                <a href="http://archive.apache.org/dist/syncope/1.2.1/syncope-standalone-1.2.1-distribution.zip.md5">md5</a> 
+                <a href="http://archive.apache.org/dist/syncope/1.2.1/syncope-standalone-1.2.1-distribution.zip.sha1">sha1</a>
               </td>
             </tr>
             <tr>
               <td>
-                <a href="http://archive.apache.org/dist/syncope/1.2.0/syncope-installer-1.2.0-uber.jar">syncope-installer-1.2.0.jar</a>
+                <a href="http://archive.apache.org/dist/syncope/1.2.1/syncope-installer-1.2.1-uber.jar">syncope-installer-1.2.1.jar</a>
               </td>
               <td>
-                <a href="http://archive.apache.org/dist/syncope/1.2.0/syncope-installer-1.2.0-uber.jar.asc">asc</a> 
-                <a href="http://archive.apache.org/dist/syncope/1.2.0/syncope-installer-1.2.0-uber.jar.md5">md5</a> 
-                <a href="http://archive.apache.org/dist/syncope/1.2.0/syncope-installer-1.2.0-uber.jar.sha1">sha1</a>
+                <a href="http://archive.apache.org/dist/syncope/1.2.1/syncope-installer-1.2.1-uber.jar.asc">asc</a> 
+                <a href="http://archive.apache.org/dist/syncope/1.2.1/syncope-installer-1.2.1-uber.jar.md5">md5</a> 
+                <a href="http://archive.apache.org/dist/syncope/1.2.1/syncope-installer-1.2.1-uber.jar.sha1">sha1</a>
               </td>
             </tr>
             <tr>
               <td>
-                <a href="http://archive.apache.org/dist/syncope/1.2.0/apache-syncope-1.2.0.deb">apache-syncope-1.2.0.deb</a>
+                <a href="http://archive.apache.org/dist/syncope/1.2.1/apache-syncope-1.2.1.deb">apache-syncope-1.2.1.deb</a>
               </td>
               <td>
-                <a href="http://archive.apache.org/dist/syncope/1.2.0/apache-syncope-1.2.0.deb.asc">asc</a> 
-                <a href="http://archive.apache.org/dist/syncope/1.2.0/apache-syncope-1.2.0.deb.md5">md5</a> 
-                <a href="http://archive.apache.org/dist/syncope/1.2.0/apache-syncope-1.2.0.deb.sha1">sha1</a>
+                <a href="http://archive.apache.org/dist/syncope/1.2.1/apache-syncope-1.2.1.deb.asc">asc</a> 
+                <a href="http://archive.apache.org/dist/syncope/1.2.1/apache-syncope-1.2.1.deb.md5">md5</a> 
+                <a href="http://archive.apache.org/dist/syncope/1.2.1/apache-syncope-1.2.1.deb.sha1">sha1</a>
               </td>
             </tr>
             <tr>
               <td>
-                <a href="http://archive.apache.org/dist/syncope/1.2.0/apache-syncope-console-1.2.0.deb">apache-syncope-console-1.2.0.deb</a>
+                <a href="http://archive.apache.org/dist/syncope/1.2.1/apache-syncope-console-1.2.1.deb">apache-syncope-console-1.2.1.deb</a>
               </td>
               <td>
-                <a href="http://archive.apache.org/dist/syncope/1.2.0/apache-syncope-console-1.2.0.deb.asc">asc</a> 
-                <a href="http://archive.apache.org/dist/syncope/1.2.0/apache-syncope-console-1.2.0.deb.md5">md5</a> 
-                <a href="http://archive.apache.org/dist/syncope/1.2.0/apache-syncope-console-1.2.0.deb.sha1">sha1</a>
+                <a href="http://archive.apache.org/dist/syncope/1.2.1/apache-syncope-console-1.2.1.deb.asc">asc</a> 
+                <a href="http://archive.apache.org/dist/syncope/1.2.1/apache-syncope-console-1.2.1.deb.md5">md5</a> 
+                <a href="http://archive.apache.org/dist/syncope/1.2.1/apache-syncope-console-1.2.1.deb.sha1">sha1</a>
               </td>
             </tr>
           </tbody>


[02/22] syncope git commit: Updating CHANGES for release

Posted by il...@apache.org.
Updating CHANGES for release


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/db4c9202
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/db4c9202
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/db4c9202

Branch: refs/heads/master
Commit: db4c920256035f49507115b8dc9fb28c54a1b217
Parents: 3237d26
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Jan 30 08:59:00 2015 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Jan 30 08:59:00 2015 +0100

----------------------------------------------------------------------
 CHANGES | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/db4c9202/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index a9b5592..142ca16 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,29 @@ Apache Syncope - CHANGES
 Licensed under Apache License 2.0 - http://www.apache.org/licenses/LICENSE-2.0
 --------------------------------------------------------------------------------
 
+Release Notes - Syncope - Version 1.2.2
+================================================================================
+
+** Bug
+    * [SYNCOPE-607] - Error when adding a value to a multivalue configuration parameter of type long
+    * [SYNCOPE-608] - Cannot configure audit for AuthenticationController
+    * [SYNCOPE-610] - Installer doesn't update the console.properties with the container port
+    * [SYNCOPE-611] - An approver displays all approval tasks including those not assigned to him
+    * [SYNCOPE-613] - delete overridable connector configuration property of type array String in resource edit panel
+    * [SYNCOPE-614] - NotificationJob fails with NullPointerException
+    * [SYNCOPE-615] - Updating properties and xml files of the installer module with the current version
+    * [SYNCOPE-617] - User/role schema attribute with minus symbol in name
+    * [SYNCOPE-625] - Build fails with Java 6
+    * [SYNCOPE-629] - ATTRTEMPLATE entities not exported
+    * [SYNCOPE-632] - Errors during update propagation when derived attribute is configured as account id
+
+** Improvement
+    * [SYNCOPE-612] - explicit configuration of Velocity logging
+    * [SYNCOPE-616] - Improving the management of the xml and properties files inside the installer
+    * [SYNCOPE-621] - Reduce log level of bean validation errors (in data binder)
+    * [SYNCOPE-622] - Improve VirAttrCache management
+    * [SYNCOPE-630] - Eliminate duplicate Syncope WADL methods
+
 Release Notes - Syncope - Version 1.2.1
 ================================================================================
 


[21/22] syncope git commit: Merge from 1_2_X

Posted by il...@apache.org.
Merge from 1_2_X


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/69754419
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/69754419
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/69754419

Branch: refs/heads/master
Commit: 69754419891a5f36619c9a02bc0133286cab897e
Parents: 3f4c758 424148a
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon Feb 2 14:54:29 2015 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon Feb 2 14:54:29 2015 +0100

----------------------------------------------------------------------
 CHANGES                                         |  23 +++
 NOTICE                                          |   2 +-
 build-tools/NOTICE                              |   8 +-
 console/NOTICE                                  |  12 +-
 core/NOTICE                                     |  12 +-
 core/pom.xml                                    |  38 ++++
 .../rest/utils/QueryResourceInfoComparator.java | 114 ++++++++++
 .../main/resources/quartz/tables_mariadb.sql    | 206 +++++++++++++++++++
 core/src/main/resources/restContext.xml         |   3 +
 .../core/rest/ConfigurationTestITCase.java      |   8 +-
 .../resources/mariadb/persistence.properties    |  28 +++
 pom.xml                                         |   5 +-
 src/site/xdoc/building.xml                      |   5 +
 src/site/xdoc/downloads.xml                     |  88 ++++----
 standalone/NOTICE                               |  14 +-
 15 files changed, 492 insertions(+), 74 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/69754419/core/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/syncope/blob/69754419/pom.xml
----------------------------------------------------------------------


[05/22] syncope git commit: Updating downloads site page for release

Posted by il...@apache.org.
Updating downloads site page for release


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/1df9ef89
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/1df9ef89
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/1df9ef89

Branch: refs/heads/2_0_X
Commit: 1df9ef8960dc35e43e23161d82a7364c5b30c2f1
Parents: 4f43793
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Jan 30 09:01:53 2015 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Jan 30 09:01:53 2015 +0100

----------------------------------------------------------------------
 src/site/xdoc/downloads.xml | 88 ++++++++++++++++++++--------------------
 1 file changed, 44 insertions(+), 44 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/1df9ef89/src/site/xdoc/downloads.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/downloads.xml b/src/site/xdoc/downloads.xml
index 618c51d..fe99a11 100644
--- a/src/site/xdoc/downloads.xml
+++ b/src/site/xdoc/downloads.xml
@@ -60,8 +60,8 @@ under the License.
     </section>
 
     <section name="Current Releases">
-      <subsection name="1.2.1 Intermezzo">
-        <p>Release date: Nov 17th, 2014</p>
+      <subsection name="1.2.2 Intermezzo">
+        <p>Release date: Jan 30th, 2015</p>
         <p>
           <a href="https://cwiki.apache.org/confluence/display/SYNCOPE/Intermezzo">Release notes</a>
         </p>
@@ -75,52 +75,52 @@ under the License.
           <tbody>
             <tr>
               <td>
-                <a href="http://www.apache.org/dyn/closer.cgi/syncope/1.2.1/syncope-1.2.1-source-release.zip">syncope-1.2.1-source-release.zip</a>
+                <a href="http://www.apache.org/dyn/closer.cgi/syncope/1.2.2/syncope-1.2.2-source-release.zip">syncope-1.2.2-source-release.zip</a>
               </td>
               <td>
-                <a href="http://www.apache.org/dist/syncope/1.2.1/syncope-1.2.1-source-release.zip.asc">asc</a> 
-                <a href="http://www.apache.org/dist/syncope/1.2.1/syncope-1.2.1-source-release.zip.md5">md5</a> 
-                <a href="http://www.apache.org/dist/syncope/1.2.1/syncope-1.2.1-source-release.zip.sha1">sha1</a>
+                <a href="http://www.apache.org/dist/syncope/1.2.2/syncope-1.2.2-source-release.zip.asc">asc</a> 
+                <a href="http://www.apache.org/dist/syncope/1.2.2/syncope-1.2.2-source-release.zip.md5">md5</a> 
+                <a href="http://www.apache.org/dist/syncope/1.2.2/syncope-1.2.2-source-release.zip.sha1">sha1</a>
               </td>
             </tr>
             <tr>
               <td>
-                <a href="http://www.apache.org/dyn/closer.cgi/syncope/1.2.1/syncope-standalone-1.2.1-distribution.zip">syncope-standalone-1.2.1-distribution.zip</a>
+                <a href="http://www.apache.org/dyn/closer.cgi/syncope/1.2.2/syncope-standalone-1.2.2-distribution.zip">syncope-standalone-1.2.2-distribution.zip</a>
               </td>
               <td>
-                <a href="http://www.apache.org/dist/syncope/1.2.1/syncope-standalone-1.2.1-distribution.zip.asc">asc</a> 
-                <a href="http://www.apache.org/dist/syncope/1.2.1/syncope-standalone-1.2.1-distribution.zip.md5">md5</a> 
-                <a href="http://www.apache.org/dist/syncope/1.2.1/syncope-standalone-1.2.1-distribution.zip.sha1">sha1</a>
+                <a href="http://www.apache.org/dist/syncope/1.2.2/syncope-standalone-1.2.2-distribution.zip.asc">asc</a> 
+                <a href="http://www.apache.org/dist/syncope/1.2.2/syncope-standalone-1.2.2-distribution.zip.md5">md5</a> 
+                <a href="http://www.apache.org/dist/syncope/1.2.2/syncope-standalone-1.2.2-distribution.zip.sha1">sha1</a>
               </td>
             </tr>
             <tr>
               <td>
-                <a href="http://www.apache.org/dyn/closer.cgi/syncope/1.2.1/syncope-installer-1.2.1-uber.jar">syncope-installer-1.2.1.jar</a>
+                <a href="http://www.apache.org/dyn/closer.cgi/syncope/1.2.2/syncope-installer-1.2.2-uber.jar">syncope-installer-1.2.2.jar</a>
               </td>
               <td>
-                <a href="http://www.apache.org/dist/syncope/1.2.1/syncope-installer-1.2.1-uber.jar.asc">asc</a> 
-                <a href="http://www.apache.org/dist/syncope/1.2.1/syncope-installer-1.2.1-uber.jar.md5">md5</a> 
-                <a href="http://www.apache.org/dist/syncope/1.2.1/syncope-installer-1.2.1-uber.jar.sha1">sha1</a>
+                <a href="http://www.apache.org/dist/syncope/1.2.2/syncope-installer-1.2.2-uber.jar.asc">asc</a> 
+                <a href="http://www.apache.org/dist/syncope/1.2.2/syncope-installer-1.2.2-uber.jar.md5">md5</a> 
+                <a href="http://www.apache.org/dist/syncope/1.2.2/syncope-installer-1.2.2-uber.jar.sha1">sha1</a>
               </td>
             </tr>
             <tr>
               <td>
-                <a href="http://www.apache.org/dyn/closer.cgi/syncope/1.2.1/apache-syncope-1.2.1.deb">apache-syncope-1.2.1.deb</a>
+                <a href="http://www.apache.org/dyn/closer.cgi/syncope/1.2.2/apache-syncope-1.2.2.deb">apache-syncope-1.2.2.deb</a>
               </td>
               <td>
-                <a href="http://www.apache.org/dist/syncope/1.2.1/apache-syncope-1.2.1.deb.asc">asc</a> 
-                <a href="http://www.apache.org/dist/syncope/1.2.1/apache-syncope-1.2.1.deb.md5">md5</a> 
-                <a href="http://www.apache.org/dist/syncope/1.2.1/apache-syncope-1.2.1.deb.sha1">sha1</a>
+                <a href="http://www.apache.org/dist/syncope/1.2.2/apache-syncope-1.2.2.deb.asc">asc</a> 
+                <a href="http://www.apache.org/dist/syncope/1.2.2/apache-syncope-1.2.2.deb.md5">md5</a> 
+                <a href="http://www.apache.org/dist/syncope/1.2.2/apache-syncope-1.2.2.deb.sha1">sha1</a>
               </td>
             </tr>
             <tr>
               <td>
-                <a href="http://www.apache.org/dyn/closer.cgi/syncope/1.2.1/apache-syncope-console-1.2.1.deb">apache-syncope-console-1.2.1.deb</a>
+                <a href="http://www.apache.org/dyn/closer.cgi/syncope/1.2.2/apache-syncope-console-1.2.2.deb">apache-syncope-console-1.2.2.deb</a>
               </td>
               <td>
-                <a href="http://www.apache.org/dist/syncope/1.2.1/apache-syncope-console-1.2.1.deb.asc">asc</a> 
-                <a href="http://www.apache.org/dist/syncope/1.2.1/apache-syncope-console-1.2.1.deb.md5">md5</a> 
-                <a href="http://www.apache.org/dist/syncope/1.2.1/apache-syncope-console-1.2.1.deb.sha1">sha1</a>
+                <a href="http://www.apache.org/dist/syncope/1.2.2/apache-syncope-console-1.2.2.deb.asc">asc</a> 
+                <a href="http://www.apache.org/dist/syncope/1.2.2/apache-syncope-console-1.2.2.deb.md5">md5</a> 
+                <a href="http://www.apache.org/dist/syncope/1.2.2/apache-syncope-console-1.2.2.deb.sha1">sha1</a>
               </td>
             </tr>
           </tbody>
@@ -191,8 +191,8 @@ under the License.
     </section>
 
     <section name="Older Releases">
-      <subsection name="1.2.0 Intermezzo">
-        <p>Release date: Oct 3rd, 2014</p>
+      <subsection name="1.2.1 Intermezzo">
+        <p>Release date: Nov 17th, 2014</p>
         <p>
           <a href="https://cwiki.apache.org/confluence/display/SYNCOPE/Intermezzo">Release notes</a>
         </p>
@@ -206,52 +206,52 @@ under the License.
           <tbody>
             <tr>
               <td>
-                <a href="http://archive.apache.org/dist/syncope/1.2.0/syncope-1.2.0-source-release.zip">syncope-1.2.0-source-release.zip</a>
+                <a href="http://archive.apache.org/dist/syncope/1.2.1/syncope-1.2.1-source-release.zip">syncope-1.2.1-source-release.zip</a>
               </td>
               <td>
-                <a href="http://archive.apache.org/dist/syncope/1.2.0/syncope-1.2.0-source-release.zip.asc">asc</a> 
-                <a href="http://archive.apache.org/dist/syncope/1.2.0/syncope-1.2.0-source-release.zip.md5">md5</a> 
-                <a href="http://archive.apache.org/dist/syncope/1.2.0/syncope-1.2.0-source-release.zip.sha1">sha1</a>
+                <a href="http://archive.apache.org/dist/syncope/1.2.1/syncope-1.2.1-source-release.zip.asc">asc</a> 
+                <a href="http://archive.apache.org/dist/syncope/1.2.1/syncope-1.2.1-source-release.zip.md5">md5</a> 
+                <a href="http://archive.apache.org/dist/syncope/1.2.1/syncope-1.2.1-source-release.zip.sha1">sha1</a>
               </td>
             </tr>
             <tr>
               <td>
-                <a href="http://archive.apache.org/dist/syncope/1.2.0/syncope-standalone-1.2.0-distribution.zip">syncope-standalone-1.2.0-distribution.zip</a>
+                <a href="http://archive.apache.org/dist/syncope/1.2.1/syncope-standalone-1.2.1-distribution.zip">syncope-standalone-1.2.1-distribution.zip</a>
               </td>
               <td>
-                <a href="http://archive.apache.org/dist/syncope/1.2.0/syncope-standalone-1.2.0-distribution.zip.asc">asc</a> 
-                <a href="http://archive.apache.org/dist/syncope/1.2.0/syncope-standalone-1.2.0-distribution.zip.md5">md5</a> 
-                <a href="http://archive.apache.org/dist/syncope/1.2.0/syncope-standalone-1.2.0-distribution.zip.sha1">sha1</a>
+                <a href="http://archive.apache.org/dist/syncope/1.2.1/syncope-standalone-1.2.1-distribution.zip.asc">asc</a> 
+                <a href="http://archive.apache.org/dist/syncope/1.2.1/syncope-standalone-1.2.1-distribution.zip.md5">md5</a> 
+                <a href="http://archive.apache.org/dist/syncope/1.2.1/syncope-standalone-1.2.1-distribution.zip.sha1">sha1</a>
               </td>
             </tr>
             <tr>
               <td>
-                <a href="http://archive.apache.org/dist/syncope/1.2.0/syncope-installer-1.2.0-uber.jar">syncope-installer-1.2.0.jar</a>
+                <a href="http://archive.apache.org/dist/syncope/1.2.1/syncope-installer-1.2.1-uber.jar">syncope-installer-1.2.1.jar</a>
               </td>
               <td>
-                <a href="http://archive.apache.org/dist/syncope/1.2.0/syncope-installer-1.2.0-uber.jar.asc">asc</a> 
-                <a href="http://archive.apache.org/dist/syncope/1.2.0/syncope-installer-1.2.0-uber.jar.md5">md5</a> 
-                <a href="http://archive.apache.org/dist/syncope/1.2.0/syncope-installer-1.2.0-uber.jar.sha1">sha1</a>
+                <a href="http://archive.apache.org/dist/syncope/1.2.1/syncope-installer-1.2.1-uber.jar.asc">asc</a> 
+                <a href="http://archive.apache.org/dist/syncope/1.2.1/syncope-installer-1.2.1-uber.jar.md5">md5</a> 
+                <a href="http://archive.apache.org/dist/syncope/1.2.1/syncope-installer-1.2.1-uber.jar.sha1">sha1</a>
               </td>
             </tr>
             <tr>
               <td>
-                <a href="http://archive.apache.org/dist/syncope/1.2.0/apache-syncope-1.2.0.deb">apache-syncope-1.2.0.deb</a>
+                <a href="http://archive.apache.org/dist/syncope/1.2.1/apache-syncope-1.2.1.deb">apache-syncope-1.2.1.deb</a>
               </td>
               <td>
-                <a href="http://archive.apache.org/dist/syncope/1.2.0/apache-syncope-1.2.0.deb.asc">asc</a> 
-                <a href="http://archive.apache.org/dist/syncope/1.2.0/apache-syncope-1.2.0.deb.md5">md5</a> 
-                <a href="http://archive.apache.org/dist/syncope/1.2.0/apache-syncope-1.2.0.deb.sha1">sha1</a>
+                <a href="http://archive.apache.org/dist/syncope/1.2.1/apache-syncope-1.2.1.deb.asc">asc</a> 
+                <a href="http://archive.apache.org/dist/syncope/1.2.1/apache-syncope-1.2.1.deb.md5">md5</a> 
+                <a href="http://archive.apache.org/dist/syncope/1.2.1/apache-syncope-1.2.1.deb.sha1">sha1</a>
               </td>
             </tr>
             <tr>
               <td>
-                <a href="http://archive.apache.org/dist/syncope/1.2.0/apache-syncope-console-1.2.0.deb">apache-syncope-console-1.2.0.deb</a>
+                <a href="http://archive.apache.org/dist/syncope/1.2.1/apache-syncope-console-1.2.1.deb">apache-syncope-console-1.2.1.deb</a>
               </td>
               <td>
-                <a href="http://archive.apache.org/dist/syncope/1.2.0/apache-syncope-console-1.2.0.deb.asc">asc</a> 
-                <a href="http://archive.apache.org/dist/syncope/1.2.0/apache-syncope-console-1.2.0.deb.md5">md5</a> 
-                <a href="http://archive.apache.org/dist/syncope/1.2.0/apache-syncope-console-1.2.0.deb.sha1">sha1</a>
+                <a href="http://archive.apache.org/dist/syncope/1.2.1/apache-syncope-console-1.2.1.deb.asc">asc</a> 
+                <a href="http://archive.apache.org/dist/syncope/1.2.1/apache-syncope-console-1.2.1.deb.md5">md5</a> 
+                <a href="http://archive.apache.org/dist/syncope/1.2.1/apache-syncope-console-1.2.1.deb.sha1">sha1</a>
               </td>
             </tr>
           </tbody>


[17/22] syncope git commit: Upgrading Wicket and Maven enforcer plugin

Posted by il...@apache.org.
Upgrading Wicket and Maven enforcer plugin


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/424148ad
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/424148ad
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/424148ad

Branch: refs/heads/master
Commit: 424148ada65f09b8718af2d923d88a1c8aadb107
Parents: bccd3a0
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon Feb 2 14:48:22 2015 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon Feb 2 14:48:22 2015 +0100

----------------------------------------------------------------------
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/424148ad/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2d3f6c9..cb26d2b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -352,7 +352,7 @@ under the License.
 
     <cocoon.version>3.0.0-alpha-3</cocoon.version>
 
-    <wicket.version>6.18.0</wicket.version>
+    <wicket.version>6.19.0</wicket.version>
 
     <groovy.version>2.3.9</groovy.version>
 
@@ -1344,7 +1344,7 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>1.3.1</version>
+        <version>1.4</version>
         <executions>
           <execution>
             <id>enforce-java</id>


[09/22] syncope git commit: [maven-release-plugin] prepare for next development iteration

Posted by il...@apache.org.
[maven-release-plugin] prepare for next development iteration


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/b1511319
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/b1511319
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/b1511319

Branch: refs/heads/2_0_X
Commit: b1511319334aafc68142fa3a014ce9bf74144e48
Parents: bd0d901
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Jan 30 09:09:11 2015 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Jan 30 09:09:11 2015 +0100

----------------------------------------------------------------------
 archetype/pom.xml     | 2 +-
 build-tools/pom.xml   | 2 +-
 client/pom.xml        | 2 +-
 common/pom.xml        | 2 +-
 console/pom.xml       | 2 +-
 core-upgrader/pom.xml | 2 +-
 core/pom.xml          | 2 +-
 deb/console/pom.xml   | 2 +-
 deb/core/pom.xml      | 2 +-
 deb/pom.xml           | 2 +-
 installer/pom.xml     | 2 +-
 pom.xml               | 4 ++--
 standalone/pom.xml    | 2 +-
 13 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/b1511319/archetype/pom.xml
----------------------------------------------------------------------
diff --git a/archetype/pom.xml b/archetype/pom.xml
index 44424bb..fa42a6b 100644
--- a/archetype/pom.xml
+++ b/archetype/pom.xml
@@ -24,7 +24,7 @@ under the License.
   <parent>
     <groupId>org.apache.syncope</groupId>
     <artifactId>syncope</artifactId>
-    <version>1.2.2</version>
+    <version>1.2.3-SNAPSHOT</version>
   </parent>
 
   <name>Apache Syncope Archetype</name>

http://git-wip-us.apache.org/repos/asf/syncope/blob/b1511319/build-tools/pom.xml
----------------------------------------------------------------------
diff --git a/build-tools/pom.xml b/build-tools/pom.xml
index 47bc221..d2257be 100644
--- a/build-tools/pom.xml
+++ b/build-tools/pom.xml
@@ -24,7 +24,7 @@ under the License.
   <parent>
     <groupId>org.apache.syncope</groupId>
     <artifactId>syncope</artifactId>
-    <version>1.2.2</version>
+    <version>1.2.3-SNAPSHOT</version>
   </parent>
 
   <name>Apache Syncope Build Tools</name>

http://git-wip-us.apache.org/repos/asf/syncope/blob/b1511319/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index 8a9ea62..23764ce 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -24,7 +24,7 @@ under the License.
   <parent>
     <groupId>org.apache.syncope</groupId>
     <artifactId>syncope</artifactId>
-    <version>1.2.2</version>
+    <version>1.2.3-SNAPSHOT</version>
   </parent>
 
   <name>Apache Syncope Client</name>

http://git-wip-us.apache.org/repos/asf/syncope/blob/b1511319/common/pom.xml
----------------------------------------------------------------------
diff --git a/common/pom.xml b/common/pom.xml
index 005add7..331e929 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -24,7 +24,7 @@ under the License.
   <parent>
     <groupId>org.apache.syncope</groupId>
     <artifactId>syncope</artifactId>
-    <version>1.2.2</version>
+    <version>1.2.3-SNAPSHOT</version>
   </parent>
 
   <name>Apache Syncope Common</name>

http://git-wip-us.apache.org/repos/asf/syncope/blob/b1511319/console/pom.xml
----------------------------------------------------------------------
diff --git a/console/pom.xml b/console/pom.xml
index ac57f92..8f2dd3c 100644
--- a/console/pom.xml
+++ b/console/pom.xml
@@ -24,7 +24,7 @@ under the License.
   <parent>
     <groupId>org.apache.syncope</groupId>
     <artifactId>syncope</artifactId>
-    <version>1.2.2</version>
+    <version>1.2.3-SNAPSHOT</version>
   </parent>
 
   <name>Apache Syncope Console</name>

http://git-wip-us.apache.org/repos/asf/syncope/blob/b1511319/core-upgrader/pom.xml
----------------------------------------------------------------------
diff --git a/core-upgrader/pom.xml b/core-upgrader/pom.xml
index aa9d1d2..8db5eb5 100644
--- a/core-upgrader/pom.xml
+++ b/core-upgrader/pom.xml
@@ -23,7 +23,7 @@ under the License.
   <parent>
     <groupId>org.apache.syncope</groupId>
     <artifactId>syncope</artifactId>
-    <version>1.2.2</version>
+    <version>1.2.3-SNAPSHOT</version>
   </parent>
  
   <groupId>org.apache.syncope</groupId>

http://git-wip-us.apache.org/repos/asf/syncope/blob/b1511319/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index d9541b5..4b13eab 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -24,7 +24,7 @@ under the License.
   <parent>
     <groupId>org.apache.syncope</groupId>
     <artifactId>syncope</artifactId>
-    <version>1.2.2</version>
+    <version>1.2.3-SNAPSHOT</version>
   </parent>
 
   <name>Apache Syncope Core</name>

http://git-wip-us.apache.org/repos/asf/syncope/blob/b1511319/deb/console/pom.xml
----------------------------------------------------------------------
diff --git a/deb/console/pom.xml b/deb/console/pom.xml
index 2565b9d..c1bed80 100644
--- a/deb/console/pom.xml
+++ b/deb/console/pom.xml
@@ -24,7 +24,7 @@ under the License.
   <parent>
     <groupId>org.apache.syncope</groupId>
     <artifactId>syncope-deb</artifactId>
-    <version>1.2.2</version>
+    <version>1.2.3-SNAPSHOT</version>
   </parent>
 
   <name>Apache Syncope Deb Console</name>

http://git-wip-us.apache.org/repos/asf/syncope/blob/b1511319/deb/core/pom.xml
----------------------------------------------------------------------
diff --git a/deb/core/pom.xml b/deb/core/pom.xml
index 3602af0..3c1aed7 100644
--- a/deb/core/pom.xml
+++ b/deb/core/pom.xml
@@ -24,7 +24,7 @@ under the License.
   <parent>
     <groupId>org.apache.syncope</groupId>
     <artifactId>syncope-deb</artifactId>
-    <version>1.2.2</version>
+    <version>1.2.3-SNAPSHOT</version>
   </parent>
 
   <name>Apache Syncope Deb Core</name>

http://git-wip-us.apache.org/repos/asf/syncope/blob/b1511319/deb/pom.xml
----------------------------------------------------------------------
diff --git a/deb/pom.xml b/deb/pom.xml
index 852f492..904ebdd 100644
--- a/deb/pom.xml
+++ b/deb/pom.xml
@@ -24,7 +24,7 @@ under the License.
   <parent>
     <groupId>org.apache.syncope</groupId>
     <artifactId>syncope</artifactId>
-    <version>1.2.2</version>
+    <version>1.2.3-SNAPSHOT</version>
   </parent>
 
   <name>Apache Syncope Deb</name>

http://git-wip-us.apache.org/repos/asf/syncope/blob/b1511319/installer/pom.xml
----------------------------------------------------------------------
diff --git a/installer/pom.xml b/installer/pom.xml
index 16e7159..073cd52 100644
--- a/installer/pom.xml
+++ b/installer/pom.xml
@@ -24,7 +24,7 @@ under the License.
   <parent>
     <groupId>org.apache.syncope</groupId>
     <artifactId>syncope</artifactId>
-    <version>1.2.2</version>
+    <version>1.2.3-SNAPSHOT</version>
   </parent>
 
   <name>Apache Syncope Installer</name>

http://git-wip-us.apache.org/repos/asf/syncope/blob/b1511319/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a528560..3b805c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@ under the License.
 
   <groupId>org.apache.syncope</groupId>
   <artifactId>syncope</artifactId>
-  <version>1.2.2</version>
+  <version>1.2.3-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <parent>
@@ -52,7 +52,7 @@ under the License.
     <connection>scm:git:https://git-wip-us.apache.org/repos/asf/syncope.git</connection>
     <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/syncope.git</developerConnection>
     <url>https://git-wip-us.apache.org/repos/asf?p=syncope.git</url>
-    <tag>syncope-1.2.2</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <issueManagement>

http://git-wip-us.apache.org/repos/asf/syncope/blob/b1511319/standalone/pom.xml
----------------------------------------------------------------------
diff --git a/standalone/pom.xml b/standalone/pom.xml
index 8ea8346..270b58c 100644
--- a/standalone/pom.xml
+++ b/standalone/pom.xml
@@ -24,7 +24,7 @@ under the License.
   <parent>
     <groupId>org.apache.syncope</groupId>
     <artifactId>syncope</artifactId>
-    <version>1.2.2</version>
+    <version>1.2.3-SNAPSHOT</version>
   </parent>
 
   <name>Apache Syncope Standalone Distribution</name>


[11/22] syncope git commit: Restoring QueryResourceInfoComparator removed by SYNCOPE-630 in order to avoid test failures with JDK 6

Posted by il...@apache.org.
Restoring QueryResourceInfoComparator removed by SYNCOPE-630 in order to avoid test failures with JDK 6


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/9aa765b2
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/9aa765b2
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/9aa765b2

Branch: refs/heads/2_0_X
Commit: 9aa765b2519b4c565c5d2dca21afe8d7093fdf91
Parents: b151131
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Jan 30 13:58:40 2015 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Jan 30 13:58:40 2015 +0100

----------------------------------------------------------------------
 .../rest/utils/QueryResourceInfoComparator.java | 114 +++++++++++++++++++
 core/src/main/resources/restContext.xml         |   3 +
 2 files changed, 117 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/9aa765b2/core/src/main/java/org/apache/syncope/core/rest/utils/QueryResourceInfoComparator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/rest/utils/QueryResourceInfoComparator.java b/core/src/main/java/org/apache/syncope/core/rest/utils/QueryResourceInfoComparator.java
new file mode 100644
index 0000000..bcc015d
--- /dev/null
+++ b/core/src/main/java/org/apache/syncope/core/rest/utils/QueryResourceInfoComparator.java
@@ -0,0 +1,114 @@
+/*
+ * 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.core.rest.utils;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.cxf.jaxrs.ext.ResourceComparator;
+import org.apache.cxf.jaxrs.model.ClassResourceInfo;
+import org.apache.cxf.jaxrs.model.OperationResourceInfo;
+import org.apache.cxf.jaxrs.model.OperationResourceInfoComparator;
+import org.apache.cxf.jaxrs.model.Parameter;
+import org.apache.cxf.jaxrs.utils.JAXRSUtils;
+import org.apache.cxf.message.Message;
+
+public class QueryResourceInfoComparator extends OperationResourceInfoComparator implements ResourceComparator {
+
+    public QueryResourceInfoComparator() {
+        super(null, null);
+    }
+
+    @Override
+    public int compare(final ClassResourceInfo cri1, final ClassResourceInfo cri2, final Message message) {
+        // Leave Class selection to CXF
+        return 0;
+    }
+
+    @Override
+    public int compare(final OperationResourceInfo oper1, final OperationResourceInfo oper2, final Message message) {
+        // Check if CXF can make a decision
+        int cxfResult = super.compare(oper1, oper2);
+        if (cxfResult != 0) {
+            return cxfResult;
+        }
+
+        int op1Counter = getMatchingRate(oper1, message);
+        int op2Counter = getMatchingRate(oper2, message);
+
+        return op1Counter == op2Counter
+                ? 0
+                : op1Counter < op2Counter
+                ? 1
+                : -1;
+    }
+
+    /**
+     * This method calculates a number indicating a good or bad match between values provided within the request and
+     * expected method parameters. A higher number means a better match.
+     *
+     * @param operation The operation to be rated, based on contained parameterInfo values.
+     * @param message A message containing query and header values from user request
+     * @return A positive or negative number, indicating a good match between query and method
+     */
+    protected int getMatchingRate(final OperationResourceInfo operation, final Message message) {
+        List<Parameter> params = operation.getParameters();
+        if (params == null || params.isEmpty()) {
+            return 0;
+        }
+
+        // Get Request QueryParams
+        String query = (String) message.get(Message.QUERY_STRING);
+        String path = (String) message.get(Message.REQUEST_URI);
+        Map<String, List<String>> qParams = JAXRSUtils.getStructuredParams(query, "&", true, false);
+        Map<String, List<String>> mParams = JAXRSUtils.getMatrixParams(path, true);
+        // Get Request Headers
+        Map<?, ?> qHeader = (java.util.Map<?, ?>) message.get(Message.PROTOCOL_HEADERS);
+
+        int rate = 0;
+        for (Parameter p : params) {
+            switch (p.getType()) {
+                case QUERY:
+                    if (qParams.containsKey(p.getName())) {
+                        rate += 2;
+                    } else if (p.getDefaultValue() == null) {
+                        rate -= 1;
+                    }
+                    break;
+                case MATRIX:
+                    if (mParams.containsKey(p.getName())) {
+                        rate += 2;
+                    } else if (p.getDefaultValue() == null) {
+                        rate -= 1;
+                    }
+                    break;
+                case HEADER:
+                    if (qHeader.containsKey(p.getName())) {
+                        rate += 2;
+                    } else if (p.getDefaultValue() == null) {
+                        rate -= 1;
+                    }
+                    break;
+                default:
+                    break;
+            }
+        }
+        return rate;
+    }
+}

http://git-wip-us.apache.org/repos/asf/syncope/blob/9aa765b2/core/src/main/resources/restContext.xml
----------------------------------------------------------------------
diff --git a/core/src/main/resources/restContext.xml b/core/src/main/resources/restContext.xml
index 7b6fe30..1b71e31 100644
--- a/core/src/main/resources/restContext.xml
+++ b/core/src/main/resources/restContext.xml
@@ -100,6 +100,9 @@ under the License.
   <jaxrs:server id="restContainer" address="/" 
                 basePackages="org.apache.syncope.common.services, org.apache.syncope.core.services" 
                 staticSubresourceResolution="true">
+    <jaxrs:resourceComparator>
+      <bean id="queryResourceInfoComparator" class="org.apache.syncope.core.rest.utils.QueryResourceInfoComparator"/>
+    </jaxrs:resourceComparator>
     <jaxrs:properties> 
       <entry key="search.lax.property.match" value="true"/> 
     </jaxrs:properties> 


[19/22] syncope git commit: Upgrading Wicket and Maven enforcer plugin

Posted by il...@apache.org.
Upgrading Wicket and Maven enforcer plugin


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/424148ad
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/424148ad
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/424148ad

Branch: refs/heads/1_2_X
Commit: 424148ada65f09b8718af2d923d88a1c8aadb107
Parents: bccd3a0
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon Feb 2 14:48:22 2015 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon Feb 2 14:48:22 2015 +0100

----------------------------------------------------------------------
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/424148ad/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2d3f6c9..cb26d2b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -352,7 +352,7 @@ under the License.
 
     <cocoon.version>3.0.0-alpha-3</cocoon.version>
 
-    <wicket.version>6.18.0</wicket.version>
+    <wicket.version>6.19.0</wicket.version>
 
     <groovy.version>2.3.9</groovy.version>
 
@@ -1344,7 +1344,7 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>1.3.1</version>
+        <version>1.4</version>
         <executions>
           <execution>
             <id>enforce-java</id>