Author: ilgrosso
Date: Tue Oct 7 08:14:27 2014
New Revision: 1629821
URL: http://svn.apache.org/r1629821
Log:
Merge from 1_2_X
Modified:
syncope/trunk/ (props changed)
syncope/trunk/CHANGES
syncope/trunk/common/src/main/java/org/apache/syncope/common/services/UserSelfService.java
syncope/trunk/src/site/xdoc/downloads.xml
syncope/trunk/src/site/xdoc/release-process.xml
Propchange: syncope/trunk/
------------------------------------------------------------------------------
Merged /syncope/branches/1_2_X:r1629152-1629819
Modified: syncope/trunk/CHANGES
URL:
http://svn.apache.org/viewvc/syncope/trunk/CHANGES?rev=1629821&r1=1629820&r2=1629821&view=diff
==============================================================================
--- syncope/trunk/CHANGES (original)
+++ syncope/trunk/CHANGES Tue Oct 7 08:14:27 2014
@@ -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.0
+================================================================================
+
+** Sub-task
+ * [SYNCOPE-529] - Install through HTTP proxy
+ * [SYNCOPE-552] - Provide Activiti modeler installation feature to
installer
+
+** Bug
+ * [SYNCOPE-547] - Cannot send e-mails out when SMTP server requires
authentication
+ * [SYNCOPE-548] - Provide Activiti Modeler setup instructions
+ * [SYNCOPE-549] - Activiti Modeler always show the default workflow
definition
+ * [SYNCOPE-551] - Admin console shows 24 roles at most in the role tree
+ * [SYNCOPE-553] - Internal Server Error when creating account policy
+ * [SYNCOPE-556] - Error in the enum schema when trying to add new
enumeration value/label
+
+** Improvement
+ * [SYNCOPE-550] - Provide cleaner user workflow definition for production
+ * [SYNCOPE-555] - check for id != 0 in *Controller.resolveReference()
+
+** New Feature
+ * [SYNCOPE-135] - Password reset
+ * [SYNCOPE-143] - GUI Installer
+
Release Notes - Syncope - Version 1.2.0-M1
================================================================================
Modified:
syncope/trunk/common/src/main/java/org/apache/syncope/common/services/UserSelfService.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/services/UserSelfService.java?rev=1629821&r1=1629820&r2=1629821&view=diff
==============================================================================
---
syncope/trunk/common/src/main/java/org/apache/syncope/common/services/UserSelfService.java
(original)
+++
syncope/trunk/common/src/main/java/org/apache/syncope/common/services/UserSelfService.java
Tue Oct 7 08:14:27 2014
@@ -48,8 +48,9 @@ public interface UserSelfService extends
*
* @return <tt>Response</tt> contains special Syncope HTTP header
indicating if user self registration and / or
* password reset is allowed
- * @see
org.apache.syncope.common.types.RESTHeaders#SELFREGISTRATION_ALLOWED
- * @see org.apache.syncope.common.types.RESTHeaders#PASSWORDRESET_ALLOWED
+ * @see org.apache.syncope.common.types.RESTHeaders#SELFREG_ALLOWED
+ * @see org.apache.syncope.common.types.RESTHeaders#PWDRESET_ALLOWED
+ * @see
org.apache.syncope.common.types.RESTHeaders#PWDRESET_NEEDS_SECURITYQUESTIONS
*/
@Descriptions({
@Description(target = DocTarget.RESPONSE,
Modified: syncope/trunk/src/site/xdoc/downloads.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/src/site/xdoc/downloads.xml?rev=1629821&r1=1629820&r2=1629821&view=diff
==============================================================================
--- syncope/trunk/src/site/xdoc/downloads.xml (original)
+++ syncope/trunk/src/site/xdoc/downloads.xml Tue Oct 7 08:14:27 2014
@@ -60,8 +60,8 @@ under the License.
</section>
<section name="Current Releases">
- <subsection name="1.2.0-M1 Intermezzo">
- <p>Release date: Sep 8th, 2014</p>
+ <subsection name="1.2.0 Intermezzo">
+ <p>Release date: Oct 3rd, 2014</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.0-M1/syncope-1.2.0-M1-source-release.zip";>syncope-1.2.0-M1-source-release.zip</a>
+ <a
href="http://www.apache.org/dyn/closer.cgi/syncope/1.2.0/syncope-1.2.0-source-release.zip";>syncope-1.2.0-source-release.zip</a>
</td>
<td>
- <a
href="http://www.apache.org/dist/syncope/1.2.0-M1/syncope-1.2.0-M1-source-release.zip.asc";>asc</a>
- <a
href="http://www.apache.org/dist/syncope/1.2.0-M1/syncope-1.2.0-M1-source-release.zip.md5";>md5</a>
- <a
href="http://www.apache.org/dist/syncope/1.2.0-M1/syncope-1.2.0-M1-source-release.zip.sha1";>sha1</a>
+ <a
href="http://www.apache.org/dist/syncope/1.2.0/syncope-1.2.0-source-release.zip.asc";>asc</a>
+ <a
href="http://www.apache.org/dist/syncope/1.2.0/syncope-1.2.0-source-release.zip.md5";>md5</a>
+ <a
href="http://www.apache.org/dist/syncope/1.2.0/syncope-1.2.0-source-release.zip.sha1";>sha1</a>
</td>
</tr>
<tr>
<td>
- <a
href="http://www.apache.org/dyn/closer.cgi/syncope/1.2.0-M1/syncope-standalone-1.2.0-M1-distribution.zip";>syncope-standalone-1.2.0-M1-distribution.zip</a>
+ <a
href="http://www.apache.org/dyn/closer.cgi/syncope/1.2.0/syncope-standalone-1.2.0-distribution.zip";>syncope-standalone-1.2.0-distribution.zip</a>
</td>
<td>
- <a
href="http://www.apache.org/dist/syncope/1.2.0-M1/syncope-standalone-1.2.0-M1-distribution.zip.asc";>asc</a>
- <a
href="http://www.apache.org/dist/syncope/1.2.0-M1/syncope-standalone-1.2.0-M1-distribution.zip.md5";>md5</a>
- <a
href="http://www.apache.org/dist/syncope/1.2.0-M1/syncope-standalone-1.2.0-M1-distribution.zip.sha1";>sha1</a>
+ <a
href="http://www.apache.org/dist/syncope/1.2.0/syncope-standalone-1.2.0-distribution.zip.asc";>asc</a>
+ <a
href="http://www.apache.org/dist/syncope/1.2.0/syncope-standalone-1.2.0-distribution.zip.md5";>md5</a>
+ <a
href="http://www.apache.org/dist/syncope/1.2.0/syncope-standalone-1.2.0-distribution.zip.sha1";>sha1</a>
</td>
</tr>
<tr>
<td>
- <a
href="http://www.apache.org/dyn/closer.cgi/syncope/1.2.0-M1/syncope-installer-1.2.0-M1-uber.jar";>syncope-installer-1.2.0-M1.jar</a>
+ <a
href="http://www.apache.org/dyn/closer.cgi/syncope/1.2.0/syncope-installer-1.2.0-uber.jar";>syncope-installer-1.2.0.jar</a>
</td>
<td>
- <a
href="http://www.apache.org/dist/syncope/1.2.0-M1/syncope-installer-1.2.0-M1-uber.jar.asc";>asc</a>
- <a
href="http://www.apache.org/dist/syncope/1.2.0-M1/syncope-installer-1.2.0-M1-uber.jar.md5";>md5</a>
- <a
href="http://www.apache.org/dist/syncope/1.2.0-M1/syncope-installer-1.2.0-M1-uber.jar.sha1";>sha1</a>
+ <a
href="http://www.apache.org/dist/syncope/1.2.0/syncope-installer-1.2.0-uber.jar.asc";>asc</a>
+ <a
href="http://www.apache.org/dist/syncope/1.2.0/syncope-installer-1.2.0-uber.jar.md5";>md5</a>
+ <a
href="http://www.apache.org/dist/syncope/1.2.0/syncope-installer-1.2.0-uber.jar.sha1";>sha1</a>
</td>
</tr>
<tr>
<td>
- <a
href="http://www.apache.org/dyn/closer.cgi/syncope/1.2.0-M1/apache-syncope-1.2.0-M1.deb";>apache-syncope-1.2.0-M1.deb</a>
+ <a
href="http://www.apache.org/dyn/closer.cgi/syncope/1.2.0/apache-syncope-1.2.0.deb";>apache-syncope-1.2.0.deb</a>
</td>
<td>
- <a
href="http://www.apache.org/dist/syncope/1.2.0-M1/apache-syncope-1.2.0-M1.deb.asc";>asc</a>
- <a
href="http://www.apache.org/dist/syncope/1.2.0-M1/apache-syncope-1.2.0-M1.deb.md5";>md5</a>
- <a
href="http://www.apache.org/dist/syncope/1.2.0-M1/apache-syncope-1.2.0-M1.deb.sha1";>sha1</a>
+ <a
href="http://www.apache.org/dist/syncope/1.2.0/apache-syncope-1.2.0.deb.asc";>asc</a>
+ <a
href="http://www.apache.org/dist/syncope/1.2.0/apache-syncope-1.2.0.deb.md5";>md5</a>
+ <a
href="http://www.apache.org/dist/syncope/1.2.0/apache-syncope-1.2.0.deb.sha1";>sha1</a>
</td>
</tr>
<tr>
<td>
- <a
href="http://www.apache.org/dyn/closer.cgi/syncope/1.2.0-M1/apache-syncope-console-1.2.0-M1.deb";>apache-syncope-console-1.2.0-M1.deb</a>
+ <a
href="http://www.apache.org/dyn/closer.cgi/syncope/1.2.0/apache-syncope-console-1.2.0.deb";>apache-syncope-console-1.2.0.deb</a>
</td>
<td>
- <a
href="http://www.apache.org/dist/syncope/1.2.0-M1/apache-syncope-console-1.2.0-M1.deb.asc";>asc</a>
- <a
href="http://www.apache.org/dist/syncope/1.2.0-M1/apache-syncope-console-1.2.0-M1.deb.md5";>md5</a>
- <a
href="http://www.apache.org/dist/syncope/1.2.0-M1/apache-syncope-console-1.2.0-M1.deb.sha1";>sha1</a>
+ <a
href="http://www.apache.org/dist/syncope/1.2.0/apache-syncope-console-1.2.0.deb.asc";>asc</a>
+ <a
href="http://www.apache.org/dist/syncope/1.2.0/apache-syncope-console-1.2.0.deb.md5";>md5</a>
+ <a
href="http://www.apache.org/dist/syncope/1.2.0/apache-syncope-console-1.2.0.deb.sha1";>sha1</a>
</td>
</tr>
</tbody>
@@ -191,6 +191,72 @@ under the License.
</section>
<section name="Older Releases">
+ <subsection name="1.2.0-M1 Intermezzo">
+ <p>Release date: Sep 8th, 2014</p>
+ <p>
+ <a
href="https://cwiki.apache.org/confluence/display/SYNCOPE/Intermezzo";>Release
notes</a>
+ </p>
+ <table>
+ <thead>
+ <tr>
+ <th>Artifact</th>
+ <th>Signatures</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>
+ <a
href="http://archive.apache.org/dist/syncope/1.2.0-M1/syncope-1.2.0-M1-source-release.zip";>syncope-1.2.0-M1-source-release.zip</a>
+ </td>
+ <td>
+ <a
href="http://archive.apache.org/dist/syncope/1.2.0-M1/syncope-1.2.0-M1-source-release.zip.asc";>asc</a>
+ <a
href="http://archive.apache.org/dist/syncope/1.2.0-M1/syncope-1.2.0-M1-source-release.zip.md5";>md5</a>
+ <a
href="http://archive.apache.org/dist/syncope/1.2.0-M1/syncope-1.2.0-M1-source-release.zip.sha1";>sha1</a>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a
href="http://archive.apache.org/dist/syncope/1.2.0-M1/syncope-standalone-1.2.0-M1-distribution.zip";>syncope-standalone-1.2.0-M1-distribution.zip</a>
+ </td>
+ <td>
+ <a
href="http://archive.apache.org/dist/syncope/1.2.0-M1/syncope-standalone-1.2.0-M1-distribution.zip.asc";>asc</a>
+ <a
href="http://archive.apache.org/dist/syncope/1.2.0-M1/syncope-standalone-1.2.0-M1-distribution.zip.md5";>md5</a>
+ <a
href="http://archive.apache.org/dist/syncope/1.2.0-M1/syncope-standalone-1.2.0-M1-distribution.zip.sha1";>sha1</a>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a
href="http://archive.apache.org/dist/syncope/1.2.0-M1/syncope-installer-1.2.0-M1-uber.jar";>syncope-installer-1.2.0-M1.jar</a>
+ </td>
+ <td>
+ <a
href="http://archive.apache.org/dist/syncope/1.2.0-M1/syncope-installer-1.2.0-M1-uber.jar.asc";>asc</a>
+ <a
href="http://archive.apache.org/dist/syncope/1.2.0-M1/syncope-installer-1.2.0-M1-uber.jar.md5";>md5</a>
+ <a
href="http://archive.apache.org/dist/syncope/1.2.0-M1/syncope-installer-1.2.0-M1-uber.jar.sha1";>sha1</a>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a
href="http://archive.apache.org/dist/syncope/1.2.0-M1/apache-syncope-1.2.0-M1.deb";>apache-syncope-1.2.0-M1.deb</a>
+ </td>
+ <td>
+ <a
href="http://archive.apache.org/dist/syncope/1.2.0-M1/apache-syncope-1.2.0-M1.deb.asc";>asc</a>
+ <a
href="http://archive.apache.org/dist/syncope/1.2.0-M1/apache-syncope-1.2.0-M1.deb.md5";>md5</a>
+ <a
href="http://archive.apache.org/dist/syncope/1.2.0-M1/apache-syncope-1.2.0-M1.deb.sha1";>sha1</a>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a
href="http://archive.apache.org/dist/syncope/1.2.0-M1/apache-syncope-console-1.2.0-M1.deb";>apache-syncope-console-1.2.0-M1.deb</a>
+ </td>
+ <td>
+ <a
href="http://archive.apache.org/dist/syncope/1.2.0-M1/apache-syncope-console-1.2.0-M1.deb.asc";>asc</a>
+ <a
href="http://archive.apache.org/dist/syncope/1.2.0-M1/apache-syncope-console-1.2.0-M1.deb.md5";>md5</a>
+ <a
href="http://archive.apache.org/dist/syncope/1.2.0-M1/apache-syncope-console-1.2.0-M1.deb.sha1";>sha1</a>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </subsection>
<subsection name="1.1.7 Ad libitum">
<p>Release date: Apr 11th, 2014</p>
<p>
Modified: syncope/trunk/src/site/xdoc/release-process.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/src/site/xdoc/release-process.xml?rev=1629821&r1=1629820&r2=1629821&view=diff
==============================================================================
--- syncope/trunk/src/site/xdoc/release-process.xml (original)
+++ syncope/trunk/src/site/xdoc/release-process.xml Tue Oct 7 08:14:27 2014
@@ -271,7 +271,7 @@ mvn -P site -Dsite.deploymentBaseUrl=fil
cd common
mvn -P offline-doc
-cd ../../site/<version>
+cd ../../../site/<version>
rm -rf syncope-* project-reports.html apidocs/1.html
# if releasing from 1_2_X
@@ -498,7 +498,7 @@ svn commit -m "Cleaning up older release
<source><![CDATA[
svn co https://svn.apache.org/repos/asf/syncope/site/
cd site
-svn rm *.html apidocs css images img js
+svn rm *.html apidocs rest css images img js
svn mv <version>/* .
svn rm <version>
svn commit -m "Promoting the staging site"]]></source>
