directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r812226 - in /directory/studio/trunk: ./ apacheds/ common-ui/ common-ui/src/ common-ui/src/main/ common-ui/src/main/java/ common-ui/src/main/java/org/ common-ui/src/main/java/org/apache/ common-ui/src/main/java/org/apache/directory/ common-...
Date Mon, 07 Sep 2009 17:12:29 GMT
Author: pamarcelot
Date: Mon Sep  7 17:12:28 2009
New Revision: 812226

URL: http://svn.apache.org/viewvc?rev=812226&view=rev
Log:
Fix for DIRSTUDIO-534 (Re-order the preference pages for better understanding).

Added:
    directory/studio/trunk/common-ui/
    directory/studio/trunk/common-ui/plugin.properties
    directory/studio/trunk/common-ui/plugin.xml
    directory/studio/trunk/common-ui/pom.xml
    directory/studio/trunk/common-ui/src/
    directory/studio/trunk/common-ui/src/main/
    directory/studio/trunk/common-ui/src/main/java/
    directory/studio/trunk/common-ui/src/main/java/org/
    directory/studio/trunk/common-ui/src/main/java/org/apache/
    directory/studio/trunk/common-ui/src/main/java/org/apache/directory/
    directory/studio/trunk/common-ui/src/main/java/org/apache/directory/studio/
    directory/studio/trunk/common-ui/src/main/java/org/apache/directory/studio/common/
    directory/studio/trunk/common-ui/src/main/java/org/apache/directory/studio/common/Messages.java
    directory/studio/trunk/common-ui/src/main/java/org/apache/directory/studio/common/StudioPreferencePage.java
    directory/studio/trunk/common-ui/src/main/java/org/apache/directory/studio/common/messages.properties
    directory/studio/trunk/common-ui/src/main/java/org/apache/directory/studio/common/messages_de.properties
    directory/studio/trunk/common-ui/src/main/java/org/apache/directory/studio/common/messages_fr.properties
    directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/ViewsPreferencePage.java
Modified:
    directory/studio/trunk/apacheds/plugin.properties
    directory/studio/trunk/apacheds/plugin.xml
    directory/studio/trunk/connection-ui/plugin.properties
    directory/studio/trunk/connection-ui/plugin.xml
    directory/studio/trunk/ldapbrowser-common/plugin.properties
    directory/studio/trunk/ldapbrowser-common/plugin.xml
    directory/studio/trunk/ldapbrowser-common/plugin_de.properties
    directory/studio/trunk/ldapbrowser-common/plugin_fr.properties
    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-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/ldifeditor/plugin.properties
    directory/studio/trunk/ldifeditor/plugin.xml
    directory/studio/trunk/pom.xml
    directory/studio/trunk/schemaeditor/plugin.properties
    directory/studio/trunk/schemaeditor/plugin.xml
    directory/studio/trunk/studio/pom.xml

Modified: directory/studio/trunk/apacheds/plugin.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds/plugin.properties?rev=812226&r1=812225&r2=812226&view=diff
==============================================================================
--- directory/studio/trunk/apacheds/plugin.properties (original)
+++ directory/studio/trunk/apacheds/plugin.properties Mon Sep  7 17:12:28 2009
@@ -17,6 +17,8 @@
 
 Plugin_id=org.apache.directory.studio.apacheds
 
+Pref_StudioPage_id=org.apache.directory.studio.StudioPreferencePage
+
 Pref_MainPage_id=org.apache.directory.studio.apacheds.prefs.MainPage
 Pref_MainPage_name=Apache DS
 

Modified: directory/studio/trunk/apacheds/plugin.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds/plugin.xml?rev=812226&r1=812225&r2=812226&view=diff
==============================================================================
--- directory/studio/trunk/apacheds/plugin.xml (original)
+++ directory/studio/trunk/apacheds/plugin.xml Mon Sep  7 17:12:28 2009
@@ -22,13 +22,8 @@
       <page
             class="org.apache.directory.studio.apacheds.prefs.MainPage"
             id="%Pref_MainPage_id"
-            name="%Pref_MainPage_name">
-      </page>
-      <page
-            class="org.apache.directory.studio.apacheds.prefs.ColorsAndFontsPage"
-            id="%Pref_ColorsAndFontsPage_id"
-            name="%Pref_ColorsAndFontsPage_name"
-            category="%Pref_MainPage_id">
+            name="%Pref_MainPage_name"
+            category="%Pref_StudioPage_id">
       </page>
       <page
             class="org.apache.directory.studio.apacheds.prefs.ServerLogsPage"
@@ -36,6 +31,12 @@
             name="%Pref_ServerLogsPage_name"
             category="%Pref_MainPage_id">
       </page>
+      <page
+            class="org.apache.directory.studio.apacheds.prefs.ColorsAndFontsPage"
+            id="%Pref_ColorsAndFontsPage_id"
+            name="%Pref_ColorsAndFontsPage_name"
+            category="%Pref_ServerLogsPage_id">
+      </page>
    </extension>
    <extension
          point="org.eclipse.core.runtime.preferences">

Added: directory/studio/trunk/common-ui/plugin.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/common-ui/plugin.properties?rev=812226&view=auto
==============================================================================
--- directory/studio/trunk/common-ui/plugin.properties (added)
+++ directory/studio/trunk/common-ui/plugin.properties Mon Sep  7 17:12:28 2009
@@ -0,0 +1,19 @@
+# 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.
+
+Pref_StudioPage_id=org.apache.directory.studio.StudioPreferencePage
+Pref_StudioPage_name=Apache Directory Studio

