directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seelm...@apache.org
Subject svn commit: r792280 - in /directory/studio/trunk: ./ ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/ ldapbrowser-core/ ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/ lda...
Date Wed, 08 Jul 2009 19:36:21 GMT
Author: seelmann
Date: Wed Jul  8 19:36:19 2009
New Revision: 792280

URL: http://svn.apache.org/viewvc?rev=792280&view=rev
Log:
DIRSTUDIO-462 (Add Export to Open Document Format)

Added:
    directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportOdfJob.java
    directory/studio/trunk/ldapbrowser-ui/resources/icons/export_odf.gif   (with props)
    directory/studio/trunk/ldapbrowser-ui/resources/icons/export_odf_wizard.gif   (with props)
    directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportOdfFromWizardPage.java
    directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportOdfToWizardPage.java
    directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportOdfWizard.java
    directory/studio/trunk/repository/org/openoffice/
    directory/studio/trunk/repository/org/openoffice/odfdom/
    directory/studio/trunk/repository/org/openoffice/odfdom/0.6.16/
    directory/studio/trunk/repository/org/openoffice/odfdom/0.6.16/odfdom-0.6.16.jar   (with props)
    directory/studio/trunk/repository/org/openoffice/odfdom/0.6.16/odfdom-0.6.16.jar.md5
    directory/studio/trunk/repository/org/openoffice/odfdom/0.6.16/odfdom-0.6.16.jar.sha1
    directory/studio/trunk/repository/org/openoffice/odfdom/0.6.16/odfdom-0.6.16.pom
    directory/studio/trunk/repository/org/openoffice/odfdom/0.6.16/odfdom-0.6.16.pom.md5
    directory/studio/trunk/repository/org/openoffice/odfdom/0.6.16/odfdom-0.6.16.pom.sha1
    directory/studio/trunk/repository/org/openoffice/odfdom/maven-metadata.xml
    directory/studio/trunk/repository/org/openoffice/odfdom/maven-metadata.xml.md5
    directory/studio/trunk/repository/org/openoffice/odfdom/maven-metadata.xml.sha1
