Return-Path: 
 <commits-return-11690-apmail-directory-commits-archive=directory.apache.org@directory.apache.org>
Delivered-To: apmail-directory-commits-archive@www.apache.org
Received: (qmail 51281 invoked from network); 1 Jan 2007 23:50:55 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 1 Jan 2007 23:50:55 -0000
Received: (qmail 72922 invoked by uid 500); 1 Jan 2007 23:51:01 -0000
Delivered-To: apmail-directory-commits-archive@directory.apache.org
Received: (qmail 72871 invoked by uid 500); 1 Jan 2007 23:51:01 -0000
Mailing-List: contact commits-help@directory.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@directory.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@directory.apache.org>
List-Post: <mailto:commits@directory.apache.org>
List-Id: <commits.directory.apache.org>
Reply-To: dev@directory.apache.org
Delivered-To: mailing list commits@directory.apache.org
Received: (qmail 72844 invoked by uid 99); 1 Jan 2007 23:51:01 -0000
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Jan 2007 15:50:59 -0800
Received: by eris.apache.org (Postfix, from userid 65534)
	id B9ECD1A981A; Mon,  1 Jan 2007 15:29:45 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r491700 -
 /directory/trunks/ldapstudio/ldapstudio-browser-ui/plugin.xml
Date: Mon, 01 Jan 2007 23:29:45 -0000
To: commits@directory.apache.org
From: seelmann@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070101232945.B9ECD1A981A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: seelmann
Date: Mon Jan  1 15:29:43 2007
New Revision: 491700

URL: http://svn.apache.org/viewvc?view=rev&rev=491700
Log:
Added categories for new/import/export wizards; removed search actionSet

Modified:
    directory/trunks/ldapstudio/ldapstudio-browser-ui/plugin.xml

