directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seelm...@apache.org
Subject svn commit: r1669933 - in /directory/studio/trunk/tests/test.integration.ui: ./ src/main/java/org/apache/directory/studio/test/integration/ui/ src/main/java/org/apache/directory/studio/test/integration/ui/bots/
Date Sun, 29 Mar 2015 17:11:26 GMT
Author: seelmann
Date: Sun Mar 29 17:11:26 2015
New Revision: 1669933

URL: http://svn.apache.org/r1669933
Log:
Migrate UI tests to tycho. Fix compile errors. Execute tests in tycho build (tests are not passing yet). (DIRSTUDIO-1021)

Added:
    directory/studio/trunk/tests/test.integration.ui/build.properties
    directory/studio/trunk/tests/test.integration.ui/pom-first.xml
    directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/Activator.java
Modified:
    directory/studio/trunk/tests/test.integration.ui/pom.xml
    directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ApacheDSPluginTest.java
    directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ApacheDsUtils.java
    directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/EntryEditorTest.java
    directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ImportExportTest.java
    directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/NewConnectionWizardTest.java
    directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/NewEntryWizardTest.java
    directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ReferralDialogTest.java
    directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/SearchTest.java
    directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/ApacheDSServersViewBot.java

Added: directory/studio/trunk/tests/test.integration.ui/build.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/tests/test.integration.ui/build.properties?rev=1669933&view=auto
==============================================================================
--- directory/studio/trunk/tests/test.integration.ui/build.properties (added)
+++ directory/studio/trunk/tests/test.integration.ui/build.properties Sun Mar 29 17:11:26 2015
@@ -0,0 +1,4 @@
+source.. = src/main/java/
+bin.includes = META-INF/,\
+               .,\
+               src/main/resources/

