directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r696323 - in /directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration: ./ editor/ editor/v154/ editor/v154/dialogs/ model/v153/ model/v154/ wizards/
Date Wed, 17 Sep 2008 14:32:51 GMT
Author: pamarcelot
Date: Wed Sep 17 07:32:48 2008
New Revision: 696323

URL: http://svn.apache.org/viewvc?rev=696323&view=rev
Log:
Part of a fix for DIRSTUDIO-393 (Add support for ApacheDS 1.5.4 server.xml file in the ApacheDS
Configuration Editor):
   o Various fixes

Modified:
    directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/ApacheDSConfigurationPlugin.java
    directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/NonExistingServerConfigurationInput.java
    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/v154/PartitionDetailsPage.java
    directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v154/dialogs/InterceptorDialog.java
    directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v153/ServerXmlIOV153.java
    directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v154/InterceptorEnum.java
    directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v154/Partition.java
    directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v154/ServerConfigurationV154.java
    directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v154/ServerXmlIOV154.java
    directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/wizards/NewApacheDSConfigurationFileWizard.java

Modified: directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/ApacheDSConfigurationPlugin.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/ApacheDSConfigurationPlugin.java?rev=696323&r1=696322&r2=696323&view=diff
==============================================================================
--- directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/ApacheDSConfigurationPlugin.java
(original)
+++ directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/ApacheDSConfigurationPlugin.java
Wed Sep 17 07:32:48 2008
@@ -43,6 +43,7 @@
 import org.apache.directory.studio.apacheds.configuration.model.v151.ServerXmlIOV151;
 import org.apache.directory.studio.apacheds.configuration.model.v152.ServerXmlIOV152;
 import org.apache.directory.studio.apacheds.configuration.model.v153.ServerXmlIOV153;
