directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1806342 - in /directory/studio/branches/studio-value/plugins: aciitemeditor/ aciitemeditor/resources/templates/ aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/ apacheds.configuration/ apacheds.configuration/src/main/...
Date Sun, 27 Aug 2017 07:05:42 GMT
Author: elecharny
Date: Sun Aug 27 07:05:41 2017
New Revision: 1806342

URL: http://svn.apache.org/viewvc?rev=1806342&view=rev
Log:
o Get rid of Plugin_id in plugin.properties
o Removed the various ID defined in plugin.properties
o A bit of formating
o Removed some SonarLint warnings

Modified:
    directory/studio/branches/studio-value/plugins/aciitemeditor/plugin.properties
    directory/studio/branches/studio-value/plugins/aciitemeditor/plugin.xml
    directory/studio/branches/studio-value/plugins/aciitemeditor/resources/templates/templates.xml
    directory/studio/branches/studio-value/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/ACIITemConstants.java
    directory/studio/branches/studio-value/plugins/apacheds.configuration/plugin.properties
    directory/studio/branches/studio-value/plugins/apacheds.configuration/plugin.xml
    directory/studio/branches/studio-value/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/ApacheDS2ConfigurationPluginConstants.java
    directory/studio/branches/studio-value/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ServerConfigurationEditorUtils.java

Modified: directory/studio/branches/studio-value/plugins/aciitemeditor/plugin.properties
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/aciitemeditor/plugin.properties?rev=1806342&r1=1806341&r2=1806342&view=diff
==============================================================================
--- directory/studio/branches/studio-value/plugins/aciitemeditor/plugin.properties (original)
+++ directory/studio/branches/studio-value/plugins/aciitemeditor/plugin.properties Sun Aug 27 07:05:41 2017
@@ -15,11 +15,8 @@
 # specific language governing permissions and limitations
 # under the License.
 
-Plugin_id=org.apache.directory.studio.aciitemeditor
-
 ValueEditor_AciItemValueEditor_name=ACI Item Editor
 
 ValueEditor_SubtreeValueEditor_name=Subtree Specification Editor
 
-CtxType_AciItem_Template_id=org.apache.directory.studio.aciitemeditor.templates
 CtxType_AciItem_Template_name=ACI Item
\ No newline at end of file

Modified: directory/studio/branches/studio-value/plugins/aciitemeditor/plugin.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/aciitemeditor/plugin.xml?rev=1806342&r1=1806341&r2=1806342&view=diff
==============================================================================
--- directory/studio/branches/studio-value/plugins/aciitemeditor/plugin.xml (original)
+++ directory/studio/branches/studio-value/plugins/aciitemeditor/plugin.xml Sun Aug 27 07:05:41 2017
@@ -19,29 +19,32 @@
   under the License.
 -->
 <plugin>