Added: directory/studio/trunk/common-ui/plugin.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/common-ui/plugin.xml?rev=812226&view=auto
==============================================================================
--- directory/studio/trunk/common-ui/plugin.xml (added)
+++ directory/studio/trunk/common-ui/plugin.xml Mon Sep  7 17:12:28 2009
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+<!--
+  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.
+-->
+<plugin>
+   <extension
+         point="org.eclipse.ui.preferencePages">
+      <page
+            class="org.apache.directory.studio.common.StudioPreferencePage"
+            id="%Pref_StudioPage_id"
+            name="%Pref_StudioPage_name">
+      </page>
+   </extension>
+</plugin>

Added: directory/studio/trunk/common-ui/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/common-ui/pom.xml?rev=812226&view=auto
==============================================================================
--- directory/studio/trunk/common-ui/pom.xml (added)
+++ directory/studio/trunk/common-ui/pom.xml Mon Sep  7 17:12:28 2009
@@ -0,0 +1,198 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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.
+-->
+<!--
+  @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.directory.studio</groupId>
+    <artifactId>parent</artifactId>
+    <version>1.5.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>common.ui</artifactId>
+  <version>${common.ui.version}</version>
+  <name>Apache Directory Studio Common UI</name>
+  <packaging>jar</packaging>
+
+  <description />
+  
+  <build>
+    <resources>
+      <resource>
+        <directory>.</directory>
+        <includes>
+          <include>plugin*.properties</include>
+          <include>plugin.xml</include>
+        </includes>
+      </resource>
+      <resource>
+        <directory>resources</directory>
+        <targetPath>resources</targetPath>
+      </resource>
+      <resource>
+        <directory>src/main/resources</directory>
+      </resource>
+      <resource>
+        <directory>src/main/java</directory>
+        <includes>
+          <include>**/*.properties</include>
+        </includes>
+      </resource>
+    </resources>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-eclipse-plugin</artifactId>
+        <configuration>
+          <skip>false</skip>
+          <pde>true</pde>
+          <additionalProjectnatures>
+            <projectnature>org.eclipse.pde.PluginNature</projectnature>
+            <projectnature>org.eclipse.jdt.core.javanature</projectnature>
+          </additionalProjectnatures>
+          <additionalProjects>
+            <project>org.apache.directory.studio.connection.core</project>
+          </additionalProjects>
+          <classpathContainers>
+            <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer>
+            <classpathContainer>org.eclipse.pde.core.requiredPlugins</classpathContainer>
+          </classpathContainers>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.directory.studio</groupId>
+        <artifactId>studio-maven-plugin</artifactId>
+        <configuration>
+          <skip>false</skip>
+          <createManifest>true</createManifest>
+        </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>prepare-jar-package</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+            <addMavenDescriptor>false</addMavenDescriptor>
+          </archive>
+        </configuration>
+      </plugin>
+     <!-- MANIFEST.MF Generation -->
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <manifestLocation>META-INF</manifestLocation>
+          <instructions>            
+            <Bundle-SymbolicName>${groupId}.${artifactId};singleton:=true</Bundle-SymbolicName>
+            <Bundle-Localization>plugin</Bundle-Localization>
+            <Eclipse-LazyStart>true</Eclipse-LazyStart>
+            <Require-Bundle>org.eclipse.ui,
+ org.eclipse.core.runtime
+            </Require-Bundle>
+            <Export-Package>org.apache.directory.studio.*</Export-Package>
+            <Import-Package>!</Import-Package>
+            <Private-Package>!</Private-Package>
+          </instructions>
+        </configuration>
+        <executions>
+          <execution>
+            <id>generate-manifest</id>
+            <phase>process-classes</phase>
+            <goals>
+              <goal>manifest</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <!-- No tests to run -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+	<!-- Eclipse plugins dependencies -->
+    <dependency>
+      <groupId>org.eclipse.swt.gtk.linux</groupId>
+      <artifactId>x86</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.ui</groupId>
+      <artifactId>workbench</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.core</groupId>
+      <artifactId>commands</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.core</groupId>
+      <artifactId>runtime</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.core</groupId>
+      <artifactId>jobs</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.equinox</groupId>
+      <artifactId>registry</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.equinox</groupId>
+      <artifactId>common</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse</groupId>
+      <artifactId>osgi</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse</groupId>
+      <artifactId>jface</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse</groupId>
+      <artifactId>ui</artifactId>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+
+</project>
\ No newline at end of file

Added: directory/studio/trunk/common-ui/src/main/java/org/apache/directory/studio/common/Messages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/common-ui/src/main/java/org/apache/directory/studio/common/Messages.java?rev=812226&view=auto
==============================================================================
--- directory/studio/trunk/common-ui/src/main/java/org/apache/directory/studio/common/Messages.java (added)
+++ directory/studio/trunk/common-ui/src/main/java/org/apache/directory/studio/common/Messages.java Mon Sep  7 17:12:28 2009
@@ -0,0 +1,31 @@
+package org.apache.directory.studio.common;
+
+
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+
+public class Messages
+{
+    private static final String BUNDLE_NAME = "org.apache.directory.studio.common.messages"; //$NON-NLS-1$
+
+    private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle( BUNDLE_NAME );
+
+
+    private Messages()
+    {
+    }
+
+
+    public static String getString( String key )
+    {
+        try
+        {
+            return RESOURCE_BUNDLE.getString( key );
+        }
+        catch ( MissingResourceException e )
+        {
+            return '!' + key + '!';
+        }
+    }
+}

Added: directory/studio/trunk/common-ui/src/main/java/org/apache/directory/studio/common/StudioPreferencePage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/common-ui/src/main/java/org/apache/directory/studio/common/StudioPreferencePage.java?rev=812226&view=auto
==============================================================================
--- directory/studio/trunk/common-ui/src/main/java/org/apache/directory/studio/common/StudioPreferencePage.java (added)
+++ directory/studio/trunk/common-ui/src/main/java/org/apache/directory/studio/common/StudioPreferencePage.java Mon Sep  7 17:12:28 2009
@@ -0,0 +1,68 @@
+/*
+ *  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.common;
+
+
+import org.eclipse.jface.preference.PreferencePage;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPreferencePage;
+
+
+/**
+ * This class implements the "Apache Directory Studio" preference page.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
+ */
+public class StudioPreferencePage extends PreferencePage implements IWorkbenchPreferencePage
+{
+    /**
+     * Creates a new instance of StudioPreferencePage.
+     */
+    public StudioPreferencePage()
+    {
+        super( Messages.getString( "StudioPreferencePage.Title" ) ); //$NON-NLS-1$
+        setDescription( Messages.getString( "StudioPreferencePage.Description" ) ); //$NON-NLS-1$
+
+        // Removing Default and Apply buttons
+        noDefaultAndApplyButton();
+    }
+
+
+    /**
+     * {@inheritDoc}
+     */
+    protected Control createContents( Composite parent )
+    {
+        // Nothing to do
+        return parent;
+    }
+
+
+    /**
+     * {@inheritDoc}
+     */
+    public void init( IWorkbench workbench )
+    {
+        // Nothing to do
+    }
+}
\ No newline at end of file

