directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r926724 - in /directory/studio/trunk/apacheds: ./ resources/conf/ src/main/java/org/apache/directory/studio/apacheds/ src/main/java/org/apache/directory/studio/apacheds/actions/ src/main/java/org/apache/directory/studio/apacheds/jobs/ src/m...
Date Tue, 23 Mar 2010 18:51:52 GMT
Author: pamarcelot
Date: Tue Mar 23 18:51:51 2010
New Revision: 926724

URL: http://svn.apache.org/viewvc?rev=926724&view=rev
Log:
Fix for DIRSTUDIO-641 (Integrate Apache DS version 1.5.6 in the Apache DS plugin).

Added:
    directory/studio/trunk/apacheds/resources/conf/server-1.5.6.xml
Modified:
    directory/studio/trunk/apacheds/pom.xml
    directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPluginUtils.java
    directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/CreateConnectionAction.java
    directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/CreateConnectionActionHelper.java
    directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/RunAction.java
    directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/jobs/LaunchServerJob.java
    directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/model/Server.java
    directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/model/ServerVersion.java
    directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/model/ServersHandlerIO.java

Modified: directory/studio/trunk/apacheds/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds/pom.xml?rev=926724&r1=926723&r2=926724&view=diff
==============================================================================
--- directory/studio/trunk/apacheds/pom.xml (original)
+++ directory/studio/trunk/apacheds/pom.xml Tue Mar 23 18:51:51 2010
@@ -911,6 +911,369 @@
               </artifactItems>
             </configuration>
           </execution>
