directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r894017 - in /directory/apacheds/branches/apacheds-schema/test-framework/src/main/java/org/apache/directory/server/core/integ/annotations: LdapServer.java Sasl.java
Date Sat, 26 Dec 2009 19:31:19 GMT
Author: elecharny
Date: Sat Dec 26 19:31:18 2009
New Revision: 894017

URL: http://svn.apache.org/viewvc?rev=894017&view=rev
Log:
o Added a SASL annotation
o Completed the LdapServer annotation

Added:
    directory/apacheds/branches/apacheds-schema/test-framework/src/main/java/org/apache/directory/server/core/integ/annotations/Sasl.java
Modified:
    directory/apacheds/branches/apacheds-schema/test-framework/src/main/java/org/apache/directory/server/core/integ/annotations/LdapServer.java

Modified: directory/apacheds/branches/apacheds-schema/test-framework/src/main/java/org/apache/directory/server/core/integ/annotations/LdapServer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/test-framework/src/main/java/org/apache/directory/server/core/integ/annotations/LdapServer.java?rev=894017&r1=894016&r2=894017&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/test-framework/src/main/java/org/apache/directory/server/core/integ/annotations/LdapServer.java
(original)
+++ directory/apacheds/branches/apacheds-schema/test-framework/src/main/java/org/apache/directory/server/core/integ/annotations/LdapServer.java
Sat Dec 26 19:31:18 2009
@@ -28,9 +28,15 @@
 
 
 /**
- * A annotation used to specify an sequence of LDIF's to be applied to
- * the instance for integration testing.
- *
+ * A annotation used to define a LdapServer configuration. Many elements can be configured
:
+ * <ul>
+ * <li> The server ID (or name)</li>
+ * <li> The max time limit</li>
+ * <li> the max size limit</li>
+ * <li> Should it allow anonymous access</li>
+ * <li> The keyStore file</li>
+ * <li> The certificate password</li>
+ * </ul>
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
@@ -51,4 +57,10 @@
     
     /** Tells if anonymous access are allowed or not. */
     boolean allowAnonymousAccess() default false;
+    
+    /** The external keyStore file to use, default to the empty string */
+    String keyStore() default "";
+    
+    /** The certificate password in base64, default to the empty string */
+    String certificatePassword() default "";
 }
\ No newline at end of file

Added: directory/apacheds/branches/apacheds-schema/test-framework/src/main/java/org/apache/directory/server/core/integ/annotations/Sasl.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/test-framework/src/main/java/org/apache/directory/server/core/integ/annotations/Sasl.java?rev=894017&view=auto
==============================================================================
--- directory/apacheds/branches/apacheds-schema/test-framework/src/main/java/org/apache/directory/server/core/integ/annotations/Sasl.java
(added)
+++ directory/apacheds/branches/apacheds-schema/test-framework/src/main/java/org/apache/directory/server/core/integ/annotations/Sasl.java
Sat Dec 26 19:31:18 2009
@@ -0,0 +1,76 @@
+/*
+ *  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.directory.server.core.integ.annotations;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.apache.directory.server.ldap.handlers.bind.SimpleMechanismHandler;
+import org.apache.directory.server.ldap.handlers.bind.cramMD5.CramMd5MechanismHandler;
+import org.apache.directory.server.ldap.handlers.bind.digestMD5.DigestMd5MechanismHandler;
+import org.apache.directory.server.ldap.handlers.bind.gssapi.GssapiMechanismHandler;
+import org.apache.directory.server.ldap.handlers.bind.ntlm.NtlmMechanismHandler;
+
+
+/**
+ * A annotation used to define the SASL configuration. Many elements can be configured :
+ * <ul>
+ * <li> The host</li>
+ * <li> The principal</li>
+ * <li> the max size limit</li>
+ * <li> Should it allow anonymous access</li>
+ * <li> The keyStore file</li>
+ * <li> The certificate password</li>
+ * </ul>
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
+ */
+@Documented
+@Inherited
+@Retention ( RetentionPolicy.RUNTIME )
+@Target ( { ElementType.METHOD, ElementType.TYPE } )
+public @interface Sasl
+{
+    /** The SASL host, default to localhost */
+    String host() default "localhost";
+    
+    /** The principal */
+    String principal();
+    
+    /** The SASL QOP list */
+    String[] qop() default { "auth", "auth-int", "auth-conf" };
+    
+    /** The SASL realms */
+    String[] realms() default {};
+    
+    /** The mechanism handlers.*/
+    Class<?>[] mechanismHandler() default 
+        { 
+            SimpleMechanismHandler.class,
+            CramMd5MechanismHandler.class,
+            DigestMd5MechanismHandler.class,
+            GssapiMechanismHandler.class,
+            NtlmMechanismHandler.class
+        };
+}
\ No newline at end of file



Mime
View raw message