You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pa...@apache.org on 2006/12/14 14:46:22 UTC
svn commit: r487208 - in /directory/sandbox/pamarcelot/ldapstudio:
dependencies/eclipse/3.2/plugins/ ldapstudio-rcp-feature/ ldapstudio-rcp/
ldapstudio-rcp/resources/ ldapstudio-rcp/resources/help/
ldapstudio-rcp/resources/icons/ ldapstudio-rcp/ressour...
Author: pamarcelot
Date: Thu Dec 14 05:46:21 2006
New Revision: 487208
URL: http://svn.apache.org/viewvc?view=rev&rev=487208
Log:
Updating LDAP Studio RCP Application. Adding support for using the standard Eclipse Outline and Progress Views. Cleaning some old obsolete icon files.
Added:
directory/sandbox/pamarcelot/ldapstudio/dependencies/eclipse/3.2/plugins/org.eclipse.ui.views_3.2.1.M20060906-0800.jar (with props)
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/resources/
- copied from r486081, directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/ressources/
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/resources/icons/progress.gif (with props)
Removed:
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/resources/icons/Thumbs.db
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/resources/icons/attribute_type.gif
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/resources/icons/attribute_type_new.gif
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/resources/icons/box.png
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/resources/icons/chart_organisation.png
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/resources/icons/delete.gif
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/resources/icons/find.png
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/resources/icons/flag_blue.png
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/resources/icons/object_class.gif
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/resources/icons/object_class_new.gif
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/resources/icons/object_class_warning.gif
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/resources/icons/open.png
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/resources/icons/page_white_edit.png
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/resources/icons/perspectives.png
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/resources/icons/save.gif
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/resources/icons/save_all.png
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/resources/icons/save_as.png
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/resources/icons/schema.gif
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/resources/icons/schema_core.gif
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/resources/icons/schema_new.gif
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/resources/icons/schema_new.png
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/resources/icons/schema_remove.png
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/resources/icons/sort_alphabetical.gif
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/resources/icons/sort_unalphabetical.gif
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/resources/icons/stop.png
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/ressources/
Modified:
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp-feature/feature.xml
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/build.properties
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/build.xml
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/ldapstudio.product
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/plugin.xml
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/resources/help/tocconcepts.xml
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/resources/help/tocreference.xml
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/resources/help/toctasks.xml
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/src/main/java/org/apache/directory/ldapstudio/view/ImageKeys.java
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/src/main/java/org/apache/directory/ldapstudio/view/Perspective.java
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/src/main/resources/org/apache/directory/ldapstudio/messages.properties
Added: directory/sandbox/pamarcelot/ldapstudio/dependencies/eclipse/3.2/plugins/org.eclipse.ui.views_3.2.1.M20060906-0800.jar
URL: http://svn.apache.org/viewvc/directory/sandbox/pamarcelot/ldapstudio/dependencies/eclipse/3.2/plugins/org.eclipse.ui.views_3.2.1.M20060906-0800.jar?view=auto&rev=487208
==============================================================================
Binary file - no diff available.
Propchange: directory/sandbox/pamarcelot/ldapstudio/dependencies/eclipse/3.2/plugins/org.eclipse.ui.views_3.2.1.M20060906-0800.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp-feature/feature.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp-feature/feature.xml?view=diff&rev=487208&r1=487207&r2=487208
==============================================================================
--- directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp-feature/feature.xml (original)
+++ directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp-feature/feature.xml Thu Dec 14 05:46:21 2006
@@ -2,7 +2,7 @@
<feature
id="org.apache.directory.ldapstudio.feature"
label="LDAP Studio"
- version="0.1"
+ version="1.0"
provider-name="apache.org">
<description url="http://www.example.com/description">
@@ -18,7 +18,7 @@
</license>
<url>
- <update url="http://www"/>
+ <update label="LDAP Studio RCP Application Update Site" url="http://people.apache.org/~pajbam/ldapstudio/rcp"/>
</url>
<includes
@@ -38,6 +38,8 @@
<import plugin="org.eclipse.jface" version="3.2.0" match="compatible"/>
<import plugin="org.eclipse.update.configurator" version="3.1.0" match="compatible"/>
<import plugin="org.eclipse.update.core" version="3.1.0" match="compatible"/>
+ <import plugin="org.eclipse.core.runtime" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.help" version="3.2.0" match="compatible"/>
</requires>
<plugin
@@ -109,6 +111,20 @@
<plugin
id="org.eclipse.update.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.ui.views"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.core.jobs"
download-size="0"
install-size="0"
version="0.0.0"
Modified: directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/build.properties
URL: http://svn.apache.org/viewvc/directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/build.properties?view=diff&rev=487208&r1=487207&r2=487208
==============================================================================
--- directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/build.properties (original)
+++ directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/build.properties Thu Dec 14 05:46:21 2006
@@ -8,7 +8,7 @@
plugin.properties,\
product_lg.gif,\
splash.bmp,\
- ressources/,\
+ resources/,\
plugin_customization.ini,\
log4j.conf,\
lib/nlog4j-1.2.24.jar
Modified: directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/build.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/build.xml?view=diff&rev=487208&r1=487207&r2=487208
==============================================================================
--- directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/build.xml (original)
+++ directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/build.xml Thu Dec 14 05:46:21 2006
@@ -106,9 +106,9 @@
<include name="**" />
</fileset>
</copy>
- <mkdir dir="${ldapstudio-rcp.build}/ressources" />
- <copy todir="${ldapstudio-rcp.build}/ressources">
- <fileset dir="${basedir}/ressources">
+ <mkdir dir="${ldapstudio-rcp.build}/resources" />
+ <copy todir="${ldapstudio-rcp.build}/resources">
+ <fileset dir="${basedir}/resources">
<include name="**" />
</fileset>
</copy>
@@ -208,7 +208,7 @@
<exclude name="plugin.properties" />
<exclude name="plugin.xml" />
<exclude name="product_lg.gif" />
- <exclude name="ressources/**" />
+ <exclude name="resources/**" />
<exclude name="splash.bmp" />
<exclude name="src/**" />
</fileset>
Modified: directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/ldapstudio.product
URL: http://svn.apache.org/viewvc/directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/ldapstudio.product?view=diff&rev=487208&r1=487207&r2=487208
==============================================================================
--- directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/ldapstudio.product (original)
+++ directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/ldapstudio.product Thu Dec 14 05:46:21 2006
@@ -21,7 +21,7 @@
<product name="LDAP Studio" id="org.apache.directory.ldapstudio.product" application="org.apache.directory.ldapstudio.application" useFeatures="true">
<aboutInfo>
- <image path="ressources/pictures/product_lg.gif"/>
+ <image path="resources/pictures/product_lg.gif"/>
<text>
%aboutText
</text>
@@ -31,8 +31,6 @@
<launcherArgs>
</launcherArgs>
-
- <windowImages i16="ressources/icons/sample.gif"/>
<launcher name="LDAPStudio">
<solaris/>
Modified: directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/plugin.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/plugin.xml?view=diff&rev=487208&r1=487207&r2=487208
==============================================================================
--- directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/plugin.xml (original)
+++ directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/plugin.xml Thu Dec 14 05:46:21 2006
@@ -47,11 +47,8 @@
name="aboutText"
value="%aboutText"/>
<property
- name="windowImages"
- value="ressources/icons/sample.gif"/>
- <property
name="aboutImage"
- value="ressources/pictures/product_lg.gif"/>
+ value="resources/pictures/product_lg.gif"/>
<property
name="preferenceCustomization"
value="plugin_customization.ini"/>
@@ -70,6 +67,13 @@
class="org.apache.directory.ldapstudio.view.WelcomeView"
id="org.apache.directory.ldapstudio.view.WelcomeView"
name="Welcome View"/>
+ <view
+ name="Progress"
+ icon="resources/icons/progress.gif"
+ category="org.eclipse.ui"
+ class="org.eclipse.ui.ExtensionFactory:progressView"
+ id="org.eclipse.ui.views.ProgressView">
+ </view>
</extension>
</plugin>
Modified: directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/resources/help/tocconcepts.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/resources/help/tocconcepts.xml?view=diff&rev=487208&r1=486081&r2=487208
==============================================================================
--- directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/resources/help/tocconcepts.xml (original)
+++ directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/resources/help/tocconcepts.xml Thu Dec 14 05:46:21 2006
@@ -3,13 +3,13 @@
<toc label="Concepts" link_to="toc.xml#concepts">
<topic label="Views">
- <topic label="Hierarchy view" href="ressources/help/html/concepts/views_hierarchy_view.html" />
- <topic label="Schemas view" href="ressources/help/html/concepts/views_schemas_view.html" />
- <topic label="Search view" href="ressources/help/html/concepts/views_search_view.html" />
+ <topic label="Hierarchy view" href="resources/help/html/concepts/views_hierarchy_view.html" />
+ <topic label="Schemas view" href="resources/help/html/concepts/views_schemas_view.html" />
+ <topic label="Search view" href="resources/help/html/concepts/views_search_view.html" />
</topic>
<topic label="Editors">
- <topic label="Attribute type editor" href="ressources/help/html/concepts/editors_attribute_type.html" />
- <topic label="Object class editor" href="ressources/help/html/concepts/editors_object_class.html" />
- <topic label="Schema editor" href="ressources/help/html/concepts/editors_schema.html" />
+ <topic label="Attribute type editor" href="resources/help/html/concepts/editors_attribute_type.html" />
+ <topic label="Object class editor" href="resources/help/html/concepts/editors_object_class.html" />
+ <topic label="Schema editor" href="resources/help/html/concepts/editors_schema.html" />
</topic>
</toc>
Modified: directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/resources/help/tocreference.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/resources/help/tocreference.xml?view=diff&rev=487208&r1=486081&r2=487208
==============================================================================
--- directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/resources/help/tocreference.xml (original)
+++ directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/resources/help/tocreference.xml Thu Dec 14 05:46:21 2006
@@ -2,12 +2,12 @@
<?NLS TYPE="org.eclipse.help.toc"?>
<toc label="Reference" link_to="toc.xml#reference">
- <topic label="Preferences" href="ressources/help/html/reference/preferences.html">
- <topic label="Help" href="ressources/help/html/reference/preferences_help.html" />
- <topic label="Help Server" href="ressources/help/html/reference/preferences_help_server.html" />
- <topic label="ObjectClass and AttributeType" href="ressources/help/html/reference/preferences_OC_and_AT.html" />
- <topic label="Schema" href="ressources/help/html/reference/preferences_schema.html" />
+ <topic label="Preferences" href="rssources/help/html/reference/preferences.html">
+ <topic label="Help" href="resources/help/html/reference/preferences_help.html" />
+ <topic label="Help Server" href="resources/help/html/reference/preferences_help_server.html" />
+ <topic label="ObjectClass and AttributeType" href="resources/help/html/reference/preferences_OC_and_AT.html" />
+ <topic label="Schema" href="resources/help/html/reference/preferences_schema.html" />
</topic>
<topic label="API Reference" href="doc/index.html" />
- <topic label="Source Code" href="ressources/help/html/reference/source_code.html" />
+ <topic label="Source Code" href="resources/help/html/reference/source_code.html" />
</toc>
Modified: directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/resources/help/toctasks.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/resources/help/toctasks.xml?view=diff&rev=487208&r1=486081&r2=487208
==============================================================================
--- directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/resources/help/toctasks.xml (original)
+++ directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/resources/help/toctasks.xml Thu Dec 14 05:46:21 2006
@@ -2,10 +2,10 @@
<?NLS TYPE="org.eclipse.help.toc"?>
<toc label="Tasks" link_to="toc.xml#tasks">
- <topic label="Running LDAP Studio" href="ressources/help/html/tasks/running_LDAP_Studio.html" />
- <topic label="Opening a schema" href="ressources/help/html/tasks/opening_a_schema.html" />
- <topic label="Creating a new schema" href="ressources/help/html/tasks/creating_a_new_schema.html" />
- <topic label="Removing a schema" href="ressources/help/html/tasks/removing_a_schema.html" />
- <topic label="Creating a new object class" href="ressources/help/html/tasks/creating_a_new_object_class.html" />
- <topic label="Creating a new attribute type" href="ressources/help/html/tasks/creating_a_new_attribute_type.html" />
+ <topic label="Running LDAP Studio" href="resources/help/html/tasks/running_LDAP_Studio.html" />
+ <topic label="Opening a schema" href="resources/help/html/tasks/opening_a_schema.html" />
+ <topic label="Creating a new schema" href="resources/help/html/tasks/creating_a_new_schema.html" />
+ <topic label="Removing a schema" href="resources/help/html/tasks/removing_a_schema.html" />
+ <topic label="Creating a new object class" href="resources/help/html/tasks/creating_a_new_object_class.html" />
+ <topic label="Creating a new attribute type" href="resources/help/html/tasks/creating_a_new_attribute_type.html" />
</toc>
Added: directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/resources/icons/progress.gif
URL: http://svn.apache.org/viewvc/directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/resources/icons/progress.gif?view=auto&rev=487208
==============================================================================
Binary file - no diff available.
Propchange: directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/resources/icons/progress.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/src/main/java/org/apache/directory/ldapstudio/view/ImageKeys.java
URL: http://svn.apache.org/viewvc/directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/src/main/java/org/apache/directory/ldapstudio/view/ImageKeys.java?view=diff&rev=487208&r1=487207&r2=487208
==============================================================================
--- directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/src/main/java/org/apache/directory/ldapstudio/view/ImageKeys.java (original)
+++ directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/src/main/java/org/apache/directory/ldapstudio/view/ImageKeys.java Thu Dec 14 05:46:21 2006
@@ -27,7 +27,5 @@
public class ImageKeys
{
// Images for Actions
- public static final String ABOUT = "ressources/icons/flag_blue.png"; //$NON-NLS-1$
- public static final String EXIT = "ressources/icons/stop.png"; //$NON-NLS-1$
- public static final String SHOW_PREFERENCES = "ressources/icons/preferences.png"; //$NON-NLS-1$
+ public static final String SHOW_PREFERENCES = "resources/icons/preferences.png"; //$NON-NLS-1$
}
Modified: directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/src/main/java/org/apache/directory/ldapstudio/view/Perspective.java
URL: http://svn.apache.org/viewvc/directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/src/main/java/org/apache/directory/ldapstudio/view/Perspective.java?view=diff&rev=487208&r1=487207&r2=487208
==============================================================================
--- directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/src/main/java/org/apache/directory/ldapstudio/view/Perspective.java (original)
+++ directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/src/main/java/org/apache/directory/ldapstudio/view/Perspective.java Thu Dec 14 05:46:21 2006
@@ -41,6 +41,16 @@
layout.addStandaloneView( WelcomeView.ID, false, IPageLayout.LEFT, 1.0f, editorArea );
layout.getViewLayout( WelcomeView.ID ).setCloseable( false );
+
+// // Outline folder
+// IFolderLayout outlineFolder = layout.createFolder( "outlineFolder", IPageLayout.RIGHT, ( float ) 0.75,
+// editorArea );
+// outlineFolder.addView( IPageLayout.ID_OUTLINE );
+//
+// // Progress folder
+// IFolderLayout progessFolder = layout.createFolder( "progressFolder", IPageLayout.BOTTOM, ( float ) 0.75,
+// IPageLayout.ID_OUTLINE );
+// progessFolder.addView( IPageLayout.ID_PROGRESS_VIEW );
}
}
Modified: directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/src/main/resources/org/apache/directory/ldapstudio/messages.properties
URL: http://svn.apache.org/viewvc/directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/src/main/resources/org/apache/directory/ldapstudio/messages.properties?view=diff&rev=487208&r1=487207&r2=487208
==============================================================================
--- directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/src/main/resources/org/apache/directory/ldapstudio/messages.properties (original)
+++ directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/src/main/resources/org/apache/directory/ldapstudio/messages.properties Thu Dec 14 05:46:21 2006
@@ -21,8 +21,6 @@
#
# Strings used by ApplicationActionBarAdvisor Class
-ApplicationActionBarAdvisor.Save_editor=Save editor
-ApplicationActionBarAdvisor.Save_all_editors=Save all editors
ApplicationActionBarAdvisor.Quit_LDAP_Studio=Quit LDAP Studio
ApplicationActionBarAdvisor.Software_Updates=Software Updates
@@ -31,7 +29,7 @@
AddExtensionAction.Search_for_new_extensions=Search for new extensions for LDAP Studio
AddExtensionAction.Searching_new_extensions=Searching new extensions
AddExtensionAction.LDAP_Studio_Site=LDAP Studio Site
-AddExtensionAction.LDAP_Studio_Home_Base=http://directory.apache.org
+AddExtensionAction.LDAP_Studio_Home_Base=http://people.apache.org/~pamarcelot/ldapstudio
# Strings used by ManageExtensionsAction Class
ManageExtensionsAction.Manage_Extensions=Manage Extensions