+          <!-- Apache DS 1.5.6 Libraries -->
+          <execution>
+            <id>copy-apacheds-1.5.6-libraries</id>
+            <phase>process-resources</phase>
+            <goals>
+              <goal>copy</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>resources/libs/apacheds-1.5.6</outputDirectory>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>antlr</groupId>
+                  <artifactId>antlr</artifactId>
+                  <version>2.7.7</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.server</groupId>
+                  <artifactId>apacheds-avl-partition</artifactId>
+                  <version>1.5.6</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.server</groupId>
+                  <artifactId>apacheds-core</artifactId>
+                  <version>1.5.6</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.server</groupId>
+                  <artifactId>apacheds-core-annotations</artifactId>
+                  <version>1.5.6</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.server</groupId>
+                  <artifactId>apacheds-core-api</artifactId>
+                  <version>1.5.6</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.server</groupId>
+                  <artifactId>apacheds-core-avl</artifactId>
+                  <version>1.5.6</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.server</groupId>
+                  <artifactId>apacheds-core-constants</artifactId>
+                  <version>1.5.6</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.server</groupId>
+                  <artifactId>apacheds-core-entry</artifactId>
+                  <version>1.5.6</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.server</groupId>
+                  <artifactId>apacheds-core-jndi</artifactId>
+                  <version>1.5.6</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.server</groupId>
+                  <artifactId>apacheds-core-mock</artifactId>
+                  <version>1.5.6</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.server</groupId>
+                  <artifactId>apacheds-http-integration</artifactId>
+                  <version>1.5.6</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.server</groupId>
+                  <artifactId>apacheds-i18n</artifactId>
+                  <version>1.5.6</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.server</groupId>
+                  <artifactId>apacheds-interceptor-kerberos</artifactId>
+                  <version>1.5.6</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.server</groupId>
+                  <artifactId>apacheds-jdbm</artifactId>
+                  <version>1.5.6</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.server</groupId>
+                  <artifactId>apacheds-jdbm-partition</artifactId>
+                  <version>1.5.6</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.server</groupId>
+                  <artifactId>apacheds-jdbm-store</artifactId>
+                  <version>1.5.6</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.server</groupId>
+                  <artifactId>apacheds-kerberos-shared</artifactId>
+                  <version>1.5.6</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.server</groupId>
+                  <artifactId>apacheds-ldif-partition</artifactId>
+                  <version>1.5.6</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.studio</groupId>
+                  <artifactId>apacheds-launcher</artifactId>
+                  <version>1.5.0</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.server</groupId>
+                  <artifactId>apacheds-protocol-changepw</artifactId>
+                  <version>1.5.6</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.server</groupId>
+                  <artifactId>apacheds-protocol-dns</artifactId>
+                  <version>1.5.6</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.server</groupId>
+                  <artifactId>apacheds-protocol-kerberos</artifactId>
+                  <version>1.5.6</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.server</groupId>
+                  <artifactId>apacheds-protocol-ldap</artifactId>
+                  <version>1.5.6</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.server</groupId>
+                  <artifactId>apacheds-protocol-ntp</artifactId>
+                  <version>1.5.6</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.server</groupId>
+                  <artifactId>apacheds-protocol-shared</artifactId>
+                  <version>1.5.6</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.server</groupId>
+                  <artifactId>apacheds-server-jndi</artifactId>
+                  <version>1.5.6</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.server</groupId>
+                  <artifactId>apacheds-server-xml</artifactId>
+                  <version>1.5.6</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.server</groupId>
+                  <artifactId>apacheds-utils</artifactId>
+                  <version>1.5.6</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.server</groupId>
+                  <artifactId>apacheds-xbean-spring</artifactId>
+                  <version>1.5.6</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.server</groupId>
+                  <artifactId>apacheds-xdbm-base</artifactId>
+                  <version>1.5.6</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.server</groupId>
+                  <artifactId>apacheds-xdbm-search</artifactId>
+                  <version>1.5.6</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.server</groupId>
+                  <artifactId>apacheds-xdbm-tools</artifactId>
+                  <version>1.5.6</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>bouncycastle</groupId>
+                  <artifactId>bcprov-jdk15</artifactId>
+                  <version>140</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>commons-cli</groupId>
+                  <artifactId>commons-cli</artifactId>
+                  <version>1.2</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>commons-collections</groupId>
+                  <artifactId>commons-collections</artifactId>
+                  <version>3.2.1</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>commons-daemon</groupId>
+                  <artifactId>commons-daemon</artifactId>
+                  <version>1.0.1</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>commons-io</groupId>
+                  <artifactId>commons-io</artifactId>
+                  <version>1.4</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>commons-lang</groupId>
+                  <artifactId>commons-lang</artifactId>
+                  <version>2.5</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.daemon</groupId>
+                  <artifactId>daemon-bootstrappers</artifactId>
+                  <version>1.1.7</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>dom4j</groupId>
+                  <artifactId>dom4j</artifactId>
+                  <version>1.6.1</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.slf4j</groupId>
+                  <artifactId>jcl-over-slf4j</artifactId>
+                  <version>1.5.10</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.mortbay.jetty</groupId>
+                  <artifactId>jetty</artifactId>
+                  <version>6.1.14</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.mortbay.jetty</groupId>
+                  <artifactId>jetty-util</artifactId>
+                  <version>6.1.14</version>
+                </artifactItem>
+			    <artifactItem>
+			      <groupId>org.mortbay.jetty</groupId>
+			      <artifactId>servlet-api-2.5</artifactId>
+			      <version>6.1.14</version>
+			    </artifactItem>
+                <artifactItem>
+                  <groupId>junit</groupId>
+                  <artifactId>junit</artifactId>
+                  <version>4.7</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>log4j</groupId>
+                  <artifactId>log4j</artifactId>
+                  <version>1.2.14</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.mina</groupId>
+                  <artifactId>mina-core</artifactId>
+                  <version>2.0.0-RC1</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.shared</groupId>
+                  <artifactId>shared-asn1</artifactId>
+                  <version>0.9.18</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.shared</groupId>
+                  <artifactId>shared-asn1-codec</artifactId>
+                  <version>0.9.18</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.shared</groupId>
+                  <artifactId>shared-cursor</artifactId>
+                  <version>0.9.18</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.shared</groupId>
+                  <artifactId>shared-dsml-parser</artifactId>
+                  <version>0.9.18</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.shared</groupId>
+                  <artifactId>shared-i18n</artifactId>
+                  <version>0.9.18</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.shared</groupId>
+                  <artifactId>shared-ldap</artifactId>
+                  <version>0.9.18</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.shared</groupId>
+                  <artifactId>shared-ldap-constants</artifactId>
+                  <version>0.9.18</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.shared</groupId>
+                  <artifactId>shared-ldap-converter</artifactId>
+                  <version>0.9.18</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.shared</groupId>
+                  <artifactId>shared-ldap-jndi</artifactId>
+                  <version>0.9.18</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.shared</groupId>
+                  <artifactId>shared-ldap-schema</artifactId>
+                  <version>0.9.18</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.shared</groupId>
+                  <artifactId>shared-ldap-schema</artifactId>
+                  <version>0.9.18</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.shared</groupId>
+                  <artifactId>shared-ldap-schema-dao</artifactId>
+                  <version>0.9.18</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.shared</groupId>
+                  <artifactId>shared-ldap-schema-loader</artifactId>
+                  <version>0.9.18</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.shared</groupId>
+                  <artifactId>shared-ldap-schema-manager</artifactId>
+                  <version>0.9.18</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.shared</groupId>
+                  <artifactId>shared-ldif</artifactId>
+                  <version>0.9.18</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.slf4j</groupId>
+                  <artifactId>slf4j-api</artifactId>
+                  <version>1.5.10</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.slf4j</groupId>
+                  <artifactId>slf4j-log4j12</artifactId>
+                  <version>1.5.10</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.springframework</groupId>
+                  <artifactId>spring-beans</artifactId>
+                  <version>2.5.6.SEC01</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.springframework</groupId>
+                  <artifactId>spring-context</artifactId>
+                  <version>2.5.6.SEC01</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.springframework</groupId>
+                  <artifactId>spring-core</artifactId>
+                  <version>2.5.6.SEC01</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.xbean</groupId>
+                  <artifactId>xbean-spring</artifactId>
+                  <version>3.5</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>xerces</groupId>
+                  <artifactId>xercesImpl</artifactId>
+                  <version>2.9.1</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>xpp3</groupId>
+                  <artifactId>xpp3</artifactId>
+                  <version>1.1.4c</version>
+                </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
         </executions>
      </plugin>
     </plugins>