Added: directory/studio/trunk/common-ui/src/main/java/org/apache/directory/studio/common/messages.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/common-ui/src/main/java/org/apache/directory/studio/common/messages.properties?rev=812226&view=auto
==============================================================================
--- directory/studio/trunk/common-ui/src/main/java/org/apache/directory/studio/common/messages.properties (added)
+++ directory/studio/trunk/common-ui/src/main/java/org/apache/directory/studio/common/messages.properties Mon Sep  7 17:12:28 2009
@@ -0,0 +1,18 @@
+# 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.
+StudioPreferencePage.Description=Expand the tree to edit preferences for a specific feature.
+StudioPreferencePage.Title=Apache Directory Studio

Added: directory/studio/trunk/common-ui/src/main/java/org/apache/directory/studio/common/messages_de.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/common-ui/src/main/java/org/apache/directory/studio/common/messages_de.properties?rev=812226&view=auto
==============================================================================
--- directory/studio/trunk/common-ui/src/main/java/org/apache/directory/studio/common/messages_de.properties (added)
+++ directory/studio/trunk/common-ui/src/main/java/org/apache/directory/studio/common/messages_de.properties Mon Sep  7 17:12:28 2009
@@ -0,0 +1,17 @@
+# 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.
+StudioPreferencePage.Description=TODO:Expand the tree to edit preferences for a specific feature.

Added: directory/studio/trunk/common-ui/src/main/java/org/apache/directory/studio/common/messages_fr.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/common-ui/src/main/java/org/apache/directory/studio/common/messages_fr.properties?rev=812226&view=auto
==============================================================================
--- directory/studio/trunk/common-ui/src/main/java/org/apache/directory/studio/common/messages_fr.properties (added)
+++ directory/studio/trunk/common-ui/src/main/java/org/apache/directory/studio/common/messages_fr.properties Mon Sep  7 17:12:28 2009
@@ -0,0 +1,17 @@
+# 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.
+StudioPreferencePage.Description=Déplier l'arbre pour modifier les préférences d'une fonctionnalité particulière.

Modified: directory/studio/trunk/connection-ui/plugin.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-ui/plugin.properties?rev=812226&r1=812225&r2=812226&view=diff
==============================================================================
--- directory/studio/trunk/connection-ui/plugin.properties (original)
+++ directory/studio/trunk/connection-ui/plugin.properties Mon Sep  7 17:12:28 2009
@@ -43,7 +43,7 @@
 Cmd_Delete_id=org.apache.directory.studio.ldapbrowser.action.delete
 Cmd_Properties_id=org.apache.directory.studio.ldapbrowser.action.properties
 
-PrefPage_MainPreferencePage_id=org.apache.directory.studio.ldapbrowser.preferences.MainPreferencePage
+PrefPage_StudioPage_id=org.apache.directory.studio.StudioPreferencePage
 PrefPage_ConnectionsPreferencePage_id=org.apache.directory.studio.connection.preferences.ConnectionsPreferencePage
 PrefPage_ConnectionsPreferencePage_name=Connections
 PrefPage_CertificateValidationPreferencePage_id=org.apache.directory.studio.connection.preferences.CertificateValidationPreferencePage

Modified: directory/studio/trunk/connection-ui/plugin.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-ui/plugin.xml?rev=812226&r1=812225&r2=812226&view=diff
==============================================================================
--- directory/studio/trunk/connection-ui/plugin.xml (original)
+++ directory/studio/trunk/connection-ui/plugin.xml Mon Sep  7 17:12:28 2009
@@ -60,7 +60,7 @@
    <extension
          point="org.eclipse.ui.preferencePages">
       <page
-            category="%PrefPage_MainPreferencePage_id"
+            category="%PrefPage_StudioPage_id"
             class="org.apache.directory.studio.connection.ui.preferences.ConnectionsPreferencePage"
             id="%PrefPage_ConnectionsPreferencePage_id"
             name="%PrefPage_ConnectionsPreferencePage_name">

