*** empty log message ***

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@64 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

diff --git a/src/edu/internet2/middleware/shibboleth/aa/AAAttributes.java b/src/edu/internet2/middleware/shibboleth/aa/AAAttributes.java
index f810707..8dc41ed 100755 (executable)
--- a/src/edu/internet2/middleware/shibboleth/aa/AAAttributes.java
+++ b/src/edu/internet2/middleware/shibboleth/aa/AAAttributes.java
@@ -14,7 +14,7 @@ public class AAAttributes{
     Class[] attrClasses = new Class[1];
 
     /**
-     * Sole constructor. Takes a directory name in the local file system
+     * Sole constructor. Takes a jarfile name in the local file system
      * where attribute classes reside
      */
 

diff --git a/src/edu/internet2/middleware/shibboleth/aa/AAResponder.java b/src/edu/internet2/middleware/shibboleth/aa/AAResponder.java
index eeff8de..4157abf 100755 (executable)
--- a/src/edu/internet2/middleware/shibboleth/aa/AAResponder.java
+++ b/src/edu/internet2/middleware/shibboleth/aa/AAResponder.java
@@ -28,7 +28,7 @@ public class AAResponder{
        this.arpFactory = arpFactory;
        adminArp = arpFactory.getInstance("admin", true);
        if(adminArp.isNew())
-           throw new AAException("Admin Arp not found! ");
+           throw new AAException("Admin Arp not found in "+arpFactory);
        this.ctx = ctx;
        this.domain = domain;
     }

diff --git a/src/edu/internet2/middleware/shibboleth/aa/ArpFileFactory.java b/src/edu/internet2/middleware/shibboleth/aa/ArpFileFactory.java
index f156502..9dd839a 100755 (executable)
--- a/src/edu/internet2/middleware/shibboleth/aa/ArpFileFactory.java
+++ b/src/edu/internet2/middleware/shibboleth/aa/ArpFileFactory.java
@@ -23,7 +23,9 @@ public class ArpFileFactory implements ArpFactory{
     public Arp getInstance(String arpName, boolean isAdmin)
     throws AAException{
        try{
+
            String fileName = dataStore+System.getProperty("file.separator")+arpName;
+           System.out.println("Looking for ARP "+fileName);
 
            FileInputStream f = new FileInputStream(fileName);
            ObjectInput s = new ObjectInputStream(f);
@@ -32,10 +34,12 @@ public class ArpFileFactory implements ArpFactory{
               throw new AAException("Wrong ARP name.  ARP maybe renamed in datastore. ");
            arp.setNew(false);
            arp.setLastRead(new Date());
+           System.out.println("Found and using ARP "+arpName);
            return arp;
            
        }catch(FileNotFoundException e){
            // check the IO error to make sure "file not found"
+           System.out.println("Got File Not Found for "+arpName+" in "+dataStore);
            try{
                Arp arp = new Arp(arpName, isAdmin);
                arp.setNew(true);
@@ -94,5 +98,9 @@ public class ArpFileFactory implements ArpFactory{
            throw new AAException("IO Problem:"+e);
        }
     }
+
+    public String toString(){
+       return "ArpFileFactory:dir="+dataStore;
+    }
 }
 

diff --git a/src/edu/internet2/middleware/shibboleth/aaLocal/CmuCtxFactory.java b/src/edu/internet2/middleware/shibboleth/aaLocal/CmuCtxFactory.java
index c08d530..2609c63 100755 (executable)
--- a/src/edu/internet2/middleware/shibboleth/aaLocal/CmuCtxFactory.java
+++ b/src/edu/internet2/middleware/shibboleth/aaLocal/CmuCtxFactory.java
@@ -1,3 +1,5 @@
+package edu.internet2.middleware.shibboleth.aaLocal;
+
 import java.util.Hashtable;
 import javax.naming.*;
 import javax.naming.spi.*;

diff --git a/src/edu/internet2/middleware/shibboleth/aaLocal/CmuDirContext.java b/src/edu/internet2/middleware/shibboleth/aaLocal/CmuDirContext.java
index 46f1678..003de55 100755 (executable)
--- a/src/edu/internet2/middleware/shibboleth/aaLocal/CmuDirContext.java
+++ b/src/edu/internet2/middleware/shibboleth/aaLocal/CmuDirContext.java
@@ -1,3 +1,5 @@
+package edu.internet2.middleware.shibboleth.aaLocal;
+
 import java.util.*;
 import javax.naming.*;
 import javax.naming.directory.*;

diff --git a/src/edu/internet2/middleware/shibboleth/aaLocal/EchoCtxFactory.java b/src/edu/internet2/middleware/shibboleth/aaLocal/EchoCtxFactory.java
index c071d9d..764df1a 100755 (executable)
--- a/src/edu/internet2/middleware/shibboleth/aaLocal/EchoCtxFactory.java
+++ b/src/edu/internet2/middleware/shibboleth/aaLocal/EchoCtxFactory.java
@@ -1,3 +1,5 @@
+package edu.internet2.middleware.shibboleth.aaLocal;
+
 import java.util.Hashtable;
 import javax.naming.*;
 import javax.naming.spi.*;

diff --git a/src/edu/internet2/middleware/shibboleth/aaLocal/EchoDirContext.java b/src/edu/internet2/middleware/shibboleth/aaLocal/EchoDirContext.java
index e47bff7..798e8ed 100755 (executable)
--- a/src/edu/internet2/middleware/shibboleth/aaLocal/EchoDirContext.java
+++ b/src/edu/internet2/middleware/shibboleth/aaLocal/EchoDirContext.java
@@ -1,3 +1,5 @@
+package edu.internet2.middleware.shibboleth.aaLocal;
+
 import java.util.*;
 import javax.naming.*;
 import javax.naming.directory.*;

diff --git a/src/edu/internet2/middleware/shibboleth/aaLocal/SQLCtxFactory.java b/src/edu/internet2/middleware/shibboleth/aaLocal/SQLCtxFactory.java
index e28103d..77d98b9 100755 (executable)
--- a/src/edu/internet2/middleware/shibboleth/aaLocal/SQLCtxFactory.java
+++ b/src/edu/internet2/middleware/shibboleth/aaLocal/SQLCtxFactory.java
@@ -1,3 +1,5 @@
+package edu.internet2.middleware.shibboleth.aaLocal;
+
 import java.util.Hashtable;
 import javax.naming.*;
 import javax.naming.spi.*;

diff --git a/src/edu/internet2/middleware/shibboleth/aaLocal/SQLDirContext.java b/src/edu/internet2/middleware/shibboleth/aaLocal/SQLDirContext.java
index e5b04ab..0a11ab2 100755 (executable)
--- a/src/edu/internet2/middleware/shibboleth/aaLocal/SQLDirContext.java
+++ b/src/edu/internet2/middleware/shibboleth/aaLocal/SQLDirContext.java
@@ -1,3 +1,5 @@
+package edu.internet2.middleware.shibboleth.aaLocal;
+
 import java.util.*;
 import java.sql.*;
 import javax.naming.*;

diff --git a/src/edu/internet2/middleware/shibboleth/aaLocal/attributes/cmuAndrewId.java b/src/edu/internet2/middleware/shibboleth/aaLocal/attributes/cmuAndrewId.java
index ca39158..d1edecb 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/aaLocal/attributes/cmuAndrewId.java
+++ b/src/edu/internet2/middleware/shibboleth/aaLocal/attributes/cmuAndrewId.java
@@ -1,5 +1,5 @@
 import edu.internet2.middleware.eduPerson.*;
-import edu.internet2.middleware.shibboleth.Constants; 
+import edu.internet2.middleware.shibboleth.common.Constants; 
 import org.opensaml.*;
 
 
@@ -9,7 +9,7 @@ public class cmuAndrewId extends ScopedAttribute{
     public cmuAndrewId(String[] scopes, Object[] values)
        throws SAMLException{
 
-       this.super("urn:mace:eduPerson:1.0:eduPersonPrincipalName",
+       super("urn:mace:eduPerson:1.0:eduPersonPrincipalName",
                   Constants.SHIB_ATTRIBUTE_NAMESPACE_URI, 
                   new QName("urn:mace:eduPerson:1.0",
                             "eduPersonPrincipalNameType"),

diff --git a/src/edu/internet2/middleware/shibboleth/aaLocal/attributes/eduPersonAffiliation.java b/src/edu/internet2/middleware/shibboleth/aaLocal/attributes/eduPersonAffiliation.java
index 903aa32..9a9c735 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/aaLocal/attributes/eduPersonAffiliation.java
+++ b/src/edu/internet2/middleware/shibboleth/aaLocal/attributes/eduPersonAffiliation.java
@@ -1,5 +1,5 @@
 import edu.internet2.middleware.eduPerson.*;
-import edu.internet2.middleware.shibboleth.Constants; 
+import edu.internet2.middleware.shibboleth.common.Constants; 
 import org.opensaml.*;
 
 public class eduPersonAffiliation extends ScopedAttribute{
@@ -8,7 +8,7 @@ public class eduPersonAffiliation extends ScopedAttribute{
     public eduPersonAffiliation(String[] scopes, Object[] values)
        throws SAMLException{
 
-       this.super("urn:mace:eduPerson:1.0:eduPersonAffiliation",
+       super("urn:mace:eduPerson:1.0:eduPersonAffiliation",
                   Constants.SHIB_ATTRIBUTE_NAMESPACE_URI, 
                   new QName("urn:mace:eduPerson:1.0",
                             "eduPersonAffiliationType"),
@@ -17,8 +17,8 @@ public class eduPersonAffiliation extends ScopedAttribute{
                   scopes[0],
                   scopes);
 
-     for(int i=0; i<super.values.length; i++){
-       String val = (String)super.values[i];
+     for(int i=0; i<values.length; i++){
+       String val = (String)values[i];
        if(val.equalsIgnoreCase("faculty") ||
           val.equalsIgnoreCase("student") ||
           val.equalsIgnoreCase("staff") ||
@@ -26,9 +26,9 @@ public class eduPersonAffiliation extends ScopedAttribute{
           val.equalsIgnoreCase("member") ||
           val.equalsIgnoreCase("affiliate") ||
           val.equalsIgnoreCase("employee") )
-           super.values[i] = val.toLowerCase();
+           values[i] = val.toLowerCase();
        else
-           super.values[i] = "member";
+           values[i] = "member";
      }
 
     }

diff --git a/src/edu/internet2/middleware/shibboleth/aaLocal/attributes/eduPersonPrincipalName.java b/src/edu/internet2/middleware/shibboleth/aaLocal/attributes/eduPersonPrincipalName.java
index 27d4644..263be47 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/aaLocal/attributes/eduPersonPrincipalName.java
+++ b/src/edu/internet2/middleware/shibboleth/aaLocal/attributes/eduPersonPrincipalName.java
@@ -1,5 +1,5 @@
 import edu.internet2.middleware.eduPerson.*;
-import edu.internet2.middleware.shibboleth.Constants; 
+import edu.internet2.middleware.shibboleth.common.Constants; 
 import org.opensaml.*;
 
 public class eduPersonPrincipalName extends ScopedAttribute{
@@ -8,7 +8,7 @@ public class eduPersonPrincipalName extends ScopedAttribute{
     public eduPersonPrincipalName(String[] scopes, Object[] values)
        throws SAMLException{
 
-       this.super("urn:mace:eduPerson:1.0:eduPersonPrincipalName",
+       super("urn:mace:eduPerson:1.0:eduPersonPrincipalName",
                   Constants.SHIB_ATTRIBUTE_NAMESPACE_URI, 
                   new QName("urn:mace:eduPerson:1.0",
                             "eduPersonPrincipalNameType"),
@@ -18,7 +18,7 @@ public class eduPersonPrincipalName extends ScopedAttribute{
                   scopes);
 
        if(((String)values[0]).indexOf("@") < 0)
-           super.values[0] = (String)values[0]+"@"+scopes[0];
+           values[0] = (String)values[0]+"@"+scopes[0];
     }
 }