Shorten "built-in" plugin types.

diff --git a/saml/binding/SecurityPolicyRule.h b/saml/binding/SecurityPolicyRule.h
index d03c225..0f3090c 100644 (file)
--- a/saml/binding/SecurityPolicyRule.h
+++ b/saml/binding/SecurityPolicyRule.h
@@ -66,21 +66,21 @@ namespace opensaml {
      * 
      * Extracts message ID, timestamp, and issuer information.
      */
-    #define SAML1MESSAGE_POLICY_RULE  "org.opensaml.saml1.binding.SAML1MessageRule"
+    #define SAML1MESSAGE_POLICY_RULE  "SAML1Message"
 
     /**
      * SecurityPolicyRule for processing SAML 2.0 messages.
      * 
      * Extracts message ID, timestamp, and issuer information.
      */
-    #define SAML2MESSAGE_POLICY_RULE  "org.opensaml.saml2.binding.SAML2MessageRule"
+    #define SAML2MESSAGE_POLICY_RULE  "SAML2Message"
 
     /**
      * SecurityPolicyRule for TLS client certificate authentication.
      * 
      * Evaluates client certificates against the issuer's metadata.
      */
-    #define CLIENTCERTAUTH_POLICY_RULE  "org.opensaml.binding.ClientCertAuthRule"
+    #define CLIENTCERTAUTH_POLICY_RULE  "ClientCertAuth"
 
     /**
      * SecurityPolicyRule for replay detection and freshness checking.
@@ -93,7 +93,7 @@ namespace opensaml {
      * or up to a number of seconds set by an "expires" XML attribute when
      * instantiating the policy rule.
      */
-    #define MESSAGEFLOW_POLICY_RULE  "org.opensaml.binding.MessageFlowRule"
+    #define MESSAGEFLOW_POLICY_RULE  "MessageFlow"
 
     /**
      * SecurityPolicyRule for protocol message "blob" signing.
@@ -101,7 +101,7 @@ namespace opensaml {
      * Allows the message issuer to be authenticated using a non-XML digital signature
      * over the message body. The transport layer is not considered.
      */
-    #define SIMPLESIGNING_POLICY_RULE  "org.opensaml.binding.SimpleSigningRule"
+    #define SIMPLESIGNING_POLICY_RULE  "SimpleSigning"
 
     /**
      * SecurityPolicyRule for protocol message XML signing.
@@ -109,7 +109,7 @@ namespace opensaml {
      * Allows the message issuer to be authenticated using an XML digital signature
      * over the message. The transport layer is not considered.
      */
-    #define XMLSIGNING_POLICY_RULE  "org.opensaml.binding.XMLSigningRule"
+    #define XMLSIGNING_POLICY_RULE  "XMLSigning"
 };
 
 #endif /* __saml_secrule_h__ */

diff --git a/saml/saml2/metadata/MetadataFilter.h b/saml/saml2/metadata/MetadataFilter.h
index 9a6fb76..fe287a8 100644 (file)
--- a/saml/saml2/metadata/MetadataFilter.h
+++ b/saml/saml2/metadata/MetadataFilter.h
@@ -68,13 +68,13 @@ namespace opensaml {
         void SAML_API registerMetadataFilters();
         
         /** MetadataFilter that deletes blacklisted entities. */
-        #define BLACKLIST_METADATA_FILTER  "org.opensaml.saml2.metadata.provider.BlacklistMetadataFilter"
+        #define BLACKLIST_METADATA_FILTER  "Blacklist"
 
         /** MetadataFilter that deletes all but whitelisted entities. */
-        #define WHITELIST_METADATA_FILTER  "org.opensaml.saml2.metadata.provider.WhitelistMetadataFilter"
+        #define WHITELIST_METADATA_FILTER  "Whitelist"
 
         /** MetadataFilter that verifies signatures and filters out any that don't pass. */
-        #define SIGNATURE_METADATA_FILTER  "org.opensaml.saml2.metadata.provider.SignatureMetadataFilter"
+        #define SIGNATURE_METADATA_FILTER  "Signature"
         
         DECL_XMLTOOLING_EXCEPTION(MetadataException,SAML_EXCEPTIONAPI(SAML_API),opensaml::saml2md,xmltooling::XMLToolingException,Exceptions related to metadata use);
         DECL_XMLTOOLING_EXCEPTION(MetadataFilterException,SAML_EXCEPTIONAPI(SAML_API),opensaml::saml2md,MetadataException,Exceptions related to metadata filtering);

diff --git a/saml/saml2/metadata/MetadataProvider.h b/saml/saml2/metadata/MetadataProvider.h
index 34d71a9..6a5a2e9 100644 (file)
--- a/saml/saml2/metadata/MetadataProvider.h
+++ b/saml/saml2/metadata/MetadataProvider.h
@@ -205,10 +205,10 @@ namespace opensaml {
         void SAML_API registerMetadataProviders();
         
         /** MetadataProvider based on local or remote XML file */
-        #define XML_METADATA_PROVIDER  "org.opensaml.saml2.metadata.provider.XMLMetadataProvider"
+        #define XML_METADATA_PROVIDER  "XML"
 
         /** MetadataProvider that wraps a sequence of metadata providers. */
-        #define CHAINING_METADATA_PROVIDER  "org.opensaml.saml2.metadata.provider.ChainingMetadataProvider"
+        #define CHAINING_METADATA_PROVIDER  "Chaining"
     };
 };
 

diff --git a/samltest/data/saml2/metadata/XMLMetadataProvider.xml b/samltest/data/saml2/metadata/XMLMetadataProvider.xml
index 403ad46..a2d1823 100644 (file)
--- a/samltest/data/saml2/metadata/XMLMetadataProvider.xml
+++ b/samltest/data/saml2/metadata/XMLMetadataProvider.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <FilesystemMetadataProvider path="../samltest/data/saml2/metadata/InCommon-metadata.xml" validate="0">
     <SignatureMetadataFilter>
-        <KeyResolver type="org.opensaml.xmlooling.InlineKeyResolver"/>
+        <KeyResolver type="Inline"/>
     </SignatureMetadataFilter>
 </FilesystemMetadataProvider>

diff --git a/samltest/data/saml2/metadata/XMLWithBlacklists.xml b/samltest/data/saml2/metadata/XMLWithBlacklists.xml
index bdba203..ff2b908 100644 (file)
--- a/samltest/data/saml2/metadata/XMLWithBlacklists.xml
+++ b/samltest/data/saml2/metadata/XMLWithBlacklists.xml
@@ -4,7 +4,7 @@
         <Exclude>urn:mace:incommon:washington.edu</Exclude>
         <Exclude>urn:mace:incommon:osu.edu</Exclude>
     </BlacklistMetadataFilter>
-    <MetadataFilter type="org.opensaml.saml2.metadata.provider.BlacklistMetadataFilter">
+    <MetadataFilter type="Blacklist">
         <Exclude>urn:mace:incommon:internet2.edu</Exclude>
     </MetadataFilter>
 </FilesystemMetadataProvider>