-
-   <extension
-         point="org.apache.directory.studio.valueeditors">
-      <valueEditor
-            class="org.apache.directory.studio.aciitemeditor.ACIItemValueEditor"
-            icon="resources/icons/aciitemeditor.gif"
-            name="%ValueEditor_AciItemValueEditor_name">
-         <syntax syntaxOID="1.3.6.1.4.1.1466.115.121.1.1"/>
-      </valueEditor>
-      <valueEditor
-            class="org.apache.directory.studio.aciitemeditor.valueeditors.SubtreeValueEditor"
-            icon="resources/icons/subtreeeditor.png"
-            name="%ValueEditor_SubtreeValueEditor_name">
-         <syntax syntaxOID="1.3.6.1.4.1.1466.115.121.1.45"/>
-      </valueEditor>
-   </extension>
-   <extension
-         point="org.eclipse.ui.editors.templates">
-      <include file="resources/templates/templates.xml"/>
-      <contextType
-            class="org.eclipse.jface.text.templates.TemplateContextType"
-            id="%CtxType_AciItem_Template_id"
-            name="%CtxType_AciItem_Template_name"/>
-   </extension>
-
+  <!-- Define two editors :       -->
+  <!-- o One for the ACIItem      -->
+  <!-- o Pne for the SubtreeValue -->
+  <extension
+      point="org.apache.directory.studio.valueeditors">
+    <valueEditor
+        class="org.apache.directory.studio.aciitemeditor.ACIItemValueEditor"
+        icon="resources/icons/aciitemeditor.gif"
+        name="%ValueEditor_AciItemValueEditor_name">
+      <syntax syntaxOID="1.3.6.1.4.1.1466.115.121.1.1"/>
+    </valueEditor>
+    
+    <valueEditor
+        class="org.apache.directory.studio.aciitemeditor.valueeditors.SubtreeValueEditor"
+        icon="resources/icons/subtreeeditor.png"
+        name="%ValueEditor_SubtreeValueEditor_name">
+      <syntax syntaxOID="1.3.6.1.4.1.1466.115.121.1.45"/>
+    </valueEditor>
+  </extension>
+  
+  <extension
+      point="org.eclipse.ui.editors.templates">
+    <include file="resources/templates/templates.xml"/>
+    <contextType
+        class="org.eclipse.jface.text.templates.TemplateContextType"
+        id="org.apache.directory.studio.aciitemeditor.templates"
+        name="%CtxType_AciItem_Template_name"/>
+  </extension>
 </plugin>

