Removed Factory property.

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

diff --git a/src/edu/internet2/middleware/shibboleth/aap/AttributeRule.java b/src/edu/internet2/middleware/shibboleth/aap/AttributeRule.java
index b479d33..d83c897 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/aap/AttributeRule.java
+++ b/src/edu/internet2/middleware/shibboleth/aap/AttributeRule.java
@@ -53,13 +53,6 @@ public interface AttributeRule {
     String getNamespace();
     
     /**
-     *  Get the name of the class responsible for implementing this attribute 
-     *
-     * @return The factory class name
-     */
-    String getFactory();
-    
-    /**
      *  Get the shorthand name of the attribute 
      *
      * @return The shorthand name

diff --git a/src/edu/internet2/middleware/shibboleth/aap/provider/XMLAAPProvider.java b/src/edu/internet2/middleware/shibboleth/aap/provider/XMLAAPProvider.java
index 0683694..f669a2e 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/aap/provider/XMLAAPProvider.java
+++ b/src/edu/internet2/middleware/shibboleth/aap/provider/XMLAAPProvider.java
@@ -59,7 +59,6 @@ public class XMLAAPProvider implements AAP {
 
         private String name = null;
         private String namespace = null;
-        private String factory = null;
         private String alias = null;
         private String header = null;
         private boolean caseSensitive = true;
@@ -89,7 +88,6 @@ public class XMLAAPProvider implements AAP {
         }
         
         XMLAttributeRule(Element e) throws MalformedException {
-            factory = XML.assign(e.getAttributeNS(null,"Factory"));
             alias = XML.assign(e.getAttributeNS(null,"Alias"));
             header = XML.assign(e.getAttributeNS(null,"Header"));
             name = XML.assign(e.getAttributeNS(null,"Name"));
@@ -206,10 +204,6 @@ public class XMLAAPProvider implements AAP {
             return namespace;
         }
 
-        public String getFactory() {
-            return factory;
-        }
-
         public String getAlias() {
             return alias;
         }

diff --git a/src/schemas/shibboleth.xsd b/src/schemas/shibboleth.xsd
index 67833f3..f7d4c47 100644 (file)
--- a/src/schemas/shibboleth.xsd
+++ b/src/schemas/shibboleth.xsd
@@ -102,7 +102,6 @@
         </sequence>
         <attribute name="Name" type="string" use="required"/>
         <attribute name="Namespace" type="string" use="optional"/>
-        <attribute name="Factory" type="string" use="optional"/>
         <attribute name="Alias" type="string" use="optional"/>
                <attribute name="Header" type="string" use="optional"/>
                <attribute name="Scoped" type="boolean" use="optional" default="false"/>