Index: src/main/java/javax/security/auth/message/MessagePolicy.java
===================================================================
--- src/main/java/javax/security/auth/message/MessagePolicy.java	(revision 109029)
+++ src/main/java/javax/security/auth/message/MessagePolicy.java	(working copy)
@@ -35,7 +35,7 @@
  */
 public class MessagePolicy
 { 
-   protected TargetPolicy[] targetPolicies = null;
+   private TargetPolicy[] targetPolicies = null;
    private boolean mandatory;
    
    /** 
@@ -118,8 +118,8 @@
    public static class TargetPolicy
    {
       
-      protected ProtectionPolicy protectionPolicy;
-      protected Target[] targets;
+      private ProtectionPolicy protectionPolicy;
+      private Target[] targets;
       
       /**
        * 
@@ -168,19 +168,20 @@
    public static interface ProtectionPolicy
    {
       /**
-       * A URI fragment that represents a recipient entity authentication policy AUTHENTICATE_RECIPIENT_CONTENT
+       * The identifer for a ProtectionPolicy that indicates that the sending entity is to be authenticated. 
        */
-      public static final String AUTHENTICATE_SENDER = "http://jboss.org/security/auth/container/auth_sender";
+      public static final String AUTHENTICATE_SENDER = "#authenticateSender";
       
       /**
-       * A URI fragment that represents a source entity authentication policy AUTHENTICATE_SOURCE_CONTENT
+       * The identifer for a ProtectionPolicy that indicates that the message recipient is to be authenticated. 
        */
-      public static final String AUTHENTICATE_RECIPIENT = "http://jboss.org/security/auth/container/auth_recipient";
+      public static final String AUTHENTICATE_RECIPIENT = "#authenticateRecipient";
       
       /**
-       * A URI fragment that represents a data origin authentication policy
+       * The identifer for a ProtectionPolicy that indicates that the origin of data within the message is to be
+       *  authenticated.  That is, the message is to be protected such that its recipients can establish who defined the message content
        */
-      public static final String AUTHENTICATE_CONTENT = "http://jboss.org/security/auth/container/auth_content";
+      public static final String AUTHENTICATE_CONTENT = "#authenticateContent";
        
       /**
        * Get the ProtectionPolicy identifier. An identifier may represent a 
Index: src/main/java/javax/security/auth/message/config/AuthConfigFactory.java
===================================================================
--- src/main/java/javax/security/auth/message/config/AuthConfigFactory.java	(revision 109029)
+++ src/main/java/javax/security/auth/message/config/AuthConfigFactory.java	(working copy)
@@ -83,12 +83,11 @@
 public abstract class AuthConfigFactory
 {
    private static AuthConfigFactory _factory = null;
-   private static final String FACTORY_PROP = "authconfigprovider.factory";
+   public static final String DEFAULT_FACTORY_SECURITY_PROPERTY = "authconfigprovider.factory";
+
+   /* The default AuthConfigFactory implementation  */
+   private static final String FACTORY_IMPL = "org.jboss.security.auth.message.config.JBossAuthConfigFactory";
    
-   /** The default AuthConfigFactory implementation */
-   static final String DEFAULT_FACTORY_SECURITY_PROPERTY = 
-      "org.jboss.security.auth.message.config.JBossAuthConfigFactory";
-   
    public AuthConfigFactory()
    { 
    }
@@ -231,10 +230,10 @@
    
    public abstract String[] getRegistrationIDs(AuthConfigProvider provider);
    
-   public abstract void refresh() throws AuthException, SecurityException;
+   public abstract void refresh();
    
    public abstract String registerConfigProvider( String className, Map properties,String layer,
-           String appContext,  String description) throws AuthException, SecurityException;
+           String appContext,  String description);
    
    public abstract java.lang.String registerConfigProvider(AuthConfigProvider provider,
           String layer,  String appContext,  String description);
@@ -294,11 +293,11 @@
       public Object run()
          throws Exception
       {
-         name = System.getProperty(FACTORY_PROP);
+         name = System.getProperty(DEFAULT_FACTORY_SECURITY_PROPERTY);
          if( name == null )
          {
             // Use the default factory impl
-            name = DEFAULT_FACTORY_SECURITY_PROPERTY;
+            name = FACTORY_IMPL;
          }
          ClassLoader loader = Thread.currentThread().getContextClassLoader();
          Class factoryClass = loader.loadClass(name);
Index: src/main/java/javax/security/auth/message/config/AuthConfigProvider.java
===================================================================
--- src/main/java/javax/security/auth/message/config/AuthConfigProvider.java	(revision 109029)
+++ src/main/java/javax/security/auth/message/config/AuthConfigProvider.java	(working copy)
@@ -135,5 +135,5 @@
     * @throws SecurityException if the caller does not have permission to 
     *                    refresh the provider.
     */
-   void refresh() throws AuthException, SecurityException;
+   void refresh();
 }
Index: src/main/java/javax/security/auth/message/config/AuthConfig.java
===================================================================
--- src/main/java/javax/security/auth/message/config/AuthConfig.java	(revision 109029)
+++ src/main/java/javax/security/auth/message/config/AuthConfig.java	(working copy)
@@ -65,5 +65,5 @@
     * @throws SecurityException if the caller does not have permission to refresh 
     *                           the configuration object.
     */
-   void refresh() throws AuthException, SecurityException;
+   void refresh();
 }
Index: src/main/java/javax/security/auth/message/callback/PrivateKeyCallback.java
===================================================================
--- src/main/java/javax/security/auth/message/callback/PrivateKeyCallback.java	(revision 109029)
+++ src/main/java/javax/security/auth/message/callback/PrivateKeyCallback.java	(working copy)
@@ -151,7 +151,7 @@
    /**
     *  Request type for private keys that are identified using a certificate digest or thumbprint. 
     */
-   public static class DigestRequest
+   public static class DigestRequest implements Request
    {
       private  byte[] theDigest;
       private  String theAlgorithm;