Modified: directory/studio/branches/studio-value/plugins/aciitemeditor/resources/templates/templates.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/aciitemeditor/resources/templates/templates.xml?rev=1806342&r1=1806341&r2=1806342&view=diff
==============================================================================
--- directory/studio/branches/studio-value/plugins/aciitemeditor/resources/templates/templates.xml (original)
+++ directory/studio/branches/studio-value/plugins/aciitemeditor/resources/templates/templates.xml Sun Aug 27 07:05:41 2017
@@ -19,511 +19,645 @@
 -->
 <!-- This file is used to store the code templates for the ACI Item syntax  -->
 <templates>
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.identificationTag" 
-		name="identificationTag"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">identificationTag "${cursor}",
-</template>
-		
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.precedence" 
-		name="precedence"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">precedence ${cursor},
-</template>
-		
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.authenticationLevel" 
-		name="authenticationLevel"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">authenticationLevel ${cursor},
-</template>
-		
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.none" 
-		name="none"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">none</template>
-		
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.simple" 
-		name="simple"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">simple</template>
-		
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.strong" 
-		name="strong"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">strong</template>
-		
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.itemOrUserFirst" 
-		name="itemOrUserFirst"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">itemOrUserFirst ${cursor}</template>
-		
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.itemFirst" 
-		name="itemFirst"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">itemFirst : 
-{
-    ${cursor}
-}</template>
-
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.userFirst" 
-		name="userFirst"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">userFirst : 
-{
-    ${cursor}
-}</template>
-
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.userClasses" 
-		name="userClasses"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">userClasses 
-{
-    ${cursor}
-}</template>
-
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.userPermissions" 
-		name="userPermissions"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">userPermissions 
-{
-    ${cursor}
-}</template>
-
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.protectedItems" 
-		name="protectedItems"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">protectedItems 
-{
-    ${cursor}
-}</template>
-
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.itemPermissions" 
-		name="itemPermissions"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">itemPermissions 
-{
-    ${cursor}
-}</template>
-
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.grantAdd" 
-		name="grantAdd"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">grantAdd</template>
-
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.denyAdd" 
-		name="denyAdd"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">denyAdd</template>
-
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.grantDiscloseOnError" 
-		name="grantDiscloseOnError"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">grantDiscloseOnError</template>
-
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.denyDiscloseOnError" 
-		name="denyDiscloseOnError"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">denyDiscloseOnError</template>
-
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.grantRead" 
-		name="grantRead"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">grantRead</template>
-
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.denyRead" 
-		name="denyRead"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">denyRead</template>
-
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.grantRemove" 
-		name="grantRemove"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">grantRemove</template>
-
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.denyRemove" 
-		name="denyRemove"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">denyRemove</template>
-
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.grantBrowse" 
-		name="grantBrowse"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">grantBrowse</template>
-
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.denyBrowse" 
-		name="denyBrowse"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">denyBrowse</template>
-
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.grantExport" 
-		name="grantExport"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">grantExport</template>
-
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.denyExport" 
-		name="denyExport"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">denyExport</template>
-
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.grantImport" 
-		name="grantImport"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">grantImport</template>
-
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.denyImport" 
-		name="denyImport"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">denyImport</template>
-
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.grantModify" 
-		name="grantModify"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">grantModify</template>
-
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.denyModify" 
-		name="denyModify"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">denyModify</template>
-
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.grantRename" 
-		name="grantRename"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">grantRename</template>
-
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.denyRename" 
-		name="denyRename"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">denyRename</template>
-
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.grantReturnDN" 
-		name="grantReturnDN"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">grantReturnDN</template>
-
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.denyReturnDN" 
-		name="denyReturnDN"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">denyReturnDN</template>
-
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.grantCompare" 
-		name="grantCompare"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">grantCompare</template>
-
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.denyCompare" 
-		name="denyCompare"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">denyCompare</template>
-		
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.grantFilterMatch" 
-		name="grantFilterMatch"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">grantFilterMatch</template>
-
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.denyFilterMatch" 
-		name="denyFilterMatch"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">denyFilterMatch</template>
-
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.grantInvoke" 
-		name="grantInvoke"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">grantInvoke</template>
-
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.denyInvoke" 
-		name="denyInvoke"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">denyInvoke</template>
-		
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.classes" 
-		name="classes"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">classes ${cursor}</template>
-		
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.entry" 
-		name="entry"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">entry</template>
-
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.allUserAttributeTypes" 
-		name="allUserAttributeTypes"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">allUserAttributeTypes</template>
-		
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.allUserAttributeTypesAndValues" 
-		name="allUserAttributeTypesAndValues"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">allUserAttributeTypesAndValues</template>
-		
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.grantsAndDenials" 
-		name="grantsAndDenials"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">grantsAndDenials
-{
-    ${cursor}
-}</template>
-
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.allUsers" 
-		name="allUsers"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">allUsers</template>
-
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.thisEntry" 
-		name="thisEntry"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">thisEntry</template>
-		
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.attributeType" 
-		name="attributeType"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">attributeType ${cursor}</template>
-		
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.allAttributeValues" 
-		name="allAttributeValues"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">allAttributeValues ${cursor}</template>
-		
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.selfValue" 
-		name="selfValue"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">selfValue ${cursor}</template>
-		
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.item" 
-		name="item"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">item:${cursor}</template>
-		
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.item" 
-		name="item:"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">item:${cursor}</template>
-		
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.and" 
-		name="and:"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">and:${cursor}</template>
-		
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.or" 
-		name="or:"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">or:${cursor}</template>
-		
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.not" 
-		name="not:"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">not:${cursor}</template>
-
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.name" 
-		name="name"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">name { ${cursor} }</template>
-		
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.userGroup" 
-		name="userGroup"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">userGroup { ${cursor} }</template>
-		
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.subtree" 
-		name="subtree"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">subtree { ${cursor} }</template>
-		
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.base" 
-		name="base"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">base ${cursor}</template>
-
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.specificExclusions" 
-		name="specificExclusions"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">specificExclusions ${cursor}</template>	
-
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.chopBefore" 
-		name="chopBefore:"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">chopBefore:${cursor}</template>
-		
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.chopAfter" 
-		name="chopAfter:"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">chopAfter:${cursor}</template>
-
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.minimum" 
-		name="minimum"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">minimum ${cursor}</template>
-
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.maximum" 
-		name="maximum"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">maximum ${cursor}</template>
-		
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.valuesIn" 
-		name="valuesIn"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">valuesIn ${cursor}</template>
-		
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.type" 
-		name="type"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">type ${cursor}</template>
-		
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.maxCount" 
-		name="maxCount"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">maxCount ${cursor}</template>
-		
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.maxImmSub" 
-		name="maxImmSub"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">maxImmSub ${cursor}</template>
-		
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.maxValueCount" 
-		name="maxValueCount"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">maxValueCount { ${cursor} }</template>
-
-	<template 
-		id="org.apache.directory.studio.aciitemeditor.templates.restrictedBy" 
-		name="restrictedBy"
-		context="org.apache.directory.studio.aciitemeditor.templates" 
-		enabled="true"
-		deleted="false">restrictedBy { ${cursor} }</template>
-
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.identificationTag" 
+      name="identificationTag"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+    identificationTag "${cursor}",
+  </template>
+
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.precedence" 
+      name="precedence"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+    precedence ${cursor},
+  </template>
+
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.authenticationLevel" 
+      name="authenticationLevel"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+    authenticationLevel ${cursor},
+  </template>
+
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.none" 
+      name="none"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+    none
+  </template>
+
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.simple" 
+      name="simple"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+    simple
+  </template>
+
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.strong" 
+      name="strong"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+    strong
+  </template>
+
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.itemOrUserFirst" 
+      name="itemOrUserFirst"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+    itemOrUserFirst ${cursor}
+  </template>
+
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.itemFirst" 
+      name="itemFirst"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+      itemFirst : 
+      {
+          ${cursor}
+      }
+  </template>
+
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.userFirst" 
+      name="userFirst"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+    userFirst : 
+    {
+        ${cursor}
+    }
+  </template>
+
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.userClasses" 
+      name="userClasses"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+    userClasses 
+    {
+        ${cursor}
+    }
+  </template>
+
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.userPermissions" 
+      name="userPermissions"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+    userPermissions 
+    {
+        ${cursor}
+    }
+  </template>
+
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.protectedItems" 
+      name="protectedItems"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+    protectedItems 
+    {
+        ${cursor}
+    }
+  </template>
+
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.itemPermissions" 
+      name="itemPermissions"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+    itemPermissions 
+    {
+        ${cursor}
+    }
+  </template>
+
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.grantAdd" 
+      name="grantAdd"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+    grantAdd
+  </template>
+
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.denyAdd" 
+      name="denyAdd"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+    denyAdd
+  </template>
+
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.grantDiscloseOnError" 
+      name="grantDiscloseOnError"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+    grantDiscloseOnError
+  </template>
+
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.denyDiscloseOnError" 
+      name="denyDiscloseOnError"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+    denyDiscloseOnError
+  </template>
+
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.grantRead" 
+      name="grantRead"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+    grantRead
+  </template>
+
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.denyRead" 
+      name="denyRead"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+    denyRead
+  </template>
+
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.grantRemove" 
+      name="grantRemove"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+    grantRemove
+  </template>
+
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.denyRemove" 
+      name="denyRemove"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+    denyRemove
+  </template>
+
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.grantBrowse" 
+      name="grantBrowse"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+    grantBrowse
+  </template>
+
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.denyBrowse" 
+      name="denyBrowse"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+    denyBrowse
+  </template>
+
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.grantExport" 
+      name="grantExport"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+    grantExport
+  </template>
+
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.denyExport" 
+      name="denyExport"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+    denyExport
+  </template>
+
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.grantImport" 
+      name="grantImport"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+    grantImport
+  </template>
+
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.denyImport" 
+      name="denyImport"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+    denyImport
+  </template>
+
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.grantModify" 
+      name="grantModify"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+    grantModify
+  </template>
+
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.denyModify" 
+      name="denyModify"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+    denyModify
+  </template>
+
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.grantRename" 
+      name="grantRename"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+    grantRename
+  </template>
+
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.denyRename" 
+      name="denyRename"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+    denyRename
+  </template>
+
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.grantReturnDN" 
+      name="grantReturnDN"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+    grantReturnDN
+  </template>
+
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.denyReturnDN" 
+      name="denyReturnDN"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+    denyReturnDN
+  </template>
+
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.grantCompare" 
+      name="grantCompare"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+    grantCompare
+  </template>
+
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.denyCompare" 
+      name="denyCompare"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+    denyCompare
+  </template>
+
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.grantFilterMatch" 
+      name="grantFilterMatch"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+    grantFilterMatch
+  </template>
+
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.denyFilterMatch" 
+      name="denyFilterMatch"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+    denyFilterMatch
+  </template>
+
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.grantInvoke" 
+      name="grantInvoke"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+    grantInvoke
+  </template>
+
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.denyInvoke" 
+      name="denyInvoke"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+    denyInvoke
+  </template>
+
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.classes" 
+      name="classes"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+    classes ${cursor}
+  </template>
+
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.entry" 
+      name="entry"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+    entry
+  </template>
+
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.allUserAttributeTypes" 
+      name="allUserAttributeTypes"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+    allUserAttributeTypes
+  </template>
+
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.allUserAttributeTypesAndValues" 
+      name="allUserAttributeTypesAndValues"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+    allUserAttributeTypesAndValues
+  </template>
+
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.grantsAndDenials" 
+      name="grantsAndDenials"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+    grantsAndDenials
+    {
+        ${cursor}
+    }
+  </template>
+
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.allUsers" 
+      name="allUsers"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+    allUsers
+  </template>
+
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.thisEntry" 
+      name="thisEntry"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+    thisEntry
+  </template>
+
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.attributeType" 
+      name="attributeType"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+    attributeType ${cursor}
+  </template>
+
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.allAttributeValues" 
+      name="allAttributeValues"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+    allAttributeValues ${cursor}
+  </template>
+
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.selfValue" 
+      name="selfValue"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+    selfValue ${cursor}
+  </template>
+
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.item" 
+      name="item"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+    item:${cursor}
+  </template>
+
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.item" 
+      name="item:"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+    item:${cursor}
+  </template>
+
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.and" 
+      name="and:"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+    and:${cursor}
+  </template>
+
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.or" 
+      name="or:"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+    or:${cursor}
+  </template>
+
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.not" 
+      name="not:"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+    not:${cursor}
+  </template>
+
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.name" 
+      name="name"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+    name { ${cursor} }
+  </template>
+
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.userGroup" 
+      name="userGroup"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+    userGroup { ${cursor} }
+  </template>
+
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.subtree" 
+      name="subtree"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+    subtree { ${cursor} }
+  </template>
+
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.base" 
+      name="base"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+    base ${cursor}
+  </template>
+
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.specificExclusions" 
+      name="specificExclusions"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+    specificExclusions ${cursor}
+  </template>	
+
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.chopBefore" 
+      name="chopBefore:"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+    chopBefore:${cursor}
+  </template>
+
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.chopAfter" 
+      name="chopAfter:"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+    chopAfter:${cursor}
+  </template>
+
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.minimum" 
+      name="minimum"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+    minimum ${cursor}
+  </template>
+
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.maximum" 
+      name="maximum"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+    maximum ${cursor}
+  </template>
+
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.valuesIn" 
+      name="valuesIn"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+    valuesIn ${cursor}
+  </template>
+
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.type" 
+      name="type"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+    type ${cursor}
+  </template>
+
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.maxCount" 
+      name="maxCount"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+    maxCount ${cursor}
+  </template>
+
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.maxImmSub" 
+      name="maxImmSub"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+    maxImmSub ${cursor}
+  </template>
+
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.maxValueCount" 
+      name="maxValueCount"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+    maxValueCount { ${cursor} }
+  </template>
+
+  <template 
+      id="org.apache.directory.studio.aciitemeditor.templates.restrictedBy" 
+      name="restrictedBy"
+      context="org.apache.directory.studio.aciitemeditor.templates" 
+      enabled="true"
+      deleted="false">
+    restrictedBy { ${cursor} }
+  </template>
 </templates>
