lhaeger closed pull request #3: Added value editor mappings
URL: https://github.com/apache/directory-studio/pull/3
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/plugins/edirectory/plugin.xml b/plugins/edirectory/plugin.xml
index 571bc3037..783190a69 100644
--- a/plugins/edirectory/plugin.xml
+++ b/plugins/edirectory/plugin.xml
@@ -19,5 +19,55 @@
under the License.
-->
<plugin>
-
+
+ <extension
+ point="org.apache.directory.studio.valueeditors">
+
+ <valueEditor
+ class="org.apache.directory.studio.valueeditors.TextValueEditor"
+ icon="resources/icons/texteditor.gif"
+ name="%ValueEditors_TextValueEditor_name">
+ <attribute attributeType="DirXML-ApplicationSchema"/>
+ <attribute attributeType="DirXML-ConfigManifest"/>
+ <attribute attributeType="DirXML-ConfigValues"/>
+ <attribute attributeType="DirXML-Data"/>
+ <attribute attributeType="DirXML-DriverFilter"/>
+ <attribute attributeType="DirXML-DriverStorage"/>
+ <attribute attributeType="DirXML-EngineControlValues"/>
+ <attribute attributeType="DirXML-PersistentData"/>
+ <attribute attributeType="DirXML-pkgExtensions"/>
+ <attribute attributeType="DirXML-pkgInitialState"/>
+ <attribute attributeType="DirXML-ReciprocalAttrMap"/>
+ <attribute attributeType="DirXML-ShimConfigInfo"/>
+ <attribute attributeType="DirXML-SPEntitlementsXML"/>
+ <attribute attributeType="DirXML-uiXMLBig"/>
+ <attribute attributeType="DirXML-uiXMLBigPerReplica"/>
+ <attribute attributeType="srvprvProcessXML"/>
+ <attribute attributeType="srvprvRequestXML"/>
+ <attribute attributeType="XmlData"/>
+ </valueEditor>
+
+ <valueEditor
+ class="org.apache.directory.studio.valueeditors.image.ImageValueEditor"
+ icon="resources/icons/imageeditor.gif"
+ name="%ValueEditor_ImageValueEditor_name">
+ <attribute attributeType="DirXML-DriverImage"/>
+ </valueEditor>
+
+ <valueEditor
+
class="org.apache.directory.studio.valueeditors.certificate.CertificateValueEditor"
+ icon="resources/icons/certificateeditor.png"
+ name="%ValueEditor_CertificateValueEditor_name">
+ <attribute attributeType="nDSPKIPublicKeyCertificate"/>
+ <attribute attributeType="ndsCrossCertificatePair"/>
+ </valueEditor>
+
+ <valueEditor
+
class="org.apache.directory.studio.valueeditors.uuid.InPlaceUuidValueEditor"
+ icon="resources/icons/entryuuideditor.gif"
+ name="%ValueEditor_InPlaceEntryUUIDValueEditor_name">
+ <attribute attributeType="GUID"/>
+ </valueEditor>
+
+ </extension>
</plugin>
diff --git a/plugins/edirectory/resources/icons/certificateeditor.png
b/plugins/edirectory/resources/icons/certificateeditor.png
new file mode 100644
index 000000000..3bba5db8d
Binary files /dev/null and
b/plugins/edirectory/resources/icons/certificateeditor.png differ
diff --git a/plugins/edirectory/resources/icons/entryuuideditor.gif
b/plugins/edirectory/resources/icons/entryuuideditor.gif
new file mode 100644
index 000000000..eea03385f
Binary files /dev/null and
b/plugins/edirectory/resources/icons/entryuuideditor.gif differ
diff --git a/plugins/edirectory/resources/icons/imageeditor.gif
b/plugins/edirectory/resources/icons/imageeditor.gif
new file mode 100644
index 000000000..75a4b3c20
Binary files /dev/null and b/plugins/edirectory/resources/icons/imageeditor.gif
differ
diff --git a/plugins/edirectory/resources/icons/xmldoc.gif
b/plugins/edirectory/resources/icons/xmldoc.gif
new file mode 100644
index 000000000..14eb1be09
Binary files /dev/null and b/plugins/edirectory/resources/icons/xmldoc.gif
differ
diff --git
a/plugins/edirectory/src/main/java/org/apache/directory/studio/edirectory/EDirectoryActivator.java
b/plugins/edirectory/src/main/java/org/apache/directory/studio/edirectory/EDirectoryActivator.java
index a7b71a756..b0b5e86f9 100644
---
a/plugins/edirectory/src/main/java/org/apache/directory/studio/edirectory/EDirectoryActivator.java
+++
b/plugins/edirectory/src/main/java/org/apache/directory/studio/edirectory/EDirectoryActivator.java
@@ -79,8 +79,8 @@ public static EDirectoryActivator getDefault()
* Use this method to get SWT images. Use the IMG_ constants from
* ValueEditorConstants for the key.
*
- * @param key The key (relative path to the image im filesystem)
- * @return The image discriptor or null
+ * @param key The key (relative path to the image in filesystem)
+ * @return The image descriptor or null
*/
public ImageDescriptor getImageDescriptor( String key )
{
@@ -112,7 +112,7 @@ public ImageDescriptor getImageDescriptor( String key )
* Note: Don't dispose the returned SWT Image. It is disposed
* automatically when the plugin is stopped.
*
- * @param key The key (relative path to the image im filesystem)
+ * @param key The key (relative path to the image in filesystem)
* @return The SWT Image or null
* @see ValueEditorsConstants
*/
diff --git a/plugins/rcp/plugin.xml b/plugins/rcp/plugin.xml
index 589053304..c7950c8bf 100644
--- a/plugins/rcp/plugin.xml
+++ b/plugins/rcp/plugin.xml
@@ -60,10 +60,11 @@
<property
name="startupProgressRect"
value="0,280,455,15"/>
-
<property
- name="preferenceCustomization"
- value="plugin_customization.ini"/>
+ name="preferenceCustomization"
+ value="plugin_customization.ini">
+ </property>
+
</product>
</extension>
diff --git a/plugins/valueeditors/plugin.xml b/plugins/valueeditors/plugin.xml
index 2c997e288..50fff3092 100644
--- a/plugins/valueeditors/plugin.xml
+++ b/plugins/valueeditors/plugin.xml
@@ -109,8 +109,6 @@
<syntax syntaxOID="1.3.6.1.1.16.1" />
<!-- Explicitly list entryUUID because in ApacheDS 1.5.5 it has
octetString syntax -->
<attribute attributeType="entryUUID"/>
- <!-- Explicitly list attribute for eDirectory -->
- <attribute attributeType="GUID"/>
</valueEditor>
<valueEditor
@@ -132,11 +130,9 @@
icon="resources/icons/certificateeditor.png"
name="%ValueEditor_CertificateValueEditor_name">
<syntax syntaxOID="1.3.6.1.4.1.1466.115.121.1.8"/>
- <!-- Explicitly list attributes for eDirectory -->
+ <!-- required for at least Active Directory, Edirectory and Sun DSEE -->
<attribute attributeType="userCertificate"/>
- <attribute attributeType="nDSPKIPublicKeyCertificate"/>
<attribute attributeType="cACertificate"/>
- <attribute attributeType="ndsCrossCertificatePair"/>
</valueEditor>
<valueEditor
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
