You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pa...@apache.org on 2008/05/19 13:59:05 UTC
svn commit: r657804 - in
/directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration:
editor/ editor/v152/ model/v152/
Author: pamarcelot
Date: Mon May 19 04:59:04 2008
New Revision: 657804
URL: http://svn.apache.org/viewvc?rev=657804&view=rev
Log:
o Removed old parameters from the server configuration model (binary attributes, Admin DN and password) and the UI.
o Added an ErrorPage which is showed when an error occurs during the parsing of the server.xml file.
Added:
directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ErrorPage.java
Modified:
directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ServerConfigurationEditor.java
directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/ExtendedOperationsMasterDetailsBlock.java
directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/GeneralPage.java
directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v152/ServerConfigurationV152.java
Added: directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ErrorPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ErrorPage.java?rev=657804&view=auto
==============================================================================
--- directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ErrorPage.java (added)
+++ directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ErrorPage.java Mon May 19 04:59:04 2008
@@ -0,0 +1,91 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.directory.studio.apacheds.configuration.editor;
+
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.forms.IManagedForm;
+import org.eclipse.ui.forms.editor.FormEditor;
+import org.eclipse.ui.forms.editor.FormPage;
+import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.eclipse.ui.forms.widgets.ScrolledForm;
+
+
+/**
+ * This class represents the General Page of the Server Configuration Editor.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
+ */
+public class ErrorPage extends FormPage
+{
+ /** The Page ID*/
+ public static final String ID = ServerConfigurationEditor.ID + ".ErrorPage";
+
+ /** The Page Title */
+ private static final String TITLE = "Error";
+
+
+ /**
+ * Creates a new instance of GeneralPage.
+ *
+ * @param editor
+ * the associated editor
+ */
+ public ErrorPage( FormEditor editor )
+ {
+ super( editor, ID, TITLE );
+ }
+
+
+ /* (non-Javadoc)
+ * @see org.eclipse.ui.forms.editor.FormPage#createFormContent(org.eclipse.ui.forms.IManagedForm)
+ */
+ protected void createFormContent( IManagedForm managedForm )
+ {
+ ScrolledForm form = managedForm.getForm();
+ FormToolkit toolkit = managedForm.getToolkit();
+ Composite parent = form.getBody();
+ parent.setLayout( new GridLayout( 2, false ) );
+
+ // Error Image
+ Label errorImageLabel = toolkit.createLabel( parent, null );
+ errorImageLabel.setImage( Display.getCurrent().getSystemImage( SWT.ICON_ERROR ) );
+
+ // Error Label
+ toolkit.createLabel( parent, "Error opening the editor." );
+
+ // Details Label
+ Label detailsLabel = toolkit.createLabel( parent, "Details:" );
+ detailsLabel.setLayoutData( new GridData( SWT.NONE, SWT.NONE, false, false, 2, 1 ) );
+
+ // Details Text
+ Text detailsText = toolkit.createText( parent, "", SWT.MULTI );
+ detailsText.setEditable( false );
+ detailsText.setLayoutData( new GridData( SWT.FILL, SWT.FILL, true, true, 2, 1 ) );
+ detailsText.setText( ( ( ServerConfigurationEditor ) getEditor() ).getErrorMessage() );
+ }
+}
Modified: directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ServerConfigurationEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ServerConfigurationEditor.java?rev=657804&r1=657803&r2=657804&view=diff
==============================================================================
--- directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ServerConfigurationEditor.java (original)
+++ directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ServerConfigurationEditor.java Mon May 19 04:59:04 2008
@@ -37,7 +37,6 @@
import org.apache.directory.studio.apacheds.configuration.model.ServerXmlIOException;
import org.apache.directory.studio.apacheds.configuration.model.v150.ServerXmlIOV150;
import org.apache.directory.studio.apacheds.configuration.model.v151.ServerXmlIOV151;
-import org.apache.directory.studio.apacheds.configuration.model.v152.ServerConfigurationV152;
import org.apache.directory.studio.apacheds.configuration.model.v152.ServerXmlIOV152;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.ResourcesPlugin;
@@ -87,6 +86,9 @@
/** The dirty flag */
private boolean dirty = false;
+ /** The error message */
+ private String errorMessage;
+
// The Pages
private SaveableFormPage generalPage;
private SaveableFormPage partitionsPage;
@@ -108,17 +110,7 @@
}
catch ( Exception e )
{
- // Displaying an error message
- MessageBox messageBox = new MessageBox( PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
- SWT.OK | SWT.ICON_ERROR );
- messageBox.setText( "Error!" );
- messageBox.setMessage( "An error occurred when reading the file." + "\n" + e.getMessage() );
- messageBox.open();
-
- // Creating a default (empty) server configuration and assigning the serverXmlIO
- serverConfiguration = new ServerConfigurationV152();
- serverXmlIO = new ServerXmlIOV152();
- return;
+ errorMessage = e.getMessage();
}
}
@@ -220,7 +212,12 @@
{
try
{
- if ( serverConfiguration != null )
+ if ( serverConfiguration == null )
+ {
+ ErrorPage errorPage = new ErrorPage( this );
+ addPage( errorPage );
+ }
+ else
{
switch ( serverConfiguration.getVersion() )
{
@@ -617,6 +614,18 @@
{
return serverConfiguration;
}
+
+
+ /**
+ * Gets the error message.
+ *
+ * @return
+ * the error message
+ */
+ public String getErrorMessage()
+ {
+ return errorMessage;
+ }
}
/**
@@ -747,7 +756,7 @@
/**
* Returns the path.
*/
- public IPath getPath( Object element )
+ public IPath getErrorMessage( Object element )
{
if ( element instanceof PathEditorInput )
{
@@ -757,4 +766,5 @@
return null;
}
+
}
Modified: directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/ExtendedOperationsMasterDetailsBlock.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/ExtendedOperationsMasterDetailsBlock.java?rev=657804&r1=657803&r2=657804&view=diff
==============================================================================
--- directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/ExtendedOperationsMasterDetailsBlock.java (original)
+++ directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/ExtendedOperationsMasterDetailsBlock.java Mon May 19 04:59:04 2008
@@ -117,7 +117,7 @@
toolkit.paintBordersFor( client );
section.setClient( client );
- // Creatig the Table and Table Viewer
+ // Creating the Table and Table Viewer
Table table = toolkit.createTable( client, SWT.NULL );
GridData gd = new GridData( SWT.FILL, SWT.FILL, true, true, 1, 2 );
gd.heightHint = 20;
@@ -141,6 +141,18 @@
return ApacheDSConfigurationPlugin.getDefault().getImage(
ApacheDSConfigurationPluginConstants.IMG_EXTENDED_OPERATION );
}
+
+
+ public String getText( Object element )
+ {
+ if ( element instanceof ExtendedOperationEnum )
+ {
+ return ( ( ExtendedOperationEnum ) element ).getName();
+
+ }
+
+ return super.getText( element );
+ }
} );
// Creating the button(s)
Modified: directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/GeneralPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/GeneralPage.java?rev=657804&r1=657803&r2=657804&view=diff
==============================================================================
--- directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/GeneralPage.java (original)
+++ directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/GeneralPage.java Mon May 19 04:59:04 2008
@@ -25,20 +25,11 @@
import org.apache.directory.studio.apacheds.configuration.editor.SaveableFormPage;
import org.apache.directory.studio.apacheds.configuration.editor.ServerConfigurationEditor;
-import org.apache.directory.studio.apacheds.configuration.editor.v152.dialogs.BinaryAttributeDialog;
import org.apache.directory.studio.apacheds.configuration.model.v152.ServerConfigurationV152;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.viewers.ArrayContentProvider;
import org.eclipse.jface.viewers.CheckStateChangedEvent;
import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.DoubleClickEvent;
import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
@@ -77,13 +68,7 @@
/** The Page Title */
private static final String TITLE = "General";
- /** The Binary Attribute List */
- private List<String> binaryAttributes;
-
// UI Fields
- private Text principalText;
- private Text passwordText;
- private Button showPasswordCheckbox;
private Button allowAnonymousAccessCheckbox;
private Text maxTimeLimitText;
private Text maxSizeLimitText;
@@ -93,10 +78,6 @@
private Button enableKerberosCheckbox;
private Button enableChangePasswordCheckbox;
private Button denormalizeOpAttrCheckbox;
- private TableViewer binaryAttributesTableViewer;
- private Button binaryAttributesAddButton;
- private Button binaryAttributesEditButton;
- private Button binaryAttributesDeleteButton;
private Button enableLdapCheckbox;
private Text ldapPortText;
private Button enableLdapsCheckbox;
@@ -147,7 +128,6 @@
leftCompositeTableWrapData.grabHorizontal = true;
leftComposite.setLayoutData( leftCompositeTableWrapData );
- createAdministratorSettingsSection( leftComposite, toolkit );
createProtocolsSection( leftComposite, toolkit );
createSupportedAuthenticationMechanismsSection( leftComposite, toolkit );
@@ -159,7 +139,6 @@
rightCompositeTableWrapData.grabHorizontal = true;
rightComposite.setLayoutData( rightCompositeTableWrapData );
- createBinaryAttributesSection( rightComposite, toolkit );
createLimitsSection( rightComposite, toolkit );
createOptionsSection( rightComposite, toolkit );
@@ -169,61 +148,6 @@
/**
- * Creates the Administrator Settings Section.
- *
- * @param parent
- * the parent composite
- * @param toolkit
- * the toolkit to use
- */
- private void createAdministratorSettingsSection( Composite parent, FormToolkit toolkit )
- {
- // Creation of the section
- Section section = toolkit.createSection( parent, Section.DESCRIPTION | Section.TITLE_BAR );
- section.marginWidth = 4;
- section.setText( "Administrator settings" );
- section.setDescription( "Set the settings about the administrator of the server." );
- section.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
- Composite client = toolkit.createComposite( section );
- toolkit.paintBordersFor( client );
- GridLayout glayout = new GridLayout( 2, false );
- client.setLayout( glayout );
- section.setClient( client );
-
- // Principal
- toolkit.createLabel( client, "Principal:" );
- principalText = toolkit.createText( client, "" );
- principalText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
-
- // Password
- toolkit.createLabel( client, "Password:" );
- passwordText = toolkit.createText( client, "" );
- passwordText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
- passwordText.setEchoChar( '\u2022' );
-
- // Show Password
- toolkit.createLabel( client, "" );
- showPasswordCheckbox = toolkit.createButton( client, "Show password", SWT.CHECK );
- showPasswordCheckbox.setLayoutData( new GridData( SWT.NONE, SWT.NONE, true, false ) );
- showPasswordCheckbox.setSelection( false );
- showPasswordCheckbox.addSelectionListener( new SelectionAdapter()
- {
- public void widgetSelected( SelectionEvent e )
- {
- if ( showPasswordCheckbox.getSelection() )
- {
- passwordText.setEchoChar( '\0' );
- }
- else
- {
- passwordText.setEchoChar( '\u2022' );
- }
- }
- } );
- }
-
-
- /**
* Creates the Limits Section
*
* @param parent
@@ -341,51 +265,6 @@
/**
- * Creates the Options Section
- *
- * @param parent
- * the parent composite
- * @param toolkit
- * the toolkit to use
- */
- private void createBinaryAttributesSection( Composite parent, FormToolkit toolkit )
- {
- // Creation of the section
- Section section = toolkit.createSection( parent, Section.DESCRIPTION | Section.TITLE_BAR );
- section.marginWidth = 4;
- section.setText( "Binary Attributes" );
- section.setDescription( "Set attribute type names and OID's if you want them to be handled as binary content." );
- section.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
- Composite client = toolkit.createComposite( section );
- toolkit.paintBordersFor( client );
- GridLayout glayout = new GridLayout( 2, false );
- client.setLayout( glayout );
- section.setClient( client );
-
- Table binaryAttributesTable = toolkit.createTable( client, SWT.NONE );
- GridData gd = new GridData( SWT.FILL, SWT.NONE, true, false, 1, 3 );
- gd.heightHint = 103;
- binaryAttributesTable.setLayoutData( gd );
- binaryAttributesTableViewer = new TableViewer( binaryAttributesTable );
- binaryAttributesTableViewer.setContentProvider( new ArrayContentProvider() );
-
- GridData buttonsGD = new GridData( SWT.FILL, SWT.BEGINNING, false, false );
- buttonsGD.widthHint = IDialogConstants.BUTTON_WIDTH;
-
- binaryAttributesAddButton = toolkit.createButton( client, "Add...", SWT.PUSH );
- binaryAttributesAddButton.setLayoutData( buttonsGD );
-
- binaryAttributesEditButton = toolkit.createButton( client, "Edit...", SWT.PUSH );
- binaryAttributesEditButton.setEnabled( false );
- binaryAttributesEditButton.setLayoutData( buttonsGD );
-
- binaryAttributesDeleteButton = toolkit.createButton( client, "Delete", SWT.PUSH );
- binaryAttributesDeleteButton.setEnabled( false );
- binaryAttributesDeleteButton.setLayoutData( buttonsGD );
- }
-
-
- /**
* Creates the Supported Authentication Mechanisms Section
*
* @param parent
@@ -557,24 +436,6 @@
ServerConfigurationV152 configuration = ( ServerConfigurationV152 ) ( ( ServerConfigurationEditor ) getEditor() )
.getServerConfiguration();
- // Principal
- String principal = configuration.getPrincipal();
- if ( principal != null )
- {
- principalText.setText( principal );
- }
-
- // Password
- String password = configuration.getPassword();
- if ( password != null )
- {
- passwordText.setText( password );
- }
-
- // Binary Attributes
- binaryAttributes = configuration.getBinaryAttributes();
- binaryAttributesTableViewer.setInput( binaryAttributes );
-
// LDAP Protocol
enableLdapCheckbox.setSelection( true );
ldapPortText.setEnabled( enableLdapCheckbox.getSelection() );
@@ -653,72 +514,6 @@
}
};
- // The ISelectionChangedListener for the Binary Attributes Table
- ISelectionChangedListener binaryAttributesTableViewerListener = new ISelectionChangedListener()
- {
- public void selectionChanged( SelectionChangedEvent event )
- {
- binaryAttributesEditButton.setEnabled( !event.getSelection().isEmpty() );
- binaryAttributesDeleteButton.setEnabled( !event.getSelection().isEmpty() );
- }
- };
-
- // The IDoubleClickListener for the Binary Attributes Table
- IDoubleClickListener binaryAttributesTableViewerDoubleClickListener = new IDoubleClickListener()
- {
- public void doubleClick( DoubleClickEvent event )
- {
- editSelectedBinaryAttribute();
- }
- };
-
- // The SelectionListener for the Binary Attributes Add Button
- SelectionListener binaryAttributesAddButtonListener = new SelectionAdapter()
- {
- public void widgetSelected( SelectionEvent e )
- {
- BinaryAttributeDialog dialog = new BinaryAttributeDialog( "" );
- if ( Dialog.OK == dialog.open() && dialog.isDirty() )
- {
- String newAttribute = dialog.getAttribute();
- if ( newAttribute != null && !"".equals( newAttribute )
- && !binaryAttributes.contains( newAttribute ) )
- {
- binaryAttributes.add( newAttribute );
-
- binaryAttributesTableViewer.refresh();
- setEditorDirty();
- }
- }
- }
- };
-
- // The SelectionListener for the Binary Attributes Edit Button
- SelectionListener binaryAttributesEditButtonListener = new SelectionAdapter()
- {
- public void widgetSelected( SelectionEvent e )
- {
- editSelectedBinaryAttribute();
- }
- };
-
- // The SelectionListener for the Binary Attributes Delete Button
- SelectionListener binaryAttributesDeleteButtonListener = new SelectionAdapter()
- {
- public void widgetSelected( SelectionEvent e )
- {
- StructuredSelection selection = ( StructuredSelection ) binaryAttributesTableViewer.getSelection();
- if ( !selection.isEmpty() )
- {
- String attribute = ( String ) selection.getFirstElement();
- binaryAttributes.remove( attribute );
-
- binaryAttributesTableViewer.refresh();
- setEditorDirty();
- }
- }
- };
-
selectAllSupportedMechanismsButton.addSelectionListener( new SelectionAdapter()
{
public void widgetSelected( SelectionEvent e )
@@ -735,9 +530,6 @@
}
} );
- principalText.addModifyListener( modifyListener );
- passwordText.addModifyListener( modifyListener );
-
enableLdapCheckbox.addSelectionListener( selectionListener );
enableLdapCheckbox.addSelectionListener( new SelectionAdapter()
{
@@ -804,12 +596,6 @@
selectAllSupportedMechanismsButton.addSelectionListener( selectionListener );
deselectAllSupportedMechanismsButton.addSelectionListener( selectionListener );
- binaryAttributesTableViewer.addSelectionChangedListener( binaryAttributesTableViewerListener );
- binaryAttributesTableViewer.addDoubleClickListener( binaryAttributesTableViewerDoubleClickListener );
- binaryAttributesAddButton.addSelectionListener( binaryAttributesAddButtonListener );
- binaryAttributesEditButton.addSelectionListener( binaryAttributesEditButtonListener );
- binaryAttributesDeleteButton.addSelectionListener( binaryAttributesDeleteButtonListener );
-
maxTimeLimitText.addModifyListener( modifyListener );
maxSizeLimitText.addModifyListener( modifyListener );
synchPeriodText.addModifyListener( modifyListener );
@@ -822,35 +608,6 @@
/**
- * Opens a Binary Attribute Dialog with the selected Attribute Value Object in the
- * Binary Attributes Table Viewer.
- */
- private void editSelectedBinaryAttribute()
- {
- StructuredSelection selection = ( StructuredSelection ) binaryAttributesTableViewer.getSelection();
- if ( !selection.isEmpty() )
- {
- String oldAttribute = ( String ) selection.getFirstElement();
-
- BinaryAttributeDialog dialog = new BinaryAttributeDialog( oldAttribute );
- if ( Dialog.OK == dialog.open() && dialog.isDirty() )
- {
- binaryAttributes.remove( oldAttribute );
-
- String newAttribute = dialog.getAttribute();
- if ( newAttribute != null && !"".equals( newAttribute ) && !binaryAttributes.contains( newAttribute ) )
- {
- binaryAttributes.add( newAttribute );
- }
-
- binaryAttributesTableViewer.refresh();
- setEditorDirty();
- }
- }
- }
-
-
- /**
* Sets the Editor as dirty.
*/
private void setEditorDirty()
@@ -867,11 +624,6 @@
ServerConfigurationV152 configuration = ( ServerConfigurationV152 ) ( ( ServerConfigurationEditor ) getEditor() )
.getServerConfiguration();
- configuration.setPrincipal( principalText.getText() );
- configuration.setPassword( passwordText.getText() );
-
- configuration.setBinaryAttributes( binaryAttributes );
-
configuration.setLdapPort( Integer.parseInt( ldapPortText.getText() ) );
configuration.setEnableLdaps( enableLdapsCheckbox.getSelection() );
configuration.setLdapsPort( Integer.parseInt( ldapsPortText.getText() ) );
Modified: directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v152/ServerConfigurationV152.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v152/ServerConfigurationV152.java?rev=657804&r1=657803&r2=657804&view=diff
==============================================================================
--- directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v152/ServerConfigurationV152.java (original)
+++ directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v152/ServerConfigurationV152.java Mon May 19 04:59:04 2008
@@ -41,12 +41,6 @@
/** The port */
private int ldapPort;
- /** The principal */
- private String principal;
-
- /** The password */
- private String password;
-
// Limits
/** The Max Time Limit */
@@ -126,9 +120,6 @@
// Other configuration elements
- /** The Binary Attributes */
- private List<String> binaryAttributes;
-
/** The Partitions */
private List<Partition> partitions;
@@ -152,21 +143,6 @@
partitions = new ArrayList<Partition>();
interceptors = new ArrayList<InterceptorEnum>();
extendedOperations = new ArrayList<ExtendedOperationEnum>();
- binaryAttributes = new ArrayList<String>();
- }
-
-
- /**
- * Adds a Binary Attribute.
- *
- * @param binaryAttribute
- * the Partition to add
- * @return
- * true (as per the general contract of the Collection.add method).
- */
- public boolean addBinaryAttribute( String binaryAttribute )
- {
- return binaryAttributes.add( binaryAttribute );
}
@@ -255,15 +231,6 @@
/**
- * Removes all Binary Attributes.
- */
- public void clearBinaryAttributes()
- {
- binaryAttributes.clear();
- }
-
-
- /**
* Removes all ExtendedOperations.
*/
public void clearExtendedOperations()
@@ -291,18 +258,6 @@
/**
- * Gets the Binary Attributes List.
- *
- * @return
- * the Binary Attributes List
- */
- public List<String> getBinaryAttributes()
- {
- return binaryAttributes;
- }
-
-
- /**
* Gets the Change Password port.
*
* @return
@@ -435,18 +390,6 @@
/**
- * Gets the password.
- *
- * @return
- * the password
- */
- public String getPassword()
- {
- return password;
- }
-
-
- /**
* Gets the LDAP Port.
*
* @return
@@ -459,18 +402,6 @@
/**
- * Gets the Principal
- *
- * @return
- * the Principal
- */
- public String getPrincipal()
- {
- return principal;
- }
-
-
- /**
* Gets the SASL Host.
*
* @return
@@ -651,20 +582,6 @@
/**
- * Removes a Binary Attribute.
- *
- * @param binaryAttribute
- * the Binary Attribute to remove
- * @return
- * true if this list contained the specified element.
- */
- public boolean removeBinaryAttribute( String binaryAttribute )
- {
- return binaryAttributes.remove( binaryAttribute );
- }
-
-
- /**
* Removes an Extended Operation.
*
* @param extendedOperation
@@ -761,18 +678,6 @@
/**
- * Sets the Binary Attributes List.
- *
- * @param binaryAttributes
- * the new value
- */
- public void setBinaryAttributes( List<String> binaryAttributes )
- {
- this.binaryAttributes = binaryAttributes;
- }
-
-
- /**
* Sets the Change Password port.
*
* @param changePasswordPort
@@ -988,18 +893,6 @@
/**
- * Sets the password.
- *
- * @param password
- * the new password
- */
- public void setPassword( String password )
- {
- this.password = password;
- }
-
-
- /**
* Sets the LDAP Port
*
* @param ldapPort
@@ -1012,18 +905,6 @@
/**
- * Sets the Principal
- *
- * @param principal
- * the new value
- */
- public void setPrincipal( String principal )
- {
- this.principal = principal;
- }
-
-
- /**
* Sets the SASL Host.
*
* @param saslHost