You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pa...@apache.org on 2008/07/10 19:36:31 UTC
svn commit: r675657 [6/6] - in
/directory/studio/trunk/apacheds-configuration/src/main:
java/org/apache/directory/studio/apacheds/configuration/
java/org/apache/directory/studio/apacheds/configuration/editor/
java/org/apache/directory/studio/apacheds/c...
Added: directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v153/SupportedMechanismEnum.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v153/SupportedMechanismEnum.java?rev=675657&view=auto
==============================================================================
--- directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v153/SupportedMechanismEnum.java (added)
+++ directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v153/SupportedMechanismEnum.java Thu Jul 10 10:36:30 2008
@@ -0,0 +1,123 @@
+/*
+ * 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.studio.apacheds.configuration.model.v153;
+
+
+/**
+ * This enum contains all the supported mechanisms.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
+ */
+public enum SupportedMechanismEnum
+{
+ /** The Simple mechanism */
+ SIMPLE("SIMPLE"),
+
+ /** The CRAM-MD5 (SASL) mechanism */
+ CRAM_MD5("CRAM-MD5 (SASL)"),
+
+ /** The DIGEST-MD5 (SASL) mechanism */
+ DIGEST_MD5("DIGEST-MD5 (SASL)"),
+
+ /** The GSSAPI (SASL) mechanism */
+ GSSAPI("GSSAPI (SASL)"),
+
+ /** The NTLM (SASL) mechanism */
+ NTLM("NTLM (SASL)"),
+
+ /** The NTLM (SASL) mechanism */
+ GSS_SPNEGO("GSS-SPNEGO (SASL)");
+
+ /** The name */
+ private String name;
+
+ /** The fully qualified class name of the NTLM provider */
+ private String ntlmProviderFqcn;
+
+
+ /**
+ * Creates a new instance of SupportedMechanismEnum.
+ *
+ * @param name
+ * the name
+ */
+ private SupportedMechanismEnum( String name )
+ {
+ this.name = name;
+ }
+
+
+ /**
+ * Gets the name.
+ *
+ * @return
+ * the name
+ */
+ public String getName()
+ {
+ return name;
+ }
+
+
+ /**
+ * Sets the name.
+ *
+ * @param name
+ * the name
+ */
+ public void setName( String name )
+ {
+ this.name = name;
+ }
+
+
+ /**
+ * Gets the fully qualified class name of the NTLM provider.
+ *
+ * @return
+ * The fully qualified class name of the NTLM provider
+ */
+ public String getNtlmProviderFqcn()
+ {
+ return ntlmProviderFqcn;
+ }
+
+
+ /**
+ * Sets the fully qualified class name of the NTLM provider
+ *
+ * @param ntlmProviderFqcn
+ * The fully qualified class name of the NTLM provider
+ */
+ public void setNtlmProviderFqcn( String ntlmProviderFqcn )
+ {
+ this.ntlmProviderFqcn = ntlmProviderFqcn;
+ }
+
+
+ /* (non-Javadoc)
+ * @see java.lang.Enum#toString()
+ */
+ public String toString()
+ {
+ return name;
+ }
+}
Modified: directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/wizards/NewApacheDSConfigurationFileWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/wizards/NewApacheDSConfigurationFileWizard.java?rev=675657&r1=675656&r2=675657&view=diff
==============================================================================
--- directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/wizards/NewApacheDSConfigurationFileWizard.java (original)
+++ directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/wizards/NewApacheDSConfigurationFileWizard.java Thu Jul 10 10:36:30 2008
@@ -29,6 +29,7 @@
import org.apache.directory.studio.apacheds.configuration.model.v150.ServerXmlIOV150;
import org.apache.directory.studio.apacheds.configuration.model.v151.ServerXmlIOV151;
import org.apache.directory.studio.apacheds.configuration.model.v152.ServerXmlIOV152;
+import org.apache.directory.studio.apacheds.configuration.model.v153.ServerXmlIOV153;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.swt.SWT;
@@ -78,6 +79,11 @@
ServerXmlIO serverXmlIO = null;
switch ( page.getTargetVersion() )
{
+ case VERSION_1_5_3:
+ serverXmlIO = new ServerXmlIOV153();
+ serverConfiguration = serverXmlIO.parse( ApacheDSConfigurationPlugin.class
+ .getResourceAsStream( "default-server-1.5.3.xml" ) );
+ break;
case VERSION_1_5_2:
serverXmlIO = new ServerXmlIOV152();
serverConfiguration = serverXmlIO.parse( ApacheDSConfigurationPlugin.class
@@ -94,9 +100,9 @@
.getResourceAsStream( "default-server-1.5.0.xml" ) );
break;
default:
- serverXmlIO = new ServerXmlIOV152();
+ serverXmlIO = new ServerXmlIOV153();
serverConfiguration = serverXmlIO.parse( ApacheDSConfigurationPlugin.class
- .getResourceAsStream( "default-server-1.5.2.xml" ) );
+ .getResourceAsStream( "default-server-1.5.3.xml" ) );
break;
}
Modified: directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/wizards/NewApacheDSConfigurationFileWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/wizards/NewApacheDSConfigurationFileWizardPage.java?rev=675657&r1=675656&r2=675657&view=diff
==============================================================================
--- directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/wizards/NewApacheDSConfigurationFileWizardPage.java (original)
+++ directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/wizards/NewApacheDSConfigurationFileWizardPage.java Thu Jul 10 10:36:30 2008
@@ -49,6 +49,8 @@
private static final String VERSION_1_5_1 = "1.5.1";
/** Version 1.5.2 */
private static final String VERSION_1_5_2 = "1.5.2";
+ /** Version 1.5.3 */
+ private static final String VERSION_1_5_3 = "1.5.3";
// UI Fields
private Combo versionCombo;
@@ -88,7 +90,7 @@
// Version Combo
versionCombo = new Combo( targetVersionGroup, SWT.DROP_DOWN | SWT.READ_ONLY | SWT.BORDER );
versionCombo.setItems( new String[]
- { VERSION_1_5_2, VERSION_1_5_1, VERSION_1_5_0 } );
+ { VERSION_1_5_3, VERSION_1_5_2, VERSION_1_5_1, VERSION_1_5_0 } );
versionCombo.select( 0 );
setControl( composite );
@@ -107,7 +109,11 @@
String selection = versionCombo.getItem( versionCombo.getSelectionIndex() );
// Checking the version
- if ( selection.equals( VERSION_1_5_2 ) )
+ if ( selection.equals( VERSION_1_5_3 ) )
+ {
+ return ServerConfigurationVersionEnum.VERSION_1_5_3;
+ }
+ else if ( selection.equals( VERSION_1_5_2 ) )
{
return ServerConfigurationVersionEnum.VERSION_1_5_2;
}
Added: directory/studio/trunk/apacheds-configuration/src/main/resources/org/apache/directory/studio/apacheds/configuration/default-server-1.5.3.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds-configuration/src/main/resources/org/apache/directory/studio/apacheds/configuration/default-server-1.5.3.xml?rev=675657&view=auto
==============================================================================
--- directory/studio/trunk/apacheds-configuration/src/main/resources/org/apache/directory/studio/apacheds/configuration/default-server-1.5.3.xml (added)
+++ directory/studio/trunk/apacheds-configuration/src/main/resources/org/apache/directory/studio/apacheds/configuration/default-server-1.5.3.xml Thu Jul 10 10:36:30 2008
@@ -0,0 +1,245 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<spring:beans xmlns:spring="http://xbean.apache.org/schemas/spring/1.0"
+ xmlns:s="http://www.springframework.org/schema/beans"
+ xmlns="http://apacheds.org/config/1.0">
+
+ <defaultDirectoryService id="directoryService" instanceId="default"
+ workingDirectory="example.com"
+ allowAnonymousAccess="true"
+ accessControlEnabled="false"
+ denormalizeOpAttrsEnabled="false">
+ <systemPartition>
+ <!-- use the following partitionConfiguration to override defaults for -->
+ <!-- the system partition -->
+ <jdbmPartition id="system" cacheSize="100" suffix="ou=system" optimizerEnabled="true" syncOnWrite="true">
+ <indexedAttributes>
+ <jdbmIndex attributeId="1.3.6.1.4.1.18060.0.4.1.2.1" cacheSize="100"/>
+ <jdbmIndex attributeId="1.3.6.1.4.1.18060.0.4.1.2.2" cacheSize="100"/>
+ <jdbmIndex attributeId="1.3.6.1.4.1.18060.0.4.1.2.3" cacheSize="100"/>
+ <jdbmIndex attributeId="1.3.6.1.4.1.18060.0.4.1.2.4" cacheSize="100"/>
+ <jdbmIndex attributeId="1.3.6.1.4.1.18060.0.4.1.2.5" cacheSize="10"/>
+ <jdbmIndex attributeId="1.3.6.1.4.1.18060.0.4.1.2.6" cacheSize="10"/>
+ <jdbmIndex attributeId="1.3.6.1.4.1.18060.0.4.1.2.7" cacheSize="10"/>
+ <jdbmIndex attributeId="ou" cacheSize="100"/>
+ <jdbmIndex attributeId="uid" cacheSize="100"/>
+ <jdbmIndex attributeId="objectClass" cacheSize="100"/>
+ </indexedAttributes>
+ <contextEntry>#systemContextEntry</contextEntry>
+ <!-- contextEntry>
+ <s:value>
+ objectClass: top
+ objectClass: organizationalUnit
+ objectClass: extensibleObject
+ ou: system
+ </s:value>
+ </contextEntry -->
+ </jdbmPartition>
+ </systemPartition>
+
+ <partitions>
+ <!-- NOTE: when specifying new partitions you need not include those -->
+ <!-- attributes below with OID's which are the system indices, if left -->
+ <!-- out they will be automatically configured for you with defaults. -->
+ <jdbmPartition id="example" cacheSize="100" suffix="dc=example,dc=com" optimizerEnabled="true"
+ syncOnWrite="true">
+ <indexedAttributes>
+ <jdbmIndex attributeId="1.3.6.1.4.1.18060.0.4.1.2.1" cacheSize="100"/>
+ <jdbmIndex attributeId="1.3.6.1.4.1.18060.0.4.1.2.2" cacheSize="100"/>
+ <jdbmIndex attributeId="1.3.6.1.4.1.18060.0.4.1.2.3" cacheSize="100"/>
+ <jdbmIndex attributeId="1.3.6.1.4.1.18060.0.4.1.2.4" cacheSize="100"/>
+ <jdbmIndex attributeId="1.3.6.1.4.1.18060.0.4.1.2.5" cacheSize="10"/>
+ <jdbmIndex attributeId="1.3.6.1.4.1.18060.0.4.1.2.6" cacheSize="10"/>
+ <jdbmIndex attributeId="1.3.6.1.4.1.18060.0.4.1.2.7" cacheSize="10"/>
+ <jdbmIndex attributeId="dc" cacheSize="100"/>
+ <jdbmIndex attributeId="ou" cacheSize="100"/>
+ <jdbmIndex attributeId="krb5PrincipalName" cacheSize="100"/>
+ <jdbmIndex attributeId="uid" cacheSize="100"/>
+ <jdbmIndex attributeId="objectClass" cacheSize="100"/>
+ </indexedAttributes>
+ <contextEntry>#exampleContextEntry</contextEntry>
+ <!-- contextEntry>
+ <s:value>
+ objectClass: top
+ objectClass: domain
+ objectClass: extensibleObject
+ dc: example
+ </s:value>
+ </contextEntry -->
+ </jdbmPartition>
+ </partitions>
+
+ <interceptors>
+ <normalizationInterceptor/>
+ <authenticationInterceptor/>
+ <referralInterceptor/>
+ <aciAuthorizationInterceptor/>
+ <defaultAuthorizationInterceptor/>
+ <exceptionInterceptor/>
+ <operationalAttributeInterceptor/>
+
+ <!-- Uncomment to enable the password policy interceptor
+ <passwordPolicyInterceptor/>
+ <keyDerivationInterceptor/>
+ -->
+
+ <schemaInterceptor/>
+ <subentryInterceptor/>
+ <collectiveAttributeInterceptor/>
+ <eventInterceptor/>
+ <triggerInterceptor/>
+
+ <!-- Uncomment to enable replication interceptor
+ <replicationInterceptor>
+ <configuration>
+ <replicationConfiguration serverPort="10390" peerReplicas="instance_b@localhost:10392">
+ <replicaId>
+ <replicaId id="instance_a"/>
+ </replicaId>
+ </replicationConfiguration>
+ </configuration>
+ </replicationInterceptor>
+ -->
+ </interceptors>
+ </defaultDirectoryService>
+
+ <standardThreadPool id="standardThreadPool" maxThreads="8"/>
+ <datagramAcceptor id="datagramAcceptor" logicExecutor="#standardThreadPool"/>
+ <socketAcceptor id="socketAcceptor" logicExecutor="#standardThreadPool"/>
+
+<!-- missing atou=users,dc=example,dc=com
+ <changePasswordServer ipPort="60464">
+ <directoryService>#directoryService</directoryService>
+ <datagramAcceptor>#datagramAcceptor</datagramAcceptor>
+ <socketAcceptor>#socketAcceptor</socketAcceptor>
+ </changePasswordServer>
+-->
+<!-- missing atou=users,dc=example,dc=com
+ <kdcServer ipPort="60088">
+ <directoryService>#directoryService</directoryService>
+ <datagramAcceptor>#datagramAcceptor</datagramAcceptor>
+ <socketAcceptor>#socketAcceptor</socketAcceptor>
+ </kdcServer>
+-->
+ <ntpServer ipPort="60123">
+ <datagramAcceptor>#datagramAcceptor</datagramAcceptor>
+ <socketAcceptor>#socketAcceptor</socketAcceptor>
+ </ntpServer>
+<!-- missing atou=users,dc=example,dc=com
+ <dnsServer ipPort="8053">
+ <directoryService>#directoryService</directoryService>
+ <datagramAcceptor>#datagramAcceptor</datagramAcceptor>
+ <socketAcceptor>#socketAcceptor</socketAcceptor>
+ </dnsServer>
+-->
+
+ <ldapServer id="ldapsServer"
+ enabled="true"
+ ipPort="10636"
+ enableLdaps="true">
+ <directoryService>#directoryService</directoryService>
+ <socketAcceptor>#socketAcceptor</socketAcceptor>
+ </ldapServer>
+
+
+ <ldapServer id="ldapServer"
+ ipPort="10389"
+ allowAnonymousAccess="false"
+ saslHost="ldap.example.com"
+ saslPrincipal="ldap/ldap.example.com@EXAMPLE.COM"
+ searchBaseDn="ou=users,ou=system"
+ maxTimeLimit="15000"
+ maxSizeLimit="1000">
+
+ <directoryService>#directoryService</directoryService>
+ <socketAcceptor>#socketAcceptor</socketAcceptor>
+
+ <!-- The list of supported authentication mechanisms. -->
+ <saslMechanismHandlers>
+ <simpleMechanismHandler mech-name="SIMPLE"/>
+ <cramMd5MechanismHandler mech-name="CRAM-MD5" directoryService="#directoryService"/>
+ <digestMd5MechanismHandler mech-name="DIGEST-MD5" directoryService="#directoryService"/>
+ <gssapiMechanismHandler mech-name="GSSAPI" directoryService="#directoryService"/>
+ <ntlmMechanismHandler mech-name="NTLM" ntlmProviderFqcn="com.foo.Bar"/>
+ <ntlmMechanismHandler mech-name="GSS-SPNEGO" ntlmProviderFqcn="com.foo.Bar"/>
+ </saslMechanismHandlers>
+
+ <!-- The desired quality-of-protection, used by DIGEST-MD5 and GSSAPI. -->
+ <saslQop>
+ <s:value>auth</s:value>
+ <s:value>auth-int</s:value>
+ <s:value>auth-conf</s:value>
+ </saslQop>
+
+ <!-- The realms serviced by this SASL host, used by DIGEST-MD5 and GSSAPI. -->
+ <saslRealms>
+ <s:value>example.com</s:value>
+ <s:value>apache.org</s:value>
+ </saslRealms>
+
+ <!-- the collection of extended operation handlers to install -->
+ <extendedOperationHandlers>
+ <startTlsHandler/>
+ <gracefulShutdownHandler/>
+ <launchDiagnosticUiHandler/>
+ <!-- The Stored Procedure Extended Operation is not stable yet and it may cause security risks.-->
+ <!--storedProcedureExtendedOperationHandler/-->
+ </extendedOperationHandlers>
+ </ldapServer>
+
+
+ <apacheDS id="apacheDS"
+ synchPeriodMillis="15000"
+ allowAnonymousAccess="false">
+
+ <directoryService>#directoryService</directoryService>
+ <ldapServer>#ldapServer</ldapServer>
+ <ldapsServer>#ldapsServer</ldapsServer>
+ </apacheDS>
+
+ <spring:bean id="systemContextEntry"
+ class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
+ <spring:property name="targetObject"><spring:ref local='directoryService'/></spring:property>
+ <spring:property name="targetMethod"><spring:value>newEntry</spring:value></spring:property>
+ <spring:property name="arguments">
+ <spring:list>
+ <spring:value xmlns="http://www.springframework.org/schema/beans">
+ objectClass: top
+ objectClass: organizationalUnit
+ objectClass: extensibleObject
+ ou: system
+ </spring:value>
+ <spring:value>ou=system</spring:value>
+ </spring:list>
+ </spring:property>
+ </spring:bean>
+
+ <spring:bean id="exampleContextEntry"
+ class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
+ <spring:property name="targetObject"><spring:ref local='directoryService'/></spring:property>
+ <spring:property name="targetMethod"><spring:value>newEntry</spring:value></spring:property>
+ <spring:property name="arguments">
+ <spring:list>
+ <spring:value xmlns="http://www.springframework.org/schema/beans">
+ objectClass: top
+ objectClass: domain
+ objectClass: extensibleObject
+ dc: example
+ </spring:value>
+ <spring:value>dc=example,dc=com</spring:value>
+ </spring:list>
+ </spring:property>
+ </spring:bean>
+
+ <!-- another bean I didn't convert -->
+ <spring:bean class="org.springframework.beans.factory.config.CustomEditorConfigurer">
+ <spring:property name="customEditors">
+ <spring:map>
+ <spring:entry key="javax.naming.directory.Attributes">
+ <spring:bean class="org.apache.directory.server.core.configuration.AttributesPropertyEditor"/>
+ </spring:entry>
+ </spring:map>
+ </spring:property>
+ </spring:bean>
+</spring:beans>