Added: directory/studio/trunk/apacheds/resources/conf/server-1.5.6.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds/resources/conf/server-1.5.6.xml?rev=926724&view=auto
==============================================================================
--- directory/studio/trunk/apacheds/resources/conf/server-1.5.6.xml (added)
+++ directory/studio/trunk/apacheds/resources/conf/server-1.5.6.xml Tue Mar 23 18:51:51 2010
@@ -0,0 +1,259 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  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.
+-->
+
+
+<spring:beans xmlns="http://apacheds.org/config/1.5.6"
+       xmlns:spring="http://xbean.apache.org/schemas/spring/1.0"
+       xmlns:s="http://www.springframework.org/schema/beans">
+
+  <defaultDirectoryService id="directoryService" instanceId="default"
+                           replicaId="1"
+                           workingDirectory="example.com"
+                           allowAnonymousAccess="true"
+                           accessControlEnabled="false"
+                           denormalizeOpAttrsEnabled="false"
+                           syncPeriodMillis="15000"
+                           maxPDUSize="2000000">
+    <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>
+      </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>
+      </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>
+
+    <!-- Uncomment to enable replication configuration -->
+    <!--replicationConfiguration>
+      <providers>
+        <provider id="1 type="refreshAndPersist" timeLimit="1000" sizeLimit="1000">
+          <url>
+            ldap://ldap1.acme.com:10389/ou=data,dc=acme,dc=com?*, +?sub?(objectClass=*)
+          </url>
+          <connection bindMethod="simple">
+            <principal> 
+              uid=admin,ou=system 
+            </principal> 
+            <credentials>secret</credentials>
+          </bind>
+        </provider>
+        <provider id="2 type="refreshAndPersist" timeLimit="1000" sizeLimit="1000">
+          <url>
+            ldaps://ldap2.acme.com:10389/ou=data,dc=acme,dc=com?*, +?sub?(objectClass=*)
+          </url>
+          <connection bindMethod="simple">
+            <principal> 
+              uid=admin,ou=system 
+            </principal> 
+            <credentials>secret</credentials>
+          </bind>
+        </provider>
+      </providers>
+    </replicationConfiguration-->
+
+  </defaultDirectoryService>
+
+
+  <!-- 
+  +============================================================+
+  | ChangePassword server configuration                        |
+  +============================================================+
+  -->
+  <!--  missing  atou=users,dc=example,dc=com
+  <changePasswordServer id="changePasswordServer">
+    <transports>
+      <tcpTransport port="60464" nbThreads="2" backLog="50"/>
+      <udpTransport port="60464" nbThreads="2" backLog="50"/>
+    </transports>
+    <directoryService>#directoryService</directoryService>
+  </changePasswordServer>
+-->
+
+  <!-- 
+  +============================================================+
+  | Kerberos server configuration                              |
+  +============================================================+
+  -->
+  <!--  missing atou=users,dc=example,dc=com
+  <kdcServer id="kdcServer">
+    <transports>
+      <tcpTransport port="60088" nbThreads="4" backLog="50"/>
+      <udpTransport port="60088" nbThreads="4" backLog="50"/>
+    </transports>
+    <directoryService>#directoryService</directoryService>
+  </kdcServer>
+-->
+
+  <!-- 
+  +============================================================+
+  | NtpServer configuration                                    |
+  +============================================================+
+  -->
+  <!--ntpServer>
+    <transports>
+      <tcpTransport port="60123"/>
+      <udpTransport port="60123" nbThreads="1"/>
+    </transports>
+  </ntpServer-->
+
+  <!-- 
+  +============================================================+
+  | DnsServer configuration                                    |
+  +============================================================+
+  -->
+  <!--  missing atou=users,dc=example,dc=com
+  <dnsServer>
+    <transports>
+      <tcpTransport port="8053"/>
+      <udpTransport port="8053"/>
+    </transports>
+    <directoryService>#directoryService</directoryService>
+  </dnsServer>
+-->
+
+  <!-- 
+  +============================================================+
+  | LDAP Service configuration                                 |
+  +============================================================+
+  -->
+  
+  <ldapServer id="ldapServer"
+            allowAnonymousAccess="false"
+            saslHost="ldap.example.com"
+            saslPrincipal="ldap/ldap.example.com@EXAMPLE.COM"
+            searchBaseDn="ou=users,ou=system"
+            maxTimeLimit="15000"
+            maxSizeLimit="1000">
+    <transports>
+      <tcpTransport address="0.0.0.0" port="10389" nbThreads="8" backLog="50" enableSSL="false"/>
+      <tcpTransport address="localhost" port="10636" enableSSL="true"/>
+    </transports>
+
+    <directoryService>#directoryService</directoryService>
+
+    <!-- The list of supported authentication mechanisms.                   -->
+    <saslMechanismHandlers>
+      <simpleMechanismHandler mech-name="SIMPLE"/>
+      <cramMd5MechanismHandler mech-name="CRAM-MD5" />
+      <digestMd5MechanismHandler mech-name="DIGEST-MD5" />
+      <gssapiMechanismHandler mech-name="GSSAPI" />
+      <ntlmMechanismHandler mech-name="NTLM" ntlmProviderFqcn="com.foo.Bar"/>
+      <ntlmMechanismHandler mech-name="GSS-SPNEGO" ntlmProviderFqcn="com.foo.Bar"/>
+    </saslMechanismHandlers>
+
+    <!-- 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">
+    <ldapServer>#ldapServer</ldapServer>
+  </apacheDS>
+  
+  <!-- uncomment the below line to start the jetty(v6.1.14) http server
+       This can be used to provide access to the data present in DIT via http
+       using a web application
+  -->
+  <!-- 
+   <httpServer id="httpServer" port="7009" >
+   <webApps>
+    <webApp warFile="/path/to/war/file" contextPath="/myApp"/>
+   </webApps>
+  </httpServer>
+   -->
+</spring:beans>