Added: directory/studio/trunk/tests/test.integration.ui/pom-first.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/tests/test.integration.ui/pom-first.xml?rev=1669933&view=auto
==============================================================================
--- directory/studio/trunk/tests/test.integration.ui/pom-first.xml (added)
+++ directory/studio/trunk/tests/test.integration.ui/pom-first.xml Sun Mar 29 17:11:26 2015
@@ -0,0 +1,129 @@
+<?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.
+-->
+<!--
+  @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.directory.studio</groupId>
+    <artifactId>parent-tests</artifactId>
+    <version>2.0.0.qualifier</version>
+    <relativePath>../pom-first.xml</relativePath>
+  </parent>
+
+  <name>Apache Directory Studio UI Integration Tests</name>
+  <artifactId>org.apache.directory.studio.test.integration.ui</artifactId>
+  <description/>
+  <packaging>bundle</packaging>
+
+  <build>
+     <!-- MANIFEST.MF Generation -->
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <manifestLocation>META-INF</manifestLocation>
+          <instructions>
+            <Bundle-SymbolicName>${project.artifactId};singleton:=true</Bundle-SymbolicName>
+            <Bundle-Localization>plugin</Bundle-Localization>
+            <Eclipse-LazyStart>true</Eclipse-LazyStart>
+            <Bundle-Activator>org.apache.directory.studio.test.integration.ui.Activator</Bundle-Activator>
+            
+            <Require-Bundle>org.junit;bundle-version="4.11.0",
+ org.hamcrest.library;bundle-version="1.3.0",
+ org.apache.log4j;bundle-version="1.2.15",
+ org.eclipse.swtbot.eclipse.finder;bundle-version="2.2.1",
+ org.eclipse.swtbot.eclipse.core;bundle-version="2.2.1",
+ org.eclipse.swtbot.forms.finder;bundle-version="2.2.1",
+ org.eclipse.swtbot.junit4_x;bundle-version="2.2.1",
+ bcprov;bundle-version="1.52.0",
+ 
+ org.apache.directory.server.apacheds-test-framework;bundle-version="${org.apache.directory.server.bundleversion}",
+ org.apache.directory.server.annotations;bundle-version="${org.apache.directory.server.bundleversion}",
+ org.apache.directory.server.core.annotations;bundle-version="${org.apache.directory.server.bundleversion}",
+ org.apache.directory.server.core.api;bundle-version="${org.apache.directory.server.bundleversion}",
+ org.apache.directory.server.protocol.ldap;bundle-version="${org.apache.directory.server.bundleversion}",
+ org.apache.directory.server.protocol.shared;bundle-version="${org.apache.directory.server.bundleversion}",
+ org.apache.directory.server.jdbm.partition;bundle-version="${org.apache.directory.server.bundleversion}",
+ org.apache.directory.server.xdbm.partition;bundle-version="${org.apache.directory.server.bundleversion}",
+ 
+ org.apache.directory.api.asn1.api;bundle-version="${org.apache.directory.api.bundleversion}",
+ org.apache.directory.api.ldap.client.api;bundle-version="${org.apache.directory.api.bundleversion}",
+ org.apache.directory.api.ldap.codec.core;bundle-version="${org.apache.directory.api.bundleversion}",
+ org.apache.directory.api.ldap.model;bundle-version="${org.apache.directory.api.bundleversion}",
+ org.apache.directory.api.ldap.net.mina;bundle-version="${org.apache.directory.api.bundleversion}",
+ org.apache.directory.api.util;bundle-version="${org.apache.directory.api.bundleversion}",
+ org.apache.mina.core;bundle-version="${org.apache.mina.bundleversion}",
+ 
+ org.apache.directory.studio.aciitemeditor,
+ org.apache.directory.studio.apacheds.configuration.help,
+ org.apache.directory.studio.apacheds.configuration.v2,
+ org.apache.directory.studio.apacheds.help,
+ org.apache.directory.studio.common.core,
+ org.apache.directory.studio.common.ui,
+ org.apache.directory.studio.connection.core,
+ org.apache.directory.studio.connection.ui,
+ org.apache.directory.studio.ldapbrowser.common,
+ org.apache.directory.studio.ldapbrowser.core,
+ org.apache.directory.studio.ldapbrowser.help,
+ org.apache.directory.studio.ldapbrowser.ui,
+ org.apache.directory.studio.ldapservers,
+ org.apache.directory.studio.ldapservers.apacheds.v200,
+ org.apache.directory.studio.ldifeditor,
+ org.apache.directory.studio.ldifeditor.help,
+ org.apache.directory.studio.ldifparser,
+ org.apache.directory.studio.openldap.common.ui,
+ org.apache.directory.studio.openldap.config.editor,
+ org.apache.directory.studio.openldap.syncrepl,
+ org.apache.directory.studio.rcp,
+ org.apache.directory.studio.rcp.help,
+ org.apache.directory.studio.schemaeditor,
+ org.apache.directory.studio.schemaeditor.help,
+ org.apache.directory.studio.test.integration.core,
+ org.apache.directory.studio.valueeditors,
+ 
+ org.eclipse.core.runtime,
+ org.eclipse.ui</Require-Bundle>
+            
+            <Import-Package>org.apache.commons.lang,
+ org.apache.commons.io,
+ org.apache.commons.codec.digest,
+ org.apache.http.conn.ssl,
+ org.dom4j,
+ org.dom4j.io</Import-Package>
+          
+          </instructions>
+        </configuration>
+        <executions>
+          <execution>
+            <id>generate-manifest</id>
+            <phase>process-classes</phase>
+            <goals>
+              <goal>manifest</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>
+

Modified: directory/studio/trunk/tests/test.integration.ui/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/tests/test.integration.ui/pom.xml?rev=1669933&r1=1669932&r2=1669933&view=diff
==============================================================================
--- directory/studio/trunk/tests/test.integration.ui/pom.xml (original)
+++ directory/studio/trunk/tests/test.integration.ui/pom.xml Sun Mar 29 17:11:26 2015
@@ -24,505 +24,47 @@
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>parent-tests</artifactId>
     <version>2.0.0-SNAPSHOT</version>
+    <relativePath>../</relativePath>
   </parent>
-
-  <artifactId>test.integration.ui</artifactId>
+  
+  <artifactId>org.apache.directory.studio.test.integration.ui</artifactId>
   <name>Apache Directory Studio UI Integration Tests</name>
