You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by mf...@apache.org on 2012/06/11 13:46:38 UTC
svn commit: r1348807 - in /rave/branches/model_interfaces:
rave-components/rave-core/src/main/java/org/apache/rave/portal/model/
rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/
rave-components/rave-core/src/main/java/or...
Author: mfranklin
Date: Mon Jun 11 11:46:37 2012
New Revision: 1348807
URL: http://svn.apache.org/viewvc?rev=1348807&view=rev
Log:
Refactored Authority RAVE-664
Added:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Authority.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaAuthority.java
- copied, changed from r1348769, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Authority.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaAuthorityConverter.java
- copied, changed from r1348769, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaRegionWidgetPreferenceConverter.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/AuthorityImpl.java
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaAuthorityConverterTest.java
- copied, changed from r1348769, rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaRegionWidgetPreferenceConverterTest.java
Modified:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/User.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/AuthorityRepository.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/impl/JpaAuthorityRepository.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/AuthorityService.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/resources/META-INF/persistence.xml
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/AuthorityTest.java
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/TagTest.java
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/UserTest.java
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaConverterTest.java
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/repository/impl/JpaAuthorityRepositoryTest.java
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultAuthorityServiceTest.java
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultNewAccountServiceTest.java
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultUserServiceTest.java
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/UserController.java
rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/UserControllerTest.java
rave/branches/model_interfaces/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/userdetail.jsp
Added: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Authority.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Authority.java?rev=1348807&view=auto
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Authority.java (added)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Authority.java Mon Jun 11 11:46:37 2012
@@ -0,0 +1,29 @@
+package org.apache.rave.portal.model;
+
+import org.springframework.security.core.GrantedAuthority;
+
+import java.util.Collection;
+
+/**
+ * Created with IntelliJ IDEA.
+ * User: mfranklin
+ * Date: 6/11/12
+ * Time: 5:40 AM
+ * To change this template use File | Settings | File Templates.
+ */
+public interface Authority extends GrantedAuthority {
+ @Override
+ String getAuthority();
+
+ void setAuthority(String authority);
+
+ boolean isDefaultForNewUser();
+
+ void setDefaultForNewUser(boolean defaultForNewUser);
+
+ Collection<User> getUsers();
+
+ void addUser(User user);
+
+ void removeUser(User user);
+}
Copied: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaAuthority.java (from r1348769, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Authority.java)
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaAuthority.java?p2=rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaAuthority.java&p1=rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Authority.java&r1=1348769&r2=1348807&rev=1348807&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Authority.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaAuthority.java Mon Jun 11 11:46:37 2012
@@ -34,12 +34,12 @@ import java.util.Collection;
@Table(name = "granted_authority")
@Access(AccessType.FIELD)
@NamedQueries({
- @NamedQuery(name = Authority.GET_BY_AUTHORITY_NAME, query = "SELECT a FROM Authority a WHERE a.authority = :authority"),
- @NamedQuery(name = Authority.GET_ALL, query = "SELECT a FROM Authority a"),
- @NamedQuery(name = Authority.GET_ALL_DEFAULT, query = "SELECT a FROM Authority a WHERE a.defaultForNewUser = true"),
- @NamedQuery(name = Authority.COUNT_ALL, query = "SELECT COUNT(a) FROM Authority a")
+ @NamedQuery(name = JpaAuthority.GET_BY_AUTHORITY_NAME, query = "SELECT a FROM JpaAuthority a WHERE a.authority = :authority"),
+ @NamedQuery(name = JpaAuthority.GET_ALL, query = "SELECT a FROM JpaAuthority a"),
+ @NamedQuery(name = JpaAuthority.GET_ALL_DEFAULT, query = "SELECT a FROM JpaAuthority a WHERE a.defaultForNewUser = true"),
+ @NamedQuery(name = JpaAuthority.COUNT_ALL, query = "SELECT COUNT(a) FROM JpaAuthority a")
})
-public class Authority implements GrantedAuthority, BasicEntity, Serializable {
+public class JpaAuthority implements BasicEntity, Serializable, Authority {
private static final long serialVersionUID = 463209366149842862L;
@@ -70,7 +70,7 @@ public class Authority implements Grante
/**
* Default constructor, needed for JPA
*/
- public Authority() {
+ public JpaAuthority() {
this.users = new ArrayList<User>();
}
@@ -89,22 +89,27 @@ public class Authority implements Grante
return authority;
}
+ @Override
public void setAuthority(String authority) {
this.authority = authority;
}
+ @Override
public boolean isDefaultForNewUser() {
return defaultForNewUser;
}
+ @Override
public void setDefaultForNewUser(boolean defaultForNewUser) {
this.defaultForNewUser = defaultForNewUser;
}
+ @Override
public Collection<User> getUsers() {
return users;
}
+ @Override
public void addUser(User user) {
if (!users.contains(user)) {
users.add(user);
@@ -114,6 +119,7 @@ public class Authority implements Grante
}
}
+ @Override
public void removeUser(User user) {
if (users.contains(user)) {
users.remove(user);
@@ -138,7 +144,7 @@ public class Authority implements Grante
return false;
}
- Authority authority = (Authority) o;
+ JpaAuthority authority = (JpaAuthority) o;
if (entityId != null ? !entityId.equals(authority.entityId) : authority.entityId != null) {
return false;
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/User.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/User.java?rev=1348807&r1=1348806&r2=1348807&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/User.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/User.java Mon Jun 11 11:46:37 2012
@@ -115,7 +115,7 @@ public class User extends JpaPerson impl
@JoinColumn(name = "user_id", referencedColumnName = "entity_id"),
inverseJoinColumns =
@JoinColumn(name = "authority_id", referencedColumnName = "entity_id"))
- private Collection<Authority> authorities;
+ private Collection<JpaAuthority> authorities;
public User() {
this(null, null);
@@ -129,7 +129,7 @@ public class User extends JpaPerson impl
super();
this.entityId = entityId;
this.username = username;
- this.authorities = new ArrayList<Authority>();
+ this.authorities = new ArrayList<JpaAuthority>();
}
/**
@@ -155,8 +155,9 @@ public class User extends JpaPerson impl
}
public void addAuthority(Authority authority) {
- if (!authorities.contains(authority)) {
- authorities.add(authority);
+ JpaAuthority converted = JpaConverter.getInstance().convert(authority, Authority.class);
+ if (!authorities.contains(converted)) {
+ authorities.add(converted);
}
if (!authority.getUsers().contains(this)) {
authority.addUser(this);
@@ -164,13 +165,17 @@ public class User extends JpaPerson impl
}
public void removeAuthority(Authority authority) {
- if (authorities.contains(authority)) {
- authorities.remove(authority);
+ JpaAuthority converted = JpaConverter.getInstance().convert(authority, Authority.class);
+ if (authorities.contains(converted)) {
+ authorities.remove(converted);
}
}
public void setAuthorities(Collection<Authority> newAuthorities) {
- this.authorities = newAuthorities;
+ this.getAuthorities().clear();
+ if(newAuthorities != null) {
+ this.getAuthorities().addAll(newAuthorities);
+ }
}
/**
@@ -299,7 +304,7 @@ public class User extends JpaPerson impl
@PreRemove
public void preRemove() {
- for (Authority authority : authorities) {
+ for (JpaAuthority authority : authorities) {
authority.removeUser(this);
}
this.authorities = Collections.emptyList();
@@ -338,7 +343,7 @@ public class User extends JpaPerson impl
sb.append(", openId='").append(openId).append('\'');
sb.append(", authorities=[");
boolean first=true;
- for (Authority a : authorities) {
+ for (JpaAuthority a : authorities) {
if (!first) {
sb.append(',');
}
Copied: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaAuthorityConverter.java (from r1348769, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaRegionWidgetPreferenceConverter.java)
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaAuthorityConverter.java?p2=rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaAuthorityConverter.java&p1=rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaRegionWidgetPreferenceConverter.java&r1=1348769&r2=1348807&rev=1348807&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaRegionWidgetPreferenceConverter.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaAuthorityConverter.java Mon Jun 11 11:46:37 2012
@@ -19,8 +19,8 @@
package org.apache.rave.portal.model.conversion;
import org.apache.rave.model.ModelConverter;
-import org.apache.rave.portal.model.JpaRegionWidgetPreference;
-import org.apache.rave.portal.model.RegionWidgetPreference;
+import org.apache.rave.portal.model.JpaAuthority;
+import org.apache.rave.portal.model.Authority;
import org.springframework.stereotype.Component;
import javax.persistence.EntityManager;
@@ -30,39 +30,37 @@ import javax.persistence.TypedQuery;
import static org.apache.rave.persistence.jpa.util.JpaUtil.getSingleResult;
@Component
-public class JpaRegionWidgetPreferenceConverter implements ModelConverter<RegionWidgetPreference, JpaRegionWidgetPreference> {
+public class JpaAuthorityConverter implements ModelConverter<Authority, JpaAuthority> {
@PersistenceContext
private EntityManager manager;
@Override
- public Class<RegionWidgetPreference> getSourceType() {
- return RegionWidgetPreference.class;
+ public Class<Authority> getSourceType() {
+ return Authority.class;
}
@Override
- public JpaRegionWidgetPreference convert(RegionWidgetPreference source) {
- return source instanceof JpaRegionWidgetPreference ? (JpaRegionWidgetPreference) source : createEntity(source);
+ public JpaAuthority convert(Authority source) {
+ return source instanceof JpaAuthority ? (JpaAuthority) source : createEntity(source);
}
- private JpaRegionWidgetPreference createEntity(RegionWidgetPreference source) {
- JpaRegionWidgetPreference converted = null;
+ private JpaAuthority createEntity(Authority source) {
+ JpaAuthority converted = null;
if (source != null) {
- TypedQuery<JpaRegionWidgetPreference> query = manager.createNamedQuery(JpaRegionWidgetPreference.FIND_BY_REGION_WIDGET_AND_NAME, JpaRegionWidgetPreference.class);
- query.setParameter(JpaRegionWidgetPreference.NAME_PARAM, source.getName());
- query.setParameter(JpaRegionWidgetPreference.REGION_WIDGET_ID, source.getRegionWidgetId());
+ TypedQuery<JpaAuthority> query = manager.createNamedQuery(JpaAuthority.GET_BY_AUTHORITY_NAME, JpaAuthority.class);
+ query.setParameter(JpaAuthority.PARAM_AUTHORITY_NAME, source.getAuthority());
converted = getSingleResult(query.getResultList());
if (converted == null) {
- converted = new JpaRegionWidgetPreference();
+ converted = new JpaAuthority();
}
updateProperties(source, converted);
}
return converted;
}
- private void updateProperties(RegionWidgetPreference source, JpaRegionWidgetPreference converted) {
- converted.setName(source.getName());
- converted.setRegionWidgetId(source.getRegionWidgetId());
- converted.setValue(source.getValue());
+ private void updateProperties(Authority source, JpaAuthority converted) {
+ converted.setDefaultForNewUser(source.isDefaultForNewUser());
+ converted.setAuthority(source.getAuthority());
}
}
Added: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/AuthorityImpl.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/AuthorityImpl.java?rev=1348807&view=auto
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/AuthorityImpl.java (added)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/AuthorityImpl.java Mon Jun 11 11:46:37 2012
@@ -0,0 +1,75 @@
+package org.apache.rave.portal.model.impl;
+
+import org.apache.rave.portal.model.Authority;
+import org.apache.rave.portal.model.User;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+public class AuthorityImpl implements Authority {
+
+ private String authority;
+ private Collection<User> users;
+ private boolean defaultForNewUser;
+
+ public AuthorityImpl(){
+ this.users = new ArrayList<User>();
+ }
+
+ @Override
+ public String getAuthority() {
+ return authority;
+ }
+
+ @Override
+ public void setAuthority(String authority) {
+ this.authority = authority;
+ }
+
+ @Override
+ public Collection<User> getUsers() {
+ return users;
+ }
+
+ @Override
+ public void addUser(User user) {
+ this.users.add(user);
+ }
+
+ @Override
+ public void removeUser(User user) {
+ this.users.remove(user);
+ }
+
+ @Override
+ public boolean isDefaultForNewUser() {
+ return defaultForNewUser;
+ }
+
+ @Override
+ public void setDefaultForNewUser(boolean defaultForNewUser) {
+ this.defaultForNewUser = defaultForNewUser;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (!(o instanceof AuthorityImpl)) return false;
+
+ AuthorityImpl authority1 = (AuthorityImpl) o;
+
+ if (defaultForNewUser != authority1.defaultForNewUser) return false;
+ if (authority != null ? !authority.equals(authority1.authority) : authority1.authority != null) return false;
+ if (users != null ? !users.equals(authority1.users) : authority1.users != null) return false;
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ int result = authority != null ? authority.hashCode() : 0;
+ result = 31 * result + (users != null ? users.hashCode() : 0);
+ result = 31 * result + (defaultForNewUser ? 1 : 0);
+ return result;
+ }
+}
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/AuthorityRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/AuthorityRepository.java?rev=1348807&r1=1348806&r2=1348807&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/AuthorityRepository.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/AuthorityRepository.java Mon Jun 11 11:46:37 2012
@@ -25,12 +25,12 @@ import org.apache.rave.portal.model.Auth
import java.util.List;
/**
- * Repository interface for {@link org.apache.rave.portal.model.Authority}
+ * Repository interface for {@link org.apache.rave.portal.model.JpaAuthority}
*/
public interface AuthorityRepository extends Repository<Authority> {
/**
- * Finds the {@link Authority} by its name
+ * Finds the {@link org.apache.rave.portal.model.JpaAuthority} by its name
*
* @param authorityName (unique) name of the Authority
* @return Authority if it can be found, otherwise {@literal null}
@@ -38,12 +38,12 @@ public interface AuthorityRepository ext
Authority getByAuthority(String authorityName);
/**
- * @return a List of all {@link Authority}'s.
+ * @return a List of all {@link org.apache.rave.portal.model.JpaAuthority}'s.
*/
List<Authority> getAll();
/**
- * @return a List of all default {@link Authority}'s.
+ * @return a List of all default {@link org.apache.rave.portal.model.JpaAuthority}'s.
*/
List<Authority> getAllDefault();
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/impl/JpaAuthorityRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/impl/JpaAuthorityRepository.java?rev=1348807&r1=1348806&r2=1348807&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/impl/JpaAuthorityRepository.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/impl/JpaAuthorityRepository.java Mon Jun 11 11:46:37 2012
@@ -19,51 +19,80 @@
package org.apache.rave.portal.repository.impl;
-import org.apache.rave.persistence.jpa.AbstractJpaRepository;
import org.apache.rave.portal.model.Authority;
+import org.apache.rave.portal.model.JpaAuthority;
+import org.apache.rave.portal.model.conversion.JpaAuthorityConverter;
import org.apache.rave.portal.repository.AuthorityRepository;
+import org.apache.rave.util.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Repository;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
import javax.persistence.Query;
import javax.persistence.TypedQuery;
import java.util.List;
import static org.apache.rave.persistence.jpa.util.JpaUtil.getSingleResult;
+import static org.apache.rave.persistence.jpa.util.JpaUtil.saveOrUpdate;
/**
* JPA implementation for {@link org.apache.rave.portal.repository.AuthorityRepository}
*/
@Repository
-public class JpaAuthorityRepository extends AbstractJpaRepository<Authority>
- implements AuthorityRepository {
+public class JpaAuthorityRepository implements AuthorityRepository {
+
+ @PersistenceContext
+ private EntityManager manager;
+
+ @Autowired
+ private JpaAuthorityConverter converter;
- public JpaAuthorityRepository() {
- super(Authority.class);
- }
@Override
public Authority getByAuthority(String authorityName) {
- TypedQuery<Authority> query = manager.createNamedQuery(Authority.GET_BY_AUTHORITY_NAME, Authority.class);
- query.setParameter(Authority.PARAM_AUTHORITY_NAME, authorityName);
+ TypedQuery<JpaAuthority> query = manager.createNamedQuery(JpaAuthority.GET_BY_AUTHORITY_NAME, JpaAuthority.class);
+ query.setParameter(JpaAuthority.PARAM_AUTHORITY_NAME, authorityName);
return getSingleResult(query.getResultList());
}
@Override
public List<Authority> getAll() {
- TypedQuery<Authority> query = manager.createNamedQuery(Authority.GET_ALL, Authority.class);
- return query.getResultList();
+ TypedQuery<JpaAuthority> query = manager.createNamedQuery(JpaAuthority.GET_ALL, JpaAuthority.class);
+ return CollectionUtils.<Authority>toBaseTypedList(query.getResultList());
}
@Override
public List<Authority> getAllDefault() {
- TypedQuery<Authority> query = manager.createNamedQuery(Authority.GET_ALL_DEFAULT, Authority.class);
- return query.getResultList();
+ TypedQuery<JpaAuthority> query = manager.createNamedQuery(JpaAuthority.GET_ALL_DEFAULT, JpaAuthority.class);
+ return CollectionUtils.<Authority>toBaseTypedList(query.getResultList());
}
@Override
public int getCountAll() {
- Query query = manager.createNamedQuery(Authority.COUNT_ALL);
+ Query query = manager.createNamedQuery(JpaAuthority.COUNT_ALL);
Number countResult = (Number) query.getSingleResult();
return countResult.intValue();
}
+
+ @Override
+ public Class<? extends Authority> getType() {
+ return JpaAuthority.class;
+ }
+
+ @Override
+ public Authority get(long id) {
+ return manager.find(JpaAuthority.class, id);
+ }
+
+ @Override
+ public Authority save(Authority item) {
+ JpaAuthority authority = converter.convert(item);
+ return saveOrUpdate(authority.getEntityId(), manager, authority);
+ }
+
+ @Override
+ public void delete(Authority item) {
+ manager.remove(converter.convert(item));
+ }
}
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/AuthorityService.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/AuthorityService.java?rev=1348807&r1=1348806&r2=1348807&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/AuthorityService.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/AuthorityService.java Mon Jun 11 11:46:37 2012
@@ -25,7 +25,7 @@ import org.apache.rave.portal.model.util
public interface AuthorityService {
/**
- * @param entityId unique identifier of the {@link Authority}
+ * @param entityId unique identifier of the {@link org.apache.rave.portal.model.JpaAuthority}
* @return Authority if it can be found, otherwise {@literal null}
*/
Authority getAuthorityById(long entityId);
@@ -37,13 +37,13 @@ public interface AuthorityService {
Authority getAuthorityByName(String authorityName);
/**
- * @return a {@link SearchResult} with all {@link Authority}'s
+ * @return a {@link SearchResult} with all {@link org.apache.rave.portal.model.JpaAuthority}'s
*/
SearchResult<Authority> getAllAuthorities();
/**
* @return a {@link SearchResult} with the list of all default
- * {@link Authority}'s
+ * {@link org.apache.rave.portal.model.JpaAuthority}'s
*/
SearchResult<Authority> getDefaultAuthorities();
}
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/resources/META-INF/persistence.xml?rev=1348807&r1=1348806&r2=1348807&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/resources/META-INF/persistence.xml (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/resources/META-INF/persistence.xml Mon Jun 11 11:46:37 2012
@@ -32,7 +32,7 @@
<class>org.apache.rave.portal.model.JpaWidgetComment</class>
<class>org.apache.rave.portal.model.JpaWidgetRating</class>
<class>org.apache.rave.portal.model.JpaPageLayout</class>
- <class>org.apache.rave.portal.model.Authority</class>
+ <class>org.apache.rave.portal.model.JpaAuthority</class>
<class>org.apache.rave.portal.model.Tag</class>
<class>org.apache.rave.portal.model.WidgetTag</class>
<class>org.apache.rave.portal.model.JpaPortalPreference</class>
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/AuthorityTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/AuthorityTest.java?rev=1348807&r1=1348806&r2=1348807&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/AuthorityTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/AuthorityTest.java Mon Jun 11 11:46:37 2012
@@ -25,13 +25,13 @@ import org.springframework.security.core
import static junit.framework.Assert.assertEquals;
/**
- * Test for {@link Authority}
+ * Test for {@link JpaAuthority}
*/
public class AuthorityTest {
@Test
public void testAuthority() throws Exception {
- GrantedAuthority grantedAuthority = new Authority();
+ GrantedAuthority grantedAuthority = new JpaAuthority();
((Authority) grantedAuthority).setAuthority("user");
assertEquals("user", grantedAuthority.getAuthority());
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/TagTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/TagTest.java?rev=1348807&r1=1348806&r2=1348807&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/TagTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/TagTest.java Mon Jun 11 11:46:37 2012
@@ -24,7 +24,7 @@ import org.junit.Test;
import static junit.framework.Assert.assertEquals;
/**
- * Test for {@link org.apache.rave.portal.model.Authority}
+ * Test for {@link JpaAuthority}
*/
public class TagTest {
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/UserTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/UserTest.java?rev=1348807&r1=1348806&r2=1348807&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/UserTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/UserTest.java Mon Jun 11 11:46:37 2012
@@ -108,7 +108,7 @@ public class UserTest {
User user = new User(123L, "DummyUser");
Collection<Authority> authorities = new ArrayList<Authority>();
- Authority authority = new Authority();
+ JpaAuthority authority = new JpaAuthority();
authority.setEntityId(456L);
authority.setAuthority("DummyAuthority");
authority.addUser(user);
Copied: rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaAuthorityConverterTest.java (from r1348769, rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaRegionWidgetPreferenceConverterTest.java)
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaAuthorityConverterTest.java?p2=rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaAuthorityConverterTest.java&p1=rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaRegionWidgetPreferenceConverterTest.java&r1=1348769&r2=1348807&rev=1348807&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaRegionWidgetPreferenceConverterTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaAuthorityConverterTest.java Mon Jun 11 11:46:37 2012
@@ -1,8 +1,8 @@
package org.apache.rave.portal.model.conversion;
-import org.apache.rave.portal.model.JpaRegionWidgetPreference;
-import org.apache.rave.portal.model.RegionWidgetPreference;
-import org.apache.rave.portal.model.impl.RegionWidgetPreferenceImpl;
+import org.apache.rave.portal.model.JpaAuthority;
+import org.apache.rave.portal.model.Authority;
+import org.apache.rave.portal.model.impl.AuthorityImpl;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -15,10 +15,10 @@ import static org.junit.Assert.assertTha
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(locations = {"classpath:test-applicationContext.xml", "classpath:test-dataContext.xml"})
-public class JpaRegionWidgetPreferenceConverterTest {
+public class JpaAuthorityConverterTest {
@Autowired
- JpaRegionWidgetPreferenceConverter converter;
+ JpaAuthorityConverter converter;
@Before
public void setup() {
@@ -27,25 +27,25 @@ public class JpaRegionWidgetPreferenceCo
@Test
public void testNoConversion() {
- JpaRegionWidgetPreference template = new JpaRegionWidgetPreference();
+ JpaAuthority template = new JpaAuthority();
assertThat(converter.convert(template), is(sameInstance(template)));
}
@Test
public void nullConversion() {
- RegionWidgetPreference template = null;
+ Authority template = null;
assertThat(converter.convert(template), is(nullValue()));
}
@Test
public void convertValid() {
- RegionWidgetPreference template = new RegionWidgetPreferenceImpl();
+ Authority template = new AuthorityImpl();
- JpaRegionWidgetPreference jpaTemplate = converter.convert(template);
+ JpaAuthority jpaTemplate = converter.convert(template);
assertThat(jpaTemplate, is(not(sameInstance(template))));
- assertThat(jpaTemplate, is(instanceOf(JpaRegionWidgetPreference.class)));
+ assertThat(jpaTemplate, is(instanceOf(JpaAuthority.class)));
//TODO: Add coverage for all methods
}
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaConverterTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaConverterTest.java?rev=1348807&r1=1348806&r2=1348807&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaConverterTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaConverterTest.java Mon Jun 11 11:46:37 2012
@@ -5,8 +5,13 @@ import org.apache.rave.portal.model.*;
import org.apache.rave.portal.model.impl.AddressImpl;
import org.apache.rave.portal.model.impl.GroupImpl;
import org.apache.rave.portal.model.impl.PersonImpl;
+import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import java.lang.reflect.Field;
import java.util.ArrayList;
@@ -14,12 +19,20 @@ import java.util.List;
import static org.easymock.EasyMock.*;
import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.CoreMatchers.not;
import static org.junit.Assert.assertThat;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = {"classpath:test-dataContext.xml", "classpath:test-applicationContext.xml"})
public class JpaConverterTest {
private List<ModelConverter> converters;
+ //Inject the list of converters from the context to work around any issues that arise during testing
+ @Autowired
+ private List<ModelConverter> originalConverters;
+
@Before
public void setup() throws NoSuchFieldException, IllegalAccessException {
ModelConverter personConverter = createMock(ModelConverter.class);
@@ -32,6 +45,11 @@ public class JpaConverterTest {
expect(addressConverter.convert(isA(AddressImpl.class))).andReturn(new JpaAddress());
replay(addressConverter);
+ ModelConverter pageLayoutConverter = createMock(ModelConverter.class);
+ expect(pageLayoutConverter.getSourceType()).andReturn(Address.class).anyTimes();
+ expect(pageLayoutConverter.convert(isA(PageLayout.class))).andReturn(new JpaPageLayout());
+ replay(pageLayoutConverter);
+
List<ModelConverter> converters = new ArrayList<ModelConverter>();
converters.add(personConverter);
converters.add(addressConverter);
@@ -41,6 +59,12 @@ public class JpaConverterTest {
instance.set(null, null);
}
+ @After
+ public void tearDown() {
+ //Replace the instance of converters with the one from the context
+ new JpaConverter(originalConverters);
+ }
+
@Test(expected=IllegalStateException.class)
public void noInstance() {
JpaConverter.getInstance();
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/repository/impl/JpaAuthorityRepositoryTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/repository/impl/JpaAuthorityRepositoryTest.java?rev=1348807&r1=1348806&r2=1348807&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/repository/impl/JpaAuthorityRepositoryTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/repository/impl/JpaAuthorityRepositoryTest.java Mon Jun 11 11:46:37 2012
@@ -20,7 +20,10 @@
package org.apache.rave.portal.repository.impl;
import org.apache.rave.portal.model.Authority;
+import org.apache.rave.portal.model.JpaAuthority;
import org.apache.rave.portal.model.User;
+import org.apache.rave.portal.repository.AuthorityRepository;
+import org.apache.rave.portal.repository.UserRepository;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -33,10 +36,8 @@ import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import java.util.List;
-import org.apache.rave.portal.repository.AuthorityRepository;
-import org.apache.rave.portal.repository.UserRepository;
+import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.*;
-import static org.hamcrest.CoreMatchers.*;
/**
*
@@ -59,7 +60,7 @@ public class JpaAuthorityRepositoryTest
@Test
public void getById_validId() {
- final Authority authority = repository.get(VALID_ID);
+ final JpaAuthority authority = (JpaAuthority)repository.get(VALID_ID);
assertNotNull(authority);
assertEquals(VALID_ID, authority.getEntityId());
}
@@ -94,7 +95,7 @@ public class JpaAuthorityRepositoryTest
@Test
public void addOrDeleteAuthorityDoesNotAffectUser() {
final String authorityName = "guest";
- Authority authority = new Authority();
+ Authority authority = new JpaAuthority();
authority.setAuthority(authorityName);
User user = userRepository.get(1L);
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultAuthorityServiceTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultAuthorityServiceTest.java?rev=1348807&r1=1348806&r2=1348807&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultAuthorityServiceTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultAuthorityServiceTest.java Mon Jun 11 11:46:37 2012
@@ -20,9 +20,9 @@
package org.apache.rave.portal.service.impl;
import org.apache.rave.portal.model.Authority;
+import org.apache.rave.portal.model.JpaAuthority;
import org.apache.rave.portal.model.util.SearchResult;
import org.apache.rave.portal.repository.AuthorityRepository;
-import org.apache.rave.portal.service.impl.DefaultAuthorityService;
import org.junit.Before;
import org.junit.Test;
@@ -75,7 +75,7 @@ public class DefaultAuthorityServiceTest
}
private static Authority createAuthority() {
- Authority authority = new Authority();
+ JpaAuthority authority = new JpaAuthority();
authority.setAuthority("FOO");
final long entityId = 123L;
authority.setEntityId(entityId);
@@ -84,7 +84,7 @@ public class DefaultAuthorityServiceTest
@Test
public void getAuthorityById_NotFound() {
- Authority authority = new Authority();
+ JpaAuthority authority = new JpaAuthority();
authority.setAuthority("BAR");
final long entityId = 456L;
authority.setEntityId(entityId);
@@ -100,9 +100,9 @@ public class DefaultAuthorityServiceTest
@Test
public void allAuthorities() {
List<Authority> authorities = new ArrayList<Authority>();
- Authority foo = new Authority();
+ Authority foo = new JpaAuthority();
foo.setAuthority("FOO");
- Authority bar = new Authority();
+ Authority bar = new JpaAuthority();
bar.setAuthority("BAR");
authorities.add(foo);
authorities.add(bar);
@@ -120,10 +120,10 @@ public class DefaultAuthorityServiceTest
@Test
public void test_getAllDefault() {
List<Authority> authorities = new ArrayList<Authority>();
- Authority foo = new Authority();
+ Authority foo = new JpaAuthority();
foo.setAuthority("FOO");
foo.setDefaultForNewUser(true);
- Authority bar = new Authority();
+ Authority bar = new JpaAuthority();
bar.setAuthority("BAR");
bar.setDefaultForNewUser(true);
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultNewAccountServiceTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultNewAccountServiceTest.java?rev=1348807&r1=1348806&r2=1348807&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultNewAccountServiceTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultNewAccountServiceTest.java Mon Jun 11 11:46:37 2012
@@ -19,17 +19,8 @@
package org.apache.rave.portal.service.impl;
-import static junit.framework.Assert.fail;
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.expectLastCall;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
-
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.rave.portal.model.Authority;
+import org.apache.rave.portal.model.JpaAuthority;
import org.apache.rave.portal.model.JpaPageLayout;
import org.apache.rave.portal.model.User;
import org.apache.rave.portal.model.util.SearchResult;
@@ -45,6 +36,12 @@ import org.springframework.security.core
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.test.util.ReflectionTestUtils;
+import java.util.ArrayList;
+import java.util.List;
+
+import static junit.framework.Assert.fail;
+import static org.easymock.EasyMock.*;
+
/**
* Test class for {@link org.apache.rave.portal.service.impl.DefaultNewAccountService}
*/
@@ -82,9 +79,9 @@ public class DefaultNewAccountServiceTes
validPageLayout.setNumberOfRegions(4L);
validPageLayout.setCode(VALID_LAYOUT_CODE);
- Authority role1 = new Authority();
+ Authority role1 = new JpaAuthority();
role1.setAuthority("DEFAULT_ROLE1");
- Authority role2 = new Authority();
+ Authority role2 = new JpaAuthority();
role2.setAuthority("DEFAULT_ROLE2");
validAuthorityList = new ArrayList<Authority>();
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultUserServiceTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultUserServiceTest.java?rev=1348807&r1=1348806&r2=1348807&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultUserServiceTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultUserServiceTest.java Mon Jun 11 11:46:37 2012
@@ -131,7 +131,7 @@ public class DefaultUserServiceTest {
@Test
public void setAuthenticatedUser_validRole() {
final User authUser = new User(USER_ID);
- final Authority userRole = new Authority();
+ final Authority userRole = new JpaAuthority();
userRole.setAuthority("admin");
authUser.addAuthority(userRole);
expect(userRepository.get(USER_ID)).andReturn(authUser).anyTimes();
Modified: rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/UserController.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/UserController.java?rev=1348807&r1=1348806&r2=1348807&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/UserController.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/UserController.java Mon Jun 11 11:46:37 2012
@@ -27,6 +27,7 @@ import static org.apache.rave.portal.web
import java.beans.PropertyEditorSupport;
import org.apache.rave.portal.model.Authority;
+import org.apache.rave.portal.model.JpaAuthority;
import org.apache.rave.portal.model.PortalPreference;
import org.apache.rave.portal.model.User;
import org.apache.rave.portal.model.util.SearchResult;
@@ -95,7 +96,7 @@ public class UserController {
@InitBinder(value = {"user"})
public void initBinder(WebDataBinder dataBinder) {
dataBinder.registerCustomEditor(GrantedAuthority.class, new AuthorityEditor());
- dataBinder.registerCustomEditor(Authority.class, new AuthorityEditor());
+ dataBinder.registerCustomEditor(JpaAuthority.class, new AuthorityEditor());
dataBinder.setDisallowedFields("entityId", "username", "password", "confirmPassword");
}
@@ -254,7 +255,7 @@ public class UserController {
/**
- * Mapping between the submitted form value and an {@link Authority}
+ * Mapping between the submitted form value and an {@link org.apache.rave.portal.model.JpaAuthority}
*/
private class AuthorityEditor extends PropertyEditorSupport {
Modified: rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/UserControllerTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/UserControllerTest.java?rev=1348807&r1=1348806&r2=1348807&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/UserControllerTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/UserControllerTest.java Mon Jun 11 11:46:37 2012
@@ -19,20 +19,8 @@
package org.apache.rave.portal.web.controller.admin;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertTrue;
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.createNiceMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.expectLastCall;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
-
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.rave.portal.model.Authority;
+import org.apache.rave.portal.model.JpaAuthority;
import org.apache.rave.portal.model.User;
import org.apache.rave.portal.model.util.SearchResult;
import org.apache.rave.portal.service.AuthorityService;
@@ -53,6 +41,12 @@ import org.springframework.validation.Bi
import org.springframework.web.bind.support.SessionStatus;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+import java.util.ArrayList;
+import java.util.List;
+
+import static junit.framework.Assert.*;
+import static org.easymock.EasyMock.*;
+
/**
* Test for {@link UserController}
*/
@@ -352,9 +346,9 @@ public class UserControllerTest {
private static SearchResult<Authority> createSearchResultWithTwoAuthorities() {
List<Authority> authorities = new ArrayList<Authority>();
- Authority foo = new Authority();
+ Authority foo = new JpaAuthority();
foo.setAuthority("FOO");
- Authority bar = new Authority();
+ Authority bar = new JpaAuthority();
bar.setAuthority("BAR");
authorities.add(foo);
authorities.add(bar);
Modified: rave/branches/model_interfaces/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/userdetail.jsp
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/userdetail.jsp?rev=1348807&r1=1348806&r2=1348807&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/userdetail.jsp (original)
+++ rave/branches/model_interfaces/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/userdetail.jsp Mon Jun 11 11:46:37 2012
@@ -112,7 +112,7 @@
</fieldset>
<fieldset>
<span class="label"><fmt:message key="admin.userdata.authorities"/></span>
- <%--@elvariable id="authorities" type="org.apache.rave.portal.model.util.SearchResult<org.apache.rave.portal.model.Authority>"--%>
+ <%--@elvariable id="authorities" type="org.apache.rave.portal.model.util.SearchResult<org.apache.rave.portal.model.JpaAuthority>"--%>
<ul class="checkboxlist">
<form:checkboxes path="authorities" items="${authorities.resultSet}" itemLabel="authority" itemValue="authority" element="li"/>
</ul>