Modified:
    directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/TextFormatsPreferencePage.java
    directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/messages.properties
    directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/messages_de.properties
    directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/messages_fr.properties
    directory/studio/trunk/ldapbrowser-core/pom.xml
    directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserCoreConstants.java
    directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserCoreMessages.java
    directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserCorePreferencesInitializer.java
    directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/browsercoremessages.properties
    directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/browsercoremessages_de.properties
    directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/browsercoremessages_fr.properties
    directory/studio/trunk/ldapbrowser-ui/plugin.properties
    directory/studio/trunk/ldapbrowser-ui/plugin.xml
    directory/studio/trunk/ldapbrowser-ui/plugin_de.properties
    directory/studio/trunk/ldapbrowser-ui/plugin_fr.properties
    directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/BrowserUIConstants.java
    directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/ImportExportAction.java
    directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/messages.properties
    directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/messages_de.properties
    directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/messages_fr.properties
    directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/browser/BrowserViewActionGroup.java
    directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/connection/ConnectionViewActionGroup.java
    directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/messages.properties
    directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/messages_de.properties
    directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/messages_fr.properties
    directory/studio/trunk/pom.xml

Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/TextFormatsPreferencePage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/TextFormatsPreferencePage.java?rev=792280&r1=792279&r2=792280&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/TextFormatsPreferencePage.java (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/TextFormatsPreferencePage.java Wed Jul  8 19:36:19 2009
@@ -70,6 +70,9 @@
 
     /** The constant used to preselect the 'Excel Export' tab */
     public static final String XLS_TAB = "XLS"; //$NON-NLS-1$
+    
+    /** The constant used to preselect the 'ODF Export' tab */
+    public static final String ODF_TAB = "ODF"; //$NON-NLS-1$
 
     /** The constant used to preselect the 'CSV Copy' tab */
     public static final String TABLE_TAB = "TABLE"; //$NON-NLS-1$
@@ -86,6 +89,8 @@
 
     private TabItem xlsTab;
 
+    private TabItem odfTab;
+
     private Text ldifLineLengthText;
 
     private Button ldifSpaceAfterColonButton;
@@ -118,6 +123,10 @@
 
     private OptionsInput xlsBinaryEncodingWidget;
 
+    private OptionsInput odfValueDelimiterWidget;
+
+    private OptionsInput odfBinaryEncodingWidget;
+
 
     /**
      * Creates a new instance of TextFormatsPreferencePage.
@@ -161,6 +170,10 @@
             {
                 tabFolder.setSelection( 3 );
             }
+            else if ( ODF_TAB.equals( data ) )
+            {
+                tabFolder.setSelection( 4 );
+            }
         }
     }
 
@@ -177,6 +190,7 @@
         createTableTab();
         createCsvTab();
         createXlsTab();
+        createOdfTab();
 
         validate();
 
@@ -319,6 +333,37 @@
         xlsTab.setControl( xlsComposite );
     }
 
+   
+    private void createOdfTab()
+    {
+        odfTab = new TabItem( tabFolder, SWT.NONE );
+        odfTab.setText( Messages.getString( "TextFormatsPreferencePage.OdfExport" ) ); //$NON-NLS-1$
+
+        Composite odfComposite = new Composite( tabFolder, SWT.NONE );
+        odfComposite.setLayout( new GridLayout( 1, false ) );
+        Composite odfInnerComposite = BaseWidgetUtils.createColumnContainer( odfComposite, 3, 1 );
+
+        BaseWidgetUtils.createLabel( odfInnerComposite,
+            Messages.getString( "TextFormatsPreferencePage.OdfExportLabel" ), 3 ); //$NON-NLS-1$
+        BaseWidgetUtils.createSpacer( odfInnerComposite, 3 );
+
+        odfValueDelimiterWidget = new OptionsInput(
+            Messages.getString( "TextFormatsPreferencePage.ValueDelimiter" ), Messages.getString( "TextFormatsPreferencePage.Pipe" ), "|", new String[] //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                {
+                    Messages.getString( "TextFormatsPreferencePage.Pipe" ), Messages.getString( "TextFormatsPreferencePage.Comma" ), Messages.getString( "TextFormatsPreferencePage.Semicolon" ), Messages.getString( "TextFormatsPreferencePage.Newline" ) }, new String[] //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+                { "|", ",", ";", "\n" }, coreStore.getString( BrowserCoreConstants.PREFERENCE_FORMAT_ODF_VALUEDELIMITER ), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+            false, true );
+        odfValueDelimiterWidget.createWidget( odfInnerComposite );
+        odfValueDelimiterWidget.addWidgetModifyListener( this );
+
+        odfBinaryEncodingWidget = new BinaryEncodingInput( coreStore
+            .getString( BrowserCoreConstants.PREFERENCE_FORMAT_ODF_BINARYENCODING ), false );
+        odfBinaryEncodingWidget.createWidget( odfInnerComposite );
+        odfBinaryEncodingWidget.addWidgetModifyListener( this );
+
+        odfTab.setControl( odfComposite );
+    }
+
 
     private void createLdifTab()
     {

Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/messages.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/messages.properties?rev=792280&r1=792279&r2=792280&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/messages.properties (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/messages.properties Wed Jul  8 19:36:19 2009
@@ -94,6 +94,8 @@
 TextFormatsPreferencePage.DoubleQuote=Double Quote (")
 TextFormatsPreferencePage.ExcelExport=Excel Export
 TextFormatsPreferencePage.ExcelExportLabel=Select Excel export file format options:
+TextFormatsPreferencePage.OdfExport=ODF Export
+TextFormatsPreferencePage.OdfExportLabel=Select ODF export file format options:
 TextFormatsPreferencePage.LDIF=LDIF
 TextFormatsPreferencePage.LDIFLabel=Select LDIF format options:
 TextFormatsPreferencePage.LineLength1=Line length:

Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/messages_de.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/messages_de.properties?rev=792280&r1=792279&r2=792280&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/messages_de.properties (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/messages_de.properties Wed Jul  8 19:36:19 2009
@@ -94,6 +94,8 @@
 TextFormatsPreferencePage.DoubleQuote=Doppelte Anf\u00FChrungszeichen (")
 TextFormatsPreferencePage.ExcelExport=Excel Export
 TextFormatsPreferencePage.ExcelExportLabel=Excel Exportformat:
+TextFormatsPreferencePage.OdfExport=ODF Export
+TextFormatsPreferencePage.OdfExportLabel=ODF Exportformat:
 TextFormatsPreferencePage.LDIF=LDIF
 TextFormatsPreferencePage.LDIFLabel=LDIF Format:
 TextFormatsPreferencePage.LineLength1=Zeilenl\u00E4nge:

Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/messages_fr.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/messages_fr.properties?rev=792280&r1=792279&r2=792280&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/messages_fr.properties (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/messages_fr.properties Wed Jul  8 19:36:19 2009
@@ -94,6 +94,8 @@
 TextFormatsPreferencePage.DoubleQuote=Double Quote (")
 TextFormatsPreferencePage.ExcelExport=Export Excel
 TextFormatsPreferencePage.ExcelExportLabel=S\u00E9lectionner les options de format pour l'export vers un fichier Excel:
+TextFormatsPreferencePage.OdfExport=Export ODF
+TextFormatsPreferencePage.OdfExportLabel=S\u00E9lectionner les options de format pour l'export vers un fichier ODF:
 TextFormatsPreferencePage.LDIF=LDIF
 TextFormatsPreferencePage.LDIFLabel=S\u00E9lectionner les options de format pour LDIF:
 TextFormatsPreferencePage.LineLength1=Longueur de ligne:

Modified: directory/studio/trunk/ldapbrowser-core/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/pom.xml?rev=792280&r1=792279&r2=792280&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/pom.xml (original)
+++ directory/studio/trunk/ldapbrowser-core/pom.xml Wed Jul  8 19:36:19 2009
@@ -150,6 +150,15 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.openoffice</groupId>
+      <artifactId>odfdom</artifactId>
+      <version>0.6.16</version>
+    </dependency>
+    <dependency>
+      <groupId>xerces</groupId>
+      <artifactId>xercesImpl</artifactId>
+    </dependency>
   
   	<!-- Apache Directory Studio plugins dependencies -->
     <dependency>

Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserCoreConstants.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserCoreConstants.java?rev=792280&r1=792279&r2=792280&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserCoreConstants.java (original)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserCoreConstants.java Wed Jul  8 19:36:19 2009
@@ -66,6 +66,10 @@
 
     public static final String PREFERENCE_FORMAT_XLS_BINARYENCODING = "formatXlsBinaryEncoding"; //$NON-NLS-1$
 
+    public static final String PREFERENCE_FORMAT_ODF_VALUEDELIMITER = "formatOdfValueDelimiter"; //$NON-NLS-1$
+
+    public static final String PREFERENCE_FORMAT_ODF_BINARYENCODING = "formatOdfBinaryEncoding"; //$NON-NLS-1$
+
     public static final String PREFERENCE_LDIF_LINE_WIDTH = "ldifLineWidth"; //$NON-NLS-1$
 
     public static final String PREFERENCE_LDIF_LINE_SEPARATOR = "ldifLineSeparator"; //$NON-NLS-1$

Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserCoreMessages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserCoreMessages.java?rev=792280&r1=792279&r2=792280&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserCoreMessages.java (original)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserCoreMessages.java Wed Jul  8 19:36:19 2009
@@ -310,6 +310,12 @@
 
     public static String jobs__export_xls_error;
 
+    public static String jobs__export_odf_name;
+
+    public static String jobs__export_odf_task;
+
+    public static String jobs__export_odf_error;
+
     public static String jobs__import_ldif_name;
 
     public static String jobs__import_ldif_task;

Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserCorePreferencesInitializer.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserCorePreferencesInitializer.java?rev=792280&r1=792279&r2=792280&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserCorePreferencesInitializer.java (original)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserCorePreferencesInitializer.java Wed Jul  8 19:36:19 2009
@@ -57,6 +57,10 @@
         store.setDefault( BrowserCoreConstants.PREFERENCE_FORMAT_XLS_BINARYENCODING,
             BrowserCoreConstants.BINARYENCODING_IGNORE );
 
+        store.setDefault( BrowserCoreConstants.PREFERENCE_FORMAT_ODF_VALUEDELIMITER, "|" );
+        store.setDefault( BrowserCoreConstants.PREFERENCE_FORMAT_ODF_BINARYENCODING,
+            BrowserCoreConstants.BINARYENCODING_IGNORE );
+
         store.setDefault( BrowserCoreConstants.PREFERENCE_LDIF_LINE_WIDTH, 76 );
         store.setDefault( BrowserCoreConstants.PREFERENCE_LDIF_LINE_SEPARATOR, BrowserCoreConstants.LINE_SEPARATOR );
         store.setDefault( BrowserCoreConstants.PREFERENCE_LDIF_SPACE_AFTER_COLON, true );

Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/browsercoremessages.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/browsercoremessages.properties?rev=792280&r1=792279&r2=792280&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/browsercoremessages.properties (original)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/browsercoremessages.properties Wed Jul  8 19:36:19 2009
@@ -184,6 +184,9 @@
 jobs__export_xls_name=XLS Export
 jobs__export_xls_task=Exporting XLS
 jobs__export_xls_error=Error while exporting XLS
+jobs__export_odf_name=ODF Export
+jobs__export_odf_task=Exporting ODF
+jobs__export_odf_error=Error while exporting ODF
 jobs__export_dsml_name=DSML Export
 jobs__export_dsml_task=Exporting DSML
 jobs__export_dsml_error=Error while exporting DSML

Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/browsercoremessages_de.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/browsercoremessages_de.properties?rev=792280&r1=792279&r2=792280&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/browsercoremessages_de.properties (original)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/browsercoremessages_de.properties Wed Jul  8 19:36:19 2009
@@ -178,6 +178,8 @@
 jobs__export_progress={0} Eintr\u00E4ge exportiert
 jobs__export_xls_task=XLS exportieren
 jobs__export_xls_error=Fehler beim XLS exportieren
+jobs__export_odf_task=ODF exportieren
+jobs__export_odf_error=Fehler beim ODF exportieren
 jobs__export_dsml_task=DSML exportieren
 jobs__export_dsml_error=Fehler beim DSML Exportieren
 

Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/browsercoremessages_fr.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/browsercoremessages_fr.properties?rev=792280&r1=792279&r2=792280&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/browsercoremessages_fr.properties (original)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/browsercoremessages_fr.properties Wed Jul  8 19:36:19 2009
@@ -184,6 +184,9 @@
 jobs__export_xls_name=Export XLS
 jobs__export_xls_task=Exportation XLS
 jobs__export_xls_error=Une erreur est survenue lors de l'export XLS
+jobs__export_odf_name=Export ODF
+jobs__export_odf_task=Exportation ODF
+jobs__export_odf_error=Une erreur est survenue lors de l'export ODF
 jobs__export_dsml_name=Export DSML
 jobs__export_dsml_task=Exportation DSML
 jobs__export_dsml_error=Une erreur est survenue lors de l'export DSML

Added: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportOdfJob.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportOdfJob.java?rev=792280&view=auto
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportOdfJob.java (added)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportOdfJob.java Wed Jul  8 19:36:19 2009
@@ -0,0 +1,312 @@
+/*
+ *  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.ldapbrowser.core.jobs;
+
+
+import java.io.IOException;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import javax.naming.NamingException;
+
+import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.directory.studio.connection.core.Connection;
+import org.apache.directory.studio.connection.core.jobs.StudioProgressMonitor;
+import org.apache.directory.studio.ldapbrowser.core.BrowserCoreConstants;
+import org.apache.directory.studio.ldapbrowser.core.BrowserCoreMessages;
+import org.apache.directory.studio.ldapbrowser.core.BrowserCorePlugin;
+import org.apache.directory.studio.ldapbrowser.core.jobs.ExportLdifJob.JndiLdifEnumeration;
+import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
+import org.apache.directory.studio.ldapbrowser.core.model.SearchParameter;
+import org.apache.directory.studio.ldapbrowser.core.utils.JNDIUtils;
+import org.apache.directory.studio.ldifparser.model.container.LdifContainer;
+import org.apache.directory.studio.ldifparser.model.container.LdifContentRecord;
+import org.eclipse.core.runtime.Preferences;
+import org.openoffice.odf.doc.OdfFileDom;
+import org.openoffice.odf.doc.OdfSpreadsheetDocument;
+import org.openoffice.odf.doc.element.table.OdfTable;
+import org.openoffice.odf.doc.element.table.OdfTableCell;
+import org.openoffice.odf.doc.element.table.OdfTableRow;
+import org.openoffice.odf.dom.OdfNamespace;
+import org.openoffice.odf.dom.type.office.OdfValueType;
+import org.w3c.dom.Element;
+
+
+/**
+ * Job to export directory content to an ODF file.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
+ */
+public class ExportOdfJob extends AbstractEclipseJob
+{
+
+    /** The maximum count limit */
+    public static final int MAX_COUNT_LIMIT = 65000;
+
+    /** The filename of the ODF file. */
+    private String exportOdfFilename;
+
+    /** The browser connection. */
+    private IBrowserConnection browserConnection;
+
+    /** The search parameter. */
+    private SearchParameter searchParameter;
+
+    /** The export dn flag. */
+    private boolean exportDn;
+
+
+    /**
+     * Creates a new instance of ExportOdfJob.
+     * 
+     * @param exportOdfFilename the ODF filename
+     * @param browserConnection the browser connection
+     * @param searchParameter the search parameter
+     * @param exportDn true to export the DN
+     */
+    public ExportOdfJob( String exportOdfFilename, IBrowserConnection browserConnection,
+        SearchParameter searchParameter, boolean exportDn )
+    {
+        this.exportOdfFilename = exportOdfFilename;
+        this.browserConnection = browserConnection;
+        this.searchParameter = searchParameter;
+        this.exportDn = exportDn;
+
+        setName( BrowserCoreMessages.jobs__export_odf_name );
+    }
+
+
+    /**
+     * @see org.apache.directory.studio.ldapbrowser.core.jobs.AbstractEclipseJob#getConnections()
+     */
+    protected Connection[] getConnections()
+    {
+        return new Connection[]
+            { browserConnection.getConnection() };
+    }
+
+
+    /**
+     * @see org.apache.directory.studio.ldapbrowser.core.jobs.AbstractEclipseJob#getLockedObjects()
+     */
+    protected Object[] getLockedObjects()
+    {
+        return new Object[]
+            { browserConnection.getUrl() + "_" + DigestUtils.shaHex( exportOdfFilename ) };
+    }
+
+
+    /**
+     * @see org.apache.directory.studio.ldapbrowser.core.jobs.AbstractEclipseJob#executeAsyncJob(org.apache.directory.studio.connection.core.jobs.StudioProgressMonitor)
+     */
+    protected void executeAsyncJob( StudioProgressMonitor monitor )
+    {
+        monitor.beginTask( BrowserCoreMessages.jobs__export_odf_task, 2 );
+        monitor.reportProgress( " " ); //$NON-NLS-1$
+        monitor.worked( 1 );
+
+        Preferences coreStore = BrowserCorePlugin.getDefault().getPluginPreferences();
+        String valueDelimiter = coreStore.getString( BrowserCoreConstants.PREFERENCE_FORMAT_ODF_VALUEDELIMITER );
+        int binaryEncoding = coreStore.getInt( BrowserCoreConstants.PREFERENCE_FORMAT_ODF_BINARYENCODING );
+
+        // export
+        try
+        {
+            OdfSpreadsheetDocument doc = OdfSpreadsheetDocument.createSpreadsheetDocument();
+            OdfFileDom contentDoc = doc.getContentDom();
+
+            // Remove the default table added in construction
+            Element spreadsheetElement = ( Element ) contentDoc.getElementsByTagNameNS( OdfNamespace.OFFICE.getUri(),
+                "spreadsheet" ).item( 0 );
+            OdfTable table = ( OdfTable ) ( spreadsheetElement.getElementsByTagNameNS( OdfNamespace.TABLE.getUri(),
+                "table" ).item( 0 ) );
+            table.getParentNode().removeChild( table );
+
+            // create the table
+            table = new OdfTable( contentDoc );
+            table.setName( "Export" ); //$NON-NLS-1$
+            Element officeSpreadsheet = ( Element ) contentDoc.getElementsByTagNameNS( OdfNamespace.OFFICE.getUri(),
+                "spreadsheet" ).item( 0 );
+            officeSpreadsheet.appendChild( table );
+
+            // header
+            OdfTableRow headerRow = new OdfTableRow( contentDoc );
+            table.appendChild( headerRow );
+            LinkedHashMap<String, Short> attributeNameMap = new LinkedHashMap<String, Short>();
+            if ( this.exportDn )
+            {
+                short cellNum = ( short ) 0;
+                //attributeNameMap.put( "dn", new Short( cellNum ) ); //$NON-NLS-1$
+                OdfTableCell cell = new OdfTableCell( contentDoc );
+                cell.setValueType( OdfValueType.STRING );
+                cell.setStringValue( "dn" ); //$NON-NLS-1$
+                headerRow.appendCell( cell );
+            }
+
+            // max export
+            if ( searchParameter.getCountLimit() < 1 || searchParameter.getCountLimit() > MAX_COUNT_LIMIT )
+            {
+                searchParameter.setCountLimit( MAX_COUNT_LIMIT );
+            }
+
+            int count = 0;
+            exportToOdf( browserConnection, searchParameter, contentDoc, table, headerRow, count, monitor,
+                attributeNameMap, valueDelimiter, binaryEncoding, this.exportDn );
+
+            doc.save( exportOdfFilename );
+        }
+        catch ( Exception e )
+        {
+            monitor.reportError( e );
+        }
+    }
+
+
+    /**
+     * Exports to ODF.
+     * 
+     * @param browserConnection the browser connection
+     * @param searchParameter the search parameter
+     * @param contentDoc the document
+     * @param table the table
+     * @param headerRow the header row
+     * @param count the count
+     * @param monitor the monitor
+     * @param attributeNameMap the attribute name map
+     * @param valueDelimiter the value delimiter
+     * @param binaryEncoding the binary encoding
+     * @param exportDn the export dn
+     * 
+     * @throws IOException Signals that an I/O exception has occurred.
+     */
+    private static void exportToOdf( IBrowserConnection browserConnection, SearchParameter searchParameter,
+        OdfFileDom contentDoc, OdfTable table, OdfTableRow headerRow, int count, StudioProgressMonitor monitor,
+        LinkedHashMap<String, Short> attributeNameMap, String valueDelimiter, int binaryEncoding, boolean exportDn )
+        throws IOException
+    {
+        try
+        {
+            JndiLdifEnumeration enumeration = ExportLdifJob.search( browserConnection, searchParameter, monitor );
+            while ( !monitor.isCanceled() && !monitor.errorsReported() && enumeration.hasNext() )
+            {
+                LdifContainer container = enumeration.next();
+
+                if ( container instanceof LdifContentRecord )
+                {
+                    LdifContentRecord record = ( LdifContentRecord ) container;
+                    recordToOdfRow( browserConnection, record, contentDoc, table, headerRow, attributeNameMap,
+                        valueDelimiter, binaryEncoding, exportDn );
+
+                    count++;
+                    monitor.reportProgress( BrowserCoreMessages.bind( BrowserCoreMessages.jobs__export_progress,
+                        new String[]
+                            { Integer.toString( count ) } ) );
+                }
+            }
+
+        }
+        catch ( NamingException ne )
+        {
+            int ldapStatusCode = JNDIUtils.getLdapStatusCode( ne );
+            if ( ldapStatusCode == 3 || ldapStatusCode == 4 || ldapStatusCode == 11 )
+            {
+                // nothing
+            }
+            else
+            {
+                monitor.reportError( ne );
+            }
+        }
+    }
+
+
+    /**
+     * Transforms an LDIF record to an OdfTableRow.
+     * 
+     * @param browserConnection the browser connection
+     * @param record the record
+     * @param contentDoc the document
+     * @param table the table
+     * @param headerRow the header row
+     * @param headerRowAttributeNameMap the header row attribute name map
+     * @param valueDelimiter the value delimiter
+     * @param binaryEncoding the binary encoding
+     * @param exportDn the export dn
+     */
+    private static void recordToOdfRow( IBrowserConnection browserConnection, LdifContentRecord record,
+        OdfFileDom contentDoc, OdfTable table, OdfTableRow headerRow, Map<String, Short> headerRowAttributeNameMap,
+        String valueDelimiter, int binaryEncoding, boolean exportDn )
+    {
+        // group multi-valued attributes
+        Map<String, String> attributeMap = ExportCsvJob.getAttributeMap( null, record, valueDelimiter, "UTF-16",
+            binaryEncoding );
+
+        // output attributes
+        OdfTableRow row = new OdfTableRow( contentDoc );
+        table.appendChild( row );
+
+        if ( exportDn )
+        {
+            OdfTableCell cell = new OdfTableCell( contentDoc );
+            cell.setValueType( OdfValueType.STRING );
+            cell.setStringValue( record.getDnLine().getValueAsString() );
+            row.appendCell( cell );
+
+        }
+        for ( String attributeName : attributeMap.keySet() )
+        {
+            if ( !headerRowAttributeNameMap.containsKey( attributeName ) )
+            {
+                short cellNum = ( short ) headerRowAttributeNameMap.size();
+                headerRowAttributeNameMap.put( attributeName, new Short( cellNum ) );
+
+                OdfTableCell cell = new OdfTableCell( contentDoc );
+                cell.setValueType( OdfValueType.STRING );
+                cell.setStringValue( attributeName );
+                headerRow.appendCell( cell );
+            }
+
+        }
+        for ( String attributeName : headerRowAttributeNameMap.keySet() )
+        {
+            String value = attributeMap.get( attributeName );
+            if ( value == null )
+            {
+                value = "";
+            }
+            OdfTableCell cell = new OdfTableCell( contentDoc );
+            cell.setValueType( OdfValueType.STRING );
+            cell.setStringValue( value );
+            row.appendCell( cell );
+        }
+    }
+
+
+    /**
+     * @see org.apache.directory.studio.ldapbrowser.core.jobs.AbstractEclipseJob#getErrorMessage()
+     */
+    protected String getErrorMessage()
+    {
+        return BrowserCoreMessages.jobs__export_odf_error;
+    }
+
+}

Modified: directory/studio/trunk/ldapbrowser-ui/plugin.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/plugin.properties?rev=792280&r1=792279&r2=792280&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-ui/plugin.properties (original)
+++ directory/studio/trunk/ldapbrowser-ui/plugin.properties Wed Jul  8 19:36:19 2009
@@ -91,6 +91,10 @@
 ExportWizard_ExportExcelWizard_name=LDAP to Excel
 ExportWizard_ExportExcelWizard_description=Exports an Excel file from a LDAP directory
 
+ExportWizard_ExportOdfWizard_id=org.apache.directory.studio.ldapbrowser.ui.wizards.ExportOdfWizard
+ExportWizard_ExportOdfWizard_name=LDAP to ODF
+ExportWizard_ExportOdfWizard_description=Exports an ODF file from a LDAP directory
+
 SearchPage_LdapSearch_id=org.apache.directory.studio.ldapbrowser.ui.search.SearchPage
 SearchPage_LdapSearch_label=LDAP Search
 

Modified: directory/studio/trunk/ldapbrowser-ui/plugin.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/plugin.xml?rev=792280&r1=792279&r2=792280&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-ui/plugin.xml (original)
+++ directory/studio/trunk/ldapbrowser-ui/plugin.xml Wed Jul  8 19:36:19 2009
@@ -209,6 +209,18 @@
        <selection class="org.apache.directory.studio.ldapbrowser.core.model.IConnection"/>
        <selection class="org.apache.directory.studio.ldapbrowser.core.model.IEntry"/>
     </wizard>
+    <wizard
+          category="%ExportWizards_Category_id"
+          class="org.apache.directory.studio.ldapbrowser.ui.wizards.ExportOdfWizard"
+          icon="resources/icons/export_odf.gif"
+          id="%ExportWizard_ExportOdfWizard_id"
+          name="%ExportWizard_ExportOdfWizard_name">
+       <description>
+          %ExportWizard_ExportOdfWizard_description
+       </description>
+       <selection class="org.apache.directory.studio.ldapbrowser.core.model.IConnection"/>
+       <selection class="org.apache.directory.studio.ldapbrowser.core.model.IEntry"/>
+    </wizard>
  </extension>
 
    <extension point="org.eclipse.search.searchPages">

Modified: directory/studio/trunk/ldapbrowser-ui/plugin_de.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/plugin_de.properties?rev=792280&r1=792279&r2=792280&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-ui/plugin_de.properties (original)
+++ directory/studio/trunk/ldapbrowser-ui/plugin_de.properties Wed Jul  8 19:36:19 2009
@@ -53,6 +53,9 @@
 ExportWizard_ExportExcelWizard_name=LDAP nach Excel
 ExportWizard_ExportExcelWizard_description=Exportiert eine Excel Datei aus einem LDAP Verzeichnis
 
+ExportWizard_ExportOdfWizard_name=LDAP nach ODF
+ExportWizard_ExportOdfWizard_description=Exportiert eine ODF Datei aus einem LDAP Verzeichnis
+
 SearchPage_LdapSearch_label=LDAP Suche
 
 PrefPage_SearchResultEditorPreferencePage_name=Suchresultat Editor

Modified: directory/studio/trunk/ldapbrowser-ui/plugin_fr.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/plugin_fr.properties?rev=792280&r1=792279&r2=792280&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-ui/plugin_fr.properties (original)
+++ directory/studio/trunk/ldapbrowser-ui/plugin_fr.properties Wed Jul  8 19:36:19 2009
@@ -47,6 +47,8 @@
 ExportWizard_ExportCsvWizard_description=Exporter vers un fichier CSV
 ExportWizard_ExportExcelWizard_name=LDAP vers Excel\u0099
 ExportWizard_ExportExcelWizard_description=Exporter vers une feuille Excel\u0099
+ExportWizard_ExportOdfWizard_name=LDAP vers fichier ODF
+ExportWizard_ExportOdfWizard_description=Exporter vers un fichier ODF
 
 SearchPage_LdapSearch_label=Recherche LDAP
 

Added: directory/studio/trunk/ldapbrowser-ui/resources/icons/export_odf.gif
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/resources/icons/export_odf.gif?rev=792280&view=auto
==============================================================================
Binary file - no diff available.

Propchange: directory/studio/trunk/ldapbrowser-ui/resources/icons/export_odf.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: directory/studio/trunk/ldapbrowser-ui/resources/icons/export_odf_wizard.gif
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/resources/icons/export_odf_wizard.gif?rev=792280&view=auto
==============================================================================
Binary file - no diff available.

Propchange: directory/studio/trunk/ldapbrowser-ui/resources/icons/export_odf_wizard.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/BrowserUIConstants.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/BrowserUIConstants.java?rev=792280&r1=792279&r2=792280&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/BrowserUIConstants.java (original)
+++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/BrowserUIConstants.java Wed Jul  8 19:36:19 2009
@@ -70,6 +70,7 @@
     public static final String IMG_EXPORT_CSV_WIZARD = "resources/icons/export_csv_wizard.gif"; //$NON-NLS-1$
     public static final String IMG_IMPORT_XLS_WIZARD = "resources/icons/import_xls_wizard.gif"; //$NON-NLS-1$
     public static final String IMG_EXPORT_XLS_WIZARD = "resources/icons/export_xls_wizard.gif"; //$NON-NLS-1$
+    public static final String IMG_EXPORT_ODF_WIZARD = "resources/icons/export_odf_wizard.gif"; //$NON-NLS-1$
     public static final String IMG_IMPORT_DSML = "resources/icons/import_dsml.gif"; //$NON-NLS-1$
     public static final String IMG_EXPORT_DSML = "resources/icons/export_dsml.gif"; //$NON-NLS-1$
     public static final String IMG_IMPORT_LDIF = "resources/icons/import_ldif.gif"; //$NON-NLS-1$
@@ -80,6 +81,7 @@
     public static final String IMG_EXPORT_CSV = "resources/icons/export_csv.gif"; //$NON-NLS-1$
     public static final String IMG_IMPORT_XLS = "resources/icons/import_xls.gif"; //$NON-NLS-1$
     public static final String IMG_EXPORT_XLS = "resources/icons/export_xls.gif"; //$NON-NLS-1$
+    public static final String IMG_EXPORT_ODF = "resources/icons/export_odf.gif"; //$NON-NLS-1$
     public static final String IMG_BROWSER_CONNECTIONVIEW = "resources/icons/browser_connectionview.gif"; //$NON-NLS-1$
     public static final String IMG_BROWSER_BROWSERVIEW = "resources/icons/browser_browserview.gif"; //$NON-NLS-1$
     public static final String IMG_DIT = "resources/icons/dit.gif"; //$NON-NLS-1$
@@ -189,6 +191,8 @@
         "ExportWizard_ExportDdsmlWizard_id" ); //$NON-NLS-1$
     public static final String WIZARD_EXPORT_EXCEL = BrowserUIPlugin.getDefault().getPluginProperties().getString(
         "ExportWizard_ExportExcelWizard_id" ); //$NON-NLS-1$
