Author: ilgrosso
Date: Wed Jun 12 14:29:06 2013
New Revision: 1492224
URL: http://svn.apache.org/r1492224
Log:
Merge from 1_1_X
Modified:
syncope/trunk/ (props changed)
syncope/trunk/CHANGES
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/UserDetailsPanel.java
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/UserDetailsPanel.html
syncope/trunk/core/src/main/java/org/apache/syncope/core/util/VirAttrCacheKey.java
syncope/trunk/pom.xml
syncope/trunk/src/site/xdoc/downloads.xml
Propchange: syncope/trunk/
------------------------------------------------------------------------------
Merged /syncope/branches/1_0_X:r1487793-1492222
Merged /syncope/branches/1_1_X:r1490583-1492223
Modified: syncope/trunk/CHANGES
URL:
http://svn.apache.org/viewvc/syncope/trunk/CHANGES?rev=1492224&r1=1492223&r2=1492224&view=diff
==============================================================================
--- syncope/trunk/CHANGES (original)
+++ syncope/trunk/CHANGES Wed Jun 12 14:29:06 2013
@@ -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.1.2
+================================================================================
+** Bug
+ * [SYNCOPE-369] - Wrong error message on failed login
+ * [SYNCOPE-371] - Console RuntimeException with multiple sessions for the
same user
+ * [SYNCOPE-372] - Connector error before save
+ * [SYNCOPE-373] - 500 when self reading admin user
+ * [SYNCOPE-375] - QUARTZ tables are not written into an innodb mysql DB
for an mvn generated and created project
+ * [SYNCOPE-376] - Console webapp does not start on Glassfish
+ * [SYNCOPE-377] - Exporting configuration via console causes exceptions to
be thrown
+ * [SYNCOPE-380] - Deleting a role from admin console throws an exception
+ * [SYNCOPE-381] - Adding and saving roles with resources during save
+ * [SYNCOPE-382] - Core hangs for a very long time (1h+ and then resumes)
after a CLI role create and list
+ * [SYNCOPE-383] - Failure assigning resource to an existing user
+ * [SYNCOPE-384] - Issues with CXF and Glassfish
+ * [SYNCOPE-385] - NPE when reading user assigned to resource with no
mapping
+ * [SYNCOPE-386] - Database sync (no full reconciliation) fails with
"Unsupported object class"
+ * [SYNCOPE-387] - Unable to synchronize deleted objects from OpenDJ
+
+** Improvement
+ * [SYNCOPE-374] - SyncopeUser tokens do not use secure random strings
+ * [SYNCOPE-390] - Default Reportlets improvements
+
Release Notes - Syncope - Version 1.1.1
================================================================================
** Bug
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/UserDetailsPanel.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/UserDetailsPanel.java?rev=1492224&r1=1492223&r2=1492224&view=diff
==============================================================================
---
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/UserDetailsPanel.java
(original)
+++
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/UserDetailsPanel.java
Wed Jun 12 14:29:06 2013
@@ -55,7 +55,7 @@ public class UserDetailsPanel extends Pa
final WebMarkupContainer jexlHelp =
JexlHelpUtil.getJexlHelpWebContainer("usernameJexlHelp");
add(jexlHelp);
- final AjaxLink questionMarkJexlHelp =
JexlHelpUtil.getAjaxLink(jexlHelp, "usernameQuestionMarkJexlHelp");
+ final AjaxLink<?> questionMarkJexlHelp =
JexlHelpUtil.getAjaxLink(jexlHelp, "usernameQuestionMarkJexlHelp");
add(questionMarkJexlHelp);
if (!templateMode) {
@@ -75,7 +75,7 @@ public class UserDetailsPanel extends Pa
final WebMarkupContainer pwdJexlHelp =
JexlHelpUtil.getJexlHelpWebContainer("pwdJexlHelp");
add(pwdJexlHelp);
- final AjaxLink pwdQuestionMarkJexlHelp =
JexlHelpUtil.getAjaxLink(pwdJexlHelp, "pwdQuestionMarkJexlHelp");
+ final AjaxLink<?> pwdQuestionMarkJexlHelp =
JexlHelpUtil.getAjaxLink(pwdJexlHelp, "pwdQuestionMarkJexlHelp");
add(pwdQuestionMarkJexlHelp);
if (templateMode) {
Modified:
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/UserDetailsPanel.html
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/UserDetailsPanel.html?rev=1492224&r1=1492223&r2=1492224&view=diff
==============================================================================
---
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/UserDetailsPanel.html
(original)
+++
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/UserDetailsPanel.html
Wed Jun 12 14:29:06 2013
@@ -16,7 +16,7 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<html>
+<html xmlns="http://www.w3.org/1999/xhtml";
xmlns:wicket="http://wicket.apache.org";>
<wicket:panel>
<div id="formtable">
<div class="tablerow alt">
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/util/VirAttrCacheKey.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/util/VirAttrCacheKey.java?rev=1492224&r1=1492223&r2=1492224&view=diff
==============================================================================
---
syncope/trunk/core/src/main/java/org/apache/syncope/core/util/VirAttrCacheKey.java
(original)
+++
syncope/trunk/core/src/main/java/org/apache/syncope/core/util/VirAttrCacheKey.java
Wed Jun 12 14:29:06 2013
@@ -64,16 +64,16 @@ public class VirAttrCacheKey {
@Override
public boolean equals(final Object obj) {
- return EqualsBuilder.reflectionEquals(this, obj);
+ return EqualsBuilder.reflectionEquals(this, obj, true);
}
@Override
public int hashCode() {
- return HashCodeBuilder.reflectionHashCode(this);
+ return HashCodeBuilder.reflectionHashCode(this, true);
}
@Override
public String toString() {
- return ReflectionToStringBuilder.toString(this,
ToStringStyle.MULTI_LINE_STYLE);
+ return ReflectionToStringBuilder.toString(this,
ToStringStyle.MULTI_LINE_STYLE, true);
}
}
Modified: syncope/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1492224&r1=1492223&r2=1492224&view=diff
==============================================================================
--- syncope/trunk/pom.xml (original)
+++ syncope/trunk/pom.xml Wed Jun 12 14:29:06 2013
@@ -325,7 +325,7 @@ under the License.
<apacheds.version>1.5.7</apacheds.version>
- <tomcat.version>7.0.40</tomcat.version>
+ <tomcat.version>7.0.41</tomcat.version>
<jasypt.version>1.9.0</jasypt.version>
Modified: syncope/trunk/src/site/xdoc/downloads.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/src/site/xdoc/downloads.xml?rev=1492224&r1=1492223&r2=1492224&view=diff
==============================================================================
--- syncope/trunk/src/site/xdoc/downloads.xml (original)
+++ syncope/trunk/src/site/xdoc/downloads.xml Wed Jun 12 14:29:06 2013
@@ -57,8 +57,8 @@ under the License.
</section>
<section name="Current Releases">
- <subsection name="1.1.1 Ad libitum">
- <p>Release date: Apr 29th, 2013</p>
+ <subsection name="1.1.2 Ad libitum">
+ <p>Release date: Jun 11th, 2013</p>
<p>
<a
href="https://cwiki.apache.org/confluence/display/SYNCOPE/Ad+libitum";>Release
notes</a>
</p>
@@ -72,22 +72,22 @@ under the License.
<tbody>
<tr>
<td>
- <a
href="http://www.apache.org/dyn/closer.cgi/syncope/1.1.1/syncope-1.1.1-source-release.zip";>syncope-1.1.1-source-release.zip</a>
+ <a
href="http://www.apache.org/dyn/closer.cgi/syncope/1.1.2/syncope-1.1.2-source-release.zip";>syncope-1.1.2-source-release.zip</a>
</td>
<td>
- <a
href="http://www.apache.org/dist/syncope/1.1.1/syncope-1.1.1-source-release.zip.asc";>asc</a>
- <a
href="http://www.apache.org/dist/syncope/1.1.1/syncope-1.1.1-source-release.zip.md5";>md5</a>
- <a
href="http://www.apache.org/dist/syncope/1.1.1/syncope-1.1.1-source-release.zip.sha1";>sha1</a>
+ <a
href="http://www.apache.org/dist/syncope/1.1.2/syncope-1.1.2-source-release.zip.asc";>asc</a>
+ <a
href="http://www.apache.org/dist/syncope/1.1.2/syncope-1.1.2-source-release.zip.md5";>md5</a>
+ <a
href="http://www.apache.org/dist/syncope/1.1.2/syncope-1.1.2-source-release.zip.sha1";>sha1</a>
</td>
</tr>
<tr>
<td>
- <a
href="http://www.apache.org/dyn/closer.cgi/syncope/1.1.1/syncope-standalone-1.1.1-distribution.zip";>syncope-standalone-1.1.1-distribution.zip</a>
+ <a
href="http://www.apache.org/dyn/closer.cgi/syncope/1.1.2/syncope-standalone-1.1.2-distribution.zip";>syncope-standalone-1.1.2-distribution.zip</a>
</td>
<td>
- <a
href="http://www.apache.org/dist/syncope/1.1.1/syncope-standalone-1.1.1-distribution.zip.asc";>asc</a>
- <a
href="http://www.apache.org/dist/syncope/1.1.1/syncope-standalone-1.1.1-distribution.zip.md5";>md5</a>
- <a
href="http://www.apache.org/dist/syncope/1.1.1/syncope-standalone-1.1.1-distribution.zip.sha1";>sha1</a>
+ <a
href="http://www.apache.org/dist/syncope/1.1.2/syncope-standalone-1.1.2-distribution.zip.asc";>asc</a>
+ <a
href="http://www.apache.org/dist/syncope/1.1.2/syncope-standalone-1.1.2-distribution.zip.md5";>md5</a>
+ <a
href="http://www.apache.org/dist/syncope/1.1.2/syncope-standalone-1.1.2-distribution.zip.sha1";>sha1</a>
</td>
</tr>
</tbody>
@@ -122,8 +122,8 @@ under the License.
</section>
<section name="Older Releases">
- <subsection name="1.1.0 Ad libitum">
- <p>Release date: Apr 5th, 2013</p>
+ <subsection name="1.1.1 Ad libitum">
+ <p>Release date: Apr 29th, 2013</p>
<p>
<a
href="https://cwiki.apache.org/confluence/display/SYNCOPE/Ad+libitum";>Release
notes</a>
</p>
@@ -137,22 +137,22 @@ under the License.
<tbody>
<tr>
<td>
- <a
href="http://archive.apache.org/dist/syncope/1.1.0/syncope-1.1.0-source-release.zip";>syncope-1.1.0-source-release.zip</a>
+ <a
href="http://archive.apache.org/dist/syncope/1.1.1/syncope-1.1.1-source-release.zip";>syncope-1.1.1-source-release.zip</a>
</td>
<td>
- <a
href="http://archive.apache.org/dist/syncope/1.1.0/syncope-1.1.0-source-release.zip.asc";>asc</a>
- <a
href="http://archive.apache.org/dist/syncope/1.1.0/syncope-1.1.0-source-release.zip.md5";>md5</a>
- <a
href="http://archive.apache.org/dist/syncope/1.1.0/syncope-1.1.0-source-release.zip.sha1";>sha1</a>
+ <a
href="http://archive.apache.org/dist/syncope/1.1.1/syncope-1.1.1-source-release.zip.asc";>asc</a>
+ <a
href="http://archive.apache.org/dist/syncope/1.1.1/syncope-1.1.1-source-release.zip.md5";>md5</a>
+ <a
href="http://archive.apache.org/dist/syncope/1.1.1/syncope-1.1.1-source-release.zip.sha1";>sha1</a>
</td>
</tr>
<tr>
<td>
- <a
href="http://archive.apache.org/dist/syncope/1.1.0/syncope-standalone-1.1.0-distribution.zip";>syncope-standalone-1.1.0-distribution.zip</a>
+ <a
href="http://archive.apache.org/dist/syncope/1.1.1/syncope-standalone-1.1.1-distribution.zip";>syncope-standalone-1.1.1-distribution.zip</a>
</td>
<td>
- <a
href="http://archive.apache.org/dist/syncope/1.1.0/syncope-standalone-1.1.0-distribution.zip.asc";>asc</a>
- <a
href="http://archive.apache.org/dist/syncope/1.1.0/syncope-standalone-1.1.0-distribution.zip.md5";>md5</a>
- <a
href="http://archive.apache.org/dist/syncope/1.1.0/syncope-standalone-1.1.0-distribution.zip.sha1";>sha1</a>
+ <a
href="http://archive.apache.org/dist/syncope/1.1.1/syncope-standalone-1.1.1-distribution.zip.asc";>asc</a>
+ <a
href="http://archive.apache.org/dist/syncope/1.1.1/syncope-standalone-1.1.1-distribution.zip.md5";>md5</a>
+ <a
href="http://archive.apache.org/dist/syncope/1.1.1/syncope-standalone-1.1.1-distribution.zip.sha1";>sha1</a>
</td>
</tr>
</tbody>