+import org.apache.directory.studio.apacheds.configuration.model.v154.ServerXmlIOV154;
 
 
 /**
@@ -60,7 +61,8 @@
     private PropertyResourceBundle properties;
 
     private ServerXmlIO[] serverXmlIOs = new ServerXmlIO[]
-        { new ServerXmlIOV153(), new ServerXmlIOV152(), new ServerXmlIOV151(), new ServerXmlIOV150(),
};
+        { new ServerXmlIOV154(), new ServerXmlIOV153(), new ServerXmlIOV152(), new ServerXmlIOV151(),
+            new ServerXmlIOV150(), };
 
 
     /**

Modified: directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/NonExistingServerConfigurationInput.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/NonExistingServerConfigurationInput.java?rev=696323&r1=696322&r2=696323&view=diff
==============================================================================
--- directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/NonExistingServerConfigurationInput.java
(original)
+++ directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/NonExistingServerConfigurationInput.java
Wed Sep 17 07:32:48 2008
@@ -90,6 +90,8 @@
     {
         switch ( serverConfiguration.getVersion() )
         {
+            case VERSION_1_5_4:
+                return "New Apache DS 1.5.4 Configuration File";
             case VERSION_1_5_3:
                 return "New Apache DS 1.5.3 Configuration File";
             case VERSION_1_5_2:

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=696323&r1=696322&r2=696323&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
Wed Sep 17 07:32:48 2008
@@ -40,6 +40,7 @@
 import org.apache.directory.studio.apacheds.configuration.model.v151.ServerXmlIOV151;
 import org.apache.directory.studio.apacheds.configuration.model.v152.ServerXmlIOV152;
 import org.apache.directory.studio.apacheds.configuration.model.v153.ServerXmlIOV153;
+import org.apache.directory.studio.apacheds.configuration.model.v154.ServerXmlIOV154;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
@@ -142,6 +143,9 @@
             // Setting the ServerXmlIO class
             switch ( serverConfiguration.getVersion() )
             {
+                case VERSION_1_5_4:
+                    serverXmlIO = new ServerXmlIOV154();
+                    break;
                 case VERSION_1_5_3:
                     serverXmlIO = new ServerXmlIOV153();
                     break;
@@ -227,6 +231,27 @@
             {
                 switch ( serverConfiguration.getVersion() )
                 {
+                    case VERSION_1_5_4:
+                        generalPage = new org.apache.directory.studio.apacheds.configuration.editor.v154.GeneralPage(
+                            this );
+                        addPage( generalPage );
+
+                        authenticationPage = new org.apache.directory.studio.apacheds.configuration.editor.v154.AuthenticationPage(
+                            this );
+                        addPage( authenticationPage );
+
+                        partitionsPage = new org.apache.directory.studio.apacheds.configuration.editor.v154.PartitionsPage(
+                            this );
+                        addPage( partitionsPage );
+
+                        interceptorsPage = new org.apache.directory.studio.apacheds.configuration.editor.v154.InterceptorsPage(
+                            this );
+                        addPage( interceptorsPage );
+
+                        extendedOperationsPage = new org.apache.directory.studio.apacheds.configuration.editor.v154.ExtendedOperationsPage(
+                            this );
+                        addPage( extendedOperationsPage );
+                        break;
                     case VERSION_1_5_3:
                         generalPage = new org.apache.directory.studio.apacheds.configuration.editor.v153.GeneralPage(
                             this );
@@ -393,6 +418,13 @@
         {
             switch ( serverConfiguration.getVersion() )
             {
+                case VERSION_1_5_4:
+                    generalPage.save();
+                    authenticationPage.save();
+                    partitionsPage.save();
+                    interceptorsPage.save();
+                    extendedOperationsPage.save();
+                    break;
                 case VERSION_1_5_3:
                     generalPage.save();
                     authenticationPage.save();

Modified: directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v154/PartitionDetailsPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v154/PartitionDetailsPage.java?rev=696323&r1=696322&r2=696323&view=diff
==============================================================================
--- directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v154/PartitionDetailsPage.java
(original)
+++ directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v154/PartitionDetailsPage.java
Wed Sep 17 07:32:48 2008
@@ -20,17 +20,8 @@
 package org.apache.directory.studio.apacheds.configuration.editor.v154;
 
 
-import java.util.ArrayList;
 import java.util.List;
 
-import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
-import javax.naming.directory.Attribute;
-import javax.naming.directory.Attributes;
-import javax.naming.directory.BasicAttribute;
-
-import org.apache.directory.studio.apacheds.configuration.editor.v154.dialogs.AttributeValueDialog;
-import org.apache.directory.studio.apacheds.configuration.editor.v154.dialogs.AttributeValueObject;
 import org.apache.directory.studio.apacheds.configuration.editor.v154.dialogs.IndexedAttributeDialog;
 import org.apache.directory.studio.apacheds.configuration.model.v154.IndexedAttribute;
 import org.apache.directory.studio.apacheds.configuration.model.v154.Partition;
@@ -39,17 +30,13 @@
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.DoubleClickEvent;
 import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ILabelProviderListener;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableLabelProvider;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;
@@ -58,13 +45,11 @@
 import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.swt.events.VerifyEvent;
 import org.eclipse.swt.events.VerifyListener;
-import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.forms.IDetailsPage;
 import org.eclipse.ui.forms.IFormPart;
@@ -92,9 +77,6 @@
     /** The input Partition */
     private Partition input;
 
-    /** The Context Entry */
-    private Attributes contextEntry;
-
     /** The Indexed Attributes List */
     private List<IndexedAttribute> indexedAttributes;
 
@@ -107,11 +89,6 @@
     private Text suffixText;
     private Button enableOptimizerCheckbox;
     private Button synchOnWriteCheckbox;
-    private Table contextEntryTable;
-    private TableViewer contextEntryTableViewer;
-    private Button contextEntryAddButton;
-    private Button contextEntryEditButton;
-    private Button contextEntryDeleteButton;
     private TableViewer indexedAttributesTableViewer;
     private Button indexedAttributeAddButton;
     private Button indexedAttributeEditButton;
@@ -138,85 +115,6 @@
         }
     };
 