+    public static final String WIZARD_EXPORT_ODF = BrowserUIPlugin.getDefault().getPluginProperties().getString(
+    "ExportWizard_ExportOdfWizard_id" ); //$NON-NLS-1$
     public static final String WIZARD_EXPORT_LDIF = BrowserUIPlugin.getDefault().getPluginProperties().getString(
         "ExportWizard_ExportLdifWizard_id" ); //$NON-NLS-1$
     public static final String WIZARD_IMPORT_CONNECTIONS = BrowserUIPlugin.getDefault().getPluginProperties()

Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/ImportExportAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/ImportExportAction.java?rev=792280&r1=792279&r2=792280&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/ImportExportAction.java (original)
+++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/ImportExportAction.java Wed Jul  8 19:36:19 2009
@@ -33,6 +33,7 @@
 import org.apache.directory.studio.ldapbrowser.ui.wizards.ExportDsmlWizard;
 import org.apache.directory.studio.ldapbrowser.ui.wizards.ExportExcelWizard;
 import org.apache.directory.studio.ldapbrowser.ui.wizards.ExportLdifWizard;
+import org.apache.directory.studio.ldapbrowser.ui.wizards.ExportOdfWizard;
 import org.apache.directory.studio.ldapbrowser.ui.wizards.ImportDsmlWizard;
 import org.apache.directory.studio.ldapbrowser.ui.wizards.ImportLdifWizard;
 
