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 2012/01/06 18:09:23 UTC
svn commit: r1228281 - in /directory/studio/trunk/plugins:
ldapservers.apacheds.v153/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v153/
ldapservers.apacheds.v154/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v154/
lda...
Author: pamarcelot
Date: Fri Jan 6 17:09:23 2012
New Revision: 1228281
URL: http://svn.apache.org/viewvc?rev=1228281&view=rev
Log:
Marked strings as non-externalized.
Modified:
directory/studio/trunk/plugins/ldapservers.apacheds.v153/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v153/ApacheDS153LdapServerAdapter.java
directory/studio/trunk/plugins/ldapservers.apacheds.v153/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v153/CreateConnectionAction.java
directory/studio/trunk/plugins/ldapservers.apacheds.v154/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v154/ApacheDS154LdapServerAdapter.java
directory/studio/trunk/plugins/ldapservers.apacheds.v154/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v154/CreateConnectionAction.java
directory/studio/trunk/plugins/ldapservers.apacheds.v155/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v155/ApacheDS155LdapServerAdapter.java
directory/studio/trunk/plugins/ldapservers.apacheds.v155/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v155/CreateConnectionAction.java
directory/studio/trunk/plugins/ldapservers.apacheds.v156/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v156/ApacheDS156LdapServerAdapter.java
directory/studio/trunk/plugins/ldapservers.apacheds.v156/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v156/CreateConnectionAction.java
directory/studio/trunk/plugins/ldapservers.apacheds.v157/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v157/ApacheDS157LdapServerAdapter.java
directory/studio/trunk/plugins/ldapservers.apacheds.v157/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v157/CreateConnectionAction.java
directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/ApacheDS200LdapServerAdapter.java
directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/CreateConnectionAction.java
directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/model/LdapServerActionFilterAdapter.java
Modified: directory/studio/trunk/plugins/ldapservers.apacheds.v153/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v153/ApacheDS153LdapServerAdapter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapservers.apacheds.v153/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v153/ApacheDS153LdapServerAdapter.java?rev=1228281&r1=1228280&r2=1228281&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapservers.apacheds.v153/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v153/ApacheDS153LdapServerAdapter.java (original)
+++ directory/studio/trunk/plugins/ldapservers.apacheds.v153/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v153/ApacheDS153LdapServerAdapter.java Fri Jan 6 17:09:23 2012
@@ -58,30 +58,30 @@ import org.osgi.framework.Bundle;
public class ApacheDS153LdapServerAdapter implements LdapServerAdapter
{
// Various strings constants used in paths
- private static final String SERVER_XML = "server.xml";
- private static final String LOG4J_PROPERTIES = "log4j.properties";
- private static final String RESOURCES = "resources";
- private static final String LIBS = "libs";
- private static final String CONF = "conf";
+ private static final String SERVER_XML = "server.xml"; //$NON-NLS-1$
+ private static final String LOG4J_PROPERTIES = "log4j.properties"; //$NON-NLS-1$
+ private static final String RESOURCES = "resources"; //$NON-NLS-1$
+ private static final String LIBS = "libs"; //$NON-NLS-1$
+ private static final String CONF = "conf"; //$NON-NLS-1$
/** The array of libraries names */
private static final String[] libraries = new String[]
- { "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", "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" };
+ { "antlr-2.7.7.jar", "apacheds-bootstrap-extract-1.5.3.jar", "apacheds-bootstrap-partition-1.5.3.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "apacheds-btree-base-1.5.3.jar", "apacheds-core-1.5.3.jar", "apacheds-core-constants-1.5.3.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "apacheds-core-entry-1.5.3.jar", "apacheds-core-shared-1.5.3.jar", "apacheds-jdbm-1.5.3.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "apacheds-jdbm-store-1.5.3.jar", "apacheds-kerberos-shared-1.5.3.jar", "apacheds-launcher-1.2.0.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "apacheds-protocol-changepw-1.5.3.jar", "apacheds-protocol-dns-1.5.3.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-protocol-kerberos-1.5.3.jar", "apacheds-protocol-ldap-1.5.3.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-protocol-ntp-1.5.3.jar", "apacheds-protocol-shared-1.5.3.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-schema-bootstrap-1.5.3.jar", "apacheds-schema-extras-1.5.3.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-schema-registries-1.5.3.jar", "apacheds-server-jndi-1.5.3.jar", "apacheds-server-xml-1.5.3.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "apacheds-utils-1.5.3.jar", "apacheds-xbean-spring-1.5.3.jar", "commons-cli-1.1.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "commons-collections-3.2.jar", "commons-daemon-1.0.1.jar", "commons-lang-2.3.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "daemon-bootstrappers-1.1.3.jar", "jcl104-over-slf4j-1.4.3.jar", "log4j-1.2.14.jar", "mina-core-1.1.6.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ "mina-filter-ssl-1.1.6.jar", "shared-asn1-0.9.11.jar", "shared-asn1-codec-0.9.11.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "shared-bouncycastle-reduced-0.9.11.jar", "shared-ldap-0.9.11.jar", "shared-ldap-constants-0.9.11.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "slf4j-api-1.4.3.jar", "slf4j-log4j12-1.4.3.jar", "spring-beans-2.0.6.jar", "spring-context-2.0.6.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ "spring-core-2.0.6.jar", "xbean-spring-3.3.jar" }; //$NON-NLS-1$ //$NON-NLS-2$
/**
@@ -102,11 +102,11 @@ public class ApacheDS153LdapServerAdapte
File serverFolder = LdapServersManager.getServerFolder( server ).toFile();
File confFolder = new File( serverFolder, CONF );
confFolder.mkdir();
- File ldifFolder = new File( serverFolder, "ldif" );
+ File ldifFolder = new File( serverFolder, "ldif" ); //$NON-NLS-1$
ldifFolder.mkdir();
- File logFolder = new File( serverFolder, "log" );
+ File logFolder = new File( serverFolder, "log" ); //$NON-NLS-1$
logFolder.mkdir();
- File partitionFolder = new File( serverFolder, "partitions" );
+ File partitionFolder = new File( serverFolder, "partitions" ); //$NON-NLS-1$
partitionFolder.mkdir();
// Copying configuration files
@@ -118,7 +118,7 @@ public class ApacheDS153LdapServerAdapte
LOG4J_PROPERTIES ) );
// Creating an empty log file
- new File( logFolder, "apacheds.log" ).createNewFile();
+ new File( logFolder, "apacheds.log" ).createNewFile(); //$NON-NLS-1$
}
Modified: directory/studio/trunk/plugins/ldapservers.apacheds.v153/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v153/CreateConnectionAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapservers.apacheds.v153/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v153/CreateConnectionAction.java?rev=1228281&r1=1228280&r2=1228281&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapservers.apacheds.v153/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v153/CreateConnectionAction.java (original)
+++ directory/studio/trunk/plugins/ldapservers.apacheds.v153/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v153/CreateConnectionAction.java Fri Jan 6 17:09:23 2012
@@ -47,7 +47,7 @@ import org.eclipse.ui.IWorkbenchPart;
*/
public class CreateConnectionAction implements IObjectActionDelegate
{
- private static final String EXTENSION_ID = "org.apache.directory.server.1.5.3";
+ private static final String EXTENSION_ID = "org.apache.directory.server.1.5.3"; //$NON-NLS-1$
/** The {@link ServersView} */
private ServersView view;
@@ -68,11 +68,10 @@ public class CreateConnectionAction impl
LdapServer server = ( LdapServer ) selection.getFirstElement();
// Checking that the server is really an ApacheDS 1.5.3 server
- // TODO
if ( !EXTENSION_ID.equalsIgnoreCase( server.getLdapServerAdapterExtension().getId() ) )
{
String message = Messages.getString( "CreateConnectionAction.UnableReadServerConfiguration" ) //$NON-NLS-1$
- + "\n\n" // TODO
+ + "\n\n" //$NON-NLS-1$
+ Messages.getString( "CreateConnectionAction.NotA153Server" ); //$NON-NLS-1$
reportErrorReadingServerConfiguration( view, message );
@@ -88,7 +87,7 @@ public class CreateConnectionAction impl
catch ( Exception e )
{
String message = Messages.getString( "CreateConnectionAction.UnableReadServerConfiguration" ) //$NON-NLS-1$
- + "\n\n" // TODO
+ + "\n\n" //$NON-NLS-1$
+ Messages.getString( "CreateConnectionAction.FollowingErrorOccurred" ) + e.getMessage(); //$NON-NLS-1$
reportErrorReadingServerConfiguration( view, message );
@@ -118,7 +117,6 @@ public class CreateConnectionAction impl
new String[]
{ IDialogConstants.OK_LABEL }, MessageDialog.OK );
dialog.open();
- // TODO use common methods in Common UI plugin
}
}
}
@@ -139,7 +137,6 @@ public class CreateConnectionAction impl
null, message, MessageDialog.ERROR, new String[]
{ IDialogConstants.OK_LABEL }, MessageDialog.OK );
dialog.open();
- // TODO use common methods in Common UI plugin
}
Modified: directory/studio/trunk/plugins/ldapservers.apacheds.v154/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v154/ApacheDS154LdapServerAdapter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapservers.apacheds.v154/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v154/ApacheDS154LdapServerAdapter.java?rev=1228281&r1=1228280&r2=1228281&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapservers.apacheds.v154/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v154/ApacheDS154LdapServerAdapter.java (original)
+++ directory/studio/trunk/plugins/ldapservers.apacheds.v154/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v154/ApacheDS154LdapServerAdapter.java Fri Jan 6 17:09:23 2012
@@ -58,32 +58,32 @@ import org.osgi.framework.Bundle;
public class ApacheDS154LdapServerAdapter implements LdapServerAdapter
{
// Various strings constants used in paths
- private static final String SERVER_XML = "server.xml";
- private static final String LOG4J_PROPERTIES = "log4j.properties";
- private static final String RESOURCES = "resources";
- private static final String LIBS = "libs";
- private static final String CONF = "conf";
+ private static final String SERVER_XML = "server.xml"; //$NON-NLS-1$
+ private static final String LOG4J_PROPERTIES = "log4j.properties"; //$NON-NLS-1$
+ private static final String RESOURCES = "resources"; //$NON-NLS-1$
+ private static final String LIBS = "libs"; //$NON-NLS-1$
+ private static final String CONF = "conf"; //$NON-NLS-1$
/** The array of libraries names */
private static final String[] libraries = new String[]
- { "antlr-2.7.7.jar", "xbean-spring-3.3.jar", "apacheds-bootstrap-extract-1.5.4.jar",
- "apacheds-bootstrap-partition-1.5.4.jar", "apacheds-core-1.5.4.jar", "apacheds-core-avl-1.5.4.jar",
- "apacheds-core-constants-1.5.4.jar", "apacheds-core-cursor-1.5.4.jar", "apacheds-core-entry-1.5.4.jar",
- "apacheds-core-shared-1.5.4.jar", "apacheds-jdbm-1.5.4.jar", "apacheds-jdbm-store-1.5.4.jar",
- "apacheds-kerberos-shared-1.5.4.jar", "apacheds-launcher-1.2.0.jar",
- "apacheds-protocol-changepw-1.5.4.jar", "apacheds-protocol-dns-1.5.4.jar",
- "apacheds-protocol-kerberos-1.5.4.jar", "apacheds-protocol-ldap-1.5.4.jar",
- "apacheds-protocol-ntp-1.5.4.jar", "apacheds-protocol-shared-1.5.4.jar",
- "apacheds-schema-bootstrap-1.5.4.jar", "apacheds-schema-extras-1.5.4.jar",
- "apacheds-schema-registries-1.5.4.jar", "apacheds-server-jndi-1.5.4.jar", "apacheds-server-xml-1.5.4.jar",
- "apacheds-utils-1.5.4.jar", "apacheds-xbean-spring-1.5.4.jar", "apacheds-xdbm-base-1.5.4.jar",
- "apacheds-xdbm-search-1.5.4.jar", "apacheds-xdbm-tools-1.5.4.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.4.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.12.jar", "shared-asn1-codec-0.9.12.jar",
- "shared-bouncycastle-reduced-0.9.12.jar", "shared-ldap-0.9.12.jar", "shared-ldap-constants-0.9.12.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" };
+ { "antlr-2.7.7.jar", "xbean-spring-3.3.jar", "apacheds-bootstrap-extract-1.5.4.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "apacheds-bootstrap-partition-1.5.4.jar", "apacheds-core-1.5.4.jar", "apacheds-core-avl-1.5.4.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "apacheds-core-constants-1.5.4.jar", "apacheds-core-cursor-1.5.4.jar", "apacheds-core-entry-1.5.4.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "apacheds-core-shared-1.5.4.jar", "apacheds-jdbm-1.5.4.jar", "apacheds-jdbm-store-1.5.4.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "apacheds-kerberos-shared-1.5.4.jar", "apacheds-launcher-1.2.0.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-protocol-changepw-1.5.4.jar", "apacheds-protocol-dns-1.5.4.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-protocol-kerberos-1.5.4.jar", "apacheds-protocol-ldap-1.5.4.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-protocol-ntp-1.5.4.jar", "apacheds-protocol-shared-1.5.4.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-schema-bootstrap-1.5.4.jar", "apacheds-schema-extras-1.5.4.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-schema-registries-1.5.4.jar", "apacheds-server-jndi-1.5.4.jar", "apacheds-server-xml-1.5.4.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "apacheds-utils-1.5.4.jar", "apacheds-xbean-spring-1.5.4.jar", "apacheds-xdbm-base-1.5.4.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "apacheds-xdbm-search-1.5.4.jar", "apacheds-xdbm-tools-1.5.4.jar", "commons-cli-1.1.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "commons-collections-3.2.jar", "commons-daemon-1.0.1.jar", "commons-lang-2.3.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "daemon-bootstrappers-1.1.4.jar", "jcl104-over-slf4j-1.4.3.jar", "log4j-1.2.14.jar", "mina-core-1.1.6.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ "mina-filter-ssl-1.1.6.jar", "shared-asn1-0.9.12.jar", "shared-asn1-codec-0.9.12.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "shared-bouncycastle-reduced-0.9.12.jar", "shared-ldap-0.9.12.jar", "shared-ldap-constants-0.9.12.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "slf4j-api-1.4.3.jar", "slf4j-log4j12-1.4.3.jar", "spring-beans-2.0.6.jar", "spring-context-2.0.6.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ "spring-core-2.0.6.jar" }; //$NON-NLS-1$
/**
@@ -104,11 +104,11 @@ public class ApacheDS154LdapServerAdapte
File serverFolder = LdapServersManager.getServerFolder( server ).toFile();
File confFolder = new File( serverFolder, CONF );
confFolder.mkdir();
- File ldifFolder = new File( serverFolder, "ldif" );
+ File ldifFolder = new File( serverFolder, "ldif" ); //$NON-NLS-1$
ldifFolder.mkdir();
- File logFolder = new File( serverFolder, "log" );
+ File logFolder = new File( serverFolder, "log" ); //$NON-NLS-1$
logFolder.mkdir();
- File partitionFolder = new File( serverFolder, "partitions" );
+ File partitionFolder = new File( serverFolder, "partitions" ); //$NON-NLS-1$
partitionFolder.mkdir();
// Copying configuration files
@@ -120,7 +120,7 @@ public class ApacheDS154LdapServerAdapte
LOG4J_PROPERTIES ) );
// Creating an empty log file
- new File( logFolder, "apacheds.log" ).createNewFile();
+ new File( logFolder, "apacheds.log" ).createNewFile(); //$NON-NLS-1$
}
Modified: directory/studio/trunk/plugins/ldapservers.apacheds.v154/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v154/CreateConnectionAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapservers.apacheds.v154/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v154/CreateConnectionAction.java?rev=1228281&r1=1228280&r2=1228281&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapservers.apacheds.v154/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v154/CreateConnectionAction.java (original)
+++ directory/studio/trunk/plugins/ldapservers.apacheds.v154/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v154/CreateConnectionAction.java Fri Jan 6 17:09:23 2012
@@ -47,7 +47,7 @@ import org.eclipse.ui.IWorkbenchPart;
*/
public class CreateConnectionAction implements IObjectActionDelegate
{
- private static final String EXTENSION_ID = "org.apache.directory.server.1.5.4";
+ private static final String EXTENSION_ID = "org.apache.directory.server.1.5.4"; //$NON-NLS-1$
/** The {@link ServersView} */
private ServersView view;
@@ -68,11 +68,10 @@ public class CreateConnectionAction impl
LdapServer server = ( LdapServer ) selection.getFirstElement();
// Checking that the server is really an ApacheDS 1.5.4 server
- // TODO
if ( !EXTENSION_ID.equalsIgnoreCase( server.getLdapServerAdapterExtension().getId() ) )
{
String message = Messages.getString( "CreateConnectionAction.UnableReadServerConfiguration" ) //$NON-NLS-1$
- + "\n\n" // TODO
+ + "\n\n" //$NON-NLS-1$
+ Messages.getString( "CreateConnectionAction.NotA154Server" ); //$NON-NLS-1$
reportErrorReadingServerConfiguration( view, message );
@@ -88,7 +87,7 @@ public class CreateConnectionAction impl
catch ( Exception e )
{
String message = Messages.getString( "CreateConnectionAction.UnableReadServerConfiguration" ) //$NON-NLS-1$
- + "\n\n" // TODO
+ + "\n\n" //$NON-NLS-1$
+ Messages.getString( "CreateConnectionAction.FollowingErrorOccurred" ) + e.getMessage(); //$NON-NLS-1$
reportErrorReadingServerConfiguration( view, message );
@@ -118,7 +117,6 @@ public class CreateConnectionAction impl
new String[]
{ IDialogConstants.OK_LABEL }, MessageDialog.OK );
dialog.open();
- // TODO use common methods in Common UI plugin
}
}
}
@@ -139,7 +137,6 @@ public class CreateConnectionAction impl
null, message, MessageDialog.ERROR, new String[]
{ IDialogConstants.OK_LABEL }, MessageDialog.OK );
dialog.open();
- // TODO use common methods in Common UI plugin
}
Modified: directory/studio/trunk/plugins/ldapservers.apacheds.v155/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v155/ApacheDS155LdapServerAdapter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapservers.apacheds.v155/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v155/ApacheDS155LdapServerAdapter.java?rev=1228281&r1=1228280&r2=1228281&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapservers.apacheds.v155/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v155/ApacheDS155LdapServerAdapter.java (original)
+++ directory/studio/trunk/plugins/ldapservers.apacheds.v155/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v155/ApacheDS155LdapServerAdapter.java Fri Jan 6 17:09:23 2012
@@ -57,32 +57,32 @@ import org.osgi.framework.Bundle;
public class ApacheDS155LdapServerAdapter implements LdapServerAdapter
{
// Various strings constants used in paths
- private static final String SERVER_XML = "server.xml";
- private static final String LOG4J_PROPERTIES = "log4j.properties";
- private static final String RESOURCES = "resources";
- private static final String LIBS = "libs";
- private static final String CONF = "conf";
+ private static final String SERVER_XML = "server.xml"; //$NON-NLS-1$
+ private static final String LOG4J_PROPERTIES = "log4j.properties"; //$NON-NLS-1$
+ private static final String RESOURCES = "resources"; //$NON-NLS-1$
+ private static final String LIBS = "libs"; //$NON-NLS-1$
+ private static final String CONF = "conf"; //$NON-NLS-1$
/** The array of libraries names */
private static final String[] libraries = new String[]
- { "antlr-2.7.7.jar", "apacheds-bootstrap-extract-1.5.5.jar", "apacheds-bootstrap-partition-1.5.5.jar",
- "apacheds-core-1.5.5.jar", "apacheds-core-avl-1.5.5.jar", "apacheds-core-constants-1.5.5.jar",
- "apacheds-core-entry-1.5.5.jar", "apacheds-core-jndi-1.5.5.jar", "apacheds-core-shared-1.5.5.jar",
- "apacheds-interceptor-kerberos-1.5.5.jar", "apacheds-jdbm-1.5.5.jar", "apacheds-jdbm-store-1.5.5.jar",
- "apacheds-kerberos-shared-1.5.5.jar", "apacheds-launcher-1.5.0.jar",
- "apacheds-protocol-changepw-1.5.5.jar", "apacheds-protocol-dns-1.5.5.jar",
- "apacheds-protocol-kerberos-1.5.5.jar", "apacheds-protocol-ldap-1.5.5.jar",
- "apacheds-protocol-ntp-1.5.5.jar", "apacheds-protocol-shared-1.5.5.jar",
- "apacheds-schema-bootstrap-1.5.5.jar", "apacheds-schema-extras-1.5.5.jar",
- "apacheds-schema-registries-1.5.5.jar", "apacheds-server-jndi-1.5.5.jar", "apacheds-server-xml-1.5.5.jar",
- "apacheds-utils-1.5.5.jar", "apacheds-xbean-spring-1.5.5.jar", "apacheds-xdbm-base-1.5.5.jar",
- "apacheds-xdbm-search-1.5.5.jar", "apacheds-xdbm-tools-1.5.5.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.4.jar", "daemon-bootstrappers-1.1.6.jar", "jcl-over-slf4j-1.5.6.jar", "log4j-1.2.14.jar",
- "mina-core-2.0.0-M6.jar", "shared-asn1-0.9.15.jar", "shared-asn1-codec-0.9.15.jar",
- "shared-cursor-0.9.15.jar", "shared-ldap-0.9.15.jar", "shared-ldap-constants-0.9.15.jar",
- "slf4j-api-1.5.6.jar", "slf4j-log4j12-1.5.6.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" };
+ { "antlr-2.7.7.jar", "apacheds-bootstrap-extract-1.5.5.jar", "apacheds-bootstrap-partition-1.5.5.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "apacheds-core-1.5.5.jar", "apacheds-core-avl-1.5.5.jar", "apacheds-core-constants-1.5.5.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "apacheds-core-entry-1.5.5.jar", "apacheds-core-jndi-1.5.5.jar", "apacheds-core-shared-1.5.5.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "apacheds-interceptor-kerberos-1.5.5.jar", "apacheds-jdbm-1.5.5.jar", "apacheds-jdbm-store-1.5.5.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "apacheds-kerberos-shared-1.5.5.jar", "apacheds-launcher-1.5.0.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-protocol-changepw-1.5.5.jar", "apacheds-protocol-dns-1.5.5.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-protocol-kerberos-1.5.5.jar", "apacheds-protocol-ldap-1.5.5.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-protocol-ntp-1.5.5.jar", "apacheds-protocol-shared-1.5.5.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-schema-bootstrap-1.5.5.jar", "apacheds-schema-extras-1.5.5.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-schema-registries-1.5.5.jar", "apacheds-server-jndi-1.5.5.jar", "apacheds-server-xml-1.5.5.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "apacheds-utils-1.5.5.jar", "apacheds-xbean-spring-1.5.5.jar", "apacheds-xdbm-base-1.5.5.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "apacheds-xdbm-search-1.5.5.jar", "apacheds-xdbm-tools-1.5.5.jar", "bcprov-jdk15-140.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "commons-cli-1.2.jar", "commons-collections-3.2.1.jar", "commons-daemon-1.0.1.jar", "commons-io-1.4.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ "commons-lang-2.4.jar", "daemon-bootstrappers-1.1.6.jar", "jcl-over-slf4j-1.5.6.jar", "log4j-1.2.14.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ "mina-core-2.0.0-M6.jar", "shared-asn1-0.9.15.jar", "shared-asn1-codec-0.9.15.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "shared-cursor-0.9.15.jar", "shared-ldap-0.9.15.jar", "shared-ldap-constants-0.9.15.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "slf4j-api-1.5.6.jar", "slf4j-log4j12-1.5.6.jar", "spring-beans-2.5.6.SEC01.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "spring-context-2.5.6.SEC01.jar", "spring-core-2.5.6.SEC01.jar", "xbean-spring-3.5.jar" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
/**
@@ -103,11 +103,11 @@ public class ApacheDS155LdapServerAdapte
File serverFolder = LdapServersManager.getServerFolder( server ).toFile();
File confFolder = new File( serverFolder, CONF );
confFolder.mkdir();
- File ldifFolder = new File( serverFolder, "ldif" );
+ File ldifFolder = new File( serverFolder, "ldif" ); //$NON-NLS-1$
ldifFolder.mkdir();
- File logFolder = new File( serverFolder, "log" );
+ File logFolder = new File( serverFolder, "log" ); //$NON-NLS-1$
logFolder.mkdir();
- File partitionFolder = new File( serverFolder, "partitions" );
+ File partitionFolder = new File( serverFolder, "partitions" ); //$NON-NLS-1$
partitionFolder.mkdir();
// Copying configuration files
@@ -119,7 +119,7 @@ public class ApacheDS155LdapServerAdapte
LOG4J_PROPERTIES ) );
// Creating an empty log file
- new File( logFolder, "apacheds.log" ).createNewFile();
+ new File( logFolder, "apacheds.log" ).createNewFile(); //$NON-NLS-1$
}
Modified: directory/studio/trunk/plugins/ldapservers.apacheds.v155/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v155/CreateConnectionAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapservers.apacheds.v155/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v155/CreateConnectionAction.java?rev=1228281&r1=1228280&r2=1228281&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapservers.apacheds.v155/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v155/CreateConnectionAction.java (original)
+++ directory/studio/trunk/plugins/ldapservers.apacheds.v155/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v155/CreateConnectionAction.java Fri Jan 6 17:09:23 2012
@@ -47,7 +47,7 @@ import org.eclipse.ui.IWorkbenchPart;
*/
public class CreateConnectionAction implements IObjectActionDelegate
{
- private static final String EXTENSION_ID = "org.apache.directory.server.1.5.5";
+ private static final String EXTENSION_ID = "org.apache.directory.server.1.5.5"; //$NON-NLS-1$
/** The {@link ServersView} */
private ServersView view;
@@ -68,11 +68,10 @@ public class CreateConnectionAction impl
LdapServer server = ( LdapServer ) selection.getFirstElement();
// Checking that the server is really an ApacheDS 1.5.5 server
- // TODO
if ( !EXTENSION_ID.equalsIgnoreCase( server.getLdapServerAdapterExtension().getId() ) )
{
String message = Messages.getString( "CreateConnectionAction.UnableReadServerConfiguration" ) //$NON-NLS-1$
- + "\n\n" // TODO
+ + "\n\n" //$NON-NLS-1$
+ Messages.getString( "CreateConnectionAction.NotA155Server" ); //$NON-NLS-1$
reportErrorReadingServerConfiguration( view, message );
@@ -88,7 +87,7 @@ public class CreateConnectionAction impl
catch ( Exception e )
{
String message = Messages.getString( "CreateConnectionAction.UnableReadServerConfiguration" ) //$NON-NLS-1$
- + "\n\n" // TODO
+ + "\n\n" //$NON-NLS-1$
+ Messages.getString( "CreateConnectionAction.FollowingErrorOccurred" ) + e.getMessage(); //$NON-NLS-1$
reportErrorReadingServerConfiguration( view, message );
@@ -118,7 +117,6 @@ public class CreateConnectionAction impl
new String[]
{ IDialogConstants.OK_LABEL }, MessageDialog.OK );
dialog.open();
- // TODO use common methods in Common UI plugin
}
}
}
@@ -139,7 +137,6 @@ public class CreateConnectionAction impl
null, message, MessageDialog.ERROR, new String[]
{ IDialogConstants.OK_LABEL }, MessageDialog.OK );
dialog.open();
- // TODO use common methods in Common UI plugin
}
Modified: directory/studio/trunk/plugins/ldapservers.apacheds.v156/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v156/ApacheDS156LdapServerAdapter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapservers.apacheds.v156/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v156/ApacheDS156LdapServerAdapter.java?rev=1228281&r1=1228280&r2=1228281&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapservers.apacheds.v156/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v156/ApacheDS156LdapServerAdapter.java (original)
+++ directory/studio/trunk/plugins/ldapservers.apacheds.v156/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v156/ApacheDS156LdapServerAdapter.java Fri Jan 6 17:09:23 2012
@@ -58,37 +58,37 @@ import org.osgi.framework.Bundle;
public class ApacheDS156LdapServerAdapter implements LdapServerAdapter
{
// Various strings constants used in paths
- private static final String SERVER_XML = "server.xml";
- private static final String LOG4J_PROPERTIES = "log4j.properties";
- private static final String RESOURCES = "resources";
- private static final String LIBS = "libs";
- private static final String CONF = "conf";
+ private static final String SERVER_XML = "server.xml"; //$NON-NLS-1$
+ private static final String LOG4J_PROPERTIES = "log4j.properties"; //$NON-NLS-1$
+ private static final String RESOURCES = "resources"; //$NON-NLS-1$
+ private static final String LIBS = "libs"; //$NON-NLS-1$
+ private static final String CONF = "conf"; //$NON-NLS-1$
/** The array of libraries names */
private static final String[] libraries = 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" };
+ { "antlr-2.7.7.jar", "apacheds-avl-partition-1.5.6.jar", "apacheds-core-1.5.6.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "apacheds-core-annotations-1.5.6.jar", "apacheds-core-api-1.5.6.jar", "apacheds-core-avl-1.5.6.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "apacheds-core-constants-1.5.6.jar", "apacheds-core-entry-1.5.6.jar", "apacheds-core-jndi-1.5.6.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "apacheds-core-mock-1.5.6.jar", "apacheds-http-integration-1.5.6.jar", "apacheds-i18n-1.5.6.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "apacheds-interceptor-kerberos-1.5.6.jar", "apacheds-jdbm-1.5.6.jar", "apacheds-jdbm-partition-1.5.6.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "apacheds-jdbm-store-1.5.6.jar", "apacheds-kerberos-shared-1.5.6.jar", "apacheds-launcher-1.5.0.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "apacheds-ldif-partition-1.5.6.jar", "apacheds-protocol-changepw-1.5.6.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-protocol-dns-1.5.6.jar", "apacheds-protocol-kerberos-1.5.6.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-protocol-ldap-1.5.6.jar", "apacheds-protocol-ntp-1.5.6.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-protocol-shared-1.5.6.jar", "apacheds-server-jndi-1.5.6.jar", "apacheds-server-xml-1.5.6.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "apacheds-utils-1.5.6.jar", "apacheds-xbean-spring-1.5.6.jar", "apacheds-xdbm-base-1.5.6.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "apacheds-xdbm-search-1.5.6.jar", "apacheds-xdbm-tools-1.5.6.jar", "bcprov-jdk15-140.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "commons-cli-1.2.jar", "commons-collections-3.2.1.jar", "commons-daemon-1.0.1.jar", "commons-io-1.4.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ "commons-lang-2.5.jar", "daemon-bootstrappers-1.1.7.jar", "dom4j-1.6.1.jar", "jcl-over-slf4j-1.5.10.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ "jetty-6.1.14.jar", "jetty-util-6.1.14.jar", "junit-4.7.jar", "log4j-1.2.14.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ "mina-core-2.0.0-RC1.jar", "servlet-api-2.5-6.1.14.jar", "shared-asn1-0.9.18.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "shared-asn1-codec-0.9.18.jar", "shared-cursor-0.9.18.jar", "shared-dsml-parser-0.9.18.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "shared-i18n-0.9.18.jar", "shared-ldap-0.9.18.jar", "shared-ldap-constants-0.9.18.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "shared-ldap-converter-0.9.18.jar", "shared-ldap-jndi-0.9.18.jar", "shared-ldap-schema-0.9.18.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "shared-ldap-schema-dao-0.9.18.jar", "shared-ldap-schema-loader-0.9.18.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "shared-ldap-schema-manager-0.9.18.jar", "shared-ldif-0.9.18.jar", "slf4j-api-1.5.10.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "slf4j-log4j12-1.5.10.jar", "spring-beans-2.5.6.SEC01.jar", "spring-context-2.5.6.SEC01.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "spring-core-2.5.6.SEC01.jar", "xbean-spring-3.5.jar", "xercesImpl-2.9.1.jar", "xpp3-1.1.4c.jar" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
/**
@@ -109,11 +109,11 @@ public class ApacheDS156LdapServerAdapte
File serverFolder = LdapServersManager.getServerFolder( server ).toFile();
File confFolder = new File( serverFolder, CONF );
confFolder.mkdir();
- File ldifFolder = new File( serverFolder, "ldif" );
+ File ldifFolder = new File( serverFolder, "ldif" ); //$NON-NLS-1$
ldifFolder.mkdir();
- File logFolder = new File( serverFolder, "log" );
+ File logFolder = new File( serverFolder, "log" ); //$NON-NLS-1$
logFolder.mkdir();
- File partitionFolder = new File( serverFolder, "partitions" );
+ File partitionFolder = new File( serverFolder, "partitions" ); //$NON-NLS-1$
partitionFolder.mkdir();
// Copying configuration files
@@ -125,7 +125,7 @@ public class ApacheDS156LdapServerAdapte
LOG4J_PROPERTIES ) );
// Creating an empty log file
- new File( logFolder, "apacheds.log" ).createNewFile();
+ new File( logFolder, "apacheds.log" ).createNewFile(); //$NON-NLS-1$
}
Modified: directory/studio/trunk/plugins/ldapservers.apacheds.v156/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v156/CreateConnectionAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapservers.apacheds.v156/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v156/CreateConnectionAction.java?rev=1228281&r1=1228280&r2=1228281&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapservers.apacheds.v156/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v156/CreateConnectionAction.java (original)
+++ directory/studio/trunk/plugins/ldapservers.apacheds.v156/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v156/CreateConnectionAction.java Fri Jan 6 17:09:23 2012
@@ -47,7 +47,7 @@ import org.eclipse.ui.IWorkbenchPart;
*/
public class CreateConnectionAction implements IObjectActionDelegate
{
- private static final String EXTENSION_ID = "org.apache.directory.server.1.5.6";
+ private static final String EXTENSION_ID = "org.apache.directory.server.1.5.6"; //$NON-NLS-1$
/** The {@link ServersView} */
private ServersView view;
@@ -68,11 +68,10 @@ public class CreateConnectionAction impl
LdapServer server = ( LdapServer ) selection.getFirstElement();
// Checking that the server is really an ApacheDS 1.5.6 server
- // TODO
if ( !EXTENSION_ID.equalsIgnoreCase( server.getLdapServerAdapterExtension().getId() ) )
{
String message = Messages.getString( "CreateConnectionAction.UnableReadServerConfiguration" ) //$NON-NLS-1$
- + "\n\n" // TODO
+ + "\n\n" //$NON-NLS-1$
+ Messages.getString( "CreateConnectionAction.NotA156Server" ); //$NON-NLS-1$
reportErrorReadingServerConfiguration( view, message );
@@ -88,7 +87,7 @@ public class CreateConnectionAction impl
catch ( Exception e )
{
String message = Messages.getString( "CreateConnectionAction.UnableReadServerConfiguration" ) //$NON-NLS-1$
- + "\n\n" // TODO
+ + "\n\n" //$NON-NLS-1$
+ Messages.getString( "CreateConnectionAction.FollowingErrorOccurred" ) + e.getMessage(); //$NON-NLS-1$
reportErrorReadingServerConfiguration( view, message );
@@ -118,7 +117,6 @@ public class CreateConnectionAction impl
new String[]
{ IDialogConstants.OK_LABEL }, MessageDialog.OK );
dialog.open();
- // TODO use common methods in Common UI plugin
}
}
}
@@ -139,7 +137,6 @@ public class CreateConnectionAction impl
null, message, MessageDialog.ERROR, new String[]
{ IDialogConstants.OK_LABEL }, MessageDialog.OK );
dialog.open();
- // TODO use common methods in Common UI plugin
}
Modified: directory/studio/trunk/plugins/ldapservers.apacheds.v157/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v157/ApacheDS157LdapServerAdapter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapservers.apacheds.v157/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v157/ApacheDS157LdapServerAdapter.java?rev=1228281&r1=1228280&r2=1228281&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapservers.apacheds.v157/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v157/ApacheDS157LdapServerAdapter.java (original)
+++ directory/studio/trunk/plugins/ldapservers.apacheds.v157/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v157/ApacheDS157LdapServerAdapter.java Fri Jan 6 17:09:23 2012
@@ -58,37 +58,37 @@ import org.osgi.framework.Bundle;
public class ApacheDS157LdapServerAdapter implements LdapServerAdapter
{
// Various strings constants used in paths
- private static final String SERVER_XML = "server.xml";
- private static final String LOG4J_PROPERTIES = "log4j.properties";
- private static final String RESOURCES = "resources";
- private static final String LIBS = "libs";
- private static final String CONF = "conf";
+ private static final String SERVER_XML = "server.xml"; //$NON-NLS-1$
+ private static final String LOG4J_PROPERTIES = "log4j.properties"; //$NON-NLS-1$
+ private static final String RESOURCES = "resources"; //$NON-NLS-1$
+ private static final String LIBS = "libs"; //$NON-NLS-1$
+ private static final String CONF = "conf"; //$NON-NLS-1$
/** The array of libraries names */
private static final String[] libraries = new String[]
- { "antlr-2.7.7.jar", "apacheds-avl-partition-1.5.7.jar", "apacheds-core-1.5.7.jar",
- "apacheds-core-annotations-1.5.7.jar", "apacheds-core-api-1.5.7.jar", "apacheds-core-avl-1.5.7.jar",
- "apacheds-core-constants-1.5.7.jar", "apacheds-core-entry-1.5.7.jar", "apacheds-core-jndi-1.5.7.jar",
- "apacheds-core-mock-1.5.7.jar", "apacheds-http-integration-1.5.7.jar", "apacheds-i18n-1.5.7.jar",
- "apacheds-interceptor-kerberos-1.5.7.jar", "apacheds-jdbm-1.5.7.jar", "apacheds-jdbm-partition-1.5.7.jar",
- "apacheds-jdbm-store-1.5.7.jar", "apacheds-kerberos-shared-1.5.7.jar", "apacheds-launcher-1.5.0.jar",
- "apacheds-ldif-partition-1.5.7.jar", "apacheds-protocol-changepw-1.5.7.jar",
- "apacheds-protocol-dns-1.5.7.jar", "apacheds-protocol-kerberos-1.5.7.jar",
- "apacheds-protocol-ldap-1.5.7.jar", "apacheds-protocol-ntp-1.5.7.jar",
- "apacheds-protocol-shared-1.5.7.jar", "apacheds-server-jndi-1.5.7.jar", "apacheds-server-xml-1.5.7.jar",
- "apacheds-utils-1.5.7.jar", "apacheds-xbean-spring-1.5.7.jar", "apacheds-xdbm-base-1.5.7.jar",
- "apacheds-xdbm-search-1.5.7.jar", "apacheds-xdbm-tools-1.5.7.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.8.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.19.jar",
- "shared-asn1-codec-0.9.19.jar", "shared-cursor-0.9.19.jar", "shared-dsml-parser-0.9.19.jar",
- "shared-i18n-0.9.19.jar", "shared-ldap-0.9.19.jar", "shared-ldap-constants-0.9.19.jar",
- "shared-ldap-converter-0.9.19.jar", "shared-ldap-jndi-0.9.19.jar", "shared-ldap-schema-0.9.19.jar",
- "shared-ldap-schema-dao-0.9.19.jar", "shared-ldap-schema-loader-0.9.19.jar",
- "shared-ldap-schema-manager-0.9.19.jar", "shared-ldif-0.9.19.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" };
+ { "antlr-2.7.7.jar", "apacheds-avl-partition-1.5.7.jar", "apacheds-core-1.5.7.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "apacheds-core-annotations-1.5.7.jar", "apacheds-core-api-1.5.7.jar", "apacheds-core-avl-1.5.7.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "apacheds-core-constants-1.5.7.jar", "apacheds-core-entry-1.5.7.jar", "apacheds-core-jndi-1.5.7.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "apacheds-core-mock-1.5.7.jar", "apacheds-http-integration-1.5.7.jar", "apacheds-i18n-1.5.7.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "apacheds-interceptor-kerberos-1.5.7.jar", "apacheds-jdbm-1.5.7.jar", "apacheds-jdbm-partition-1.5.7.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "apacheds-jdbm-store-1.5.7.jar", "apacheds-kerberos-shared-1.5.7.jar", "apacheds-launcher-1.5.0.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "apacheds-ldif-partition-1.5.7.jar", "apacheds-protocol-changepw-1.5.7.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-protocol-dns-1.5.7.jar", "apacheds-protocol-kerberos-1.5.7.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-protocol-ldap-1.5.7.jar", "apacheds-protocol-ntp-1.5.7.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-protocol-shared-1.5.7.jar", "apacheds-server-jndi-1.5.7.jar", "apacheds-server-xml-1.5.7.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "apacheds-utils-1.5.7.jar", "apacheds-xbean-spring-1.5.7.jar", "apacheds-xdbm-base-1.5.7.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "apacheds-xdbm-search-1.5.7.jar", "apacheds-xdbm-tools-1.5.7.jar", "bcprov-jdk15-140.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "commons-cli-1.2.jar", "commons-collections-3.2.1.jar", "commons-daemon-1.0.1.jar", "commons-io-1.4.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ "commons-lang-2.5.jar", "daemon-bootstrappers-1.1.8.jar", "dom4j-1.6.1.jar", "jcl-over-slf4j-1.5.10.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ "jetty-6.1.14.jar", "jetty-util-6.1.14.jar", "junit-4.7.jar", "log4j-1.2.14.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ "mina-core-2.0.0-RC1.jar", "servlet-api-2.5-6.1.14.jar", "shared-asn1-0.9.19.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "shared-asn1-codec-0.9.19.jar", "shared-cursor-0.9.19.jar", "shared-dsml-parser-0.9.19.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "shared-i18n-0.9.19.jar", "shared-ldap-0.9.19.jar", "shared-ldap-constants-0.9.19.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "shared-ldap-converter-0.9.19.jar", "shared-ldap-jndi-0.9.19.jar", "shared-ldap-schema-0.9.19.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "shared-ldap-schema-dao-0.9.19.jar", "shared-ldap-schema-loader-0.9.19.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "shared-ldap-schema-manager-0.9.19.jar", "shared-ldif-0.9.19.jar", "slf4j-api-1.5.10.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "slf4j-log4j12-1.5.10.jar", "spring-beans-2.5.6.SEC01.jar", "spring-context-2.5.6.SEC01.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "spring-core-2.5.6.SEC01.jar", "xbean-spring-3.5.jar", "xercesImpl-2.9.1.jar", "xpp3-1.1.4c.jar" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
/**
@@ -109,11 +109,11 @@ public class ApacheDS157LdapServerAdapte
File serverFolder = LdapServersManager.getServerFolder( server ).toFile();
File confFolder = new File( serverFolder, CONF );
confFolder.mkdir();
- File ldifFolder = new File( serverFolder, "ldif" );
+ File ldifFolder = new File( serverFolder, "ldif" ); //$NON-NLS-1$
ldifFolder.mkdir();
- File logFolder = new File( serverFolder, "log" );
+ File logFolder = new File( serverFolder, "log" ); //$NON-NLS-1$
logFolder.mkdir();
- File partitionFolder = new File( serverFolder, "partitions" );
+ File partitionFolder = new File( serverFolder, "partitions" ); //$NON-NLS-1$
partitionFolder.mkdir();
// Copying configuration files
@@ -125,7 +125,7 @@ public class ApacheDS157LdapServerAdapte
LOG4J_PROPERTIES ) );
// Creating an empty log file
- new File( logFolder, "apacheds.log" ).createNewFile();
+ new File( logFolder, "apacheds.log" ).createNewFile(); //$NON-NLS-1$
}
Modified: directory/studio/trunk/plugins/ldapservers.apacheds.v157/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v157/CreateConnectionAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapservers.apacheds.v157/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v157/CreateConnectionAction.java?rev=1228281&r1=1228280&r2=1228281&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapservers.apacheds.v157/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v157/CreateConnectionAction.java (original)
+++ directory/studio/trunk/plugins/ldapservers.apacheds.v157/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v157/CreateConnectionAction.java Fri Jan 6 17:09:23 2012
@@ -27,7 +27,6 @@ import org.apache.directory.studio.conne
import org.apache.directory.studio.connection.core.ConnectionParameter;
import org.apache.directory.studio.connection.core.ConnectionParameter.AuthenticationMethod;
import org.apache.directory.studio.connection.core.ConnectionParameter.EncryptionMethod;
-import org.apache.directory.studio.connection.core.ConnectionParameter.NetworkProvider;
import org.apache.directory.studio.ldapservers.actions.CreateConnectionActionHelper;
import org.apache.directory.studio.ldapservers.model.LdapServer;
import org.apache.directory.studio.ldapservers.views.ServersView;
@@ -47,7 +46,7 @@ import org.eclipse.ui.IWorkbenchPart;
*/
public class CreateConnectionAction implements IObjectActionDelegate
{
- private static final String EXTENSION_ID = "org.apache.directory.server.1.5.7";
+ private static final String EXTENSION_ID = "org.apache.directory.server.1.5.7"; //$NON-NLS-1$
/** The {@link ServersView} */
private ServersView view;
@@ -68,11 +67,10 @@ public class CreateConnectionAction impl
LdapServer server = ( LdapServer ) selection.getFirstElement();
// Checking that the server is really an ApacheDS 1.5.7 server
- // TODO
if ( !EXTENSION_ID.equalsIgnoreCase( server.getLdapServerAdapterExtension().getId() ) )
{
String message = Messages.getString( "CreateConnectionAction.UnableReadServerConfiguration" ) //$NON-NLS-1$
- + "\n\n" // TODO
+ + "\n\n" //$NON-NLS-1$
+ Messages.getString( "CreateConnectionAction.NotA157Server" ); //$NON-NLS-1$
reportErrorReadingServerConfiguration( view, message );
@@ -88,7 +86,7 @@ public class CreateConnectionAction impl
catch ( Exception e )
{
String message = Messages.getString( "CreateConnectionAction.UnableReadServerConfiguration" ) //$NON-NLS-1$
- + "\n\n" // TODO
+ + "\n\n" //$NON-NLS-1$
+ Messages.getString( "CreateConnectionAction.FollowingErrorOccurred" ) + e.getMessage(); //$NON-NLS-1$
reportErrorReadingServerConfiguration( view, message );
@@ -118,7 +116,6 @@ public class CreateConnectionAction impl
new String[]
{ IDialogConstants.OK_LABEL }, MessageDialog.OK );
dialog.open();
- // TODO use common methods in Common UI plugin
}
}
}
@@ -139,7 +136,6 @@ public class CreateConnectionAction impl
null, message, MessageDialog.ERROR, new String[]
{ IDialogConstants.OK_LABEL }, MessageDialog.OK );
dialog.open();
- // TODO use common methods in Common UI plugin
}
Modified: directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/ApacheDS200LdapServerAdapter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/ApacheDS200LdapServerAdapter.java?rev=1228281&r1=1228280&r2=1228281&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/ApacheDS200LdapServerAdapter.java (original)
+++ directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/ApacheDS200LdapServerAdapter.java Fri Jan 6 17:09:23 2012
@@ -74,15 +74,15 @@ import org.osgi.framework.Bundle;
public class ApacheDS200LdapServerAdapter implements LdapServerAdapter
{
// Various strings constants used in paths
- private static final String CONFIG_LDIF = "config.ldif";
- private static final String LOG4J_PROPERTIES = "log4j.properties";
- private static final String RESOURCES = "resources";
- private static final String LIBS = "libs";
- private static final String CONF = "conf";
+ private static final String CONFIG_LDIF = "config.ldif"; //$NON-NLS-1$
+ private static final String LOG4J_PROPERTIES = "log4j.properties"; //$NON-NLS-1$
+ private static final String RESOURCES = "resources"; //$NON-NLS-1$
+ private static final String LIBS = "libs"; //$NON-NLS-1$
+ private static final String CONF = "conf"; //$NON-NLS-1$
/** The array of libraries names */
private static final String[] libraries = new String[]
- { "apacheds-service-2.0.0-M3.jar" };
+ { "apacheds-service-2.0.0-M3.jar" }; //$NON-NLS-1$
/**
@@ -103,11 +103,11 @@ public class ApacheDS200LdapServerAdapte
File serverFolder = LdapServersManager.getServerFolder( server ).toFile();
File confFolder = new File( serverFolder, CONF );
confFolder.mkdir();
- File ldifFolder = new File( serverFolder, "ldif" );
+ File ldifFolder = new File( serverFolder, "ldif" ); //$NON-NLS-1$
ldifFolder.mkdir();
- File logFolder = new File( serverFolder, "log" );
+ File logFolder = new File( serverFolder, "log" ); //$NON-NLS-1$
logFolder.mkdir();
- File partitionFolder = new File( serverFolder, "partitions" );
+ File partitionFolder = new File( serverFolder, "partitions" ); //$NON-NLS-1$
partitionFolder.mkdir();
// Copying configuration files
@@ -119,7 +119,7 @@ public class ApacheDS200LdapServerAdapte
LOG4J_PROPERTIES ) );
// Creating an empty log file
- new File( logFolder, "apacheds.log" ).createNewFile();
+ new File( logFolder, "apacheds.log" ).createNewFile(); //$NON-NLS-1$
}
@@ -432,7 +432,7 @@ public class ApacheDS200LdapServerAdapte
*/
private static TransportBean getLdapServerTransportBean( ConfigBean configuration )
{
- return getLdapServerTransportBean( configuration, "ldap" );
+ return getLdapServerTransportBean( configuration, "ldap" ); //$NON-NLS-1$
}
@@ -444,7 +444,7 @@ public class ApacheDS200LdapServerAdapte
*/
private static TransportBean getLdapsServerTransportBean( ConfigBean configuration )
{
- return getLdapServerTransportBean( configuration, "ldaps" );
+ return getLdapServerTransportBean( configuration, "ldaps" ); //$NON-NLS-1$
}
@@ -645,8 +645,8 @@ public class ApacheDS200LdapServerAdapte
{
for ( TransportBean kdcServerTransportBean : kdcServerTransportBeans )
{
- if ( ( "tcp".equals( kdcServerTransportBean.getTransportId() ) )
- || ( "udp".equals( kdcServerTransportBean.getTransportId() ) ) )
+ if ( ( "tcp".equals( kdcServerTransportBean.getTransportId() ) ) //$NON-NLS-1$
+ || ( "udp".equals( kdcServerTransportBean.getTransportId() ) ) ) //$NON-NLS-1$
{
return kdcServerTransportBean.getSystemPort();
}
@@ -682,8 +682,8 @@ public class ApacheDS200LdapServerAdapte
{
for ( TransportBean dnsServerTransportBean : dnsServerTransportBeans )
{
- if ( ( "tcp".equals( dnsServerTransportBean.getTransportId() ) )
- || ( "udp".equals( dnsServerTransportBean.getTransportId() ) ) )
+ if ( ( "tcp".equals( dnsServerTransportBean.getTransportId() ) ) //$NON-NLS-1$
+ || ( "udp".equals( dnsServerTransportBean.getTransportId() ) ) ) //$NON-NLS-1$
{
return dnsServerTransportBean.getSystemPort();
}
@@ -719,8 +719,8 @@ public class ApacheDS200LdapServerAdapte
{
for ( TransportBean ntpServerTransportBean : ntpServerTransportBeans )
{
- if ( ( "tcp".equals( ntpServerTransportBean.getTransportId() ) )
- || ( "udp".equals( ntpServerTransportBean.getTransportId() ) ) )
+ if ( ( "tcp".equals( ntpServerTransportBean.getTransportId() ) ) //$NON-NLS-1$
+ || ( "udp".equals( ntpServerTransportBean.getTransportId() ) ) ) //$NON-NLS-1$
{
return ntpServerTransportBean.getSystemPort();
}
@@ -756,8 +756,8 @@ public class ApacheDS200LdapServerAdapte
{
for ( TransportBean changePasswordServerTransportBean : changePasswordServerTransportBeans )
{
- if ( ( "tcp".equals( changePasswordServerTransportBean.getTransportId() ) )
- || ( "udp".equals( changePasswordServerTransportBean.getTransportId() ) ) )
+ if ( ( "tcp".equals( changePasswordServerTransportBean.getTransportId() ) ) //$NON-NLS-1$
+ || ( "udp".equals( changePasswordServerTransportBean.getTransportId() ) ) ) //$NON-NLS-1$
{
return changePasswordServerTransportBean.getSystemPort();
}
Modified: directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/CreateConnectionAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/CreateConnectionAction.java?rev=1228281&r1=1228280&r2=1228281&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/CreateConnectionAction.java (original)
+++ directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/CreateConnectionAction.java Fri Jan 6 17:09:23 2012
@@ -47,7 +47,7 @@ import org.eclipse.ui.IWorkbenchPart;
*/
public class CreateConnectionAction implements IObjectActionDelegate
{
- private static final String EXTENSION_ID = "org.apache.directory.server.2.0.0";
+ private static final String EXTENSION_ID = "org.apache.directory.server.2.0.0"; //$NON-NLS-1$
/** The {@link ServersView} */
private ServersView view;
@@ -68,11 +68,10 @@ public class CreateConnectionAction impl
LdapServer server = ( LdapServer ) selection.getFirstElement();
// Checking that the server is really an ApacheDS 2.0.0 server
- // TODO
if ( !EXTENSION_ID.equalsIgnoreCase( server.getLdapServerAdapterExtension().getId() ) )
{
String message = Messages.getString( "CreateConnectionAction.UnableReadServerConfiguration" ) //$NON-NLS-1$
- + "\n\n" // TODO
+ + "\n\n" //$NON-NLS-1$
+ Messages.getString( "CreateConnectionAction.NotA200Server" ); //$NON-NLS-1$
reportErrorReadingServerConfiguration( view, message );
@@ -88,7 +87,7 @@ public class CreateConnectionAction impl
catch ( Exception e )
{
String message = Messages.getString( "CreateConnectionAction.UnableReadServerConfiguration" ) //$NON-NLS-1$
- + "\n\n" // TODO
+ + "\n\n" //$NON-NLS-1$
+ Messages.getString( "CreateConnectionAction.FollowingErrorOccurred" ) + e.getMessage(); //$NON-NLS-1$
reportErrorReadingServerConfiguration( view, message );
@@ -119,7 +118,6 @@ public class CreateConnectionAction impl
new String[]
{ IDialogConstants.OK_LABEL }, MessageDialog.OK );
dialog.open();
- // TODO use common methods in Common UI plugin
}
}
}
@@ -140,7 +138,6 @@ public class CreateConnectionAction impl
null, message, MessageDialog.ERROR, new String[]
{ IDialogConstants.OK_LABEL }, MessageDialog.OK );
dialog.open();
- // TODO use common methods in Common UI plugin
}
Modified: directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/model/LdapServerActionFilterAdapter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/model/LdapServerActionFilterAdapter.java?rev=1228281&r1=1228280&r2=1228281&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/model/LdapServerActionFilterAdapter.java (original)
+++ directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/model/LdapServerActionFilterAdapter.java Fri Jan 6 17:09:23 2012
@@ -33,20 +33,20 @@ import org.eclipse.ui.IActionFilter;
public class LdapServerActionFilterAdapter implements IActionFilter
{
// Identifier and value strings
- private static final String ID = "id";
- private static final String NAME = "name";
- private static final Object STATUS = "status";
- private static final Object STATUS_STARTED = "started";
- private static final Object STATUS_STARTING = "starting";
- private static final Object STATUS_STOPPED = "stopped";
- private static final Object STATUS_STOPPING = "stopping";
- private static final Object STATUS_UNKNOWN = "unknown";
- private static final Object EXTENSION_ID = "extensionId";
- private static final Object EXTENSION_NAME = "extensionName";
- private static final Object EXTENSION_VERSION = "extensionVersion";
- private static final Object EXTENSION_VENDOR = "extensionVendor";
- private static final Object HAS_CONFIGURATION_PAGE = "hasConfigurationPage";
- private static final Object IS_LDAP_PERSPECTIVE_AVAILABLE = "isLdapPerspectiveAvailable";
+ private static final String ID = "id"; //$NON-NLS-1$
+ private static final String NAME = "name"; //$NON-NLS-1$
+ private static final Object STATUS = "status"; //$NON-NLS-1$
+ private static final Object STATUS_STARTED = "started"; //$NON-NLS-1$
+ private static final Object STATUS_STARTING = "starting"; //$NON-NLS-1$
+ private static final Object STATUS_STOPPED = "stopped"; //$NON-NLS-1$
+ private static final Object STATUS_STOPPING = "stopping"; //$NON-NLS-1$
+ private static final Object STATUS_UNKNOWN = "unknown"; //$NON-NLS-1$
+ private static final Object EXTENSION_ID = "extensionId"; //$NON-NLS-1$
+ private static final Object EXTENSION_NAME = "extensionName"; //$NON-NLS-1$
+ private static final Object EXTENSION_VERSION = "extensionVersion"; //$NON-NLS-1$
+ private static final Object EXTENSION_VENDOR = "extensionVendor"; //$NON-NLS-1$
+ private static final Object HAS_CONFIGURATION_PAGE = "hasConfigurationPage"; //$NON-NLS-1$
+ private static final Object IS_LDAP_PERSPECTIVE_AVAILABLE = "isLdapPerspectiveAvailable"; //$NON-NLS-1$
/** The class instance */
private static LdapServerActionFilterAdapter INSTANCE = new LdapServerActionFilterAdapter();
@@ -147,10 +147,10 @@ public class LdapServerActionFilterAdapt
String configurationPageClassName = server.getLdapServerAdapterExtension()
.getConfigurationPageClassName();
- boolean hasConfigurationPage = ( ( configurationPageClassName != null ) && ( !""
+ boolean hasConfigurationPage = ( ( configurationPageClassName != null ) && ( !"" //$NON-NLS-1$
.equals( configurationPageClassName ) ) );
- return value.equalsIgnoreCase( hasConfigurationPage ? "true" : "false" );
+ return value.equalsIgnoreCase( hasConfigurationPage ? "true" : "false" ); //$NON-NLS-1$ //$NON-NLS-2$
}
// IS LDAP PERSPECTIVE AVAILABLE
else if ( IS_LDAP_PERSPECTIVE_AVAILABLE.equals( name ) )