-  <packaging>jar</packaging>
-
-  <description></description>
-
-  <profiles>
-
-    <!--linux-x86  -->
-    <profile>
-      <id>linux-x86</id>
-      <activation>
-        <os>
-          <arch>i386</arch>
-          <family>unix</family>
-          <name>linux</name>
-        </os>
-      </activation>
-      <properties>
-        <integration-regexp>^(ApacheDirectoryStudio-[^/]*)/(.*)$$</integration-regexp>
-        <integration-cmdline-params>-os linux -ws gtk -arch x86</integration-cmdline-params>
-        <integration-plugins-folder>plugins</integration-plugins-folder>
-      </properties>
-    </profile>
-
-    <!-- linux-x86_64 -->
-    <profile>
-      <id>linux-x86_64</id>
-      <activation>
-        <os>
-          <arch>amd64</arch>
-          <family>unix</family>
-          <name>linux</name>
-        </os>
-      </activation>
-      <properties>
-        <integration-regexp>^(ApacheDirectoryStudio-[^/]*)/(.*)$$</integration-regexp>
-        <integration-cmdline-params>-os linux -ws gtk -arch x86_64</integration-cmdline-params>
-        <integration-plugins-folder>plugins</integration-plugins-folder>
-      </properties>
-    </profile>
-
-    <!-- linux-ppc -->
-    <profile>
-      <id>linux-ppc</id>
-      <activation>
-        <os>
-          <arch>ppc</arch>
-          <family>unix</family>
-          <name>linux</name>
-        </os>
-      </activation>
-      <properties>
-        <integration-regexp>^(ApacheDirectoryStudio-[^/]*)/(.*)$$</integration-regexp>
-        <integration-cmdline-params>-os linux -ws gtk -arch ppc</integration-cmdline-params>
-        <integration-plugins-folder>plugins</integration-plugins-folder>
-      </properties>
-    </profile>
-
-    <!--win32  -->
-    <profile>
-       <id>win32</id>
-      <activation>
-        <os>
-          <arch>x86</arch>
-          <family>windows</family>
-        </os>
-      </activation>
-      <properties>
-        <integration-regexp>^(ApacheDirectoryStudio-[^\\]*)\\(.*)$$</integration-regexp>
-        <integration-cmdline-params>-os win32 -ws win32 -arch x86</integration-cmdline-params>
-        <integration-plugins-folder>plugins</integration-plugins-folder>
-      </properties>
-    </profile>
-
-    <!-- macosx -->
-    <profile>
-      <id>macosx</id>
-      <activation>
-        <os>
-          <family>unix</family>
-          <name>mac os x</name>
-        </os>
-      </activation>
-      <properties>
-        <integration-regexp>^(ApacheDirectoryStudio-[^/]*)/(.*)$$</integration-regexp>
-        <integration-cmdline-params>-os macosx -ws carbon -arch x86</integration-cmdline-params>
-        <integration-plugins-folder>Apache Directory Studio.app/Contents/Resources/Java/plugins</integration-plugins-folder>
-      </properties>
-    </profile>
-
-    <!-- launch UI tests using eclipse test framework -->
-    <profile>
-      <id>integration-ui</id>
-      <build>
-        <plugins>
-
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>integration-ui</id>
-                <phase>test</phase>
-                <configuration>
-                  <tasks>
-
-                    <!-- cleanup and recreate test-sandbox -->
-                    <delete dir="target/test-sandbox"/>
-                    <mkdir dir="target/test-sandbox"/>
-                    <mkdir dir="target/test-sandbox/workspace"/>
-
-                    <!-- copy complete eclipse distribution to test-sandbox -->
-                    <copy todir="target/test-sandbox">
-                      <fileset dir="${eclipse-home}">
-                        <exclude name="plugins/org.junit4*/**"/>
-                      </fileset>
-                    </copy>
-
-                    <!-- copy apache directory studio plugins to test-sandbox -->
-                    <copy todir="target/test-sandbox">
-                      <fileset dir="../target/distributions">
-                        <include name="ApacheDirectoryStudio-*/**/plugins/org.apache.directory*"/>
-                      </fileset>
-                      <regexpmapper from="${integration-regexp}" to="\2"/>
-                    </copy>
-
-                    <!-- copy SWTbot and eclipse testing plugins to test-sandbox -->
-                    <copy todir="target/test-sandbox/${integration-plugins-folder}">
-                      <fileset dir="resources/test-plugins">
-                        <include name="**/*" />
-                      </fileset>
-                    </copy>
-
-                    <!-- copy test-integration-ui plugin to test-sandbox -->
-                    <copy todir="target/test-sandbox/${integration-plugins-folder}">
-                      <fileset dir="target">
-                        <include name="test.integration.ui-*.jar" />
-                      </fileset>
-                    </copy>
-
-                    <!-- launch the tests -->
-                    <java fork="true" failonerror="true" classname="org.eclipse.core.launcher.Main">
-                      <jvmarg line="-Xmx1024m -XX:MaxPermSize=512m"/>
-                      <arg line="${integration-cmdline-params} -nl en -debug debugoptions -application org.eclipse.swtbot.eclipse.junit4.headless.swtbottestapplication -data target/test-sandbox/workspace formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,target/test-sandbox/workspace/test-result.xml -testPluginName org.apache.directory.studio.test.integration.ui -className org.apache.directory.studio.test.integration.ui.AutomatedSuite"/>
-                      <classpath>
-                        <fileset dir="target/test-sandbox">
-                          <include name="**/org.eclipse.equinox.launcher_*.jar"/>
-                        </fileset>
-                      </classpath>
-                    </java>
-
-                  </tasks>
-                </configuration>
-                <goals>
-                  <goal>run</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
+  <packaging>eclipse-test-plugin</packaging>
+  <description />
 
   <build>