-    /** The Selection Changed Listener for the Context Entry Table Viewer */
-    private ISelectionChangedListener contextEntryTableViewerListener = new ISelectionChangedListener()
-    {
-        public void selectionChanged( SelectionChangedEvent event )
-        {
-            contextEntryEditButton.setEnabled( !event.getSelection().isEmpty() );
-            contextEntryDeleteButton.setEnabled( !event.getSelection().isEmpty() );
-        }
-    };
-
-    /** The Double Click Listener for the Indexed Attributes Table Viewer */
-    private IDoubleClickListener contextEntryTableViewerDoubleClickListener = new IDoubleClickListener()
-    {
-        public void doubleClick( DoubleClickEvent event )
-        {
-            editSelectedContextEntry();
-        }
-    };
-
-    /** The Listener for the Add button of the Context Entry Section */
-    private SelectionListener contextEntryAddButtonListener = new SelectionAdapter()
-    {
-        public void widgetSelected( SelectionEvent e )
-        {
-            AttributeValueDialog dialog = new AttributeValueDialog( new AttributeValueObject(
"", "" ) );
-            if ( Dialog.OK == dialog.open() && dialog.isDirty() )
-            {
-                AttributeValueObject newAttributeValueObject = dialog.getAttributeValueObject();
-                Attribute attribute = contextEntry.get( newAttributeValueObject.getAttribute()
);
-                if ( attribute != null )
-                {
-                    attribute.add( newAttributeValueObject.getValue() );
-                }
-                else
-                {
-                    contextEntry.put( new BasicAttribute( newAttributeValueObject.getAttribute(),
-                        newAttributeValueObject.getValue() ) );
-                }
-
-                contextEntryTableViewer.refresh();
-                resizeContextEntryTableColumnsToFit();
-                masterDetailsBlock.setEditorDirty();
-                dirty = true;
-            }
-        }
-    };
-
-    /** The Listener for the Edit button of the Context Entry Section */
-    private SelectionListener contextEntryEditButtonListener = new SelectionAdapter()
-    {
-        public void widgetSelected( SelectionEvent e )
-        {
-            editSelectedContextEntry();
-        }
-    };
-
-    /** The Listener for the Delete button of the Context Entry Section */
-    private SelectionListener contextEntryDeleteButtonListener = new SelectionAdapter()
-    {
-        public void widgetSelected( SelectionEvent e )
-        {
-            StructuredSelection selection = ( StructuredSelection ) contextEntryTableViewer.getSelection();
-            if ( !selection.isEmpty() )
-            {
-                AttributeValueObject attributeValueObject = ( AttributeValueObject ) selection.getFirstElement();
-
-                Attribute attribute = contextEntry.get( attributeValueObject.getAttribute()
);
-                if ( attribute != null )
-                {
-                    attribute.remove( attributeValueObject.getValue() );
-                    contextEntryTableViewer.refresh();
-                    resizeContextEntryTableColumnsToFit();
-                    masterDetailsBlock.setEditorDirty();
-                    dirty = true;
-                }
-            }
-        }
-    };
-
     /** The Selection Changed Listener for the Indexed Attributes Table Viewer */
     private ISelectionChangedListener indexedAttributesTableViewerListener = new ISelectionChangedListener()
     {
@@ -306,7 +204,6 @@
         parent.setLayout( layout );
 
         createDetailsSection( parent, toolkit );
-        createContextEntrySection( parent, toolkit );
         createIndexedAttributesSection( parent, toolkit );
     }
 