Modified: directory/trunks/ldapstudio/ldapstudio-browser-ui/plugin.xml
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-ui/plugin.xml?view=diff&rev=491700&r1=491699&r2=491700
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-ui/plugin.xml (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-ui/plugin.xml Mon Jan  1 15:29:43 2007
@@ -10,13 +10,12 @@
             class="org.apache.directory.ldapstudio.browser.ui.perspective.BrowserPerspective"
             fixed="false"
             name="LDAP"
-            id="org.apache.directory.ldapstudio.browser.ui.perspective.BroserPerspective"/>
+            id="org.apache.directory.ldapstudio.browser.ui.perspective.BrowserPerspective"/>
    </extension>
     <extension
        point="org.eclipse.ui.perspectiveExtensions">
     <perspectiveExtension targetID="org.apache.directory.ldapstudio.browser.ui.perspective.BrowserPerspective">
        <actionSet id="org.apache.directory.ldapstudio.browser.ldapMenuActionSet"/>
-       <actionSet id="org.apache.directory.ldapstudio.browser.ldapSearchActionSet"/>
     </perspectiveExtension>
  </extension>
  <extension
@@ -78,10 +77,10 @@
    <extension
          point="org.eclipse.ui.newWizards">
       <category
-            name="LDAP Browser and Editor"
-            id="org.apache.directory.ldapstudio.browser.ui.wizards.category"/>
+            name="LDAP Browser"
+            id="org.apache.directory.ldapstudio.browser.ui.newWizards.category"/>
       <wizard
-            category="org.apache.directory.ldapstudio.browser.ui.wizards.category"
+            category="org.apache.directory.ldapstudio.browser.ui.newWizards.category"
             class="org.apache.directory.ldapstudio.browser.ui.wizards.NewConnectionWizard"
             hasPages="true"
             icon="icons/connection_add.gif"
@@ -89,7 +88,7 @@
             name="LDAP Connection"
             project="false"/>
       <wizard
-            category="org.apache.directory.ldapstudio.browser.ui.wizards.category"
+            category="org.apache.directory.ldapstudio.browser.ui.newWizards.category"
             class="org.apache.directory.ldapstudio.browser.ui.wizards.NewEntryWizard"
             hasPages="true"
             icon="icons/entry_add.gif"
@@ -98,7 +97,7 @@
             project="false"/>
       <wizard
             canFinishEarly="true"
-            category="org.apache.directory.ldapstudio.browser.ui.wizards.category"
+            category="org.apache.directory.ldapstudio.browser.ui.newWizards.category"
             class="org.apache.directory.ldapstudio.browser.ui.wizards.NewSearchWizard"
             hasPages="false"
             icon="icons/search_new.gif"
@@ -106,7 +105,7 @@
             name="LDAP Search"
             project="false"/>
       <wizard
-            category="org.apache.directory.ldapstudio.browser.ui.wizards.category"
+            category="org.apache.directory.ldapstudio.browser.ui.newWizards.category"
             class="org.apache.directory.ldapstudio.browser.ui.wizards.NewBookmarkWizard"
             hasPages="true"
             icon="icons/bookmark_add.gif"
@@ -114,7 +113,7 @@
             name="LDAP Bookmark"
             project="false"/>
       <wizard
-            category="org.apache.directory.ldapstudio.browser.ui.wizards.category"
+            category="org.apache.directory.ldapstudio.browser.ui.newWizards.category"
             class="org.apache.directory.ldapstudio.browser.ui.wizards.BatchOperationWizard"
             hasPages="true"
             icon="icons/batch.gif"
@@ -123,7 +122,7 @@
             project="false"/>
       <wizard
             canFinishEarly="true"
-            category="org.apache.directory.ldapstudio.browser.ui.wizards.category"
+            category="org.apache.directory.ldapstudio.browser.ui.newWizards.category"
             class="org.apache.directory.ldapstudio.browser.ui.wizards.NewLdifFileWizard"
             hasPages="false"
             icon="icons/ldifeditor_new.gif"
@@ -133,7 +132,11 @@
    </extension>
  <extension
        point="org.eclipse.ui.importWizards">
+    <category
+          id="ldapstudio-browser-ui.category1org.apache.directory.ldapstudio.browser.ui.importWizards.category"
+          name="LDAP Browser"/>
     <wizard
+          category="ldapstudio-browser-ui.category1org.apache.directory.ldapstudio.browser.ui.importWizards.category"
           class="org.apache.directory.ldapstudio.browser.ui.wizards.ImportLdifWizard"
           icon="icons/import_ldif.gif"
           id="org.apache.directory.ldapstudio.browser.ui.wizards.ImportLdifWizard"
@@ -145,6 +148,7 @@
        <selection class="org.apache.directory.ldapstudio.browser.core.model.IEntry"/>
     </wizard>
     <wizard
+          category="ldapstudio-browser-ui.category1org.apache.directory.ldapstudio.browser.ui.importWizards.category"
           class="org.apache.directory.ldapstudio.browser.ui.wizards.ImportDsmlWizard"
           icon="icons/import_dsml.gif"
           id="org.apache.directory.ldapstudio.browser.ui.wizards.ImportDsmlWizard"
@@ -158,7 +162,11 @@
  </extension>
  <extension
        point="org.eclipse.ui.exportWizards">
+    <category
+          id="org.apache.directory.ldapstudio.browser.ui.exportWizards.category"
+          name="LDAP Browser"/>
     <wizard
+          category="org.apache.directory.ldapstudio.browser.ui.exportWizards.category"
           class="org.apache.directory.ldapstudio.browser.ui.wizards.ExportLdifWizard"
           icon="icons/export_ldif.gif"
           id="org.apache.directory.ldapstudio.browser.ui.wizards.ExportLdifWizard"
@@ -170,6 +178,7 @@
        <selection class="org.apache.directory.ldapstudio.browser.core.model.IEntry"/>
     </wizard>
     <wizard
+          category="org.apache.directory.ldapstudio.browser.ui.exportWizards.category"
           class="org.apache.directory.ldapstudio.browser.ui.wizards.ExportDsmlWizard"
           icon="icons/export_dsml.gif"
           id="org.apache.directory.ldapstudio.browser.ui.wizards.ExportDdsmlWizard"
@@ -181,6 +190,7 @@
        <selection class="org.apache.directory.ldapstudio.browser.core.model.IEntry"/>
     </wizard>
     <wizard
+          category="org.apache.directory.ldapstudio.browser.ui.exportWizards.category"
           class="org.apache.directory.ldapstudio.browser.ui.wizards.ExportCsvWizard"
           icon="icons/export_csv.gif"
           id="org.apache.directory.ldapstudio.browser.ui.wizards.ExportCsvWizard"
@@ -192,6 +202,7 @@
        <selection class="org.apache.directory.ldapstudio.browser.core.model.IEntry"/>
     </wizard>
     <wizard
+          category="org.apache.directory.ldapstudio.browser.ui.exportWizards.category"
           class="org.apache.directory.ldapstudio.browser.ui.wizards.ExportExcelWizard"
           icon="icons/export_xls.gif"
           id="org.apache.directory.ldapstudio.browser.ui.wizards.ExportExcelWizard"
@@ -412,28 +423,6 @@
       </extension>
  <extension
        point="org.eclipse.ui.actionSets">
-    <actionSet
-          id="org.apache.directory.ldapstudio.browser.ldapSearchActionSet"
-          label="LDAP Search"
-          visible="false">
-          <menu
-	            id="org.eclipse.search.menu"
-	            label="%searchMenu.label"
-	            path="navigate">
-				<groupMarker name="internalDialogGroup"/>   <!-- not to be used by clients  -->
-				<groupMarker name="dialogGroup"/>           <!-- to be used by clients      -->
-	         	<separator name="contextMenuActionsGroup"/>
-				<separator name="internalOccurrencesGroup"/> <!-- not to be used by clients  -->
-	      	</menu>
-	      	
-       <action
-             class="org.apache.directory.ldapstudio.browser.ui.actions.OpenSearchAction"
-             icon="icons/browser_searchresulteditor.gif"
-             id="org.apache.directory.ldapstudio.browser.ui.actions.OpenSearchAction"
-             label="%openLDAPSearchPageAction.label"
-             menubarPath="org.eclipse.search.menu/dialogGroup"
-             style="push"/>
-    </actionSet>
     <actionSet
           id="org.apache.directory.ldapstudio.browser.ldapMenuActionSet"
           label="LDAP Menu"