-    <resources>
-      <resource>
-        <directory>.</directory>
-        <includes>
-          <include>plugin.xml</include>
-        </includes>
-      </resource>
-      <resource>
-        <directory>src/main/resources</directory>
-      </resource>
-    </resources>
     <plugins>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-eclipse-plugin</artifactId>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>target-platform-configuration</artifactId>
         <configuration>
-          <skip>false</skip>
-          <pde>true</pde>
-          <buildcommands>
-            <buildcommand>org.eclipse.jdt.core.javabuilder</buildcommand>
-            <buildcommand>org.eclipse.pde.ManifestBuilder</buildcommand>
-            <buildcommand>org.eclipse.pde.SchemaBuilder</buildcommand>
-          </buildcommands>
-          <projectnatures>
-            <projectnature>org.eclipse.jem.workbench.JavaEMFNature</projectnature>
-            <projectnature>org.eclipse.pde.PluginNature</projectnature>
-            <projectnature>org.eclipse.jdt.core.javanature</projectnature>
-            <projectnature>org.eclipse.jem.beaninfo.BeanInfoNature</projectnature>
-          </projectnatures>
-          <classpathContainers>
-            <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer>
-            <classpathContainer>org.eclipse.pde.core.requiredPlugins</classpathContainer>
-          </classpathContainers>
+          <dependency-resolution>
+            <extraRequirements>
+              <requirement>
+                <type>eclipse-feature</type>
+                <id>org.eclipse.rcp</id>
+                <versionRange>0.0.0</versionRange>
+              </requirement>
+            </extraRequirements>
+          </dependency-resolution>
         </configuration>
       </plugin>
       <plugin>
-        <groupId>org.apache.directory.studio</groupId>
-        <artifactId>studio-maven-plugin</artifactId>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-surefire-plugin</artifactId>
+        <version>${tycho.version}</version>
         <configuration>