@@ -370,140 +267,6 @@
 
 
     /**
-     * Creates the Context Entry Section.
-     *
-     * @param parent
-     *      the parent composite
-     * @param toolkit
-     *      the toolkit to use
-     */
-    private void createContextEntrySection( Composite parent, FormToolkit toolkit )
-    {
-        Section section = toolkit.createSection( parent, Section.DESCRIPTION | Section.TITLE_BAR
);
-        section.marginWidth = 10;
-        section.setText( "Context Entry" ); //$NON-NLS-1$
-        section.setDescription( "Set the attribute/value pairs for the Context Entry of the
partition." ); //$NON-NLS-1$
-        section.setLayoutData( new TableWrapData( TableWrapData.FILL ) );
-        Composite client = toolkit.createComposite( section );
-        toolkit.paintBordersFor( client );
-        client.setLayout( new GridLayout( 2, false ) );
-        section.setClient( client );
-
-        contextEntryTable = toolkit.createTable( client, SWT.NONE );
-        GridData gd = new GridData( SWT.FILL, SWT.NONE, true, false, 1, 3 );
-        gd.heightHint = 103;
-        contextEntryTable.setLayoutData( gd );
-        TableColumn idColumn = new TableColumn( contextEntryTable, SWT.LEFT, 0 );
-        idColumn.setText( "Attribute" );
-        idColumn.setWidth( 100 );
-        TableColumn valueColumn = new TableColumn( contextEntryTable, SWT.LEFT, 1 );
-        valueColumn.setText( "Value" );
-        valueColumn.setWidth( 100 );
-        contextEntryTable.setHeaderVisible( true );
-        contextEntryTableViewer = new TableViewer( contextEntryTable );
-        contextEntryTableViewer.setContentProvider( new IStructuredContentProvider()
-        {
-            public Object[] getElements( Object inputElement )
-            {
-                List<AttributeValueObject> elements = new ArrayList<AttributeValueObject>();
-
-                Attributes attributes = ( Attributes ) inputElement;
-
-                NamingEnumeration<? extends Attribute> ne = attributes.getAll();
-                while ( ne.hasMoreElements() )
-                {
-                    Attribute attribute = ( Attribute ) ne.nextElement();
-                    try
-                    {
-                        NamingEnumeration<?> values = attribute.getAll();
-                        while ( values.hasMoreElements() )
-                        {
-                            elements.add( new AttributeValueObject( attribute.getID(), values.nextElement()
) );
-                        }
-                    }
-                    catch ( NamingException e )
-                    {
-                    }
-                }
-
-                return elements.toArray();
-            }
-
-
-            public void dispose()
-            {
-            }
-
-
-            public void inputChanged( Viewer viewer, Object oldInput, Object newInput )
-            {
-            }
-        } );
-        contextEntryTableViewer.setLabelProvider( new ITableLabelProvider()
-        {
-            public String getColumnText( Object element, int columnIndex )
-            {
-                if ( element != null )
-                {
-                    switch ( columnIndex )
-                    {
-                        case 0:
-                            return ( ( AttributeValueObject ) element ).getAttribute();
-                        case 1:
-                            return ( ( AttributeValueObject ) element ).getValue().toString();
-                        default:
-                            break;
-                    }
-                }
-
-                return null;
-            }
-
-
-            public Image getColumnImage( Object element, int columnIndex )
-            {
-                return null;
-            }
-
-
-            public void addListener( ILabelProviderListener listener )
-            {
-            }
-
-
-            public void dispose()
-            {
-            }
-
-
-            public boolean isLabelProperty( Object element, String property )
-            {
-                return false;
-            }
-
-
-            public void removeListener( ILabelProviderListener listener )
-            {
-            }
-        } );
-
-        GridData buttonsGD = new GridData( SWT.FILL, SWT.BEGINNING, false, false );
-        buttonsGD.widthHint = IDialogConstants.BUTTON_WIDTH;
-
-        contextEntryAddButton = toolkit.createButton( client, "Add...", SWT.PUSH );
-        contextEntryAddButton.setLayoutData( buttonsGD );
-
-        contextEntryEditButton = toolkit.createButton( client, "Edit...", SWT.PUSH );
-        contextEntryEditButton.setEnabled( false );
-        contextEntryEditButton.setLayoutData( buttonsGD );
-
-        contextEntryDeleteButton = toolkit.createButton( client, "Delete", SWT.PUSH );
-        contextEntryDeleteButton.setEnabled( false );
-        contextEntryDeleteButton.setLayoutData( buttonsGD );
-    }
-
-
-    /**
      * Creates the Indexed Attributes Section
      *
      * @param parent
@@ -558,12 +321,6 @@
         enableOptimizerCheckbox.addSelectionListener( checkboxSelectionListener );
         synchOnWriteCheckbox.addSelectionListener( checkboxSelectionListener );
 
-        contextEntryTableViewer.addDoubleClickListener( contextEntryTableViewerDoubleClickListener
);
-        contextEntryTableViewer.addSelectionChangedListener( contextEntryTableViewerListener
);
-        contextEntryAddButton.addSelectionListener( contextEntryAddButtonListener );
-        contextEntryEditButton.addSelectionListener( contextEntryEditButtonListener );
-        contextEntryDeleteButton.addSelectionListener( contextEntryDeleteButtonListener );
-
         indexedAttributesTableViewer.addSelectionChangedListener( indexedAttributesTableViewerListener
);
         indexedAttributesTableViewer.addDoubleClickListener( indexedAttributesTableViewerDoubleClickListener
);
         indexedAttributeAddButton.addSelectionListener( indexedAttributeAddButtonListener
);
@@ -583,12 +340,6 @@
         enableOptimizerCheckbox.removeSelectionListener( checkboxSelectionListener );
         synchOnWriteCheckbox.removeSelectionListener( checkboxSelectionListener );
 
-        contextEntryTableViewer.removeDoubleClickListener( contextEntryTableViewerDoubleClickListener
);
-        contextEntryTableViewer.removeSelectionChangedListener( contextEntryTableViewerListener
);
-        contextEntryAddButton.removeSelectionListener( contextEntryAddButtonListener );
-        contextEntryEditButton.removeSelectionListener( contextEntryEditButtonListener );
-        contextEntryDeleteButton.removeSelectionListener( contextEntryDeleteButtonListener
);
-
         indexedAttributesTableViewer.removeSelectionChangedListener( indexedAttributesTableViewerListener
);
         indexedAttributesTableViewer.removeDoubleClickListener( indexedAttributesTableViewerDoubleClickListener
);
         indexedAttributeAddButton.removeSelectionListener( indexedAttributeAddButtonListener
);
@@ -690,11 +441,6 @@
         // Synchronization on write
         synchOnWriteCheckbox.setSelection( input.isSynchronizationOnWrite() );
 
-        // Context Entry
-        contextEntry = input.getContextEntry();
-        contextEntryTableViewer.setInput( contextEntry );
-        resizeContextEntryTableColumnsToFit();
-
         // Indexed Attributes
         indexedAttributes = input.getIndexedAttributes();
         indexedAttributesTableViewer.setInput( indexedAttributes );
@@ -703,20 +449,6 @@
     }
 
 
-    /**
-     * Resizes the columns to fit the size of the cells.
-     */
-    private void resizeContextEntryTableColumnsToFit()
-    {
-        // Resizing the first column
-        contextEntryTable.getColumn( 0 ).pack();
-        // Adding a little space to the first column
-        contextEntryTable.getColumn( 0 ).setWidth( contextEntryTable.getColumn( 0 ).getWidth()
+ 5 );
-        // Resizing the second column
-        contextEntryTable.getColumn( 1 ).pack();
-    }
-
-
     /* (non-Javadoc)
      * @see org.eclipse.ui.forms.IFormPart#setFocus()
      */
@@ -755,48 +487,4 @@
             }
         }
     }