\ No newline at end of file

Modified: directory/studio/branches/studio-value/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/ACIITemConstants.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/ACIITemConstants.java?rev=1806342&r1=1806341&r2=1806342&view=diff
==============================================================================
--- directory/studio/branches/studio-value/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/ACIITemConstants.java (original)
+++ directory/studio/branches/studio-value/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/ACIITemConstants.java Sun Aug 27 07:05:41 2017
@@ -28,9 +28,8 @@ package org.apache.directory.studio.acii
 public interface ACIITemConstants
 {
     /** The plug-in ID */
-    String PLUGIN_ID = Activator.getDefault().getPluginProperties().getString( "Plugin_id" ); //$NON-NLS-1$
+    String PLUGIN_ID = ACIITemConstants.class.getPackage().getName();
 
     /** The ID for ACI Item Template */
-    String ACI_ITEM_TEMPLATE_ID = Activator.getDefault().getPluginProperties()
-        .getString( "CtxType_AciItem_Template_id" ); //$NON-NLS-1$
+    String ACI_ITEM_TEMPLATE_ID = PLUGIN_ID + ".templates"; //$NON-NLS-1$
 }

Modified: directory/studio/branches/studio-value/plugins/apacheds.configuration/plugin.properties
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/apacheds.configuration/plugin.properties?rev=1806342&r1=1806341&r2=1806342&view=diff
==============================================================================
--- directory/studio/branches/studio-value/plugins/apacheds.configuration/plugin.properties (original)
+++ directory/studio/branches/studio-value/plugins/apacheds.configuration/plugin.properties Sun Aug 27 07:05:41 2017
@@ -15,19 +15,12 @@
 # specific language governing permissions and limitations
 # under the License.
 
