Shorten "built-in" plugin types.

diff --git a/xmltooling/security/TrustEngine.h b/xmltooling/security/TrustEngine.h
index 9150968..e582fd0 100644 (file)
--- a/xmltooling/security/TrustEngine.h
+++ b/xmltooling/security/TrustEngine.h
@@ -119,10 +119,10 @@ namespace xmltooling {
     void XMLTOOL_API registerTrustEngines();
 
     /** TrustEngine based on explicit knowledge of peer key information. */
-    #define EXPLICIT_KEY_TRUSTENGINE  "org.opensaml.xmltooling.security.ExplicitKeyTrustEngine"
+    #define EXPLICIT_KEY_TRUSTENGINE  "ExplicitKey"
     
     /** TrustEngine that tries multiple engines in sequence. */
-    #define CHAINING_TRUSTENGINE  "org.opensaml.xmltooling.security.ChainingTrustEngine"
+    #define CHAINING_TRUSTENGINE  "Chaining"
     
 };
 

diff --git a/xmltooling/signature/CredentialResolver.h b/xmltooling/signature/CredentialResolver.h
index 858cadc..6b133fc 100644 (file)
--- a/xmltooling/signature/CredentialResolver.h
+++ b/xmltooling/signature/CredentialResolver.h
@@ -66,7 +66,7 @@ namespace xmlsignature {
     void XMLTOOL_API registerCredentialResolvers();
 
     /** CredentialResolver based on local files */
-    #define FILESYSTEM_CREDENTIAL_RESOLVER  "org.opensaml.xmlooling.FilesystemCredentialResolver"
+    #define FILESYSTEM_CREDENTIAL_RESOLVER  "File"
 };
 
 #endif /* __xmltooling_credres_h__ */

diff --git a/xmltooling/signature/KeyResolver.h b/xmltooling/signature/KeyResolver.h
index 2592312..7412133 100644 (file)
--- a/xmltooling/signature/KeyResolver.h
+++ b/xmltooling/signature/KeyResolver.h
@@ -236,10 +236,10 @@ namespace xmlsignature {
     void XMLTOOL_API registerKeyResolvers();
 
     /** KeyResolver based on hard-wired key */
-    #define FILESYSTEM_KEY_RESOLVER  "org.opensaml.xmlooling.FilesystemKeyResolver"
+    #define FILESYSTEM_KEY_RESOLVER  "File"
 
     /** KeyResolver based on extracting information directly out of a KeyInfo */
-    #define INLINE_KEY_RESOLVER  "org.opensaml.xmlooling.InlineKeyResolver"
+    #define INLINE_KEY_RESOLVER  "Inline"
 };
 
 #endif /* __xmltooling_keyres_h__ */

diff --git a/xmltooling/util/StorageService.h b/xmltooling/util/StorageService.h
index b32400b..d9f4802 100644 (file)
--- a/xmltooling/util/StorageService.h
+++ b/xmltooling/util/StorageService.h
@@ -196,7 +196,7 @@ namespace xmltooling {
     void XMLTOOL_API registerStorageServices();
 
     /** StorageService based on in-memory caching. */
-    #define MEMORY_STORAGE_SERVICE  "org.opensaml.xmlooling.MemoryStorageService"
+    #define MEMORY_STORAGE_SERVICE  "Memory"
 };
 
 #endif /* __xmltooling_storage_h__ */