-
-
-    /**
-     * Opens a Context Entry Dialog with the selected Attribute Value Object in the
-     * Context Entry Table Viewer.
-     */
-    private void editSelectedContextEntry()
-    {
-        StructuredSelection selection = ( StructuredSelection ) contextEntryTableViewer.getSelection();
-        if ( !selection.isEmpty() )
-        {
-            AttributeValueObject attributeValueObject = ( AttributeValueObject ) selection.getFirstElement();
-
-            String oldId = attributeValueObject.getAttribute();
-            Object oldValue = attributeValueObject.getValue();
-
-            AttributeValueDialog dialog = new AttributeValueDialog( attributeValueObject
);
-            if ( Dialog.OK == dialog.open() && dialog.isDirty() )
-            {
-                Attribute attribute = contextEntry.get( oldId );
-                if ( attribute != null )
-                {
-                    attribute.remove( oldValue );
-                }
-
-                AttributeValueObject newAttributeValueObject = dialog.getAttributeValueObject();
-                attribute = contextEntry.get( newAttributeValueObject.getAttribute() );
-                if ( attribute != null )
-                {
-                    attribute.add( newAttributeValueObject.getValue() );
-                }
-                else
-                {
-                    contextEntry.put( new BasicAttribute( newAttributeValueObject.getAttribute(),
-                        newAttributeValueObject.getValue() ) );
-                }
-
-                contextEntryTableViewer.refresh();
-                resizeContextEntryTableColumnsToFit();
-                masterDetailsBlock.setEditorDirty();
-                dirty = true;
-            }
-        }
-    }
 }

