directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r690902 - in /directory/studio/trunk/apacheds-configuration: ./ src/main/java/org/apache/directory/studio/apacheds/configuration/ src/main/java/org/apache/directory/studio/apacheds/configuration/editor/
Date Mon, 01 Sep 2008 08:08:01 GMT
Author: pamarcelot
Date: Mon Sep  1 01:08:00 2008
New Revision: 690902

URL: http://svn.apache.org/viewvc?rev=690902&view=rev
Log:
Part of a fix for DIRSTUDIO-375 (Move each plugin IDs in a plugin.properties file).

Modified:
    directory/studio/trunk/apacheds-configuration/plugin.properties
    directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/ApacheDSConfigurationPlugin.java
    directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/ApacheDSConfigurationPluginConstants.java
    directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ServerConfigurationEditor.java

Modified: directory/studio/trunk/apacheds-configuration/plugin.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds-configuration/plugin.properties?rev=690902&r1=690901&r2=690902&view=diff
==============================================================================
--- directory/studio/trunk/apacheds-configuration/plugin.properties (original)
+++ directory/studio/trunk/apacheds-configuration/plugin.properties Mon Sep  1 01:08:00 2008
@@ -15,6 +15,8 @@
 # specific language governing permissions and limitations
 # under the License.
 
+Plugin_id=org.apache.directory.studio.apacheds.configuration
+
 Editor_ServerConfigurationEditor_id=org.apache.directory.studio.apacheds.configuration.editor
 Editor_ServerConfigurationEditor_name=Apache DS Configuration File Editor
 

Modified: directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/ApacheDSConfigurationPlugin.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/ApacheDSConfigurationPlugin.java?rev=690902&r1=690901&r2=690902&view=diff
==============================================================================
--- directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/ApacheDSConfigurationPlugin.java
(original)
+++ directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/ApacheDSConfigurationPlugin.java
Mon Sep  1 01:08:00 2008
@@ -53,9 +53,6 @@
  */
 public class ApacheDSConfigurationPlugin extends AbstractUIPlugin
 {
-    /** The plug-in ID */
-    public static final String PLUGIN_ID = "org.apache.directory.studio.apacheds.configuration";
//$NON-NLS-1$
-
     /** The shared instance */
     private static ApacheDSConfigurationPlugin plugin;
 
@@ -208,8 +205,10 @@
             }
             catch ( IOException e )
             {
+                // We can't use the PLUGIN_ID constant since loading the plugin.properties
file has failed,
+                // So we're using a default plugin id.
                 getLog().log(
-                    new Status( Status.ERROR, ApacheDSConfigurationPlugin.PLUGIN_ID, Status.OK,
+                    new Status( Status.ERROR, "org.apache.directory.studio.apacheds.configuration",
Status.OK,
                         "Unable to get the plugin properties.", e ) );
             }
         }

Modified: directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/ApacheDSConfigurationPluginConstants.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/ApacheDSConfigurationPluginConstants.java?rev=690902&r1=690901&r2=690902&view=diff
==============================================================================
--- directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/ApacheDSConfigurationPluginConstants.java
(original)
+++ directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/ApacheDSConfigurationPluginConstants.java
Mon Sep  1 01:08:00 2008
@@ -20,6 +20,7 @@
 package org.apache.directory.studio.apacheds.configuration;
 
 
+
 /**
  * This interface contains all the Constants used in the Plugin.
  *
@@ -28,6 +29,9 @@
  */
 public interface ApacheDSConfigurationPluginConstants
 {
+    /** The plug-in ID */
+    public static final String PLUGIN_ID = ApacheDSConfigurationPlugin.getDefault().getPluginProperties().getString(
"Plugin_id" );
+    
     // ------
     // IMAGES
     // ------

Modified: directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ServerConfigurationEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ServerConfigurationEditor.java?rev=690902&r1=690901&r2=690902&view=diff
==============================================================================
--- directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ServerConfigurationEditor.java
(original)
+++ directory/studio/trunk/apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ServerConfigurationEditor.java
Mon Sep  1 01:08:00 2008
@@ -309,7 +309,7 @@
         catch ( PartInitException e )
         {
             ApacheDSConfigurationPlugin.getDefault().getLog().log(
-                new Status( Status.ERROR, ApacheDSConfigurationPlugin.PLUGIN_ID, Status.OK,
e.getMessage(), e
+                new Status( Status.ERROR, ApacheDSConfigurationPluginConstants.PLUGIN_ID,
Status.OK, e.getMessage(), e
                     .getCause() ) );
         }
     }



Mime
View raw message