Modified: directory/studio/trunk/ldapbrowser-common/plugin.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/plugin.properties?rev=812226&r1=812225&r2=812226&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/plugin.properties (original)
+++ directory/studio/trunk/ldapbrowser-common/plugin.properties Mon Sep  7 17:12:28 2009
@@ -29,8 +29,11 @@
 NewWizards_Category_id=org.apache.directory.studio.ldapbrowser.newWizards
 NewWizards_Category_name=LDAP Browser
 
+PrefPage_StudioPage_id=org.apache.directory.studio.StudioPreferencePage
+PrefPage_EntryEditorsPreferencePage_id=org.apache.directory.studio.ldapbrowser.preferences.EntryEditorsPreferencePage
+
 PrefPage_MainPreferencePage_id=org.apache.directory.studio.ldapbrowser.preferences.MainPreferencePage
-PrefPage_MainPreferencePage_name=LDAP
+PrefPage_MainPreferencePage_name=LDAP Browser
 
 PrefPage_AttributesPreferencePage_id=org.apache.directory.studio.ldapbrowser.preferences.AttributesPreferencePage
 PrefPage_AttributesPreferencePage_name=Attributes
@@ -45,7 +48,7 @@
 PrefPage_ValueEditorsPreferencePage_name=Value Editors
 
 PrefPage_BrowserPreferencePage_id=org.apache.directory.studio.ldapbrowser.preferences.BrowserPreferencePage
-PrefPage_BrowserPreferencePage_name=Browser
+PrefPage_BrowserPreferencePage_name=Browser View
 
 PrefPage_EntryEditorPreferencePage_id=org.apache.directory.studio.ldapbrowser.preferences.EntryEditorPreferencePage
 PrefPage_EntryEditorPreferencePage_name=Entry Editor
@@ -53,9 +56,15 @@
 PrefPage_TextFormatsPreferencePage_id=org.apache.directory.studio.ldapbrowser.preferences.TextFormatsPreferencePage
 PrefPage_TextFormatsPreferencePage_name=Text Formats
 
+PrefPage_ViewsPreferencePage_id=org.apache.directory.studio.ldapbrowser.preferences.ViewsPreferencePage
+PrefPage_ViewsPreferencePage_name=Views
+
+
 CtxType_LdapFilter_Template_id=org.apache.directory.studio.ldapbrowser.common.templates.filter
 CtxType_LdapFilter_Template_name=LDAP Filter
 
+
+
 Keyword_Colors_id=org.apache.directory.studio.ldapbrowser.keyword.colors
 Keyword_Colors_label=Colors
 

Modified: directory/studio/trunk/ldapbrowser-common/plugin.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/plugin.xml?rev=812226&r1=812225&r2=812226&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/plugin.xml (original)
+++ directory/studio/trunk/ldapbrowser-common/plugin.xml Mon Sep  7 17:12:28 2009
@@ -52,6 +52,7 @@
    <extension
          point="org.eclipse.ui.preferencePages">
       <page
+            category="%PrefPage_StudioPage_id"
             class="org.apache.directory.studio.ldapbrowser.common.dialogs.preferences.MainPreferencePage"
             id="%PrefPage_MainPreferencePage_id"
             name="%PrefPage_MainPreferencePage_name">
@@ -81,21 +82,21 @@
          <keywordReference id="%Keyword_LDAP_id"/>
       </page>
       <page
-            category="%PrefPage_AttributesPreferencePage_id"
+            category="%PrefPage_MainPreferencePage_id"
             class="org.apache.directory.studio.ldapbrowser.common.dialogs.preferences.ValueEditorsPreferencePage"
             id="%PrefPage_ValueEditorsPreferencePage_id"
             name="%PrefPage_ValueEditorsPreferencePage_name">
          <keywordReference id="%Keyword_LDAP_id"/>
       </page>
       <page
-            category="%PrefPage_MainPreferencePage_id"
+            category="%PrefPage_ViewsPreferencePage_id"
             class="org.apache.directory.studio.ldapbrowser.common.dialogs.preferences.BrowserPreferencePage"
             id="%PrefPage_BrowserPreferencePage_id"
             name="%PrefPage_BrowserPreferencePage_name">
          <keywordReference id="%Keyword_LDAP_id"/>
       </page>            
       <page
-            category="%PrefPage_MainPreferencePage_id"
+            category="%PrefPage_EntryEditorsPreferencePage_id"
             class="org.apache.directory.studio.ldapbrowser.common.dialogs.preferences.EntryEditorPreferencePage"
             id="%PrefPage_EntryEditorPreferencePage_id"
             name="%PrefPage_EntryEditorPreferencePage_name">
@@ -108,6 +109,14 @@
             name="%PrefPage_TextFormatsPreferencePage_name">
          <keywordReference id="%Keyword_LDAP_id"/>
          <keywordReference id="%Keyword_LDIF_id"/>
+      </page>    
+      <page
+            category="%PrefPage_MainPreferencePage_id"
+            class="org.apache.directory.studio.ldapbrowser.common.dialogs.preferences.ViewsPreferencePage"
+            id="%PrefPage_ViewsPreferencePage_id"
+            name="%PrefPage_ViewsPreferencePage_name">
+         <keywordReference id="%Keyword_LDAP_id"/>
+         <keywordReference id="%Keyword_LDIF_id"/>
       </page>            
    </extension>
 

Modified: directory/studio/trunk/ldapbrowser-common/plugin_de.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/plugin_de.properties?rev=812226&r1=812225&r2=812226&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/plugin_de.properties (original)
+++ directory/studio/trunk/ldapbrowser-common/plugin_de.properties Mon Sep  7 17:12:28 2009
@@ -29,6 +29,10 @@
 
 PrefPage_TextFormatsPreferencePage_name=Text Formate
 