Modified: directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v154/dialogs/InterceptorDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v154/dialogs/InterceptorDialog.java?rev=696323&r1=696322&r2=696323&view=diff
==============================================================================
--- directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v154/dialogs/InterceptorDialog.java
(original)
+++ directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v154/dialogs/InterceptorDialog.java
Wed Sep 17 07:32:48 2008
@@ -191,10 +191,6 @@
         {
             availableInterceptors.add( InterceptorEnum.AUTHENTICATION );
         }
-        if ( !initialInterceptors.contains( InterceptorEnum.REFERRAL ) )
-        {
-            availableInterceptors.add( InterceptorEnum.REFERRAL );
-        }
         if ( !initialInterceptors.contains( InterceptorEnum.ACI_AUTHORIZATION ) )
         {
             availableInterceptors.add( InterceptorEnum.ACI_AUTHORIZATION );

Modified: directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v153/ServerXmlIOV153.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v153/ServerXmlIOV153.java?rev=696323&r1=696322&r2=696323&view=diff
==============================================================================
--- directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v153/ServerXmlIOV153.java
(original)
+++ directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v153/ServerXmlIOV153.java
Wed Sep 17 07:32:48 2008
@@ -208,7 +208,13 @@
             {
                 // Looking for the 'apacheDS' element
                 Element apacheDSElement = rootElement.element( ServerXmlIOV153.ELEMENT_APACHE_DS
);
-                return ( apacheDSElement != null );
+                if ( apacheDSElement != null )
+                {
+                    // Looking for the 'ldapServer' element
+                    Element ldapServerElement = rootElement.element( ServerXmlIOV153.ELEMENT_LDAP_SERVER
);
+
+                    return ( ldapServerElement != null );
+                }
             }
         }
 

Modified: directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v154/InterceptorEnum.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v154/InterceptorEnum.java?rev=696323&r1=696322&r2=696323&view=diff
==============================================================================
--- directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v154/InterceptorEnum.java
(original)
+++ directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v154/InterceptorEnum.java
Wed Sep 17 07:32:48 2008
@@ -20,8 +20,6 @@
 package org.apache.directory.studio.apacheds.configuration.model.v154;
 
 
-
-
 /**
  * This enum contains all the interceptors.
  *
@@ -38,11 +36,6 @@
     /** The Authentication Interceptor */
     AUTHENTICATION("Authentication", "An interceptor that authenticates users."),
 
-    /** The Referral Interceptor */
-    REFERRAL("Referral", "An interceptor which is responsible referral handling behaviors.
 It "
-        + "manages  referral handling behavior when the Context#REFERRAL "
-        + "is implicitly or explicitly set to \"ignore\", when set to \"throw\" " + "and
when set to \"follow\"."),
-
     /** The ACI Authorization Interceptor */
     ACI_AUTHORIZATION("ACI Authorization", "An ACI based authorization interceptor."),
 

