Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@harmony.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r599862 - in
 /harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/sasl:
 DefaultCallbackHandler.java SaslBind.java
Date: Fri, 30 Nov 2007 16:30:07 -0000
To: commits@harmony.apache.org
From: tellison@apache.org
Message-Id: <20071130163008.524CF1A9846@eris.apache.org>

Author: tellison
Date: Fri Nov 30 08:30:07 2007
New Revision: 599862

URL: http://svn.apache.org/viewvc?rev=599862&view=rev
Log:
Split classes into separate source files to enable ant clean target to work properly.

Added:
    harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/sasl/DefaultCallbackHandler.java   (with props)
Modified:
    harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/sasl/SaslBind.java

Added: harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/sasl/DefaultCallbackHandler.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/sasl/DefaultCallbackHandler.java?rev=599862&view=auto
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/sasl/DefaultCallbackHandler.java (added)
+++ harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/sasl/DefaultCallbackHandler.java Fri Nov 30 08:30:07 2007
@@ -0,0 +1,86 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.apache.harmony.jndi.provider.ldap.sasl;
+
+import java.util.Hashtable;
+
+import javax.naming.Context;
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.NameCallback;
+import javax.security.auth.callback.PasswordCallback;
+import javax.security.auth.callback.UnsupportedCallbackException;
+import javax.security.sasl.RealmCallback;
+import javax.security.sasl.RealmChoiceCallback;
+
+import org.apache.harmony.jndi.provider.ldap.asn1.Utils;
+
+
+/*
+ * Default callback handler, may be customized through
+ * "java.naming.security.sasl.realm".
+ */
+class DefaultCallbackHandler implements CallbackHandler {
+    
+    private static final String JAVA_NAMING_SECURITY_SASL_REALM = "java.naming.security.sasl.realm";
+
+    private Hashtable env;
+
+    private String realm = "";
+
+    public DefaultCallbackHandler() {
+
+    }
+
+    public DefaultCallbackHandler(Hashtable env) {
+        this.env = env;
+    }
+
+    public void handle(Callback[] callbacks) throws java.io.IOException,
+            UnsupportedCallbackException {
+        for (int i = 0; i < callbacks.length; i++) {
+            if (callbacks[i] instanceof RealmChoiceCallback) {
+                // TODO what to do here?
+                // RealmChoiceCallback rcc = (RealmChoiceCallback) callbacks[i];
+
+            } else if (callbacks[i] instanceof RealmCallback) {
+                RealmCallback rc = (RealmCallback) callbacks[i];
+                if (env.get(JAVA_NAMING_SECURITY_SASL_REALM) != null) {
+                    realm = (String) env.get(JAVA_NAMING_SECURITY_SASL_REALM);
+                    rc.setText(realm);
+                } else {
+                    rc.setText(realm);
+                }
+            } else if (callbacks[i] instanceof PasswordCallback) {
+                PasswordCallback pc = (PasswordCallback) callbacks[i];
+                pc.setPassword(Utils.getCharArray(env
+                        .get(Context.SECURITY_CREDENTIALS)));
+            } else if (callbacks[i] instanceof NameCallback) {
+                //authentication Id
+                NameCallback nc = (NameCallback) callbacks[i];
+                nc.setName((String) env.get(Context.SECURITY_PRINCIPAL));
+            } else {
+                throw new UnsupportedCallbackException(callbacks[i]);
+            }
+        }
+    }
+
+    public void setRealm(String realm) {
+        this.realm = realm;
+    }
+}

Propchange: harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/sasl/DefaultCallbackHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/sasl/SaslBind.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/sasl/SaslBind.java?rev=599862&r1=599861&r2=599862&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/sasl/SaslBind.java (original)
+++ harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/sasl/SaslBind.java Fri Nov 30 08:30:07 2007
@@ -25,13 +25,7 @@
 import javax.naming.AuthenticationNotSupportedException;
 import javax.naming.Context;
 import javax.naming.ldap.Control;
-import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.NameCallback;
-import javax.security.auth.callback.PasswordCallback;
-import javax.security.auth.callback.UnsupportedCallbackException;
-import javax.security.sasl.RealmCallback;
-import javax.security.sasl.RealmChoiceCallback;
 import javax.security.sasl.Sasl;
 import javax.security.sasl.SaslClient;
 import javax.security.sasl.SaslException;
@@ -39,7 +33,6 @@
 import org.apache.harmony.jndi.provider.ldap.BindOp;
 import org.apache.harmony.jndi.provider.ldap.LdapClient;
 import org.apache.harmony.jndi.provider.ldap.LdapResult;
-import org.apache.harmony.jndi.provider.ldap.asn1.Utils;
 import org.apache.harmony.jndi.provider.ldap.parser.ParseException;
 
 /**
@@ -253,59 +246,5 @@
             }
         }
         return "";
-    }
-}
-
-/*
- * Default callback handler, may be customized through
- * "java.naming.security.sasl.realm".
- */
-class DefaultCallbackHandler implements CallbackHandler {
-    
-    private static final String JAVA_NAMING_SECURITY_SASL_REALM = "java.naming.security.sasl.realm";
-
-    private Hashtable env;
-
-    private String realm = "";
-
-    public DefaultCallbackHandler() {
-
-    }
-
-    public DefaultCallbackHandler(Hashtable env) {
-        this.env = env;
-    }
-
-    public void handle(Callback[] callbacks) throws java.io.IOException,
-            UnsupportedCallbackException {
-        for (int i = 0; i < callbacks.length; i++) {
-            if (callbacks[i] instanceof RealmChoiceCallback) {
-                // TODO what to do here?
-                // RealmChoiceCallback rcc = (RealmChoiceCallback) callbacks[i];
-
-            } else if (callbacks[i] instanceof RealmCallback) {
-                RealmCallback rc = (RealmCallback) callbacks[i];
-                if (env.get(JAVA_NAMING_SECURITY_SASL_REALM) != null) {
-                    realm = (String) env.get(JAVA_NAMING_SECURITY_SASL_REALM);
-                    rc.setText(realm);
-                } else {
-                    rc.setText(realm);
-                }
-            } else if (callbacks[i] instanceof PasswordCallback) {
-                PasswordCallback pc = (PasswordCallback) callbacks[i];
-                pc.setPassword(Utils.getCharArray(env
-                        .get(Context.SECURITY_CREDENTIALS)));
-            } else if (callbacks[i] instanceof NameCallback) {
-                //authentication Id
-                NameCallback nc = (NameCallback) callbacks[i];
-                nc.setName((String) env.get(Context.SECURITY_PRINCIPAL));
-            } else {
-                throw new UnsupportedCallbackException(callbacks[i]);
-            }
-        }
-    }
-
-    public void setRealm(String realm) {
-        this.realm = realm;
     }
 }