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 17:45:31 UTC
svn commit: r1228258 - in
/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2:
./ actions/ editor/ jobs/
Author: pamarcelot
Date: Fri Jan 6 16:45:30 2012
New Revision: 1228258
URL: http://svn.apache.org/viewvc?rev=1228258&view=rev
Log:
Marked strings as non-externalized.
Modified:
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/ApacheDS2ConfigurationContentDescriber.java
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/ApacheDS2ConfigurationPlugin.java
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/actions/EditorImportConfigurationAction.java
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ErrorPage.java
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/KerberosServerPage.java
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/LdapLdapsServersPage.java
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/OverviewPage.java
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/PartitionsMasterDetailsBlock.java
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/PartitionsPage.java
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ServerConfigurationEditorPage.java
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ServerConfigurationEditorUtils.java
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/EntryBasedConfigurationPartition.java
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/LoadConfigurationRunnable.java
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/PartitionsDiffComputer.java
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/ApacheDS2ConfigurationContentDescriber.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/ApacheDS2ConfigurationContentDescriber.java?rev=1228258&r1=1228257&r2=1228258&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/ApacheDS2ConfigurationContentDescriber.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/ApacheDS2ConfigurationContentDescriber.java Fri Jan 6 16:45:30 2012
@@ -59,8 +59,8 @@ public class ApacheDS2ConfigurationConte
// Initializing DNs
try
{
- configEntryDn = new Dn( "ou=config" );
- directoryServiceDn = new Dn( "ads-directoryServiceId=default,ou=config" );
+ configEntryDn = new Dn( "ou=config" ); //$NON-NLS-1$
+ directoryServiceDn = new Dn( "ads-directoryServiceId=default,ou=config" ); //$NON-NLS-1$
}
catch ( LdapInvalidDnException e )
{
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/ApacheDS2ConfigurationPlugin.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/ApacheDS2ConfigurationPlugin.java?rev=1228258&r1=1228257&r2=1228258&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/ApacheDS2ConfigurationPlugin.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/ApacheDS2ConfigurationPlugin.java Fri Jan 6 16:45:30 2012
@@ -99,7 +99,7 @@ public class ApacheDS2ConfigurationPlugi
schemaManager = new DefaultSchemaManager( loader );
// Loading only the 'adsconfig' schema with its dependencies
- schemaManager.loadWithDeps( "adsconfig" );
+ schemaManager.loadWithDeps( "adsconfig" ); //$NON-NLS-1$
// Checking if no error occurred when loading the schemas
if ( schemaManager.getErrors().size() != 0 )
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/actions/EditorImportConfigurationAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/actions/EditorImportConfigurationAction.java?rev=1228258&r1=1228257&r2=1228258&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/actions/EditorImportConfigurationAction.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/actions/EditorImportConfigurationAction.java Fri Jan 6 16:45:30 2012
@@ -216,11 +216,11 @@ public class EditorImportConfigurationAc
{
/** The validated status */
private Status validated = new Status( IStatus.OK, ApacheDS2ConfigurationPluginConstants.PLUGIN_ID,
- IStatus.OK, "", null );
+ IStatus.OK, "", null ); //$NON-NLS-1$
/** The not validated status */
private Status notValidated = new Status( IStatus.ERROR, ApacheDS2ConfigurationPluginConstants.PLUGIN_ID,
- IStatus.ERROR, "", null );
+ IStatus.ERROR, "", null ); //$NON-NLS-1$
public IStatus validate( Object[] selection )
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ErrorPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ErrorPage.java?rev=1228258&r1=1228257&r2=1228258&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ErrorPage.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ErrorPage.java Fri Jan 6 16:45:30 2012
@@ -54,8 +54,8 @@ public class ErrorPage extends FormPage
/** The Page Title */
private static final String TITLE = "Error opening the editor";
- private static final String DETAILS_CLOSED = NLS.bind( "{0} >>", "Details" );
- private static final String DETAILS_OPEN = NLS.bind( "<< {0}", "Details" );
+ private static final String DETAILS_CLOSED = NLS.bind( "{0} >>", "Details" ); //$NON-NLS-1$
+ private static final String DETAILS_OPEN = NLS.bind( "<< {0}", "Details" ); //$NON-NLS-1$
/** The exception */
private Exception exception;
@@ -105,7 +105,7 @@ public class ErrorPage extends FormPage
// Error Label
Label errorLabel = toolkit.createLabel( parent,
- NLS.bind( "Could not open the editor: {0}", exception.getMessage() ) );
+ NLS.bind( "Could not open the editor: {0}", exception.getMessage() ) ); //$NON-NLS-1$
errorLabel.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
// Details Button
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/KerberosServerPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/KerberosServerPage.java?rev=1228258&r1=1228257&r2=1228258&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/KerberosServerPage.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/KerberosServerPage.java Fri Jan 6 16:45:30 2012
@@ -286,7 +286,7 @@ public class KerberosServerPage extends
toolkit.createLabel( composite, TABULATION );
toolkit.createLabel( composite, "Port:" );
kerberosPortText = createPortText( toolkit, composite );
- createDefaultValueLabel( toolkit, composite, "60088" );
+ createDefaultValueLabel( toolkit, composite, "60088" ); //$NON-NLS-1$
// Enable Change Password Server Checkbox
enableChangePasswordCheckbox = toolkit.createButton( composite, "Enable Kerberos Change Password Server",
@@ -298,7 +298,7 @@ public class KerberosServerPage extends
toolkit.createLabel( composite, TABULATION );
toolkit.createLabel( composite, "Port:" );
changePasswordPortText = createPortText( toolkit, composite );
- createDefaultValueLabel( toolkit, composite, "60464" );
+ createDefaultValueLabel( toolkit, composite, "60464" ); //$NON-NLS-1$
}
@@ -322,9 +322,9 @@ public class KerberosServerPage extends
// KDC Principal Text
toolkit.createLabel( composite, "KDC Principal:" );
- kdcPrincipalText = toolkit.createText( composite, "" );
+ kdcPrincipalText = toolkit.createText( composite, "" ); //$NON-NLS-1$
setGridDataWithDefaultWidth( kdcPrincipalText, new GridData( SWT.FILL, SWT.NONE, true, false ) );
- Label defaultSaslHostLabel = createDefaultValueLabel( toolkit, composite, "krbtgt/EXAMPLE.COM@EXAMPLE.COM" );
+ Label defaultSaslHostLabel = createDefaultValueLabel( toolkit, composite, "krbtgt/EXAMPLE.COM@EXAMPLE.COM" ); //$NON-NLS-1$
defaultSaslHostLabel.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 2, 1 ) );
// SASL Principal Text
@@ -332,21 +332,21 @@ public class KerberosServerPage extends
primaryKdcRealmText = toolkit.createText( composite, "" ); //$NON-NLS-1$
setGridDataWithDefaultWidth( primaryKdcRealmText, new GridData( SWT.FILL, SWT.NONE, true, false ) );
Label defaultSaslPrincipalLabel = createDefaultValueLabel( toolkit, composite,
- "EXAMPLE.COM" );
+ "EXAMPLE.COM" ); //$NON-NLS-1$
defaultSaslPrincipalLabel.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 2, 1 ) );
// Search Base Dn Text
toolkit.createLabel( composite, "Search Base Dn:" );
kdcSearchBaseDnText = toolkit.createText( composite, "" ); //$NON-NLS-1$
setGridDataWithDefaultWidth( kdcSearchBaseDnText, new GridData( SWT.FILL, SWT.NONE, true, false ) );
- Label defaultSaslSearchBaseDnLabel = createDefaultValueLabel( toolkit, composite, "ou=users,dc=example,dc=com" );
+ Label defaultSaslSearchBaseDnLabel = createDefaultValueLabel( toolkit, composite, "ou=users,dc=example,dc=com" ); //$NON-NLS-1$
defaultSaslSearchBaseDnLabel.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 2, 1 ) );
// Encryption Types Text
toolkit.createLabel( composite, "Encryption Types:" );
encryptionTypesText = toolkit.createText( composite, "" ); //$NON-NLS-1$
setGridDataWithDefaultWidth( encryptionTypesText, new GridData( SWT.FILL, SWT.NONE, true, false ) );
- Label defaultEncryptionTypesLabel = createDefaultValueLabel( toolkit, composite, "[des-cbc-md5]" );
+ Label defaultEncryptionTypesLabel = createDefaultValueLabel( toolkit, composite, "[des-cbc-md5]" ); //$NON-NLS-1$
defaultEncryptionTypesLabel.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 2, 1 ) );
}
@@ -430,13 +430,13 @@ public class KerberosServerPage extends
KdcServerBean kdcServerBean = getKdcServerBean();
setSelection( enableKerberosCheckbox, kdcServerBean.isEnabled() );
setEnabled( kerberosPortText, enableKerberosCheckbox.getSelection() );
- setText( kerberosPortText, "" + getKdcServerTransportBean().getSystemPort() );
+ setText( kerberosPortText, "" + getKdcServerTransportBean().getSystemPort() ); //$NON-NLS-1$
// Change Password Checkbox
ChangePasswordServerBean changePasswordServerBean = getChangePasswordServerBean();
setSelection( enableChangePasswordCheckbox, changePasswordServerBean.isEnabled() );
setEnabled( changePasswordPortText, enableChangePasswordCheckbox.getSelection() );
- setText( changePasswordPortText, "" + getChangePasswordServerTransportBean().getSystemPort() );
+ setText( changePasswordPortText, "" + getChangePasswordServerTransportBean().getSystemPort() ); //$NON-NLS-1$
// Kerberos Settings
setText( kdcPrincipalText, kdcServerBean.getKrbKdcPrincipal().toString() );
@@ -451,9 +451,9 @@ public class KerberosServerPage extends
setSelection( requirePreAuthByEncryptedTimestampCheckbox, kdcServerBean.isKrbPaEncTimestampRequired() );
setSelection( allowPostdatedTicketsCheckbox, kdcServerBean.isKrbPostdatedAllowed() );
setSelection( allowRenewableTicketsCheckbox, kdcServerBean.isKrbRenewableAllowed() );
- setText( maximumRenewableLifetimeText, kdcServerBean.getKrbMaximumRenewableLifetime() + "" );
- setText( maximumTicketLifetimeText, kdcServerBean.getKrbMaximumTicketLifetime() + "" );
- setText( allowableClockSkewText, kdcServerBean.getKrbAllowableClockSkew() + "" );
+ setText( maximumRenewableLifetimeText, kdcServerBean.getKrbMaximumRenewableLifetime() + "" ); //$NON-NLS-1$
+ setText( maximumTicketLifetimeText, kdcServerBean.getKrbMaximumTicketLifetime() + "" ); //$NON-NLS-1$
+ setText( allowableClockSkewText, kdcServerBean.getKrbAllowableClockSkew() + "" ); //$NON-NLS-1$
addListeners();
}
@@ -697,8 +697,8 @@ public class KerberosServerPage extends
{
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$
{
transportBean = kdcServerTransportBean;
break;
@@ -710,7 +710,7 @@ public class KerberosServerPage extends
if ( transportBean == null )
{
transportBean = new TransportBean();
- transportBean.setTransportId( "tcp" ); // TODO can either 'tcp' or 'udp'
+ transportBean.setTransportId( "tcp" ); // TODO can either 'tcp' or 'udp' //$NON-NLS-1$
kdcServerBean.addTransports( transportBean );
}
@@ -736,7 +736,7 @@ public class KerberosServerPage extends
{
for ( TransportBean changePasswordServerTransportBean : changePasswordServerTransportBeans )
{
- if ( "tcp".equals( changePasswordServerTransportBean.getTransportId() ) ) // TODO can either 'tcp' or 'udp'
+ if ( "tcp".equals( changePasswordServerTransportBean.getTransportId() ) ) // TODO can either 'tcp' or 'udp' //$NON-NLS-1$
{
transportBean = changePasswordServerTransportBean;
break;
@@ -748,7 +748,7 @@ public class KerberosServerPage extends
if ( transportBean == null )
{
transportBean = new TransportBean();
- transportBean.setTransportId( "tcp" ); // TODO can either 'tcp' or 'udp'
+ transportBean.setTransportId( "tcp" ); // TODO can either 'tcp' or 'udp' //$NON-NLS-1$
changePasswordServerBean.addTransports( transportBean );
}
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/LdapLdapsServersPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/LdapLdapsServersPage.java?rev=1228258&r1=1228257&r2=1228258&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/LdapLdapsServersPage.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/LdapLdapsServersPage.java Fri Jan 6 16:45:30 2012
@@ -63,25 +63,25 @@ import org.eclipse.ui.forms.widgets.Tabl
*/
public class LdapLdapsServersPage extends ServerConfigurationEditorPage
{
- private static final String DEFAULT_ADDRESS = "0.0.0.0";
+ private static final String DEFAULT_ADDRESS = "0.0.0.0"; //$NON-NLS-1$
private static final int DEFAULT_PORT_LDAPS = 10636;
private static final int DEFAULT_PORT_LDAP = 10389;
- private static final String TRANSPORT_ID_LDAP = "ldap";
- private static final String TRANSPORT_ID_LDAPS = "ldaps";
- private static final String SASL_MECHANISMS_SIMPLE = "SIMPLE";
- private static final String START_TLS_HANDLER_ID = "starttlshandler";
- private static final String START_TLS_HANDLER_CLASS = "org.apache.directory.server.ldap.handlers.extended.StartTlsHandler";
- private static final String FQCN_HASHING_INTERCEPTOR_SSHA512 = "org.apache.directory.server.core.hash.Ssha512PasswordHashingInterceptor";
- private static final String FQCN_HASHING_INTERCEPTOR_SHA512 = "org.apache.directory.server.core.hash.Sha512PasswordHashingInterceptor";
- private static final String FQCN_HASHING_INTERCEPTOR_SSHA384 = "org.apache.directory.server.core.hash.Ssha384PasswordHashingInterceptor";
- private static final String FQCN_HASHING_INTERCEPTOR_SHA384 = "org.apache.directory.server.core.hash.Sha384PasswordHashingInterceptor";
- private static final String FQCN_HASHING_INTERCEPTOR_SSHA256 = "org.apache.directory.server.core.hash.Ssha256PasswordHashingInterceptor";
- private static final String FQCN_HASHING_INTERCEPTOR_SHA256 = "org.apache.directory.server.core.hash.Sha256PasswordHashingInterceptor";
- private static final String FQCN_HASHING_INTERCEPTOR_CRYPT = "org.apache.directory.server.core.hash.CryptPasswordHashingInterceptor";
- private static final String FQCN_HASHING_INTERCEPTOR_SMD5 = "org.apache.directory.server.core.hash.Smd5PasswordHashingInterceptor";
- private static final String FQCN_HASHING_INTERCEPTOR_MD5 = "org.apache.directory.server.core.hash.Md5PasswordHashingInterceptor";
- private static final String FQCN_HASHING_INTERCEPTOR_SSHA = "org.apache.directory.server.core.hash.SshaPasswordHashingInterceptor";
- private static final String FQCN_HASHING_INTERCEPTOR_SHA = "org.apache.directory.server.core.hash.ShaPasswordHashingInterceptor";
+ private static final String TRANSPORT_ID_LDAP = "ldap"; //$NON-NLS-1$
+ private static final String TRANSPORT_ID_LDAPS = "ldaps"; //$NON-NLS-1$
+ private static final String SASL_MECHANISMS_SIMPLE = "SIMPLE"; //$NON-NLS-1$
+ private static final String START_TLS_HANDLER_ID = "starttlshandler"; //$NON-NLS-1$
+ private static final String START_TLS_HANDLER_CLASS = "org.apache.directory.server.ldap.handlers.extended.StartTlsHandler"; //$NON-NLS-1$
+ private static final String FQCN_HASHING_INTERCEPTOR_SSHA512 = "org.apache.directory.server.core.hash.Ssha512PasswordHashingInterceptor"; //$NON-NLS-1$
+ private static final String FQCN_HASHING_INTERCEPTOR_SHA512 = "org.apache.directory.server.core.hash.Sha512PasswordHashingInterceptor"; //$NON-NLS-1$
+ private static final String FQCN_HASHING_INTERCEPTOR_SSHA384 = "org.apache.directory.server.core.hash.Ssha384PasswordHashingInterceptor"; //$NON-NLS-1$
+ private static final String FQCN_HASHING_INTERCEPTOR_SHA384 = "org.apache.directory.server.core.hash.Sha384PasswordHashingInterceptor"; //$NON-NLS-1$
+ private static final String FQCN_HASHING_INTERCEPTOR_SSHA256 = "org.apache.directory.server.core.hash.Ssha256PasswordHashingInterceptor"; //$NON-NLS-1$
+ private static final String FQCN_HASHING_INTERCEPTOR_SHA256 = "org.apache.directory.server.core.hash.Sha256PasswordHashingInterceptor"; //$NON-NLS-1$
+ private static final String FQCN_HASHING_INTERCEPTOR_CRYPT = "org.apache.directory.server.core.hash.CryptPasswordHashingInterceptor"; //$NON-NLS-1$
+ private static final String FQCN_HASHING_INTERCEPTOR_SMD5 = "org.apache.directory.server.core.hash.Smd5PasswordHashingInterceptor"; //$NON-NLS-1$
+ private static final String FQCN_HASHING_INTERCEPTOR_MD5 = "org.apache.directory.server.core.hash.Md5PasswordHashingInterceptor"; //$NON-NLS-1$
+ private static final String FQCN_HASHING_INTERCEPTOR_SSHA = "org.apache.directory.server.core.hash.SshaPasswordHashingInterceptor"; //$NON-NLS-1$
+ private static final String FQCN_HASHING_INTERCEPTOR_SHA = "org.apache.directory.server.core.hash.ShaPasswordHashingInterceptor"; //$NON-NLS-1$
/** The Page ID*/
public static final String ID = LdapLdapsServersPage.class.getName(); //$NON-NLS-1$
@@ -359,7 +359,7 @@ public class LdapLdapsServersPage extend
toolkit.createLabel( composite, TABULATION );
toolkit.createLabel( composite, "Port:" );
ldapPortText = createPortText( toolkit, composite );
- createDefaultValueLabel( toolkit, composite, "10389" );
+ createDefaultValueLabel( toolkit, composite, "10389" ); //$NON-NLS-1$
// Enable LDAPS Server Checkbox
enableLdapsCheckbox = toolkit.createButton( composite, "Enable LDAPS Server", SWT.CHECK );
@@ -369,7 +369,7 @@ public class LdapLdapsServersPage extend
toolkit.createLabel( composite, TABULATION );
toolkit.createLabel( composite, "Port:" );
ldapsPortText = createPortText( toolkit, composite );
- createDefaultValueLabel( toolkit, composite, "10636" );
+ createDefaultValueLabel( toolkit, composite, "10636" ); //$NON-NLS-1$
}
@@ -436,7 +436,7 @@ public class LdapLdapsServersPage extend
enableServerSidePasswordHashingCheckbox.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 3, 1 ) );
// Server-side Password Hashing Combo
- toolkit.createLabel( composite, " " );
+ toolkit.createLabel( composite, " " ); //$NON-NLS-1$
toolkit.createLabel( composite, "Hashing Method:" );
Combo hashingMethodCombo = new Combo( composite, SWT.READ_ONLY | SWT.SINGLE );
hashingMethodCombo.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
@@ -454,27 +454,27 @@ public class LdapLdapsServersPage extend
switch ( hashingMethod )
{
case HASH_METHOD_SHA:
- return "SHA";
+ return "SHA"; //$NON-NLS-1$
case HASH_METHOD_SSHA:
- return "SSHA";
+ return "SSHA"; //$NON-NLS-1$
case HASH_METHOD_MD5:
- return "MD5";
+ return "MD5"; //$NON-NLS-1$
case HASH_METHOD_SMD5:
- return "SMD5";
+ return "SMD5"; //$NON-NLS-1$
case HASH_METHOD_CRYPT:
- return "CRYPT";
+ return "CRYPT"; //$NON-NLS-1$
case HASH_METHOD_SHA256:
- return "SHA-256";
+ return "SHA-256"; //$NON-NLS-1$
case HASH_METHOD_SSHA256:
- return "SSHA-256";
+ return "SSHA-256"; //$NON-NLS-1$
case HASH_METHOD_SHA384:
- return "SHA-384";
+ return "SHA-384"; //$NON-NLS-1$
case HASH_METHOD_SSHA384:
- return "SSHA-384";
+ return "SSHA-384"; //$NON-NLS-1$
case HASH_METHOD_SHA512:
- return "SHA-512";
+ return "SHA-512"; //$NON-NLS-1$
case HASH_METHOD_SSHA512:
- return "SSHA-512";
+ return "SSHA-512"; //$NON-NLS-1$
}
}
@@ -497,8 +497,8 @@ public class LdapLdapsServersPage extend
};
hashingMethodComboViewer.setInput( hashingMethods );
setSelection( hashingMethodComboViewer, LdapSecurityConstants.HASH_METHOD_SSHA );
- toolkit.createLabel( composite, " " );
- Label defaultLabel = createDefaultValueLabel( toolkit, composite, "SSHA" );
+ toolkit.createLabel( composite, " " ); //$NON-NLS-1$
+ Label defaultLabel = createDefaultValueLabel( toolkit, composite, "SSHA" ); //$NON-NLS-1$
defaultLabel.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 2, 1 ) );
}
@@ -524,28 +524,28 @@ public class LdapLdapsServersPage extend
section.setClient( composite );
// Simple Checkbox
- authMechSimpleCheckbox = toolkit.createButton( composite, "Simple", SWT.CHECK );
+ authMechSimpleCheckbox = toolkit.createButton( composite, "Simple", SWT.CHECK ); //$NON-NLS-1$
authMechSimpleCheckbox.setLayoutData( new GridData( SWT.FILL, SWT.CENTER, true, false ) );
// GSSAPI Checkbox
- authMechGssapiCheckbox = toolkit.createButton( composite, "GSSAPI", SWT.CHECK );
+ authMechGssapiCheckbox = toolkit.createButton( composite, "GSSAPI", SWT.CHECK ); //$NON-NLS-1$
authMechGssapiCheckbox.setLayoutData( new GridData( SWT.FILL, SWT.CENTER, true, false ) );
// CRAM-MD5 Checkbox
- authMechCramMd5Checkbox = toolkit.createButton( composite, "CRAM-MD5", SWT.CHECK );
+ authMechCramMd5Checkbox = toolkit.createButton( composite, "CRAM-MD5", SWT.CHECK ); //$NON-NLS-1$
authMechCramMd5Checkbox.setLayoutData( new GridData( SWT.FILL, SWT.CENTER, true, false ) );
// DIGEST-MD5 Checkbox
- authMechDigestMd5Checkbox = toolkit.createButton( composite, "DIGEST-MD5", SWT.CHECK );
+ authMechDigestMd5Checkbox = toolkit.createButton( composite, "DIGEST-MD5", SWT.CHECK ); //$NON-NLS-1$
authMechDigestMd5Checkbox.setLayoutData( new GridData( SWT.FILL, SWT.CENTER, true, false ) );
// NTLM Checkbox and Text
- authMechNtlmCheckbox = toolkit.createButton( composite, "NTLM", SWT.CHECK );
+ authMechNtlmCheckbox = toolkit.createButton( composite, "NTLM", SWT.CHECK ); //$NON-NLS-1$
authMechNtlmCheckbox.setLayoutData( new GridData( SWT.FILL, SWT.CENTER, true, false ) );
Composite authMechNtlmComposite = toolkit.createComposite( composite );
authMechNtlmComposite.setLayout( new GridLayout( 2, false ) );
toolkit.createLabel( authMechNtlmComposite, "Provider:" );
- authMechNtlmText = toolkit.createText( authMechNtlmComposite, "" );
+ authMechNtlmText = toolkit.createText( authMechNtlmComposite, "" ); //$NON-NLS-1$
authMechNtlmText.setLayoutData( new GridData( SWT.FILL, SWT.CENTER, true, false ) );
authMechNtlmComposite.setLayoutData( new GridData( SWT.FILL, SWT.CENTER, false, false, 3, 1 ) );
@@ -555,7 +555,7 @@ public class LdapLdapsServersPage extend
Composite authMechGssSpnegoComposite = toolkit.createComposite( composite );
authMechGssSpnegoComposite.setLayout( new GridLayout( 2, false ) );
toolkit.createLabel( authMechGssSpnegoComposite, "Provider:" );
- authMechGssSpnegoText = toolkit.createText( authMechGssSpnegoComposite, "" );
+ authMechGssSpnegoText = toolkit.createText( authMechGssSpnegoComposite, "" ); //$NON-NLS-1$
authMechGssSpnegoText.setLayoutData( new GridData( SWT.FILL, SWT.CENTER, true, false ) );
authMechGssSpnegoComposite.setLayoutData( new GridData( SWT.FILL, SWT.CENTER, true, false, 3, 1 ) );
}
@@ -583,9 +583,9 @@ public class LdapLdapsServersPage extend
// SASL Host Text
toolkit.createLabel( composite, "SASL Host:" );
- saslHostText = toolkit.createText( composite, "" );
+ saslHostText = toolkit.createText( composite, "" ); //$NON-NLS-1$
setGridDataWithDefaultWidth( saslHostText, new GridData( SWT.FILL, SWT.NONE, true, false ) );
- Label defaultSaslHostLabel = createDefaultValueLabel( toolkit, composite, "ldap.example.com" );
+ Label defaultSaslHostLabel = createDefaultValueLabel( toolkit, composite, "ldap.example.com" ); //$NON-NLS-1$
defaultSaslHostLabel.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 2, 1 ) );
// SASL Principal Text
@@ -593,14 +593,14 @@ public class LdapLdapsServersPage extend
saslPrincipalText = toolkit.createText( composite, "" ); //$NON-NLS-1$
setGridDataWithDefaultWidth( saslPrincipalText, new GridData( SWT.FILL, SWT.NONE, true, false ) );
Label defaultSaslPrincipalLabel = createDefaultValueLabel( toolkit, composite,
- "ldap/ldap.example.com@EXAMPLE.COM" );
+ "ldap/ldap.example.com@EXAMPLE.COM" ); //$NON-NLS-1$
defaultSaslPrincipalLabel.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 2, 1 ) );
// Search Base Dn Text
toolkit.createLabel( composite, "Search Base Dn:" );
saslSearchBaseDnText = toolkit.createText( composite, "" ); //$NON-NLS-1$
setGridDataWithDefaultWidth( saslSearchBaseDnText, new GridData( SWT.FILL, SWT.NONE, true, false ) );
- Label defaultSaslSearchBaseDnLabel = createDefaultValueLabel( toolkit, composite, "ou=users,dc=example,dc=com" );
+ Label defaultSaslSearchBaseDnLabel = createDefaultValueLabel( toolkit, composite, "ou=users,dc=example,dc=com" ); //$NON-NLS-1$
defaultSaslSearchBaseDnLabel.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 2, 1 ) );
}
@@ -790,13 +790,13 @@ public class LdapLdapsServersPage extend
TransportBean ldapServerTransportBean = getLdapServerTransportBean();
setSelection( enableLdapCheckbox, ldapServerTransportBean.isEnabled() );
setEnabled( ldapPortText, enableLdapCheckbox.getSelection() );
- setText( ldapPortText, ldapServerTransportBean.getSystemPort() + "" );
+ setText( ldapPortText, ldapServerTransportBean.getSystemPort() + "" ); //$NON-NLS-1$
// LDAPS Server
TransportBean ldapsServerTransportBean = getLdapsServerTransportBean();
setSelection( enableLdapsCheckbox, ldapsServerTransportBean.isEnabled() );
setEnabled( enableLdapsCheckbox, enableLdapsCheckbox.getSelection() );
- setText( ldapsPortText, ldapsServerTransportBean.getSystemPort() + "" );
+ setText( ldapsPortText, ldapsServerTransportBean.getSystemPort() + "" ); //$NON-NLS-1$
// SASL Properties
LdapServerBean ldapServerBean = getLdapServerBean();
@@ -840,8 +840,8 @@ public class LdapLdapsServersPage extend
}
// Limits
- setText( maxTimeLimitText, "" + ldapServerBean.getLdapServerMaxTimeLimit() );
- setText( maxSizeLimitText, "" + ldapServerBean.getLdapServerMaxSizeLimit() );
+ setText( maxTimeLimitText, "" + ldapServerBean.getLdapServerMaxTimeLimit() ); //$NON-NLS-1$
+ setText( maxSizeLimitText, "" + ldapServerBean.getLdapServerMaxSizeLimit() ); //$NON-NLS-1$
// Enable TLS Checkbox
setSelection( enableTlsCheckbox, getTlsExtendedOpHandlerBean().isEnabled() );
@@ -1208,7 +1208,7 @@ public class LdapLdapsServersPage extend
{
if ( fqcn != null )
{
- String id = fqcn.replace( "org.apache.directory.server.core.hash.", "" );
+ String id = fqcn.replace( "org.apache.directory.server.core.hash.", "" ); //$NON-NLS-1$ //$NON-NLS-2$
if ( id.length() > 0 )
{
@@ -1405,7 +1405,7 @@ public class LdapLdapsServersPage extend
for ( InterceptorBean interceptor : interceptors )
{
// Looking for the authentication interceptor
- if ( "org.apache.directory.server.core.authn.AuthenticationInterceptor".equalsIgnoreCase( interceptor
+ if ( "org.apache.directory.server.core.authn.AuthenticationInterceptor".equalsIgnoreCase( interceptor //$NON-NLS-1$
.getInterceptorClassName() ) )
{
// We found the authentication interceptor
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/OverviewPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/OverviewPage.java?rev=1228258&r1=1228257&r2=1228258&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/OverviewPage.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/OverviewPage.java Fri Jan 6 16:45:30 2012
@@ -273,7 +273,7 @@ public class OverviewPage extends Server
toolkit.createLabel( composite, TABULATION );
toolkit.createLabel( composite, "Port:" );
ldapPortText = createPortText( toolkit, composite );
- createDefaultValueLabel( toolkit, composite, "10389" );
+ createDefaultValueLabel( toolkit, composite, "10389" ); //$NON-NLS-1$
// Enable LDAPS Server Checkbox
enableLdapsCheckbox = toolkit.createButton( composite, "Enable LDAPS Server", SWT.CHECK );
@@ -283,7 +283,7 @@ public class OverviewPage extends Server
toolkit.createLabel( composite, TABULATION );
toolkit.createLabel( composite, "Port:" );
ldapsPortText = createPortText( toolkit, composite );
- createDefaultValueLabel( toolkit, composite, "10636" );
+ createDefaultValueLabel( toolkit, composite, "10636" ); //$NON-NLS-1$
// LDAP Configuration Link
openLdapConfigurationLink = toolkit.createHyperlink( composite,
@@ -322,7 +322,7 @@ public class OverviewPage extends Server
toolkit.createLabel( composite, TABULATION );
toolkit.createLabel( composite, "Port:" );
kerberosPortText = createPortText( toolkit, composite );
- createDefaultValueLabel( toolkit, composite, "60088" );
+ createDefaultValueLabel( toolkit, composite, "60088" ); //$NON-NLS-1$
// Enable Change Password Server Checkbox
enableChangePasswordCheckbox = toolkit.createButton( composite, "Enable Kerberos Change Password Server",
@@ -334,7 +334,7 @@ public class OverviewPage extends Server
toolkit.createLabel( composite, TABULATION );
toolkit.createLabel( composite, "Port:" );
changePasswordPortText = createPortText( toolkit, composite );
- createDefaultValueLabel( toolkit, composite, "60464" );
+ createDefaultValueLabel( toolkit, composite, "60464" ); //$NON-NLS-1$
// Kerberos Configuration Link
openKerberosConfigurationLink = toolkit.createHyperlink( composite,
@@ -365,7 +365,7 @@ public class OverviewPage extends Server
section.setClient( composite );
// Partitions Label
- partitionsLabel = toolkit.createLabel( composite, "" );
+ partitionsLabel = toolkit.createLabel( composite, "" ); //$NON-NLS-1$
partitionsLabel.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
// Partitions Table Viewer
@@ -529,27 +529,27 @@ public class OverviewPage extends Server
TransportBean ldapServerTransportBean = LdapLdapsServersPage.getLdapServerTransportBean( directoryServiceBean );
setSelection( enableLdapCheckbox, ldapServerTransportBean.isEnabled() );
setEnabled( ldapPortText, enableLdapCheckbox.getSelection() );
- setText( ldapPortText, ldapServerTransportBean.getSystemPort() + "" );
+ setText( ldapPortText, ldapServerTransportBean.getSystemPort() + "" ); //$NON-NLS-1$
// LDAPS Server
TransportBean ldapsServerTransportBean = LdapLdapsServersPage
.getLdapsServerTransportBean( directoryServiceBean );
setSelection( enableLdapsCheckbox, ldapsServerTransportBean.isEnabled() );
setEnabled( ldapsPortText, enableLdapsCheckbox.getSelection() );
- setText( ldapsPortText, ldapsServerTransportBean.getSystemPort() + "" );
+ setText( ldapsPortText, ldapsServerTransportBean.getSystemPort() + "" ); //$NON-NLS-1$
// Kerberos Server
KdcServerBean kdcServerBean = KerberosServerPage.getKdcServerBean( directoryServiceBean );
setSelection( enableKerberosCheckbox, kdcServerBean.isEnabled() );
setEnabled( kerberosPortText, enableKerberosCheckbox.getSelection() );
- setText( kerberosPortText, "" + kdcServerBean.getTransports()[0].getSystemPort() );
+ setText( kerberosPortText, "" + kdcServerBean.getTransports()[0].getSystemPort() ); //$NON-NLS-1$
// Change Password Server
ChangePasswordServerBean changePasswordServerBean = KerberosServerPage
.getChangePasswordServerBean( directoryServiceBean );
setSelection( enableChangePasswordCheckbox, changePasswordServerBean.isEnabled() );
setEnabled( changePasswordPortText, enableChangePasswordCheckbox.getSelection() );
- setText( changePasswordPortText, "" + changePasswordServerBean.getTransports()[0].getSystemPort() );
+ setText( changePasswordPortText, "" + changePasswordServerBean.getTransports()[0].getSystemPort() ); //$NON-NLS-1$
// Partitions
List<PartitionBean> partitions = directoryServiceBean.getPartitions();
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/PartitionsMasterDetailsBlock.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/PartitionsMasterDetailsBlock.java?rev=1228258&r1=1228257&r2=1228258&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/PartitionsMasterDetailsBlock.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/PartitionsMasterDetailsBlock.java Fri Jan 6 16:45:30 2012
@@ -207,7 +207,7 @@ public class PartitionsMasterDetailsBloc
newPartitionBean.setPartitionId( newId );
try
{
- newPartitionBean.setPartitionSuffix( new Dn( "dc=" + newId + ",dc=com" ) );
+ newPartitionBean.setPartitionSuffix( new Dn( "dc=" + newId + ",dc=com" ) ); //$NON-NLS-1$ //$NON-NLS-2$
}
catch ( LdapInvalidDnException e1 )
{
@@ -219,20 +219,20 @@ public class PartitionsMasterDetailsBloc
newPartitionBean.setJdbmPartitionOptimizerEnabled( true );
newPartitionBean.setPartitionSyncOnWrite( true );
List<IndexBean> indexes = new ArrayList<IndexBean>();
- indexes.add( createJdbmIndex( "apacheAlias", 100 ) );
- indexes.add( createJdbmIndex( "apacheOneAlias", 100 ) );
- indexes.add( createJdbmIndex( "apacheOneLevel", 100 ) );
- indexes.add( createJdbmIndex( "apachePresence", 100 ) );
- indexes.add( createJdbmIndex( "apacheRdn", 100 ) );
- indexes.add( createJdbmIndex( "apacheSubAlias", 100 ) );
- indexes.add( createJdbmIndex( "apacheSubLevel", 100 ) );
- indexes.add( createJdbmIndex( "dc", 100 ) );
- indexes.add( createJdbmIndex( "entryCSN", 100 ) );
- indexes.add( createJdbmIndex( "entryUUID", 100 ) );
- indexes.add( createJdbmIndex( "krbPrincipalName", 100 ) );
- indexes.add( createJdbmIndex( "objectClass", 100 ) );
- indexes.add( createJdbmIndex( "ou", 100 ) );
- indexes.add( createJdbmIndex( "uid", 100 ) );
+ indexes.add( createJdbmIndex( "apacheAlias", 100 ) ); //$NON-NLS-1$
+ indexes.add( createJdbmIndex( "apacheOneAlias", 100 ) ); //$NON-NLS-1$
+ indexes.add( createJdbmIndex( "apacheOneLevel", 100 ) ); //$NON-NLS-1$
+ indexes.add( createJdbmIndex( "apachePresence", 100 ) ); //$NON-NLS-1$
+ indexes.add( createJdbmIndex( "apacheRdn", 100 ) ); //$NON-NLS-1$
+ indexes.add( createJdbmIndex( "apacheSubAlias", 100 ) ); //$NON-NLS-1$
+ indexes.add( createJdbmIndex( "apacheSubLevel", 100 ) ); //$NON-NLS-1$
+ indexes.add( createJdbmIndex( "dc", 100 ) ); //$NON-NLS-1$
+ indexes.add( createJdbmIndex( "entryCSN", 100 ) ); //$NON-NLS-1$
+ indexes.add( createJdbmIndex( "entryUUID", 100 ) ); //$NON-NLS-1$
+ indexes.add( createJdbmIndex( "krbPrincipalName", 100 ) ); //$NON-NLS-1$
+ indexes.add( createJdbmIndex( "objectClass", 100 ) ); //$NON-NLS-1$
+ indexes.add( createJdbmIndex( "ou", 100 ) ); //$NON-NLS-1$
+ indexes.add( createJdbmIndex( "uid", 100 ) ); //$NON-NLS-1$
newPartitionBean.setIndexes( indexes );
page.getConfigBean().getDirectoryServiceBean().addPartitions( newPartitionBean );
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/PartitionsPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/PartitionsPage.java?rev=1228258&r1=1228257&r2=1228258&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/PartitionsPage.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/PartitionsPage.java Fri Jan 6 16:45:30 2012
@@ -52,7 +52,7 @@ public class PartitionsPage extends Serv
{
PartitionBean partition = ( PartitionBean ) element;
- return NLS.bind( "{0} ({1})", partition.getPartitionId(), partition.getPartitionSuffix() );
+ return NLS.bind( "{0} ({1})", partition.getPartitionId(), partition.getPartitionSuffix() ); //$NON-NLS-1$
}
return super.getText( element );
@@ -122,6 +122,6 @@ public class PartitionsPage extends Serv
*/
public static boolean isSystemPartition( PartitionBean partition )
{
- return "system".equalsIgnoreCase( partition.getPartitionId() );
+ return "system".equalsIgnoreCase( partition.getPartitionId() ); //$NON-NLS-1$
}
}
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ServerConfigurationEditorPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ServerConfigurationEditorPage.java?rev=1228258&r1=1228257&r2=1228258&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ServerConfigurationEditorPage.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ServerConfigurationEditorPage.java Fri Jan 6 16:45:30 2012
@@ -61,7 +61,7 @@ import org.eclipse.ui.forms.widgets.Scro
public abstract class ServerConfigurationEditorPage extends FormPage
{
protected static final Color GRAY_COLOR = new Color( null, 120, 120, 120 );
- protected static final String TABULATION = " ";
+ protected static final String TABULATION = " "; //$NON-NLS-1$
// Dirty listeners
private ModifyListener dirtyModifyListener = new ModifyListener()
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ServerConfigurationEditorUtils.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ServerConfigurationEditorUtils.java?rev=1228258&r1=1228257&r2=1228258&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ServerConfigurationEditorUtils.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ServerConfigurationEditorUtils.java Fri Jan 6 16:45:30 2012
@@ -116,7 +116,7 @@ public class ServerConfigurationEditorUt
}
else
{
- dialog.setOriginalName( "config.ldif" );
+ dialog.setOriginalName( "config.ldif" ); //$NON-NLS-1$
}
// Open the dialog
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/EntryBasedConfigurationPartition.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/EntryBasedConfigurationPartition.java?rev=1228258&r1=1228257&r2=1228258&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/EntryBasedConfigurationPartition.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/EntryBasedConfigurationPartition.java Fri Jan 6 16:45:30 2012
@@ -59,8 +59,8 @@ public class EntryBasedConfigurationPart
*/
protected void doInit() throws InvalidNameException, Exception
{
- setId( "config" );
- setSuffixDn( new Dn( "ou=config" ) );
+ setId( "config" ); //$NON-NLS-1$
+ setSuffixDn( new Dn( "ou=config" ) ); //$NON-NLS-1$
super.doInit();
}
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/LoadConfigurationRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/LoadConfigurationRunnable.java?rev=1228258&r1=1228257&r2=1228258&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/LoadConfigurationRunnable.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/LoadConfigurationRunnable.java Fri Jan 6 16:45:30 2012
@@ -172,7 +172,7 @@ public class LoadConfigurationRunnable i
// need to get the server configuration and return
if ( input instanceof NewServerConfigurationInput )
{
- InputStream is = ApacheDS2ConfigurationPlugin.class.getResourceAsStream( "config.ldif" );
+ InputStream is = ApacheDS2ConfigurationPlugin.class.getResourceAsStream( "config.ldif" ); //$NON-NLS-1$
return readConfiguration( is );
}
// If the input is a ConnectionServerConfigurationInput, then we
@@ -289,8 +289,8 @@ public class LoadConfigurationRunnable i
// Creating the search parameter
SearchParameter configSearchParameter = new SearchParameter();
- configSearchParameter.setSearchBase( new Dn( "ou=config" ) );
- configSearchParameter.setFilter( "(objectClass=*)" );
+ configSearchParameter.setSearchBase( new Dn( "ou=config" ) ); //$NON-NLS-1$
+ configSearchParameter.setFilter( "(objectClass=*)" ); //$NON-NLS-1$
configSearchParameter.setScope( SearchScope.OBJECT );
configSearchParameter.setReturningAttributes( SchemaConstants.ALL_USER_ATTRIBUTES_ARRAY );
@@ -337,7 +337,7 @@ public class LoadConfigurationRunnable i
SearchParameter searchParameter = new SearchParameter();
searchParameter.setSearchBase( entry.getDn() );
- searchParameter.setFilter( "(objectClass=*)" );
+ searchParameter.setFilter( "(objectClass=*)" ); //$NON-NLS-1$
searchParameter.setScope( SearchScope.ONELEVEL );
searchParameter.setReturningAttributes( SchemaConstants.ALL_USER_ATTRIBUTES_ARRAY );
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/PartitionsDiffComputer.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/PartitionsDiffComputer.java?rev=1228258&r1=1228257&r2=1228258&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/PartitionsDiffComputer.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/PartitionsDiffComputer.java Fri Jan 6 16:45:30 2012
@@ -80,7 +80,7 @@ public class PartitionsDiffComputer
// Using the original partition suffix as base
// '*' for all user attributes, '+' for all operational attributes
return computeModifications( originalPartition.getSuffixDn(), new String[]
- { "*", "+" } );
+ { "*", "+" } ); //$NON-NLS-1$ //$NON-NLS-2$
}
@@ -109,34 +109,34 @@ public class PartitionsDiffComputer
// Checking the original partition
if ( originalPartition == null )
{
- throw new PartitionsDiffException( "The original partition must not be 'null'." );
+ throw new PartitionsDiffException( "The original partition must not be 'null'." ); //$NON-NLS-1$
}
else
{
if ( !originalPartition.isInitialized() )
{
- throw new PartitionsDiffException( "The original partition must be intialized." );
+ throw new PartitionsDiffException( "The original partition must be intialized." ); //$NON-NLS-1$
}
else if ( originalPartition.getSuffixDn() == null )
{
- throw new PartitionsDiffException( "The original suffix is null." );
+ throw new PartitionsDiffException( "The original suffix is null." ); //$NON-NLS-1$
}
}
// Checking the destination partition
if ( destinationPartition == null )
{
- throw new PartitionsDiffException( "The destination partition must not be 'null'." );
+ throw new PartitionsDiffException( "The destination partition must not be 'null'." ); //$NON-NLS-1$
}
else
{
if ( !destinationPartition.isInitialized() )
{
- throw new PartitionsDiffException( "The destination partition must be intialized." );
+ throw new PartitionsDiffException( "The destination partition must be intialized." ); //$NON-NLS-1$
}
else if ( destinationPartition.getSuffixDn() == null )
{
- throw new PartitionsDiffException( "The destination suffix is null." );
+ throw new PartitionsDiffException( "The destination suffix is null." ); //$NON-NLS-1$
}
}
}
@@ -165,7 +165,7 @@ public class PartitionsDiffComputer
.lookup( new LookupOperationContext( null, baseDn, attributeIds ) );
if ( originalBaseEntry == null )
{
- throw new PartitionsDiffException( "Unable to find the base entry in the original partition." );
+ throw new PartitionsDiffException( "Unable to find the base entry in the original partition." ); //$NON-NLS-1$
}
// Creating the list containing all the original entries to be processed
@@ -220,7 +220,7 @@ public class PartitionsDiffComputer
setReturningAttributes( originalPartition.getSchemaManager(), attributeIds, soc );
soc.setDn( originalEntry.getDn() );
soc.setScope( SearchScope.ONELEVEL );
- soc.setFilter( FilterParser.parse( originalPartition.getSchemaManager(), "(objectClass=*)" ) );
+ soc.setFilter( FilterParser.parse( originalPartition.getSchemaManager(), "(objectClass=*)" ) ); //$NON-NLS-1$
soc.setAliasDerefMode( AliasDerefMode.DEREF_ALWAYS );
// Looking for the children of the current entry
@@ -242,7 +242,7 @@ public class PartitionsDiffComputer
.lookup( new LookupOperationContext( null, baseDn, attributeIds ) );
if ( destinationBaseEntry == null )
{
- throw new PartitionsDiffException( "Unable to find the base entry in the destination partition." );
+ throw new PartitionsDiffException( "Unable to find the base entry in the destination partition." ); //$NON-NLS-1$
}
// Creating the list containing all the destination entries to be processed
@@ -285,7 +285,7 @@ public class PartitionsDiffComputer
setReturningAttributes( destinationPartition.getSchemaManager(), attributeIds, soc );
soc.setDn( destinationEntry.getDn() );
soc.setScope( SearchScope.ONELEVEL );
- soc.setFilter( FilterParser.parse( destinationPartition.getSchemaManager(), "(objectClass=*)" ) );
+ soc.setFilter( FilterParser.parse( destinationPartition.getSchemaManager(), "(objectClass=*)" ) ); //$NON-NLS-1$
soc.setAliasDerefMode( AliasDerefMode.DEREF_ALWAYS );
// Looking for the children of the current entry