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 2013/04/18 17:18:03 UTC
svn commit: r1469365 - in /syncope/trunk: ./
core/src/main/java/org/apache/syncope/core/persistence/dao/
core/src/main/java/org/apache/syncope/core/persistence/dao/impl/
src/site/xdoc/
Author: ilgrosso
Date: Thu Apr 18 15:18:03 2013
New Revision: 1469365
URL: http://svn.apache.org/r1469365
Log:
Merge from 1_1_X
Modified:
syncope/trunk/ (props changed)
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/RoleDAO.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/RoleDAOImpl.java
syncope/trunk/pom.xml
syncope/trunk/src/site/xdoc/downloads.xml
syncope/trunk/src/site/xdoc/release-process.xml
Propchange: syncope/trunk/
------------------------------------------------------------------------------
Merged /syncope/branches/1_1_X:r1468809-1469364
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/RoleDAO.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/RoleDAO.java?rev=1469365&r1=1469364&r2=1469365&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/RoleDAO.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/RoleDAO.java Thu Apr 18 15:18:03 2013
@@ -24,9 +24,9 @@ import org.apache.syncope.common.service
import org.apache.syncope.core.persistence.beans.Entitlement;
import org.apache.syncope.core.persistence.beans.ExternalResource;
import org.apache.syncope.core.persistence.beans.membership.Membership;
+import org.apache.syncope.core.persistence.beans.role.RAttrValue;
import org.apache.syncope.core.persistence.beans.role.SyncopeRole;
import org.apache.syncope.core.persistence.beans.user.SyncopeUser;
-import org.apache.syncope.core.persistence.beans.user.UAttrValue;
import org.apache.syncope.core.persistence.validation.entity.InvalidEntityException;
public interface RoleDAO extends AttributableDAO {
@@ -49,9 +49,9 @@ public interface RoleDAO extends Attribu
List<SyncopeRole> findByDerAttrValue(String schemaName, String value) throws InvalidSearchConditionException;
- List<SyncopeRole> findByAttrValue(String schemaName, UAttrValue attrValue);
+ List<SyncopeRole> findByAttrValue(String schemaName, RAttrValue attrValue);
- SyncopeRole findByAttrUniqueValue(String schemaName, UAttrValue attrUniqueValue);
+ SyncopeRole findByAttrUniqueValue(String schemaName, RAttrValue attrUniqueValue);
List<SyncopeRole> findByResource(ExternalResource resource);
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/RoleDAOImpl.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/RoleDAOImpl.java?rev=1469365&r1=1469364&r2=1469365&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/RoleDAOImpl.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/RoleDAOImpl.java Thu Apr 18 15:18:03 2013
@@ -30,9 +30,9 @@ import org.apache.syncope.core.persisten
import org.apache.syncope.core.persistence.beans.Entitlement;
import org.apache.syncope.core.persistence.beans.ExternalResource;
import org.apache.syncope.core.persistence.beans.membership.Membership;
+import org.apache.syncope.core.persistence.beans.role.RAttrValue;
import org.apache.syncope.core.persistence.beans.role.SyncopeRole;
import org.apache.syncope.core.persistence.beans.user.SyncopeUser;
-import org.apache.syncope.core.persistence.beans.user.UAttrValue;
import org.apache.syncope.core.persistence.dao.EntitlementDAO;
import org.apache.syncope.core.persistence.dao.RoleDAO;
import org.apache.syncope.core.persistence.dao.UserDAO;
@@ -192,12 +192,12 @@ public class RoleDAOImpl extends Abstrac
}
@Override
- public List<SyncopeRole> findByAttrValue(final String schemaName, final UAttrValue attrValue) {
+ public List<SyncopeRole> findByAttrValue(final String schemaName, final RAttrValue attrValue) {
return findByAttrValue(schemaName, attrValue, AttributableUtil.getInstance(AttributableType.ROLE));
}
@Override
- public SyncopeRole findByAttrUniqueValue(final String schemaName, final UAttrValue attrUniqueValue) {
+ public SyncopeRole findByAttrUniqueValue(final String schemaName, final RAttrValue attrUniqueValue) {
return (SyncopeRole) findByAttrUniqueValue(schemaName, attrUniqueValue,
AttributableUtil.getInstance(AttributableType.ROLE));
}
Modified: syncope/trunk/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1469365&r1=1469364&r2=1469365&view=diff
==============================================================================
--- syncope/trunk/pom.xml (original)
+++ syncope/trunk/pom.xml Thu Apr 18 15:18:03 2013
@@ -311,7 +311,7 @@ under the License.
<cocoon.version>3.0.0-alpha-3</cocoon.version>
- <wicket.version>6.6.0</wicket.version>
+ <wicket.version>6.7.0</wicket.version>
<groovy.version>2.1.3</groovy.version>
Modified: syncope/trunk/src/site/xdoc/downloads.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/src/site/xdoc/downloads.xml?rev=1469365&r1=1469364&r2=1469365&view=diff
==============================================================================
--- syncope/trunk/src/site/xdoc/downloads.xml (original)
+++ syncope/trunk/src/site/xdoc/downloads.xml Thu Apr 18 15:18:03 2013
@@ -93,8 +93,8 @@ under the License.
</tbody>
</table>
</subsection>
- <subsection name="1.0.7 Espressivo">
- <p>Release date: Mar 26th, 2013</p>
+ <subsection name="1.0.8 Espressivo">
+ <p>Release date: Apr 18th, 2013</p>
<p>
<a href="https://cwiki.apache.org/confluence/display/SYNCOPE/Espressivo">Release notes</a>
</p>
@@ -108,12 +108,12 @@ under the License.
<tbody>
<tr>
<td>
- <a href="http://www.apache.org/dyn/closer.cgi/syncope/1.0.7/syncope-root-1.0.7-source-release.zip">syncope-root-1.0.7-source-release.zip</a>
+ <a href="http://www.apache.org/dyn/closer.cgi/syncope/1.0.8/syncope-root-1.0.8-source-release.zip">syncope-root-1.0.8-source-release.zip</a>
</td>
<td>
- <a href="http://www.apache.org/dist/syncope/1.0.7/syncope-root-1.0.7-source-release.zip.asc">asc</a>
- <a href="http://www.apache.org/dist/syncope/1.0.7/syncope-root-1.0.7-source-release.zip.md5">md5</a>
- <a href="http://www.apache.org/dist/syncope/1.0.7/syncope-root-1.0.7-source-release.zip.sha1">sha1</a>
+ <a href="http://www.apache.org/dist/syncope/1.0.8/syncope-root-1.0.8-source-release.zip.asc">asc</a>
+ <a href="http://www.apache.org/dist/syncope/1.0.8/syncope-root-1.0.8-source-release.zip.md5">md5</a>
+ <a href="http://www.apache.org/dist/syncope/1.0.8/syncope-root-1.0.8-source-release.zip.sha1">sha1</a>
</td>
</tr>
</tbody>
@@ -122,8 +122,8 @@ under the License.
</section>
<section name="Older Releases">
- <subsection name="1.0.6 Espressivo">
- <p>Release date: Feb 27th, 2013</p>
+ <subsection name="1.0.7 Espressivo">
+ <p>Release date: Mar 26th, 2013</p>
<p>
<a href="https://cwiki.apache.org/confluence/display/SYNCOPE/Espressivo">Release notes</a>
</p>
@@ -137,12 +137,12 @@ under the License.
<tbody>
<tr>
<td>
- <a href="http://archive.apache.org/dist/syncope/1.0.6/syncope-root-1.0.6-source-release.zip">syncope-root-1.0.6-source-release.zip</a>
+ <a href="http://archive.apache.org/dist/syncope/1.0.7/syncope-root-1.0.7-source-release.zip">syncope-root-1.0.7-source-release.zip</a>
</td>
<td>
- <a href="http://archive.apache.org/dist/syncope/1.0.6/syncope-root-1.0.6-source-release.zip.asc">asc</a>
- <a href="http://archive.apache.org/dist/syncope/1.0.6/syncope-root-1.0.6-source-release.zip.md5">md5</a>
- <a href="http://archive.apache.org/dist/syncope/1.0.6/syncope-root-1.0.6-source-release.zip.sha1">sha1</a>
+ <a href="http://archive.apache.org/dist/syncope/1.0.7/syncope-root-1.0.7-source-release.zip.asc">asc</a>
+ <a href="http://archive.apache.org/dist/syncope/1.0.7/syncope-root-1.0.7-source-release.zip.md5">md5</a>
+ <a href="http://archive.apache.org/dist/syncope/1.0.7/syncope-root-1.0.7-source-release.zip.sha1">sha1</a>
</td>
</tr>
</tbody>
Modified: syncope/trunk/src/site/xdoc/release-process.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/src/site/xdoc/release-process.xml?rev=1469365&r1=1469364&r2=1469365&view=diff
==============================================================================
--- syncope/trunk/src/site/xdoc/release-process.xml (original)
+++ syncope/trunk/src/site/xdoc/release-process.xml Thu Apr 18 15:18:03 2013
@@ -317,11 +317,9 @@ svn checkout https://svn.apache.org/repo
cd syncope-1_1_X
mvn -P site -Dsite.deploymentBaseUrl=file:///<absolute path to ../site/<version>>
cd ../site/<version>
-rm -rf syncope-console syncope-client syncope-archetype syncope-core syncope-build-tools project-reports.html apidocs/1.html apidocs/1.1
+rm -rf syncope-console syncope-client syncope-archetype syncope-core syncope-build-tools syncope-common syncope-standalone project-reports.html apidocs/1.html apidocs/1.1
cd ..
svn add <version>
-svn copy *.html css images img js <version>
-svn revert <version>/downloads.html
svn copy apidocs/1.1 <version>/apidocs/
svn commit -m "Staging site for release"</source>
</li>