@@ -42,7 +43,7 @@
 
 
 /**
- * This class implements Import/Export Actions for LDIF, CSV, EXCEL and DSML.
+ * This class implements Import/Export Actions for LDIF, CSV, EXCEL, ODF and DSML.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
@@ -79,6 +80,11 @@
      */
     public static final int TYPE_EXPORT_DSML = 5;
 
+    /**
+     * ODF Export Type
+     */
+    public static final int TYPE_EXPORT_ODF = 6;
+
     private int type;
 
 
@@ -116,6 +122,10 @@
         {
             return Messages.getString( "ImportExportAction.ExcelExport" ); //$NON-NLS-1$
         }
+        else if ( this.type == TYPE_EXPORT_ODF )
+        {
+            return Messages.getString( "ImportExportAction.OdfExport" ); //$NON-NLS-1$
+        }
         else if ( this.type == TYPE_IMPORT_DSML )
         {
             return Messages.getString( "ImportExportAction.DSMLImport" ); //$NON-NLS-1$
@@ -152,6 +162,10 @@
         {
             return BrowserUIPlugin.getDefault().getImageDescriptor( BrowserUIConstants.IMG_EXPORT_XLS );
         }
+        else if ( this.type == TYPE_EXPORT_ODF )
+        {
+            return BrowserUIPlugin.getDefault().getImageDescriptor( BrowserUIConstants.IMG_EXPORT_ODF );
+        }
         else if ( this.type == TYPE_IMPORT_DSML )
         {
             return BrowserUIPlugin.getDefault().getImageDescriptor( BrowserUIConstants.IMG_IMPORT_DSML );
@@ -243,6 +257,10 @@
         {
             wizard = new ExportExcelWizard();
         }
+        else if ( this.type == TYPE_EXPORT_ODF )
+        {
+            wizard = new ExportOdfWizard();
+        }
         else if ( this.type == TYPE_EXPORT_DSML )
         {
             wizard = new ExportDsmlWizard();

Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/messages.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/messages.properties?rev=792280&r1=792279&r2=792280&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/messages.properties (original)
+++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/messages.properties Wed Jul  8 19:36:19 2009
@@ -52,6 +52,7 @@
 ImportExportAction.DSMLExport=DSML Export...
 ImportExportAction.DSMLImport=DSML Import...
 ImportExportAction.ExcelExport=Excel Export...
+ImportExportAction.OdfExport=ODF Export...
 ImportExportAction.Export=Export...
 ImportExportAction.LDIFExport=LDIF Export...
 ImportExportAction.LDIFImport=LDIF Import...

Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/messages_de.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/messages_de.properties?rev=792280&r1=792279&r2=792280&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/messages_de.properties (original)
+++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/messages_de.properties Wed Jul  8 19:36:19 2009
@@ -50,6 +50,7 @@
 ImportExportAction.DSMLExport=DSML exportieren...
 ImportExportAction.DSMLImport=DSML importieren...
 ImportExportAction.ExcelExport=Excel exportieren...
+ImportExportAction.OdfExport=ODF exportieren...
 ImportExportAction.Export=Exportieren...
 ImportExportAction.LDIFExport=LDIF exportieren...
 ImportExportAction.LDIFImport=LDIF importieren...

Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/messages_fr.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/messages_fr.properties?rev=792280&r1=792279&r2=792280&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/messages_fr.properties (original)
+++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/messages_fr.properties Wed Jul  8 19:36:19 2009
@@ -52,6 +52,7 @@
 ImportExportAction.DSMLExport=Export DSML...
 ImportExportAction.DSMLImport=Import DSML...
 ImportExportAction.ExcelExport=Export Excel...
+ImportExportAction.OdfExport=Export ODF...
 ImportExportAction.Export=Exporter...
 ImportExportAction.LDIFExport=Export LDIF...
 ImportExportAction.LDIFImport=Import LDIF...

Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/browser/BrowserViewActionGroup.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/browser/BrowserViewActionGroup.java?rev=792280&r1=792279&r2=792280&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/browser/BrowserViewActionGroup.java (original)
+++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/browser/BrowserViewActionGroup.java Wed Jul  8 19:36:19 2009
@@ -159,6 +159,9 @@
 
     /** The Constant exportExcelAction. */
     private static final String exportExcelAction = "exportExcelAction"; //$NON-NLS-1$
+
+    /** The Constant exportOdfAction. */
+    private static final String exportOdfAction = "exportOdfAction"; //$NON-NLS-1$
     
     /** The Constant fetchOperationalAttributesAction. */
     private static final String fetchOperationalAttributesAction = "fetchOperationalAttributesAction"; //$NON-NLS-1$
@@ -232,6 +235,8 @@
             ImportExportAction.TYPE_EXPORT_CSV ) ) );
         browserActionMap.put( exportExcelAction, new BrowserViewActionProxy( viewer, new ImportExportAction(
             ImportExportAction.TYPE_EXPORT_EXCEL ) ) );