Modified: directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPluginUtils.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPluginUtils.java?rev=926724&r1=926723&r2=926724&view=diff
==============================================================================
--- directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPluginUtils.java (original)
+++ directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPluginUtils.java Tue Mar 23 18:51:51 2010
@@ -33,6 +33,7 @@ import org.apache.directory.studio.apach
 import org.apache.directory.studio.apacheds.configuration.model.v153.ServerXmlIOV153;
 import org.apache.directory.studio.apacheds.configuration.model.v154.ServerXmlIOV154;
 import org.apache.directory.studio.apacheds.configuration.model.v155.ServerXmlIOV155;
+import org.apache.directory.studio.apacheds.configuration.model.v156.ServerXmlIOV156;
 import org.apache.directory.studio.apacheds.model.Server;
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.IPath;
@@ -125,6 +126,37 @@ public class ApacheDsPluginUtils
         {
             switch ( server.getVersion() )
             {
+                case VERSION_1_5_6:
+                    return new String[]
+                        { "antlr-2.7.7.jar", "apacheds-avl-partition-1.5.6.jar", "apacheds-core-1.5.6.jar",
+                            "apacheds-core-annotations-1.5.6.jar", "apacheds-core-api-1.5.6.jar",
+                            "apacheds-core-avl-1.5.6.jar", "apacheds-core-constants-1.5.6.jar",
+                            "apacheds-core-entry-1.5.6.jar", "apacheds-core-jndi-1.5.6.jar",
+                            "apacheds-core-mock-1.5.6.jar", "apacheds-http-integration-1.5.6.jar",
+                            "apacheds-i18n-1.5.6.jar", "apacheds-interceptor-kerberos-1.5.6.jar",
+                            "apacheds-jdbm-1.5.6.jar", "apacheds-jdbm-partition-1.5.6.jar",
+                            "apacheds-jdbm-store-1.5.6.jar", "apacheds-kerberos-shared-1.5.6.jar",
+                            "apacheds-launcher-1.5.0.jar", "apacheds-ldif-partition-1.5.6.jar",
+                            "apacheds-protocol-changepw-1.5.6.jar", "apacheds-protocol-dns-1.5.6.jar",
+                            "apacheds-protocol-kerberos-1.5.6.jar", "apacheds-protocol-ldap-1.5.6.jar",
+                            "apacheds-protocol-ntp-1.5.6.jar", "apacheds-protocol-shared-1.5.6.jar",
+                            "apacheds-server-jndi-1.5.6.jar", "apacheds-server-xml-1.5.6.jar",
+                            "apacheds-utils-1.5.6.jar", "apacheds-xbean-spring-1.5.6.jar",
+                            "apacheds-xdbm-base-1.5.6.jar", "apacheds-xdbm-search-1.5.6.jar",
+                            "apacheds-xdbm-tools-1.5.6.jar", "bcprov-jdk15-140.jar", "commons-cli-1.2.jar",
+                            "commons-collections-3.2.1.jar", "commons-daemon-1.0.1.jar", "commons-io-1.4.jar",
+                            "commons-lang-2.5.jar", "daemon-bootstrappers-1.1.7.jar", "dom4j-1.6.1.jar",
+                            "jcl-over-slf4j-1.5.10.jar", "jetty-6.1.14.jar", "jetty-util-6.1.14.jar", "junit-4.7.jar",
+                            "log4j-1.2.14.jar", "mina-core-2.0.0-RC1.jar", "servlet-api-2.5-6.1.14.jar",
+                            "shared-asn1-0.9.18.jar", "shared-asn1-codec-0.9.18.jar", "shared-cursor-0.9.18.jar",
+                            "shared-dsml-parser-0.9.18.jar", "shared-i18n-0.9.18.jar", "shared-ldap-0.9.18.jar",
+                            "shared-ldap-constants-0.9.18.jar", "shared-ldap-converter-0.9.18.jar",
+                            "shared-ldap-jndi-0.9.18.jar", "shared-ldap-schema-0.9.18.jar",
+                            "shared-ldap-schema-dao-0.9.18.jar", "shared-ldap-schema-loader-0.9.18.jar",
+                            "shared-ldap-schema-manager-0.9.18.jar", "shared-ldif-0.9.18.jar", "slf4j-api-1.5.10.jar",
+                            "slf4j-log4j12-1.5.10.jar", "spring-beans-2.5.6.SEC01.jar",
+                            "spring-context-2.5.6.SEC01.jar", "spring-core-2.5.6.SEC01.jar", "xbean-spring-3.5.jar",
+                            "xercesImpl-2.9.1.jar", "xpp3-1.1.4c.jar" };
                 case VERSION_1_5_5:
                     return new String[]
                         { "antlr-2.7.7.jar", "apacheds-bootstrap-extract-1.5.5.jar",
@@ -316,7 +348,7 @@ public class ApacheDsPluginUtils
 
             // Copying server.xml file
             File serverXmlFile = new File( confFolder, "server.xml" );
-            copyConfigurationFile( "server-1.5.5.xml", serverXmlFile );
+            copyConfigurationFile( "server-1.5.6.xml", serverXmlFile );
 
             // Creating log4j.properties file to the serverSocket folder
             File log4jPropertiesServerSocketFile = new File( serverSocketFolder, "log4j.properties" );
@@ -566,6 +598,9 @@ public class ApacheDsPluginUtils
         // Parsing and returning the server configuration
         switch ( server.getVersion() )
         {
+            case VERSION_1_5_6:
+                ServerXmlIOV156 serverXmlIOV156 = new ServerXmlIOV156();
+                return serverXmlIOV156.parse( fis );
             case VERSION_1_5_5:
                 ServerXmlIOV155 serverXmlIOV155 = new ServerXmlIOV155();
                 return serverXmlIOV155.parse( fis );

Modified: directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/CreateConnectionAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/CreateConnectionAction.java?rev=926724&r1=926723&r2=926724&view=diff
==============================================================================
--- directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/CreateConnectionAction.java (original)
+++ directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/CreateConnectionAction.java Tue Mar 23 18:51:51 2010
@@ -32,6 +32,7 @@ import org.apache.directory.studio.apach
 import org.apache.directory.studio.apacheds.configuration.model.v153.ServerConfigurationV153;
 import org.apache.directory.studio.apacheds.configuration.model.v154.ServerConfigurationV154;
 import org.apache.directory.studio.apacheds.configuration.model.v155.ServerConfigurationV155;
+import org.apache.directory.studio.apacheds.configuration.model.v156.ServerConfigurationV156;
 import org.apache.directory.studio.apacheds.model.Server;
 import org.apache.directory.studio.apacheds.views.ServersView;
 import org.eclipse.core.runtime.Platform;
@@ -193,7 +194,12 @@ public class CreateConnectionAction exte
      */
     private boolean isEnableLdapOrLdaps( ServerConfiguration serverConfiguration )
     {
-        if ( serverConfiguration instanceof ServerConfigurationV155 )
+        if ( serverConfiguration instanceof ServerConfigurationV156 )
+        {
+            ServerConfigurationV156 serverConfiguration156 = ( ServerConfigurationV156 ) serverConfiguration;
+            return ( serverConfiguration156.isEnableLdap() ) || ( serverConfiguration156.isEnableLdaps() );
+        }
+        else if ( serverConfiguration instanceof ServerConfigurationV155 )
         {
             ServerConfigurationV155 serverConfiguration155 = ( ServerConfigurationV155 ) serverConfiguration;
             return ( serverConfiguration155.isEnableLdap() ) || ( serverConfiguration155.isEnableLdaps() );

Modified: directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/CreateConnectionActionHelper.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/CreateConnectionActionHelper.java?rev=926724&r1=926723&r2=926724&view=diff
==============================================================================
--- directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/CreateConnectionActionHelper.java (original)
+++ directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/CreateConnectionActionHelper.java Tue Mar 23 18:51:51 2010
@@ -25,6 +25,7 @@ import org.apache.directory.studio.apach
 import org.apache.directory.studio.apacheds.configuration.model.v153.ServerConfigurationV153;
 import org.apache.directory.studio.apacheds.configuration.model.v154.ServerConfigurationV154;
 import org.apache.directory.studio.apacheds.configuration.model.v155.ServerConfigurationV155;
+import org.apache.directory.studio.apacheds.configuration.model.v156.ServerConfigurationV156;
 import org.apache.directory.studio.connection.core.Connection;
 import org.apache.directory.studio.connection.core.ConnectionCorePlugin;
 import org.apache.directory.studio.connection.core.ConnectionParameter;
@@ -63,7 +64,21 @@ public class CreateConnectionActionHelpe
         connectionParameter.setAuthMethod( AuthenticationMethod.SIMPLE );
 
         // Encryption method and port
-        if ( serverConfiguration instanceof ServerConfigurationV155 )
+        if ( serverConfiguration instanceof ServerConfigurationV156 )
+        {
+            ServerConfigurationV156 serverConfigurationV156 = ( ServerConfigurationV156 ) serverConfiguration;
+            if ( serverConfigurationV156.isEnableLdap() )
+            {
+                connectionParameter.setEncryptionMethod( EncryptionMethod.NONE );
+                connectionParameter.setPort( serverConfigurationV156.getLdapPort() );
+            }
+            else if ( serverConfigurationV156.isEnableLdaps() )
+            {
+                connectionParameter.setEncryptionMethod( EncryptionMethod.LDAPS );
+                connectionParameter.setPort( serverConfigurationV156.getLdapsPort() );
+            }
+        }
+        else if ( serverConfiguration instanceof ServerConfigurationV155 )
         {
             ServerConfigurationV155 serverConfiguration155 = ( ServerConfigurationV155 ) serverConfiguration;
             if ( serverConfiguration155.isEnableLdap() )

Modified: directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/RunAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/RunAction.java?rev=926724&r1=926723&r2=926724&view=diff
==============================================================================
--- directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/RunAction.java (original)
+++ directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/RunAction.java Tue Mar 23 18:51:51 2010
@@ -32,6 +32,7 @@ import org.apache.directory.studio.apach
 import org.apache.directory.studio.apacheds.configuration.model.v153.ServerConfigurationV153;
 import org.apache.directory.studio.apacheds.configuration.model.v154.ServerConfigurationV154;
 import org.apache.directory.studio.apacheds.configuration.model.v155.ServerConfigurationV155;
+import org.apache.directory.studio.apacheds.configuration.model.v156.ServerConfigurationV156;
 import org.apache.directory.studio.apacheds.jobs.LaunchServerJob;
 import org.apache.directory.studio.apacheds.model.Server;
 import org.apache.directory.studio.apacheds.views.ServersView;
@@ -225,6 +226,11 @@ public class RunAction extends Action im
      */
     private String[] getAlreadyInUseProtocolPorts( ServerConfiguration serverConfiguration )
     {
+        // Version 1.5.6
+        if ( serverConfiguration instanceof ServerConfigurationV156 )
+        {
+            return getAlreadyInUseProtocolPortsVersion156( ( ServerConfigurationV156 ) serverConfiguration );
+        }
         // Version 1.5.5
         if ( serverConfiguration instanceof ServerConfigurationV155 )
         {
@@ -493,6 +499,88 @@ public class RunAction extends Action im
     }
 
 
+    /**
+     * Gets an array of String containing the ports and their associated 
+     * protocols which are already in use.
+     *
+     * @param serverConfiguration
+     *      the 1.5.6 server configuration
+     * @return
+     *      an array of String containing the ports and their associated 
+     * protocols which are already in use.
+     */
+    private String[] getAlreadyInUseProtocolPortsVersion156( ServerConfigurationV156 serverConfiguration )
+    {
+        List<String> alreadyInUseProtocolPortsList = new ArrayList<String>();
+
+        // LDAP
+        if ( serverConfiguration.isEnableLdap() )
+        {
+            if ( !AvailablePortFinder.available( serverConfiguration.getLdapPort() ) )
+            {
+                alreadyInUseProtocolPortsList.add( NLS.bind(
+                    Messages.getString( "RunAction.LDAPPort" ), new Object[] { serverConfiguration.getLdapPort() } ) ); //$NON-NLS-1$
+            }
+        }
+
+        // LDAPS
+        if ( serverConfiguration.isEnableLdaps() )
+        {
+            if ( !AvailablePortFinder.available( serverConfiguration.getLdapsPort() ) )
+            {
+                alreadyInUseProtocolPortsList.add( NLS.bind(
+                    Messages.getString( "RunAction.LDAPSPort" ), new Object[] { serverConfiguration.getLdapsPort() } ) ); //$NON-NLS-1$
+            }
+        }
+
+        // Kerberos
+        if ( serverConfiguration.isEnableKerberos() )
+        {
+            if ( !AvailablePortFinder.available( serverConfiguration.getKerberosPort() ) )
+            {
+                alreadyInUseProtocolPortsList
+                    .add( NLS
+                        .bind(
+                            Messages.getString( "RunAction.KerberosPort" ), new Object[] { serverConfiguration.getKerberosPort() } ) ); //$NON-NLS-1$
+            }
+        }
+
+        // DNS
+        if ( serverConfiguration.isEnableDns() )
+        {
+            if ( !AvailablePortFinder.available( serverConfiguration.getDnsPort() ) )
+            {
+                alreadyInUseProtocolPortsList.add( NLS.bind(
+                    Messages.getString( "RunAction.DNSPort" ), new Object[] { serverConfiguration.getDnsPort() } ) ); //$NON-NLS-1$
+            }
+        }
+
+        // NTP
+        if ( serverConfiguration.isEnableNtp() )
+        {
+            if ( !AvailablePortFinder.available( serverConfiguration.getNtpPort() ) )
+            {
+                alreadyInUseProtocolPortsList.add( NLS.bind( Messages.getString( "RunAction.NTPPort" ), new Object[] //$NON-NLS-1$
+                    { serverConfiguration.getNtpPort() } ) );
+            }
+        }
+
+        // Change Password
+        if ( serverConfiguration.isEnableChangePassword() )
+        {
+            if ( !AvailablePortFinder.available( serverConfiguration.getChangePasswordPort() ) )
+            {
+                alreadyInUseProtocolPortsList
+                    .add( NLS
+                        .bind(
+                            Messages.getString( "RunAction.ChangePasswordPort" ), new Object[] { serverConfiguration.getChangePasswordPort() } ) ); //$NON-NLS-1$
+            }
+        }
+
+        return alreadyInUseProtocolPortsList.toArray( new String[0] );
+    }
+
+
     /* (non-Javadoc)
      * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
      */

Modified: directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/jobs/LaunchServerJob.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/jobs/LaunchServerJob.java?rev=926724&r1=926723&r2=926724&view=diff
==============================================================================
--- directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/jobs/LaunchServerJob.java (original)
+++ directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/jobs/LaunchServerJob.java Tue Mar 23 18:51:51 2010
@@ -34,6 +34,7 @@ import org.apache.directory.studio.apach
 import org.apache.directory.studio.apacheds.configuration.model.v153.ServerConfigurationV153;
 import org.apache.directory.studio.apacheds.configuration.model.v154.ServerConfigurationV154;
 import org.apache.directory.studio.apacheds.configuration.model.v155.ServerConfigurationV155;
+import org.apache.directory.studio.apacheds.configuration.model.v156.ServerConfigurationV156;
 import org.apache.directory.studio.apacheds.model.Server;
 import org.apache.directory.studio.apacheds.model.ServerStateEnum;
 import org.apache.log4j.net.SocketServer;
@@ -234,7 +235,11 @@ public class LaunchServerJob extends Job
              */
             private int getTestingPort( ServerConfiguration configuration )
             {
-                if ( configuration instanceof ServerConfigurationV155 )
+                if ( configuration instanceof ServerConfigurationV156 )
+                {
+                    return getTestingPortVersion156( ( ServerConfigurationV156 ) configuration );
+                }
+                else if ( configuration instanceof ServerConfigurationV155 )
                 {
                     return getTestingPortVersion155( ( ServerConfigurationV155 ) configuration );
                 }
@@ -392,6 +397,53 @@ public class LaunchServerJob extends Job
                     return 0;
                 }
             }
+
+
+            /**
+             * Gets the testing port.
+             *
+             * @param configuration
+             *      the 1.5.6 server configuration
+             * @return
+             *      the testing port
+             */
+            private int getTestingPortVersion156( ServerConfigurationV156 configuration )
+            {
+                // LDAP
+                if ( configuration.isEnableLdap() )
+                {
+                    return configuration.getLdapPort();
+                }
+                // LDAPS
+                else if ( configuration.isEnableLdaps() )
+                {
+                    return configuration.getLdapsPort();
+                }
+                // Kerberos
+                else if ( configuration.isEnableKerberos() )
+                {
+                    return configuration.getKerberosPort();
+                }
+                // DNS
+                else if ( configuration.isEnableDns() )
+                {
+                    return configuration.getDnsPort();
+                }
+                // NTP
+                else if ( configuration.isEnableNtp() )
+                {
+                    return configuration.getNtpPort();
+                }
+                // ChangePassword
+                else if ( configuration.isEnableChangePassword() )
+                {
+                    return configuration.getChangePasswordPort();
+                }
+                else
+                {
+                    return 0;
+                }
+            }
         };
 
         // Starting the thread

Modified: directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/model/Server.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/model/Server.java?rev=926724&r1=926723&r2=926724&view=diff
==============================================================================
--- directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/model/Server.java (original)
+++ directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/model/Server.java Tue Mar 23 18:51:51 2010
@@ -43,7 +43,7 @@ public class Server implements IAdaptabl
     private String id;
 
     /** The version of the server */
-    private ServerVersion version = ServerVersion.VERSION_1_5_5;
+    private ServerVersion version = ServerVersion.VERSION_1_5_6;
 
     /** The state of the server */
     private ServerStateEnum state = ServerStateEnum.STOPPED;

Modified: directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/model/ServerVersion.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/model/ServerVersion.java?rev=926724&r1=926723&r2=926724&view=diff
==============================================================================
--- directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/model/ServerVersion.java (original)
+++ directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/model/ServerVersion.java Tue Mar 23 18:51:51 2010
@@ -28,6 +28,17 @@ package org.apache.directory.studio.apac
  */
 public enum ServerVersion
 {
+    /** Version 1.5.6 */
+    VERSION_1_5_6
+    {
+        /* (non-Javadoc)
+         * @see java.lang.Enum#toString()
+         */
+        public String toString()
+        {
+            return "1.5.6"; //$NON-NLS-1$
+        }
+    },
     /** Version 1.5.5 */
     VERSION_1_5_5
     {

Modified: directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/model/ServersHandlerIO.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/model/ServersHandlerIO.java?rev=926724&r1=926723&r2=926724&view=diff
==============================================================================
--- directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/model/ServersHandlerIO.java (original)
+++ directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/model/ServersHandlerIO.java Tue Mar 23 18:51:51 2010
@@ -123,7 +123,11 @@ public class ServersHandlerIO
         Attribute versionAttribute = element.attribute( SERVER_VERSION_ATTRIBUTE );
         if ( versionAttribute != null )
         {
-            if ( versionAttribute.getValue().equalsIgnoreCase( "1.5.5" ) ) //$NON-NLS-1$
+            if ( versionAttribute.getValue().equalsIgnoreCase( "1.5.6" ) ) //$NON-NLS-1$
+            {
+                server.setVersion( ServerVersion.VERSION_1_5_6 );
+            }
+            else if ( versionAttribute.getValue().equalsIgnoreCase( "1.5.5" ) ) //$NON-NLS-1$
             {
                 server.setVersion( ServerVersion.VERSION_1_5_5 );
             }



Mime
View raw message