Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils: [115] tags
|
From: <fg...@us...> - 2006-11-14 16:09:54
|
Revision: 115
http://svn.sourceforge.net/openutils/?rev=115&view=rev
Author: fgiust
Date: 2006-11-14 08:09:40 -0800 (Tue, 14 Nov 2006)
Log Message:
-----------
[maven-scm] copy for tag openutils-usermanagement-1.1.1
Added Paths:
-----------
tags/openutils-usermanagement-1.1.1/
tags/openutils-usermanagement-1.1.1/pom.xml
tags/openutils-usermanagement-1.1.1/src/main/java/it/openutils/usermanagement/acegi/HibernateUserDetailsServiceImpl.java
tags/openutils-usermanagement-1.1.1/src/test/java/it/openutils/usermanagement/manager/HibernateUserDetailsServiceTest.java
Removed Paths:
-------------
tags/openutils-usermanagement-1.1.1/pom.xml
tags/openutils-usermanagement-1.1.1/src/main/java/it/openutils/usermanagement/acegi/HibernateUserDetailsServiceImpl.java
tags/openutils-usermanagement-1.1.1/src/test/java/it/openutils/usermanagement/manager/HibernateUserDetailsServiceTest.java
Copied: tags/openutils-usermanagement-1.1.1 (from rev 109, trunk/openutils-usermanagement)
Deleted: tags/openutils-usermanagement-1.1.1/pom.xml
===================================================================
--- trunk/openutils-usermanagement/pom.xml 2006-11-13 21:23:57 UTC (rev 109)
+++ tags/openutils-usermanagement-1.1.1/pom.xml 2006-11-14 16:09:40 UTC (rev 115)
@@ -1,116 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils</artifactId>
- <version>2</version>
- <relativePath>../openutils-parent</relativePath>
- </parent>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-usermanagement</artifactId>
- <packaging>jar</packaging>
- <name>openutils-usermanagement</name>
- <version>1.1-SNAPSHOT</version>
- <description>Usermanagement classes</description>
- <dependencies>
- <dependency>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-spring</artifactId>
- <version>1.0</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-usermanagement-dataobjects</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-bshd5</artifactId>
- <version>1.0.2</version>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-testing</artifactId>
- <version>1.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.0.1</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-annotations</artifactId>
- <version>3.2.0.ga</version>
- </dependency>
- <dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- <version>1.2.1</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <artifactId>xerces</artifactId>
- <groupId>xerces</groupId>
- </exclusion>
- <exclusion>
- <artifactId>xml-apis</artifactId>
- <groupId>xml-apis</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.2</version>
- </dependency>
- <dependency>
- <groupId>org.acegisecurity</groupId>
- <artifactId>acegi-security</artifactId>
- <version>1.0.2</version>
- <exclusions>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-remoting</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jdbc</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-support</artifactId>
- </exclusion>
- <exclusion>
- <groupId>logkit</groupId>
- <artifactId>logkit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>10.1.2.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>dbunit</groupId>
- <artifactId>dbunit</artifactId>
- <version>2.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
Copied: tags/openutils-usermanagement-1.1.1/pom.xml (from rev 114, trunk/openutils-usermanagement/pom.xml)
===================================================================
--- tags/openutils-usermanagement-1.1.1/pom.xml (rev 0)
+++ tags/openutils-usermanagement-1.1.1/pom.xml 2006-11-14 16:09:40 UTC (rev 115)
@@ -0,0 +1,121 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils</artifactId>
+ <version>2</version>
+ <relativePath>../openutils-parent</relativePath>
+ </parent>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-usermanagement</artifactId>
+ <packaging>jar</packaging>
+ <name>openutils-usermanagement</name>
+ <version>1.1.1</version>
+ <description>Usermanagement classes</description>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-spring</artifactId>
+ <version>1.0</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-usermanagement-dataobjects</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-bshd5</artifactId>
+ <version>1.0.2</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-testing</artifactId>
+ <version>1.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-annotations</artifactId>
+ <version>3.2.0.ga</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <version>1.2.1</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>xerces</artifactId>
+ <groupId>xerces</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>xml-apis</artifactId>
+ <groupId>xml-apis</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.acegisecurity</groupId>
+ <artifactId>acegi-security</artifactId>
+ <version>1.0.2</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-remoting</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jdbc</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-support</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>10.1.2.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>dbunit</groupId>
+ <artifactId>dbunit</artifactId>
+ <version>2.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <scm>
+ <connection>scm:svn:https://svn.sourceforge.net/svnroot/openutils/tags/openutils-usermanagement-1.1.1</connection>
+ <developerConnection>scm:svn:https://svn.sourceforge.net/svnroot/openutils/tags/openutils-usermanagement-1.1.1</developerConnection>
+ <url>http://svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-usermanagement-1.1.1</url>
+ </scm>
+</project>
\ No newline at end of file
Deleted: tags/openutils-usermanagement-1.1.1/src/main/java/it/openutils/usermanagement/acegi/HibernateUserDetailsServiceImpl.java
===================================================================
--- trunk/openutils-usermanagement/src/main/java/it/openutils/usermanagement/acegi/HibernateUserDetailsServiceImpl.java 2006-11-13 21:23:57 UTC (rev 109)
+++ tags/openutils-usermanagement-1.1.1/src/main/java/it/openutils/usermanagement/acegi/HibernateUserDetailsServiceImpl.java 2006-11-14 16:09:40 UTC (rev 115)
@@ -1,57 +0,0 @@
-package it.openutils.usermanagement.acegi;
-
-import it.openutils.usermanagement.dao.GroupDAO;
-import it.openutils.usermanagement.dao.UserDAO;
-
-import org.acegisecurity.userdetails.UserDetails;
-import org.acegisecurity.userdetails.UserDetailsService;
-import org.acegisecurity.userdetails.UsernameNotFoundException;
-import org.apache.commons.lang.ArrayUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.dao.DataAccessException;
-
-
-public class HibernateUserDetailsServiceImpl implements UserDetailsService
-{
-
- private Logger log = LoggerFactory.getLogger(getClass());
-
- private UserDAO userDao;
-
- private GroupDAO groupDao;
-
- public void setUserDao(UserDAO userDao)
- {
- this.userDao = userDao;
- }
-
- public void setGroupDAO(GroupDAO groupDao)
- {
- this.groupDao = groupDao;
- }
-
- public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException, DataAccessException
- {
-
- log.debug("Login:: Loading User's Data");
-
- it.openutils.usermanagement.dataobjects.User filter = new it.openutils.usermanagement.dataobjects.User();
- filter.setId(username);
- it.openutils.usermanagement.dataobjects.User user = null;
-
- user = this.userDao.findFilteredFirst(filter);
-
- // warning: user can be null
- if (user != null)
- {
- log.debug("Groups: {}, Roles {}", user.getGroups(), user.getRoles());
- log.debug("Authorities: {}", ArrayUtils.toString(user.getAuthorities()));
- }
-
- log.debug("Login:: Returning User to Acegi: {}", user);
-
- return user;
- }
-
-}
Copied: tags/openutils-usermanagement-1.1.1/src/main/java/it/openutils/usermanagement/acegi/HibernateUserDetailsServiceImpl.java (from rev 113, trunk/openutils-usermanagement/src/main/java/it/openutils/usermanagement/acegi/HibernateUserDetailsServiceImpl.java)
===================================================================
--- tags/openutils-usermanagement-1.1.1/src/main/java/it/openutils/usermanagement/acegi/HibernateUserDetailsServiceImpl.java (rev 0)
+++ tags/openutils-usermanagement-1.1.1/src/main/java/it/openutils/usermanagement/acegi/HibernateUserDetailsServiceImpl.java 2006-11-14 16:09:40 UTC (rev 115)
@@ -0,0 +1,59 @@
+package it.openutils.usermanagement.acegi;
+
+import it.openutils.usermanagement.dao.GroupDAO;
+import it.openutils.usermanagement.dao.UserDAO;
+
+import org.acegisecurity.userdetails.UserDetails;
+import org.acegisecurity.userdetails.UserDetailsService;
+import org.acegisecurity.userdetails.UsernameNotFoundException;
+import org.apache.commons.lang.ArrayUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.dao.DataAccessException;
+
+
+public class HibernateUserDetailsServiceImpl implements UserDetailsService
+{
+
+ private Logger log = LoggerFactory.getLogger(getClass());
+
+ private UserDAO userDao;
+
+ private GroupDAO groupDao;
+
+ public void setUserDao(UserDAO userDao)
+ {
+ this.userDao = userDao;
+ }
+
+ public void setGroupDAO(GroupDAO groupDao)
+ {
+ this.groupDao = groupDao;
+ }
+
+ public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException, DataAccessException
+ {
+
+ log.debug("Login:: Loading User's Data");
+
+ it.openutils.usermanagement.dataobjects.User filter = new it.openutils.usermanagement.dataobjects.User();
+ filter.setId(username);
+ it.openutils.usermanagement.dataobjects.User user = null;
+
+ user = this.userDao.findFilteredFirst(filter);
+
+ // mandatory: UserDetailsService can't return null
+ if (user == null)
+ {
+ throw new UsernameNotFoundException("Username " + username + " not found");
+ }
+
+ log.debug("Groups: {}, Roles {}", user.getGroups(), user.getRoles());
+ log.debug("Authorities: {}", ArrayUtils.toString(user.getAuthorities()));
+
+ log.debug("Login:: Returning User to Acegi: {}", user);
+
+ return user;
+ }
+
+}
Deleted: tags/openutils-usermanagement-1.1.1/src/test/java/it/openutils/usermanagement/manager/HibernateUserDetailsServiceTest.java
===================================================================
--- trunk/openutils-usermanagement/src/test/java/it/openutils/usermanagement/manager/HibernateUserDetailsServiceTest.java 2006-11-13 21:23:57 UTC (rev 109)
+++ tags/openutils-usermanagement-1.1.1/src/test/java/it/openutils/usermanagement/manager/HibernateUserDetailsServiceTest.java 2006-11-14 16:09:40 UTC (rev 115)
@@ -1,24 +0,0 @@
-package it.openutils.usermanagement.manager;
-
-import it.openutils.testing.junit.GenericsDbUnitTestCase;
-
-import org.acegisecurity.userdetails.UserDetails;
-import org.acegisecurity.userdetails.UserDetailsService;
-
-
-/**
- * @author fgiust
- * @version $Id$
- */
-public class HibernateUserDetailsServiceTest extends GenericsDbUnitTestCase<UserDetailsService>
-{
-
- public void testLoadUserByUsername()
- {
-
- UserDetails user = instance.loadUserByUsername("UserUno");
- assertNotNull(user);
-
- }
-
-}
Copied: tags/openutils-usermanagement-1.1.1/src/test/java/it/openutils/usermanagement/manager/HibernateUserDetailsServiceTest.java (from rev 113, trunk/openutils-usermanagement/src/test/java/it/openutils/usermanagement/manager/HibernateUserDetailsServiceTest.java)
===================================================================
--- tags/openutils-usermanagement-1.1.1/src/test/java/it/openutils/usermanagement/manager/HibernateUserDetailsServiceTest.java (rev 0)
+++ tags/openutils-usermanagement-1.1.1/src/test/java/it/openutils/usermanagement/manager/HibernateUserDetailsServiceTest.java 2006-11-14 16:09:40 UTC (rev 115)
@@ -0,0 +1,39 @@
+package it.openutils.usermanagement.manager;
+
+import it.openutils.testing.junit.GenericsDbUnitTestCase;
+
+import org.acegisecurity.userdetails.UserDetails;
+import org.acegisecurity.userdetails.UserDetailsService;
+import org.acegisecurity.userdetails.UsernameNotFoundException;
+
+
+/**
+ * @author fgiust
+ * @version $Id$
+ */
+public class HibernateUserDetailsServiceTest extends GenericsDbUnitTestCase<UserDetailsService>
+{
+
+ public void testLoadUserByUsername()
+ {
+
+ UserDetails user = instance.loadUserByUsername("UserUno");
+ assertNotNull(user);
+
+ }
+
+ public void testNotExistingUser()
+ {
+ try
+ {
+ instance.loadUserByUsername("notexisting");
+ }
+ catch (UsernameNotFoundException e)
+ {
+ // as expected
+ return;
+ }
+ fail("Expected UsernameNotFoundException not thrown");
+ }
+
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