-          <skip>false</skip>
-          <createManifest>true</createManifest>
-        </configuration>
-        <executions>
-          <execution>
-            <goals>
-              <goal>prepare-jar-package</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <configuration>
-          <archive>
-            <manifestFile>META-INF/MANIFEST.MF</manifestFile>
-            <addMavenDescriptor>false</addMavenDescriptor>
-          </archive>
-        </configuration>
-      </plugin>
-      <!-- MANIFEST.MF Generation -->
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <manifestLocation>META-INF</manifestLocation>
-          <instructions>
-            <Bundle-SymbolicName>${project.groupId}.${project.artifactId};singleton:=true</Bundle-SymbolicName>
-            <Bundle-Localization>plugin</Bundle-Localization>
-            <Require-Bundle>org.eclipse.core.runtime,
- org.eclipse.ui,
- org.apache.directory.studio.common.core,
- org.apache.directory.studio.common.ui,
- org.apache.directory.studio.connection.core,
- org.apache.directory.studio.connection.ui,
- org.apache.directory.studio.ldapbrowser.common,
- org.apache.directory.studio.ldapbrowser.core,
- org.apache.directory.studio.ldapbrowser.ui,
- org.apache.directory.studio.apacheds,
- org.apache.directory.api.i18n,
- org.apache.directory.api.ldap.schema,
- org.apache.directory.api.ldap.client.api,
- org.apache.mina.core,
- org.apache.commons.collections,
- org.apache.commons.io,
- org.apache.commons.lang,
- org.bouncycastle.bcprov.jdk15,
- org.slf4j.api,
- org.slf4j.log4j12,
- org.apache.logging.log4j,
- org.junit4,
- org.eclipse.swtbot.junit4_x,
- org.eclipse.swtbot.swt.finder,
- org.eclipse.swtbot.eclipse.finder,
- org.hamcrest
-            </Require-Bundle>
-            <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
-            <Embed-Directory>lib</Embed-Directory>
-            <Embed-StripGroup>true</Embed-StripGroup>
-            <Embed-Transitive>true</Embed-Transitive>
-            <_exportcontents>!*</_exportcontents>
-            <Import-Package>!</Import-Package>
-            <Private-Package>!</Private-Package>
-          </instructions>
-        </configuration>
-        <executions>
-          <execution>
-            <phase>process-classes</phase>
-            <goals>
-              <goal>manifest</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <!-- No tests to run -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <skip>false</skip>
+          <includes>
+            <include>**/*Test.java</include>
+          </includes>
+          <useUIHarness>true</useUIHarness>
+          <useUIThread>false</useUIThread>
+<!--           <product>org.eclipse.sdk.ide</product> -->
+<!--           <application>org.eclipse.ui.ide.workbench</application> -->
+          <product>org.apache.directory.studio.rcp.product</product>
+          <application>org.apache.directory.studio.rcp.application</application>
         </configuration>
       </plugin>
     </plugins>
   </build>
-
-  <dependencies>
-    <!-- Apache Directory Studio library plugins dependencies -->
-    <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.bouncycastle.bcprov.jdk15</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.commons.lang</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.commons.codec</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.directory.api</groupId>
-      <artifactId>shared-ldap</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-server-integ</artifactId>
-      <version>1.5.8-SNAPSHOT</version>
-      <!-- These excluded dependencies are included as eclipse bundles -->
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.directory.api</groupId>
-          <artifactId>api-i18n</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.directory.api</groupId>
-          <artifactId>shared-ldap-schema-data</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.directory.api</groupId>
-          <artifactId>shared-ldap-client-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.mina</groupId>
-          <artifactId>mina-core</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>bouncycastle</groupId>
-          <artifactId>bcprov-jdk15</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-log4j12</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>log4j</groupId>
-          <artifactId>log4j</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>commons-collections</groupId>
-          <artifactId>commons-collections</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>commons-io</groupId>
-          <artifactId>commons-io</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>commons-lang</groupId>
-          <artifactId>commons-lang</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>junit</groupId>
-          <artifactId>junit</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.commons.io</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>common.core</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>common.ui</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>connection.core</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>connection.ui</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>ldapbrowser.core</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>ldapbrowser.common</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>ldapbrowser.ui</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>apacheds</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.eclipse.swtbot.swt</groupId>
-      <artifactId>finder</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.swtbot.eclipse</groupId>
-      <artifactId>finder</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-all</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.eclipse</groupId>
-      <artifactId>osgi</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.equinox</groupId>
-      <artifactId>common</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.equinox</groupId>
-      <artifactId>registry</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.core</groupId>
-      <artifactId>runtime</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.core</groupId>
-      <artifactId>jobs</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse</groupId>
-      <artifactId>ui</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.ui</groupId>
-      <artifactId>workbench</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse</groupId>
-      <artifactId>jface</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.swt.gtk.linux</groupId>
-      <artifactId>x86</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.equinox</groupId>
-      <artifactId>preferences</artifactId>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-
 </project>

Added: directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/Activator.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/Activator.java?rev=1669933&view=auto
==============================================================================
--- directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/Activator.java (added)
+++ directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/Activator.java Sun Mar 29 17:11:26 2015
@@ -0,0 +1,51 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *  
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *  
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License. 
+ *  
+ */
+package org.apache.directory.studio.test.integration.ui;
+
+
+import org.apache.directory.api.ldap.codec.protocol.mina.LdapProtocolCodecActivator;
+import org.eclipse.core.runtime.Plugin;
+import org.osgi.framework.BundleContext;
+
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends Plugin
+{
+
+    /**
+     * @see org.eclipse.core.runtime.Plugin#start(org.osgi.framework.BundleContext)
+     */
+    public void start( BundleContext context ) throws Exception
+    {
+        super.start( context );
+        LdapProtocolCodecActivator.lazyStart();
+    }
+
+
+    /**
+     * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
+     */
+    public void stop( BundleContext context ) throws Exception
+    {
+    }
+
+}