+PrefPage_BrowserPreferencePage_name=Browser Ansicht
+
+PrefPage_ViewsPreferencePage_name=TODO:Views
+
 CtxType_LdapFilter_Template_name=LDAP Filter
 
 Keyword_Colors_label=Farben

Modified: directory/studio/trunk/ldapbrowser-common/plugin_fr.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/plugin_fr.properties?rev=812226&r1=812225&r2=812226&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/plugin_fr.properties (original)
+++ directory/studio/trunk/ldapbrowser-common/plugin_fr.properties Mon Sep  7 17:12:28 2009
@@ -25,7 +25,7 @@
 
 NewWizards_Category_name=Navigateur LDAP
 
-PrefPage_MainPreferencePage_name=LDAP
+PrefPage_MainPreferencePage_name=Navigateur LDAP
 
 PrefPage_AttributesPreferencePage_name=Attributs
 
@@ -35,12 +35,14 @@
 
 PrefPage_ValueEditorsPreferencePage_name=Editeurs de valeur
 
-PrefPage_BrowserPreferencePage_name=Navigateur
+PrefPage_BrowserPreferencePage_name=Vue navigateur
 
 PrefPage_EntryEditorPreferencePage_name=Editeur d'entr\u00E9e
 
 PrefPage_TextFormatsPreferencePage_name=Formats de texte
 
+PrefPage_ViewsPreferencePage_name=Vues
+
 CtxType_LdapFilter_Template_name=Filtre LDAP
 
 Keyword_Colors_label=Couleurs

Added: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/ViewsPreferencePage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/ViewsPreferencePage.java?rev=812226&view=auto
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/ViewsPreferencePage.java (added)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/ViewsPreferencePage.java Mon Sep  7 17:12:28 2009
@@ -0,0 +1,71 @@
+/*
+ *  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.common.dialogs.preferences;
+
+
+import org.eclipse.jface.preference.PreferencePage;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPreferencePage;
+
+
+/**
+ * The BrowserPreferencePage contains general settings for the browser view.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
+ */
+public class ViewsPreferencePage extends PreferencePage implements IWorkbenchPreferencePage
+{
+
+    /**
+     * Creates a new instance of ViewsPreferencePage.
+     */
+    public ViewsPreferencePage()
+    {
+        super( Messages.getString("ViewsPreferencePage.Views") ); //$NON-NLS-1$
+        setDescription( Messages.getString("ViewsPreferencePage.Description") ); //$NON-NLS-1$
+        
+        // Removing Default and Apply buttons
+        noDefaultAndApplyButton();
+    }
+
+
+    /**
+     * {@inheritDoc}
+     */
+    public void init( IWorkbench workbench )
+    {
+        // Nothing to do
+    }
+
+
+    /**
+     * {@inheritDoc}
+     */
+    protected Control createContents( Composite parent )
+    {
+        // Nothing to do
+        
+        return parent;
+    }
+}

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=812226&r1=812225&r2=812226&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 Mon Sep  7 17:12:28 2009
@@ -123,3 +123,5 @@
 ValueEditorsPreferencePage.ValueEditorBySyntax=Value Editors by Syntax
 ValueEditorsPreferencePage.ValueEditors=Value Editors
 ValueEditorsPreferencePage.ValueEditorsByAttributeType=Value Editors by Attribute Types
+ViewsPreferencePage.Description=Expand the tree to edit preferences for a specific feature.
+ViewsPreferencePage.Views=Views

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=812226&r1=812225&r2=812226&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 Mon Sep  7 17:12:28 2009
@@ -123,3 +123,5 @@
 ValueEditorsPreferencePage.ValueEditorBySyntax=Wert Editoren nach Syntax
 ValueEditorsPreferencePage.ValueEditors=Wert Editoren
 ValueEditorsPreferencePage.ValueEditorsByAttributeType=Wert Editoren nach Attributtyp
+ViewsPreferencePage.Description=TODO:Expand the tree to edit preferences for a specific feature.
+ViewsPreferencePage.Views=TODO:Views

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=812226&r1=812225&r2=812226&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 Mon Sep  7 17:12:28 2009
@@ -123,3 +123,5 @@
 ValueEditorsPreferencePage.ValueEditorBySyntax=Editeurs de valeur par syntaxe
 ValueEditorsPreferencePage.ValueEditors=Editeurs de valeur
 ValueEditorsPreferencePage.ValueEditorsByAttributeType=Editeurs de valeur par type d'attribut
+ViewsPreferencePage.Description=Déplier l'arbre pour modifier les préférences d'une fonctionnalité particulière.
+ViewsPreferencePage.Views=Vues
\ No newline at end of file

Modified: directory/studio/trunk/ldapbrowser-ui/plugin.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/plugin.properties?rev=812226&r1=812225&r2=812226&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-ui/plugin.properties (original)
+++ directory/studio/trunk/ldapbrowser-ui/plugin.properties Mon Sep  7 17:12:28 2009
@@ -117,6 +117,7 @@
 PrefPage_BinaryAttributesAndSyntaxesPreferencePage_id=org.apache.directory.studio.ldapbrowser.preferences.BinaryAttributesAndSyntaxesPreferencePage
 PrefPage_BrowserPreferencePage_id=org.apache.directory.studio.ldapbrowser.preferences.BrowserPreferencePage
 PrefPage_EntryEditorPreferencePage_id=org.apache.directory.studio.ldapbrowser.preferences.EntryEditorPreferencePage
+PrefPage_ViewsPreferencePage_id=org.apache.directory.studio.ldapbrowser.preferences.ViewsPreferencePage
 
 Keyword_LDAP_id=org.apache.directory.studio.ldapbrowser.keyword.ldap
 
