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 2007/08/30 17:47:13 UTC
svn commit: r571218 - in /directory/studio/trunk:
studio-rcp/src/main/java/org/apache/directory/studio/actions/
studio-rcp/src/main/resources/org/apache/directory/studio/
studio-schemaeditor-feature/ studio-updatesite/
Author: pamarcelot
Date: Thu Aug 30 08:47:09 2007
New Revision: 571218
URL: http://svn.apache.org/viewvc?rev=571218&view=rev
Log:
Fixed problems with IDs and description of the features.
Modified:
directory/studio/trunk/studio-rcp/src/main/java/org/apache/directory/studio/actions/AddExtensionAction.java
directory/studio/trunk/studio-rcp/src/main/resources/org/apache/directory/studio/messages.properties
directory/studio/trunk/studio-schemaeditor-feature/feature.xml
directory/studio/trunk/studio-updatesite/build.xml
directory/studio/trunk/studio-updatesite/site.xml
Modified: directory/studio/trunk/studio-rcp/src/main/java/org/apache/directory/studio/actions/AddExtensionAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-rcp/src/main/java/org/apache/directory/studio/actions/AddExtensionAction.java?rev=571218&r1=571217&r2=571218&view=diff
==============================================================================
--- directory/studio/trunk/studio-rcp/src/main/java/org/apache/directory/studio/actions/AddExtensionAction.java (original)
+++ directory/studio/trunk/studio-rcp/src/main/java/org/apache/directory/studio/actions/AddExtensionAction.java Thu Aug 30 08:47:09 2007
@@ -89,9 +89,9 @@
try
{
String homeBase = System.getProperty(
- "studio.homebase", Messages.getString( "AddExtensionAction.LDAP_Studio_Home_Base" ) ); //$NON-NLS-1$ //$NON-NLS-2$
+ "studio.homebase", Messages.getString( "AddExtensionAction.Apache_Directory_Studio_Home_Base" ) ); //$NON-NLS-1$ //$NON-NLS-2$
URL url = new URL( homeBase );
- scope.addSearchSite( Messages.getString( "AddExtensionAction.LDAP_Studio_Site" ), url, null ); //$NON-NLS-1$
+ scope.addSearchSite( Messages.getString( "AddExtensionAction.Apache_Directory_Studio_Site" ), url, null ); //$NON-NLS-1$
}
catch ( MalformedURLException e )
{
Modified: directory/studio/trunk/studio-rcp/src/main/resources/org/apache/directory/studio/messages.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-rcp/src/main/resources/org/apache/directory/studio/messages.properties?rev=571218&r1=571217&r2=571218&view=diff
==============================================================================
--- directory/studio/trunk/studio-rcp/src/main/resources/org/apache/directory/studio/messages.properties (original)
+++ directory/studio/trunk/studio-rcp/src/main/resources/org/apache/directory/studio/messages.properties Thu Aug 30 08:47:09 2007
@@ -28,8 +28,8 @@
AddExtensionAction.Add_Extensions=Add Extensions
AddExtensionAction.Search_for_new_extensions=Search for new extensions for Apache Directory Studio
AddExtensionAction.Searching_new_extensions=Searching new extensions
-AddExtensionAction.LDAP_Studio_Site=Apache Directory Studio Site
-AddExtensionAction.LDAP_Studio_Home_Base=http://directory.apache.org/studio/update
+AddExtensionAction.Apache_Directory_Studio_Site=Apache Directory Studio Update Site
+AddExtensionAction.Apache_Directory__Home_Base=http://directory.apache.org/studio/update/1.x
# Strings used by ManageConfigurationAction Class
ManageConfigurationAction.Manage_Configuration=Manage Configuration
@@ -39,15 +39,6 @@
UpdateAction.Search_for_updates=Search for updates...
UpdateAction.Search_for_updates_for_LDAP_Studio=Search for updates for Apache Directory Studio
UpdateAction.Searching_for_updates=Searching for updates
-
-# Strings used by WelcomeView Class
-WelcomeView.Welcome_message=Welcome to Apache Directory Studio.\n\nPlease select a perspective above...
-WelcomeView.LDAP_Browser_Plugin=LDAP Browser Plugin
-WelcomeView.Schemas_Editor_Plugin=Schemas Editor Plugin
-WelcomeView.Apache.org_url=http://www.apache.org/
-WelcomeView.Error=Error \!
-WelcomeView.LDAP_Studio_was_unable_to_open_www.apache.org=Apache Directory Studio was unable to open http://www.apache.org in your default browser.
-WelcomeView.Copyright=\u00A9 Copyright 2007 - Apache Software Foundation
# Strings used by OpenFileAction Class
OpenFileAction.Open_File=Open File...
Modified: directory/studio/trunk/studio-schemaeditor-feature/feature.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-schemaeditor-feature/feature.xml?rev=571218&r1=571217&r2=571218&view=diff
==============================================================================
--- directory/studio/trunk/studio-schemaeditor-feature/feature.xml (original)
+++ directory/studio/trunk/studio-schemaeditor-feature/feature.xml Thu Aug 30 08:47:09 2007
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
- id="org.apache.directory.studio.schemas.feature"
+ id="org.apache.directory.studio.schemaeditor.feature"
label="Apache Directory Studio Schema Editor"
version="1.0.0"
provider-name="Apache Software Foundation"
@@ -8,8 +8,7 @@
image="studio.png">
<description>
- The Apache Directory Studio Schemas Feature contains all plugins related to the
-Schemas Editor.
+ The Apache Directory Studio Schema Feature contains all plugins related to the Schema Editor.
</description>
<copyright>
@@ -229,7 +228,7 @@
unpack="false"/>
<plugin
- id="org.apache.directory.studio.schemas.help"
+ id="org.apache.directory.studio.schemaeditor.help"
download-size="0"
install-size="0"
version="1.0.0"
Modified: directory/studio/trunk/studio-updatesite/build.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-updatesite/build.xml?rev=571218&r1=571217&r2=571218&view=diff
==============================================================================
--- directory/studio/trunk/studio-updatesite/build.xml (original)
+++ directory/studio/trunk/studio-updatesite/build.xml Thu Aug 30 08:47:09 2007
@@ -17,32 +17,34 @@
under the License.
-->
<project default="generate">
- <import file="../studio-build/build.xml"/>
+ <import file="../studio-build/build.xml" />
<!-- Setting updatesite properties -->
<property name="updatesite" value="${target}/updatesite" />
<property name="updatesite.plugins" value="${updatesite}/plugins" />
<property name="updatesite.features" value="${updatesite}/features" />
-
+
<!-- GENERATE TASK -->
<target name="generate" description="Generates the update site. Generates and copies features and plugins.">
- <mkdir dir="${updatesite}"/>
- <mkdir dir="${updatesite.plugins}"/>
- <mkdir dir="${updatesite.features}"/>
+ <mkdir dir="${updatesite}" />
+ <mkdir dir="${updatesite.plugins}" />
+ <mkdir dir="${updatesite.features}" />
<!-- Creation of the Features -->
<!-- Apache Directory Studio RCP Feature -->
<ant dir="../studio-rcp-feature" inheritAll="no" />
- <!-- Apache Directory Studio Schemas Editor Feature -->
- <ant dir="../studio-schemaeditor-feature" inheritAll="no" />
- <!-- Apache Directory Studio Browser Feature -->
- <ant dir="../studio-ldapbrowser-feature" inheritAll="no" />
- <!-- Apache Directory Studio Apache DS Configuration Feature -->
- <ant dir="../studio-apacheds-configuration-feature" inheritAll="no" />
-
+ <!-- Apache Directory Studio Schemas Editor Feature -->
+ <ant dir="../studio-schemaeditor-feature" inheritAll="no" />
+ <!-- Apache Directory Studio LDAP Browser Feature -->
+ <ant dir="../studio-ldapbrowser-feature" inheritAll="no" />
+ <!-- Apache Directory Studio LDIF Editor Feature -->
+ <ant dir="../studio-ldifeditor-feature" inheritAll="no" />
+ <!-- Apache Directory Studio Apache DS Configuration Feature -->
+ <ant dir="../studio-apacheds-configuration-feature" inheritAll="no" />
+
<!-- Copying updatesite files -->
- <copy todir="${updatesite}">
- <fileset dir="${basedir}">
+ <copy todir="${updatesite}">
+ <fileset dir="${basedir}">
<include name="index.html" />
<include name="site--xml.cgi" />
<include name="site--xml.html" />
@@ -50,115 +52,119 @@
<include name="web/**" />
</fileset>
</copy>
-
- <!-- Copying the Features -->
- <copy todir="${updatesite.features}">
- <!-- Apache Directory Studio RCP Feature -->
- <fileset dir="../studio-rcp-feature/target">
- <include name="*.jar" />
- </fileset>
- <!-- Apache Directory Studio Schemas Editor Feature -->
- <fileset dir="../studio-schemaeditor-feature/target">
- <include name="*.jar" />
- </fileset>
- <!-- Apache Directory Studio Browser Feature -->
- <fileset dir="../studio-ldapbrowser-feature/target">
- <include name="*.jar" />
- </fileset>
- <!-- Apache Directory Studio Apache DS Configuration Feature -->
- <fileset dir="../studio-apacheds-configuration-feature/target">
- <include name="*.jar" />
- </fileset>
- </copy>
-
- <!-- Creation of the Plugins -->
- <!-- Apache Directory Studio RCP -->
- <ant dir="../studio-rcp" inheritAll="no" />
- <!-- Apache Directory Studio Help Plugin -->
- <ant dir="../studio-rcp-help" inheritAll="no" />
- <!-- Apache Directory Studio Schemas Editor Plugin -->
- <ant dir="../studio-schemaeditor" inheritAll="no" />
- <!-- Apache Directory Studio Schemas Editor Help Plugin -->
- <ant dir="../studio-schemaeditor-help" inheritAll="no" />
- <!-- Apache Directory Studio Browser Core Plugin -->
- <ant dir="../studio-ldapbrowser-core" inheritAll="no" />
- <!-- Apache Directory Studio Browser Common Plugin -->
- <ant dir="../studio-ldapbrowser-common" inheritAll="no" />
- <!-- Apache Directory Studio Jars Plugin -->
- <ant dir="../studio-jars" inheritAll="no" />
- <!-- Apache Directory Studio LDIF Editor Plugin -->
- <ant dir="../studio-ldifeditor" inheritAll="no" />
- <!-- Apache Directory Studio Value Editors Plugin -->
- <ant dir="../studio-valueeditors" inheritAll="no" />
- <!-- Apache Directory Studio ACI Item Editor Plugin -->
- <ant dir="../studio-aciitemeditor" inheritAll="no" />
- <!-- Apache Directory Studio Browser Help Plugin -->
- <ant dir="../studio-ldapbrowser-help" inheritAll="no" />
- <!-- Apache Directory Studio Browser UI Plugin -->
- <ant dir="../studio-ldapbrowser-ui" inheritAll="no" />
- <!-- Apache Directory Studio Apache DS Configuration Plugin -->
- <ant dir="../studio-apacheds-configuration" inheritAll="no" />
- <!-- Apache Directory Studio Apache DS Configuration Help Plugin -->
- <ant dir="../studio-apacheds-configuration-help" inheritAll="no" />
-
- <!-- Copying the Plugins -->
- <copy todir="${updatesite.plugins}">
- <!-- Apache Directory Studio RCP -->
- <fileset dir="../studio-rcp/target">
- <include name="*.jar" />
- </fileset>
- <!-- Apache Directory Studio Help Plugin -->
- <fileset dir="../studio-rcp-help/target">
- <include name="*.jar" />
- </fileset>
- <!-- Apache Directory Studio Schemas Editor Plugin -->
- <fileset dir="../studio-schemaeditor/target">
- <include name="*.jar" />
- </fileset>
- <!-- Apache Directory Studio Schemas Editor Help Plugin -->
- <fileset dir="../studio-schemaeditor-help/target">
- <include name="*.jar" />
- </fileset>
- <!-- Apache Directory Studio Browser Core Plugin -->
- <fileset dir="../studio-ldapbrowser-core/target">
- <include name="*.jar" />
- </fileset>
- <!-- Apache Directory Studio Browser Common Plugin -->
- <fileset dir="../studio-ldapbrowser-common/target">
- <include name="*.jar" />
- </fileset>
- <!-- Apache Directory Studio LDIF Editor Plugin -->
- <fileset dir="../studio-ldifeditor/target">
- <include name="*.jar" />
- </fileset>
- <!-- Apache Directory Studio Value Editors Plugin -->
- <fileset dir="../studio-valueeditors/target">
- <include name="*.jar" />
- </fileset>
- <!-- Apache Directory Studio Browser Help Plugin -->
- <fileset dir="../studio-ldapbrowser-help/target">
- <include name="*.jar" />
- </fileset>
- <!-- Apache Directory Studio Browser UI Plugin -->
- <fileset dir="../studio-ldapbrowser-ui/target">
- <include name="*.jar" />
- </fileset>
- <!-- Apache Directory Studio ACI Item Editor Plugin -->
- <fileset dir="../studio-aciitemeditor/target">
- <include name="*.jar" />
- </fileset>
- <!-- Apache Directory Studio Jars Plugin -->
- <fileset dir="../studio-jars/target">
- <include name="*.jar" />
- </fileset>
- <!-- Apache Directory Studio Apache DS Configuration Plugin -->
- <fileset dir="../studio-apacheds-configuration/target">
- <include name="*.jar" />
- </fileset>
- <!-- Apache Directory Studio Apache DS Configuration Plugin Help -->
- <fileset dir="../studio-apacheds-configuration-help/target">
- <include name="*.jar" />
- </fileset>
- </copy>
+
+ <!-- Copying the Features -->
+ <copy todir="${updatesite.features}">
+ <!-- Apache Directory Studio RCP Feature -->
+ <fileset dir="../studio-rcp-feature/target">
+ <include name="*.jar" />
+ </fileset>
+ <!-- Apache Directory Studio Schemas Editor Feature -->
+ <fileset dir="../studio-schemaeditor-feature/target">
+ <include name="*.jar" />
+ </fileset>
+ <!-- Apache Directory Studio LDAP Browser Feature -->
+ <fileset dir="../studio-ldapbrowser-feature/target">
+ <include name="*.jar" />
+ </fileset>
+ <!-- Apache Directory Studio Apache DS Configuration Feature -->
+ <fileset dir="../studio-ldifeditor-feature/target">
+ <include name="*.jar" />
+ </fileset>
+ <!-- Apache Directory Studio Apache DS Configuration Feature -->
+ <fileset dir="../studio-apacheds-configuration-feature/target">
+ <include name="*.jar" />
+ </fileset>
+ </copy>
+
+ <!-- Creation of the Plugins -->
+ <!-- Apache Directory Studio RCP -->
+ <ant dir="../studio-rcp" inheritAll="no" />
+ <!-- Apache Directory Studio Help Plugin -->
+ <ant dir="../studio-rcp-help" inheritAll="no" />
+ <!-- Apache Directory Studio Schemas Editor Plugin -->
+ <ant dir="../studio-schemaeditor" inheritAll="no" />
+ <!-- Apache Directory Studio Schemas Editor Help Plugin -->
+ <ant dir="../studio-schemaeditor-help" inheritAll="no" />
+ <!-- Apache Directory Studio Browser Core Plugin -->
+ <ant dir="../studio-ldapbrowser-core" inheritAll="no" />
+ <!-- Apache Directory Studio Browser Common Plugin -->
+ <ant dir="../studio-ldapbrowser-common" inheritAll="no" />
+ <!-- Apache Directory Studio Jars Plugin -->
+ <ant dir="../studio-jars" inheritAll="no" />
+ <!-- Apache Directory Studio LDIF Editor Plugin -->
+ <ant dir="../studio-ldifeditor" inheritAll="no" />
+ <!-- Apache Directory Studio Value Editors Plugin -->
+ <ant dir="../studio-valueeditors" inheritAll="no" />
+ <!-- Apache Directory Studio ACI Item Editor Plugin -->
+ <ant dir="../studio-aciitemeditor" inheritAll="no" />
+ <!-- Apache Directory Studio Browser Help Plugin -->
+ <ant dir="../studio-ldapbrowser-help" inheritAll="no" />
+ <!-- Apache Directory Studio Browser UI Plugin -->
+ <ant dir="../studio-ldapbrowser-ui" inheritAll="no" />
+ <!-- Apache Directory Studio Apache DS Configuration Plugin -->
+ <ant dir="../studio-apacheds-configuration" inheritAll="no" />
+ <!-- Apache Directory Studio Apache DS Configuration Help Plugin -->
+ <ant dir="../studio-apacheds-configuration-help" inheritAll="no" />
+
+ <!-- Copying the Plugins -->
+ <copy todir="${updatesite.plugins}">
+ <!-- Apache Directory Studio RCP -->
+ <fileset dir="../studio-rcp/target">
+ <include name="*.jar" />
+ </fileset>
+ <!-- Apache Directory Studio Help Plugin -->
+ <fileset dir="../studio-rcp-help/target">
+ <include name="*.jar" />
+ </fileset>
+ <!-- Apache Directory Studio Schemas Editor Plugin -->
+ <fileset dir="../studio-schemaeditor/target">
+ <include name="*.jar" />
+ </fileset>
+ <!-- Apache Directory Studio Schemas Editor Help Plugin -->
+ <fileset dir="../studio-schemaeditor-help/target">
+ <include name="*.jar" />
+ </fileset>
+ <!-- Apache Directory Studio Browser Core Plugin -->
+ <fileset dir="../studio-ldapbrowser-core/target">
+ <include name="*.jar" />
+ </fileset>
+ <!-- Apache Directory Studio Browser Common Plugin -->
+ <fileset dir="../studio-ldapbrowser-common/target">
+ <include name="*.jar" />
+ </fileset>
+ <!-- Apache Directory Studio LDIF Editor Plugin -->
+ <fileset dir="../studio-ldifeditor/target">
+ <include name="*.jar" />
+ </fileset>
+ <!-- Apache Directory Studio Value Editors Plugin -->
+ <fileset dir="../studio-valueeditors/target">
+ <include name="*.jar" />
+ </fileset>
+ <!-- Apache Directory Studio Browser Help Plugin -->
+ <fileset dir="../studio-ldapbrowser-help/target">
+ <include name="*.jar" />
+ </fileset>
+ <!-- Apache Directory Studio Browser UI Plugin -->
+ <fileset dir="../studio-ldapbrowser-ui/target">
+ <include name="*.jar" />
+ </fileset>
+ <!-- Apache Directory Studio ACI Item Editor Plugin -->
+ <fileset dir="../studio-aciitemeditor/target">
+ <include name="*.jar" />
+ </fileset>
+ <!-- Apache Directory Studio Jars Plugin -->
+ <fileset dir="../studio-jars/target">
+ <include name="*.jar" />
+ </fileset>
+ <!-- Apache Directory Studio Apache DS Configuration Plugin -->
+ <fileset dir="../studio-apacheds-configuration/target">
+ <include name="*.jar" />
+ </fileset>
+ <!-- Apache Directory Studio Apache DS Configuration Plugin Help -->
+ <fileset dir="../studio-apacheds-configuration-help/target">
+ <include name="*.jar" />
+ </fileset>
+ </copy>
</target>
</project>
Modified: directory/studio/trunk/studio-updatesite/site.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-updatesite/site.xml?rev=571218&r1=571217&r2=571218&view=diff
==============================================================================
--- directory/studio/trunk/studio-updatesite/site.xml (original)
+++ directory/studio/trunk/studio-updatesite/site.xml Thu Aug 30 08:47:09 2007
@@ -3,18 +3,29 @@
<description url="http://directory.apache.org/studio/update/1.x">
The Apache Directory Studio update site.
</description>
- <feature url="features/org.apache.directory.studio.rcp.feature_1.0.0.jar" id="org.apache.directory.studio.rcp.feature" version="1.0.0" os="linux,macosx,win32" ws="carbon,gtk,win32" arch="ppc,x86,x86_64">
+ <feature
+ url="features/org.apache.directory.studio.rcp.feature_1.0.0.jar"
+ id="org.apache.directory.studio.rcp.feature" version="1.0.0"
+ os="linux,macosx,win32" ws="carbon,gtk,win32" arch="ppc,x86,x86_64">
<category name="Apache Directory Studio RCP"/>
</feature>
- <feature url="features/org.apache.directory.studio.ldapbrowser.feature_1.0.0.jar" id="org.apache.directory.studio.ldapbrowser.feature" version="1.0.0">
+ <feature
+ url="features/org.apache.directory.studio.ldapbrowser.feature_1.0.0.jar"
+ id="org.apache.directory.studio.ldapbrowser.feature" version="1.0.0">
<category name="Apache Directory Studio LDAP Browser"/>
</feature>
- <feature url="features/org.apache.directory.studio.schemaeditor.feature_1.0.0.jar" id="org.apache.directory.studio.schemaeditor.feature" version="1.0.0">
+ <feature url="features/org.apache.directory.studio.schemaeditor.feature_1.0.0.jar"
+ id="org.apache.directory.studio.schemaeditor.feature" version="1.0.0">
<category name="Apache Directory Studio Schema Editor"/>
</feature>
- <feature url="features/org.apache.directory.studio.apacheds.configuration.feature_1.0.0.jar" id="org.apache.directory.studio.apacheds.configuration.feature" version="1.0.0">
+ <feature url="features/org.apache.directory.studio.apacheds.configuration.feature_1.0.0.jar"
+ id="org.apache.directory.studio.apacheds.configuration.feature" version="1.0.0">
<category name="Apache Directory Studio Apache DS"/>
</feature>
+ <feature url="features/org.apache.directory.studio.ldifeditor.feature_1.0.0.jar"
+ id="org.apache.directory.studio.ldifeditor.feature" version="1.0.0">
+ <category name="Apache Directory Studio LDIF Editor"/>
+ </feature>
<category-def name="Apache Directory Studio RCP" label="Apache Directory Studio RCP">
<description>
The Apache Directory Studio RCP category contains all features related to the RCP Application.
@@ -30,9 +41,14 @@
The Apache Directory Studio Schema category contains all features related to the Schema Editor.
</description>
</category-def>
- <category-def name="Apache Directory Studio Apache DS" label="Apache Directory Apache DS">
+ <category-def name="Apache Directory Studio Apache DS" label="Apache Directory Studio Apache DS">
<description>
The Apache Directory Studio Apache DS category contains all features related to Apache DS.
+ </description>
+ </category-def>
+ <category-def name="Apache Directory Studio LDIF Editor" label="Apache Directory Studio LDIF Editor">
+ <description>
+ The Apache Directory Studio LDIF Editor category contains all features related to the LDIF Editor.
</description>
</category-def>
</site>