Modified: directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ApacheDSPluginTest.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ApacheDSPluginTest.java?rev=1669933&r1=1669932&r2=1669933&view=diff
==============================================================================
--- directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ApacheDSPluginTest.java (original)
+++ directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ApacheDSPluginTest.java Sun Mar 29 17:11:26 2015
@@ -25,12 +25,12 @@ import static org.junit.Assert.assertEqu
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-import org.apache.directory.studio.apacheds.model.ServersHandler;
 import org.apache.directory.studio.connection.core.Connection;
 import org.apache.directory.studio.connection.core.ConnectionCorePlugin;
 import org.apache.directory.studio.connection.core.ConnectionFolder;
 import org.apache.directory.studio.connection.core.ConnectionFolderManager;
 import org.apache.directory.studio.connection.core.ConnectionManager;
+import org.apache.directory.studio.ldapservers.LdapServersManager;
 import org.apache.directory.studio.test.integration.ui.bots.ApacheDSServersViewBot;
 import org.apache.directory.studio.test.integration.ui.bots.ConnectionFromServerDialogBot;
 import org.apache.directory.studio.test.integration.ui.bots.ConnectionsViewBot;
@@ -280,7 +280,7 @@ public class ApacheDSPluginTest
      */
     public int getCoreServersCount()
     {
-        ServersHandler serversHandler = ServersHandler.getDefault();
+        LdapServersManager serversHandler = LdapServersManager.getDefault();
         if ( serversHandler != null )
         {
             return serversHandler.getServersList().size();

Modified: directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ApacheDsUtils.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ApacheDsUtils.java?rev=1669933&r1=1669932&r2=1669933&view=diff
==============================================================================
--- directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ApacheDsUtils.java (original)
+++ directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ApacheDsUtils.java Sun Mar 29 17:11:26 2015
@@ -21,13 +21,15 @@
 package org.apache.directory.studio.test.integration.ui;
 
 
-import static org.apache.directory.server.integ.ServerIntegrationUtils.getWiredContext;
+import java.util.Hashtable;
 
+import javax.naming.Context;
 import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
 import javax.naming.directory.BasicAttribute;
 import javax.naming.directory.DirContext;
 import javax.naming.directory.ModificationItem;
+import javax.naming.ldap.InitialLdapContext;
 
 import org.apache.directory.server.ldap.LdapServer;
 
@@ -42,7 +44,14 @@ public class ApacheDsUtils
 {
     public static void enableSchema( LdapServer ldapServer, String schema ) throws Exception
     {
-        DirContext schemaRoot = ( DirContext ) getWiredContext( ldapServer ).lookup( "ou=schema" );
+        Hashtable<String, String> env = new Hashtable<String, String>();
+        env.put( Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory" );
+        env.put( Context.PROVIDER_URL, "ldap://localhost:" + ldapServer.getPort() );
+        env.put( Context.SECURITY_PRINCIPAL, "uid=admin,ou=system" );
+        env.put( Context.SECURITY_CREDENTIALS, "secret" );
+        env.put( Context.SECURITY_AUTHENTICATION, "simple" );
+        DirContext schemaRoot = ( DirContext ) new InitialLdapContext( env, null ).lookup( "ou=schema" );
+
         Attributes krb5kdcAttrs = schemaRoot.getAttributes( "cn=" + schema );
         boolean isKrb5KdcDisabled = false;
         if ( krb5kdcAttrs.get( "m-disabled" ) != null )

Modified: directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/EntryEditorTest.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/EntryEditorTest.java?rev=1669933&r1=1669932&r2=1669933&view=diff
==============================================================================
--- directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/EntryEditorTest.java (original)
+++ directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/EntryEditorTest.java Sun Mar 29 17:11:26 2015
@@ -60,8 +60,8 @@ import org.junit.runner.RunWith;
 @RunWith(FrameworkRunner.class)
 @CreateLdapServer(transports =
     { @CreateTransport(protocol = "LDAP") })
-@ApplyLdifFiles(
-    { "org/apache/directory/studio/test/integration/ui/EntryEditorTest.ldif" })
+@ApplyLdifFiles( clazz=EntryEditorTest.class,
+    value = { "org/apache/directory/studio/test/integration/ui/EntryEditorTest.ldif" })
 public class EntryEditorTest extends AbstractLdapTestUnit
 {
     private StudioBot studioBot;
@@ -249,7 +249,7 @@ public class EntryEditorTest extends Abs
         entryEditorBot.getAttributeValues().contains( "uid: bjensen" );
 
         // assert pasted value was written to directory
-        Entry entry = ldapServer.getDirectoryService().getAdminSession()
+        Entry entry = service.getAdminSession()
             .lookup( new Dn( "cn=\\#\\\\\\+\\, \\\"\u00F6\u00E9\\\",ou=users,ou=system" ) );
         assertTrue( entry.contains( "uid", "bjensen" ) );
     }

Modified: directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ImportExportTest.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ImportExportTest.java?rev=1669933&r1=1669932&r2=1669933&view=diff
==============================================================================
--- directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ImportExportTest.java (original)
+++ directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ImportExportTest.java Sun Mar 29 17:11:26 2015
@@ -37,7 +37,7 @@ import org.apache.directory.server.annot
 import org.apache.directory.server.core.annotations.ApplyLdifFiles;
 import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
 import org.apache.directory.server.core.integ.FrameworkRunner;
-import org.apache.directory.server.core.partition.Partition;
+import org.apache.directory.server.core.api.partition.Partition;
 import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition;
 import org.apache.directory.api.ldap.model.name.Dn;
 import org.apache.directory.studio.ldapbrowser.core.events.EventRegistry;
@@ -204,10 +204,10 @@ public class ImportExportTest extends Ab
     public void testImportContextEntryRefreshesRootDSE() throws Exception
     {
         // add a new partition
-        Partition partition = new JdbmPartition();
+        Partition partition = new JdbmPartition(service.getSchemaManager(), service.getDnFactory());
         partition.setId( "example" );
-        partition.setSuffix( new Dn( "dc=example,dc=com" ) );
-        ldapServer.getDirectoryService().addPartition( partition );
+        partition.setSuffixDn( new Dn( "dc=example,dc=com" ) );
+        service.addPartition( partition );
 
         // refresh root DSE and ensure that the partition is in root DSE
         browserViewBot.selectEntry( "DIT", "Root DSE" );

Modified: directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/NewConnectionWizardTest.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/NewConnectionWizardTest.java?rev=1669933&r1=1669932&r2=1669933&view=diff
==============================================================================
--- directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/NewConnectionWizardTest.java (original)
+++ directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/NewConnectionWizardTest.java Sun Mar 29 17:11:26 2015
@@ -47,7 +47,7 @@ import javax.security.auth.x500.X500Prin
 
 import org.apache.directory.server.annotations.CreateLdapServer;
 import org.apache.directory.server.annotations.CreateTransport;
-import org.apache.directory.server.core.CoreSession;
+import org.apache.directory.server.core.api.CoreSession;
 import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
 import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.api.ldap.model.entry.Entry;
@@ -1092,7 +1092,7 @@ public class NewConnectionWizardTest ext
         List<Modification> modifications = new ArrayList<Modification>();
 
         // Get old key algorithm
-        Entry entry = ldapServer.getDirectoryService().getAdminSession().lookup( dn );
+        Entry entry = service.getAdminSession().lookup( dn );
         String keyAlgo = entry.get( KEY_ALGORITHM_AT ).getString();
 
         // Generate key pair
@@ -1128,7 +1128,7 @@ public class NewConnectionWizardTest ext
         request.replace( PUBLIC_KEY_AT, publicKey.getEncoded() );
         request.replace( PUBLIC_KEY_FORMAT_AT, publicKey.getFormat() );
         request.replace( USER_CERTIFICATE_AT, cert.getEncoded() );
-        ldapServer.getDirectoryService().getAdminSession().modify( dn, modifications );
+        service.getAdminSession().modify( dn, modifications );
 
         // TODO: activate when DIRSERVER-1373 is fixed
         //ldapService.reloadSslContext();
@@ -1144,7 +1144,7 @@ public class NewConnectionWizardTest ext
         }
         ksFile = File.createTempFile( "testStore", "ks" );
 
-        CoreSession session = ldapServer.getDirectoryService().getAdminSession();
+        CoreSession session = service.getAdminSession();
         Entry entry = session.lookup( new Dn( "uid=admin,ou=system" ), new String[]
             { USER_CERTIFICATE_AT } );
         byte[] userCertificate = entry.get( USER_CERTIFICATE_AT ).getBytes();

Modified: directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/NewEntryWizardTest.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/NewEntryWizardTest.java?rev=1669933&r1=1669932&r2=1669933&view=diff
==============================================================================
--- directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/NewEntryWizardTest.java (original)
+++ directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/NewEntryWizardTest.java Sun Mar 29 17:11:26 2015
@@ -81,7 +81,7 @@ public class NewEntryWizardTest extends
         entry.add( "objectClass", "top", "referral", "extensibleObject" );
         entry.add( "cn", "referralDialogTest" );
         entry.add( "ref", "ldap://localhost:" + ldapServer.getPort() + "/ou=users,ou=system" );
-        ldapServer.getDirectoryService().getAdminSession().add( entry );
+        service.getAdminSession().add( entry );
 
         studioBot = new StudioBot();
         studioBot.resetLdapPerspective();

Modified: directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ReferralDialogTest.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ReferralDialogTest.java?rev=1669933&r1=1669932&r2=1669933&view=diff
==============================================================================
--- directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ReferralDialogTest.java (original)
+++ directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ReferralDialogTest.java Sun Mar 29 17:11:26 2015
@@ -82,7 +82,7 @@ public class ReferralDialogTest extends
         entry.add( "objectClass", "top", "referral", "extensibleObject" );
         entry.add( "cn", "referralDialogTest" );
         entry.add( "ref", "ldap://localhost:" + ldapServer.getPort() + "/ou=users,ou=system" );
-        ldapServer.getDirectoryService().getAdminSession().add( entry );
+        service.getAdminSession().add( entry );
 
         // get paths
         parentPath = new String[]

Modified: directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/SearchTest.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/SearchTest.java?rev=1669933&r1=1669932&r2=1669933&view=diff
==============================================================================
--- directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/SearchTest.java (original)
+++ directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/SearchTest.java Sun Mar 29 17:11:26 2015
@@ -197,7 +197,7 @@ public class SearchTest extends Abstract
         ModifyRequest request = new ModifyRequestImpl();
         request.setName( new Dn( "uid=admin,ou=system" ) );
         request.replace( "description", "The 1st description." );
-        ldapServer.getDirectoryService().getAdminSession().modify( request );
+        service.getAdminSession().modify( request );
 
         // refresh the search, using the toolbar icon
         srEditorBot.refresh();

Modified: directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/ApacheDSServersViewBot.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/ApacheDSServersViewBot.java?rev=1669933&r1=1669932&r2=1669933&view=diff
==============================================================================
--- directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/ApacheDSServersViewBot.java (original)
+++ directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/ApacheDSServersViewBot.java Sun Mar 29 17:11:26 2015
@@ -20,9 +20,9 @@
 package org.apache.directory.studio.test.integration.ui.bots;
 
 
-import org.apache.directory.studio.apacheds.model.Server;
-import org.apache.directory.studio.apacheds.model.ServerStateEnum;
-import org.apache.directory.studio.apacheds.model.ServersHandler;
+import org.apache.directory.studio.ldapservers.LdapServersManager;
+import org.apache.directory.studio.ldapservers.model.LdapServer;
+import org.apache.directory.studio.ldapservers.model.LdapServerStatus;
 import org.apache.directory.studio.test.integration.ui.ContextMenuHelper;
 import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot;
 import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView;
@@ -189,10 +189,10 @@ public class ApacheDSServersViewBot
         {
             public boolean test() throws Exception
             {
-                Server server = getServer( serverName );
+                LdapServer server = getServer( serverName );
                 if ( server != null )
                 {
-                    return ( ServerStateEnum.STARTED == server.getState() );
+                    return ( LdapServerStatus.STARTED == server.getStatus() );
                 }
 
                 return false;
@@ -219,10 +219,10 @@ public class ApacheDSServersViewBot
         {
             public boolean test() throws Exception
             {
-                Server server = getServer( serverName );
+                LdapServer server = getServer( serverName );
                 if ( server != null )
                 {
-                    return ( ServerStateEnum.STOPPED == server.getState() );
+                    return ( LdapServerStatus.STOPPED == server.getStatus() );
                 }
 
                 return false;
@@ -246,9 +246,9 @@ public class ApacheDSServersViewBot
      *      the server associated with the given name,
      *      or <code>null</code> if none was found.
      */
-    private Server getServer( String serverName )
+    private LdapServer getServer( String serverName )
     {
-        for ( Server server : ServersHandler.getDefault().getServersList() )
+        for ( LdapServer server : LdapServersManager.getDefault().getServersList() )
         {
             if ( serverName.equals( server.getName() ) )
             {



Mime
View raw message