@@ -124,10 +125,10 @@
 PrefPage_SearchResultEditorPreferencePage_name=Search Result Editor
 
 PrefPage_ModificationLogsPreferencePage_id=org.apache.directory.studio.ldapbrowser.preferences.ModificationLogsPreferencePage
-PrefPage_ModificationLogsPreferencePage_name=Modification Logs
+PrefPage_ModificationLogsPreferencePage_name=Modification Logs View
 
 PrefPage_SearchLogsPreferencePage_id=org.apache.directory.studio.ldapbrowser.preferences.SearchLogsPreferencePage
-PrefPage_SearchLogsPreferencePage_name=Search Logs
+PrefPage_SearchLogsPreferencePage_name=Search Logs View
 
 PrefPage_EntryEditorsPreferencePage_id=org.apache.directory.studio.ldapbrowser.preferences.EntryEditorsPreferencePage
 PrefPage_EntryEditorsPreferencePage_name=Entry Editors

Modified: directory/studio/trunk/ldapbrowser-ui/plugin.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/plugin.xml?rev=812226&r1=812225&r2=812226&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-ui/plugin.xml (original)
+++ directory/studio/trunk/ldapbrowser-ui/plugin.xml Mon Sep  7 17:12:28 2009
@@ -274,14 +274,14 @@
          <keywordReference id="%Keyword_LDAP_id"/>
       </page>
       <page
-            category="%PrefPage_MainPreferencePage_id"
+            category="%PrefPage_ViewsPreferencePage_id"
             class="org.apache.directory.studio.ldapbrowser.ui.dialogs.preferences.ModificationLogsPreferencePage"
             id="%PrefPage_ModificationLogsPreferencePage_id"
             name="%PrefPage_ModificationLogsPreferencePage_name">
          <keywordReference id="%Keyword_LDAP_id"/>
       </page>
       <page
-            category="%PrefPage_MainPreferencePage_id"
+            category="%PrefPage_ViewsPreferencePage_id"
             class="org.apache.directory.studio.ldapbrowser.ui.dialogs.preferences.SearchLogsPreferencePage"
             id="%PrefPage_SearchLogsPreferencePage_id"
             name="%PrefPage_SearchLogsPreferencePage_name">

Modified: directory/studio/trunk/ldapbrowser-ui/plugin_de.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/plugin_de.properties?rev=812226&r1=812225&r2=812226&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-ui/plugin_de.properties (original)
+++ directory/studio/trunk/ldapbrowser-ui/plugin_de.properties Mon Sep  7 17:12:28 2009
@@ -65,9 +65,9 @@
 
 PrefPage_SearchResultEditorPreferencePage_name=Suchresultat Editor
 
-PrefPage_ModificationLogsPreferencePage_name=\u00C4nderungs-Logs
+PrefPage_ModificationLogsPreferencePage_name=\u00C4nderungs-Logs Ansicht
 
-PrefPage_SearchLogsPreferencePage_name=Such-Logs
+PrefPage_SearchLogsPreferencePage_name=Such-Logs Ansicht
 
 PrefPage_EntryEditorsPreferencePage_name=TODO:Entry Editors
 

Modified: directory/studio/trunk/ldapbrowser-ui/plugin_fr.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/plugin_fr.properties?rev=812226&r1=812225&r2=812226&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-ui/plugin_fr.properties (original)
+++ directory/studio/trunk/ldapbrowser-ui/plugin_fr.properties Mon Sep  7 17:12:28 2009
@@ -59,8 +59,8 @@
 SearchPage_LdapSearch_label=Recherche LDAP
 
 PrefPage_SearchResultEditorPreferencePage_name=Editeur de recherche
-PrefPage_ModificationLogsPreferencePage_name=Logs de modification
-PrefPage_SearchLogsPreferencePage_name=Logs de recherche
+PrefPage_ModificationLogsPreferencePage_name=Vue logs de modification
+PrefPage_SearchLogsPreferencePage_name=Vue logs de recherche
 PrefPage_EntryEditorsPreferencePage_name=Editeurs d'entr\u00E9e
 
 PropPage_Schema_name=Sch\u00E9ma

Modified: directory/studio/trunk/ldifeditor/plugin.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldifeditor/plugin.properties?rev=812226&r1=812225&r2=812226&view=diff
==============================================================================
--- directory/studio/trunk/ldifeditor/plugin.properties (original)
+++ directory/studio/trunk/ldifeditor/plugin.properties Mon Sep  7 17:12:28 2009
@@ -29,6 +29,8 @@
 Keyword_LDAP_id=org.apache.directory.studio.ldapbrowser.keyword.ldap
 Keyword_LDIF_id=org.apache.directory.studio.ldapbrowser.keyword.ldif
 
+PrefPage_StudioPage_id=org.apache.directory.studio.StudioPreferencePage
+
 PrefPage_LdifEditorPreferencePage_id=org.apache.directory.studio.ldifeditor.dialogs.preferences.LdifEditorPreferencePage
 PrefPage_LdifEditorPreferencePage_name=LDIF Editor
 

Modified: directory/studio/trunk/ldifeditor/plugin.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldifeditor/plugin.xml?rev=812226&r1=812225&r2=812226&view=diff
==============================================================================
--- directory/studio/trunk/ldifeditor/plugin.xml (original)
+++ directory/studio/trunk/ldifeditor/plugin.xml Mon Sep  7 17:12:28 2009
@@ -52,6 +52,7 @@
    <extension
          point="org.eclipse.ui.preferencePages">
       <page
+            category="%PrefPage_StudioPage_id"
             class="org.apache.directory.studio.ldifeditor.dialogs.preferences.LdifEditorPreferencePage"
             id="%PrefPage_LdifEditorPreferencePage_id"
             name="%PrefPage_LdifEditorPreferencePage_name">