-Plugin_id=org.apache.directory.studio.apacheds.configuration
-
-ContentType_ServerConfiguration_id=org.apache.directory.studio.apacheds.configuration.contenttype
 ContentType_ServerConfiguration_name=ApacheDS Configuration File
 
-Editor_ServerConfigurationEditor_id=org.apache.directory.studio.apacheds.configuration.editor.ServerConfigurationEditor
 Editor_ServerConfigurationEditor_name=Server Configuration
 
-OpenConfigurationAction_id=org.apache.directory.studio.apacheds.configuration.actions.OpenConfigurationAction
 OpenConfigurationAction_label=Open Configuration
 
-NewWizards_Category_id=org.apache.directory.studio.apacheds.newWizards
 NewWizards_Category_name=ApacheDS
 
-NewWizards_NewApacheDSConfigurationFileWizard_id=org.apache.directory.studio.apacheds.configuration.wizards.NewApacheDSConfigurationFileWizard
 NewWizards_NewApacheDSConfigurationFileWizard_name=ApacheDS 2.0 Configuration File
\ No newline at end of file

Modified: directory/studio/branches/studio-value/plugins/apacheds.configuration/plugin.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/apacheds.configuration/plugin.xml?rev=1806342&r1=1806341&r2=1806342&view=diff
==============================================================================
--- directory/studio/branches/studio-value/plugins/apacheds.configuration/plugin.xml (original)
+++ directory/studio/branches/studio-value/plugins/apacheds.configuration/plugin.xml Sun Aug 27 07:05:41 2017
@@ -20,13 +20,14 @@
 -->
 <plugin>
   <extension point="org.eclipse.ui.editors">