+        browserActionMap.put( exportOdfAction, new BrowserViewActionProxy( viewer, new ImportExportAction(
+            ImportExportAction.TYPE_EXPORT_ODF ) ) );
 
         browserActionMap.put( fetchOperationalAttributesAction, new BrowserViewActionProxy( viewer,
             new FetchOperationalAttributesAction() ) );
@@ -357,6 +362,7 @@
         exportMenuManager.add( new Separator() );
         exportMenuManager.add( browserActionMap.get( exportCsvAction ) );
         exportMenuManager.add( browserActionMap.get( exportExcelAction ) );
+        exportMenuManager.add( browserActionMap.get( exportOdfAction ) );
         menuManager.add( exportMenuManager );
         menuManager.add( new Separator() );
 

Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/connection/ConnectionViewActionGroup.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/connection/ConnectionViewActionGroup.java?rev=792280&r1=792279&r2=792280&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/connection/ConnectionViewActionGroup.java (original)
+++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/connection/ConnectionViewActionGroup.java Wed Jul  8 19:36:19 2009
@@ -68,6 +68,9 @@
     /** The Constant exportExcelAction. */
     private static final String exportExcelAction = "exportExcelAction"; //$NON-NLS-1$
 
+    /** The Constant exportOdfAction. */
+    private static final String exportOdfAction = "exportOdfAction"; //$NON-NLS-1$
+
     /** The Constant importConnectionsAction. */
     private static final String importConnectionsAction = "importConnectionsAction"; //$NON-NLS-1$
 
