You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2017/08/27 21:16:36 UTC
svn commit: r1806391 - in
/directory/studio/branches/studio-value/plugins/connection.core: ./
src/main/java/org/apache/directory/studio/connection/core/
Author: elecharny
Date: Sun Aug 27 21:16:36 2017
New Revision: 1806391
URL: http://svn.apache.org/viewvc?rev=1806391&view=rev
Log:
o Get rid of Plugin_id in plugin.properties
o Removed the various ID defined in plugin.properties that are used only once
Modified:
directory/studio/branches/studio-value/plugins/connection.core/plugin.properties
directory/studio/branches/studio-value/plugins/connection.core/plugin.xml
directory/studio/branches/studio-value/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionCoreConstants.java
directory/studio/branches/studio-value/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionCorePlugin.java
directory/studio/branches/studio-value/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionManager.java
Modified: directory/studio/branches/studio-value/plugins/connection.core/plugin.properties
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/connection.core/plugin.properties?rev=1806391&r1=1806390&r2=1806391&view=diff
==============================================================================
--- directory/studio/branches/studio-value/plugins/connection.core/plugin.properties (original)
+++ directory/studio/branches/studio-value/plugins/connection.core/plugin.properties Sun Aug 27 21:16:36 2017
@@ -15,21 +15,17 @@
# specific language governing permissions and limitations
# under the License.
-Plugin_id=org.apache.directory.studio.connection.core
-
-ExtensionPoint_JndiLogger_id=org.apache.directory.studio.jndilogger
+#---------------------------------------------------------------------------------------------------
+# The I18n Strings
+#---------------------------------------------------------------------------------------------------
ExtensionPoint_JndiLogger_name=JNDI Logger
-ExtensionPoint_ConnectionListener_id=org.apache.directory.studio.connectionlistener
ExtensionPoint_ConnectionListener_name=Connection Listener
-ExtensionPoint_ConnectionInitializer_id=org.apache.directory.studio.connectionInitializer
ExtensionPoint_ConnectionInitializer_name=Connection Initializer
-JndiLogger_LdifModificationLogger_id=org.apache.directory.studio.connection.core.io.jndi.LdifModificationLogger
JndiLogger_LdifModificationLogger_name=LDIF Modification Logger
JndiLogger_LdifModificationLogger_description=Logs modifications in LDIF format to a file.
-JndiLogger_LdifSearchLogger_id=org.apache.directory.studio.connection.core.io.jndi.LdifSearchLogger
JndiLogger_LdifSearchLogger_name=LDIF Search Logger
JndiLogger_LdifSearchLogger_description=Logs searches in LDIF format to a file.
\ No newline at end of file
Modified: directory/studio/branches/studio-value/plugins/connection.core/plugin.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/connection.core/plugin.xml?rev=1806391&r1=1806390&r2=1806391&view=diff
==============================================================================
--- directory/studio/branches/studio-value/plugins/connection.core/plugin.xml (original)
+++ directory/studio/branches/studio-value/plugins/connection.core/plugin.xml Sun Aug 27 21:16:36 2017
@@ -19,29 +19,30 @@
under the License.
-->
<plugin>
- <extension-point id="org.apache.directory.studio.jndilogger" name="%ExtensionPoint_JndiLogger_name" schema="src/main/resources/jndiLogger.exsd"/>
- <extension-point id="org.apache.directory.studio.connectionlistener" name="%ExtensionPoint_ConnectionListener_name" schema="src/main/resources/connectionListener.exsd"/>
- <extension-point id="org.apache.directory.studio.connectionInitializer" name="%ExtensionPoint_ConnectionInitializer_name" schema="src/main/resources/connectionInitializer.exsd"/>
- <extension
- point="org.apache.directory.studio.jndilogger">
- <jndiLogger
- class="org.apache.directory.studio.connection.core.io.jndi.LdifModificationLogger"
- description="%JndiLogger_LdifModificationLogger_description"
- id="%JndiLogger_LdifModificationLogger_id"
- name="%JndiLogger_LdifModificationLogger_name">
- </jndiLogger>
- <jndiLogger
- class="org.apache.directory.studio.connection.core.io.jndi.LdifSearchLogger"
- description="%JndiLogger_LdifSearchLogger_description"
- id="%JndiLogger_LdifSearchLogger_id"
- name="%JndiLogger_LdifSearchLogger_name">
- </jndiLogger>
- </extension>
- <extension
- point="org.eclipse.core.runtime.preferences">
- <initializer
- class="org.apache.directory.studio.connection.core.ConnectionCorePreferencesInitializer">
- </initializer>
- </extension>
-
+ <extension-point id="org.apache.directory.studio.jndilogger" name="%ExtensionPoint_JndiLogger_name"
+ schema="src/main/resources/jndiLogger.exsd"/>
+
+ <extension-point id="org.apache.directory.studio.connectionlistener" name="%ExtensionPoint_ConnectionListener_name"
+ schema="src/main/resources/connectionListener.exsd"/>
+
+ <extension-point id="org.apache.directory.studio.connectionInitializer" name="%ExtensionPoint_ConnectionInitializer_name"
+ schema="src/main/resources/connectionInitializer.exsd"/>
+
+ <extension point="org.apache.directory.studio.jndilogger">
+ <jndiLogger
+ class="org.apache.directory.studio.connection.core.io.jndi.LdifModificationLogger"
+ description="%JndiLogger_LdifModificationLogger_description"
+ id="org.apache.directory.studio.connection.core.io.jndi.LdifModificationLogger"
+ name="%JndiLogger_LdifModificationLogger_name"/>
+
+ <jndiLogger
+ class="org.apache.directory.studio.connection.core.io.jndi.LdifSearchLogger"
+ description="%JndiLogger_LdifSearchLogger_description"
+ id="org.apache.directory.studio.connection.core.io.jndi.LdifSearchLogger"
+ name="%JndiLogger_LdifSearchLogger_name"/>
+ </extension>
+
+ <extension point="org.eclipse.core.runtime.preferences">
+ <initializer class="org.apache.directory.studio.connection.core.ConnectionCorePreferencesInitializer"/>
+ </extension>
</plugin>
Modified: directory/studio/branches/studio-value/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionCoreConstants.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionCoreConstants.java?rev=1806391&r1=1806390&r2=1806391&view=diff
==============================================================================
--- directory/studio/branches/studio-value/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionCoreConstants.java (original)
+++ directory/studio/branches/studio-value/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionCoreConstants.java Sun Aug 27 21:16:36 2017
@@ -41,8 +41,7 @@ public final class ConnectionCoreConstan
}
/** The plug-in ID */
- public static final String PLUGIN_ID = ConnectionCorePlugin.getDefault().getPluginProperties()
- .getString( "Plugin_id" ); //$NON-NLS-1$
+ public static final String PLUGIN_ID = ConnectionCoreConstants.class.getPackage().getName();
/** The line separator. */
public static final String LINE_SEPARATOR = System.getProperty( "line.separator" ); //$NON-NLS-1$
Modified: directory/studio/branches/studio-value/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionCorePlugin.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionCorePlugin.java?rev=1806391&r1=1806390&r2=1806391&view=diff
==============================================================================
--- directory/studio/branches/studio-value/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionCorePlugin.java (original)
+++ directory/studio/branches/studio-value/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionCorePlugin.java Sun Aug 27 21:16:36 2017
@@ -442,8 +442,7 @@ public class ConnectionCorePlugin extend
jndiLoggers = new ArrayList<IJndiLogger>();
IExtensionRegistry registry = Platform.getExtensionRegistry();
- IExtensionPoint extensionPoint = registry.getExtensionPoint( getPluginProperties().getString(
- "ExtensionPoint_JndiLogger_id" ) ); //$NON-NLS-1$
+ IExtensionPoint extensionPoint = registry.getExtensionPoint( "org.apache.directory.studio.jndilogger" ); //$NON-NLS-1$
IConfigurationElement[] members = extensionPoint.getConfigurationElements();
for ( IConfigurationElement member : members )
{
@@ -480,8 +479,7 @@ public class ConnectionCorePlugin extend
connectionListeners = new ArrayList<IConnectionListener>();
IExtensionRegistry registry = Platform.getExtensionRegistry();
- IExtensionPoint extensionPoint = registry.getExtensionPoint( getPluginProperties().getString(
- "ExtensionPoint_ConnectionListener_id" ) ); //$NON-NLS-1$
+ IExtensionPoint extensionPoint = registry.getExtensionPoint( "org.apache.directory.studio.connectionlistener" ); //$NON-NLS-1$
IConfigurationElement[] members = extensionPoint.getConfigurationElements();
for ( IConfigurationElement member : members )
{
Modified: directory/studio/branches/studio-value/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionManager.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionManager.java?rev=1806391&r1=1806390&r2=1806391&view=diff
==============================================================================
--- directory/studio/branches/studio-value/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionManager.java (original)
+++ directory/studio/branches/studio-value/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionManager.java Sun Aug 27 21:16:36 2017
@@ -93,8 +93,7 @@ public class ConnectionManager implement
}
IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(
- ConnectionCorePlugin.getDefault().getPluginProperties()
- .getString( "ExtensionPoint_ConnectionInitializer_id" ) ); //$NON-NLS-1$
+ "org.apache.directory.studio.connectionInitializer" ); //$NON-NLS-1$
IConfigurationElement[] configurationElements = extensionPoint.getConfigurationElements();
for ( IConfigurationElement configurationElement : configurationElements )