+    <!-- The ApacheDS configuration editor -->
     <editor
         class="org.apache.directory.studio.apacheds.configuration.editor.ServerConfigurationEditor"
         default="false"
         icon="resources/icons/editor.gif"
-        id="%Editor_ServerConfigurationEditor_id"
+        id="org.apache.directory.studio.apacheds.configuration.editor.ServerConfigurationEditor"
         name="%Editor_ServerConfigurationEditor_name">
-      <contentTypeBinding contentTypeId="%ContentType_ServerConfiguration_id"/>
+      <contentTypeBinding contentTypeId="org.apache.directory.studio.apacheds.configuration.contenttype"/>
     </editor>
   </extension>
    
@@ -34,10 +35,11 @@
     <content-type
         describer="org.apache.directory.studio.apacheds.configuration.ApacheDS2ConfigurationContentDescriber"
         file-names="config.ldif"
-        id="%ContentType_ServerConfiguration_id"
+        id="org.apache.directory.studio.apacheds.configuration.contenttype"
         name="%ContentType_ServerConfiguration_name"/>
   </extension>
    
+  <!-- Adds an item in the connection context menu -->
   <extension point="org.eclipse.ui.popupMenus">
     <objectContribution
         objectClass="org.apache.directory.studio.connection.core.Connection"