@@ -103,6 +106,8 @@
             ImportExportAction.TYPE_EXPORT_CSV ) ) );
         connectionActionMap.put( exportExcelAction, new ConnectionViewActionProxy( viewer, this,
             new ImportExportAction( ImportExportAction.TYPE_EXPORT_EXCEL ) ) );
+        connectionActionMap.put( exportOdfAction, new ConnectionViewActionProxy( viewer, this,
+            new ImportExportAction( ImportExportAction.TYPE_EXPORT_ODF ) ) );
         connectionActionMap.put( importConnectionsAction, new ConnectionViewActionProxy( viewer, this,
             new ImportConnectionsAction() ) );
         connectionActionMap.put( exportConnectionsAction, new ConnectionViewActionProxy( viewer, this,
@@ -174,6 +179,7 @@
         exportMenuManager.add( new Separator() );
         exportMenuManager.add( ( IAction ) connectionActionMap.get( exportCsvAction ) );
         exportMenuManager.add( ( IAction ) connectionActionMap.get( exportExcelAction ) );
+        exportMenuManager.add( ( IAction ) connectionActionMap.get( exportOdfAction ) );
         exportMenuManager.add( new Separator() );
         exportMenuManager.add( ( IAction ) connectionActionMap.get( exportConnectionsAction ) );
         exportMenuManager.add( new Separator() );

Added: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportOdfFromWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportOdfFromWizardPage.java?rev=792280&view=auto
==============================================================================
--- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportOdfFromWizardPage.java (added)
+++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportOdfFromWizardPage.java Wed Jul  8 19:36:19 2009
@@ -0,0 +1,77 @@
+/*
+ *  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.ldapbrowser.ui.wizards;
+
+
+import org.apache.directory.studio.ldapbrowser.common.widgets.search.SearchPageWrapper;
+import org.apache.directory.studio.ldapbrowser.ui.BrowserUIConstants;
+import org.apache.directory.studio.ldapbrowser.ui.BrowserUIPlugin;
+
+
+/**
+ * This class implements the page used to select the data to export to ODF.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
+ */
+public class ExportOdfFromWizardPage extends ExportBaseFromWizardPage
+{
+
+    /**
+     * Creates a new instance of ExportOdfFromWizardPage using a 
+     * {@link SearchPageWrapper} with
+     * <ul> 
+     * <li>hidden name
+     * <li>visible and checked return DN checkbox
+     * <li>visible all attributes checkbox
+     * <li>visible operational attributes checkbox
+     * </ul> 
+     * 
+     * @param pageName the page name
+     * @param wizard the wizard
+     */
+    public ExportOdfFromWizardPage( String pageName, ExportBaseWizard wizard )
+    {
+        super( pageName, wizard, new SearchPageWrapper(
+            SearchPageWrapper.NAME_INVISIBLE
+                | SearchPageWrapper.RETURN_DN_VISIBLE
+                | SearchPageWrapper.RETURN_DN_CHECKED
+                | SearchPageWrapper.RETURN_ALLATTRIBUTES_VISIBLE
+                | SearchPageWrapper.RETURN_OPERATIONALATTRIBUTES_VISIBLE
+                | ( ( wizard.getSearch().getReturningAttributes() == null || wizard.getSearch()
+                    .getReturningAttributes().length == 0 ) ? SearchPageWrapper.RETURN_ALLATTRIBUTES_CHECKED
+                    : SearchPageWrapper.NONE ) ) );
+        super.setImageDescriptor( BrowserUIPlugin.getDefault().getImageDescriptor(
+            BrowserUIConstants.IMG_EXPORT_ODF_WIZARD ) );
+    }
+
+
+    /**
+     * Checks if the DNs should be exported.
+     * 
+     * @return true, if the DNs should be exported
+     */
+    public boolean isExportDn()
+    {
+        return spw.isReturnDn();
+    }
+
+}

Added: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportOdfToWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportOdfToWizardPage.java?rev=792280&view=auto
==============================================================================
--- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportOdfToWizardPage.java (added)
+++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportOdfToWizardPage.java Wed Jul  8 19:36:19 2009
@@ -0,0 +1,107 @@
+/*
+ *  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.ldapbrowser.ui.wizards;
+
+
+import org.apache.directory.studio.ldapbrowser.common.dialogs.preferences.TextFormatsPreferencePage;
+import org.apache.directory.studio.connection.ui.widgets.BaseWidgetUtils;
+import org.apache.directory.studio.ldapbrowser.ui.BrowserUIConstants;
+import org.apache.directory.studio.ldapbrowser.ui.BrowserUIPlugin;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Link;
+import org.eclipse.ui.dialogs.PreferencesUtil;
+
+
+/**
+ * This class implements the page to select the target ODF file.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
+ */
+public class ExportOdfToWizardPage extends ExportBaseToPage
+{
+
+    /** The extensions used by ODF files */
+    private static final String[] EXTENSIONS = new String[]
+        { "*.ods", "*.*" }; //$NON-NLS-1$ //$NON-NLS-2$
+
+
+    /**
+     * Creates a new instance of ExportOdfToWizardPage.
+     * 
+     * @param pageName the page name
+     * @param wizard the wizard
+     */
+    public ExportOdfToWizardPage( String pageName, ExportBaseWizard wizard )
+    {
+        super( pageName, wizard );
+        setImageDescriptor( BrowserUIPlugin.getDefault().getImageDescriptor( BrowserUIConstants.IMG_EXPORT_ODF_WIZARD ) );
+    }
+
+
+    /**
+     * {@inheritDoc}
+     */
+    public void createControl( Composite parent )
+    {
+        final Composite composite = BaseWidgetUtils.createColumnContainer( parent, 3, 1 );
+        super.createControl( composite );
+
+        BaseWidgetUtils.createSpacer( composite, 3 );
+
+        BaseWidgetUtils.createSpacer( composite, 1 );
+        String text = Messages.getString( "ExportOdfToWizardPage.SeeTextFormats" ); //$NON-NLS-1$
+        Link link = BaseWidgetUtils.createLink( composite, text, 2 );
+        link.addSelectionListener( new SelectionAdapter()
+        {
+            public void widgetSelected( SelectionEvent e )
+            {
+                PreferencesUtil.createPreferenceDialogOn( getShell(), BrowserUIConstants.PREFERENCEPAGEID_TEXTFORMATS,
+                    null, TextFormatsPreferencePage.ODF_TAB ).open();
+            }
+        } );
+
+        BaseWidgetUtils.createSpacer( composite, 3 );
+        BaseWidgetUtils.createSpacer( composite, 1 );
+        BaseWidgetUtils.createWrappedLabel( composite, Messages.getString( "ExportOdfToWizardPage.WarningOdf" ), 2 ); //$NON-NLS-1$
+    }
+
+
+    /**
+     * {@inheritDoc}
+     */
+    protected String[] getExtensions()
+    {
+        return EXTENSIONS;
+    }
+
+
+    /**
+     * {@inheritDoc}
+     */
+    protected String getFileType()
+    {
+        return Messages.getString( "ExportOdfToWizardPage.Odf" ); //$NON-NLS-1$
+    }
+
+}

Added: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportOdfWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportOdfWizard.java?rev=792280&view=auto
==============================================================================
--- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportOdfWizard.java (added)
+++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportOdfWizard.java Wed Jul  8 19:36:19 2009
@@ -0,0 +1,109 @@
+/*
+ *  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.ldapbrowser.ui.wizards;
+
+
+import org.apache.directory.studio.ldapbrowser.core.jobs.ExportOdfJob;
+import org.apache.directory.studio.ldapbrowser.ui.BrowserUIConstants;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.PlatformUI;
+
+
+/**
+ * This class implements the Wizard for Exporting to ODF.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
+ */
+public class ExportOdfWizard extends ExportBaseWizard
+{
+
+    /** The from page, used to select the exported data. */
+    private ExportOdfFromWizardPage fromPage;
+
+    /** The to page, used to select the target file. */
+    private ExportOdfToWizardPage toPage;
+
+
+    /**
+     * Creates a new instance of ExportOdfWizard.
+     */
+    public ExportOdfWizard()
+    {
+        super( Messages.getString( "ExportOdfWizard.OdfExport" ) ); //$NON-NLS-1$
+    }
+
+
+    /**
+     * Gets the ID of the Export ODF Wizard
+     * 
+     * @return The ID of the Export ODF Wizard
+     */
+    public static String getId()
+    {
+        return BrowserUIConstants.WIZARD_EXPORT_ODF;
+    }
+
+
+    /**
+     * {@inheritDoc}
+     */
+    public void addPages()
+    {
+        fromPage = new ExportOdfFromWizardPage( ExportOdfFromWizardPage.class.getName(), this );
+        addPage( fromPage );
+        toPage = new ExportOdfToWizardPage( ExportOdfToWizardPage.class.getName(), this );
+        addPage( toPage );
+    }
+
+
+    /**
+     * {@inheritDoc}
+     */
+    public void createPageControls( Composite pageContainer )
+    {
+        super.createPageControls( pageContainer );
+
+        // set help context ID
+        PlatformUI.getWorkbench().getHelpSystem().setHelp( fromPage.getControl(),
+            BrowserUIConstants.PLUGIN_ID + "." + "tools_odfexport_wizard" ); //$NON-NLS-1$ //$NON-NLS-2$
+        PlatformUI.getWorkbench().getHelpSystem().setHelp( toPage.getControl(),
+            BrowserUIConstants.PLUGIN_ID + "." + "tools_odfexport_wizard" ); //$NON-NLS-1$ //$NON-NLS-2$
+    }
+
+
+    /**
+     * {@inheritDoc}
+     */
+    public boolean performFinish()
+    {
+        fromPage.saveDialogSettings();
+        toPage.saveDialogSettings();
+        boolean exportDn = this.fromPage.isExportDn();
+
+        ExportOdfJob eoj = new ExportOdfJob( exportFilename, search.getBrowserConnection(),
+            search.getSearchParameter(), exportDn );
+        eoj.execute();
+
+        return true;
+    }
+
+}

Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/messages.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/messages.properties?rev=792280&r1=792279&r2=792280&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/messages.properties (original)
+++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/messages.properties Wed Jul  8 19:36:19 2009
@@ -79,6 +79,10 @@
 ExportExcelToWizardPage.SeeTextFormats=See <a>Text Formats</a> for Excel file format preferences.
 ExportExcelToWizardPage.WarningExcel=Warning\: Excel export is memory intensive\! Maximum number of exportable entries is limited to 65000\!
 ExportExcelWizard.ExcelExport=Excel Export
+ExportOdfToWizardPage.Odf=ODF
+ExportOdfToWizardPage.SeeTextFormats=See <a>Text Formats</a> for ODF file format preferences.
+ExportOdfToWizardPage.WarningOdf=Warning\: ODF export is memory intensive\! Maximum number of exportable entries is limited to 65000\!
+ExportOdfWizard.OdfExport=ODF Export
 ExportLdifToWizardPage.LDIF=LDIF
 ExportLdifToWizardPage.SeeTextFormats=See <a>Text Formats</a> for LDIF file format preferences.
 ExportLdifWizard.LDIFExport=LDIF Export

Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/messages_de.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/messages_de.properties?rev=792280&r1=792279&r2=792280&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/messages_de.properties (original)
+++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/messages_de.properties Wed Jul  8 19:36:19 2009
@@ -67,6 +67,8 @@
 ExportDsmlToWizardPage.SearchSaveAsResponse=Die Suche wird als Antwort auf eine DSML-Anfrage gespeichert werden.
 ExportExcelToWizardPage.SeeTextFormats=F\u00FCr Excel Datei-Format Pr\u00E4ferenzen siehe <a>Text Formats</a>.
 ExportExcelToWizardPage.WarningExcel=Warnung\: Exportieren nach Excel ist speicherintensiv\! Die maximale Anzahl exportierbarer Eintr\u00E4ge ist auf 65000 beschr\u00E4nkt\!
+ExportOdfToWizardPage.SeeTextFormats=F\u00FCr ODF Datei-Format Pr\u00E4ferenzen siehe <a>Text Formats</a>.
+ExportOdfToWizardPage.WarningOdf=Warnung\: Exportieren nach ODF ist speicherintensiv\! Die maximale Anzahl exportierbarer Eintr\u00E4ge ist auf 65000 beschr\u00E4nkt\!
 ExportLdifToWizardPage.SeeTextFormats=F\u00FCr LDIF Datei-Format Pr\u00E4ferenzen siehe <a>Text Formats</a>.
 ExportModificationLogsWizard.CantExportModificationLogs=Kann \u00C4nderungs-Logs nicht exportieren
 ExportModificationLogsWizard.ExportModificationLogs=\u00C4nderungs-Logs exportieren

Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/messages_fr.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/messages_fr.properties?rev=792280&r1=792279&r2=792280&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/messages_fr.properties (original)
+++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/messages_fr.properties Wed Jul  8 19:36:19 2009
@@ -87,6 +87,9 @@
 
 ExportExcelWizard.ExcelExport=Export Excel\u0099
 
+ExportOdfToWizardPage.SeeTextFormats=Se r\u00E9f\u00E9rer aux  <a>Formats de textes</a> pour g\u00E9rer les pr\u00E9f\u00E9rences des fichiers ODF.
+ExportOdfToWizardPage.WarningOdf=Attention : Les exports ODF sont consommateurs en m\u00E9moire. Iln'es paspossible d'eporter plus de 65 000 entr\u00E9es\!
+
 ExportLdifToWizardPage.LDIF=LDIF
 ExportLdifToWizardPage.SeeTextFormats=Se r\u00E9f\u00E9rer aux  <a>Formats de textes</a> pour g\u00E9rer les pr\u00E9f\u00E9rences des fichiers LDIF.
 

Modified: directory/studio/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/pom.xml?rev=792280&r1=792279&r2=792280&view=diff
==============================================================================
--- directory/studio/trunk/pom.xml (original)
+++ directory/studio/trunk/pom.xml Wed Jul  8 19:36:19 2009
@@ -1005,7 +1005,7 @@
       <dependency>
         <groupId>xerces</groupId>
         <artifactId>xercesImpl</artifactId>
-        <version>2.0.2</version>
+        <version>2.9.1</version>
       </dependency>
       <dependency>
         <groupId>checkstyle</groupId>

Added: directory/studio/trunk/repository/org/openoffice/odfdom/0.6.16/odfdom-0.6.16.jar
URL: http://svn.apache.org/viewvc/directory/studio/trunk/repository/org/openoffice/odfdom/0.6.16/odfdom-0.6.16.jar?rev=792280&view=auto
==============================================================================
Binary file - no diff available.

Propchange: directory/studio/trunk/repository/org/openoffice/odfdom/0.6.16/odfdom-0.6.16.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: directory/studio/trunk/repository/org/openoffice/odfdom/0.6.16/odfdom-0.6.16.jar.md5
URL: http://svn.apache.org/viewvc/directory/studio/trunk/repository/org/openoffice/odfdom/0.6.16/odfdom-0.6.16.jar.md5?rev=792280&view=auto
==============================================================================
--- directory/studio/trunk/repository/org/openoffice/odfdom/0.6.16/odfdom-0.6.16.jar.md5 (added)
+++ directory/studio/trunk/repository/org/openoffice/odfdom/0.6.16/odfdom-0.6.16.jar.md5 Wed Jul  8 19:36:19 2009
@@ -0,0 +1 @@
+4eb31040983453c06cbd5fa632da5094
\ No newline at end of file

Added: directory/studio/trunk/repository/org/openoffice/odfdom/0.6.16/odfdom-0.6.16.jar.sha1
URL: http://svn.apache.org/viewvc/directory/studio/trunk/repository/org/openoffice/odfdom/0.6.16/odfdom-0.6.16.jar.sha1?rev=792280&view=auto
==============================================================================
--- directory/studio/trunk/repository/org/openoffice/odfdom/0.6.16/odfdom-0.6.16.jar.sha1 (added)
+++ directory/studio/trunk/repository/org/openoffice/odfdom/0.6.16/odfdom-0.6.16.jar.sha1 Wed Jul  8 19:36:19 2009
@@ -0,0 +1 @@
+e1a11420effae03d9c43507783dc291a7cda80d1
\ No newline at end of file

Added: directory/studio/trunk/repository/org/openoffice/odfdom/0.6.16/odfdom-0.6.16.pom
URL: http://svn.apache.org/viewvc/directory/studio/trunk/repository/org/openoffice/odfdom/0.6.16/odfdom-0.6.16.pom?rev=792280&view=auto
==============================================================================
--- directory/studio/trunk/repository/org/openoffice/odfdom/0.6.16/odfdom-0.6.16.pom (added)
+++ directory/studio/trunk/repository/org/openoffice/odfdom/0.6.16/odfdom-0.6.16.pom Wed Jul  8 19:36:19 2009
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.openoffice</groupId>
+  <artifactId>odfdom</artifactId>
+  <version>0.6.16</version>
+</project>

Added: directory/studio/trunk/repository/org/openoffice/odfdom/0.6.16/odfdom-0.6.16.pom.md5
URL: http://svn.apache.org/viewvc/directory/studio/trunk/repository/org/openoffice/odfdom/0.6.16/odfdom-0.6.16.pom.md5?rev=792280&view=auto
==============================================================================
--- directory/studio/trunk/repository/org/openoffice/odfdom/0.6.16/odfdom-0.6.16.pom.md5 (added)
+++ directory/studio/trunk/repository/org/openoffice/odfdom/0.6.16/odfdom-0.6.16.pom.md5 Wed Jul  8 19:36:19 2009
@@ -0,0 +1 @@
+9c14ef8445717b5573f650f8c8a51d48
\ No newline at end of file

Added: directory/studio/trunk/repository/org/openoffice/odfdom/0.6.16/odfdom-0.6.16.pom.sha1
URL: http://svn.apache.org/viewvc/directory/studio/trunk/repository/org/openoffice/odfdom/0.6.16/odfdom-0.6.16.pom.sha1?rev=792280&view=auto
==============================================================================
--- directory/studio/trunk/repository/org/openoffice/odfdom/0.6.16/odfdom-0.6.16.pom.sha1 (added)
+++ directory/studio/trunk/repository/org/openoffice/odfdom/0.6.16/odfdom-0.6.16.pom.sha1 Wed Jul  8 19:36:19 2009
@@ -0,0 +1 @@
+1ea2c71e503bbf1a792a724c848e5d2ad4c4b6b5
\ No newline at end of file

Added: directory/studio/trunk/repository/org/openoffice/odfdom/maven-metadata.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/repository/org/openoffice/odfdom/maven-metadata.xml?rev=792280&view=auto
==============================================================================
--- directory/studio/trunk/repository/org/openoffice/odfdom/maven-metadata.xml (added)
+++ directory/studio/trunk/repository/org/openoffice/odfdom/maven-metadata.xml Wed Jul  8 19:36:19 2009
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata xsi:schemaLocation="http://maven.apache.org/METADATA/1.0.0 http://maven.apache.org/xsd/metadata-1.0.0.xsd" xmlns="http://maven.apache.org/METADATA/1.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <groupId>org.openoffice</groupId>
+  <artifactId>odfdom</artifactId>
+  <version>0.6.16</version>
+  <versioning>
+    <versions>
+      <version>0.6.16</version>
+    </versions>
+    <lastUpdated>20090708115823</lastUpdated>
+  </versioning>
+</metadata>

Added: directory/studio/trunk/repository/org/openoffice/odfdom/maven-metadata.xml.md5
URL: http://svn.apache.org/viewvc/directory/studio/trunk/repository/org/openoffice/odfdom/maven-metadata.xml.md5?rev=792280&view=auto
==============================================================================
--- directory/studio/trunk/repository/org/openoffice/odfdom/maven-metadata.xml.md5 (added)
+++ directory/studio/trunk/repository/org/openoffice/odfdom/maven-metadata.xml.md5 Wed Jul  8 19:36:19 2009
@@ -0,0 +1 @@
+4a0cef6b07cc543431413dd18fb5f8bf
\ No newline at end of file

Added: directory/studio/trunk/repository/org/openoffice/odfdom/maven-metadata.xml.sha1
URL: http://svn.apache.org/viewvc/directory/studio/trunk/repository/org/openoffice/odfdom/maven-metadata.xml.sha1?rev=792280&view=auto
==============================================================================
--- directory/studio/trunk/repository/org/openoffice/odfdom/maven-metadata.xml.sha1 (added)
+++ directory/studio/trunk/repository/org/openoffice/odfdom/maven-metadata.xml.sha1 Wed Jul  8 19:36:19 2009
@@ -0,0 +1 @@
+b6275d089bac3339eb8ea372ae16ca0950517ae2
\ No newline at end of file



Mime
View raw message