You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pa...@apache.org on 2008/07/17 14:38:48 UTC
svn commit: r677569 - 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/
Author: pamarcelot
Date: Thu Jul 17 05:38:48 2008
New Revision: 677569
URL: http://svn.apache.org/viewvc?rev=677569&view=rev
Log:
Updated the Apache DS plugin to use the latest version of Apache DS (1.5.3).
Modified:
directory/studio/trunk/apacheds/plugin.xml
directory/studio/trunk/apacheds/pom.xml
directory/studio/trunk/apacheds/resources/conf/server.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
Modified: directory/studio/trunk/apacheds/plugin.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds/plugin.xml?rev=677569&r1=677568&r2=677569&view=diff
==============================================================================
--- directory/studio/trunk/apacheds/plugin.xml (original)
+++ directory/studio/trunk/apacheds/plugin.xml Thu Jul 17 05:38:48 2008
@@ -86,6 +86,12 @@
</command>
<command
categoryId="org.apache.directory.studio.apacheds.commands"
+ description="Creates a connection"
+ id="org.apache.directory.studio.apacheds.commands.createConnection"
+ name="Create a Connection">
+ </command>
+ <command
+ categoryId="org.apache.directory.studio.apacheds.commands"
description="Runs the server"
id="org.apache.directory.studio.apacheds.commands.run"
name="Run">
Modified: directory/studio/trunk/apacheds/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds/pom.xml?rev=677569&r1=677568&r2=677569&view=diff
==============================================================================
--- directory/studio/trunk/apacheds/pom.xml (original)
+++ directory/studio/trunk/apacheds/pom.xml Thu Jul 17 05:38:48 2008
@@ -139,6 +139,10 @@
</artifactItem>
<artifactItem>
<groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-jdbm</artifactId>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-jdbm-store</artifactId>
</artifactItem>
<artifactItem>
@@ -230,10 +234,6 @@
<artifactId>jcl104-over-slf4j</artifactId>
</artifactItem>
<artifactItem>
- <groupId>jdbm</groupId>
- <artifactId>jdbm</artifactId>
- </artifactItem>
- <artifactItem>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</artifactItem>
@@ -308,122 +308,127 @@
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-bootstrap-extract</artifactId>
- <version>1.5.2</version>
+ <version>1.5.3</version>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-bootstrap-partition</artifactId>
- <version>1.5.2</version>
+ <version>1.5.3</version>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-btree-base</artifactId>
- <version>1.5.2</version>
+ <version>1.5.3</version>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-core</artifactId>
- <version>1.5.2</version>
+ <version>1.5.3</version>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-core-constants</artifactId>
- <version>1.5.2</version>
+ <version>1.5.3</version>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-core-entry</artifactId>
- <version>1.5.2</version>
+ <version>1.5.3</version>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-core-shared</artifactId>
- <version>1.5.2</version>
+ <version>1.5.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-jdbm</artifactId>
+ <version>1.5.3</version>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-jdbm-store</artifactId>
- <version>1.5.2</version>
+ <version>1.5.3</version>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-kerberos-shared</artifactId>
- <version>1.5.2</version>
+ <version>1.5.3</version>
</dependency>
<dependency>
<groupId>org.apache.directory.installers</groupId>
<artifactId>apacheds-noarch-installer</artifactId>
- <version>1.5.2</version>
+ <version>1.5.3</version>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-protocol-changepw</artifactId>
- <version>1.5.2</version>
+ <version>1.5.3</version>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-protocol-dns</artifactId>
- <version>1.5.2</version>
+ <version>1.5.3</version>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-protocol-kerberos</artifactId>
- <version>1.5.2</version>
+ <version>1.5.3</version>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-protocol-ldap</artifactId>
- <version>1.5.2</version>
+ <version>1.5.3</version>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-protocol-ldap</artifactId>
- <version>1.5.2</version>
+ <version>1.5.3</version>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-protocol-ntp</artifactId>
- <version>1.5.2</version>
+ <version>1.5.3</version>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-protocol-shared</artifactId>
- <version>1.5.2</version>
+ <version>1.5.3</version>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-schema-bootstrap</artifactId>
- <version>1.5.2</version>
+ <version>1.5.3</version>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-schema-extras</artifactId>
- <version>1.5.2</version>
+ <version>1.5.3</version>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-schema-registries</artifactId>
- <version>1.5.2</version>
+ <version>1.5.3</version>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-server-jndi</artifactId>
- <version>1.5.2</version>
+ <version>1.5.3</version>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-server-xml</artifactId>
- <version>1.5.2</version>
+ <version>1.5.3</version>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-utils</artifactId>
- <version>1.5.2</version>
+ <version>1.5.3</version>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-xbean-spring</artifactId>
- <version>1.5.2</version>
+ <version>1.5.3</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
@@ -456,11 +461,6 @@
<version>1.4.3</version>
</dependency>
<dependency>
- <groupId>jdbm</groupId>
- <artifactId>jdbm</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.14</version>
@@ -468,37 +468,37 @@
<dependency>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
- <version>1.1.2</version>
+ <version>1.1.6</version>
</dependency>
<dependency>
<groupId>org.apache.mina</groupId>
<artifactId>mina-filter-ssl</artifactId>
- <version>1.1.2</version>
+ <version>1.1.6</version>
</dependency>
<dependency>
<groupId>org.apache.directory.shared</groupId>
<artifactId>shared-asn1</artifactId>
- <version>0.9.10</version>
+ <version>0.9.11</version>
</dependency>
<dependency>
<groupId>org.apache.directory.shared</groupId>
<artifactId>shared-asn1-codec</artifactId>
- <version>0.9.10</version>
+ <version>0.9.11</version>
</dependency>
<dependency>
<groupId>org.apache.directory.shared</groupId>
<artifactId>shared-bouncycastle-reduced</artifactId>
- <version>0.9.10</version>
+ <version>0.9.11</version>
</dependency>
<dependency>
<groupId>org.apache.directory.shared</groupId>
<artifactId>shared-ldap</artifactId>
- <version>0.9.10</version>
+ <version>0.9.11</version>
</dependency>
<dependency>
<groupId>org.apache.directory.shared</groupId>
<artifactId>shared-ldap-constants</artifactId>
- <version>0.9.10</version>
+ <version>0.9.11</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Modified: directory/studio/trunk/apacheds/resources/conf/server.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds/resources/conf/server.xml?rev=677569&r1=677568&r2=677569&view=diff
==============================================================================
--- directory/studio/trunk/apacheds/resources/conf/server.xml (original)
+++ directory/studio/trunk/apacheds/resources/conf/server.xml Thu Jul 17 05:38:48 2008
@@ -142,6 +142,7 @@
<socketAcceptor>#socketAcceptor</socketAcceptor>
</ldapServer>
+
<ldapServer id="ldapServer"
ipPort="10389"
allowAnonymousAccess="false"
@@ -153,13 +154,16 @@
<directoryService>#directoryService</directoryService>
<socketAcceptor>#socketAcceptor</socketAcceptor>
+
<!-- The list of supported authentication mechanisms. -->
- <supportedMechanisms>
- <s:value>SIMPLE</s:value>
- <s:value>CRAM-MD5</s:value>
- <s:value>DIGEST-MD5</s:value>
- <!--<s:value>GSSAPI</s:value>-->
- </supportedMechanisms>
+ <saslMechanismHandlers>
+ <simpleMechanismHandler mech-name="SIMPLE"/>
+ <cramMd5MechanismHandler mech-name="CRAM-MD5" directoryService="#directoryService"/>
+ <digestMd5MechanismHandler mech-name="DIGEST-MD5" directoryService="#directoryService"/>
+ <gssapiMechanismHandler mech-name="GSSAPI" directoryService="#directoryService"/>
+ <ntlmMechanismHandler mech-name="NTLM" ntlmProviderFqcn="com.foo.Bar"/>
+ <ntlmMechanismHandler mech-name="GSS-SPNEGO" ntlmProviderFqcn="com.foo.Bar"/>
+ </saslMechanismHandlers>
<!-- The desired quality-of-protection, used by DIGEST-MD5 and GSSAPI. -->
<saslQop>
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=677569&r1=677568&r2=677569&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 Thu Jul 17 05:38:48 2008
@@ -49,29 +49,29 @@
private static final String LIBRARIES_FOLDER_NAME = "libs";
private static final String APACHEDS = "apacheds";
/** The version of ApacheDS bundle with the plugin */
- private static final String APACHEDS_VERSION = "1.5.2";
+ private static final String APACHEDS_VERSION = "1.5.3";
/** The line separator */
public static final String LINE_SEPARATOR = System.getProperty( "line.separator" );
/** This array of String contains all filenames of the needed libraries to launch Apache DS */
public static final String[] apachedsLibraries = new String[]
- { "antlr-2.7.7.jar", "apacheds-bootstrap-extract-1.5.2.jar", "apacheds-bootstrap-partition-1.5.2.jar",
- "apacheds-btree-base-1.5.2.jar", "apacheds-core-1.5.2.jar", "apacheds-core-constants-1.5.2.jar",
- "apacheds-core-entry-1.5.2.jar", "apacheds-core-shared-1.5.2.jar", "apacheds-jdbm-store-1.5.2.jar",
- "apacheds-kerberos-shared-1.5.2.jar", "apacheds-launcher-1.2.0.jar",
- "apacheds-protocol-changepw-1.5.2.jar", "apacheds-protocol-dns-1.5.2.jar",
- "apacheds-protocol-kerberos-1.5.2.jar", "apacheds-protocol-ldap-1.5.2.jar",
- "apacheds-protocol-ntp-1.5.2.jar", "apacheds-protocol-shared-1.5.2.jar",
- "apacheds-schema-bootstrap-1.5.2.jar", "apacheds-schema-extras-1.5.2.jar",
- "apacheds-schema-registries-1.5.2.jar", "apacheds-server-jndi-1.5.2.jar", "apacheds-server-xml-1.5.2.jar",
- "apacheds-utils-1.5.2.jar", "apacheds-xbean-spring-1.5.2.jar", "commons-cli-1.1.jar",
+ { "antlr-2.7.7.jar", "apacheds-bootstrap-extract-1.5.3.jar", "apacheds-bootstrap-partition-1.5.3.jar",
+ "apacheds-btree-base-1.5.3.jar", "apacheds-core-1.5.3.jar", "apacheds-core-constants-1.5.3.jar",
+ "apacheds-core-entry-1.5.3.jar", "apacheds-core-shared-1.5.3.jar", "apacheds-jdbm-1.5.3.jar",
+ "apacheds-jdbm-store-1.5.3.jar", "apacheds-kerberos-shared-1.5.3.jar", "apacheds-launcher-1.2.0.jar",
+ "apacheds-protocol-changepw-1.5.3.jar", "apacheds-protocol-dns-1.5.3.jar",
+ "apacheds-protocol-kerberos-1.5.3.jar", "apacheds-protocol-ldap-1.5.3.jar",
+ "apacheds-protocol-ntp-1.5.3.jar", "apacheds-protocol-shared-1.5.3.jar",
+ "apacheds-schema-bootstrap-1.5.3.jar", "apacheds-schema-extras-1.5.3.jar",
+ "apacheds-schema-registries-1.5.3.jar", "apacheds-server-jndi-1.5.3.jar", "apacheds-server-xml-1.5.3.jar",
+ "apacheds-utils-1.5.3.jar", "apacheds-xbean-spring-1.5.3.jar", "commons-cli-1.1.jar",
"commons-collections-3.2.jar", "commons-daemon-1.0.1.jar", "commons-lang-2.3.jar",
- "daemon-bootstrappers-1.1.3.jar", "jcl104-over-slf4j-1.4.3.jar", "jdbm-1.0.jar", "log4j-1.2.14.jar",
- "mina-core-1.1.2.jar", "mina-filter-ssl-1.1.2.jar", "shared-asn1-0.9.10.jar",
- "shared-asn1-codec-0.9.10.jar", "shared-bouncycastle-reduced-0.9.10.jar", "shared-ldap-0.9.10.jar",
- "shared-ldap-constants-0.9.10.jar", "slf4j-api-1.4.3.jar", "slf4j-log4j12-1.4.3.jar",
- "spring-beans-2.0.6.jar", "spring-context-2.0.6.jar", "spring-core-2.0.6.jar", "xbean-spring-3.3.jar" };
+ "daemon-bootstrappers-1.1.3.jar", "jcl104-over-slf4j-1.4.3.jar", "log4j-1.2.14.jar", "mina-core-1.1.6.jar",
+ "mina-filter-ssl-1.1.6.jar", "shared-asn1-0.9.11.jar", "shared-asn1-codec-0.9.11.jar",
+ "shared-bouncycastle-reduced-0.9.11.jar", "shared-ldap-0.9.11.jar", "shared-ldap-constants-0.9.11.jar",
+ "slf4j-api-1.4.3.jar", "slf4j-log4j12-1.4.3.jar", "spring-beans-2.0.6.jar", "spring-context-2.0.6.jar",
+ "spring-core-2.0.6.jar", "xbean-spring-3.3.jar" };
/**
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=677569&r1=677568&r2=677569&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 Thu Jul 17 05:38:48 2008
@@ -28,8 +28,8 @@
import org.apache.directory.studio.apacheds.ApacheDsPluginConstants;
import org.apache.directory.studio.apacheds.ApacheDsPluginUtils;
import org.apache.directory.studio.apacheds.configuration.model.ServerXmlIOException;
-import org.apache.directory.studio.apacheds.configuration.model.v152.ServerConfigurationV152;
-import org.apache.directory.studio.apacheds.configuration.model.v152.ServerXmlIOV152;
+import org.apache.directory.studio.apacheds.configuration.model.v153.ServerConfigurationV153;
+import org.apache.directory.studio.apacheds.configuration.model.v153.ServerXmlIOV153;
import org.apache.directory.studio.apacheds.model.Server;
import org.apache.directory.studio.apacheds.views.ServersView;
import org.eclipse.core.runtime.Platform;
@@ -110,11 +110,11 @@
Server server = ( Server ) selection.getFirstElement();
// Parsing the 'server.xml' file
- ServerXmlIOV152 serverXmlIOV152 = new ServerXmlIOV152();
- ServerConfigurationV152 serverConfiguration = null;
+ ServerXmlIOV153 serverXmlIOV153 = new ServerXmlIOV153();
+ ServerConfigurationV153 serverConfiguration = null;
try
{
- serverConfiguration = ( ServerConfigurationV152 ) serverXmlIOV152.parse( new FileInputStream(
+ serverConfiguration = ( ServerConfigurationV153 ) serverXmlIOV153.parse( new FileInputStream(
new File( ApacheDsPluginUtils.getApacheDsServersFolder().append( server.getId() ).append(
"conf" ).append( "server.xml" ).toOSString() ) ) );
}
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=677569&r1=677568&r2=677569&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 Thu Jul 17 05:38:48 2008
@@ -20,7 +20,7 @@
package org.apache.directory.studio.apacheds.actions;
-import org.apache.directory.studio.apacheds.configuration.model.v152.ServerConfigurationV152;
+import org.apache.directory.studio.apacheds.configuration.model.v153.ServerConfigurationV153;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.core.ConnectionCorePlugin;
import org.apache.directory.studio.connection.core.ConnectionParameter;
@@ -49,7 +49,7 @@
* @param serverConfiguration
* the server configuration
*/
- public static void createLdapBrowserConnection( String serverName, ServerConfigurationV152 serverConfiguration )
+ public static void createLdapBrowserConnection( String serverName, ServerConfigurationV153 serverConfiguration )
{
if ( ( serverConfiguration.isEnableLdap() ) || ( serverConfiguration.isEnableLdaps() ) )
{
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=677569&r1=677568&r2=677569&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 Thu Jul 17 05:38:48 2008
@@ -30,8 +30,8 @@
import org.apache.directory.studio.apacheds.ApacheDsPluginConstants;
import org.apache.directory.studio.apacheds.ApacheDsPluginUtils;
import org.apache.directory.studio.apacheds.configuration.model.ServerXmlIOException;
-import org.apache.directory.studio.apacheds.configuration.model.v152.ServerConfigurationV152;
-import org.apache.directory.studio.apacheds.configuration.model.v152.ServerXmlIOV152;
+import org.apache.directory.studio.apacheds.configuration.model.v153.ServerConfigurationV153;
+import org.apache.directory.studio.apacheds.configuration.model.v153.ServerXmlIOV153;
import org.apache.directory.studio.apacheds.jobs.LaunchServerJob;
import org.apache.directory.studio.apacheds.model.Server;
import org.apache.directory.studio.apacheds.views.ServersView;
@@ -111,11 +111,11 @@
final Server server = ( Server ) selection.getFirstElement();
// Parsing the 'server.xml' file
- ServerXmlIOV152 serverXmlIOV152 = new ServerXmlIOV152();
- ServerConfigurationV152 serverConfiguration = null;
+ ServerXmlIOV153 serverXmlIOV153 = new ServerXmlIOV153();
+ ServerConfigurationV153 serverConfiguration = null;
try
{
- serverConfiguration = ( ServerConfigurationV152 ) serverXmlIOV152.parse( new FileInputStream(
+ serverConfiguration = ( ServerConfigurationV153 ) serverXmlIOV153.parse( new FileInputStream(
new File( ApacheDsPluginUtils.getApacheDsServersFolder().append( server.getId() ).append(
"conf" ).append( "server.xml" ).toOSString() ) ) );
}
@@ -224,7 +224,7 @@
* an array of String containing the ports and their associated
* protocols which are already in use.
*/
- private String[] getAlreadyInUseProtocolPorts( ServerConfigurationV152 serverConfiguration )
+ private String[] getAlreadyInUseProtocolPorts( ServerConfigurationV153 serverConfiguration )
{
List<String> alreadyInUseProtocolPortsList = new ArrayList<String>();
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=677569&r1=677568&r2=677569&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 Thu Jul 17 05:38:48 2008
@@ -29,7 +29,7 @@
import org.apache.directory.studio.apacheds.ApacheDsPluginUtils;
import org.apache.directory.studio.apacheds.ConsolesHandler;
import org.apache.directory.studio.apacheds.LogMessageConsole;
-import org.apache.directory.studio.apacheds.configuration.model.v152.ServerConfigurationV152;
+import org.apache.directory.studio.apacheds.configuration.model.v153.ServerConfigurationV153;
import org.apache.directory.studio.apacheds.model.Server;
import org.apache.directory.studio.apacheds.model.ServerStateEnum;
import org.apache.log4j.net.SocketServer;
@@ -70,7 +70,7 @@
private Server server;
/** The configuration */
- private ServerConfigurationV152 configuration;
+ private ServerConfigurationV153 configuration;
/** The launch that will be created when running the server */
private ILaunch launch;
@@ -93,7 +93,7 @@
* @param configuration
* the configuration
*/
- public LaunchServerJob( Server server, ServerConfigurationV152 configuration )
+ public LaunchServerJob( Server server, ServerConfigurationV153 configuration )
{
super( "" );
this.server = server;
@@ -319,8 +319,7 @@
ILaunch debugEventLaunch = runtimeProcess.getLaunch();
if ( debugEventLaunch.equals( launch ) )
{
- // The launch we had created is now
- // terminated
+ // The launch we had created is now terminated
// The server is now stopped
server.setState( ServerStateEnum.STOPPED );