[seam-commits] Seam SVN: r10812 - in modules/trunk/security: src/main/java/org/jboss/seam/security and 3 other directories.

[seam-commits at lists.jboss.org]

Author: shane.bryzak at jboss.com
Date: 2009-05-06 02:45:23 -0400 (Wed, 06 May 2009)
New Revision: 10812

Added:
   modules/trunk/security/src/main/resources/META-INF/
   modules/trunk/security/src/main/resources/META-INF/beans.xml
Modified:
   modules/trunk/security/pom.xml
   modules/trunk/security/src/main/java/org/jboss/seam/security/Credentials.java
   modules/trunk/security/src/main/java/org/jboss/seam/security/SecurityEventMessages.java
   modules/trunk/security/src/main/java/org/jboss/seam/security/management/IdentityStore.java
   modules/trunk/security/src/main/java/org/jboss/seam/security/management/LdapIdentityStore.java
Log:
fixed deployment issues

Modified: modules/trunk/security/pom.xml
===================================================================
--- modules/trunk/security/pom.xml	2009-05-06 06:24:40 UTC (rev 10811)
+++ modules/trunk/security/pom.xml	2009-05-06 06:45:23 UTC (rev 10812)
@@ -26,14 +26,17 @@
       <dependency>
          <groupId>javax.persistence</groupId>
          <artifactId>persistence-api</artifactId>
+         <scope>provided</scope>
       </dependency>   
       <dependency>
          <groupId>javax.faces</groupId>
          <artifactId>jsf-api</artifactId>
+         <scope>provided</scope>
       </dependency>  
       <dependency>
          <groupId>javax.ejb</groupId>
          <artifactId>ejb-api</artifactId>
+         <scope>provided</scope>
       </dependency>
       <dependency>
          <groupId>org.drools</groupId>
@@ -62,6 +65,7 @@
       <dependency>
          <groupId>org.hibernate</groupId>
          <artifactId>hibernate</artifactId>
+         <scope>provided</scope>
       </dependency>      
    </dependencies>
 

Modified: modules/trunk/security/src/main/java/org/jboss/seam/security/Credentials.java
===================================================================
--- modules/trunk/security/src/main/java/org/jboss/seam/security/Credentials.java	2009-05-06 06:24:40 UTC (rev 10811)
+++ modules/trunk/security/src/main/java/org/jboss/seam/security/Credentials.java	2009-05-06 06:45:23 UTC (rev 10812)
@@ -1,17 +1,11 @@
 package org.jboss.seam.security;
 
-import java.io.IOException;
 import java.io.Serializable;
 
 import javax.annotation.Named;
 import javax.context.SessionScoped;
 import javax.inject.Current;
 import javax.inject.manager.Manager;
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.NameCallback;
-import javax.security.auth.callback.PasswordCallback;
-import javax.security.auth.callback.UnsupportedCallbackException;
 
 import org.jboss.seam.security.events.CredentialsInitializedEvent;
 import org.jboss.seam.security.events.CredentialsUpdatedEvent;

Modified: modules/trunk/security/src/main/java/org/jboss/seam/security/SecurityEventMessages.java
===================================================================
--- modules/trunk/security/src/main/java/org/jboss/seam/security/SecurityEventMessages.java	2009-05-06 06:24:40 UTC (rev 10811)
+++ modules/trunk/security/src/main/java/org/jboss/seam/security/SecurityEventMessages.java	2009-05-06 06:45:23 UTC (rev 10812)
@@ -27,6 +27,7 @@
             //ServletContexts.instance().getRequest(), identity.getPrincipal().getName());
    }
    
+   /*
    @Current StatusMessages statusMessages;
    @Current Credentials credentials;
    
@@ -93,4 +94,6 @@
          "You are already logged in, please log out first if you wish to log in again"
       );
    }
+   
+   */
 }

Modified: modules/trunk/security/src/main/java/org/jboss/seam/security/management/IdentityStore.java
===================================================================
--- modules/trunk/security/src/main/java/org/jboss/seam/security/management/IdentityStore.java	2009-05-06 06:24:40 UTC (rev 10811)
+++ modules/trunk/security/src/main/java/org/jboss/seam/security/management/IdentityStore.java	2009-05-06 06:45:23 UTC (rev 10812)
@@ -1,5 +1,6 @@
 package org.jboss.seam.security.management;
 
+import java.io.Serializable;
 import java.security.Principal;
 import java.util.HashSet;
 import java.util.List;
@@ -19,8 +20,10 @@
    /**
     * Represents a set of optional features that an IdentityStore implementation might support.
     */
-   public class FeatureSet 
+   public class FeatureSet implements Serializable
    {                             
+      private static final long serialVersionUID = 1100272929055626911L;
+      
       private Set<Feature> features;
 
       public FeatureSet()

Modified: modules/trunk/security/src/main/java/org/jboss/seam/security/management/LdapIdentityStore.java
===================================================================
--- modules/trunk/security/src/main/java/org/jboss/seam/security/management/LdapIdentityStore.java	2009-05-06 06:24:40 UTC (rev 10811)
+++ modules/trunk/security/src/main/java/org/jboss/seam/security/management/LdapIdentityStore.java	2009-05-06 06:45:23 UTC (rev 10812)
@@ -31,7 +31,6 @@
  * 
  * @author Shane Bryzak
  */
- at Named("identityStore")
 @ApplicationScoped
 public class LdapIdentityStore implements IdentityStore, Serializable
 {
@@ -372,13 +371,13 @@
       return featureSet.supports(feature);
    }
    
-   protected final InitialLdapContext initialiseContext()
+   protected InitialLdapContext initialiseContext()
       throws NamingException
    {
       return initialiseContext(getBindDN(), getBindCredentials());
    }
    
-   protected final InitialLdapContext initialiseContext(String principal, String credentials)
+   protected InitialLdapContext initialiseContext(String principal, String credentials)
       throws NamingException
    {
       Properties env = new Properties();

Added: modules/trunk/security/src/main/resources/META-INF/beans.xml
===================================================================