Modified: directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v154/Partition.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v154/Partition.java?rev=696323&r1=696322&r2=696323&view=diff
==============================================================================
--- directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v154/Partition.java
(original)
+++ directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v154/Partition.java
Wed Sep 17 07:32:48 2008
@@ -23,9 +23,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.naming.directory.Attributes;
-import javax.naming.directory.BasicAttributes;
-
 
 /**
  * This class represents a Partition.
@@ -50,9 +47,6 @@
     /** The Synchronization On Write flag */
     private boolean synchronizationOnWrite;
 
-    /** The Context Entry */
-    private Attributes contextEntry;
-
     /** The indexed attributes */
     private List<IndexedAttribute> indexedAttributes;
 
@@ -66,7 +60,6 @@
     public Partition()
     {
         indexedAttributes = new ArrayList<IndexedAttribute>();
-        contextEntry = new BasicAttributes( true );
     }
 
 
@@ -79,7 +72,6 @@
     public Partition( String id )
     {
         indexedAttributes = new ArrayList<IndexedAttribute>();
-        contextEntry = new BasicAttributes( true );
         this.id = id;
     }
 
@@ -133,30 +125,6 @@
 
 
     /**
-     * Gets the Context Entry.
-     *
-     * @return
-     *      the Content Entry
-     */
-    public Attributes getContextEntry()
-    {
-        return contextEntry;
-    }
-
-
-    /**
-     * Sets the Context Entry
-     *
-     * @param contextEntry
-     *      the new Context Entry
-     */
-    public void setContextEntry( Attributes contextEntry )
-    {
-        this.contextEntry = contextEntry;
-    }
-
-
-    /**
      * Gets the Enable Optimizer flag.
      *
      * @return

Modified: directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v154/ServerConfigurationV154.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v154/ServerConfigurationV154.java?rev=696323&r1=696322&r2=696323&view=diff
==============================================================================
--- directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v154/ServerConfigurationV154.java
(original)
+++ directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v154/ServerConfigurationV154.java
Wed Sep 17 07:32:48 2008
@@ -138,7 +138,7 @@
      */
     public ServerConfigurationV154()
     {
-        super( ServerConfigurationVersionEnum.VERSION_1_5_3 );
+        super( ServerConfigurationVersionEnum.VERSION_1_5_4 );
 
         supportedMechanisms = new ArrayList<SupportedMechanismEnum>();
         saslQops = new ArrayList<SaslQualityOfProtectionEnum>();

Modified: directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v154/ServerXmlIOV154.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v154/ServerXmlIOV154.java?rev=696323&r1=696322&r2=696323&view=diff
==============================================================================
--- directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v154/ServerXmlIOV154.java
(original)
+++ directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v154/ServerXmlIOV154.java
Wed Sep 17 07:32:48 2008
@@ -198,7 +198,14 @@
             {
                 // Looking for the 'apacheDS' element
                 Element apacheDSElement = rootElement.element( ServerXmlIOV154.ELEMENT_APACHE_DS
);
-                return ( apacheDSElement != null );
+                if ( apacheDSElement != null )
+                {
+                    // Looking for the 'apacheDS' element
+                    Element ldapServiceElement = rootElement.element( ServerXmlIOV154.ELEMENT_LDAP_SERVICE
);
+
+                    return ( ldapServiceElement != null );
+                }
+
             }
         }
 

Modified: directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/wizards/NewApacheDSConfigurationFileWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/wizards/NewApacheDSConfigurationFileWizard.java?rev=696323&r1=696322&r2=696323&view=diff
==============================================================================
--- directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/wizards/NewApacheDSConfigurationFileWizard.java
(original)
+++ directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/wizards/NewApacheDSConfigurationFileWizard.java
Wed Sep 17 07:32:48 2008
@@ -84,6 +84,7 @@
                     serverXmlIO = new ServerXmlIOV154();
                     serverConfiguration = serverXmlIO.parse( ApacheDSConfigurationPlugin.class
                         .getResourceAsStream( "default-server-1.5.4.xml" ) );
+                    break;
                 case VERSION_1_5_3:
                     serverXmlIO = new ServerXmlIOV153();
                     serverConfiguration = serverXmlIO.parse( ApacheDSConfigurationPlugin.class



Mime
View raw message