Modified: directory/studio/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/pom.xml?rev=812226&r1=812225&r2=812226&view=diff
==============================================================================
--- directory/studio/trunk/pom.xml (original)
+++ directory/studio/trunk/pom.xml Mon Sep  7 17:12:28 2009
@@ -68,11 +68,12 @@
     <aciitemeditor.version>1.5.0-SNAPSHOT</aciitemeditor.version>
     <apacheds.launcher.version>1.5.0-SNAPSHOT</apacheds.launcher.version>
     <apacheds.version>1.5.0-SNAPSHOT</apacheds.version>
-    <apacheds.help.version>1.5.0-SNAPSHOT</apacheds.help.version>
     <apacheds.feature.version>1.5.0-SNAPSHOT</apacheds.feature.version>
+    <apacheds.help.version>1.5.0-SNAPSHOT</apacheds.help.version>
     <apacheds.configuration.version>1.5.0-SNAPSHOT</apacheds.configuration.version>
     <apacheds.configuration.feature.version>1.5.0-SNAPSHOT</apacheds.configuration.feature.version>
     <apacheds.configuration.help.version>1.5.0-SNAPSHOT</apacheds.configuration.help.version>
+    <common.ui.version>1.5.0-SNAPSHOT</common.ui.version>
     <connection.core.version>1.5.0-SNAPSHOT</connection.core.version>
     <connection.ui.version>1.5.0-SNAPSHOT</connection.ui.version>
     <jars.version>1.5.0-SNAPSHOT</jars.version>
