You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by fe...@apache.org on 2007/11/28 00:36:53 UTC
svn commit: r598822 [1/3] - in /directory/sandbox/felixk:
studio-apacheds-configuration/resources/icons/
studio-apacheds-configuration/src/main/resources/org/apache/directory/studio/apacheds/configuration/
studio-connection-core/src/main/resources/ stu...
Author: felixk
Date: Tue Nov 27 15:36:48 2007
New Revision: 598822
URL: http://svn.apache.org/viewvc?rev=598822&view=rev
Log:
Some updates from trunk (up to r598668)
Added:
directory/sandbox/felixk/studio-apacheds-configuration/src/main/resources/org/apache/directory/studio/apacheds/configuration/Copy of default-server.xml (with props)
directory/sandbox/felixk/studio-connection-core/src/main/resources/jndiLogger.exsd
directory/sandbox/felixk/studio-schemaeditor-help/contexts.xml (with props)
directory/sandbox/felixk/studio-schemaeditor-help/src/main/resources/html/images/icons_attribute-type-hierarchy-selected.gif (with props)
directory/sandbox/felixk/studio-schemaeditor-help/src/main/resources/html/images/icons_hierarchy-type.gif (with props)
directory/sandbox/felixk/studio-schemaeditor-help/src/main/resources/html/images/icons_object-class-hierarchy-selected.gif (with props)
directory/sandbox/felixk/studio-schemaeditor-help/src/main/resources/html/images/icons_project-online-closed.gif (with props)
directory/sandbox/felixk/studio-schemaeditor-help/src/main/resources/html/images/icons_project-online.gif (with props)
directory/sandbox/felixk/studio-schemaeditor-help/src/main/resources/html/images/tasks_new-project-wizard_page-1.png (with props)
directory/sandbox/felixk/studio-schemaeditor-help/src/main/resources/html/images/tasks_new-project-wizard_page-2_offline.png (with props)
directory/sandbox/felixk/studio-schemaeditor-help/src/main/resources/html/images/tasks_new-project-wizard_page-2_online.png (with props)
directory/sandbox/felixk/studio-schemaeditor-help/src/main/resources/html/images/views_schema-view-flat-presentation.png (with props)
directory/sandbox/felixk/studio-schemaeditor-help/src/main/resources/html/images/views_schema-view-hierarchical-presentation.png (with props)
Modified:
directory/sandbox/felixk/studio-apacheds-configuration/resources/icons/editor.gif
directory/sandbox/felixk/studio-apacheds-configuration/src/main/resources/org/apache/directory/studio/apacheds/configuration/default-server.xml
directory/sandbox/felixk/studio-schemaeditor-help/src/main/docbook/0_index.xml
directory/sandbox/felixk/studio-schemaeditor-help/src/main/resources/html/images/preferences_schema-view.png
directory/sandbox/felixk/studio-schemaeditor-help/src/main/resources/html/images/views_hierarchy-view.png
directory/sandbox/felixk/studio-schemaeditor-help/src/main/resources/html/images/views_projects-view.png
directory/sandbox/felixk/studio-schemaeditor-help/src/main/resources/html/images/views_search-view.png
Modified: directory/sandbox/felixk/studio-apacheds-configuration/resources/icons/editor.gif
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-apacheds-configuration/resources/icons/editor.gif?rev=598822&r1=598821&r2=598822&view=diff
==============================================================================
Binary files - no diff available.
Added: directory/sandbox/felixk/studio-apacheds-configuration/src/main/resources/org/apache/directory/studio/apacheds/configuration/Copy of default-server.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-apacheds-configuration/src/main/resources/org/apache/directory/studio/apacheds/configuration/Copy%20of%20default-server.xml?rev=598822&view=auto
==============================================================================
--- directory/sandbox/felixk/studio-apacheds-configuration/src/main/resources/org/apache/directory/studio/apacheds/configuration/Copy of default-server.xml (added)
+++ directory/sandbox/felixk/studio-apacheds-configuration/src/main/resources/org/apache/directory/studio/apacheds/configuration/Copy of default-server.xml Tue Nov 27 15:36:48 2007
@@ -0,0 +1,368 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN"
+ "http://www.springframework.org/dtd/spring-beans.dtd">
+
+<beans>
+ <bean id="environment" class="org.springframework.beans.factory.config.PropertiesFactoryBean">
+ <property name="properties">
+ <props>
+ <prop key="java.naming.security.authentication">simple</prop>
+ <prop key="java.naming.security.principal">uid=admin,ou=system</prop>
+ <prop key="java.naming.security.credentials">secret</prop>
+ <!--<prop key="kdc.entryBaseDn">ou=users,dc=example,dc=com</prop>-->
+ <!--<prop key="kdc.java.naming.security.credentials">secret</prop>-->
+ <!--<prop key="changepw.entryBaseDn">ou=users,dc=example,dc=com</prop>-->
+ <!--<prop key="changepw.java.naming.security.credentials">secret</prop>-->
+ <!-- Set this key to a space delimited set of attributeType descriptions
+ and their OID's if you want an attributeType to be handled as
+ binary content.
+
+ The server will use the schema to derive the set of attributeTypes
+ to treat as binary. The union if the values you provide here
+ will be taken as the set of binaries. Note to be consistent you
+ must add both the OID and all the names an attributeType can have.
+ -->
+ <!--
+ <prop key="java.naming.ldap.attributes.binary"></prop>
+ -->
+ </props>
+ </property>
+ </bean>
+
+ <bean id="configuration" class="org.apache.directory.server.configuration.MutableServerStartupConfiguration">
+ <property name="workingDirectory" value="example.com" />
+
+ <!-- Uncomment below to have the server load entries on startup! -->
+ <!-- ldifDirectory property can point to a relative file, directory or -->
+ <!-- can point to an absolute path to either using the URL path -->
+ <!-- notation: i.e. file:///Users/jack/apacheds/ldifs -->
+
+ <!-- Entries will optionally be filtered using LdifLoadFilters in the -->
+ <!-- order specified. The included Krb5KdcEntryFilter will filter -->
+ <!-- kerberos principals creating keys for them using their -->
+ <!-- userPassword attribute if present. -->
+
+ <!--<property name="ldifDirectory">
+ <value>example.ldif</value>
+ </property>
+ <property name="ldifFilters">
+ <list>
+ <bean class="org.apache.directory.server.protocol.shared.store.Krb5KdcEntryFilter"/>
+ </list>
+ </property>-->
+
+ <!-- the number of milliseconds before issuing a synch (flush to disk) -->
+ <!-- which writes out dirty pages back to disk. To turn off synchs all -->
+ <!-- together simply set this value to <= 0. Make sure you turn on -->
+ <!-- synchOnWrite for all partitions if you do choose to do this or else-->
+ <!-- writes may never persist to disk. -->
+ <property name="synchPeriodMillis" value="15000" />
+
+ <!-- limits searches by non-admin users to a max time of 15000 -->
+ <!-- milliseconds and has a default value of 10000 -->
+ <property name="maxTimeLimit" value="15000" />
+ <!-- limits searches to max size of 1000 entries: default value is 100 -->
+ <property name="maxSizeLimit" value="1000" />
+ <!-- maximum number of threads used by mina is set to 8: default is 4 -->
+ <property name="maxThreads" value="8" />
+
+ <property name="allowAnonymousAccess" value="false" />
+ <property name="accessControlEnabled" value="false" />
+ <property name="enableNtp" value="false" />
+ <property name="enableKerberos" value="false" />
+ <property name="enableChangePassword" value="false" />
+
+ <!--
+ It's more efficient to keep this feature turned off but you may not like
+ having the creatorsName and modifiersName contain OIDs instead of short
+ attributeType names instead. So if you want the creatorsName to change
+ from the normalized form which is the internal representation of
+
+ '0.9.2342.19200300.100.1.1=admin,2.5.4.11=system'
+
+ to a more human readabile form like:
+
+ 'uid=admin,ou=system'
+
+ then set this property to true.
+ -->
+ <property name="denormalizeOpAttrsEnabled" value="false" />
+
+ <property name="ldapPort" value="10389" />
+
+ <property name="systemPartitionConfiguration" ref="systemPartitionConfiguration" />
+
+ <property name="partitionConfigurations">
+ <set>
+ <ref bean="examplePartitionConfiguration"/>
+ </set>
+ </property>
+
+ <property name="extendedOperationHandlers">
+ <list>
+ <bean class="org.apache.directory.server.ldap.support.extended.GracefulShutdownHandler"/>
+ <bean class="org.apache.directory.server.ldap.support.extended.LaunchDiagnosticUiHandler"/>
+ </list>
+ </property>
+
+ <property name="interceptorConfigurations">
+ <list>
+ <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
+ <property name="name" value="normalizationService" />
+ <property name="interceptor">
+ <bean class="org.apache.directory.server.core.normalization.NormalizationService" />
+ </property>
+ </bean>
+ <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
+ <property name="name" value="authenticationService" />
+ <property name="interceptor">
+ <bean class="org.apache.directory.server.core.authn.AuthenticationService" />
+ </property>
+ </bean>
+ <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
+ <property name="name" value="referralService" />
+ <property name="interceptor">
+ <bean class="org.apache.directory.server.core.referral.ReferralService" />
+ </property>
+ </bean>
+ <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
+ <property name="name" value="authorizationService" />
+ <property name="interceptor">
+ <bean class="org.apache.directory.server.core.authz.AuthorizationService" />
+ </property>
+ </bean>
+ <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
+ <property name="name" value="defaultAuthorizationService" />
+ <property name="interceptor">
+ <bean class="org.apache.directory.server.core.authz.DefaultAuthorizationService" />
+ </property>
+ </bean>
+ <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
+ <property name="name" value="exceptionService" />
+ <property name="interceptor">
+ <bean class="org.apache.directory.server.core.exception.ExceptionService" />
+ </property>
+ </bean>
+ <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
+ <property name="name" value="operationalAttributeService" />
+ <property name="interceptor">
+ <bean class="org.apache.directory.server.core.operational.OperationalAttributeService" />
+ </property>
+ </bean>
+ <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
+ <property name="name" value="schemaService" />
+ <property name="interceptor">
+ <bean class="org.apache.directory.server.core.schema.SchemaService" />
+ </property>
+ </bean>
+ <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
+ <property name="name" value="subentryService" />
+ <property name="interceptor">
+ <bean class="org.apache.directory.server.core.subtree.SubentryService" />
+ </property>
+ </bean>
+ <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
+ <property name="name" value="collectiveAttributeService" />
+ <property name="interceptor">
+ <bean class="org.apache.directory.server.core.collective.CollectiveAttributeService" />
+ </property>
+ </bean>
+ <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
+ <property name="name" value="eventService" />
+ <property name="interceptor">
+ <bean class="org.apache.directory.server.core.event.EventService" />
+ </property>
+ </bean>
+ <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
+ <property name="name" value="triggerService" />
+ <property name="interceptor">
+ <bean class="org.apache.directory.server.core.trigger.TriggerService" />
+ </property>
+ </bean>
+
+ <!-- Uncomment to enable replication service
+ <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
+ <property name="name" value="replicationService" />
+ <property name="interceptor">
+ <bean class="org.apache.directory.mitosis.service.ReplicationService">
+ <property name="configuration">
+ <bean class="org.apache.directory.mitosis.configuration.ReplicationConfiguration">
+ <property name="replicaId" value="instance_a" />
+ <property name="serverPort" value="10390" />
+ <property name="peerReplicas" value="instance_b@localhost:10392" />
+ </bean>
+ </property>
+ </bean>
+ </property>
+ </bean>
+ -->
+ </list>
+ </property>
+ </bean>
+
+ <!-- use the following partitionConfiguration to override defaults for -->
+ <!-- the system partition -->
+ <bean id="systemPartitionConfiguration" class="org.apache.directory.server.core.partition.impl.btree.MutableBTreePartitionConfiguration">
+ <property name="name" value="system" />
+ <property name="cacheSize" value="100" />
+ <property name="suffix" value="ou=system" />
+
+ <!-- the optimizer is enabled by default but may not always be what -->
+ <!-- you want if your queries are really simple -->
+ <property name="optimizerEnabled" value="true" />
+
+ <!--
+ Synchronization on writes does not wait for synch operations
+ to flush dirty pages. Writes persist immediately to disk at
+ a cost to performance with increased data integrity. Otherwise
+ the periodic synch operation will flush dirty pages using the
+ synchPeriodMillis parameter in the main configuration.
+ -->
+ <property name="synchOnWrite" value="true" />
+ <property name="indexedAttributes">
+ <set>
+ <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
+ <property name="attributeId" value="1.3.6.1.4.1.18060.0.4.1.2.1" />
+ <property name="cacheSize" value="100" />
+ </bean>
+ <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
+ <property name="attributeId" value="1.3.6.1.4.1.18060.0.4.1.2.2" />
+ <property name="cacheSize" value="100" />
+ </bean>
+ <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
+ <property name="attributeId" value="1.3.6.1.4.1.18060.0.4.1.2.3" />
+ <property name="cacheSize" value="100" />
+ </bean>
+ <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
+ <property name="attributeId" value="1.3.6.1.4.1.18060.0.4.1.2.4" />
+ <property name="cacheSize" value="100" />
+ </bean>
+ <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
+ <property name="attributeId" value="1.3.6.1.4.1.18060.0.4.1.2.5" />
+ <property name="cacheSize" value="10" />
+ </bean>
+ <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
+ <property name="attributeId" value="1.3.6.1.4.1.18060.0.4.1.2.6" />
+ <property name="cacheSize" value="10" />
+ </bean>
+ <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
+ <property name="attributeId" value="1.3.6.1.4.1.18060.0.4.1.2.7" />
+ <property name="cacheSize" value="10" />
+ </bean>
+
+ <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
+ <property name="attributeId" value="ou" />
+ <property name="cacheSize" value="100" />
+ </bean>
+ <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
+ <property name="attributeId" value="uid" />
+ <property name="cacheSize" value="100" />
+ </bean>
+ <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
+ <property name="attributeId" value="objectClass" />
+ <property name="cacheSize" value="100" />
+ </bean>
+ </set>
+ </property>
+ <property name="contextEntry">
+ <value>
+ objectClass: top
+ objectClass: organizationalUnit
+ objectClass: extensibleObject
+ ou: system
+ </value>
+ </property>
+ </bean>
+
+
+ <bean id="examplePartitionConfiguration" class="org.apache.directory.server.core.partition.impl.btree.MutableBTreePartitionConfiguration">
+ <property name="name" value="example" />
+ <property name="cacheSize" value="100" />
+ <property name="suffix" value="dc=example,dc=com" />
+
+ <!-- the optimizer is enabled by default but may not always be what -->
+ <!-- you want if your queries are really simple -->
+ <property name="optimizerEnabled" value="true" />
+
+ <!--
+ Synchronization on writes does not wait for synch operations
+ to flush dirty pages. Writes persist immediately to disk at
+ a cost to performance with increased data integrity. Otherwise
+ the periodic synch operation will flush dirty pages using the
+ synchPeriodMillis parameter in the main configuration.
+ -->
+ <property name="synchOnWrite" value="true" />
+ <property name="indexedAttributes">
+ <set>
+ <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
+ <property name="attributeId" value="1.3.6.1.4.1.18060.0.4.1.2.1" />
+ <property name="cacheSize" value="100" />
+ </bean>
+ <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
+ <property name="attributeId" value="1.3.6.1.4.1.18060.0.4.1.2.2" />
+ <property name="cacheSize" value="100" />
+ </bean>
+ <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
+ <property name="attributeId" value="1.3.6.1.4.1.18060.0.4.1.2.3" />
+ <property name="cacheSize" value="100" />
+ </bean>
+ <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
+ <property name="attributeId" value="1.3.6.1.4.1.18060.0.4.1.2.4" />
+ <property name="cacheSize" value="100" />
+ </bean>
+ <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
+ <property name="attributeId" value="1.3.6.1.4.1.18060.0.4.1.2.5" />
+ <property name="cacheSize" value="10" />
+ </bean>
+ <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
+ <property name="attributeId" value="1.3.6.1.4.1.18060.0.4.1.2.6" />
+ <property name="cacheSize" value="10" />
+ </bean>
+ <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
+ <property name="attributeId" value="1.3.6.1.4.1.18060.0.4.1.2.7" />
+ <property name="cacheSize" value="10" />
+ </bean>
+
+ <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
+ <property name="attributeId" value="dc" />
+ <property name="cacheSize" value="100" />
+ </bean>
+ <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
+ <property name="attributeId" value="ou" />
+ <property name="cacheSize" value="100" />
+ </bean>
+ <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
+ <property name="attributeId" value="krb5PrincipalName" />
+ <property name="cacheSize" value="100" />
+ </bean>
+ <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
+ <property name="attributeId" value="uid" />
+ <property name="cacheSize" value="100" />
+ </bean>
+ <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
+ <property name="attributeId" value="objectClass" />
+ <property name="cacheSize" value="100" />
+ </bean>
+ </set>
+ </property>
+ <property name="contextEntry">
+ <value>
+ objectClass: top
+ objectClass: domain
+ objectClass: extensibleObject
+ dc: example
+ </value>
+ </property>
+ </bean>
+
+ <bean class="org.springframework.beans.factory.config.CustomEditorConfigurer">
+ <property name="customEditors">
+ <map>
+ <entry key="javax.naming.directory.Attributes">
+ <bean class="org.apache.directory.server.core.configuration.AttributesPropertyEditor"/>
+ </entry>
+ </map>
+ </property>
+ </bean>
+</beans>
Propchange: directory/sandbox/felixk/studio-apacheds-configuration/src/main/resources/org/apache/directory/studio/apacheds/configuration/Copy of default-server.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: directory/sandbox/felixk/studio-apacheds-configuration/src/main/resources/org/apache/directory/studio/apacheds/configuration/default-server.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-apacheds-configuration/src/main/resources/org/apache/directory/studio/apacheds/configuration/default-server.xml?rev=598822&r1=598821&r2=598822&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-apacheds-configuration/src/main/resources/org/apache/directory/studio/apacheds/configuration/default-server.xml (original)
+++ directory/sandbox/felixk/studio-apacheds-configuration/src/main/resources/org/apache/directory/studio/apacheds/configuration/default-server.xml Tue Nov 27 15:36:48 2007
@@ -7,13 +7,10 @@
<bean id="environment" class="org.springframework.beans.factory.config.PropertiesFactoryBean">
<property name="properties">
<props>
+ <!-- JNDI security properties used to get initial contexts. -->
<prop key="java.naming.security.authentication">simple</prop>
<prop key="java.naming.security.principal">uid=admin,ou=system</prop>
<prop key="java.naming.security.credentials">secret</prop>
- <!--<prop key="kdc.entryBaseDn">ou=users,dc=example,dc=com</prop>-->
- <!--<prop key="kdc.java.naming.security.credentials">secret</prop>-->
- <!--<prop key="changepw.entryBaseDn">ou=users,dc=example,dc=com</prop>-->
- <!--<prop key="changepw.java.naming.security.credentials">secret</prop>-->
<!-- Set this key to a space delimited set of attributeType descriptions
and their OID's if you want an attributeType to be handled as
binary content.
@@ -30,6 +27,107 @@
</property>
</bean>
+ <bean id="changePasswordConfiguration" class="org.apache.directory.server.changepw.ChangePasswordConfiguration">
+ <!-- Whether to enable the Change Password protocol. -->
+ <property name="enabled" value="false" />
+ <!-- The port to run the Change Password protocol on. -->
+ <property name="ipPort" value="464" />
+ </bean>
+
+ <bean id="ntpConfiguration" class="org.apache.directory.server.ntp.NtpConfiguration">
+ <!-- Whether to enable the NTP protocol. -->
+ <property name="enabled" value="false" />
+ <!-- The port to run the NTP protocol on. -->
+ <property name="ipPort" value="123" />
+ </bean>
+
+ <bean id="dnsConfiguration" class="org.apache.directory.server.dns.DnsConfiguration">
+ <!-- Whether to enable the DNS protocol. -->
+ <property name="enabled" value="false" />
+ <!-- The port to run the DNS protocol on. -->
+ <property name="ipPort" value="53" />
+ </bean>
+
+ <bean id="kdcConfiguration" class="org.apache.directory.server.kerberos.kdc.KdcConfiguration">
+ <!-- Whether to enable the Kerberos protocol. -->
+ <property name="enabled" value="false" />
+ <!-- The port to run the Kerberos protocol on. -->
+ <property name="ipPort" value="88" />
+ </bean>
+
+ <bean id="ldapsConfiguration" class="org.apache.directory.server.ldap.LdapConfiguration">
+ <!-- Whether to enable the LDAPS protocol. -->
+ <property name="enabled" value="false" />
+ <!-- The port to run the LDAPS protocol on. -->
+ <property name="ipPort" value="636" />
+
+ <property name="enableLdaps" value="true" />
+ </bean>
+
+ <bean id="ldapConfiguration" class="org.apache.directory.server.ldap.LdapConfiguration">
+ <!-- The port to run the LDAP protocol on. -->
+ <property name="ipPort" value="10389" />
+ <!-- Whether to allow anonymous access. -->
+ <property name="allowAnonymousAccess" value="false" />
+
+ <!-- The list of supported authentication mechanisms. -->
+ <property name="supportedMechanisms">
+ <list>
+ <value>SIMPLE</value>
+ <value>CRAM-MD5</value>
+ <value>DIGEST-MD5</value>
+ <!--<value>GSSAPI</value>-->
+ </list>
+ </property>
+
+ <!-- The FQDN of this SASL host, validated during SASL negotiation. -->
+ <property name="saslHost" value="ldap.example.com" />
+
+ <!-- The Kerberos principal name for this LDAP service, used by GSSAPI. -->
+ <property name="saslPrincipal" value="ldap/ldap.example.com@EXAMPLE.COM" />
+
+ <!-- The desired quality-of-protection, used by DIGEST-MD5 and GSSAPI. -->
+ <property name="saslQop">
+ <list>
+ <value>auth</value>
+ <value>auth-int</value>
+ <value>auth-conf</value>
+ </list>
+ </property>
+
+ <!-- The realms serviced by this SASL host, used by DIGEST-MD5 and GSSAPI. -->
+ <property name="saslRealms">
+ <list>
+ <value>example.com</value>
+ <value>apache.org</value>
+ </list>
+ </property>
+
+ <!-- The base DN containing users that can be SASL authenticated. -->
+ <property name="searchBaseDn" value="ou=users,ou=system" />
+
+ <!-- SSL CONFIG CAN GO HERE-->
+
+ <!-- limits searches by non-admin users to a max time of 15000 -->
+ <!-- milliseconds and has a default value of 10000 -->
+ <property name="maxTimeLimit" value="15000" />
+
+ <!-- limits searches to max size of 1000 entries: default value is 100 -->
+ <property name="maxSizeLimit" value="1000" />
+
+ <!-- the collection of extended operation handlers to install -->
+ <property name="extendedOperationHandlers">
+ <list>
+ <!--<bean class="org.apache.directory.server.ldap.support.starttls.StartTlsHandler"/>-->
+ <bean class="org.apache.directory.server.ldap.support.extended.GracefulShutdownHandler"/>
+ <bean class="org.apache.directory.server.ldap.support.extended.LaunchDiagnosticUiHandler"/>
+ <!-- The Stored Procedure Extended Operation is not stable yet and it may cause security risks.
+ <bean class="org.apache.directory.server.ldap.support.extended.StoredProcedureExtendedOperationHandler"/>
+ -->
+ </list>
+ </property>
+ </bean>
+
<bean id="configuration" class="org.apache.directory.server.configuration.MutableServerStartupConfiguration">
<property name="workingDirectory" value="example.com" />
@@ -38,19 +136,19 @@
<!-- can point to an absolute path to either using the URL path -->
<!-- notation: i.e. file:///Users/jack/apacheds/ldifs -->
- <!-- Entries will optionally be filtered using LdifLoadFilters in the -->
- <!-- order specified. The included Krb5KdcEntryFilter will filter -->
- <!-- kerberos principals creating keys for them using their -->
- <!-- userPassword attribute if present. -->
-
- <!--<property name="ldifDirectory">
- <value>example.ldif</value>
+ <property name="ldifDirectory">
+ <value>ldif</value>
</property>
+
+ <!-- Entries will optionally be filtered using LdifLoadFilters in the -->
+ <!-- order specified. -->
+ <!--
<property name="ldifFilters">
<list>
- <bean class="org.apache.directory.server.protocol.shared.store.Krb5KdcEntryFilter"/>
+ <bean class="com.example.MyEntryFilter"/>
</list>
- </property>-->
+ </property>
+ -->
<!-- the number of milliseconds before issuing a synch (flush to disk) -->
<!-- which writes out dirty pages back to disk. To turn off synchs all -->
@@ -59,20 +157,12 @@
<!-- writes may never persist to disk. -->
<property name="synchPeriodMillis" value="15000" />
- <!-- limits searches by non-admin users to a max time of 15000 -->
- <!-- milliseconds and has a default value of 10000 -->
- <property name="maxTimeLimit" value="15000" />
- <!-- limits searches to max size of 1000 entries: default value is 100 -->
- <property name="maxSizeLimit" value="1000" />
<!-- maximum number of threads used by mina is set to 8: default is 4 -->
<property name="maxThreads" value="8" />
<property name="allowAnonymousAccess" value="false" />
<property name="accessControlEnabled" value="false" />
- <property name="enableNtp" value="false" />
- <property name="enableKerberos" value="false" />
- <property name="enableChangePassword" value="false" />
-
+
<!--
It's more efficient to keep this feature turned off but you may not like
having the creatorsName and modifiersName contain OIDs instead of short
@@ -89,7 +179,12 @@
-->
<property name="denormalizeOpAttrsEnabled" value="false" />
- <property name="ldapPort" value="10389" />
+ <property name="ntpConfiguration" ref="ntpConfiguration" />
+ <property name="dnsConfiguration" ref="dnsConfiguration" />
+ <property name="changePasswordConfiguration" ref="changePasswordConfiguration" />
+ <property name="kdcConfiguration" ref="kdcConfiguration" />
+ <property name="ldapConfiguration" ref="ldapConfiguration" />
+ <property name="ldapsConfiguration" ref="ldapsConfiguration" />
<property name="systemPartitionConfiguration" ref="systemPartitionConfiguration" />
@@ -99,100 +194,97 @@
</set>
</property>
- <property name="extendedOperationHandlers">
- <list>
- <bean class="org.apache.directory.server.ldap.support.extended.GracefulShutdownHandler"/>
- <bean class="org.apache.directory.server.ldap.support.extended.LaunchDiagnosticUiHandler"/>
- </list>
- </property>
-
<property name="interceptorConfigurations">
<list>
<bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
<property name="name" value="normalizationService" />
- <property name="interceptor">
- <bean class="org.apache.directory.server.core.normalization.NormalizationService" />
- </property>
+ <property name="interceptorClassName"
+ value="org.apache.directory.server.core.normalization.NormalizationService" />
</bean>
<bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
<property name="name" value="authenticationService" />
- <property name="interceptor">
- <bean class="org.apache.directory.server.core.authn.AuthenticationService" />
- </property>
+ <property name="interceptorClassName"
+ value="org.apache.directory.server.core.authn.AuthenticationService" />
</bean>
<bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
<property name="name" value="referralService" />
- <property name="interceptor">
- <bean class="org.apache.directory.server.core.referral.ReferralService" />
- </property>
+ <property name="interceptorClassName"
+ value="org.apache.directory.server.core.referral.ReferralService" />
</bean>
<bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
<property name="name" value="authorizationService" />
- <property name="interceptor">
- <bean class="org.apache.directory.server.core.authz.AuthorizationService" />
- </property>
+ <property name="interceptorClassName"
+ value="org.apache.directory.server.core.authz.AuthorizationService" />
</bean>
<bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
<property name="name" value="defaultAuthorizationService" />
- <property name="interceptor">
- <bean class="org.apache.directory.server.core.authz.DefaultAuthorizationService" />
- </property>
+ <property name="interceptorClassName"
+ value="org.apache.directory.server.core.authz.DefaultAuthorizationService" />
</bean>
<bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
<property name="name" value="exceptionService" />
- <property name="interceptor">
- <bean class="org.apache.directory.server.core.exception.ExceptionService" />
- </property>
+ <property name="interceptorClassName"
+ value="org.apache.directory.server.core.exception.ExceptionService" />
</bean>
<bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
<property name="name" value="operationalAttributeService" />
- <property name="interceptor">
- <bean class="org.apache.directory.server.core.operational.OperationalAttributeService" />
- </property>
+ <property name="interceptorClassName"
+ value="org.apache.directory.server.core.operational.OperationalAttributeService" />
+ </bean>
+ <!-- Uncomment to enable the password policy service
+ <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
+ <property name="name" value="passwordPolicyService" />
+ <property name="interceptorClassName"
+ value="org.apache.directory.server.core.kerberos.PasswordPolicyService" />
</bean>
<bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
+ <property name="name" value="keyDerivationService" />
+ <property name="interceptorClassName"
+ value="org.apache.directory.server.core.kerberos.KeyDerivationService" />
+ </bean>
+ -->
+ <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
<property name="name" value="schemaService" />
- <property name="interceptor">
- <bean class="org.apache.directory.server.core.schema.SchemaService" />
- </property>
+ <property name="interceptorClassName"
+ value="org.apache.directory.server.core.schema.SchemaService" />
</bean>
<bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
<property name="name" value="subentryService" />
- <property name="interceptor">
- <bean class="org.apache.directory.server.core.subtree.SubentryService" />
- </property>
+ <property name="interceptorClassName"
+ value="org.apache.directory.server.core.subtree.SubentryService" />
</bean>
<bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
<property name="name" value="collectiveAttributeService" />
- <property name="interceptor">
- <bean class="org.apache.directory.server.core.collective.CollectiveAttributeService" />
- </property>
+ <property name="interceptorClassName"
+ value="org.apache.directory.server.core.collective.CollectiveAttributeService" />
</bean>
<bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
<property name="name" value="eventService" />
- <property name="interceptor">
- <bean class="org.apache.directory.server.core.event.EventService" />
- </property>
+ <property name="interceptorClassName"
+ value="org.apache.directory.server.core.event.EventService" />
</bean>
<bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
<property name="name" value="triggerService" />
- <property name="interceptor">
- <bean class="org.apache.directory.server.core.trigger.TriggerService" />
- </property>
+ <property name="interceptorClassName"
+ value="org.apache.directory.server.core.trigger.TriggerService" />
</bean>
- <!-- Uncomment to enable replication service
- <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
+ <!-- Uncomment to enable replication service
+ <bean class="org.apache.directory.mitosis.configuration.MutableReplicationInterceptorConfiguration">
<property name="name" value="replicationService" />
- <property name="interceptor">
- <bean class="org.apache.directory.mitosis.service.ReplicationService">
- <property name="configuration">
- <bean class="org.apache.directory.mitosis.configuration.ReplicationConfiguration">
- <property name="replicaId" value="instance_a" />
- <property name="serverPort" value="10390" />
- <property name="peerReplicas" value="instance_b@localhost:10392" />
+ <property name="interceptorClassName"
+ value="org.apache.directory.mitosis.service.ReplicationService" />
+ <property name="replicationConfiguration">
+ <bean class="org.apache.directory.mitosis.configuration.ReplicationConfiguration">
+ <property name="replicaId">
+ <bean class="org.apache.directory.mitosis.common.ReplicaId">
+ <constructor-arg>
+ <value>instance_a</value>
+ </constructor-arg>
</bean>
</property>
+ <property name="serverPort" value="10390" />
+ <property name="peerReplicas" value="instance_b@localhost:10392" />
</bean>
</property>
</bean>
@@ -204,10 +296,11 @@
<!-- use the following partitionConfiguration to override defaults for -->
<!-- the system partition -->
<bean id="systemPartitionConfiguration" class="org.apache.directory.server.core.partition.impl.btree.MutableBTreePartitionConfiguration">
- <property name="name" value="system" />
+ <property name="id" value="system" />
<property name="cacheSize" value="100" />
<property name="suffix" value="ou=system" />
-
+ <property name="partitionClassName"
+ value="org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition" />
<!-- the optimizer is enabled by default but may not always be what -->
<!-- you want if your queries are really simple -->
<property name="optimizerEnabled" value="true" />
@@ -250,7 +343,6 @@
<property name="attributeId" value="1.3.6.1.4.1.18060.0.4.1.2.7" />
<property name="cacheSize" value="10" />
</bean>
-
<bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
<property name="attributeId" value="ou" />
<property name="cacheSize" value="100" />
@@ -277,9 +369,11 @@
<bean id="examplePartitionConfiguration" class="org.apache.directory.server.core.partition.impl.btree.MutableBTreePartitionConfiguration">
- <property name="name" value="example" />
+ <property name="id" value="example" />
<property name="cacheSize" value="100" />
<property name="suffix" value="dc=example,dc=com" />
+ <property name="partitionClassName"
+ value="org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition" />
<!-- the optimizer is enabled by default but may not always be what -->
<!-- you want if your queries are really simple -->
Added: directory/sandbox/felixk/studio-connection-core/src/main/resources/jndiLogger.exsd
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-connection-core/src/main/resources/jndiLogger.exsd?rev=598822&view=auto
==============================================================================
--- directory/sandbox/felixk/studio-connection-core/src/main/resources/jndiLogger.exsd (added)
+++ directory/sandbox/felixk/studio-connection-core/src/main/resources/jndiLogger.exsd Tue Nov 27 15:36:48 2007
@@ -0,0 +1,160 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.apache.directory.studio.connection.core">
+<annotation>
+ <appInfo>
+ <meta.schema plugin="org.apache.directory.studio.connection.core" id="jndiLogger" name="JNDI Logger"/>
+ </appInfo>
+ <documentation>
+ An JNDI Logger is used to log an LDAP request send by the JNDIConnectionWrapper.
+ </documentation>
+ </annotation>
+
+ <element name="extension">
+ <complexType>
+ <sequence minOccurs="1" maxOccurs="unbounded">
+ <element ref="jndiLogger"/>
+ </sequence>
+ <attribute name="point" type="string" use="required">
+ <annotation>
+ <documentation>
+ The extension-point of this extension.
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="id" type="string">
+ <annotation>
+ <documentation>
+ Extension identifier.
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="name" type="string">
+ <annotation>
+ <documentation>
+ Name of this extension.
+ </documentation>
+ </annotation>
+ </attribute>
+ </complexType>
+ </element>
+
+ <element name="jndiLogger">
+ <annotation>
+ <appInfo>
+ <meta.element labelAttribute="name" icon="icon"/>
+ </appInfo>
+ </annotation>
+ <complexType>
+ <attribute name="id" type="string" use="required">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="name" type="string" use="required">
+ <annotation>
+ <documentation>
+ The name of the function.
+ </documentation>
+ <appInfo>
+ <meta.attribute translatable="true"/>
+ </appInfo>
+ </annotation>
+ </attribute>
+ <attribute name="description" type="string" use="required">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ <appInfo>
+ <meta.attribute translatable="true"/>
+ </appInfo>
+ </annotation>
+ </attribute>
+ <attribute name="class" type="string" use="required">
+ <annotation>
+ <documentation>
+ The specific class implementing the function.
+ </documentation>
+ <appInfo>
+ <meta.attribute kind="java" basedOn=":org.apache.directory.studio.connection.core.IJndiLogger"/>
+ </appInfo>
+ </annotation>
+ </attribute>
+ </complexType>
+ </element>
+
+ <annotation>
+ <appInfo>
+ <meta.section type="since"/>
+ </appInfo>
+ <documentation>
+ 1.1.0
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appInfo>
+ <meta.section type="examples"/>
+ </appInfo>
+ <documentation>
+ <p>
+<pre>
+ <extension
+ point="org.apache.directory.studio.jndilogger">
+
+ <valueEditor
+ name="Browser Options"
+ class="org.apache.directory.studio.ldapbrowser.common.wizard.connection.ConnectionParameterPage"
+ />
+ </extension>
+</pre>
+<p>
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appInfo>
+ <meta.section type="apiInfo"/>
+ </appInfo>
+ <documentation>
+
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appInfo>
+ <meta.section type="implementation"/>
+ </appInfo>
+ <documentation>
+
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appInfo>
+ <meta.section type="copyright"/>
+ </appInfo>
+ <documentation>
+ 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.
+ </documentation>
+ </annotation>
+
+</schema>
Added: directory/sandbox/felixk/studio-schemaeditor-help/contexts.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-schemaeditor-help/contexts.xml?rev=598822&view=auto
==============================================================================
--- directory/sandbox/felixk/studio-schemaeditor-help/contexts.xml (added)
+++ directory/sandbox/felixk/studio-schemaeditor-help/contexts.xml Tue Nov 27 15:36:48 2007
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?NLS TYPE="org.eclipse.help.contexts"?>
+<!--
+ 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.
+-->
+<contexts>
+ <context id="hierarchy_view">
+ <description>The Hierarchy view shows the hierarchy of an element (attribute type or object class).</description>
+ <topic label="Hiearchy view" href="html/gettingstarted_views_hierarchy.html"/>
+ </context>
+ <context id="problems_view">
+ <description>The Problems view displays errors and warnings associated with a resource.</description>
+ <topic label="Problems view" href="html/gettingstarted_views_problems.html"/>
+ </context>
+ <context id="projects_view">
+ <description>The Projects view shows all the Schema projects of the workspace.</description>
+ <topic label="Projects view" href="html/gettingstarted_views_projects.html"/>
+ </context>
+ <context id="schema_view">
+ <description>This Schema view shows all the schemas of the currently opened project.</description>
+ <topic label="Schema view" href="html/gettingstarted_views_schema.html"/>
+ </context>
+ <context id="search_view">
+ <description>The Search view displays the results of a search.</description>
+ <topic label="Search view" href="html/gettingstarted_views_search.html"/>
+ </context>
+ <context id="attribute_type_editor">
+ <description>The attribute type editor is the one-stop shop where you can define all aspects of your attribute type.</description>
+ <topic label="Attribute type editor" href="html/gettingstarted_editors_attribute_type.html"/>
+ </context>
+ <context id="object_class_editor">
+ <description>The object class editor is the one-stop shop where you can define all aspects of your object class.</description>
+ <topic label="Object class editor" href="html/gettingstarted_editors_object_class.html"/>
+ </context>
+ <context id="schema_editor">
+ <description>The schema editor displays all the attribute types and the object classes that contains a schema file.</description>
+ <topic label="Schema editor" href="html/gettingstarted_editors_schema.html"/>
+ </context>
+</contexts>
Propchange: directory/sandbox/felixk/studio-schemaeditor-help/contexts.xml
------------------------------------------------------------------------------
svn:eol-style = native