You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by ad...@apache.org on 2009/11/13 19:21:57 UTC
svn commit: r835947 - in /incubator/shiro/sandbox/crowd: pom.xml
src/main/java/org/jsecurity/realms/crowd/CrowdRealm.java
Author: adc
Date: Fri Nov 13 18:21:57 2009
New Revision: 835947
URL: http://svn.apache.org/viewvc?rev=835947&view=rev
Log:
SHIRO-18 Brought back to life
Modified:
incubator/shiro/sandbox/crowd/pom.xml
incubator/shiro/sandbox/crowd/src/main/java/org/jsecurity/realms/crowd/CrowdRealm.java
Modified: incubator/shiro/sandbox/crowd/pom.xml
URL: http://svn.apache.org/viewvc/incubator/shiro/sandbox/crowd/pom.xml?rev=835947&r1=835946&r2=835947&view=diff
==============================================================================
--- incubator/shiro/sandbox/crowd/pom.xml (original)
+++ incubator/shiro/sandbox/crowd/pom.xml Fri Nov 13 18:21:57 2009
@@ -22,6 +22,12 @@
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>6</version>
+ </parent>
+
<groupId>org.jsecurity.realms</groupId>
<artifactId>crowd</artifactId>
<version>1.0-snapshot</version>
@@ -29,7 +35,20 @@
<name>Crowd Realm</name>
<description>A JSecurity realm for the Atlassian Crowd API</description>
- <build/>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ <encoding>${project.build.sourceEncoding}</encoding>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
<dependencies>
<dependency>
@@ -41,14 +60,20 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.4</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.jsecurity</groupId>
- <artifactId>jsecurity</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-core</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.5.6</version>
</dependency>
</dependencies>
Modified: incubator/shiro/sandbox/crowd/src/main/java/org/jsecurity/realms/crowd/CrowdRealm.java
URL: http://svn.apache.org/viewvc/incubator/shiro/sandbox/crowd/src/main/java/org/jsecurity/realms/crowd/CrowdRealm.java?rev=835947&r1=835946&r2=835947&view=diff
==============================================================================
--- incubator/shiro/sandbox/crowd/src/main/java/org/jsecurity/realms/crowd/CrowdRealm.java (original)
+++ incubator/shiro/sandbox/crowd/src/main/java/org/jsecurity/realms/crowd/CrowdRealm.java Fri Nov 13 18:21:57 2009
@@ -27,23 +27,22 @@
import com.atlassian.crowd.integration.exception.ObjectNotFoundException;
import com.atlassian.crowd.integration.service.soap.client.SecurityServerClient;
import com.atlassian.crowd.integration.service.soap.client.SecurityServerClientFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.jsecurity.authc.AuthenticationException;
-import org.jsecurity.authc.AuthenticationInfo;
-import org.jsecurity.authc.AuthenticationToken;
-import org.jsecurity.authc.DisabledAccountException;
-import org.jsecurity.authc.IncorrectCredentialsException;
-import org.jsecurity.authc.SimpleAuthenticationInfo;
-import org.jsecurity.authc.UsernamePasswordToken;
-import org.jsecurity.authc.pam.UnsupportedTokenException;
-import org.jsecurity.authz.AuthorizationException;
-import org.jsecurity.authz.AuthorizationInfo;
-import org.jsecurity.authz.SimpleAuthorizationInfo;
-import org.jsecurity.realm.AuthorizingRealm;
-import org.jsecurity.subject.PrincipalCollection;
+import org.apache.shiro.authc.AuthenticationException;
+import org.apache.shiro.authc.AuthenticationInfo;
+import org.apache.shiro.authc.AuthenticationToken;
+import org.apache.shiro.authc.DisabledAccountException;
+import org.apache.shiro.authc.IncorrectCredentialsException;
+import org.apache.shiro.authc.SimpleAuthenticationInfo;
+import org.apache.shiro.authc.UsernamePasswordToken;
+import org.apache.shiro.authc.pam.UnsupportedTokenException;
+import org.apache.shiro.authz.AuthorizationException;
+import org.apache.shiro.authz.AuthorizationInfo;
+import org.apache.shiro.authz.SimpleAuthorizationInfo;
+import org.apache.shiro.realm.AuthorizingRealm;
+import org.apache.shiro.subject.PrincipalCollection;
/**
@@ -59,7 +58,7 @@
*/
public class CrowdRealm extends AuthorizingRealm {
- private static final Log LOG = LogFactory.getLog(CrowdRealm.class);
+ private static final Logger LOG = LoggerFactory.getLogger(CrowdRealm.class);
private SecurityServerClient crowdClient = SecurityServerClientFactory.getSecurityServerClient();
private EnumSet<RoleSource> roleSources = EnumSet.of(RoleSource.ROLES_FROM_CROWD_ROLES);