@@ -194,98 +195,93 @@
       <!-- Apache Directory Studio -->
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
-        <artifactId>ldapbrowser.core</artifactId>
-        <version>${ldapbrowser.core.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.directory.studio</groupId>
-        <artifactId>ldapbrowser.common</artifactId>
-        <version>${ldapbrowser.common.version}</version>
+        <artifactId>aciitemeditor</artifactId>
+        <version>${aciitemeditor.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
-        <artifactId>connection.ui</artifactId>
-        <version>${connection.ui.version}</version>
+        <artifactId>apacheds</artifactId>
+        <version>${apacheds.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
-        <artifactId>connection.core</artifactId>
-        <version>${connection.core.version}</version>
+        <artifactId>apacheds.feature</artifactId>
+        <version>${apacheds.feature.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
-        <artifactId>valueeditors</artifactId>
-        <version>${valueeditors.version}</version>
+        <artifactId>apacheds.help</artifactId>
+        <version>${apacheds.help.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
-        <artifactId>rcp</artifactId>
-        <version>${rcp.version}</version>
+        <artifactId>apacheds-launcher</artifactId>
+        <version>${apacheds.launcher.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
-        <artifactId>ldifeditor</artifactId>
-        <version>${ldifeditor.version}</version>
+        <artifactId>apacheds.configuration</artifactId>
+        <version>${apacheds.configuration.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
-        <artifactId>ldifparser</artifactId>
-        <version>${ldifparser.version}</version>
+        <artifactId>apacheds.configuration.feature</artifactId>
+        <version>${apacheds.configuration.feature.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
-        <artifactId>schemaeditor</artifactId>
-        <version>${schemaeditor.version}</version>
+        <artifactId>apacheds.configuration.help</artifactId>
+        <version>${apacheds.configuration.help.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
-        <artifactId>ldapbrowser.ui</artifactId>
-        <version>${ldapbrowser.ui.version}</version>
+        <artifactId>common.ui</artifactId>
+        <version>${common.ui.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
-        <artifactId>apacheds.configuration</artifactId>
-        <version>${apacheds.configuration.version}</version>
+        <artifactId>connection.core</artifactId>
+        <version>${connection.core.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
-        <artifactId>apacheds</artifactId>
-        <version>${apacheds.version}</version>
+        <artifactId>connection.ui</artifactId>
+        <version>${connection.ui.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
-        <artifactId>apacheds-launcher</artifactId>
-        <version>${apacheds.launcher.version}</version>
+        <artifactId>jars</artifactId>
+        <version>${jars.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
-        <artifactId>jars</artifactId>
-        <version>${jars.version}</version>
+        <artifactId>ldapbrowser.common</artifactId>
+        <version>${ldapbrowser.common.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
-        <artifactId>updatesite</artifactId>
-        <version>${updatesite.version}</version>
+        <artifactId>ldapbrowser.core</artifactId>
+        <version>${ldapbrowser.core.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
-        <artifactId>aciitemeditor</artifactId>
-        <version>${aciitemeditor.version}</version>
+        <artifactId>ldapbrowser.feature</artifactId>
+        <version>${ldapbrowser.feature.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
-        <artifactId>rcp.feature</artifactId>
-        <version>${rcp.feature.version}</version>
+        <artifactId>ldapbrowser.help</artifactId>
+        <version>${ldapbrowser.help.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
-        <artifactId>schemaeditor.feature</artifactId>
-        <version>${schemaeditor.feature.version}</version>
+        <artifactId>ldapbrowser.ui</artifactId>
+        <version>${ldapbrowser.ui.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
-        <artifactId>ldapbrowser.feature</artifactId>
-        <version>${ldapbrowser.feature.version}</version>
+        <artifactId>ldifeditor</artifactId>
+        <version>${ldifeditor.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
@@ -294,43 +290,43 @@
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
-        <artifactId>apacheds.configuration.feature</artifactId>
-        <version>${apacheds.configuration.feature.version}</version>
+        <artifactId>ldifeditor.help</artifactId>
+        <version>${ldifeditor.help.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
-        <artifactId>apacheds.feature</artifactId>
-        <version>${apacheds.feature.version}</version>
+        <artifactId>ldifparser</artifactId>
+        <version>${ldifparser.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
-        <artifactId>schemaeditor.help</artifactId>
-        <version>${schemaeditor.help.version}</version>
+        <artifactId>rcp</artifactId>
+        <version>${rcp.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
-        <artifactId>rcp.help</artifactId>
-        <version>${rcp.help.version}</version>
+        <artifactId>rcp.feature</artifactId>
+        <version>${rcp.feature.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
-        <artifactId>ldifeditor.help</artifactId>
-        <version>${ldifeditor.help.version}</version>
+        <artifactId>rcp.help</artifactId>
+        <version>${rcp.help.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
-        <artifactId>ldapbrowser.help</artifactId>
-        <version>${ldapbrowser.help.version}</version>
+        <artifactId>schemaeditor</artifactId>
+        <version>${schemaeditor.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
-        <artifactId>apacheds.configuration.help</artifactId>
-        <version>${apacheds.configuration.help.version}</version>
+        <artifactId>schemaeditor.feature</artifactId>
+        <version>${schemaeditor.feature.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
-        <artifactId>apacheds.help</artifactId>
-        <version>${apacheds.help.version}</version>
+        <artifactId>schemaeditor.help</artifactId>
+        <version>${schemaeditor.help.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
@@ -342,6 +338,16 @@
         <artifactId>test.integration.ui</artifactId>
         <version>${test.integration.ui.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.directory.studio</groupId>
+        <artifactId>updatesite</artifactId>
+        <version>${updatesite.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.directory.studio</groupId>
+        <artifactId>valueeditors</artifactId>
+        <version>${valueeditors.version}</version>
+      </dependency>
       
       <!-- Maven -->
       <dependency>
@@ -1135,28 +1141,31 @@
   </dependencyManagement>
 
   <modules>
+    <!-- The 'repository' module must be the first one -->
     <module>repository</module>
-    <module>ldif-parser</module>
-    <module>connection-core</module>
-    <module>ldapbrowser-core</module>
-    <module>connection-ui</module>
-    <module>ldapbrowser-common</module>
-    <module>valueeditors</module>
+    <!-- Other modules are sorted in alphabetical order -->
     <module>aciitemeditor</module>
-    <module>schemaeditor</module>
-    <module>schemaeditor-feature</module>
-    <module>rcp</module>
-    <module>rcp-feature</module>
-    <module>ldifeditor</module>
-    <module>ldifeditor-feature</module>
-    <module>ldapbrowser-ui</module>
-    <module>ldapbrowser-feature</module>
+    <module>apacheds</module>
     <module>apacheds-configuration</module>
     <module>apacheds-configuration-feature</module>
     <module>apacheds-launcher</module>
-    <module>apacheds</module>
     <module>apacheds-feature</module>
+    <module>connection-core</module>
+    <module>connection-ui</module>
+    <module>common-ui</module>
     <module>jars</module>
+    <module>ldapbrowser-core</module>
+    <module>ldapbrowser-common</module>
+    <module>ldapbrowser-feature</module>
+    <module>ldapbrowser-ui</module>
+    <module>ldifeditor</module>
+    <module>ldifeditor-feature</module>
+    <module>ldif-parser</module>
+    <module>rcp</module>
+    <module>rcp-feature</module>
+    <module>schemaeditor</module>
+    <module>schemaeditor-feature</module>
+    <module>valueeditors</module>
   </modules>
 
   <build>

Modified: directory/studio/trunk/schemaeditor/plugin.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/plugin.properties?rev=812226&r1=812225&r2=812226&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/plugin.properties (original)
+++ directory/studio/trunk/schemaeditor/plugin.properties Mon Sep  7 17:12:28 2009
@@ -99,6 +99,8 @@
 ImportWizard_ImportProjectsWizard_id=org.apache.directory.studio.schemaeditor.wizards.ImportProjectsWizard
 ImportWizard_ImportProjectsWizard_name=Schema Projects
 
+PrefPage_StudioPage_id=org.apache.directory.studio.StudioPreferencePage
+
 PrefPage_SchemaEditor_id=org.apache.directory.studio.schemaeditor.preferences.plugin
 PrefPage_SchemaEditor_name=Schema Editor
 

Modified: directory/studio/trunk/schemaeditor/plugin.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/plugin.xml?rev=812226&r1=812225&r2=812226&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/plugin.xml (original)
+++ directory/studio/trunk/schemaeditor/plugin.xml Mon Sep  7 17:12:28 2009
@@ -206,6 +206,7 @@
          point="org.eclipse.ui.preferencePages">
       <page
             class="org.apache.directory.studio.schemaeditor.view.preferences.PluginPreferencePage"
+            category="%PrefPage_StudioPage_id"
             id="%PrefPage_SchemaEditor_id"
             name="%PrefPage_SchemaEditor_name"/>
 	  <page

Modified: directory/studio/trunk/studio/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio/pom.xml?rev=812226&r1=812225&r2=812226&view=diff
==============================================================================
--- directory/studio/trunk/studio/pom.xml (original)
+++ directory/studio/trunk/studio/pom.xml Mon Sep  7 17:12:28 2009
@@ -1009,6 +1009,10 @@
                 </artifactItem>
                 <artifactItem>
                   <groupId>org.apache.directory.studio</groupId>
+                  <artifactId>common.ui</artifactId>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.studio</groupId>
                   <artifactId>connection.core</artifactId>
                 </artifactItem>
                 <artifactItem>



Mime
View raw message