@@ -45,10 +47,11 @@
       <action
           class="org.apache.directory.studio.apacheds.configuration.actions.OpenConfigurationAction"
           enablesFor="1"
-          id="%OpenConfigurationAction_id"
+          id="org.apache.directory.studio.apacheds.configuration.actions.OpenConfigurationAction"
           label="%OpenConfigurationAction_label"
           icon="resources/icons/editor.gif"/>
       <visibility>
+        <!-- Only work for ApacheDS 2.0.0 -->
         <and>
           <objectState name="vendorName" value="Apache Software Foundation"/>
             <or>
@@ -63,14 +66,14 @@
  
   <!-- Add a new entry to create an ApacheDS  configuration in the New menu -->  
   <extension point="org.eclipse.ui.newWizards">
-    <category id="%NewWizards_Category_id" name="%NewWizards_Category_name" />
+    <category id="org.apache.directory.studio.apacheds.newWizards" name="%NewWizards_Category_name" />
     <wizard
       canFinishEarly="true"
-      category="%NewWizards_Category_id"
+      category="org.apache.directory.studio.apacheds.newWizards"
       class="org.apache.directory.studio.apacheds.configuration.wizards.NewApacheDSConfigurationFileWizard"
       hasPages="false"
       icon="resources/icons/editor_new.gif"
-      id="%NewWizards_NewApacheDSConfigurationFileWizard_id"
+      id="org.apache.directory.studio.apacheds.configuration.wizards.NewApacheDSConfigurationFileWizard"
       name="%NewWizards_NewApacheDSConfigurationFileWizard_name"
       project="false"/>
   </extension>

Modified: directory/studio/branches/studio-value/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/ApacheDS2ConfigurationPluginConstants.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/ApacheDS2ConfigurationPluginConstants.java?rev=1806342&r1=1806341&r2=1806342&view=diff
==============================================================================
--- directory/studio/branches/studio-value/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/ApacheDS2ConfigurationPluginConstants.java (original)
+++ directory/studio/branches/studio-value/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/ApacheDS2ConfigurationPluginConstants.java Sun Aug 27 07:05:41 2017
@@ -28,8 +28,7 @@ package org.apache.directory.studio.apac
 public interface ApacheDS2ConfigurationPluginConstants
 {
     /** The plug-in ID */
-    String PLUGIN_ID = ApacheDS2ConfigurationPlugin.getDefault().getPluginProperties()
-        .getString( "Plugin_id" ); //$NON-NLS-1$
+    String PLUGIN_ID = ApacheDS2ConfigurationPluginConstants.class.getPackage().getName();
 
     // ------
     // IMAGES

Modified: directory/studio/branches/studio-value/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ServerConfigurationEditorUtils.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ServerConfigurationEditorUtils.java?rev=1806342&r1=1806341&r2=1806342&view=diff
==============================================================================
--- directory/studio/branches/studio-value/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ServerConfigurationEditorUtils.java (original)
+++ directory/studio/branches/studio-value/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ServerConfigurationEditorUtils.java Sun Aug 27 07:05:41 2017
@@ -26,6 +26,7 @@ import java.util.List;
 import java.util.UUID;
 
 import org.apache.directory.api.util.FileUtils;
+import org.apache.directory.api.util.Strings;
 import org.apache.directory.api.ldap.model.constants.SchemaConstants;
 import org.apache.directory.api.ldap.model.csn.CsnFactory;
 import org.apache.directory.api.ldap.model.entry.DefaultEntry;
@@ -100,13 +101,14 @@ public class ServerConfigurationEditorUt
         if ( isIDE )
         {
             // Asking the user for the location where to 'save as' the file
-            final SaveAsDialog dialog = new SaveAsDialog( shell );
+            SaveAsDialog dialog = new SaveAsDialog( shell );
 
             String inputClassName = input.getClass().getName();
+            
             if ( input instanceof FileEditorInput )
-            // FileEditorInput class is used when the file is opened
-            // from a project in the workspace.
             {
+                // FileEditorInput class is used when the file is opened
+                // from a project in the workspace.
                 dialog.setOriginalFile( ( ( FileEditorInput ) input ).getFile() );
             }
             else if ( input instanceof IPathEditorInput )
@@ -116,11 +118,11 @@ public class ServerConfigurationEditorUt
             }
             else if ( inputClassName.equals( "org.eclipse.ui.internal.editors.text.JavaFileEditorInput" ) //$NON-NLS-1$
                 || inputClassName.equals( "org.eclipse.ui.ide.FileStoreEditorInput" ) ) //$NON-NLS-1$
-            // The class 'org.eclipse.ui.internal.editors.text.JavaFileEditorInput'
-            // is used when opening a file from the menu File > Open... in Eclipse 3.2.x
-            // The class 'org.eclipse.ui.ide.FileStoreEditorInput' is used when
-            // opening a file from the menu File > Open... in Eclipse 3.3.x
             {
+                // The class 'org.eclipse.ui.internal.editors.text.JavaFileEditorInput'
+                // is used when opening a file from the menu File > Open... in Eclipse 3.2.x
+                // The class 'org.eclipse.ui.ide.FileStoreEditorInput' is used when
+                // opening a file from the menu File > Open... in Eclipse 3.3.x
                 dialog.setOriginalFile( ResourcesPlugin.getWorkspace().getRoot()
                     .getFile( new Path( input.getToolTipText() ) ) );
             }
@@ -247,13 +249,7 @@ public class ServerConfigurationEditorUt
         final DialogResult result = new DialogResult();
 
         // Opening the dialog in the UI thread
-        Display.getDefault().syncExec( new Runnable()
-        {
-            public void run()
-            {
-                result.setResult( dialog.open() );
-            }
-        } );
+        Display.getDefault().syncExec( () -> result.setResult( dialog.open() ) );
 
         return result.getResult();
     }
@@ -288,14 +284,11 @@ public class ServerConfigurationEditorUt
         final DialogResult result = new DialogResult();
 
         // Opening the dialog in the UI thread
-        Display.getDefault().syncExec( new Runnable()
-        {
-            public void run()
+        Display.getDefault().syncExec( () ->
             {
                 FileDialog dialog = new FileDialog( shell, SWT.SAVE );
                 result.setResult( dialog.open() );
-            }
-        } );
+            } );
 
         return result.getResult();
     }
@@ -311,8 +304,7 @@ public class ServerConfigurationEditorUt
      * @throws Exception
      */
     public static void saveConfiguration( ConnectionServerConfigurationInput input, ConfigWriter configWriter,
-        IProgressMonitor monitor )
-        throws Exception
+        IProgressMonitor monitor ) throws Exception
     {
         // Getting the original configuration partition
         EntryBasedConfigurationPartition originalPartition = input.getOriginalPartition();
@@ -510,10 +502,8 @@ public class ServerConfigurationEditorUt
         PartitionsDiffComputer partitionsDiffComputer = new PartitionsDiffComputer();
         partitionsDiffComputer.setOriginalPartition( originalPartition );
         partitionsDiffComputer.setDestinationPartition( newconfigurationPartition );
-        List<LdifEntry> modificationsList = partitionsDiffComputer.computeModifications( new String[]
+        return partitionsDiffComputer.computeModifications( new String[]
             { SchemaConstants.ALL_USER_ATTRIBUTES } );
-
-        return modificationsList;
     }
 
 
@@ -544,7 +534,7 @@ public class ServerConfigurationEditorUt
      */
     public static String checkEmptyString( String s )
     {
-        if ( "".equals( s ) )
+        if ( Strings.isEmpty( s ) )
         {
             return null;
         }



Mime
View raw message